[jboss-cvs] jboss-seam/examples/wiki/view/includes ...
Christian Bauer
christian at hibernate.org
Sat Dec 29 21:33:20 EST 2007
User: cbauer
Date: 07/12/29 21:33:20
Modified: examples/wiki/view/includes
formFieldDecorate.xhtml commentsDisplay.xhtml
preferencesEditor.xhtml wikiTextEditor.xhtml
pluginPreferencesForm.xhtml
wikiUploadImageEditor.xhtml attachmentDisplay.xhtml
ownerSelector.xhtml captchaEntry.xhtml
userControl.xhtml statusIndicator.xhtml
Log:
Complete overhaul of the preferences system
Revision Changes Path
1.4 +1 -1 jboss-seam/examples/wiki/view/includes/formFieldDecorate.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: formFieldDecorate.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/formFieldDecorate.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- formFieldDecorate.xhtml 19 Dec 2007 04:29:19 -0000 1.3
+++ formFieldDecorate.xhtml 30 Dec 2007 02:33:20 -0000 1.4
@@ -21,7 +21,7 @@
<s:div styleClass="errorMessage" rendered="#{invalid}">
<h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/attention.gif"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif"
width="18" height="18"
styleClass="attentionImage"/>
<s:span styleClass="attentionMessage"> <s:message/></s:span>
1.20 +2 -2 jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: commentsDisplay.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- commentsDisplay.xhtml 19 Dec 2007 13:33:34 -0000 1.19
+++ commentsDisplay.xhtml 30 Dec 2007 02:33:20 -0000 1.20
@@ -46,9 +46,9 @@
<s:div>
<s:span styleClass="commentDate">
<h:outputText value="#{c.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}"/>
</s:span>
<h:outputText value=" | "/>
<s:span styleClass="commentLink undecoratedLink">
1.7 +34 -70 jboss-seam/examples/wiki/view/includes/preferencesEditor.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: preferencesEditor.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/preferencesEditor.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- preferencesEditor.xhtml 19 Dec 2007 04:29:19 -0000 1.6
+++ preferencesEditor.xhtml 30 Dec 2007 02:33:20 -0000 1.7
@@ -3,92 +3,56 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core"
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:s="http://jboss.com/products/seam/taglib">
<h:panelGrid columns="2" columnClasses="formListGridColumn">
<a:region>
- <h:dataTable id="preferenceComponentList" var="prefComp"
- value="#{preferenceComponents}"
- styleClass="formListTable sessionEventTrigger"
- cellpadding="0" cellspacing="0" border="0"
- columnClasses="formListItem">
+ <h:dataTable id="preferenceEntityList"
+ var="preferenceEntity"
+ value="#{preferenceEntities}"
+ styleClass="formListTable"
+ cellpadding="0" cellspacing="0" border="0">
<h:column>
- <a:commandLink action="#{preferenceEditor.selectPreferenceComponent(prefComp)}"
- reRender="preferenceComponentList, propertyPanel" oncomplete="onAjaxRequestComplete()"
- styleClass="#{prefComp == preferenceEditor.preferenceComponent ? 'selectedItem' : ''}">
- #{prefComp.description}
+ <s:div styleClass="#{preferenceEntity == preferenceEditor.preferenceEntity ? 'formListSelectedItem' : 'formListItem'}">
+ <a:commandLink action="#{preferenceEditor.selectPreferenceEntity(preferenceEntity)}"
+ status="#{statusId}"
+ reRender="preferenceEntityList, preferencePropertyPanel" oncomplete="onAjaxRequestComplete()">
+ #{preferenceEntity.description}
</a:commandLink>
+ </s:div>
</h:column>
</h:dataTable>
</a:region>
- <s:div id="propertyPanel">
+ <s:div id="preferencePropertyPanel">
<a:region>
- <h:dataTable id="propertyTable" var="v"
- rendered="#{not empty preferenceEditor.preferenceComponent}"
- value="#{preferenceEditor.preferenceValues}"
+ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"
+ rendered="#{not empty preferenceEditor.preferenceEntity}"
styleClass="datatable topLeftBottomBorder rightBorder sessionEventTrigger"
columnClasses="twentyPercentColumn alignLeft minorPadding,
twentyPercentColumn alignLeft, defaultColumn alignCenter rightBorder"
- rowClasses="rowEven,rowOdd"
- cellpadding="0" cellspacing="0" border="0">
-
- <h:column>
- <h:outputText value="#{v.preferenceProperty.description}"/>
- </h:column>
- <h:column>
+ rowClasses="rowEven,rowOdd">
- <s:div rendered="#{v.preferenceProperty.type.simpleName == 'Boolean'}">
- <h:selectBooleanCheckbox value="#{v.value}"/>
- </s:div>
+ <c:forEach items="#{preferenceEditor.preferenceValues}" var="v">
- <s:div rendered="#{v.preferenceProperty.type.simpleName == 'String'}">
- <h:inputText styleClass="ajaxSupport" value="#{v.value}" size="25" rendered="#{!v.preferenceProperty.longStringAllowed}">
- <a:support event="onblur" action="#{preferenceEditor.validate}" oncomplete="onAjaxRequestComplete()"
- reRender="preferenceValidationErrors, preferenceComponentList"/>
- </h:inputText>
- <h:inputTextarea value="#{v.value}" rows="10" cols="35" style="margin:5px;" rendered="#{v.preferenceProperty.longStringAllowed}">
- <a:support event="onblur" action="#{preferenceEditor.validate}"
- reRender="preferenceValidationErrors, preferenceComponentList"/>
- </h:inputTextarea>
+ <s:div>
+ <h:outputText value="#{v.preferenceProperty.description}:"/>
</s:div>
- <s:div rendered="#{v.preferenceProperty.type.simpleName == 'Long'}">
- <h:inputText styleClass="ajaxSupport" value="#{v.value}" size="5">
- <f:converter converterId="javax.faces.Long"/>
- <a:support event="onblur" action="#{preferenceEditor.validate}" oncomplete="onAjaxRequestComplete()"
- reRender="preferenceValidationErrors, preferenceComponentList, propertyPanel"/>
- </h:inputText>
+ <s:div>
+ <ui:include src="preferences/#{v.preferenceProperty.editorIncludeName}.xhtml">
+ <ui:param name="v" value="#{v}"/>
+ </ui:include>
</s:div>
- <s:div rendered="#{v.preferenceProperty.type.simpleName == 'Double'}">
- <h:inputText styleClass="ajaxSupport" value="#{v.value}" size="10">
- <f:converter converterId="javax.faces.Double"/>
- <a:support event="onblur" action="#{preferenceEditor.validate}" oncomplete="onAjaxRequestComplete()"
- reRender="preferenceValidationErrors, preferenceComponentList"/>
- </h:inputText>
- </s:div>
-
- <s:div rendered="#{v.preferenceProperty.type.simpleName == 'Date'}">
- <h:inputText styleClass="ajaxSupport" id="dt" value="#{v.value}">
- <f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
- <a:support event="onblur" action="#{preferenceEditor.validate}" oncomplete="onAjaxRequestComplete()"
- reRender="preferenceValidationErrors, preferenceComponentList"/>
- </h:inputText>
- <s:selectDate for="dt" dateFormat="dd. MMM yyyy, HH:mm">
- <h:graphicImage style="vertical-align:bottom;margin-bottom:2px;"
- value="/themes/#{wikiPreferences.themeName}/img/icon.calendar.gif"
- width="16" height="16"/>
- </s:selectDate>
- </s:div>
-
- </h:column>
- </h:dataTable>
+ </c:forEach>
+ </h:panelGrid>
</a:region>
</s:div>
1.11 +3 -3 jboss-seam/examples/wiki/view/includes/wikiTextEditor.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: wikiTextEditor.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/wikiTextEditor.xhtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- wikiTextEditor.xhtml 20 Dec 2007 18:35:54 -0000 1.10
+++ wikiTextEditor.xhtml 30 Dec 2007 02:33:20 -0000 1.11
@@ -9,7 +9,7 @@
<!-- TODO: Most of this Javascript could be made generic and not rendered for each and every
text editor on the page (luckily we usually have just one)... -->
-<script type="text/javascript" src="#{wikiPreferences.baseUrl}/seam/resource/remoting/interface.js?wikiTextEditor"></script>
+<script type="text/javascript" src="#{preferences.get('Wiki').baseUrl}/seam/resource/remoting/interface.js?wikiTextEditor"></script>
<script type="text/javascript">
Seam.Remoting.getContext().setConversationId('#{conversation.id}');
@@ -61,7 +61,7 @@
<s:div styleClass="errorMessage" rendered="#{wiki:hasMessage(namingContainer, wiki:concat(textEditorId, 'TextArea'))}">
<h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/attention.gif"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif"
width="18" height="18"
styleClass="attentionImage"/>
<s:span styleClass="attentionMessage"> <span id="#{textEditorId}MessageText"><h:message for="#{textEditorId}TextArea"/></span></s:span>
@@ -114,7 +114,7 @@
</h:inputTextarea>
<ui:decorate template="helpPopupButton.xhtml">
- <ui:param name="label" value="?"/>
+ <ui:param name="label" value="#{messages['lacewiki.button.help.Help']}"/>
<ui:param name="width" value="450"/>
<ui:param name="height" value="350"/>
<ui:param name="offsetId" value="#{namingContainer}\\\\:#{textEditorId}TextEditDiv"/>
1.8 +2 -2 jboss-seam/examples/wiki/view/includes/pluginPreferencesForm.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pluginPreferencesForm.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/pluginPreferencesForm.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- pluginPreferencesForm.xhtml 19 Dec 2007 04:29:19 -0000 1.7
+++ pluginPreferencesForm.xhtml 30 Dec 2007 02:33:20 -0000 1.8
@@ -60,11 +60,11 @@
<s:div rendered="#{v.preferenceProperty.type.simpleName == 'Date'}">
<h:inputText id="dt" value="#{v.value}" tabindex="1">
- <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:inputText>
<s:selectDate for="dt" dateFormat="dd. MMM yyyy, HH:mm">
<h:graphicImage style="vertical-align:bottom;margin-bottom:2px;"
- value="/themes/#{wikiPreferences.themeName}/img/icon.calendar.gif" width="16"
+ value="/themes/#{preferences.get('Wiki').themeName}/img/icon.calendar.gif" width="16"
height="16"/>
</s:selectDate>
</s:div>
1.2 +3 -3 jboss-seam/examples/wiki/view/includes/wikiUploadImageEditor.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: wikiUploadImageEditor.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/wikiUploadImageEditor.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- wikiUploadImageEditor.xhtml 19 Dec 2007 04:29:19 -0000 1.1
+++ wikiUploadImageEditor.xhtml 30 Dec 2007 02:33:20 -0000 1.2
@@ -22,17 +22,17 @@
<a:commandLink status="uploadEditFormStatus" id="zoomOut" tabindex="2" action="#{editor.zoomPreviewOut}"
reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/minus.gif" width="18" height="18"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/minus.gif" width="18" height="18"/>
</a:commandLink>
<a:commandLink status="uploadEditFormStatus" id="actualSize" tabindex="2" action="#{editor.zoomActualSize}"
reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/equals.gif" width="18" height="18"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/equals.gif" width="18" height="18"/>
</a:commandLink>
<a:commandLink status="uploadEditFormStatus" id="zoomIn" tabindex="2" action="#{editor.zoomPreviewIn}"
reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/plus.gif" width="18" height="18"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/plus.gif" width="18" height="18"/>
</a:commandLink>
</a:region>
</h:panelGroup>
1.16 +2 -2 jboss-seam/examples/wiki/view/includes/attachmentDisplay.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: attachmentDisplay.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/attachmentDisplay.xhtml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- attachmentDisplay.xhtml 19 Dec 2007 04:29:19 -0000 1.15
+++ attachmentDisplay.xhtml 30 Dec 2007 02:33:20 -0000 1.16
@@ -21,10 +21,10 @@
<s:span><a name="attachment#{uiComponent['attachmentTable'].rowIndex + 1}"/></s:span>
<h:outputText value="# #{uiComponent['attachmentTable'].rowIndex + 1}"/>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes[link.file.contentType].displayIcon}"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes[link.file.contentType].displayIcon}"
rendered="#{not empty uploadTypes[link.file.contentType]}" width="18" height="20"/>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes['generic'].displayIcon}"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/#{uploadTypes['generic'].displayIcon}"
rendered="#{empty uploadTypes[link.file.contentType]}" width="18" height="20"/>
</h:panelGrid>
</h:column>
1.11 +16 -16 jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ownerSelector.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ownerSelector.xhtml 19 Dec 2007 13:33:34 -0000 1.10
+++ ownerSelector.xhtml 30 Dec 2007 02:33:20 -0000 1.11
@@ -75,17 +75,17 @@
<a:commandLink action="#{userSearch.firstPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="20"
oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger">
- <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"/>
</a:commandLink>
- <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="#{!userSearch.previousPageAvailable}"/>
<a:commandLink action="#{userSearch.previousPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="20"
oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger">
- <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"/>
</a:commandLink>
- <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="#{!userSearch.previousPageAvailable}"/>
<h:outputText value="#{messages['lacewiki.label.userList.Found']} #{userSearch.rowCount} #{messages['lacewiki.label.userList.Members']}"/>
@@ -93,17 +93,17 @@
<a:commandLink action="#{userSearch.nextPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="20"
oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger">
- <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"/>
</a:commandLink>
- <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="#{!userSearch.nextPageAvailable}"/>
<a:commandLink action="#{userSearch.lastPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="20"
oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger">
- <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"/>
</a:commandLink>
- <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="#{!userSearch.nextPageAvailable}"/>
</h:panelGrid>
@@ -128,9 +128,9 @@
<a:commandLink action="#{userSearch.sortBy('username')}" tabindex="20" reRender="dialogOwnerSelectionContent"
oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
<h:outputText value="#{messages['lacewiki.label.userList.Username']}"/>
</a:commandLink>
@@ -144,9 +144,9 @@
<a:commandLink action="#{userSearch.sortBy('firstname')}" tabindex="20" reRender="dialogOwnerSelectionContent"
oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
<h:outputText value="#{messages['lacewiki.label.userList.FirstName']}"/>
</a:commandLink>
@@ -159,9 +159,9 @@
<a:commandLink action="#{userSearch.sortBy('lastname')}" tabindex="20" reRender="dialogOwnerSelectionContent"
oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
<h:outputText value="#{messages['lacewiki.label.userList.LastName']}"/>
</a:commandLink>
@@ -174,9 +174,9 @@
<a:commandLink action="#{userSearch.sortBy('email')}" tabindex="20" reRender="dialogOwnerSelectionContent"
oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
<h:outputText value="#{messages['lacewiki.label.userList.Email']}"/>
</a:commandLink>
1.2 +1 -1 jboss-seam/examples/wiki/view/includes/captchaEntry.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: captchaEntry.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/captchaEntry.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- captchaEntry.xhtml 19 Dec 2007 04:29:19 -0000 1.1
+++ captchaEntry.xhtml 30 Dec 2007 02:33:20 -0000 1.2
@@ -11,7 +11,7 @@
<s:div styleClass="errorMessage" rendered="#{invalid}">
<h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/attention.gif"
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/attention.gif"
width="18" height="18"
styleClass="attentionImage"/>
<s:span styleClass="attentionMessage"> <s:message/></s:span>
1.18 +1 -1 jboss-seam/examples/wiki/view/includes/userControl.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userControl.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/userControl.xhtml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- userControl.xhtml 19 Dec 2007 04:29:19 -0000 1.17
+++ userControl.xhtml 30 Dec 2007 02:33:20 -0000 1.18
@@ -24,7 +24,7 @@
<s:link styleClass="userControlLink" tabindex="50"
accesskey="#{messages['lacewiki.button.userControl.Register.accesskey']}"
view="/userRegister_#{skin}.xhtml" propagation="none"
- rendered="#{userManagementPreferences.properties['enableRegistration']}">
+ rendered="#{preferences.get('UserManagement').enableRegistration}">
<h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Register']}"/>
</s:link>
1.5 +2 -2 jboss-seam/examples/wiki/view/includes/statusIndicator.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: statusIndicator.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/statusIndicator.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- statusIndicator.xhtml 19 Dec 2007 04:29:19 -0000 1.4
+++ statusIndicator.xhtml 30 Dec 2007 02:33:20 -0000 1.5
@@ -10,12 +10,12 @@
<a:status id="#{statusId}" forceId="true">
<f:facet name="start">
<s:div styleClass="statusStart">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/statusindicator.gif" width="20" height="25"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/statusindicator.gif" width="20" height="25"/>
</s:div>
</f:facet>
<f:facet name="stop">
<s:div styleClass="statusStop">
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="20" height="25"/>
+ <h:graphicImage value="/themes/#{preferences.get('Wiki').themeName}/img/blank.gif" width="20" height="25"/>
</s:div>
</f:facet>
</a:status>
More information about the jboss-cvs-commits
mailing list