From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 18 Aug 2015 13:47:20 +0000 (-0400)
Subject: LP#1452950 patron summary show/hide repair
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1ef95797c8ad96456a715b12f82b73c9d94982fc;p=evergreen%2Fequinox.git

LP#1452950 patron summary show/hide repair

Recover the patron summary show/hide link, which was lost in the
fixed-position elements shuffle.  This moves the patron's name back into
the fixed bar along the top so that it's always visible, as before.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index 1db25c2a6c..9cfd554108 100644
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -54,15 +54,37 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
   #top-content-container { padding-top: 80px; }
 </style>
 
-
 [% END %]
 
-<div class="row">
-  <div class="col-md-3">
-    <!-- just here to keep this slot open for the patron summary column -->
+<div class="row" id="patron-fixed-tabs">
+  <div class="col-md-3 patron-name-header">
+    <div ng-show="patron()">
+      <h4 title="{{patron().id()}}">
+        <div class="flex-row">
+          <div class="flex-cell">
+            [% l('[_1], [_2] [_3]', 
+                '{{patron().family_name()}}',
+                '{{patron().first_given_name()}}',
+                '{{patron().second_given_name()}}') %]
+          </div>
+          <div ng-show="tab != 'search'">
+            <a href ng-click="toggle_expand_summary()"
+              title="[% l('Collapse Patron Summary Display') %]"
+              ng-hide="collapse_summary()">
+              <span class="glyphicon glyphicon-resize-small"></span>
+            </a>
+            <a href ng-click="toggle_expand_summary()"
+              title="[% l('Expand Patron Summary Display') %]"
+              ng-show="collapse_summary()">
+              <span class="glyphicon glyphicon-resize-full"></span>
+            </a>
+          </div>
+        </div>
+      </h4>
+    </div>
   </div>
 
-  <div class="col-md-9" id="patron-fixed-tabs">
+  <div class="col-md-9">
     <ul class="nav nav-pills nav-pills-like-tabs">
       <li ng-class="{active : tab == 'checkout', disabled : !patron()}">
         <a a-disabled="!patron()" href="./circ/patron/{{patron().id()}}/checkout">[% l('Check Out') %]</a>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
index 1cb43fa596..40896dcb67 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
@@ -1,31 +1,5 @@
 
 <div ng-cloak class="patron-summary-grid-wrapper">
-  <div class="row">
-    <div class="col-md-12">
-      <h4 title="{{patron().id()}}">
-        <div class="flex-row">
-          <div class="flex-cell">
-            [% l('[_1], [_2] [_3]', 
-                '{{patron().family_name()}}',
-                '{{patron().first_given_name()}}',
-                '{{patron().second_given_name()}}') %]
-          </div>
-          <div ng-show="tab != 'search'">
-            <a href ng-click="toggle_expand_summary()"
-              title="[% l('Collapse Patron Summary Display') %]"
-              ng-hide="collapse_summary()">
-              <span class="glyphicon glyphicon-resize-small"></span>
-            </a>
-            <a href ng-click="toggle_expand_summary()"
-              title="[% l('Expand Patron Summary Display') %]"
-              ng-show="collapse_summary()">
-              <span class="glyphicon glyphicon-resize-full"></span>
-            </a>
-          </div>
-        </div>
-      </h4>
-    </div>
-  </div>
   <div ng-show="patron()" id="patron-summary-grid">
     <div class="row" 
       ng-class="{'patron-summary-divider' : !$index}"
diff --git a/Open-ILS/src/templates/staff/css/circ.css.tt2 b/Open-ILS/src/templates/staff/css/circ.css.tt2
index 551883e45f..05cea1b099 100644
--- a/Open-ILS/src/templates/staff/css/circ.css.tt2
+++ b/Open-ILS/src/templates/staff/css/circ.css.tt2
@@ -2,7 +2,7 @@
 /* push the patron summary up to compensate for the extra
  * padding required to support the fixed navigation */
 .patron-summary-grid-wrapper {
-  margin-top: -60px;
+  margin-top: 20px;
 }
 
 /** style to make a grid look like a striped table */
@@ -29,12 +29,17 @@ but the ones I'm finding aren't quite cutting it..*/
     position: fixed;
     top: 50px;
     right: 15px;
+    left: 45px;
     padding-top: 20px;
     padding-top: 10px;
     z-index: 1;
     background-color: rgba(255,255,255,1);
 }
 
+.patron-name-header {
+  margin-top: 20px;
+}
+
 /* let search form elements fill their containers w/ slight padding */
 #patron-search-form-row {margin-left: 0px;}
 #patron-search-form div.col-md-2 { padding: 2px; }