[open-ils-commits] r11822 - in trunk/Open-ILS/xul/staff_client/server: locale/en-US patron skin

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-01-14 11:41:28 -0500 (Wed, 14 Jan 2009)
New Revision: 11822

Modified:
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
   trunk/Open-ILS/xul/staff_client/server/patron/summary.js
   trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
   trunk/Open-ILS/xul/staff_client/server/skin/patron_summary.css
Log:
fix the size of the Standing box in patron summary so that it won't shift the interface; make it always there.  We may want to do this differently

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties	2009-01-14 00:37:24 UTC (rev 11821)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties	2009-01-14 16:41:28 UTC (rev 11822)
@@ -242,6 +242,7 @@
 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.

Modified: trunk/Open-ILS/xul/staff_client/server/patron/summary.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/summary.js	2009-01-14 00:37:24 UTC (rev 11821)
+++ trunk/Open-ILS/xul/staff_client/server/patron/summary.js	2009-01-14 16:41:28 UTC (rev 11822)
@@ -95,6 +95,14 @@
 								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 @@
                                     }
 
 									e.appendChild(row);
-                                    e.parentNode.parentNode.hidden = false;
 								}
 							};
 						}

Modified: trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul	2009-01-14 00:37:24 UTC (rev 11821)
+++ trunk/Open-ILS/xul/staff_client/server/patron/summary_overlay.xul	2009-01-14 16:41:28 UTC (rev 11822)
@@ -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"/>
 	<!--

Modified: trunk/Open-ILS/xul/staff_client/server/skin/patron_summary.css
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/skin/patron_summary.css	2009-01-14 00:37:24 UTC (rev 11821)
+++ trunk/Open-ILS/xul/staff_client/server/skin/patron_summary.css	2009-01-14 16:41:28 UTC (rev 11822)
@@ -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 }