Dev: Reordered and added borders to buttons in Menues view

LimeSurvey · Jul 14, 2021 · 6023778 · 6023778
1 parent ff35390
commit 6023778
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/application/models/Surveymenu.php b/application/models/Surveymenu.php
@@ -352,26 +352,25 @@ public function getButtons()
         $buttons = "<div style='white-space: nowrap'>";
         $raw_button_template = ""
             . "<button class='btn btn-default btn-sm %s %s' style='margin-right: 5px;' role='button' data-toggle='tooltip' title='%s' onclick='return false;'>" //extra class //title
-            . "<i class='fa fa-%s' ></i>" //icon class
+            . "<i class='fa fa-%s' ></i>"
             . "</button>";
 
         if (Permission::model()->hasGlobalPermission('settings', 'update')) {
             $editData = array(
                 'action_surveymenu_editModal',
-                'text-danger',
+                'green-border',
                 gT("Edit this survey menu"),
                 'pencil'
             );
             $deleteData = array(
                 'action_surveymenu_deleteModal',
-                'text-danger',
+                'red-border',
                 gT("Delete this survey menu"),
-                'trash text-danger'
+                'trash'
             );
 
-            $buttons .= vsprintf($raw_button_template, $deleteData);
-
             $buttons .= vsprintf($raw_button_template, $editData);
+            $buttons .= vsprintf($raw_button_template, $deleteData);
         }
 
         $buttons .= '</div>';

diff --git a/application/views/admin/super/fullpagebar_view.php b/application/views/admin/super/fullpagebar_view.php
@@ -50,7 +50,7 @@ class='btn btn-default'
                     <a class="btn btn-default"
                        id="createnewmenu"
                        style="margin-top: 10px; margin-bottom: 10px;">
-                        <i class="icon-add text-success"></i>&nbsp;<?php eT('New') ?>
+                        <i class="icon-add text-success"></i>&nbsp;<?php eT('New Menu') ?>
                     </a>
                 <?php endif; ?>
             <?php endif; ?>