LP#1642761 Hatch print config UI WIP

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

diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2
index f986bf3..8f4a34d 100644 (file)
--- a/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_print_config.tt2
@@ -16,6 +16,9 @@
   <div class="row"> 
     <div class="col-md-12">
       <h2>[% l('Printer Settings for Remote Printing') %]</h2>
+      <div class="alert alert-warning" ng-show="hatchNotConnected()">
+        [% l("Hatch is not connected") %]
+      </div>
     </div>
   </div>
 
@@ -71,10 +74,22 @@
                   value="{{printConfig[context].printer}}">
               </div><!-- /input-group -->
             </div><!-- col -->
+            <div class="col-md-4">
+              <span class="pad-right-min">
+                <button class="btn btn-warning" 
+                  ng-click="resetPrinterSettings(context)">
+                  [% l('Reset Form') %]
+                </button>
+              </span>
+              <button class="btn btn-success" 
+                ng-click="savePrinterSettings(context)">
+                [% l('Apply Changes') %]
+              </button>
+            </div>
           </div><!-- row -->
+
           <div class="row" ng-hide="isTestView"> 
             <div class="col-md-10">
-              <h3>[% l('Printer Options') %]</h3>
               <div class="row">
                 <div class="col-md-1"></div>
                 <div class="col-md-2">
@@ -257,18 +272,21 @@
                 </div>
                 <div class="col-md-2">
                   <div class="input-group">
-                    <span class="input-group-addon">[% l('Right') %]</span>
+                    <span class="input-group-addon">[% l('Top') %]</span>
                     <input type="text" class="form-control"
                       ng-disabled="printConfig[context].autoMargins"
-                      ng-model="printConfig[context].rightMargin"/>
+                      ng-model="printConfig[context].topMargin"/>
                   </div>
                 </div>
+              </div>
+              <div class="row">
+                <div class="col-md-3"></div>
                 <div class="col-md-2">
                   <div class="input-group">
-                    <span class="input-group-addon">[% l('Top') %]</span>
+                    <span class="input-group-addon">[% l('Right') %]</span>
                     <input type="text" class="form-control"
                       ng-disabled="printConfig[context].autoMargins"
-                      ng-model="printConfig[context].topMargin"/>
+                      ng-model="printConfig[context].rightMargin"/>
                   </div>
                 </div>
                 <div class="col-md-2">
@@ -296,6 +314,9 @@
                     ng-checked="!printConfig[context].allPages"
                     ng-click="printConfig[context].allPages=false"/>
                 </div>
+              </div>
+              <div class="row">
+                <div class="col-md-3"></div>
                 <div class="col-md-2">
                   <div class="input-group">
                     <span class="input-group-addon">[% l('Start') %]</span>
@@ -315,26 +336,7 @@
                 <!-- TODO: support multiple page ranges by 
                     dynamically adding additional pageRanges[X] pairs -->
               </div>
-
-              <div class="row">
-                <div class="col-md-1"></div>
-                <div class="col-md-2">
-                  <button class="btn btn-warning" 
-                    ng-click="resetPrinterSettings(context)">
-                    [% l('Reset Form') %]
-                  </button>
-                </div>
-                <div class="col-md-2">
-                  <button class="btn btn-success" 
-                    ng-click="savePrinterSettings(context)">
-                    [% l('Apply Changes') %]
-                  </button>
-                </div>
-              </div><!-- row -->
-
-
             </div><!-- col -->
-            <div class="col-md-1"></div>
           </div><!-- row -->
 
           <div class="row" ng-hide="isTestView">

diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index f276c1b..9855a3c 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -228,6 +228,10 @@ function($scope , egCore) {
     }
     $scope.setContext('default');
 
+    $scope.hatchNotConnected = function() {
+        return !egCore.hatch.hatchAvailable;
+    }
+
     $scope.getPrinterByAttr = function(attr, value) {
         var printer;
         angular.forEach($scope.printers, function(p) {