From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 10 Dec 2015 15:06:45 +0000 (-0500)
Subject: LP#1452950 patron reg refactor alert pane
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3dc16660ecaa5f43c8dbda985fd061e3e86ffb0c;p=working%2FEvergreen.git

LP#1452950 patron reg refactor alert pane

Create a single top-right floating alert pane which contains both the
duplicate patron links and the field documentation.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 23e51d7fbe..dba0a4c990 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -19,46 +19,50 @@
 <div ng-if="patron_id"
     class="strong-text-2">[% l('Patron Edit') %]</div>
 
-<!-- IDL field documentation window -->
-<fieldset id="reg-field-doc" ng-show="selected_field_doc">
-  <legend>
-  {{idl_fields[selected_field_doc.fm_class()][selected_field_doc.field()].label}}
-  </legend>
-  <div>{{selected_field_doc.string()}}</div>
-</fieldset>
-
-<div id="reg-dupe-links">
-    [%# dupe_search_encoded is uri escaped in the JS %]
-    <div>
-        <a target="_blank" ng-show="dupe_counts.name"
-            href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
-        [% l('Found [_1] patron(s) with the same name', '{{dupe_counts.name}}') %]
-        </a>
-    </div>
-    <div>
-        <a target="_blank" ng-show="dupe_counts.email"
-            href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
-            [% l('Found [_1] patron(s) with the same email address', 
-            '{{dupe_counts.email}}') %]</a>
-    </div>
-    <div>
-        <a target="_blank" ng-show="dupe_counts.ident"
-            href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
-            [% l('Found [_1] patron(s) with the same identification', 
-            '{{dupe_counts.ident}}') %]</a>
-    </div>
-    <div>
-        <a target="_blank" ng-show="dupe_counts.phone"
-            href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
-            [% l('Found [_1] patron(s) with the same phone number', 
-            '{{dupe_counts.phone}}') %]</a>
-    </div>
-    <div>
-        <a target="_blank" ng-show="dupe_counts.address"
-            href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
-            [% l('Found [_1] patron(s) with the same address', 
-            '{{dupe_counts.address}}') %]</a>
-    </div>
+
+<div id="reg-alert-pane">
+
+	<div id="reg-dupe-links">
+		[%# dupe_search_encoded is uri escaped in the JS %]
+		<div>
+			<a target="_blank" ng-show="dupe_counts.name"
+				href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
+			[% l('[_1] patron(s) with same name', '{{dupe_counts.name}}') %]
+			</a>
+		</div>
+		<div>
+			<a target="_blank" ng-show="dupe_counts.email"
+				href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
+				[% l('[_1] patron(s) with same email', 
+				'{{dupe_counts.email}}') %]</a>
+		</div>
+		<div>
+			<a target="_blank" ng-show="dupe_counts.ident"
+				href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
+				[% l('[_1] patron(s) with same identification', 
+				'{{dupe_counts.ident}}') %]</a>
+		</div>
+		<div>
+			<a target="_blank" ng-show="dupe_counts.phone"
+				href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
+				[% l('[_1] patron(s) with same phone', 
+				'{{dupe_counts.phone}}') %]</a>
+		</div>
+		<div>
+			<a target="_blank" ng-show="dupe_counts.address"
+				href="/eg/staff/circ/patron/search?search={{dupe_search_encoded}}" >
+				[% l('Found [_1] patron(s) with same address', 
+				'{{dupe_counts.address}}') %]</a>
+		</div>
+	</div>
+
+	<!-- IDL field documentation window -->
+	<fieldset id="reg-field-doc" ng-show="selected_field_doc">
+		<legend>
+		{{idl_fields[selected_field_doc.fm_class()][selected_field_doc.field()].label}}
+		</legend>
+		<div>{{selected_field_doc.string()}}</div>
+	</fieldset>
 </div>
 
 
diff --git a/Open-ILS/src/templates/staff/css/circ.css.tt2 b/Open-ILS/src/templates/staff/css/circ.css.tt2
index 80373bb4ed..599b2d5f2b 100644
--- a/Open-ILS/src/templates/staff/css/circ.css.tt2
+++ b/Open-ILS/src/templates/staff/css/circ.css.tt2
@@ -97,9 +97,8 @@ but the ones I'm finding aren't quite cutting it..*/
   text-align: right;
 }
 
-
 /* floating div along top-right with field documentation */
-#reg-field-doc {
+#reg-alert-pane {
     position: fixed;
     top:160px;
     right:20px;
@@ -111,13 +110,10 @@ but the ones I'm finding aren't quite cutting it..*/
 }
 
 #reg-dupe-links {
-    position: fixed;
-    top:180px;
-    right:20px;
-    padding: 10px;
-    margin-top: 10px;
+		margin-bottom: 10px;
 }
 
+
 #reg-field-doc legend {
     /* otherwise the font size is quite large */
     font-size: 100%;