Author: rgardler
Date: Sat Feb 11 17:29:06 2012
New Revision: 1243108
URL: http://svn.apache.org/viewvc?rev=1243108&view=rev
Log:
allow the layout of the primary and secondary content to be configured from
properties
Added:
incubator/wookie/trunk/widgets/templates/twoColumn/default.widget.properties
(with props)
Modified:
incubator/wookie/trunk/widgets/templates/twoColumn/readme.txt
incubator/wookie/trunk/widgets/templates/twoColumn/style/screen.css.add
Added:
incubator/wookie/trunk/widgets/templates/twoColumn/default.widget.properties
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/twoColumn/default.widget.properties?rev=1243108&view=auto
==============================================================================
---
incubator/wookie/trunk/widgets/templates/twoColumn/default.widget.properties
(added)
+++
incubator/wookie/trunk/widgets/templates/twoColumn/default.widget.properties
Sat Feb 11 17:29:06 2012
@@ -0,0 +1,6 @@
+#
+# Position of secondary and primary content when there is sufficient
+# width to place them side by side. Can be "left" or "right"
+#
+twoColumn.primary.position=right
+twoColumn.secondary.position=left
Propchange:
incubator/wookie/trunk/widgets/templates/twoColumn/default.widget.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/wookie/trunk/widgets/templates/twoColumn/default.widget.properties
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/wookie/trunk/widgets/templates/twoColumn/readme.txt
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/twoColumn/readme.txt?rev=1243108&r1=1243107&r2=1243108&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/twoColumn/readme.txt (original)
+++ incubator/wookie/trunk/widgets/templates/twoColumn/readme.txt Sat Feb 11
17:29:06 2012
@@ -4,7 +4,12 @@ content_primary.html will be the main bo
rendered on the right of the page.
content_secondary.html will commonly be used for navigation or sidebar
-content. By default it is rendered either to the left of the screeen
-or, where the screen is too narrow the secondary content will appear
-above the primary. Any collapsible items in this area will be expanded
-or collpsed as appropriate for the screen dimensions.
+content. By default it is rendered either to the left or right (see
+below) of the screeen or, where the screen is too narrow the secondary
+content will appear above the primary. Any collapsible items in this
+area will be expanded or collpsed as appropriate for the screen
+dimensions.
+
+The positions of the secondary and primary content on a wide screen
+are controlled by the twoColumn.primary.position and
+twoColumn.secdonary.position
Modified:
incubator/wookie/trunk/widgets/templates/twoColumn/style/screen.css.add
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/widgets/templates/twoColumn/style/screen.css.add?rev=1243108&r1=1243107&r2=1243108&view=diff
==============================================================================
--- incubator/wookie/trunk/widgets/templates/twoColumn/style/screen.css.add
(original)
+++ incubator/wookie/trunk/widgets/templates/twoColumn/style/screen.css.add Sat
Feb 11 17:29:06 2012
@@ -30,40 +30,41 @@
@media ${widget.media.screen.moderateWidth} {
.content-secondary {
text-align: left;
- float: left;
+ float: ${twoColumn.secondary.position};
width: 42%;
margin-right: 1%;
padding-right: 2%;
}
.content-primary {
width: 55%;
- float: right;
+ float: ${twoColumn.primary.position};
}
}
@media ${widget.media.screen.wide} {
.content-secondary {
text-align: left;
- float: left;
+ float: ${twoColumn.secondary.position};
width: 32%;
margin-right: 1%;
padding-right: 2%;
}
.content-primary {
width: 65%;
- float: right;
+ float: ${twoColumn.primary.position};
}
}
@media ${widget.media.screen.veryWide} {
.content-secondary {
text-align: left;
- float: left;
+ float: ${twoColumn.secondary.position};
width: 22%;
margin-right: 1%;
padding-right: 2%;
}
.content-primary {
width: 75%;
+ float: ${twoColumn.primary.position};
}
}
\ No newline at end of file
