LP#1452950 patron reg refactor alert pane
authorBill Erickson <berickxx@gmail.com>
Thu, 10 Dec 2015 15:06:45 +0000 (10:06 -0500)
committerGalen Charlton <gmc@esilibrary.com>
Thu, 25 Feb 2016 22:31:59 +0000 (17:31 -0500)
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>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
Open-ILS/src/templates/staff/css/circ.css.tt2

index 23e51d7..dba0a4c 100644 (file)
 <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>
 
 
index 80373bb..599b2d5 100644 (file)
@@ -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%;