From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 4 Jun 2015 01:43:45 +0000 (-0400)
Subject: LP#1452950 patron reg. UI improvements / repairs
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=983399bdddc5f7acfdbe55b263f369cc262056bc;p=working%2FEvergreen.git

LP#1452950 patron reg. UI improvements / repairs

 * floating save, clone, etc pane arranged vertically with less padding.
 * reduce vertical spacing between fields
 * alert_message field rendered as textarea
 * avoid showing 'Example:' label when no phone example exists.

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 17dde5e58f..32907ce719 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -6,16 +6,18 @@
 <div id="reg-control-actions">
   <div class="pad-all-min">
     <button type="button" class="btn btn-default">[% l('Save') %]</button>
+  </div>
+  <div class="pad-all-min">
     <button type="button" class="btn btn-default">[% l('Save & Clone') %]</button>
   </div>
   <div class="pad-all-min" ng-show="!display_required_fields">
-    <a href>[% l('Show Only Required Fields') %]</a>
+    <a href>[% l('Required Fields') %]</a>
   </div>
   <div class="pad-all-min" ng-show="!display_suggested_fields">
-    <a href>[% l('Show Suggested Fields') %]</a>
+    <a href>[% l('Suggested Fields') %]</a>
   </div>
   <div class="pad-all-min" ng-show="!display_all_fields">
-    <a href>[% l('Show All Fields') %]</a>
+    <a href>[% l('All Fields') %]</a>
   </div>
   <fieldset id="reg-field-doc" ng-show="selected_field_doc">
     <legend>
@@ -31,7 +33,7 @@
 
   IF NOT input_type; input_type = 'text'; END %] 
 
-<div class="row pad-all-min2 form-group">
+<div class="row form-group">
 
   <div class="col-md-3 reg-field-label"> <!-- field label -->
 
@@ -45,9 +47,9 @@
 
   <div class="col-md-3 reg-field-input"> <!-- field form input -->
 
-  [%
-    model = path ? 'patron.' _ path _ '.' _ field : 'patron.' _ field;
-      IF input_type == 'checkbox' %]
+  [% model = path ? 'patron.' _ path _ '.' _ field : 'patron.' _ field %]
+
+  [% IF input_type == 'checkbox' %]
 
     <div class='checkbox'>
       <input type='checkbox' ng-model='[% model %]'/>
@@ -56,11 +58,17 @@
   [% ELSE %]
     <!-- text / number input -->
 
-    <input type="[% input_type %]" 
-      class="form-control" ng-model="[% model %]"/>
+    [% IF field == 'alert_message' %]
+      <textarea class="form-control" ng-model="[% model %]"/>
+    [% ELSE %]
+      <input type="[% input_type %]" 
+        class="form-control" ng-model="[% model %]"/>
+    [% END %]
   [% END %]
+
   </div>
 
+  <!-- supplemental actions and example text -->
   <div class="col-md-3 patron-reg-example">
 
     [% IF field == 'barcode' %]
@@ -85,7 +93,7 @@
 
       [% IF field.match('phone') %]
         <!-- phones have a fall-through example option -->
-        <span ng-if="![% set_str %]">
+        <span ng-if="![% set_str %] && org_settings['ui.patron.edit.phone.example']">
           [% l('Example: [_1]', 
            "{{org_settings['ui.patron.edit.phone.example']}}") %]
         </span>
diff --git a/Open-ILS/src/templates/staff/css/circ.css.tt2 b/Open-ILS/src/templates/staff/css/circ.css.tt2
index bf9d8341cf..4f83603443 100644
--- a/Open-ILS/src/templates/staff/css/circ.css.tt2
+++ b/Open-ILS/src/templates/staff/css/circ.css.tt2
@@ -79,13 +79,13 @@ but the ones I'm finding aren't quite cutting it..*/
 #reg-control-actions {
     position: fixed;
     top:160px;
-    right:30px;
-    width:300px;
+    right:10px;
+    /*width:200px;*/
     border:2px dashed #d9e8f9;
     -moz-border-radius: 10px;
     font-weight: bold;
-    padding: 20px;
-    margin-top: 20px;
+    padding: 10px;
+    margin-top: 10px;
 }
 
 #reg-field-doc {