Dev : Remove javascript redirects from menu bars.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12340 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Feb 4, 2012 · 56ab998 · 56ab998
1 parent 5ee6abe
commit 56ab998
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 58 deletions.
diff --git a/application/views/admin/conditions/conditionshead_view.php b/application/views/admin/conditions/conditionshead_view.php
@@ -5,16 +5,16 @@
             </div>
             <div class='menubar-main'>
                 <div class='menubar-left'>
-                    <a href="#" onclick="window.open('<?php echo $this->createUrl("/admin/survey/view/$surveyid$extraGetParams");?>', '_top')" title='"<?php $clang->eTview("Return to survey administration");?>'>
+                    <a href="<?php echo $this->createUrl("/admin/survey/view/$surveyid$extraGetParams"); ?>" title='"<?php $clang->eTview("Return to survey administration");?>'>
                         <img name='HomeButton' src='<?php echo $imageurl;?>/home.png' alt='<?php $clang->eT("Return to survey administration");?>' /></a>
                     <img src='<?php echo $imageurl;?>/blank.gif' alt='' width='11' />
                     <img src='<?php echo $imageurl;?>/seperator.gif' alt='' />
-                    <a href="#" onclick="window.open('<?php echo $this->createUrl("/admin/conditions/index/subaction/conditions/surveyid/$surveyid/gid/$gid/qid/$qid");?>', '_top')" title='<?php $clang->eTview("Show conditions for this question");?>' >
+                    <a href="<?php echo $this->createUrl("/admin/conditions/index/subaction/conditions/surveyid/$surveyid/gid/$gid/qid/$qid"); ?>" title='<?php $clang->eTview("Show conditions for this question");?>' >
                         <img name='SummaryButton' src='<?php echo $imageurl;?>/summary.png' alt='<?php $clang->eT("Show conditions for this question");?>' /></a>
                     <img src='<?php echo $imageurl;?>/seperator.gif' alt='' />
-                    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/conditions/index/subaction/editconditionsform/surveyid/$surveyid/gid/$gid/qid/$qid");?>', '_top')" title='<?php $clang->eTview("Add and edit conditions");?>' >
+                    <a href="<?php echo $this->createUrl("admin/conditions/index/subaction/editconditionsform/surveyid/$surveyid/gid/$gid/qid/$qid"); ?>" title='<?php $clang->eTview("Add and edit conditions");?>' >
                         <img name='ConditionAddButton' src='<?php echo $imageurl;?>/conditions_add.png' alt='"<?php $clang->eT("Add and edit conditions");?>' /></a>
-                    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/conditions/index/subaction/copyconditionsform/surveyid/$surveyid/gid/$gid/qid/$qid");?>', '_top')" title='<?php $clang->eTview("Copy conditions");?>' >
+                    <a href="<?php echo $this->createUrl("admin/conditions/index/subaction/copyconditionsform/surveyid/$surveyid/gid/$gid/qid/$qid"); ?>" title='<?php $clang->eTview("Copy conditions");?>' >
                         <img name='ConditionCopyButton' src='<?php echo $imageurl;?>/conditions_copy.png' alt='<?php $clang->eT("Copy conditions");?>' /></a>
 
                 </div><div class='menubar-right'>

diff --git a/application/views/admin/labels/labelbar_view.php b/application/views/admin/labels/labelbar_view.php
@@ -15,7 +15,7 @@
             <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/dumplabel.png' alt='<?php $clang->eT("Export this label set"); ?>' align='left' /></a>
         </div>
         <div class='menubar-right'>
-            <input type='image' src='<?php echo Yii::app()->getConfig('imageurl'); ?>/close.gif' title='<?php $clang->eT("Close Window"); ?>' onclick="window.open('<?php echo $this->createUrl("admin/labels/view"); ?>', '_top')" />
+            <input type='image' src='<?php echo Yii::app()->getConfig('imageurl'); ?>/close.gif' title='<?php $clang->eT("Close Window"); ?>' href="<?php echo $this->createUrl("admin/labels/view"); ?>" />
         </div>
     </div>
 </div>

diff --git a/application/views/admin/super/adminmenu.php b/application/views/admin/super/adminmenu.php
@@ -7,7 +7,7 @@
 			if(Yii::app()->session['loginID'])
 	    	{ ?>
 	 			 --  <?php $clang->eT("Logged in as:");?><strong>
-		        <a href="#" onclick="window.open('<?php echo $this->createUrl("/admin/user/personalsettings");?>', '_top')" title="<?php $clang->eTview("Edit your personal preferences");?>">
+		        <a href="<?php echo $this->createUrl("/admin/user/personalsettings"); ?>" title="<?php $clang->eTview("Edit your personal preferences");?>">
 		        <?php echo Yii::app()->session['user'];?> <img src='<?php echo Yii::app()->getConfig('imageurl');?>/profile_edit.png' alt='<?php $clang->eT("Edit your personal preferences");?>' /></a>
 		        </strong>
 	        <?php } ?>
@@ -20,28 +20,28 @@
 	</div>
     <div class='menubar-main'>
     <div class='menubar-left'>
-	    <a href="#" onclick="window.open('<?php echo $this->createUrl("/admin");?>', '_top')" title="<?php $clang->eTview("Default Administration Page");?>">
+	    <a href="<?php echo $this->createUrl("/admin"); ?>" title="<?php $clang->eTview("Default Administration Page");?>">
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/home.png' alt='<?php $clang->eT("Default Administration Page");?>' width='40' height='40'/></a>
 
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/blank.gif' alt='' width='11' />
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/seperator.gif' alt='' />
 
-	    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/user/index");?>', '_top')" title="<?php $clang->eTview("Create/Edit Users");?>" >
+	    <a href="<?php echo $this->createUrl("admin/user/index"); ?>" title="<?php $clang->eTview("Create/Edit Users");?>" >
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/security.png' alt='<?php $clang->eT("Create/Edit Users");?>' width='40' height='40'/></a>
 
-	    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/usergroups/index");?>', '_top')" title="<?php $clang->eTview("Create/Edit Groups");?>" >
+	    <a href="<?php echo $this->createUrl("admin/usergroups/index"); ?>" title="<?php $clang->eTview("Create/Edit Groups");?>" >
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/usergroup.png' alt='<?php $clang->eT("Create/Edit Groups");?>' width='40' height='40'/></a>
 
 		<?php
 		if(Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1)
 		{ ?>
-	    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/globalsettings");?>', '_top')" title="<?php $clang->eTview("Global settings");?>" >
+	    <a href="<?php echo $this->createUrl("admin/globalsettings"); ?>" title="<?php $clang->eTview("Global settings");?>" >
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/global.png' alt='<?php $clang->eT("Global settings");?>' width='40' height='40'/></a>
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/seperator.gif' alt='' />
 		<?php }
 		if(Yii::app()->session['USER_RIGHT_CONFIGURATOR'] == 1)
 		{ ?>
-	    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/checkintegrity");?>', '_top')" title="<?php $clang->eTview("Check Data Integrity");?>">
+	    <a href="<?php echo $this->createUrl("admin/checkintegrity"); ?>" title="<?php $clang->eTview("Check Data Integrity");?>">
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/checkdb.png' alt='<?php $clang->eT("Check Data Integrity");?>' width='40' height='40'/></a>
 		<?php
         }
@@ -53,7 +53,7 @@
 
 				?>
 
-				<a href="#" onclick="window.open('<?php echo $this->createUrl("admin/dumpdb");?>', '_top')" title="<?php $clang->eTview("Backup Entire Database");?>" >
+				<a href="<?php echo $this->createUrl("admin/dumpdb"); ?>" title="<?php $clang->eTview("Backup Entire Database");?>" >
 				<img src='<?php echo Yii::app()->getConfig('imageurl');?>/backup.png' alt='<?php $clang->eT("Backup Entire Database");?>' width='40' height='40'/>
 				</a>
 
@@ -69,20 +69,20 @@
 		{
 	    ?>
 
-	    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/labels/view");?>', '_top')" title="<?php $clang->eTview("Edit label sets");?>" >
+	    <a href="<?php echo $this->createUrl("admin/labels/view"); ?>" title="<?php $clang->eTview("Edit label sets");?>" >
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/labels.png'  alt='<?php $clang->eT("Edit label sets");?>' width='40' height='40'/></a>
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/seperator.gif' alt='' />
 	    <?php }
 	    if(Yii::app()->session['USER_RIGHT_MANAGE_TEMPLATE'] == 1)
 		{ ?>
-	    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/templates/view");?>', '_top')" title="<?php $clang->eTview("Template Editor");?>" >
+	    <a href="<?php echo $this->createUrl("admin/templates/view"); ?>" title="<?php $clang->eTview("Template Editor");?>" >
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/templates.png' alt='<?php $clang->eT("Template Editor");?>' width='40' height='40'/></a>
 	    <?php } ?>
             <img src='<?php echo Yii::app()->getConfig('imageurl');?>/seperator.gif' alt='' />
         <?php
         if(Yii::app()->session['USER_RIGHT_PARTICIPANT_PANEL'] == 1)
 		{ 	 ?>
-            <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/participants/index");?>', '_top')" title="<?php $clang->eTview("Participant panel");?>" >
+            <a href="<?php echo $this->createUrl("admin/participants/index"); ?>" title="<?php $clang->eTview("Participant panel");?>" >
 	        <img src='<?php echo Yii::app()->getConfig('imageurl');?>/tokens.png' alt='<?php $clang->eT("Participant panel");?>' width='40' height='40'/></a>
         <?php } ?>
 	</div>
@@ -91,21 +91,21 @@
 	    <select id='surveylist' name='surveylist' onchange="window.open(this.options[this.selectedIndex].value,'_top')">
 	    <?php echo getSurveyList(false, false, $surveyid); ?>
 	    </select>
-        <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/survey/index");?>', '_top')" title="<?php $clang->eTview("Detailed list of surveys");?>" >
+        <a href="<?php echo $this->createUrl("admin/survey/index"); ?>" title="<?php $clang->eTview("Detailed list of surveys");?>" >
         <img src='<?php echo Yii::app()->getConfig('imageurl');?>/surveylist.png' alt='<?php $clang->eT("Detailed list of surveys");?>' />
         </a>
 
 	    <?php
 	    if(Yii::app()->session['USER_RIGHT_CREATE_SURVEY'] == 1)
 		{ ?>
 
-	    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/survey/newsurvey");?>', '_top')" title="<?php $clang->eTview("Create, import, or copy a survey");?>" >
+	    <a href="<?php echo $this->createUrl("admin/survey/newsurvey"); ?>" title="<?php $clang->eTview("Create, import, or copy a survey");?>" >
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/add.png' alt='<?php $clang->eT("Create, import, or copy a survey");?>' /></a>
 	    <?php } ?>
 
 
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/seperator.gif' alt='' />
-	    <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/authentication/logout");?>', '_top')" title="<?php $clang->eTview("Logout");?>" >
+	    <a href="<?php echo $this->createUrl("admin/authentication/logout"); ?>" title="<?php $clang->eTview("Logout");?>" >
 	    <img src='<?php echo Yii::app()->getConfig('imageurl');?>/logout.png' alt='<?php $clang->eT("Logout");?>' /></a>
 
 	    <a href="http://docs.limesurvey.org" title="<?php $clang->eTview("LimeSurvey online manual");?>" >

diff --git a/application/views/admin/survey/Question/questionbar_view.php b/application/views/admin/survey/Question/questionbar_view.php
@@ -17,12 +17,12 @@
             {
                 if (count(Survey::model()->findByPk($surveyid)->additionalLanguages) == 0)
                 { ?>
-                <a href="#" accesskey='q' onclick="window.open('<?php echo $this->createUrl("admin/question/preview/surveyid/$surveyid/qid/$qid/");?>', '_blank')"
+                <a accesskey='q' href="<?php echo $this->createUrl("admin/question/preview/surveyid/$surveyid/qid/$qid/"); ?>" target="_blank"
                     title="<?php $clang->eTview("Preview This Question"); ?>">
                     <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/preview.png' alt='<?php $clang->eT("Preview This Question"); ?>' /></a>
                 <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/seperator.gif' alt='' />
                 <?php } else { ?>
-                <a href="#" accesskey='q' id='previewquestion'
+                <a accesskey='q' id='previewquestion'
                     title="<?php $clang->eTview("Preview This Question"); ?>">
                     <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/preview.png' title='' alt='<?php $clang->eT("Preview This Question"); ?>' /></a>
                 <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/seperator.gif' alt=''  />
@@ -42,7 +42,7 @@
         <?php if(hasSurveyPermission($surveyid,'surveyactivation','read'))
         { ?>
             <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/seperator.gif' alt=''  />
-            <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}/gid/{$gid}/qid/{$qid}/"); ?>','_blank')"
+            <a href="<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}/gid/{$gid}/qid/{$qid}/"); ?>','_blank')"
                 title="<?php $clang->eTview("Survey Logic File for current question"); ?>">
             <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/quality_assurance.png' alt='<?php $clang->eT("Survey Logic File for current question"); ?>' /></a>
         <?php } ?>
@@ -111,7 +111,7 @@
 
             if(hasSurveyPermission($surveyid,'surveycontent','update'))
             { ?>
-            <a href='#' onclick="window.open('<?php echo $this->createUrl("admin/conditions/index/subaction/editconditionsform/surveyid/$surveyid/gid/$gid/qid/$qid");?>', '_top')"
+            <a href="<?php echo $this->createUrl("admin/conditions/index/subaction/editconditionsform/surveyid/$surveyid/gid/$gid/qid/$qid"); ?>"
                 title="<?php $clang->eTview("Set/view conditions for this question"); ?>">
                 <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/conditions.png' alt='<?php $clang->eT("Set conditions for this question"); ?>'  /></a>
             <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/seperator.gif' alt='' />
@@ -169,7 +169,7 @@
         <input type='image' src='<?php echo Yii::app()->getConfig('imageurl'); ?>/plus.gif' title='
             <?php $clang->eT("Show Details of this Question"); ?>'  alt='<?php $clang->eT("Show Details of this Question"); ?>' onclick='document.getElementById("questiondetails").style.display="";' />
         <input type='image' src='<?php echo Yii::app()->getConfig('imageurl'); ?>/close.gif' title='
-            <?php $clang->eT("Close this Question"); ?>' alt='<?php $clang->eT("Close this Question"); ?>' onclick="window.open('<?php echo $this->createUrl("admin/survey/view/surveyid/$surveyid/gid/$gid"); ?>', '_top')" />
+            <?php $clang->eT("Close this Question"); ?>' alt='<?php $clang->eT("Close this Question"); ?>' href="<?php echo $this->createUrl("admin/survey/view/surveyid/$surveyid/gid/$gid"); ?>" />
     </div>
 </div>
 </div>

diff --git a/application/views/admin/survey/QuestionGroups/questiongroupbar_view.php b/application/views/admin/survey/QuestionGroups/questiongroupbar_view.php
@@ -9,8 +9,8 @@
         <?php if(hasSurveyPermission($surveyid,'surveycontent','update'))
             { ?>
             <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/seperator.gif' alt=''  />
-            <a href="#" onclick="window.open('<?php echo $this->createUrl("survey/index/action/previewgroup/sid/$surveyid/gid/$gid/");?>','_blank')"
-                title="<?php $clang->eTview("Preview current question group"); ?>">
+            <a href="<?php echo $this->createUrl("survey/index/action/previewgroup/sid/$surveyid/gid/$gid/"); ?>"
+                title="<?php $clang->eTview("Preview current question group"); ?>" target="_blank">
                 <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/preview.png' alt='<?php $clang->eT("Preview current question group"); ?>' width="40" height="40"/></a>
             <?php }
             else{ ?>
@@ -20,15 +20,15 @@
         <?php if(hasSurveyPermission($surveyid,'surveycontent','update'))
             { ?>
             <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/seperator.gif' alt=''  />
-            <a href="#" onclick="window.open('<?php echo $this->createUrl('admin/questiongroup/edit/surveyid/'.$surveyid.'/gid/'.$gid); ?>','_top')"
+            <a href="<?php echo $this->createUrl('admin/questiongroup/edit/surveyid/'.$surveyid.'/gid/'.$gid); ?>"
                 title="<?php $clang->eTview("Edit current question group"); ?>">
                 <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/edit.png' alt='<?php $clang->eT("Edit current question group"); ?>' width="40" height="40"/></a>
         <?php } ?>
 
         <?php if(hasSurveyPermission($surveyid,'surveyactivation','read'))
         { ?>
             <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/seperator.gif' alt=''  />
-            <a href="#" onclick="window.open('<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}/gid/{$gid}/"); ?>','_blank')"
+            <a href="<?php echo $this->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}/gid/{$gid}/"); ?>"
                 title="<?php $clang->eTview("Survey Logic File for current question group"); ?>">
             <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/quality_assurance.png' alt='<?php $clang->eT("Survey Logic File for current question group"); ?>' /></a>
         <?php } ?>
@@ -112,15 +112,13 @@
         <?php if ($activated == "Y")
             { ?>
             <a href='#'>
-                <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/add_disabled.png' title='' alt='<?php echo $clang->gT("Disabled").' - '.$clang->gT("This survey is currently active."); ?>'
-                   onclick="window.open('', '_top')" width="40" height="40"/></a>
+                <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/add_disabled.png' title='' alt='<?php echo $clang->gT("Disabled").' - '.$clang->gT("This survey is currently active."); ?>' width="40" height="40" /></a>
             <?php }
             elseif(hasSurveyPermission($surveyid,'surveycontent','create'))
             { ?>
             <a href='<?php echo $this->createUrl("admin/question/addquestion/surveyid/".$surveyid."/gid/".$gid); ?>'
                 title="<?php $clang->eTview("Add new question to group"); ?>" >
-                <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/add.png' title='' alt='<?php $clang->eT("Add New Question to Group"); ?>'
-                   onclick="window.open('', '_top')" width="40" height="40"/></a>
+                <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/add.png' title='' alt='<?php $clang->eT("Add New Question to Group"); ?>' width="40" height="40" /></a>
             <?php } ?>
 
         <img src='<?php echo Yii::app()->getConfig('imageurl'); ?>/seperator.gif' alt=''  />
@@ -131,7 +129,7 @@
         <?php if (!$qid)
             { ?>
             <input type='image' src='<?php echo Yii::app()->getConfig('imageurl'); ?>/close.gif' title='<?php $clang->eT("Close this Group"); ?>' alt='<?php $clang->eT("Close this Group"); ?>'
-                onclick="window.open('<?php echo $this->createUrl("admin/survey/view/surveyid/".$surveyid); ?>', '_top')" />
+                href="<?php echo $this->createUrl("admin/survey/view/surveyid/".$surveyid); ?>" />
             <?php }
             else
             { ?>
@@ -193,7 +191,7 @@
                     {
 
                         $listcid=implode("-",$depcid);?>
-                    <a href='#' onclick="window.open('<?php echo $this->createUrl("admin/conditions/markcid/" . implode("-",$depcid) . "/surveyid/$surveyid/gid/$depgid/qid/$depqid"); ?>','_top')">[QID: <?php echo $depqid; ?>]</a>
+                    <a href='<?php echo $this->createUrl("admin/conditions/markcid/" . implode("-",$depcid) . "/surveyid/$surveyid/gid/$depgid/qid/$depqid"); ?>'>[QID: <?php echo $depqid; ?>]</a>
                     <?php }
             } ?>
         </td></tr>