[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Mon Apr 2 14:25:05 EDT 2007
User: cbauer
Date: 07/04/02 14:25:05
Modified: examples/wiki/view userProfile.xhtml
dirDisplay.xhtml userList.xhtml docDisplay.xhtml
dirEdit.xhtml message.xhtml fileEdit.xhtml
docEdit.xhtml docHistory.xhtml userPrefs.xhtml
userAccount.xhtml
Added: examples/wiki/view adminPrefs.xhtml
adminRoles.xhtml adminHome.xhtml
Log:
Totally overengineered but definitely cool system/user/instance wiki preferences architecture
Revision Changes Path
1.7 +2 -2 jboss-seam/examples/wiki/view/userProfile.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userProfile.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userProfile.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- userProfile.xhtml 21 Mar 2007 17:32:23 -0000 1.6
+++ userProfile.xhtml 2 Apr 2007 18:25:04 -0000 1.7
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
@@ -14,7 +14,7 @@
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
</ui:define>
-<ui:define name="screenname">Member Profile</ui:define>
+<ui:define name="screenname">Member Profile '#{userHome.instance.username}'</ui:define>
<ui:define name="headerTopRight">
<ui:include src="includes/userControl.xhtml"/>
1.12 +7 -7 jboss-seam/examples/wiki/view/dirDisplay.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirDisplay.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay.xhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- dirDisplay.xhtml 19 Mar 2007 04:53:53 -0000 1.11
+++ dirDisplay.xhtml 2 Apr 2007 18:25:04 -0000 1.12
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
@@ -86,23 +86,23 @@
<s:link view="/dirDisplay.xhtml" tabindex="1"
rendered="#{!empty currentDirectory.parent and s:hasPermission('Node','read',currentDirectory.parent)}">
<f:param name="nodeId" value="#{currentDirectory.parent.id}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/icon.dirup.gif" width="18" height="20"/>
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dirup.gif" width="18" height="20"/>
</s:link>
</f:facet>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/icon.dir.gif"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dir.gif"
width="18" height="20"
rendered="#{wiki:isDirectory(node)}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/icon.doc.gif"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.gif"
width="18" height="20"
rendered="#{wiki:isDocument(node) and node != currentDirectory.defaultDocument}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/icon.doc.default.gif"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.default.gif"
width="18" height="20"
rendered="#{wiki:isDocument(node) and node == currentDirectory.defaultDocument}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/#{fileMetaMap[node.contentType].displayIcon}"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{fileMetaMap[node.contentType].displayIcon}"
width="18" height="20"
rendered="#{wiki:isFile(node) and !empty fileMetaMap[node.contentType]}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/#{fileMetaMap['generic'].displayIcon}"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{fileMetaMap['generic'].displayIcon}"
width="18" height="20"
rendered="#{wiki:isFile(node) and empty fileMetaMap[node.contentType]}"/>
</h:column>
1.10 +20 -20 jboss-seam/examples/wiki/view/userList.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userList.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList.xhtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- userList.xhtml 21 Mar 2007 17:32:23 -0000 1.9
+++ userList.xhtml 2 Apr 2007 18:25:04 -0000 1.10
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
@@ -95,29 +95,29 @@
rendered="#{userSearch.rowCount > 0}">
<h:commandLink action="#{userSearch.firstPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="7">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/page.first.gif" width="13" height="11"/>
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.first.gif" width="13" height="11"/>
</h:commandLink>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/blank.gif" width="13" height="11"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
rendered="#{!userSearch.previousPageAvailable}"/>
<h:commandLink action="#{userSearch.previousPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="7">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/page.previous.gif" width="13" height="11"/>
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.previous.gif" width="13" height="11"/>
</h:commandLink>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/blank.gif" width="13" height="11"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
rendered="#{!userSearch.previousPageAvailable}"/>
<h:outputText value="Found: #{userSearch.rowCount} member(s)"/>
<h:commandLink action="#{userSearch.nextPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="7">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/page.next.gif" width="13" height="11"/>
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.next.gif" width="13" height="11"/>
</h:commandLink>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/blank.gif" width="13" height="11"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
rendered="#{!userSearch.nextPageAvailable}"/>
<h:commandLink action="#{userSearch.lastPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="7">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/page.last.gif" width="13" height="11"/>
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.last.gif" width="13" height="11"/>
</h:commandLink>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/blank.gif" width="13" height="11"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
rendered="#{!userSearch.nextPageAvailable}"/>
</h:panelGrid>
@@ -138,9 +138,9 @@
<h:column>
<f:facet name="header">
<h:commandLink action="#{userSearch.sortBy('username')}" tabindex="8">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.up.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.down.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
Username
</h:commandLink>
@@ -152,9 +152,9 @@
<h:column>
<f:facet name="header">
<h:commandLink action="#{userSearch.sortBy('firstname')}" tabindex="9">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.up.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.down.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
First name
</h:commandLink>
@@ -165,9 +165,9 @@
<h:column>
<f:facet name="header">
<h:commandLink action="#{userSearch.sortBy('lastname')}" tabindex="10">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.up.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.down.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
Last name
</h:commandLink>
@@ -178,9 +178,9 @@
<h:column>
<f:facet name="header">
<h:commandLink action="#{userSearch.sortBy('email')}" tabindex="11">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.up.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.down.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
E-mail address
</h:commandLink>
@@ -191,9 +191,9 @@
<h:column>
<f:facet name="header">
<h:commandLink action="#{userSearch.sortBy('createdOn')}" tabindex="12">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.up.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'createdOn'}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/sortindicator.down.gif" width="8" height="8"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'createdOn'}"/>
Joined on
</h:commandLink>
@@ -203,7 +203,7 @@
</h:outputText>
</h:column>
- <h:column>
+ <h:column rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
<s:link view="/userAccount.xhtml" value="Edit">
<f:param name="userId" value="#{u.id}"/>
</s:link>
1.13 +5 -2 jboss-seam/examples/wiki/view/docDisplay.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docDisplay.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay.xhtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- docDisplay.xhtml 22 Mar 2007 12:16:08 -0000 1.12
+++ docDisplay.xhtml 2 Apr 2007 18:25:04 -0000 1.13
@@ -5,8 +5,9 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:wiki="http://jboss.com/products/seam/wiki"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
@@ -50,7 +51,9 @@
linkStyleClass="regularLink"
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
- thumbnailLinkStyleClass="regularLink"/>
+ thumbnailLinkStyleClass="regularLink">
+
+ </wiki:formattedText>
<ui:include src="includes/attachmentDisplay.xhtml"/>
1.15 +7 -7 jboss-seam/examples/wiki/view/dirEdit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirEdit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirEdit.xhtml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- dirEdit.xhtml 20 Mar 2007 02:38:14 -0000 1.14
+++ dirEdit.xhtml 2 Apr 2007 18:25:04 -0000 1.15
@@ -7,7 +7,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:rich="http://richfaces.ajax4jsf.org/rich"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
@@ -112,7 +112,7 @@
<h:commandLink id="nodeUp" tabindex="1"
action="#{directoryHome.moveNodeUpInList}"
rendered="#{wikiUtil.datatable.rowIndex > 0}">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/up.gif" width="18" height="18"/>
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/up.gif" width="18" height="18"/>
</h:commandLink>
</h:column>
@@ -120,7 +120,7 @@
<h:commandLink id="nodeDown" tabindex="2"
action="#{directoryHome.moveNodeDownInList}"
rendered="#{wikiUtil.datatable.rowIndex+1 lt wikiUtil.datatable.rowCount}">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/down.gif" width="18" height="18"/>
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/down.gif" width="18" height="18"/>
</h:commandLink>
</h:column>
@@ -129,17 +129,17 @@
</h:column>
<h:column>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/icon.dir.gif"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dir.gif"
width="18" height="20"
rendered="#{wiki:isDirectory(node)}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/icon.doc.gif"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.gif"
width="18" height="20"
rendered="#{wiki:isDocument(node)}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/#{fileMetaMap[node.contentType].displayIcon}"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{fileMetaMap[node.contentType].displayIcon}"
width="18" height="20"
rendered="#{wiki:isFile(node) and !empty fileMetaMap[node.contentType]}"/>
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/#{fileMetaMap['generic'].displayIcon}"
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{fileMetaMap['generic'].displayIcon}"
width="18" height="20"
rendered="#{wiki:isFile(node) and empty fileMetaMap[node.contentType]}"/>
</h:column>
1.2 +1 -1 jboss-seam/examples/wiki/view/message.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: message.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/message.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- message.xhtml 21 Feb 2007 16:24:11 -0000 1.1
+++ message.xhtml 2 Apr 2007 18:25:04 -0000 1.2
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="screenname">Message</ui:define>
1.8 +5 -5 jboss-seam/examples/wiki/view/fileEdit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: fileEdit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/fileEdit.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- fileEdit.xhtml 20 Mar 2007 02:38:14 -0000 1.7
+++ fileEdit.xhtml 2 Apr 2007 18:25:04 -0000 1.8
@@ -7,7 +7,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:rich="http://richfaces.ajax4jsf.org/rich"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
@@ -93,8 +93,8 @@
<div class="entry">
<div class="label">Image Preview:</div>
<div class="output">
- <h:outputLink value="#{facesContext.externalContext.requestContextPath}/files/download?fileId=#{fileHome.instance.id}"><h:graphicImage
- style="border: 1px solid black;" value="/files/download?fileId=#{fileHome.instance.id}&width=#{fileHome.imagePreviewSize}&conversationId=#{conversation.id}"/>
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}/files/download.seam?fileId=#{fileHome.instance.id}"><h:graphicImage
+ style="border: 1px solid black;" value="/files/download.seam?fileId=#{fileHome.instance.id}&width=#{fileHome.imagePreviewSize}&conversationId=#{conversation.id}"/>
</h:outputLink>
</div>
@@ -105,10 +105,10 @@
<div class="input">
<h:panelGroup>
<h:commandLink id="zoomOut" tabindex="2" action="#{fileHome.zoomPreviewOut}">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/minus.gif" width="18" height="18"/>
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/minus.gif" width="18" height="18"/>
</h:commandLink>
<h:commandLink id="zoomIn" tabindex="3" action="#{fileHome.zoomPreviewIn}">
- <h:graphicImage value="/themes/#{globalPrefs.themeName}/img/plus.gif" width="18" height="18"/>
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/plus.gif" width="18" height="18"/>
</h:commandLink>
</h:panelGroup>
</div>
1.19 +14 -2 jboss-seam/examples/wiki/view/docEdit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docEdit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit.xhtml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- docEdit.xhtml 22 Mar 2007 12:16:08 -0000 1.18
+++ docEdit.xhtml 2 Apr 2007 18:25:04 -0000 1.19
@@ -9,7 +9,7 @@
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:rich="http://richfaces.ajax4jsf.org/rich"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
@@ -119,12 +119,24 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.enabledPreview}" tabindex="3">
- <a:support event="onchange" reRender="preview,attachmentDisplay,content"/>
+ <a:support event="onchange" reRender="preview,attachmentDisplay,content,pluginSwitch"/>
</h:selectBooleanCheckbox>
Show interactive preview
</div>
</s:div>
+ <s:div id="pluginSwitch">
+ <s:div styleClass="entry" rendered="#{documentHome.enabledPreview}">
+ <div class="label"> </div>
+ <div class="input">
+ <h:selectBooleanCheckbox value="#{documentHome.showPluginPrefs}" tabindex="3">
+ <a:support event="onchange" reRender="preview"/>
+ </h:selectBooleanCheckbox>
+ Show plugin settings in preview
+ </div>
+ </s:div>
+ </s:div>
+
<s:div styleClass="entry" rendered="#{documentHome.managed}">
<div class="label"> </div>
<div class="input">
1.5 +1 -1 jboss-seam/examples/wiki/view/docHistory.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docHistory.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- docHistory.xhtml 21 Mar 2007 17:32:23 -0000 1.4
+++ docHistory.xhtml 2 Apr 2007 18:25:04 -0000 1.5
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
1.7 +4 -7 jboss-seam/examples/wiki/view/userPrefs.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userPrefs.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userPrefs.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- userPrefs.xhtml 21 Mar 2007 17:32:23 -0000 1.6
+++ userPrefs.xhtml 2 Apr 2007 18:25:04 -0000 1.7
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
@@ -14,7 +14,7 @@
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
</ui:define>
-<ui:define name="screenname">Member Preferences</ui:define>
+<ui:define name="screenname">Member Preferences '#{userHome.instance.username}'</ui:define>
<ui:define name="headerTopRight">
<ui:include src="includes/userControl.xhtml"/>
@@ -23,8 +23,7 @@
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
- <ui:include src="includes/searchControl.xhtml"/>
- <ui:include src="includes/mainMenu.xhtml"/>
+ <ui:include src="includes/preferencesMenu.xhtml"/>
</ui:define>
<ui:define name="controlLeft">
@@ -42,9 +41,7 @@
</ui:define>
<ui:define name="content">
-
- Not implemented.
-
+ <ui:include src="includes/preferencesForm.xhtml"/>
</ui:define>
<ui:define name="footer"> </ui:define>
1.7 +2 -2 jboss-seam/examples/wiki/view/userAccount.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userAccount.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userAccount.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- userAccount.xhtml 21 Mar 2007 17:32:23 -0000 1.6
+++ userAccount.xhtml 2 Apr 2007 18:25:04 -0000 1.7
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
- template="themes/#{globalPrefs.themeName}/template.xhtml">
+ template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
@@ -16,7 +16,7 @@
<ui:define name="screenname">
<h:outputText value="Registration" rendered="#{!userHome.managed}"/>
- <h:outputText value="Member Account" rendered="#{userHome.managed}"/>
+ <h:outputText value="Member Account '#{userHome.instance.username}'" rendered="#{userHome.managed}"/>
</ui:define>
<ui:define name="headerTopRight">
1.1 date: 2007/04/02 18:25:04; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/adminPrefs.xhtml
Index: adminPrefs.xhtml
===================================================================
<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/blogCalendar.css" rel="stylesheet" type="text/css"/>
</ui:define>
<ui:define name="screenname">
<h:outputText value="System Administration"/>
</ui:define>
<ui:define name="headerTopRight">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/preferencesMenu.xhtml"/>
</ui:define>
<ui:define name="controlLeft">
<s:link id="adminHome" styleClass="linkTab inactiveTab" action="adminHome">Admin Home</s:link>
<s:link id="editRoles" styleClass="linkTab inactiveTab" action="adminRoles">Roles/Permissions</s:link>
<s:link id="editPreferences" styleClass="linkTab activeTab" action="adminPrefs">System Preferences</s:link>
</ui:define>
<ui:define name="controlRight">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit</s:link>
</ui:define>
<ui:define name="content">
<ui:include src="includes/preferencesForm.xhtml"/>
</ui:define>
<ui:define name="footer"> </ui:define>
</ui:composition>
1.1 date: 2007/04/02 18:25:04; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/adminRoles.xhtml
Index: adminRoles.xhtml
===================================================================
<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
</ui:define>
<ui:define name="screenname">
<h:outputText value="System Administration"/>
</ui:define>
<ui:define name="headerTopRight">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar"> </ui:define>
<ui:define name="controlLeft">
<s:link id="adminHome" styleClass="linkTab inactiveTab" action="adminHome">Admin Home</s:link>
<s:link id="editRoles" styleClass="linkTab activeTab" action="adminRoles">Roles/Permissions</s:link>
<s:link id="editPreferences" styleClass="linkTab inactiveTab" action="adminPrefs">System Preferences</s:link>
</ui:define>
<ui:define name="controlRight">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit</s:link>
</ui:define>
<ui:define name="content">
Not implemented
</ui:define>
<ui:define name="footer"> </ui:define>
</ui:composition>
1.1 date: 2007/04/02 18:25:04; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/adminHome.xhtml
Index: adminHome.xhtml
===================================================================
<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="includeHeaders">
<link href="#{themePath}/css/userControl.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/searchControl.css" rel="stylesheet" type="text/css"/>
</ui:define>
<ui:define name="screenname">
<h:outputText value="System Administration"/>
</ui:define>
<ui:define name="headerTopRight">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="sidebar"> </ui:define>
<ui:define name="controlLeft">
<s:link id="adminHome" styleClass="linkTab activeTab" action="adminHome">Admin Home</s:link>
<s:link id="editRoles" styleClass="linkTab inactiveTab" action="adminRoles">Roles/Permissions</s:link>
<s:link id="editPreferences" styleClass="linkTab inactiveTab" action="adminPrefs">System Preferences</s:link>
</ui:define>
<ui:define name="controlRight">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit</s:link>
</ui:define>
<ui:define name="content">
Admin home. We can show some (live) statistics here.
</ui:define>
<ui:define name="footer"> </ui:define>
</ui:composition>
More information about the jboss-cvs-commits
mailing list