From c102d8f23eb4442083fcf9de88695641678b8587 Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 5 Jul 2017 14:33:48 -0400
Subject: [PATCH] serials: Use more bootstrap for better layout control

Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
 Open-ILS/src/templates/staff/serials/t_manage.tt2  |   5 +-
 .../staff/serials/t_prediction_manager.tt2         |   8 +-
 .../src/templates/staff/serials/t_sub_selector.tt2 |   4 +-
 .../staff/serials/t_subscription_manager.tt2       | 107 ++++++++++++---------
 4 files changed, 73 insertions(+), 51 deletions(-)

diff --git a/Open-ILS/src/templates/staff/serials/t_manage.tt2 b/Open-ILS/src/templates/staff/serials/t_manage.tt2
index 6751f02898..c919d29321 100644
--- a/Open-ILS/src/templates/staff/serials/t_manage.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_manage.tt2
@@ -8,8 +8,9 @@
       <!-- note that non-numeric index values must be enclosed in single-quotes,
            otherwise selecting the active table won't work cleanly -->
       <uib-tab index="'manage-subscriptions'" heading="[% l('Manage Subscriptions') %]">
-        <eg-subscription-manager ng-if="active_tab == 'manage-subscriptions'" bib-id="bib_id">
-        </eg-subscription-manager>
+        <div class="container-fluid">
+        <eg-subscription-manager ng-if="active_tab == 'manage-subscriptions'" bib-id="bib_id"></eg-subscription-manager>
+        </div>
       </uib-tab>
       <uib-tab index="'prediction'" heading="[% l('Manage Predictions') %]">
         <eg-prediction-manager ng-if="active_tab == 'prediction'"
diff --git a/Open-ILS/src/templates/staff/serials/t_prediction_manager.tt2 b/Open-ILS/src/templates/staff/serials/t_prediction_manager.tt2
index 24c9c416b3..1bc9bb9042 100644
--- a/Open-ILS/src/templates/staff/serials/t_prediction_manager.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_prediction_manager.tt2
@@ -3,11 +3,11 @@
 </div>
 
 <div>
-  <div class="pad-vert">
+  <div class="form-inline pad-vert">
     <button class="btn btn-warning" ng-click="startNewScap()">[% l('Add New') %]</button>
     <button class="btn btn-warning" ng-click="importScapFromBibRecord()" ng-disabled="!has_pattern_to_import">[% l('Import from Bibliographic and/or MFHD Records') %]</button>
     <button class="btn btn-warning" ng-click="importScapFromSpt()">[% l('Create from Template') %]</button>
-    <select ng-model="active_pattern_template.id" ng-options="spt.id as spt.name for spt in pattern_templates | orderBy:'name'"> 
+    <select class="form-control" ng-model="active_pattern_template.id" ng-options="spt.id as spt.name for spt in pattern_templates | orderBy:'name'"> 
     </select>
   </div>
   <div class="row" ng-if="new_prediction">
@@ -24,7 +24,7 @@
       </div>
       <div class="col-md-3">
           <label>[% l('Type') %]</label>
-          <select ng-model="new_prediction.type">
+          <select class="form-control" ng-model="new_prediction.type">
               <option value="basic">[% l('Basic') %]</option>
               <option value="supplement">[% l('Supplement') %]</option>
               <option value="index">[% l('Index') %]</option>
@@ -55,7 +55,7 @@
     </div>
     <div class="col-md-3">
         <label>[% l('Type') %]</label>
-        <select ng-model="pred.type">
+        <select class="form-control" ng-model="pred.type">
             <option value="basic">[% l('Basic') %]</option>
             <option value="supplement">[% l('Supplement') %]</option>
             <option value="index">[% l('Index') %]</option>
diff --git a/Open-ILS/src/templates/staff/serials/t_sub_selector.tt2 b/Open-ILS/src/templates/staff/serials/t_sub_selector.tt2
index 99f3e0d7ee..08608b4c66 100644
--- a/Open-ILS/src/templates/staff/serials/t_sub_selector.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_sub_selector.tt2
@@ -1,5 +1,6 @@
+<div class="form-inline">
 <label for="choose-subscription">[% l('Select subscription to work on') %]</label>
-<select id="choose-subscription" ng-model="ssubId">
+<select class="form-control" id="choose-subscription" ng-model="ssubId">
   <option ng-repeat="ssub in subscriptions | orderBy: 'id' as filtered track by ssub.id"
           value="{{ssub.id}}">
     [% l('Subscription [_1] at [_2] ([_3] - [_4])',
@@ -8,3 +9,4 @@
         '{{ssub.end_date | date:"shortDate"}}') %]
   </option>
 </select>
+</div>
diff --git a/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2 b/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2
index 5368c81751..b4ea33831a 100644
--- a/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2
+++ b/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2
@@ -1,63 +1,82 @@
 <form name="ssubform">
-  <div ng-repeat="ssub in subscriptions">
+  <div class="form-inline" ng-repeat="ssub in subscriptions">
     <div class="row form-inline">
-      <div class="form-group">
+      <div class="form-group col-sm-2">
         <label>[% l('Owning Library') %]</label>
         <eg-org-selector selected="ssub.owning_lib"></eg-org-selector>
       </div>
-      <div class="form-group">
-        <label>[% l('Start Date') %]</label>
-      </div>
-      <div class="form-group">
-        <eg-date-input ng-model="ssub.start_date"></eg-date-input>
-      </div>
-      <div class="form-group">
-        <label>[% l('End Date') %]</label>
+      <div class="form-group col-sm-3">
+        <div class="row">
+          <div class="form-group col-lg-6">
+            <label class="pull-right">[% l('Start Date') %]</label>
+          </div>
+          <div class="form-group col-lg-6">
+            <div class="pull-left"><eg-date-input ng-model="ssub.start_date"></eg-date-input></div>
+          </div>
+        </div>
       </div>
-      <div class="form-group">
-        <eg-date-input ng-model="ssub.end_date"></eg-date-input>
+      <div class="form-group col-sm-3">
+        <div class="row">
+          <div class="form-group col-lg-6">
+            <label class="pull-right">[% l('End Date') %]</label>
+          </div>
+          <div class="form-group col-lg-6">
+            <div class="pull-left"><eg-date-input ng-model="ssub.end_date"></eg-date-input></div>
+          </div>
+        </div>
       </div>
-      <div class="form-group">
+      <div class="form-group col-sm-3">
         <label>[% l('Expected Offset') %]
           <eg-help-popover help-text="[% l('The difference between the nominal publishing date of an issue and the date that you expect to receive your copy.') %]">
         </label>
-        <input type="text" ng-model="ssub.expected_date_offset"></input>
+        <input class="form-control" type="text" ng-model="ssub.expected_date_offset"></input>
       </div>
-      <button class="btn btn-sm btn-warning" ng-click="add_distribution(ssub)">[% l('Add distribution') %]</button>
-    </div>
-    <div class="row form-inline" ng-repeat="sdist in ssub.distributions">
-      <div class="col-md-1"></div>
-      <div class="col-md-5 form-group">
-        <label>[% l('Library') %]</label>
-        <eg-org-selector selected="sdist.holding_lib"></eg-org-selector>
-        <label>[% l('Label') %]</label>
-        <input type="text" required ng-model="sdist.label"></input>
-        <label>[% l('OPAC Display') %]
-          <eg-help-popover help-text="[% l('Whether the public catalog display of issues should be grouped by chronology (e.g., years) or enumeration (e.g., volume and number).') %]">
-        </label>
-        <select required ng-model="sdist.display_grouping">
-          <option value="chron">[% l('Chronological') %]</option>
-          <option value="enum" >[% l('Enumeration') %]</option>
-        </select>
-        <label>[% l('Receiving Template') %]</label>
-        <select ng-model="sdist.receive_unit_template"
-            ng-options="t.id as t.name for t in receiving_templates[sdist.holding_lib.id()]">
-            <option value=""></option>
-        </select>
+      <div class="form-group col-sm-1">
+        <button class="btn btn-sm btn-warning" ng-click="add_distribution(ssub)">[% l('Add distribution') %]</button>
       </div>
-      <div class="col-md-2">
-        <button class="btn btn-sm btn-info" ng-click="add_stream(sdist)">[% l('Add copy stream') %]</button>
+    </div>
+    <div class="row pad-vert" ng-repeat="sdist in ssub.distributions">
+      <div class="row">
+        <div class="col-sm-1"></div>
+        <div class="col-sm-2">
+          <label>[% l('Distribution Library') %]</label>
+          <eg-org-selector selected="sdist.holding_lib"></eg-org-selector>
+        </div>
+        <div class="col-sm-3">
+          <label>[% l('Label') %]</label>
+          <input class="form-control" type="text" required ng-model="sdist.label"></input>
+        </div>
+        <div class="col-sm-2">
+          <label>[% l('OPAC Display') %]
+            <eg-help-popover help-text="[% l('Whether the public catalog display of issues should be grouped by chronology (e.g., years) or enumeration (e.g., volume and number).') %]">
+          </label>
+          <select class="form-control" required ng-model="sdist.display_grouping">
+            <option value="chron">[% l('Chronological') %]</option>
+            <option value="enum" >[% l('Enumeration') %]</option>
+          </select>
+        </div>
+        <div class="col-sm-3">
+          <label>[% l('Receiving Template') %]</label>
+          <select class="form-control" ng-model="sdist.receive_unit_template"
+              ng-options="t.id as t.name for t in receiving_templates[sdist.holding_lib.id()]">
+              <option value=""></option>
+          </select>
+        </div>
+        <div class="col-sm-1" style="padding-left:0"><!-- Yes, it's terrible. But, nested grid alignment... -->
+          <button class="btn btn-sm btn-info" ng-click="add_stream(sdist)">[% l('Add copy stream') %]</button>
+        </div>
       </div>
-      <div class="col-md-3">
-        <div class="row" ng-repeat="sstr in sdist.streams">
-            <div class="form-inline">
-              <label>[% l('Send to') %]</label>
-              <input type="text" ng-model="sstr.routing_label"></input>
-            </div>
+      <div class="row pad-vert">
+        <div class="row form-inline" ng-repeat="sstr in sdist.streams">
+          <div class="col-sm-2"></div>
+          <div class="col-sm-8">
+            <label>[% l('Send to') %]</label>
+            <input class="form-control" type="text" ng-model="sstr.routing_label"></input>
+          </div>
         </div>
       </div>
     </div>
-    <div class="row pad-vert"></div>
+    <div class="row form-inline pad-vert"></div>
   </div>
   <div class="row">
     <button class="btn btn-warning pull-left" ng-click="add_subscription()">[% l('New Subscription') %]</button>
-- 
2.11.0