[uiprops] use lazystr and update some variables usage in css
to get a chance to change style without having to change all properties.
Also had missing boxHeader.png file (formerly header.png).
Binary file web/data/boxHeader.png has changed
--- a/web/data/cubicweb.css Thu Jul 08 12:54:27 2010 +0200
+++ b/web/data/cubicweb.css Thu Jul 08 12:54:28 2010 +0200
@@ -322,7 +322,7 @@
overflow: hidden;
font-weight: bold;
color: #fff;
- background: %(boxTitleBgColor)s url("header.png") repeat-x 50% 50%;
+ background: %(boxTitleBg)s;
}
div.boxTitle span,
@@ -333,7 +333,7 @@
div.searchBoxFrame div.boxTitle,
div.greyBoxFrame div.boxTitle {
- background: %(actionBoxTitleBgColor)s url("actionBoxHeader.png") repeat-x 50% 50% ;
+ background: %(actionBoxTitleBg)s;
}
div.sideBoxTitle span,
@@ -379,7 +379,7 @@
}
div.sideBoxTitle {
- background: %(actionBoxTitleBgColor)s;
+ background: %(actionBoxTitleBg)s;
display: block;
font-weight: bold;
}
@@ -400,11 +400,11 @@
div.sideBoxBody {
padding: 0.2em 5px;
- background: %(sideBoxBodyBgColor)s;
+ background: %(sideBoxBodyBg)s;
}
div.sideBoxBody a {
- color: %(sideBoxColor)s;
+ color: %(sideBoxBodyColor)s;
}
div.sideBoxBody a:hover {
@@ -804,7 +804,7 @@
ul.boxListing a:hover,
ul.boxListing ul li a:hover {
text-decoration: none;
- background: %(sideBoxBodyBgColor)s;
+ background: %(sideBoxBodyBg)s;
}
ul.boxListing ul li a:hover{
--- a/web/data/uiprops.py Thu Jul 08 12:54:27 2010 +0200
+++ b/web/data/uiprops.py Thu Jul 08 12:54:28 2010 +0200
@@ -2,7 +2,6 @@
# CSS stylesheets to include systematically in HTML headers
# use the following line if you *need* to keep the old stylesheet
-#STYLESHEETS = [data('cubicweb.old.css')]
STYLESHEETS = [data('cubicweb.reset.css'),
data('cubicweb.css'), ]
STYLESHEETS_IE = [data('cubicweb.ie.css')]
@@ -66,7 +65,7 @@
defaultFontFamily = "'Bitstream Vera Sans','Lucida Grande','Lucida Sans Unicode','Geneva','Verdana',sans-serif"
defaultSize = '12px'
defaultLineHeight = '1.5'
-defaultLineHeightEm = defaultLineHeight + 'em'
+defaultLineHeightEm = lazystr('%(defaultLineHeight)sem')
baseRhythmBg = 'rhythm18.png'
inputHeight = '1.3em'
@@ -82,7 +81,7 @@
h1Padding = '0 0 0.14em 0 '
h1Margin = '0.8em 0 0.5em'
h1Color = '#000'
-h1BorderBottomStyle = '0.06em solid %s' % h1Color
+h1BorderBottomStyle = lazystr('0.06em solid %(h1Color)s')
h2FontSize = '1.33333em'
h2Padding = '0.4em 0 0.35em 0'
@@ -94,7 +93,7 @@
# links
aColor = '#e6820e'
-aActiveColor = aVisitedColor = aLinkColor = aColor
+aActiveColor = aVisitedColor = aLinkColor = lazystr('%(aColor)s')
# page frame
@@ -105,13 +104,15 @@
pageMinHeight = '800px'
# boxes
-boxTitleBgColor = headerBgColor
+boxTitleBg = lazystr('%(headerBgColor)s url("boxHeader.png") repeat-x 50%% 50%%')
boxBodyBgColor = '#efefde'
# action, search, sideBoxes
actionBoxTitleBgColor = '#cfceb7'
+actionBoxTitleBg = lazystr('%(actionBoxTitleBgColor)s url("actionBoxHeader.png") repeat-x 50%% 50%%')
sideBoxBodyBgColor = '#f8f8ee'
-sideBoxColor = '#555544'
+sideBoxBodyBg = lazystr('%(sideBoxBodyBgColor)s')
+sideBoxBodyColor = '#555544'
# table listing & co
listingBorderColor = '#ccc'
@@ -122,7 +123,7 @@
bulletDownImg = 'url("puce_down.png") 98% 6px no-repeat'
#forms
-formHeaderBgColor = listingHeaderBgColor
+formHeaderBgColor = lazystr('%(listingHeaderBgColor)s')
helperColor = '#555'
# button