[open-ils-commits] r11469 - in trunk/Open-ILS/xul/staff_client: . server/skin
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Dec 9 00:22:23 EST 2008
Author: dbs
Date: 2008-12-09 00:22:20 -0500 (Tue, 09 Dec 2008)
New Revision: 11469
Modified:
trunk/Open-ILS/xul/staff_client/Makefile.am
trunk/Open-ILS/xul/staff_client/server/skin/cat.css
trunk/Open-ILS/xul/staff_client/server/skin/circ.css
trunk/Open-ILS/xul/staff_client/server/skin/global.css
trunk/Open-ILS/xul/staff_client/server/skin/patron_display.css
trunk/Open-ILS/xul/staff_client/server/skin/patron_summary.css
trunk/Open-ILS/xul/staff_client/server/skin/simple_auth.css
Log:
Enable simple customization of server XUL:
* create a *_custom.css file per CSS file in server/skin that is protected on upgrades
* use the !important attribute to override properties in the parent CSS file
Update the Makefile to generate *_custom.css stubs if they do not already exist
Remove * {font-size: large;} property from patron_summary.css
Modified: trunk/Open-ILS/xul/staff_client/Makefile.am
===================================================================
--- trunk/Open-ILS/xul/staff_client/Makefile.am 2008-12-09 04:06:59 UTC (rev 11468)
+++ trunk/Open-ILS/xul/staff_client/Makefile.am 2008-12-09 05:22:20 UTC (rev 11469)
@@ -5,11 +5,12 @@
export STAFF_CLIENT_BUILD_ID = $$(/bin/cat build/BUILD_ID)
OPENSRF_JSLIBS = "$(OPENSRF_LIBS)/javascript"
-CHROME_LOCALES = $$(ls chrome/locale)
+CHROME_LOCALES = $$(ls -1 chrome/locale)
+SKIN_CSS = $$(ls -1 server/skin/*css | sed -e "s/.css/_custom.css/")
install-exec-local: build
-build: build_dir chrome2remote generated open-ils stamp
+build: build_dir chrome2remote generated custom_skins open-ils stamp
@echo To test the staff client:
@echo " cd build/"
@echo " xulrunner application.ini"
@@ -62,4 +63,7 @@
cp $(OPENSRF_JSLIBS)/*.js build/chrome/content/OpenILS/util/
external/prune_dirs.sh build/
-
+custom_skins:
+ @for skin in $(SKIN_CSS); do \
+ if [ ! -f "$$skin" ]; then touch build/"$$skin"; fi \
+ done;
Modified: trunk/Open-ILS/xul/staff_client/server/skin/cat.css
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/skin/cat.css 2008-12-09 04:06:59 UTC (rev 11468)
+++ trunk/Open-ILS/xul/staff_client/server/skin/cat.css 2008-12-09 05:22:20 UTC (rev 11469)
@@ -1,3 +1,5 @@
+ at import url("cat_custom.css");
+
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/TR/REC-html40");
@@ -2,2 +4 @@
.has_copies { color: black; background-color: lightgreen; font-weight: bold; }
-
Modified: trunk/Open-ILS/xul/staff_client/server/skin/circ.css
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/skin/circ.css 2008-12-09 04:06:59 UTC (rev 11468)
+++ trunk/Open-ILS/xul/staff_client/server/skin/circ.css 2008-12-09 05:22:20 UTC (rev 11469)
@@ -1,3 +1,4 @@
+ at import url("circ_custom.css");
+
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/TR/REC-html40");
-
Modified: trunk/Open-ILS/xul/staff_client/server/skin/global.css
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/skin/global.css 2008-12-09 04:06:59 UTC (rev 11468)
+++ trunk/Open-ILS/xul/staff_client/server/skin/global.css 2008-12-09 05:22:20 UTC (rev 11469)
@@ -1,3 +1,5 @@
+ at import url("global_custom.css");
+
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/TR/REC-html40");
@@ -97,4 +99,3 @@
*/
.edit_hold_range { display: none; }
.edit_hold_focus { display: none; }
-
Modified: trunk/Open-ILS/xul/staff_client/server/skin/patron_display.css
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/skin/patron_display.css 2008-12-09 04:06:59 UTC (rev 11468)
+++ trunk/Open-ILS/xul/staff_client/server/skin/patron_display.css 2008-12-09 05:22:20 UTC (rev 11469)
@@ -1,3 +1,5 @@
+ at import url("patron_display_custom.css");
+
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/TR/REC-html40");
@@ -76,4 +78,3 @@
.PATRON_JUVENILE .dob { color: purple; }
.PATRON_JUVENILE label.juvenile_indicator { display: inline; color: purple; }
-
Modified: trunk/Open-ILS/xul/staff_client/server/skin/patron_summary.css
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/skin/patron_summary.css 2008-12-09 04:06:59 UTC (rev 11468)
+++ trunk/Open-ILS/xul/staff_client/server/skin/patron_summary.css 2008-12-09 05:22:20 UTC (rev 11469)
@@ -1,9 +1,8 @@
+ at import url("patron_summary_custom.css");
+
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/TR/REC-html40");
-* { font-size: large; }
-
.PENALTY_RENEW { background-color: yellow; }
.PENALTY_HOLD { background-color: orange; }
.PENALTY_CIRC { background-color: red; }
-
Modified: trunk/Open-ILS/xul/staff_client/server/skin/simple_auth.css
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/skin/simple_auth.css 2008-12-09 04:06:59 UTC (rev 11468)
+++ trunk/Open-ILS/xul/staff_client/server/skin/simple_auth.css 2008-12-09 05:22:20 UTC (rev 11469)
@@ -1,3 +1,5 @@
+ at import url("simple_auth_custom.css");
+
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/TR/REC-html40");
@@ -3,3 +5,2 @@
.staff groupbox { border: #FF3333; }
.temp groupbox { border: #FF9933; }
-
More information about the open-ils-commits
mailing list