From bcc887e2eb91ed259573a37fddd55c8d492eec46 Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Fri, 9 Oct 2015 11:47:52 -0400
Subject: [PATCH] webstaff: Move the "Help" and "Stack Subfields" UI elements
 around a bit, to save space

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../templates/staff/cat/share/t_marcedit.tt2  | 62 +++++++++++--------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2 b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
index 25862c571c..67a36cb267 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
@@ -12,13 +12,19 @@
   </div>
 
   <div class="pad-vert row marctypesource">
-    <div class="col-md-2" ng-show="!flatOnly">
+    <div class="col-md-2 form-group" ng-show="!flatOnly">
       <label>
         <input type="checkbox" ng-model="flatEditor" ng-change="refreshVisual()"/>
         [% l('Flat Text Editor') %]
       </label>
     </div>
-    <div class="col-md-3">
+    <div class="col-md-2 form-group" ng-show="!flatOnly">
+      <label>
+        <input type="checkbox" ng-model="stackSubfields.enabled" />
+        [% l('Stack subfields') %]
+      </label>
+    </div>
+    <div class="col-md-2">
       <div class="input-group">
         <span class="input-group-addon"><b>[% l('Record Type') %]</b></span>
         <span class="input-group-addon">{{calculated_record_type}}</span>
@@ -39,6 +45,9 @@
           <button ng-hide="brandNewRecord || embedded || Record().deleted()" class="btn btn-default" ng-click="deleteRecord()">[% l('Delete') %]</button>
           <button ng-if="!brandNewRecord && Record().deleted()" class="btn btn-default" ng-click="undeleteRecord()">[% l('Undelete') %]</button>
         </span>
+        <span class="btn-group">
+          <button class="btn btn-default" ng-click="showHelp = !showHelp">[% l('Help') %]</button>
+        </span>
       </div>
     </div>
   </div>
@@ -141,30 +150,33 @@
       </div>
     </div>
     <div class="marcrecord pad-vert">
-      <div class="form-group">
-        <label>
-          <input type="checkbox" ng-model="stackSubfields.enabled" />
-          [% l('Stack subfields') %]
-        </label>
-        <button class="btn btn-default btn-sm" ng-click="showHelp = !showHelp">[% l('Help') %]</button>
-        <!-- TODO: when we update to angular-ui >= 0.13.0 and get popover-template, switching to
-                   that rather than using ui.bootstrap.collapse might be good -->
-      </div>
       <div collapse="!showHelp">
-        <ul>
-           <li>[% l('Undo: CTRL-z') %]</li>
-           <li>[% l('Redo: CTRL-y') %]</li>
-           <li>[% l('Add Row: CTRL+Enter') %]</li>
-           <li>[% l('Insert Row: CTRL+Shift+Enter') %]</li>
-           <li>[% l('Copy Current Row Above: CTRL+Up') %]</li>
-           <li>[% l('Copy Current Row Below: CTRL+Down') %]</li>
-           <li>[% l('Add Subfield: CTRL+D or CTRL+I') %]</li>
-           <li>[% l('Remove Row: CTRL+Del') %]</li>
-           <li>[% l('Remove Subfield: Shift+Del') %]</li>
-           <li>[% l('Create/Replace 006: Shift+F6') %]</li>
-           <li>[% l('Create/Replace 007: Shift+F7') %]</li>
-           <li>[% l('Create/Replace 008: Shift+F8') %]</li>
-        </ul>
+        <div class="row">
+          <div class="col-md-4">
+            <ul>
+               <li>[% l('Undo: CTRL-z') %]</li>
+               <li>[% l('Redo: CTRL-y') %]</li>
+               <li>[% l('Add Row: CTRL+Enter') %]</li>
+               <li>[% l('Insert Row: CTRL+Shift+Enter') %]</li>
+            </ul>
+          </div>
+          <div class="col-md-4">
+            <ul>
+               <li>[% l('Copy Current Row Above: CTRL+Up') %]</li>
+               <li>[% l('Copy Current Row Below: CTRL+Down') %]</li>
+               <li>[% l('Add Subfield: CTRL+D or CTRL+I') %]</li>
+               <li>[% l('Remove Row: CTRL+Del') %]</li>
+            </ul>
+          </div>
+          <div class="col-md-4">
+            <ul>
+               <li>[% l('Remove Subfield: Shift+Del') %]</li>
+               <li>[% l('Create/Replace 006: Shift+F6') %]</li>
+               <li>[% l('Create/Replace 007: Shift+F7') %]</li>
+               <li>[% l('Create/Replace 008: Shift+F8') %]</li>
+            </ul>
+          </div>
+        </div>
       </div>
       <div>
         <eg-marc-edit-leader record="record" on-keydown="onKeydown"/>
-- 
2.43.2