[jboss-cvs] jboss-seam/examples/wiki/view/plugins/forumTopics ...
Christian Bauer
christian at hibernate.org
Sat Dec 29 21:33:26 EST 2007
User: cbauer
Date: 07/12/29 21:33:26
Modified: examples/wiki/view/plugins/forumTopics topicPager.xhtml
topicControls.xhtml topicTable.xhtml
Log:
Complete overhaul of the preferences system
Revision Changes Path
1.2 +8 -8 jboss-seam/examples/wiki/view/plugins/forumTopics/topicPager.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: topicPager.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/forumTopics/topicPager.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- topicPager.xhtml 9 Nov 2007 15:00:29 -0000 1.1
+++ topicPager.xhtml 30 Dec 2007 02:33:26 -0000 1.2
@@ -13,16 +13,16 @@
<h:outputLink rendered="#{forumQuery.pager.previousPageAvailable}" target="_top"
value="#{wiki:renderURL(currentDocument)}">
- <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"/>
</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="#{!forumQuery.pager.previousPageAvailable}"/>
<h:outputLink rendered="#{forumQuery.pager.previousPageAvailable}" target="_top"
value="#{wiki:renderURL(currentDocument)}/Page/#{forumQuery.pager.previousPage}">
- <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"/>
</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="#{!forumQuery.pager.previousPageAvailable}"/>
<s:span>
@@ -34,16 +34,16 @@
<h:outputLink rendered="#{forumQuery.pager.nextPageAvailable}" target="_top"
value="#{wiki:renderURL(currentDocument)}/Page/#{forumQuery.pager.nextPage}">
- <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"/>
</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="#{!forumQuery.pager.nextPageAvailable}"/>
<h:outputLink rendered="#{forumQuery.pager.nextPageAvailable}" target="_top"
value="#{wiki:renderURL(currentDocument)}/Page/#{forumQuery.pager.lastPage}">
- <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"/>
</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="#{!forumQuery.pager.nextPageAvailable}"/>
</h:panelGrid>
1.4 +1 -1 jboss-seam/examples/wiki/view/plugins/forumTopics/topicControls.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: topicControls.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/forumTopics/topicControls.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- topicControls.xhtml 19 Dec 2007 04:29:30 -0000 1.3
+++ topicControls.xhtml 30 Dec 2007 02:33:26 -0000 1.4
@@ -19,7 +19,7 @@
<s:div styleClass="forumsFeedLink undecoratedLink" rendered="#{not empty currentDirectory.feed}">
<h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{currentDirectory.feed.id}"
tabindex="1">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.atom.gif" width="18" height="18"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.atom.gif" width="18" height="18"/>
<h:outputText value="#{currentDocument.name} #{messages['forum.label.Feed']}"/>
</h:outputLink>
</s:div>
1.4 +5 -5 jboss-seam/examples/wiki/view/plugins/forumTopics/topicTable.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: topicTable.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/plugins/forumTopics/topicTable.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- topicTable.xhtml 19 Dec 2007 04:29:30 -0000 1.3
+++ topicTable.xhtml 30 Dec 2007 02:33:26 -0000 1.4
@@ -28,7 +28,7 @@
<h:column>
<f:facet name="header"> </f:facet>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.#{t.iconName}.gif" width="22" height="26"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/icon.#{t.iconName}.gif" width="22" height="26"/>
</h:column>
<h:column>
@@ -61,9 +61,9 @@
<s:fragment rendered="#{not empty t.lastComment}">
<h:outputLink value="#{wiki:renderURL(t.lastComment)}" tabindex="1">
<h:outputText value="#{t.lastComment.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:graphicImage styleClass="topicGotoIcon" value="/themes/#{wikiPreferences.themeName}/img/icon.posting_goto.gif" width="18" height="9"/>
+ <h:graphicImage styleClass="topicGotoIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.posting_goto.gif" width="18" height="9"/>
</h:outputLink>
<ui:include src="../../includes/userInfoLink.xhtml">
@@ -75,9 +75,9 @@
<s:fragment rendered="#{empty t.lastComment}">
<h:outputLink value="#{wiki:renderURL(t.topic)}" tabindex="1">
<h:outputText value="#{t.topic.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:graphicImage styleClass="topicGotoIcon" value="/themes/#{wikiPreferences.themeName}/img/icon.posting_goto.gif" width="18" height="9"/>
+ <h:graphicImage styleClass="topicGotoIcon" value="/themes/#{preferences.get('Wiki').themeName}/img/icon.posting_goto.gif" width="18" height="9"/>
</h:outputLink>
<ui:include src="../../includes/userInfoLink.xhtml">
More information about the jboss-cvs-commits
mailing list