Dev Theme editor now receives focus

Dev REmoved obsolete function
LimeSurvey · May 6, 2016 · 8040aa0 · 8040aa0
1 parent 3588b18
commit 8040aa0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/application/helpers/admin/template_helper.php b/application/helpers/admin/template_helper.php
@@ -38,14 +38,6 @@ function getListOfFiles($wh){
     return $arr;
 }
 
-function textarea_encode($html_code)
-{
-    $from = array('<', '>');
-    $to = array('&lt;', '&gt;');
-    $html_code = str_replace($from, $to, $html_code);
-    return $html_code;
-}
-
 /**
  * Load this editfile
  *

diff --git a/application/views/admin/templates/templatesummary_view.php b/application/views/admin/templates/templatesummary_view.php
@@ -53,13 +53,17 @@
                 <input type='hidden' name='editfileindex' value='<?php echo $_GET['editfile']; ?>' />
                 <?php endif;?>
             <?php echo CHtml::hiddenField('templatename', $templatename, array('class'=>'templatename'));
-            echo CHtml::hiddenField('screenname', $screenname, array('class'=>'screenname')); ?>
-            <input type='hidden' name='editfile' value='<?php echo $editindex; ?>' />
-            <input type='hidden' name='editfilename' value='<?php echo $editfile; ?>' />
-            <input type='hidden' name='action' value='templatesavechanges' />
-            <textarea name='changes' id='changes' rows='20' cols='40' data-filetype="<?php echo $sEditorFileType; ?>" class="ace <?php echo $sTemplateEditorMode; ?>" style='width:100%'><?php if (isset($editfile)) {
-                echo textarea_encode(filetext($templatename,$editfile,$templates));
-            } ?></textarea>
+            echo CHtml::hiddenField('screenname', $screenname, array('class'=>'screenname'));
+            echo CHtml::hiddenField('editfile', $editindex);
+            echo CHtml::hiddenField('editfilename', $editfile);
+            echo CHtml::hiddenField('action', 'templatesavechanges');
+            echo CHtml::textArea('changes', isset($editfile)?filetext($templatename,$editfile,$templates):'',array('rows'=>'20',
+                                                                                                                   'cols'=>'40',
+                                                                                                                   'data-filetype'=>$sEditorFileType,
+                                                                                                                   'class'=>'ace '.$sTemplateEditorMode,
+                                                                                                                    'style'=>'width:100%'
+                                                                                                                    ));
+                                                                                                                    ?>
             <p class='text-center'>
                 <br/>
                 <?php if (Permission::model()->hasGlobalPermission('templates','update')):?>

diff --git a/scripts/admin/templates.js b/scripts/admin/templates.js
@@ -50,7 +50,5 @@ function createToolbar(element, editor)
     {
         editor.commands.exec('replace', editor);
     });
-
-
-
+    editor.focus();
 }