Fixed #10122: added classes and overflow hidden to editor

LimeSurvey · Dec 15, 2015 · fa5b18c · fa5b18c
1 parent 8420459
commit fa5b18c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/application/views/admin/templates/templateeditorbar_view.php b/application/views/admin/templates/templateeditorbar_view.php
@@ -49,19 +49,20 @@ function copyprompt(text, defvalue, copydirectory, action)
 
 <div class='menubar' id="templateeditorbar">
     <div class='row container-fluid'>
-        <div class="col-md-7">
 
+        <!-- Left Menu -->
+        <div class="col-md-5">
+
+            <!-- Create -->
             <?php if(is_writable($tempdir) && is_writable($usertemplaterootdir)):?>
-                <!-- Create -->
                 <a class="btn btn-default" href="#" role="button" onclick="javascript: copyprompt('<?php eT("Create new template called:"); ?>', '<?php eT("NewTemplate"); ?>', 'default', 'copy')">
                     <span class="icon-add text-success"></span>
                     <?php eT("Create new"); ?>
                 </a>
             <?php endif;?>
 
+            <!-- Import -->
             <?php if(is_writable($tempdir) && is_writable($usertemplaterootdir)):?>
-
-                <!-- Import -->
                 <?php if(Permission::model()->hasGlobalPermission('templates','import') && function_exists("zip_open")):?>
                     <a class="btn btn-default" href="<?php echo $this->createUrl('admin/templates/sa/upload'); ?>" role="button">
                         <span class="icon-import text-success"></span>
@@ -147,9 +148,8 @@ function copyprompt(text, defvalue, copydirectory, action)
         </div>
 
 
-        <!-- Menu Right -->
-
-        <div class="col-md-5 text-right form-inline">
+        <!-- Right Menu -->
+        <div class="col-md-7 text-right form-inline">
             <div class="form-group">
                 <label for='templatedir'><?php eT("Template:"); ?></label>
                 <select class="listboxtemplates form-control" id='templatedir' name='templatedir' onchange="javascript: window.open('<?php echo $this->createUrl("admin/templates/sa/view/editfile/".$editfile."/screenname/".$screenname); ?>/templatename/'+escape(this.value), '_top')">
@@ -164,9 +164,6 @@ function copyprompt(text, defvalue, copydirectory, action)
                 </select>
             </div>
 
-
-
-
             <?php if(isset($fullpagebar['savebutton']['form'])):?>
                 <a class="btn btn-success" href="#" role="button" id="save-form-button" aria-data-form-id="<?php echo $fullpagebar['savebutton']['form']; ?>">
                     <span class="glyphicon glyphicon-ok" ></span>
@@ -184,7 +181,7 @@ function copyprompt(text, defvalue, copydirectory, action)
                 <a class="btn btn-default" href="<?php echo $this->createUrl("/admin"); ?>" role="button">
                     <span class="glyphicon glyphicon-backward" ></span>
                     &nbsp;&nbsp;
-                    <?php eT("return to admin pannel."); ?>
+                    <?php eT("return to admin pannel"); ?>
                 </a>
             <?php endif;?>
         </div>

diff --git a/application/views/admin/templates/templatesummary_view.php b/application/views/admin/templates/templatesummary_view.php
@@ -65,11 +65,11 @@
 
 
 
-    <div class="col-lg-2">
+    <div class="col-lg-2" style="overflow-x: hidden">
         <div>
             <?php eT("Other files:"); ?>
             <?php echo CHtml::form(array('admin/templates/sa/templatefiledelete'), 'post'); ?>
-            <select size='11' style='width:250px; overflow: hidden;' name='otherfile' id='otherfile'>
+            <select size='11' class="form-control" name='otherfile' id='otherfile'>
                 <?php echo makeoptions($otherfiles, "name", "name", ""); ?>
             </select><br>
             <?php
@@ -92,13 +92,14 @@
             { ?>
 
                 <?php echo CHtml::form(array('admin/templates/sa/uploadfile'), 'post', array('id'=>'importtemplatefile', 'name'=>'importtemplatefile', 'enctype'=>'multipart/form-data')); ?>
-                <?php eT("Upload a file:"); ?><br><input name='upload_file' id="upload_file" type="file" required="required"/><br />
+                <?php eT("Upload a file:"); ?>
+                <br>
+                <input name='upload_file' id="upload_file" type="file" required="required"/>
                 <input type='submit' value='<?php eT("Upload"); ?>' class='btn btn-default'
-                    <?php if (!is_template_editable($templatename))  { ?>
+                    <?php if (!is_template_editable($templatename)) : ?>
                         disabled='disabled'
-                        <?php } ?>
-
-                    />
+                    <?php endif; ?>
+                />
                 <input type='hidden' name='editfile' value='<?php echo $editfile; ?>' />
                 <input type='hidden' name='screenname' value='<?php echo HTMLEscape($screenname); ?>' />
                 <input type='hidden' name='templatename' value='<?php echo $templatename; ?>' />