Fixed some HTML issues

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11074 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 1, 2011 · 885816f · 885816f
1 parent 20ad533
commit 885816f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 30 deletions.
diff --git a/application/controllers/admin/saved.php b/application/controllers/admin/saved.php
@@ -138,8 +138,6 @@ function _showSavedList($surveyid)
         }
     }
 
-    //				[<a href='saved.php?sid=$surveyid&amp;action=remind&amp;scid=".$row['scid']."'>".$clang->gT("Remind")."</a>]
-    //               c_schmitz: Since its without function at the moment i removed it from the above lines
 
     /**
      * saved::_savedmenubar()
@@ -154,16 +152,7 @@ function _savedmenubar($surveyid)
         if (!isset($surveyoptions)) {$surveyoptions="";}
         $surveyoptions .= "<a href='".site_url('admin/survey/view/'.$surveyid)."' title='".$clang->gTview("Return to survey administration")."' >" .
     			"<img name='Administration' src='".$this->config->item('imageurl')."/home.png' alt='".$clang->gT("Return to survey administration")."' align='left'></a>\n";
-        /*	. "\t\t\t<img src='$imageurl/blank.gif' alt='' width='11' border='0' hspace='0' align='left'>\n"
-         . "\t\t\t<img src='$imageurl/seperator.gif' alt='' border='0' hspace='0' align='left'>\n"
-         . "\t\t\t<a href='$scriptname?action=saved&amp;sid=$surveyid' " .
-         "title='".$clang->gTview("Show summary information")."'>" .
-         "<img name='SurveySummary' src='$imageurl/summary.png' alt='".$clang->gT("Show summary information")."' align='left'></a>\n"
-         . "\t\t\t<a href='$scriptname?action=saved&amp;sid=$surveyid&amp;subaction=all' title='".$clang->gTview("Display Responses")."'>"
-         . "<img name='ViewAll' src='$imageurl/document.png' alt='".$clang->gT("Display Responses")."' align='left'></a>\n"
-         //. "\t\t\t<input type='image' name='ViewLast' src='$imageurl/viewlast.png' title='"
-         //. $clang->gT("Display Last 50 Responses")."'  align='left'  onclick=\"window.open('saved.php?sid=$surveyid&action=all&limit=50&order=desc', '_top')\">\n"
-         . "\t\t\t<img src='$imageurl/seperator.gif' border='0' hspace='0' align='left' alt=''>\n";*/
+
         return $surveyoptions;
     }
 

diff --git a/application/helpers/update/upgrade-mssql_helper.php b/application/helpers/update/upgrade-mssql_helper.php
@@ -533,7 +533,7 @@ function db_upgrade($oldversion) {
             [date_created] datetime,
             PRIMARY KEY  ([participant_id],[token_id],[survey_id])
             );");echo $modifyoutput; flush();ob_flush();
-        modify_database("", "ALTER TABLE [prefix_users] ADD [participant_panel] int NOT NULL default '1'"); echo $modifyoutput; flush();ob_flush();
+        modify_database("", "ALTER TABLE [prefix_users] ADD [participant_panel] int NOT NULL default '0'"); echo $modifyoutput; flush();ob_flush();
 
         // Add language field to question_attributes table
         modify_database("","ALTER TABLE [prefix_question_attributes] ADD [language] varchar(20)"); echo $modifyoutput; flush();ob_flush();

diff --git a/application/helpers/update/upgrade-mssqlnative_helper.php b/application/helpers/update/upgrade-mssqlnative_helper.php
@@ -533,7 +533,7 @@ function db_upgrade($oldversion) {
                           [date_created] datetime,
                           PRIMARY KEY  ([participant_id],[token_id],[survey_id])
                           ); ");echo $modifyoutput; flush();ob_flush();
-        modify_database("", "ALTER TABLE [prefix_users] ADD [participant_panel] int NOT NULL default '1'"); echo $modifyoutput; flush();ob_flush();
+        modify_database("", "ALTER TABLE [prefix_users] ADD [participant_panel] int NOT NULL default '0'"); echo $modifyoutput; flush();ob_flush();
 
         // Add language field to question_attributes table
         modify_database("","ALTER TABLE [prefix_question_attributes] ADD [language] varchar(20)"); echo $modifyoutput; flush();ob_flush();

diff --git a/application/helpers/update/upgrade-mysql_helper.php b/application/helpers/update/upgrade-mysql_helper.php
@@ -590,7 +590,7 @@ function db_upgrade($oldversion) {
     }
     if ($oldversion < 148)
     {
-        modify_database("","ALTER TABLE `prefix_users` ADD `participant_panel` tinyint(1) NOT NULL default '1'"); echo $modifyoutput; flush();ob_flush();
+        modify_database("","ALTER TABLE `prefix_users` ADD `participant_panel` tinyint(1) NOT NULL default '0'"); echo $modifyoutput; flush();ob_flush();
         modify_database("","CREATE TABLE `prefix_participants` (`participant_id` varchar(50) NOT NULL,
                                                                 `firstname` varchar(40) default NULL,
                                                                 `lastname` varchar(40) default NULL,

diff --git a/application/helpers/update/upgrade-postgres_helper.php b/application/helpers/update/upgrade-postgres_helper.php
@@ -368,7 +368,7 @@ function db_upgrade($oldversion) {
         date_created date NOT NULL,
         PRIMARY KEY (participant_id,token_id,survey_id)
         );"); echo $modifyoutput; flush();ob_flush();
-        modify_database("","ALTER TABLE prefix_user ADD participant_panel integer NOT NULL default '1'"); echo $modifyoutput; flush();ob_flush();
+        modify_database("","ALTER TABLE prefix_user ADD participant_panel integer NOT NULL default '0'"); echo $modifyoutput; flush();ob_flush();
         // add language field to question_attributes table
         modify_database("","ALTER TABLE prefix_question_attributes ADD language character varying(20)"); echo $modifyoutput; flush();ob_flush();
         upgrade_question_attributes148();

diff --git a/application/views/admin/authentication/login.php b/application/views/admin/authentication/login.php
@@ -1,4 +1,5 @@
-<form name='loginform' id='loginform' method='post' action='<?php echo site_url("admin/authentication/login");?>' ><br /><p><strong><?php echo $summary;?></strong><br />	<br />
+<form name='loginform' id='loginform' method='post' action='<?php echo site_url("admin/authentication/login");?>' >
+<br /><p><strong><?php echo $summary;?></strong><br /><br /></p>
 <ul>
                                         <li><label for='user'><?php echo $clang->gT("Username");?></label>
                                         <input name='user' id='user' type='text' size='40' maxlength='40' value='' /></li>
@@ -28,11 +29,11 @@
         if ($this->config->item("display_user_password_in_email") === true)
         {
             ?>
-            <p><a href='<?php echo site_url("admin/authentication/forgotpassword");?>'><?php echo $clang->gT("Forgot Your Password?");?></a><br />&nbsp;
+            <a href='<?php echo site_url("admin/authentication/forgotpassword");?>'><?php echo $clang->gT("Forgot Your Password?");?></a><br />&nbsp;
             <?php
         }
 		?>
-        </form><br />
+        </p></form><br />
         <script type='text/javascript'>
           document.getElementById('user').focus();
        </script>
diff --git a/application/views/admin/super/adminmenu.php b/application/views/admin/super/adminmenu.php
@@ -21,28 +21,28 @@
     <div class='menubar-main'>
     <div class='menubar-left'>
 	    <a href="#" onclick="window.open('<?php echo site_url("admin");?>', '_top')" title="<?php echo $clang->gTview("Default Administration Page");?>">
-	    <img src='<?php echo $this->config->item('imageurl');?>/home.png' name='HomeButton' alt='<?php echo $clang->gT("Default Administration Page");?>' /></a>
+	    <img src='<?php echo $this->config->item('imageurl');?>/home.png' name='HomeButton' alt='<?php echo $clang->gT("Default Administration Page");?>' width='40' height='40'/></a>
 
 	    <img src='<?php echo $this->config->item('imageurl');?>/blank.gif' alt='' width='11' />
 	    <img src='<?php echo $this->config->item('imageurl');?>/seperator.gif' alt='' />
 
 	    <a href="#" onclick="window.open('<?php echo site_url("admin/user/editusers");?>', '_top')" title="<?php echo $clang->gTview("Create/Edit Users");?>" >
-	    <img src='<?php echo $this->config->item('imageurl');?>/security.png' name='AdminSecurity' alt='<?php echo $clang->gT("Create/Edit Users");?>' /></a>
+	    <img src='<?php echo $this->config->item('imageurl');?>/security.png' name='AdminSecurity' alt='<?php echo $clang->gT("Create/Edit Users");?>' width='40' height='40'/></a>
 
 	    <a href="#" onclick="window.open('<?php echo site_url("admin/usergroups/view");?>', '_top')" title="<?php echo $clang->gTview("Create/Edit Groups");?>" >
-	    <img src='<?php echo $this->config->item('imageurl');?>/usergroup.png' alt='<?php echo $clang->gT("Create/Edit Groups");?>' /></a>
+	    <img src='<?php echo $this->config->item('imageurl');?>/usergroup.png' alt='<?php echo $clang->gT("Create/Edit Groups");?>' width='40' height='40'/></a>
 
 		<?php
 		if($this->session->userdata('USER_RIGHT_SUPERADMIN') == 1)
 		{ ?>
 	    <a href="#" onclick="window.open('<?php echo site_url("admin/globalsettings");?>', '_top')" title="<?php echo $clang->gTview("Global settings");?>" >
-	    <img src='<?php echo $this->config->item('imageurl');?>/global.png' name='GlobalSettings' alt='<?php echo $clang->gT("Global settings");?>' /></a>
+	    <img src='<?php echo $this->config->item('imageurl');?>/global.png' name='GlobalSettings' alt='<?php echo $clang->gT("Global settings");?>' width='40' height='40'/></a>
 	    <img src='<?php echo $this->config->item('imageurl');?>/seperator.gif' alt='' border='0' hspace='0' />
 		<?php }
 		if($this->session->userdata('USER_RIGHT_CONFIGURATOR') == 1)
 		{ ?>
 	    <a href="#" onclick="window.open('<?php echo site_url("admin/checkintegrity");?>', '_top')" title="<?php echo $clang->gTview("Check Data Integrity");?>">
-	    <img src='<?php echo $this->config->item('imageurl');?>/checkdb.png' name='CheckDataIntegrity' alt='<?php echo $clang->gT("Check Data Integrity");?>' /></a>
+	    <img src='<?php echo $this->config->item('imageurl');?>/checkdb.png' name='CheckDataIntegrity' alt='<?php echo $clang->gT("Check Data Integrity");?>' width='40' height='40'/></a>
 		<?php
         }
 		if($this->session->userdata('USER_RIGHT_CONFIGURATOR') == 1)
@@ -54,7 +54,7 @@
 		?>
 
 	    <a href="#" onclick="window.open('<?php echo site_url("admin/dumpdb");?>', '_top')" title="<?php echo $clang->gTview("Backup Entire Database");?>" >
-	    <img src='<?php echo $this->config->item('imageurl');?>/backup.png' name='ExportDB' alt='<?php echo $clang->gT("Backup Entire Database");?>' />
+	    <img src='<?php echo $this->config->item('imageurl');?>/backup.png' name='ExportDB' alt='<?php echo $clang->gT("Backup Entire Database");?>' width='40' height='40'/>
 	    </a>
 	    <?php
 	    /*
@@ -75,19 +75,20 @@
 	    ?>
 
 	    <a href="#" onclick="window.open('<?php echo site_url("admin/labels/view");?>', '_top')" title="<?php echo $clang->gTview("Edit label sets");?>" >
-	    <img src='<?php echo $this->config->item('imageurl');?>/labels.png' name='LabelsEditor' alt='<?php echo $clang->gT("Edit label sets");?>' /></a>
+	    <img src='<?php echo $this->config->item('imageurl');?>/labels.png' name='LabelsEditor' alt='<?php echo $clang->gT("Edit label sets");?>' width='40' height='40'/></a>
 	    <img src='<?php echo $this->config->item('imageurl');?>/seperator.gif' alt='' border='0' hspace='0' />
 	    <?php }
 	    if($this->session->userdata('USER_RIGHT_MANAGE_TEMPLATE') == 1)
 		{ ?>
 	    <a href="#" onclick="window.open('<?php echo site_url("admin/templates/view");?>', '_top')" title="<?php echo $clang->gTview("Template Editor");?>" >
-	    <img src='<?php echo $this->config->item('imageurl');?>/templates.png' name='EditTemplates' alt='<?php echo $clang->gT("Template Editor");?>' /></a>
+	    <img src='<?php echo $this->config->item('imageurl');?>/templates.png' name='EditTemplates' alt='<?php echo $clang->gT("Template Editor");?>' width='40' height='40'/></a>
 	    <?php } ?>
             <img src='<?php echo $this->config->item('imageurl');?>/seperator.gif' alt='' border='0' hspace='0' />
-        <?php if($this->session->userdata('USER_RIGHT_PARTICIPANT_PANEL') == 1)
+        <?php
+        if($this->session->userdata('USER_RIGHT_PARTICIPANT_PANEL') == 1)
 		{ 	 ?>
             <a href="#" onclick="window.open('<?php echo site_url("admin/participants");?>', '_top')" title="<?php echo $clang->gTview("Participant panel");?>" >
-	        <img src='<?php echo $this->config->item('imageurl');?>/tokens.png' name='participantpanel' alt='<?php echo $clang->gT("Participant panel");?>' /></a>
+	        <img src='<?php echo $this->config->item('imageurl');?>/tokens.png' name='participantpanel' alt='<?php echo $clang->gT("Participant panel");?>' width='40' height='40'/></a>
         <?php } ?>
 	</div>
 	<div class='menubar-right'><span class="boxcaption"><?php echo $clang->gT("Surveys");?>:</span>

diff --git a/tmp/sample_installer_file.txt b/tmp/sample_installer_file.txt