[jboss-cvs] jboss-seam/examples/wiki/view/plugins/blogDirectory ...
Christian Bauer
christian at hibernate.org
Sat Dec 29 21:33:29 EST 2007
User: cbauer
Date: 07/12/29 21:33:29
Modified: examples/wiki/view/plugins/blogDirectory plugin.xhtml
Log:
Complete overhaul of the preferences system
Revision Changes Path
1.24 +13 -26 jboss-seam/examples/wiki/view/plugins/blogDirectory/plugin.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: plugin.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/blogDirectory/plugin.xhtml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- plugin.xhtml 19 Dec 2007 04:29:31 -0000 1.23
+++ plugin.xhtml 30 Dec 2007 02:33:29 -0000 1.24
@@ -7,20 +7,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:s="http://jboss.com/products/seam/taglib">
- <s:div id="blogDirectory"
- styleClass="#{showPluginPreferences and !empty blogDirectoryPreferencesEditor ? 'pluginPreferencesBox' : ''}">
-
- <s:div id="blogDirectoryPreferences"
- rendered="#{showPluginPreferences and !empty blogDirectoryPreferencesEditor}">
- <div align="center">
- <h:message for="blogDirectoryPreferences" styleClass="pluginPreferencesMessage"/>
-
- <ui:include src="../../includes/pluginPreferencesForm.xhtml">
- <ui:param name="pluginDiv" value="blogDirectory"/>
- <ui:param name="pluginPreferencesEditor" value="#{blogDirectoryPreferencesEditor}"/>
- </ui:include>
- </div>
- </s:div>
+ <s:div styleClass="blogDirectory">
<s:div id="blogEntries">
<s:div rendered="#{!empty blogDirectory.blogEntries}">
@@ -33,9 +20,9 @@
<h:outputText value="#{blogEntry.entryDocument.name}"/>
<div class="undecoratedLink">
<h:outputText styleClass="blogEntryCreatedOnText" value="#{blogEntry.entryDocument.createdOn}">
- <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
+ <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{preferences.get('Wiki').timeZone}"/>
</h:outputText>
- <h:outputText value=" #{wikiPreferences.timeZone}"/>
+ <h:outputText value=" #{preferences.get('Wiki').timeZone}"/>
<h:outputText value=", by "/>
<h:outputLink value="#{wiki:renderURL(blogEntry.entryDocument.createdBy.memberHome)}" target="_top"
rendered="#{!empty blogEntry.entryDocument.createdBy.memberHome}">
@@ -61,7 +48,7 @@
enablePlugins="true"/>
</div>
- <s:div rendered="#{wikiPreferences.showTags and not blogEntry.entryDocument.macroPresent('hideTags') and not empty blogEntry.entryDocument.tags}"
+ <s:div rendered="#{preferences.get('Wiki').showTags and not blogEntry.entryDocument.macroPresent('hideTags') and not empty blogEntry.entryDocument.tags}"
styleClass="documentTags undecoratedLink">
<s:div>
#{messages['lacewiki.label.docDisplay.Tags']}: 
@@ -126,7 +113,7 @@
</c:forEach>
</s:div>
- <h:panelGrid columns="5" rendered="#{blogDirectory.numOfBlogEntries > blogDirectoryPreferences.properties['pageSize']}"
+ <h:panelGrid columns="5" rendered="#{blogDirectory.numOfBlogEntries > preferences.get('Blog').pageSize}"
styleClass="blogPagerTable"
columnClasses="blogPagerColumn, blogPagerColumn, blogPagerTextColumn, blogPagerColumn, blogPagerColumn, "
cellpadding="0" cellspacing="0" border="0">
@@ -134,19 +121,19 @@
<h:outputLink rendered="#{blogDirectory.previousPageAvailable}" target="_top"
value="#{wiki:renderURL(currentDocument)}#{blogDirectory.dateUrl}#{blogDirectory.tagUrl}">
<div style="width:30px;">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.first.gif" width="13" height="11"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.first.gif" width="13" height="11"/>
</div>
</h:outputLink>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
rendered="#{!blogDirectory.previousPageAvailable}"/>
<h:outputLink rendered="#{blogDirectory.previousPageAvailable}" target="_top"
value="#{wiki:renderURL(currentDocument)}#{blogDirectory.dateUrl}/Page/#{blogDirectory.previousPage}#{blogDirectory.tagUrl}">
<div style="width:30px;">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.previous.gif" width="13" height="11"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.previous.gif" width="13" height="11"/>
</div>
</h:outputLink>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
rendered="#{!blogDirectory.previousPageAvailable}"/>
<s:span>
@@ -166,19 +153,19 @@
<h:outputLink rendered="#{blogDirectory.nextPageAvailable}" target="_top"
value="#{wiki:renderURL(currentDocument)}#{blogDirectory.dateUrl}/Page/#{blogDirectory.nextPage}#{blogDirectory.tagUrl}">
<div style="width:30px;">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.next.gif" width="13" height="11"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.next.gif" width="13" height="11"/>
</div>
</h:outputLink>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
rendered="#{!blogDirectory.nextPageAvailable}"/>
<h:outputLink rendered="#{blogDirectory.nextPageAvailable}" target="_top"
value="#{wiki:renderURL(currentDocument)}#{blogDirectory.dateUrl}/Page/#{blogDirectory.lastPage}#{blogDirectory.tagUrl}">
<div style="width:30px;">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.last.gif" width="13" height="11"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/page.last.gif" width="13" height="11"/>
</div>
</h:outputLink>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="13" height="11"
rendered="#{!blogDirectory.nextPageAvailable}"/>
</h:panelGrid>
More information about the jboss-cvs-commits
mailing list