Dev Fixed survey translation image and placement on advanced toolbar

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@9253 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 15, 2010 · 6d4a55f · 6d4a55f
1 parent fa60ade
commit 6d4a55f
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/admin/html.php b/admin/html.php
@@ -562,20 +562,6 @@
             }
         }
 
-//<AdV>
-        if(bHasRight($surveyid,'edit_survey_property'))
-        {
-            $surveysummary .= "<img src='$imagefiles/seperator.gif' alt=''  />\n";
-            $surveysummary .= "<a href=\"#\" onclick=\"window.open('$scriptname?action=translate&amp;sid=$surveyid', '_top')\""
-            . " title=\"".$clang->gTview("Translate survey")."\" >"
-            . "<img src='$imagefiles/translate_survey.png' name='translate' alt='".$clang->gT("Translate survey")."' /></a>\n";
-        }
-        else
-        {
-            $surveysummary .= "<img src='$imagefiles/seperator.gif' alt=''  />\n";
-            $surveysummary .= "<img src='$imagefiles/blank.gif' alt='' width='80' />\n";
-        }
-//</AdV>
 
         if (bHasRight($surveyid,'export') || bHasRight($surveyid,'activate_survey'))
         {
@@ -713,6 +699,19 @@
             $surveysummary .= "<img src='$imagefiles/blank.gif' alt='' width='40'  />\n";
         }
 
+        if(bHasRight($surveyid,'edit_survey_property'))
+        {
+            $surveysummary .= "<img src='$imagefiles/seperator.gif' alt=''  />\n";
+            $surveysummary .= "<a href=\"#\" onclick=\"window.open('$scriptname?action=translate&amp;sid=$surveyid', '_top')\""
+            . " title=\"".$clang->gTview("Translate survey")."\" >"
+            . "<img src='$imagefiles/translate.png' name='translate' alt='".$clang->gT("Translate survey")."' /></a>\n";
+        }
+        else
+        {
+            $surveysummary .= "<img src='$imagefiles/seperator.gif' alt=''  />\n";
+            $surveysummary .= "<img src='$imagefiles/blank.gif' alt='' width='80' />\n";
+        }
+
         if (bHasRight($surveyid,'define_questions'))
         {
             if ($sumcount6 > 0) {
@@ -802,7 +801,7 @@
         || $action=="setsurveysecurity" ||  $action=="setusergroupsurveysecurity" || $action=="delsurveysecurity"
         || $action=="editsurveysettings"|| $action=="editsurveylocalesettings" || $action=="updatesurveysettingsandeditlocalesettings" || $action=="addgroup" || $action=="importgroup"
         || $action=="ordergroups" || $action=="deletesurvey" || $action=="resetsurveylogic"
-        || $action=="importsurveyresources" || $action=="translate"  // <AdV>
+        || $action=="importsurveyresources" || $action=="translate"  
         || $action=="exportstructure" || $action=="quotas" || $action=="copysurvey") {$showstyle="style='display: none'";}
         if (!isset($showstyle)) {$showstyle="";}
         $aAdditionalLanguages = GetAdditionalLanguagesFromSurveyID($surveyid);
@@ -3576,7 +3575,6 @@
 
 }
 
-//<AdV>
 if ($action == "translate")  // Translate survey
 {
     if(bHasRight($surveyid,'edit_survey_property'))
@@ -3591,9 +3589,6 @@
 
 }
 
-//</AdV>
-
-
 if($action == "quotas")
 {
     include("quota.php");