Dev Some HTML fixes in quick translation

LimeSurvey · Jun 19, 2017 · d5f15c1 · d5f15c1
1 parent c4b7b5a
commit d5f15c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/application/controllers/admin/translate.php b/application/controllers/admin/translate.php
@@ -372,11 +372,6 @@ private function _getLanguageList($iSurveyID, $tolang)
                                 'onchange' => "window.open(this.options[this.selectedIndex].value,'_top')"
                             )
                         );
-        $language_list .= CHtml::closeTag('div');
-        $language_list .= CHtml::closeTag('div');
-        $language_list .= CHtml::closeTag('div');
-        $language_list .= CHtml::closeTag('div');
-        $language_list .= '';
         if ( count(Survey::model()->findByPk($iSurveyID)->additionalLanguages) > 1 )
         {
             $selected = ( ! isset($tolang) ) ? "selected" : "";
@@ -408,6 +403,9 @@ private function _getLanguageList($iSurveyID, $tolang)
 
         $language_list .= CHtml::closeTag('select');
         $language_list .= CHtml::closeTag('div'); // End of menubar-right
+        $language_list .= CHtml::closeTag('div');
+        $language_list .= CHtml::closeTag('div');
+        $language_list .= CHtml::closeTag('div');
 
         return $language_list;
     }
@@ -830,13 +828,13 @@ private function displayTranslateFieldsHeader($baselangdesc, $tolangdesc, $type)
 
         $translateoutput = "";
         $translateoutput .= CHtml::openTag('table', array('class'=>'translate'));
-        $translateoutput .= CHtml::openTag('tr');
         if ($type=='question' || $type=='subquestion' || $type=='question_help' || $type=='answer')
         {
-            $translateoutput.='<colgroup valign="top" width="8%" />';
+            $translateoutput.='<colgroup width="8%" />';
         }
-        $translateoutput .= '<colgroup valign="top" width="37" />';
-        $translateoutput .= '<colgroup valign="top" width="55%" />';
+        $translateoutput .= '<colgroup width="37" />';
+        $translateoutput .= '<colgroup width="55%" />';
+        $translateoutput .= CHtml::openTag('tr');
         if ($type=='question' || $type=='subquestion' || $type=='question_help' || $type=='answer')
         {
             $translateoutput .= CHtml::tag('th', array(), CHtml::tag('b', array(), gT('Question code / ID')));
@@ -900,7 +898,7 @@ private function displayTranslateFields($iSurveyID, $gid, $qid, $type, $amTypeOp
                                 ),
                                 showJavaScript($textfrom)
                             );
-        $translateoutput .= CHtml::openTag('td', array('valign'=>'middle'));
+        $translateoutput .= CHtml::openTag('td');
         $translateoutput .= CHtml::hiddenField("{$type}_id1_{$i}", $value1);
         $translateoutput .= CHtml::hiddenField("{$type}_id2_{$i}", $value2);
         if (is_numeric($iScaleID)) $translateoutput .= CHtml::hiddenField("{$type}_scaleid_{$i}", $iScaleID);

diff --git a/scripts/admin/translation.js b/scripts/admin/translation.js
@@ -1,4 +1,4 @@
-// $Id: tokens.js 8633 2010-04-25 12:57:33Z c_schmitz
+
 var iRunningThreads=0;
 
 $(document).ready(function(){