From 49837dc3010755342a04c08527e4aa28d24e3832 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Tue, 11 Sep 2018 17:13:11 +0000
Subject: [PATCH] lp1511742 Additional Scaffolding Fixes
- Apply scaffolding fixes to Aquisition Patron Requests,
Circ Age to Lost, and Auto Print settings UIs, preventing
Org Selector from taking up entire width of screen.
Signed-off-by: Kyle Huckins <khuckins@catalyte.io>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
.../src/templates/staff/acq/requests/t_list.tt2 | 7 +++---
.../staff/admin/local/circ/age_to_lost.tt2 | 12 +++++-----
.../staff/admin/local/config/auto_print.tt2 | 28 +++++++++++-----------
3 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/Open-ILS/src/templates/staff/acq/requests/t_list.tt2 b/Open-ILS/src/templates/staff/acq/requests/t_list.tt2
index 5c279b4faa..af828d1c2c 100644
--- a/Open-ILS/src/templates/staff/acq/requests/t_list.tt2
+++ b/Open-ILS/src/templates/staff/acq/requests/t_list.tt2
@@ -8,9 +8,10 @@
<div class="form-group">
<div class="row">
<span ng-hide="context_user || context_lineitem">
- <label for="select-request-ou">[% l('Patron Home Library: ' ) %]</label>
- <eg-org-selector id="select-request-ou" selected="context_ou"></eg-org-selector>
- <span> </span>
+ <div class="col-md-3 input-group">
+ <span class="input-group-addon">[% l('Patron Home Library: ' ) %]</span>
+ <eg-org-selector id="select-request-ou" selected="context_ou"></eg-org-selector>
+ </div>
</span>
<span ng-show="context_user">[% l('User ID: [_1]','{{context_user}}') %]</span>
<span ng-show="context_lineitem">[% l('PO Line Item ID: [_1]','{{context_lineitem}}') %]</span>
diff --git a/Open-ILS/src/templates/staff/admin/local/circ/age_to_lost.tt2 b/Open-ILS/src/templates/staff/admin/local/circ/age_to_lost.tt2
index f3471a62d5..b9a51f24e4 100644
--- a/Open-ILS/src/templates/staff/admin/local/circ/age_to_lost.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/circ/age_to_lost.tt2
@@ -26,9 +26,9 @@ you wish to age to a Lost status. Note the descendants of these values
<div id='age-to-lost-container'>
<div xclass="form-inline">
- <div class="form-group">
+ <div class="form-group row">
<label class="col-md-2">[% l('User Profile') %]</label>
- <div class="btn-group" uib-dropdown>
+ <div class="btn-group col-md-2" uib-dropdown>
<button type="button" class="btn btn-default" uib-dropdown-toggle>
<span style="padding-right: 5px;">{{selected_profile.name()}}</span>
<span class="caret"></span>
@@ -42,13 +42,13 @@ you wish to age to a Lost status. Note the descendants of these values
</ul>
</div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="col-md-2">[% l('Circulation Library') %]</label>
- <eg-org-selector selected="context_org"></eg-org-selector>
+ <div class="col-md-2"><eg-org-selector selected="context_org"></eg-org-selector></div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="col-md-2">[% l('Are you sure?') %]</label>
- <input type="checkbox" ng-model="i_am_sure"/>
+ <div class="col-md-2"><input type="checkbox" ng-model="i_am_sure"/></div>
</div>
</div>
<div class="form-group">
diff --git a/Open-ILS/src/templates/staff/admin/local/config/auto_print.tt2 b/Open-ILS/src/templates/staff/admin/local/config/auto_print.tt2
index a6b4725003..73b720993c 100644
--- a/Open-ILS/src/templates/staff/admin/local/config/auto_print.tt2
+++ b/Open-ILS/src/templates/staff/admin/local/config/auto_print.tt2
@@ -45,34 +45,34 @@ dialog (the ones that offer Print and Do Not Print as options).[% END %]
<div class="row"></div><!-- add some padding -->
<div>
- <div class="form-group">
+ <div class="form-group row">
<label class="col-md-2">[% l('Checkout Receipt') %]</label>
- <input type="checkbox" ng-model="co_recpt"/>
+ <div class="col-md-2"><input type="checkbox" ng-model="co_recpt"/></div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="col-md-2">[% l('Bill Pay Receipt') %]</label>
- <input type="checkbox" ng-model="bill_recpt"/>
+ <div class="col-md-2"><input type="checkbox" ng-model="bill_recpt"/></div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="col-md-2">[% l('Hold Slip') %]</label>
- <input type="checkbox" ng-model="hold_slip"/>
+ <div class="col-md-2"><input type="checkbox" ng-model="hold_slip"/></div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="col-md-2">[% l('Transit Slip') %]</label>
- <input type="checkbox" ng-model="transit_slip"/>
+ <div class="col-md-2"><input type="checkbox" ng-model="transit_slip"/></div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="col-md-2">[% l('Hold/Transit Slip') %]</label>
- <input type="checkbox" ng-model="hold_transit_slip"/>
+ <div class="col-md-2"><input type="checkbox" ng-model="hold_transit_slip"/></div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<label class="col-md-2">[% l('For This Library and Descendants') %]</label>
- <eg-org-selector selected="context_org"
- onchange="show_org_values" disable-test="cant_use_org"></eg-org-selector>
+ <div class="col-md-2"><eg-org-selector selected="context_org"
+ onchange="show_org_values" disable-test="cant_use_org"></eg-org-selector></div>
</div>
</div>
</div>
- <div class="form-group">
+ <div class="form-group row">
<button class="btn btn-default"
ng-class="{disabled : in_flight}"
ng-click="update_auto_print()">
--
2.11.0