From e8bd904d8ba765409545f4ee38aa0bffc8653754 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Tue, 15 Dec 2015 14:38:07 -0500
Subject: [PATCH] Miscellaneous OPAC UI tweaks for spacing / layout.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

Conflicts:
	Open-ILS/src/templates/opac/parts/org_selector.tt2
	Open-ILS/src/templates/opac/parts/record/copy_table.tt2
	Open-ILS/src/templates/opac/parts/searchbar.tt2
---
 Open-ILS/src/templates/opac/css/style.css.tt2      | 45 ++++++++++++++++++----
 Open-ILS/src/templates/opac/parts/org_selector.tt2 |  2 +-
 .../src/templates/opac/parts/record/copy_table.tt2 | 24 +++++++-----
 .../src/templates/opac/parts/record/navigation.tt2 |  2 +-
 Open-ILS/src/templates/opac/parts/result/table.tt2 |  3 +-
 Open-ILS/src/templates/opac/parts/searchbar.tt2    | 16 ++++----
 6 files changed, 62 insertions(+), 30 deletions(-)

diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index f5992cc130..ee8edae9fe 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -290,6 +290,17 @@ for now until a better color is picked - if needed.
 	background-color:#ddd;
 }
 
+#search_box {
+    width:90%;
+	max-width:600px;
+	height:20px;
+	padding:3px;
+}
+
+.org_selector_dropdown {
+    padding:3px;
+}
+
 #adv_search_tabs, #acct_tabs, #acct_fines_tabs, #acct_checked_tabs, #acct_holds_tabs, #acct_prefs_tabs, #results_header_inner{
     margin-left: 2px;
     overflow: auto;
@@ -400,10 +411,9 @@ for now until a better color is picked - if needed.
     border-bottom: 1px dotted [% css_colors.accent_medium %];
 	border-top: 1px dotted [% css_colors.accent_medium %];
 	background-color:#eee;
-	margin-left:-20px;
-	margin-right:-20px;
 	font-weight: bold;
 	text-decoration: none;
+	overflow: hidden;
 }
 
 .rdetail_results a, .rdetail_result_nav a {
@@ -749,12 +759,12 @@ collapse correctly when the window width decreases */
 }
 
 .results_header_nav1 {
-    padding: 10px 7px 10px 7px;
+    padding: 10px 0px 10px 0px;
 	text-align:center;
     border-bottom: 2px dotted [% css_colors.accent_light %];
 	background-color:#eee;
-	margin-left:-20px;
-	margin-right:-20px;
+	margin-left:-13px;
+	margin-right:-14px;
 }
 
 .results_header_nav1 .h1 {
@@ -806,7 +816,8 @@ tr.result_table_row > td.result_table_pic_header {
 }
 
 .result_number {
-    white-space: nowrap;
+    padding-left:10px;
+	padding-right:10px;
 }
 
 .result_count_number {
@@ -1797,6 +1808,14 @@ a.preflib_change {
 	margin-left:40px;
 }
 
+.call_number_box {
+	margin-left:40px;
+}
+
+div.result_table_utils {
+    margin-left:-40px;
+}
+
 .record_title {
     font-size: [% css_fonts.size_bigger %];
 }
@@ -1856,6 +1875,11 @@ a.preflib_change {
     #homesearch_main_logo {
         display:none;
     }
+	.org_selector_dropdown {
+        padding:3px;
+		width:90%;
+		max-width:250px;
+    }
     #format_selector {
         display:none;
     }
@@ -1932,6 +1956,10 @@ a.preflib_change {
     .results_header_lbl {
         display: none;
     }
+	.results_header_nav1 {
+	    margin-left:0px;
+	    margin-right:0px;
+    }
     .results_header_nav1 span.h1 {
         display: none;
     }
@@ -1953,8 +1981,11 @@ a.preflib_change {
     .result_table_pic {
         width: 55px;
         padding: 0px;
-        margin: 0px;
+        margin: 5px;
     }
+	.result_table_title_cell, .call_number_box {
+		margin-left:0px;
+	}
     tr[name=results_isbn_tr], tr[name=results_phys_desc_tr], tr[name=results_pub_tr] strong, .result_count {
          display: none;
     }
diff --git a/Open-ILS/src/templates/opac/parts/org_selector.tt2 b/Open-ILS/src/templates/opac/parts/org_selector.tt2
index 34d1375f3e..3f83690f22 100644
--- a/Open-ILS/src/templates/opac/parts/org_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/org_selector.tt2
@@ -29,7 +29,7 @@ BLOCK build_org_selector;
 
     <select [% IF id %] id='[% id %]' [% END -%]
             title='[% arialabel || l("Select Library") %]' 
-            name='[% name %]' style="padding:3px;width:20em;">
+            name='[% name %]' class="org_selector_dropdown">
     [%- 
         WHILE node_stack.size > 0; 
             node = node_stack.pop();
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index ce9d7ff0f4..f25e1630e1 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -32,23 +32,27 @@ END;
             [% IF serial_holdings -%]
             <th scope='col'>[% l("Issue Label") %]</th>
             [%- ELSE -%]
-            <th scope='col'>[% l("Library System: Library Branch Name") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Library System: Library Branch Name") %]<br/>
+			    <span style="font-size:smaller;font-style:italic;">(Click library name for locations and hours)</span>
+			</th>
             [%- END %]
-            <th scope='col'>[% l("Shelving Location") %]</th>
-            <th scope='col'>[% l("Call Number / Copy Notes") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Shelving Location") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Call Number / Copy Notes") %]</th>
             [%- IF has_parts == 'true' %]
-            <th scope='col'>[% l("Part") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Part") %]</th>
             [%- END %]
-            <th scope='col'>[% l("Barcode") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Barcode") %]</th>
             [%- IF ctx.is_staff %]
-            <th scope='col'>[% l("Age Hold Protection") %]</th>
-            <th scope='col'>[% l("Active/Create Date") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Age Hold Protection") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Active/Create Date") %]</th>
             [%- END %]
             [%- IF ctx.is_staff OR serial_holdings %]
-            <th scope='col'>[% l("Holdable?") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Holdable?") %]</th>
             [%- END %]
-            <th scope='col'>[% l("Status") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("Status") %]</th>
+			[%- IF ctx.is_staff %]
             <th scope='col'>[% l("Due Date") %]</th>
+			[%- END -%]
         </tr>
     </thead>
     <tbody class="copy_details_table">
@@ -108,7 +112,7 @@ END; # FOREACH bib
             [%- IF has_parts == 'true' %]
             <td valign="top" style="background-color:#fff;">[% copy_info.part_label | html %]</td>
             [%- END %]
-            <td property="serialNumber" valign="top" style="background-color:#fff;text-align:center;">
+            <td property="serialNumber" valign="top" style="background-color:#fff;text-align:left;">
                 [% copy_info.barcode | html -%]
                 [% IF ctx.is_staff %]<br/>
                   [%- IF ctx.is_browser_staff %]
diff --git a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
index 4782e4eb22..55ffd0e770 100644
--- a/Open-ILS/src/templates/opac/parts/record/navigation.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
@@ -19,7 +19,7 @@
                 ctx.prev_rec_url = mkurl(ctx.prev_search_record, prev_args, stop_parms);
         %]
         <a class='np_nav_link classic_link' title='[% l("Previous Record") %]'
-            href='[% ctx.prev_rec_url %]' rel="nofollow" vocab=""><span class="nav_arrow_fix">&#9668;</span> [% l('Previous') %]</a>
+            href='[% ctx.prev_rec_url %]' rel="nofollow" vocab=""><span class="nav_arrow_fix">&#9668;</span> [% l('Previous Item') %]</a> &nbsp; &nbsp; &nbsp;
         [% END %]
 
         [% 
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 77ab0e85ab..78da48d35c 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -160,8 +160,7 @@ END;
                                                     <table 
                                                        role="presentation"
                                                        title="[% l('Record Holdings Summary') %]"
-                                                       class="table_no_border_space table_no_cell_pad table_no_border results_info_table"
-													   style="margin-left:40px;">
+                                                       class="table_no_border_space table_no_cell_pad table_no_border results_info_table call_number_box">
                                                         [% UNLESS rec.mmr_id %]
                                                            [% IF args.holdings.size > 0 %]
                                                         <tr name='bib_cn_list' class='result_table_title_cell'>
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 41a748a203..1a3989f1ab 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -14,8 +14,8 @@
         <span class='search_box_wrapper'>
             [%- # autosuggest breaks accessibility, as the aria-label
                 # attribute is removed when the Dijit is created. :(  %]
-            <label id="search_box_label" for="search_box">[% l('Search for: ') %]
-            <input type="text" id="search_box" name="query" style="width:90%;max-width:600px;height:20px;padding:3px;" aria-label="[%
+            <label id="search_box_label" for="search_box">[% l('Search for: ') %]</label>
+            <input type="text" id="search_box" name="query" aria-label="[%
                     l('Enter search query:');
                 %]" value="[% is_advanced ? ctx.naive_query_scrub(ctx.processed_search_query) : CGI.param('query') | html %]"
                 [%- IF use_autosuggest.enabled == "t" %]
@@ -27,16 +27,15 @@
                 [%- ELSE -%]
                     [% IF basic_search != "f" %] autofocus [% END %] x-webkit-speech
                 [%- END # autosuggest enabled %] />
-            </label>
         </span>
 		<br/>
-        <label id="search_qtype_label" for="qtype">
+        <label id="search_qtype_label" for="qtype"></label>
         [%- 
             l('Search by:&nbsp;');
             INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
         -%]
-        </label> &nbsp; &nbsp; 
-        <label id="search_itype_label" for="search_itype_selector">
+        &nbsp; &nbsp; 
+        <label id="search_itype_label" for="search_itype_selector"></label>
         [%-
             l('Limit to: ');
             IF search.basic_config.type == 'attr';
@@ -51,15 +50,14 @@
                     none_label=search.basic_config.none_label;
             END;
         -%]
-        </label> &nbsp; &nbsp;
-        <label id="search_locg_label" for="search_org_selector">
+        &nbsp; &nbsp;
+        <label id="search_locg_label" for="search_org_selector"></label>
         [%- 
             l('Search within: ');
             select_lib_label = l("Select search library");
             INCLUDE build_org_selector arialabel=select_lib_label 
               id='search_org_selector' show_loc_groups=1
         -%]
-        </label>
     <span>
     [%- IF (show_more_details.default == 'true' OR show_more_details.default == 'hide') AND !CGI.param('detail_record_view') %]
         <input id="detail" type="hidden" name="detail_record_view" value="1"/>
-- 
2.11.0