[open-ils-commits] [GIT] Evergreen ILS branch master updated. ecdcfb21c141d05fede11cad7ddef11c7a75a18a

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  ecdcfb21c141d05fede11cad7ddef11c7a75a18a (commit)
      from  e3a67f1a81b8e7ffd3a856c2addd2c0a3a8486a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ecdcfb21c141d05fede11cad7ddef11c7a75a18a
Author: Garry Collum <gcollum at gmail.com>
Date:   Sun Jun 10 00:08:53 2018 -0400

    LP#1752891 Crowded text on Print Item Labels page fix.
    
    This patch replaces an h4 style used for labels for dropdown lists, removes a blue background, and changes the style of the title of the page. All to make this page look more consistent with other pages in Evergreen.  Also removes some unnecessary extra divs and makes the bootstrap columns for the top form more consistent.
    
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    
    Conflicts:
    	Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2

diff --git a/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2 b/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
index 86d0926..49f82dc 100644
--- a/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
@@ -10,40 +10,42 @@
   }
 </style>
 
-<h2>[% l('Print Item Labels') %]</h2>
+<div class="container-fluid" style="text-align:center">
+    <div class="alert alert-info alert-less-pad strong-text-2">
+        [% l('Print Item Labels') %]
+    </div>
+</div>
 
-<div class="row bg-info">
-    <div class="col-md-6">
-        <div class="row">
-            <div class="col-md-1">
-                <span class="h4">[% l('Template') %]</span>
-            </div>
-            <div class="col-md-5">
-                <eg-basic-combo-box list="template_name_list" selected="template_name"></eg-basic-combo-box>
-            </div>
-            <div class="col-md-1">
-                <button class="btn btn-default" ng-click="applyTemplate(template_name)">[% l('Apply') %]</button>
-            </div>
-            <div class="col-md-1">
-                <span class="h4">[% l('Printer') %]</span>
-            </div>
-            <div class="col-md-4">
-                <select class="form-control" ng-model="print.template_context">
-                  <option value="default">[% l('Default') %]</option>
-                  <option value="receipt">[% l('Receipt') %]</option>
-                  <option value="label">[% l('Label') %]</option>
-                  <option value="mail">[% l('Mail') %]</option>
-                  <option value="offline">[% l('Offline') %]</option>
-                </select>
-            </div>
+<div class="row">
+    <div class="col-md-3">
+       <div class="input-group">
+            <span class="input-group-addon">[% l('Template') %]</span>
+            <eg-basic-combo-box list="template_name_list" selected="template_name"></eg-basic-combo-box>
+       </div>
+    </div>
+    <div class="col-md-1">
+        <button class="btn btn-default" ng-click="applyTemplate(template_name)">[% l('Apply') %]</button>
+    </div>
+    <div class="col-md-2">
+       <div class="input-group">
+            <span class="input-group-addon">[% l('Printer') %]</span>
+            <select class="form-control" ng-model="print.template_context">
+                <option value="default">[% l('Default') %]</option>
+                <option value="receipt">[% l('Receipt') %]</option>
+                <option value="label">[% l('Label') %]</option>
+                <option value="mail">[% l('Mail') %]</option>
+                <option value="offline">[% l('Offline') %]</option>
+            </select>
         </div>
     </div>
+
     <div class="col-md-2">
         <div class="btn-group">
             <button class="btn btn-default" ng-click="saveTemplate(template_name)">[% l('Save') %]</button>
             <button class="btn btn-default" ng-click="deleteTemplate(template_name)">[% l('Delete') %]</button>
         </div>
     </div>
+
     <div class="col-md-3">
         <div class="btn-group">
             <span class="btn btn-default btn-file">
@@ -51,13 +53,14 @@
                 <input type="file" eg-file-reader container="imported_templates.data">
             </span>
             <label class="btn btn-default"
-                eg-json-exporter container="templates"
-                default-file-name="'[% l('exported_label_templates.json') %]'">
-                [% l('Export') %]
+               eg-json-exporter container="templates"
+               default-file-name="'[% l('exported_label_templates.json') %]'">
+               [% l('Export') %]
             </label>
             <label class="btn btn-default" ng-click="reset_to_default()">[% l('Default') %]</label>
-        </div>
+         </div>
     </div>
+
     <div class="col-md-1 pull-right">
         <button class="btn btn-default" ng-click="print_labels()">[% l('Print') %]</button>
     </div>

-----------------------------------------------------------------------

Summary of changes:
 .../src/templates/staff/cat/printlabels/t_view.tt2 |   61 ++++++++++---------
 1 files changed, 32 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
Evergreen ILS