LP#1704873 Label print UI layout improvements

* Adds support for an optionl 'label' attribute to <eg-basic-combo-box/>
  elements.

* Label the Template selector combobox.

* For consistency with the Template combobox, treat the Printer selector
  as an input group with add-on.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

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 418d4e8..63ba9cc 100644 (file)
--- a/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
+++ b/Open-ILS/src/templates/staff/cat/printlabels/t_view.tt2
@@ -15,19 +15,15 @@
 <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 class="col-md-6">
+              <eg-basic-combo-box label="[% l('Template') %]"
+                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">
+              <div class="input-group">
                 <select class="form-control" ng-model="print.template_context">
                   <option value="default">[% l('Default') %]</option>
                   <option value="receipt">[% l('Receipt') %]</option>
@@ -35,6 +31,8 @@
                   <option value="mail">[% l('Mail') %]</option>
                   <option value="offline">[% l('Offline') %]</option>
                 </select>
+                <span class="input-group-addon">[% l('Printer') %]</span>
+              </div>
             </div>
         </div>
     </div>

diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js
index dfa1a1a..b2b4704 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -443,12 +443,16 @@ function($window , egStrings) {
             selected: "=",
             egDisabled: "=",
             allowAll: "@",
+            // optional primary drop-down button label
+            label : '@',
+
         },
         template:
             '<div class="input-group">'+
                 '<input type="text" ng-disabled="egDisabled" class="form-control" ng-model="selected" ng-change="makeOpen()">'+
                 '<div class="input-group-btn" dropdown ng-class="{open:isopen}">'+
-                    '<button type="button" ng-click="showAll()" class="btn btn-default dropdown-toggle"><span class="caret"></span></button>'+
+                    '<button type="button" ng-click="showAll()" class="btn btn-default dropdown-toggle">' +
+                        '{{label ? label + " " : ""}}<span class="caret"></span></button>'+
                     '<ul class="dropdown-menu dropdown-menu-right">'+
                         '<li ng-repeat="item in list|filter:selected"><a href ng-click="changeValue(item)">{{item}}</a></li>'+
                         '<li ng-if="complete_list" class="divider"><span></span></li>'+