fix the size of the Standing box in patron summary so that it won't shift the interfa...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11822 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
index 1810aa3..3dc3a4f 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
@@ -242,6 +242,7 @@ staff.patron.summary.retrieve.no_barcode=summary: No barcode or ID
 staff.patron.summary.patron_net_access=Internet
 staff.patron.summary.expires_on=Expires on
 staff.patron.summary.standing_penalty.remove=Remove
+staff.patron.summary.standing_penalty.none=No Blocks/Penalties
 staff.patron.standing_penalty.note_prompt=Enter note to go with penalties:
 staff.patron.standing_penalty.note_title=Apply Penalty
 staff.patron.standing_penalty.apply_error=Error applying %1$s block/standing penalty.

diff --git a/Open-ILS/xul/staff_client/server/patron/summary.js b/Open-ILS/xul/staff_client/server/patron/summary.js
index 3f1be5d..5d212d2 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/summary.js
+++ b/Open-ILS/xul/staff_client/server/patron/summary.js
@@ -95,6 +95,14 @@ patron.summary.prototype = {
                                                                JSAN.use('util.widgets');
                                                                util.widgets.remove_children(e);
                                                                var penalties = obj.patron.standing_penalties();
+                                if (penalties.length == 0) {
+                                                                       var row = document.createElement('row');
+                                                                       var label = document.createElement('label');
+                                    label.setAttribute('value',patronStrings.getString('staff.patron.summary.standing_penalty.none'));
+                                    addCSSClass(label,'NO_PENALTY');
+                                                                       row.appendChild(label);
+                                                                       e.appendChild(row);
+                                }
                                                                for (var i = 0; i < penalties.length; i++) {
 
                                                                        var row = document.createElement('row');
@@ -157,7 +165,6 @@ patron.summary.prototype = {
                                     }
 
                                                                        e.appendChild(row);
-                                    e.parentNode.parentNode.hidden = false;
                                                                }
                                                        };
                                                }

diff --git a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
index 69808e6..cddc5a4 100644 (file)
--- a/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
@@ -19,11 +19,14 @@
                <caption id="psagbc" label="&staff.patron.summary_overlay.psagbc.alert.label;" class="shrinkable_groupbox"/>
                <description id="patron_alert"/>
        </groupbox>
-       <groupbox id="PatronSummaryStanding_groupbox" flex="0" hidden="true" class="standing">
+       <groupbox id="PatronSummaryStanding_groupbox" flex="0" class="standing">
                <caption id="pssgbc" label="&staff.patron.summary_overlay.pssgbc.standing.label;" class="shrinkable_groupbox"/>
-               <grid><columns><column/><column/></columns>
-            <rows id="patron_standing_penalties"/>
-        </grid>
+        <vbox id="pssgbvb">
+            <grid><columns><column/><column/></columns>
+                <rows id="patron_standing_penalties"/>
+            </grid>
+        </vbox>
+        <spacer/>
        </groupbox>
        <groupbox id="PatronSummaryStatus_groupbox" flex="0" class="status"/>
        <!--

diff --git a/Open-ILS/xul/staff_client/server/skin/patron_summary.css b/Open-ILS/xul/staff_client/server/skin/patron_summary.css
index b852ed2..4a06519 100755 (executable)
--- a/Open-ILS/xul/staff_client/server/skin/patron_summary.css
+++ b/Open-ILS/xul/staff_client/server/skin/patron_summary.css
@@ -3,7 +3,10 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); 
 @namespace html url("http://www.w3.org/TR/REC-html40"); 
 
+.NO_PENALTY { background-color: lime; color: black; }
 .PENALTY_RENEW { background-color: yellow; color: black; }
 .PENALTY_HOLD { background-color: orange; color: black; }
 .PENALTY_CIRC { background-color: red; color: white; }
 
+groupbox.standing { max-height: 7em; min-height: 7em; }
+groupbox.standing vbox { max-height: 5em; min-height: 5em; overflow: auto }