From d659dd120c8af51e8d736c3bcf3647f7d391e40b Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 16 May 2014 11:41:06 -0400 Subject: [PATCH] item status UI continued Signed-off-by: Bill Erickson --- .../src/templates/staff/cat/item/t_circs_pane.tt2 | 44 +++++------ .../src/templates/staff/cat/item/t_holds_pane.tt2 | 28 +++---- .../templates/staff/cat/item/t_summary_pane.tt2 | 90 +++++++++++++--------- Open-ILS/src/templates/staff/css/style.css.tt2 | 16 ++-- 4 files changed, 93 insertions(+), 85 deletions(-) diff --git a/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2 index 17b8f79620..1ba584c48e 100644 --- a/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2 +++ b/Open-ILS/src/templates/staff/cat/item/t_circs_pane.tt2 @@ -12,7 +12,7 @@
[% l('Patron') %]
-
+
[% l('[_1], [_2] [_3] : [_4]', @@ -26,66 +26,66 @@
[% l('Total Circs') %]
-
+
{{prev_circ_summary.num_circs()}}
[% l('Checkout Date') %]
-
+
{{prev_circ_summary.start_time() | date:'short'}}
[% l('Checkout Workstation') %]
-
+
{{prev_circ_summary.checkout_workstation()}}
[% l('Last Renewed On') %]
-
+
{{prev_circ_summary.last_renewal_time() | date:'short'}}
[% l('Renewal Workstation') %]
-
+
{{prev_circ_summary.last_renewal_workstation()}}
[% l('Stop Fines Reason') %]
-
+
{{prev_circ_summary.last_stop_fines()}}
[% l('Stop Fines Time') %]
-
+
{{prev_circ_summary.last_stop_fines_time() | date:'short'}}
[% l('Checkin Time') %]
-
+
{{prev_circ_summary.last_checkin_time() | date:'short'}}
[% l('Checkin Scan Time') %]
-
+
{{prev_circ_summary.last_checkin_scan_time() | date:'short'}}
[% l('Checkin Workstation') %]
-
+
{{prev_circ_summary.last_checkin_workstation()}}
@@ -104,7 +104,7 @@
[% l('Patron') %]
-
+
[% l('[_1], [_2] [_3] : [_4]', @@ -118,70 +118,70 @@
[% l('Total Circs') %]
-
+
{{circ_summary.num_circs()}}
[% l('Checkout Date') %]
-
+
{{circ.xact_start() | date:'short'}}
[% l('Checkout Workstation') %]
-
+
{{circ.workstation().name()}}
[% l('Last Renewed On') %]
-
+
{{circ_summary.last_renewal_time() | date:'short'}}
[% l('Renewal Workstation') %]
-
+
{{circ_summary.last_renewal_workstation()}}
[% l('Stop Fines Reason') %]
-
+
{{circ.stop_fines()}}
[% l('Stop Fines Time') %]
-
+
{{circ.stop_fines_time() | date:'short'}}
[% l('Checkin Time') %]
-
+
{{circ.checkin_time() | date:'short'}}
[% l('Checkin Scan Time') %]
-
+
{{circ.checkin_scan_time() | date:'short'}}
[% l('Checkin Workstation') %]
-
+
{{circ.checkin_workstation.name()}}
diff --git a/Open-ILS/src/templates/staff/cat/item/t_holds_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_holds_pane.tt2 index a5f7e507b6..2da962bd45 100644 --- a/Open-ILS/src/templates/staff/cat/item/t_holds_pane.tt2 +++ b/Open-ILS/src/templates/staff/cat/item/t_holds_pane.tt2 @@ -11,7 +11,7 @@
[% l('Patron') %]
-
+
[% l('[_1], [_2] [_3] : [_4]', @@ -24,7 +24,7 @@
[% l('Requestor') %]
-
+
[% l('[_1], [_2] [_3] : [_4]', @@ -37,49 +37,49 @@
[% l('Pickup Lib') %]
-
+
{{hold.pickup_lib().shortname()}}
[% l('Current Shelf Lib') %]
-
+
{{hold.current_shelf_lib().shortname()}}
[% l('Request Date') %]
-
+
{{hold.request_time() | date:'short'}}
[% l('Capture Date') %]
-
+
{{hold.capture_time() | date:'short'}}
[% l('Shelf Time') %]
-
+
{{hold.shelf_time() | date:'short'}}
[% l('Shelf Expire Time') %]
-
+
{{hold.shelf_expire_time() | date:'short'}}
[% l('Hold Expire Time') %]
-
+
{{hold.expire_time() | date:'short'}}
[% l('Behind Desk') %]
-
+
{{hold.behind_desk()}}
@@ -99,25 +99,25 @@
[% l('Transit Source') %]
-
+
{{transit.source().shortname()}}
[% l('Transit Destination') %]
-
+
{{transit.dest().shortname()}}
[% l('Transit Send Time') %]
-
+
{{transit.source_send_time() | date:'short'}}
[% l('Transit Receive Time') %]
-
+
{{transit.source_recv_time() | date:'short'}}
diff --git a/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2 b/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2 index 21b2522c0b..69181249ee 100644 --- a/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2 +++ b/Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2 @@ -1,125 +1,132 @@ + +
[% l('Barcode') %]
-
{{copy.barcode()}}
+
{{copy.barcode()}}
[% l('Circ Library') %]
-
{{copy.circ_lib().shortname()}}
+
{{copy.circ_lib().shortname()}}
[% l('Call # Prefix') %]
-
+
{{copy.call_number().prefix().label()}}
[% l('Status') %]
-
{{copy.status().name()}}
+
{{copy.status().name()}}
[% l('Price') %]
-
{{copy.price()}}
+
{{copy.price()}}
[% l('Owning Library') %]
-
{{copy.circ_lib().shortname()}}
+
{{copy.circ_lib().shortname()}}
[% l('Call #') %]
-
{{copy.call_number().label()}}
+
{{copy.call_number().label()}}
[% l('Due Date') %]
-
{{circ.due_date() | date:'short'}}
+
{{circ.due_date() | date:'short'}}
[% l('ISBN') %]
-
+
{{copy.call_number().record().simple_record().isbn()}}
[% l('Copy Location') %]
-
{{copy.location().name()}}
+
{{copy.location().name()}}
[% l('Call # Suffix') %]
-
+
{{copy.call_number().suffix().label()}}
[% l('Checkout Date') %]
-
{{circ.xact_start() | date:'short'}}
+
{{circ.xact_start() | date:'short'}}
[% l('Date Created') %]
-
{{copy.create_date() | date:'short'}}
+
{{copy.create_date() | date:'short'}}
[% l('Loan Duration') %]
-
{{circ.duration()}}
+
{{circ.duration()}}
[% l('Renewal Type') %]
-
+
[% l('OPAC') %]
[% l('Desk') %]
[% l('Phone') %]
[% l('Checkout Workstation') %]
-
{{circ.workstation().name()}}
+
{{circ.workstation().name()}}
[% l('Date Active') %]
-
{{copy.active_date() | date:'short'}}
+
{{copy.active_date() | date:'short'}}
[% l('Fine Level') %]
-
{{circ.duration_rule().name()}}
+
{{circ.duration_rule().name()}}
[% l('Total Circs') %]
-
{{total_circs}}
+
{{total_circs}}
[% l('Duration Rule') %]
-
{{circ.duration_rule().name()}}
+
{{circ.duration_rule().name()}}
[% l('Status Changed') %]
-
{{copy.status_changed_time() | date:'short'}}
+
{{copy.status_changed_time() | date:'short'}}
[% l('Reference') %]
-
{{copy.ref()}}
+
{{copy.ref()}}
[% l('Total Circs - Current Year') %]
-
{{total_circs_this_year}}
+
{{total_circs_this_year}}
[% l('Recurring Fine Rule') %]
-
{{circ.recurring_fine_rule().name()}}
+
{{circ.recurring_fine_rule().name()}}
[% l('Copy ID') %]
-
{{copy.id()}}
+
{{copy.id()}}
[% l('OPAC Visible') %]
-
{{copy.opac_visible()}}
+
{{copy.opac_visible()}}
[% l('Total Circs - Prev Year') %]
-
{{total_circs_prev_year}}
+
{{total_circs_prev_year}}
[% l('Max Fine Rule') %]
-
{{circ.max_fine_rule().name()}}
+
{{circ.max_fine_rule().name()}}
[% l('TCN') %]
-
{{copy.call_number().record().tcn_value()}}
+
{{copy.call_number().record().tcn_value()}}
[% l('Holdable') %]
-
{{copy.opac_visible()}}
+
{{copy.opac_visible()}}
[% l('Renewal Workstation') %]
-
{{circ_summary.last_renewal_workstation()}}
+
{{circ_summary.last_renewal_workstation()}}
[% l('Checkin Time') %]
-
+
{{circ.checkin_time() || circ_summary.last_checkin_time() | date:'short'}}
@@ -127,16 +134,16 @@
[% l('Floating') %]
-
{{copy.floating()}}
+
{{copy.floating()}}
[% l('Circulate') %]
-
{{copy.circulate()}}
+
{{copy.circulate()}}
[% l('Remaining Renewals') %]
-
{{circ.renewal_remaining()}}
+
{{circ.renewal_remaining()}}
[% l('Checkin Scan Time') %]
-
+
{{circ.checkin_scan_time() || circ_summary.last_checkin_scan_time() | date:'short'}}
@@ -148,17 +155,24 @@
[% l('Circ Modifier') %]
-
{{copy.circ_modifier().name()}}
+
{{copy.circ_modifier().name()}}
[% l('Checkin Workstation') %]
-
+
{{circ.checkin_workstation().name() || circ_summary.last_checkin_workstation().name()}}
+
+
[% l('Alert Message') %]
+
+ {{copy.alert_message()}} +
+
+
diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index 0c7c730fd7..787c249c83 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -319,19 +319,13 @@ table.list tr.selected td { } .flex-cell { flex: 1; - padding: 5px; + padding: 4px; /* bootstrap default is much bigger */ } - -/* present cells in small rounded wells */ -.flex-cell-well { - border-radius: 4px; - border: 1px solid #ddd; - background-color: #f5f5f5; - /* wells looks better with a little space between them */ - margin-bottom: 4px; +.flex-cell.well { + min-height: 2.5em; /* don't let empty wells scrunch down */ + margin-bottom: 5px; /* bootstrap default is 20px */ } - -.flex-2 { +.flex-2 { /* meh, convience */ flex: 2; } -- 2.11.0