Fixed issue #10409: missing inline html-editor when editing mail temp…

…lates (fix reset button position)
LimeSurvey · Feb 12, 2016 · 0c44f20 · 0c44f20
1 parent 47c8fa7
commit 0c44f20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/application/helpers/admin/htmleditor_helper.php b/application/helpers/admin/htmleditor_helper.php
@@ -149,8 +149,6 @@ function getEditor($fieldtype,$fieldname,$fieldtext, $surveyID=null,$gID=null,$q
         }
         if ( $surveyID && getEmailFormat($surveyID) != 'html' && substr($fieldtype,0,6)==="email-" )// email but survey as text email
         {
-            //echo '<pre>'; var_dump(getEmailFormat($surveyID)); echo '</pre>';
-            //echo '<pre>'; var_dump('here'); echo '</pre>';die;
             return '';
         }
 

diff --git a/application/views/admin/emailtemplates/email_language_template_tab.php b/application/views/admin/emailtemplates/email_language_template_tab.php
@@ -11,7 +11,7 @@
         <div class='col-sm-4'>
             <?php echo CHtml::textField("email_{$tab}_subj_{$grouplang}",$esrow->$details['field']['subject'],array('class' => 'form-control', 'size'=>80)); ?>
         </div>
-        <div class='col-sm-1 text-right'>
+        <div class='col-sm-1'>
             <?php echo CHtml::button(gT("Reset"),array('class'=>'fillin btn btn-default','data-target'=>"email_{$tab}_subj_{$grouplang}",'data-value'=>$details['default']['subject'])); ?>
         </div>
     </div>
@@ -22,13 +22,17 @@
             <?php echo CHtml::textArea("email_{$tab}_{$grouplang}",$esrow->$details['field']['body'],array('cols'=>80,'rows'=>20, 'class'=>'form-control')); ?>
             <?php echo getEditor("email-$tab","email_{$tab}_$grouplang", $details['body'].'('.$grouplang.')',$surveyid,'','','editemailtemplates'); ?>
         </div>
-        <div class='col-sm-1  text-right'>
+        <div class='col-sm-6'></div>
+    </div>
+    <div class='form-group'>
+        <div class='col-sm-2'></div>
+        <div class='col-sm-1'>
             <?php
                 $details['default']['body']=($tab=='admin_detailed_notification') ? $details['default']['body'] : conditionalNewlineToBreak($details['default']['body'],$ishtml) ;
                 echo CHtml::button(gT("Reset"),array('class'=>'fillin btn btn-default','data-target'=>"email_{$tab}_{$grouplang}",'data-value'=>$details['default']['body']));
             ?>
         </div>
-        <div class='col-sm-4'></div>
+        <div class='col-sm-9'></div>
     </div>
 
     <div class='form-group'>