[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Sat Aug 25 13:59:21 EDT 2007
User: cbauer
Date: 07/08/25 13:59:21
Modified: examples/wiki/view docHistory.xhtml
dirDisplay.xhtml message.xhtml dirEdit.xhtml
docDisplay.xhtml userHome.xhtml userRegister.xhtml
search.xhtml fileEdit.xhtml docEdit.xhtml
adminHome.xhtml userList.xhtml
Log:
Major refactoring of navigation
Revision Changes Path
1.10 +1 -3 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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- docHistory.xhtml 17 Aug 2007 13:00:25 -0000 1.9
+++ docHistory.xhtml 25 Aug 2007 17:59:21 -0000 1.10
@@ -13,9 +13,7 @@
<ui:define name="controlTwo">
- <s:link id="exit" styleClass="linkNavigation"
- action="#{browser.exitConversation(true)}"
- accesskey="E"><u>E</u>xit</s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
</ui:define>
1.21 +66 -50 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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- dirDisplay.xhtml 17 Aug 2007 13:00:25 -0000 1.20
+++ dirDisplay.xhtml 25 Aug 2007 17:59:21 -0000 1.21
@@ -8,74 +8,89 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
-<ui:define name="screenname">#{currentDirectory.name}</ui:define>
+<ui:define name="screenname">#{directoryHome.instance.name}</ui:define>
<ui:define name="controlTwo">
- <h:panelGroup rendered="#{!empty currentDirectory.parent}">
- <s:link id="createDir" styleClass="linkNavigation" action="createDir" accesskey="S"
- rendered="#{s:hasPermission('Node', 'create', currentDirectory)}">New <u>S</u>ubdirectory</s:link>
-
- <s:link id="editDir" styleClass="linkNavigation" action="editDir" accesskey="E"
- rendered="#{s:hasPermission('Node', 'edit', currentDirectory)}"><u>E</u>dit Directory</s:link>
-
- <s:link id="createDoc" styleClass="linkNavigation" action="createDoc" accesskey="N"
- rendered="#{s:hasPermission('Node', 'create', currentDirectory)}"><u>N</u>ew Document</s:link>
-
- <s:link id="uploadFile" styleClass="linkNavigation" action="uploadFile" accesskey="U"
- rendered="#{s:hasPermission('Node', 'create', currentDirectory)}"><u>U</u>pload File</s:link>
-
- <h:outputLink styleClass="linkNavigation" rendered="#{not empty currentDirectory.feed}"
- value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{currentDirectory.feed.id}">
- Subscribe
- </h:outputLink>
+ <s:fragment rendered="#{!empty directoryHome.parentDirectory}">
- </h:panelGroup>
+ <s:link id="createDir" styleClass="linkNavigation" accesskey="S" view="/dirEdit.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">New <u>S</u>ubdirectory
+ <f:param name="directoryId"/>
+ <f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
+ </s:link>
+
+ <s:link id="editDir" styleClass="linkNavigation" accesskey="E" view="/dirEdit.xhtml"
+ rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}"><u>E</u>dit Directory</s:link>
+
+ <s:link id="createDoc" styleClass="linkNavigation" accesskey="N" view="/docEdit.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}"><u>N</u>ew Document
+ <f:param name="documentId"/>
+ <f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
+ </s:link>
+
+ <s:link id="uploadFile" styleClass="linkNavigation" accesskey="U" view="/fileEdit.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}"><u>U</u>pload File
+ <f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
+ </s:link>
+
+ </s:fragment>
+
+ <s:fragment rendered="#{empty directoryHome.parentDirectory}">
+ <s:link id="createArea" styleClass="linkNavigation" accesskey="N" view="/dirEdit.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}"><u>N</u>ew Area
+ <f:param name="directoryId"/>
+ <f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
+ </s:link>
+
+ <s:link id="editRoot" styleClass="linkNavigation" accesskey="E" view="/dirEdit.xhtml"
+ rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}"><u>E</u>dit Wiki Root
+ <f:param name="parentDirectoryId"/>
+ </s:link>
+
+ </s:fragment>
+
+ <h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{directoryHome.instance.feed.id}"
+ styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}">Subscribe</h:outputLink>
- <h:panelGroup rendered="#{empty currentDirectory.parent}">
- <s:link id="createArea" styleClass="linkNavigation" action="createDir" accesskey="N"
- rendered="#{s:hasPermission('Node', 'create', currentDirectory)}"><u>N</u>ew Area</s:link>
-
- <s:link id="editRoot" styleClass="linkNavigation" action="editDir" accesskey="E"
- rendered="#{s:hasPermission('Node', 'edit', currentDirectory)}"><u>E</u>dit Wiki Root</s:link>
-
- <h:outputLink styleClass="linkNavigation" rendered="#{not empty currentDirectory.feed}"
- value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{currentDirectory.feed.id}">
- Subscribe
- </h:outputLink>
- </h:panelGroup>
</ui:define>
<ui:define name="content">
<div class="directoryPathPanel">
+
+ <s:link view="/dirDisplay.xhtml" value="#{wikiRoot.name}" styleClass="directoryButton" tabindex="1">
+ <f:param name="directoryId" value="#{wikiRoot.id}"/>
+ </s:link>
+ <h:outputText value="/" styleClass="directorySeparator"/>
+
<h:panelGroup>
- <ui:repeat var="directory" value="#{currentDirectoryPath}">
+ <ui:repeat var="directory" value="#{breadcrumb}">
<s:link view="/dirDisplay.xhtml" value="#{directory.name}" styleClass="directoryButton" tabindex="1">
- <f:param name="nodeId" value="#{directory.id}"/>
+ <f:param name="directoryId" value="#{directory.id}"/>
</s:link>
- <h:outputText value="/" styleClass="directorySeparator" rendered="#{directory != currentDirectory}"/>
+ <h:outputText value="/" styleClass="directorySeparator" rendered="#{directory != directoryHome.instance}"/>
</ui:repeat>
</h:panelGroup>
</div>
- <s:div styleClass="directoryEmpty" rendered="#{empty currentDirectory.children}">
- <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}"/>
+ <s:div styleClass="directoryEmpty" rendered="#{empty directoryHome.instance.children}">
+ <s:link view="/dirDisplay.xhtml" tabindex="1" accesskey="."
+ rendered="#{!empty directoryHome.parentDirectory and s:hasPermission('Node','read',directoryHome.parentDirectory)}">
+ <f:param name="directoryId" value="#{directoryHome.parentDirectory.id}"/>
<h:panelGrid columns="2">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dirup.gif" width="18" height="20"/>
<h:outputText value=".."/>
</h:panelGrid>
</s:link>
- <h:outputText rendered="#{empty currentDirectory.parent or !s:hasPermission('Node','read',currentDirectory.parent)}"
+ <h:outputText rendered="#{empty directoryHome.parentDirectory or !s:hasPermission('Node','read',directoryHome.parentDirectory)}"
value="This directory is empty."/>
</s:div>
<h:dataTable id="directoryTable" var="node"
- value="#{currentDirectory.children}"
- rendered="#{!empty currentDirectory.children}"
+ value="#{directoryHome.instance.children}"
+ rendered="#{!empty directoryHome.instance.children}"
styleClass="datatable topLeftBottomBorder"
headerClass="regularHeader rightBorder"
columnClasses="onePercentColumn rightBorder alignCenter, defaultColumn rightBorder alignLeft,
@@ -86,9 +101,9 @@
<h:column>
<f:facet name="header">
- <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}"/>
+ <s:link view="/dirDisplay.xhtml" tabindex="1" accesskey="."
+ rendered="#{!empty directoryHome.parentDirectory and s:hasPermission('Node','read',directoryHome.parentDirectory)}">
+ <f:param name="directoryId" value="#{directoryHome.parentDirectory.id}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.dirup.gif" width="18" height="20"/>
</s:link>
</f:facet>
@@ -97,10 +112,10 @@
rendered="#{wiki:isDirectory(node)}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.gif"
width="18" height="20"
- rendered="#{wiki:isDocument(node) and node != currentDirectory.defaultDocument}"/>
+ rendered="#{wiki:isDocument(node) and node != directoryHome.instance.defaultDocument}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/icon.doc.default.gif"
width="18" height="20"
- rendered="#{wiki:isDocument(node) and node == currentDirectory.defaultDocument}"/>
+ rendered="#{wiki:isDocument(node) and node == directoryHome.instance.defaultDocument}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{fileMetaMap[node.contentType].displayIcon}"
width="18" height="20"
@@ -118,7 +133,7 @@
<s:span rendered="#{wiki:isDirectory(node)}">
<s:link id="browseDirectory" value="#{wiki:truncateString(node.name, 40, '...')}" view="/dirDisplay.xhtml"
rendered="#{s:hasPermission('Node','read',node)}" tabindex="2">
- <f:param name="nodeId" value="#{node.id}"/>
+ <f:param name="directoryId" value="#{node.id}"/>
</s:link>
<h:outputText value="#{wiki:truncateString(node.name, 40, '...')}" rendered="#{!s:hasPermission('Node','read',node)}"/>
</s:span>
@@ -131,8 +146,9 @@
</s:span>
<s:span rendered="#{wiki:isFile(node) and s:hasPermission('Node', 'edit', node)}">
- <s:link id="editFile" value="#{wiki:truncateString(node.name, 30, '...')}" action="editFile" tabindex="2">
+ <s:link id="editFile" value="#{wiki:truncateString(node.name, 30, '...')}" tabindex="2" view="/fileEdit.xhtml">
<f:param name="fileId" value="#{node.id}"/>
+ <f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
</s:link>
<h:outputText value=" (#{wiki:displayFilesize(node.filesize)}, #{node.contentType})"/>
</s:span>
1.6 +19 -19 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- message.xhtml 17 Aug 2007 13:00:25 -0000 1.5
+++ message.xhtml 25 Aug 2007 17:59:21 -0000 1.6
@@ -1,18 +1,20 @@
-<!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"
+<html 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">
+ xmlns:wiki="http://jboss.com/products/seam/wiki">
-<ui:define name="screenname">Message</ui:define>
+<head>
+ <title>Message</title>
+</head>
+<body>
+
+<div id="messageBox">
+ <h:messages/>
+</div>
-<ui:define name="content">
-
- <s:div id="stackTraceHandled" rendered="#{not empty org.jboss.seam.handledException}">
+ <s:div id="stackTraceHandled" rendered="#{init.debug and not empty org.jboss.seam.handledException}">
Handled exception:
<pre style="font-size:75%;">
@@ -30,7 +32,7 @@
<hr/>
</s:div>
- <s:div id="stackTrace" rendered="#{not empty org.jboss.seam.exception}">
+ <s:div id="stackTrace" rendered="#{init.debug and not empty org.jboss.seam.exception}">
Unhandled exception:
<pre style="font-size:75%;">
@@ -49,9 +51,7 @@
</s:div>
-</ui:define>
-
-<ui:define name="footer"> </ui:define>
-</ui:composition>
+</body>
+</html>
1.28 +12 -10 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.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- dirEdit.xhtml 17 Aug 2007 13:00:25 -0000 1.27
+++ dirEdit.xhtml 25 Aug 2007 17:59:21 -0000 1.28
@@ -16,9 +16,13 @@
</ui:define>
<ui:define name="controlTwo">
- <s:link id="exit" styleClass="linkNavigation"
- action="#{browser.exitConversation(true)}"
+
+ <s:link id="exitManaged" styleClass="linkNavigation" rendered="#{directoryHome.managed}" action="exitManaged"
+ accesskey="E"><u>E</u>xit Editor</s:link>
+
+ <s:link id="exitUnmanaged" styleClass="linkNavigation" rendered="#{!directoryHome.managed}" action="exitUnmanaged"
accesskey="E"><u>E</u>xit Editor</s:link>
+
</ui:define>
<ui:define name="content">
@@ -29,7 +33,7 @@
</ui:include>
</s:span>
-<s:span rendered="#{directoryHome.managed and !empty directoryHome.instance.parent and directoryHome.instance.id != wikiPreferences.memberAreaId}">
+<s:span rendered="#{directoryHome.managed and !empty directoryHome.parentDirectory and directoryHome.instance.id != wikiPreferences.memberAreaId}">
<ui:include src="includes/deleteConfirmation.xhtml">
<ui:param name="home" value="#{directoryHome}"/>
</ui:include>
@@ -39,10 +43,8 @@
<h:form id="directoryEditForm">
<div class="form">
<div class="formHead">
- <h:outputText value="New directory: #{directoryHome.instance.name}"
- rendered="#{!directoryHome.managed}"/>
- <h:outputText value="Editing directory: #{directoryHome.instance.name}"
- rendered="#{directoryHome.managed}"/>
+ <h:outputText value="New directory" rendered="#{!directoryHome.managed}"/>
+ <h:outputText value="Edit directory" rendered="#{directoryHome.managed}"/>
</div>
<div class="formFields formBorder">
@@ -83,7 +85,7 @@
</s:validateAll>
<s:span id="defaultDocumentSelector">
- <s:div styleClass="entry" rendered="#{directoryHome.managed and !empty directoryHome.instance.parent and !empty directoryHome.childDocuments}">
+ <s:div styleClass="entry" rendered="#{directoryHome.managed and !empty directoryHome.parentDirectory and !empty directoryHome.childDocuments}">
<div class="label">Default document:</div>
<div class="input">
<h:selectOneMenu value="#{directoryHome.instance.defaultDocument}" converter="#{restrictedEntityConverter}" tabindex="2">
@@ -159,7 +161,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{directoryHome.hasFeed}" tabindex="2"
- disabled="#{empty directoryHome.instance.parent}"/>
+ disabled="#{empty directoryHome.parentDirectory}"/>
Enable syndication feed (disabling invalidates subcriber link)
<a:commandLink id="resetFeed" reRender="messageBoxContainer"
action="#{directoryHome.resetFeed}"
@@ -186,7 +188,7 @@
tabindex="7" accesskey="U"><span class="buttonLabel"><u>U</u>pdate</span></h:commandLink>
<h:outputLink id="delete" value="#" tabindex="8" accesskey="D" styleClass="button"
- rendered="#{directoryHome.managed and !empty directoryHome.instance.parent and directoryHome.instance.id != wikiPreferences.memberAreaId}"><j4j:idProxy
+ rendered="#{directoryHome.managed and !empty directoryHome.parentDirectory and directoryHome.instance.id != wikiPreferences.memberAreaId}"><j4j:idProxy
id="openDialogDelete"/><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
</div>
1.21 +15 -13 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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- docDisplay.xhtml 17 Aug 2007 13:00:25 -0000 1.20
+++ docDisplay.xhtml 25 Aug 2007 17:59:21 -0000 1.21
@@ -14,7 +14,7 @@
<link href="#{themePath}/css/breadcrumb.css" rel="stylesheet" type="text/css"/>
</ui:define>
-<ui:define name="screenname">#{currentDocument.name}</ui:define>
+<ui:define name="screenname">#{documentHome.instance.name}</ui:define>
<ui:define name="headerBottomOne">
<ui:include src="includes/breadcrumb.xhtml"/>
@@ -22,14 +22,17 @@
<ui:define name="controlTwo">
- <s:link id="createDoc" styleClass="linkNavigation" action="createDoc" accesskey="C"
- rendered="#{s:hasPermission('Node', 'create', currentDirectory)}"><u>C</u>reate</s:link>
+ <s:link id="editDoc" styleClass="linkNavigation" accesskey="E" view="/docEdit.xhtml"
+ rendered="#{s:hasPermission('Node', 'edit', documentHome.instance)}"><u>E</u>dit</s:link>
- <s:link id="editDoc" styleClass="linkNavigation" action="editDoc" accesskey="E"
- rendered="#{s:hasPermission('Node', 'edit', currentDocument)}"><u>E</u>dit</s:link>
-
- <s:link id="showHistory" styleClass="linkNavigation" action="showHistory" accesskey="I">H<u>i</u>story</s:link>
- <s:link id="browseDir" styleClass="linkNavigation" action="browseDir" accesskey="B"><u>B</u>rowse</s:link>
+ <s:link id="showHistory" styleClass="linkNavigation" accesskey="I" view="/docHistory.xhtml"
+ rendered="#{documentHome.historicalNodesPresent}">H<u>i</u>story
+ <f:param name="nodeId" value="#{documentHome.nodeId}"/>
+ </s:link>
+
+ <s:link id="browseDir" styleClass="linkNavigation" accesskey="B" view="/dirDisplay.xhtml"><u>B</u>rowse
+ <f:param name="directoryId" value="#{documentHome.parentDirectory.id}"/>
+ </s:link>
</ui:define>
@@ -39,17 +42,16 @@
clearContentBackground();
});</script>
-
<div id="documentDisplayContainer" class="shadowContainer"><div class="shadow1"><div class="shadow2">
<s:div id="documentDisplay" styleClass="documentDisplay"><j4j:idProxy id="documentDisplay_" />
- <s:div rendered="#{currentDocument.nameAsTitle}"><h1 class="documentTitle">#{currentDocument.name}</h1></s:div>
- <wiki:formattedText value="#{currentDocument.content}"
+ <s:div rendered="#{documentHome.instance.nameAsTitle}"><h1 class="documentTitle">#{documentHome.instance.name}</h1></s:div>
+ <wiki:formattedText value="#{documentHome.instance.content}"
linkStyleClass="regularLink"
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
thumbnailLinkStyleClass="regularLink"
- renderBaseDocument="#{currentDocument}"
- renderBaseDirectory="#{currentDirectory}"
+ renderBaseDocument="#{documentHome.instance}"
+ renderBaseDirectory="#{documentHome.parentDirectory}"
enablePlugins="true"/>
</s:div>
</div></div></div>
1.12 +7 -4 jboss-seam/examples/wiki/view/userHome.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userHome.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome.xhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- userHome.xhtml 17 Aug 2007 13:00:25 -0000 1.11
+++ userHome.xhtml 25 Aug 2007 17:59:21 -0000 1.12
@@ -16,9 +16,7 @@
<ui:define name="controlTwo">
- <s:link id="exit" styleClass="linkNavigation"
- action="#{browser.exitConversation(true)}"
- accesskey="E"><u>E</u>xit</s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
</ui:define>
@@ -34,16 +32,21 @@
<div class="form">
<script type="text/javascript">jQuery(function() {
- jQuery('#formTabs').tabs({onClick: function(){formTabClicked()} });
+ jQuery('#formTabs').tabs(2, {onClick: function(){formTabClicked()} });
});</script>
<div id="formTabs">
<ul>
+ <li class="formTabsTitle">
+ <h:outputText value="Edit user"/>
+ </li>
<li id="userAccountTab"><a href="#userAccount" accesskey="N">Accou<u>n</u>t</a></li>
<li id="userProfileTab"><a href="#userProfile" accesskey="F">Pro<u>f</u>ile</a></li>
<li id="userPrefsTab"><a href="#userPreferences" accesskey="R">P<u>r</u>eferences</a></li>
</ul>
+ <div id="formTabsTitle"/>
+
<div id="userAccount">
<div class="formFields wideLabels">
1.8 +2 -4 jboss-seam/examples/wiki/view/userRegister.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userRegister.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userRegister.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- userRegister.xhtml 17 Aug 2007 13:00:25 -0000 1.7
+++ userRegister.xhtml 25 Aug 2007 17:59:21 -0000 1.8
@@ -13,9 +13,7 @@
<ui:define name="controlTwo">
- <s:link id="exit" styleClass="linkNavigation"
- action="#{browser.exitConversation(true)}"
- accesskey="E"><u>E</u>xit</s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
</ui:define>
@@ -83,7 +81,7 @@
</s:div>
<s:decorate id="verifyCaptchaDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Enter repsonse</ui:define>
+ <ui:define name="label">Enter response</ui:define>
<h:inputSecret tabindex="7" size="5" maxlength="5" required="true"
redisplay="true" id="verifyCaptcha" value="#{captcha.response}">
</h:inputSecret>
1.5 +5 -7 jboss-seam/examples/wiki/view/search.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: search.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/search.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- search.xhtml 17 Aug 2007 13:00:25 -0000 1.4
+++ search.xhtml 25 Aug 2007 17:59:21 -0000 1.5
@@ -14,9 +14,7 @@
<ui:define name="controlTwo">
- <s:link id="exit" styleClass="linkNavigation"
- action="#{browser.exitConversation(true)}"
- accesskey="E"><u>E</u>xit</s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
</ui:define>
@@ -52,18 +50,18 @@
<h:panelGrid columns="2" rendered="#{empty wikiSearch.selectedSearchableEntity}" cellpadding="0" cellspacing="0" border="0">
<h:outputText styleClass="label" value="Terms: "/>
- <h:inputText value="#{wikiSearch.simpleQuery}" size="30" maxlength="1000" tabindex="1"/>
+ <h:inputText value="#{wikiSearch.simpleQuery}" size="28" maxlength="1000" tabindex="1"/>
</h:panelGrid>
<s:span rendered="#{not empty wikiSearch.selectedSearchableEntity}"> </s:span>
<h:panelGrid columns="2" rendered="#{empty wikiSearch.selectedSearchableEntity}" cellpadding="0" cellspacing="0" border="0">
<h:selectBooleanCheckbox value="#{wikiSearch.simpleQueryMatchExactPhrase}" tabindex="1"/>
- <h:outputText styleClass="label" value=" Match exact phrase"/>
+ <h:outputText styleClass="label" style="white-space:nowrap;" value=" Exact phrase"/>
</h:panelGrid>
<s:span rendered="#{not empty wikiSearch.selectedSearchableEntity}"> </s:span>
<h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
- <h:outputText styleClass="label" value="Show results: "/>
+ <h:outputText styleClass="label" value="Results: "/>
<h:selectOneMenu value="#{wikiSearch.pageSize}" id="pageSize" tabindex="1">
<f:selectItem itemLabel="5" itemValue="5"/>
<f:selectItem itemLabel="15" itemValue="15"/>
@@ -72,7 +70,7 @@
</h:selectOneMenu>
</h:panelGrid>
- <a:commandLink id="find" styleClass="buttonNonpersistent" reRender="searchControl, searchPager, searchResult"
+ <a:commandLink id="find" styleClass="buttonNonpersistent" reRender="workspaceSwitcher, searchControl, searchPager, searchResult"
action="#{wikiSearch.search()}"
tabindex="1" accesskey="F"><span class="buttonLabel"><u>F</u>ind</span></a:commandLink>
1.20 +8 -9 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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- fileEdit.xhtml 17 Aug 2007 13:00:25 -0000 1.19
+++ fileEdit.xhtml 25 Aug 2007 17:59:21 -0000 1.20
@@ -17,9 +17,7 @@
<ui:define name="controlTwo">
- <s:link id="exit" styleClass="linkNavigation"
- action="#{browser.exitConversation(true)}"
- accesskey="E"><u>E</u>xit Editor</s:link>
+ <s:link id="exitxitManaged" styleClass="linkNavigation" action="exit" accesskey="E"><u>E</u>xit Editor</s:link>
</ui:define>
@@ -46,18 +44,19 @@
<h:form enctype="multipart/form-data">
<div class="form">
<div class="formHead">
- <h:outputText value="New file: #{fileHome.instance.name}" rendered="#{!fileHome.managed}"/>
- <h:outputText value="Editing file: #{fileHome.instance.name}" rendered="#{fileHome.managed}"/>
+ <h:outputText value="Create file" rendered="#{!fileHome.managed}"/>
+ <h:outputText value="Edit file" rendered="#{fileHome.managed}"/>
</div>
<div class="formFields formBorder wideLabels">
- <s:div styleClass="entry" rendered="#{fileHome.managed}">
- <div class="label">In directory:</div>
+ <s:div styleClass="entry">
+ <div class="label">Directory:</div>
<div class="output">
- <s:span id="directoryNameDisplay">#{fileHome.parentDirectory}</s:span>
+ <s:span id="directoryNameDisplay">#{fileHome.parentDirectory.name}</s:span>
- <h:outputLink id="selectDirectory" value="#" tabindex="1" styleClass="buttonNonpersistent"><j4j:idProxy
+ <h:outputLink rendered="#{fileHome.managed}" id="selectDirectory"
+ value="#" tabindex="1" styleClass="buttonNonpersistent"><j4j:idProxy
id="openDialogDirectorySelection"/><span class="buttonLabel">...</span></h:outputLink>
</div>
</s:div>
1.37 +61 -55 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.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- docEdit.xhtml 17 Aug 2007 13:00:25 -0000 1.36
+++ docEdit.xhtml 25 Aug 2007 17:59:21 -0000 1.37
@@ -17,15 +17,10 @@
<ui:define name="controlTwo">
- <s:link id="uploadFile" styleClass="linkNavigation" action="uploadFile" accesskey="I" propagation="none"
- rendered="#{s:hasPermission('Node', 'create', documentHome.parentDirectory)}">
- <f:param name="lastConversationId" value="#{conversation.id}"/>
- <f:param name="parentDirId" value="#{documentHome.parentDirectory.id}"/>
- Upload F<u>i</u>le
- </s:link>
+ <s:link id="exitManaged" styleClass="linkNavigation" rendered="#{documentHome.managed}" action="exitManaged"
+ accesskey="E"><u>E</u>xit Editor</s:link>
- <s:link id="exit" styleClass="linkNavigation"
- action="#{browser.exitConversation(true)}"
+ <s:link id="exitUnmanaged" styleClass="linkNavigation" rendered="#{!documentHome.managed}" action="exitUnmanaged"
accesskey="E"><u>E</u>xit Editor</s:link>
</ui:define>
@@ -59,25 +54,43 @@
<div class="form">
<script type="text/javascript">jQuery(function() {
- jQuery('#formTabs').tabs({onClick: function(){formTabClicked()} });
+ jQuery('#formTabs').tabs(2, {onClick: function(){formTabClicked()} });
});</script>
- <div id="formTabs">
+ <div id="formTabs" class="formTabs">
<ul>
- <li id="docContentTab"><a href="#docContent">Content</a></li>
- <li id="docPropertiesTab"><a href="#docProperties">Properties</a></li>
+ <li class="formTabsTitle">
+ <h:outputText value="Create document" rendered="#{!documentHome.managed}"/>
+ <h:outputText value="Edit document" rendered="#{documentHome.managed}"/>
+ </li>
+ <li id="docContentTab"><a href="#docContent" accesskey="C"><u>C</u>ontent</a></li>
+ <li id="docPropertiesTab"><a href="#docProperties" accesskey="O">Pr<u>o</u>perties</a></li>
</ul>
+ <div id="formTabsTitle"/>
+
<div id="docContent">
<a:region>
<div class="formFields">
+ <s:div styleClass="entry">
+ <div class="label">Directory:</div>
+ <div class="output">
+ <s:span id="directoryNameDisplay">#{documentHome.parentDirectory.name}</s:span>
+
+ <h:outputLink id="selectDirectory" rendered="#{documentHome.managed}"
+ value="#" tabindex="1"
+ styleClass="buttonNonpersistent"><j4j:idProxy
+ id="openDialogDirectorySelection"/><span class="buttonLabel">...</span></h:outputLink>
+ </div>
+ </s:div>
+
<s:decorate id="nameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="docContentTab"/>
<ui:param name="fieldId" value="name"/>
<ui:define name="label">Name</ui:define>
- <h:inputText tabindex="2" size="80" maxlength="255" required="true" value="#{documentHome.instance.name}">
+ <h:inputText tabindex="2" size="70" maxlength="255" required="true" value="#{documentHome.instance.name}">
<a:support event="onblur" reRender="nameDecorate"/>
</h:inputText>
</s:decorate>
@@ -90,11 +103,30 @@
</div>
</s:div>
+ <s:div styleClass="entry" rendered="#{documentHome.managed}">
+ <div class="label"> </div>
+ <div class="input">
+ <h:selectBooleanCheckbox value="#{documentHome.minorRevision}" tabindex="3"/>
+ Minor change, don't create a new revision
+ </div>
+ </s:div>
+
+ <s:div id="feedSwitch">
+ <s:div styleClass="entry">
+ <div class="label"> </div>
+ <div class="input">
+ <h:selectBooleanCheckbox value="#{documentHome.pushOnSiteFeed}" tabindex="3"/>
+ Push document onto site news syndication feed
+ </div>
+ </s:div>
+ </s:div>
+
<s:decorate id="contentDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="docContentTab"/>
<ui:param name="fieldId" value="contentTextArea"/>
<ui:define name="label">Content</ui:define>
- <script type="text/javascript">if(!$.browser.safari){jQuery(function() {
+ <script type="text/javascript">if(!$.browser.safari && !$.browser.msie){
+ jQuery(function() {
jQuery("#contentTextEdit").Resizable({
minHeight: 50,
handlers: {
@@ -104,7 +136,9 @@
jQuery("textarea", this).css({ height: size.height + "px" });
}
});
- })};</script>
+ jQuery("#contentTextEditResizeHandle").show();
+ }
+ )};</script>
<div id="contentTextEdit" class="textEditResizable">
<h:inputTextarea tabindex="3"
required="true"
@@ -115,7 +149,7 @@
<a:support rendered="#{documentHome.enabledPreview}" event="onkeyup" reRender="preview" requestDelay="3000" eventsQueue="editKeyPress"/>
<a:support event="onblur" reRender="contentDecorate"/>
</h:inputTextarea>
- <div id="contentTextEditResizeHandle" class="textEditResizeHandle"/>
+ <div id="contentTextEditResizeHandle" class="textEditResizeHandle" style="display:none"/>
</div>
</s:decorate>
@@ -152,16 +186,6 @@
<div class="formFields">
<s:div styleClass="entry" rendered="#{documentHome.managed}">
- <div class="label">In directory:</div>
- <div class="output">
- <s:span id="directoryNameDisplay">#{documentHome.parentDirectory}</s:span>
-
- <h:outputLink id="selectDirectory" value="#" tabindex="1" styleClass="buttonNonpersistent"><j4j:idProxy
- id="openDialogDirectorySelection"/><span class="buttonLabel">...</span></h:outputLink>
- </div>
- </s:div>
-
- <s:div styleClass="entry" rendered="#{documentHome.managed}">
<div class="label">Created On:</div>
<div class="output">
<h:outputText value="#{documentHome.instance.createdOn}">
@@ -197,24 +221,6 @@
</s:div>
</s:div>
- <s:div styleClass="entry" rendered="#{documentHome.managed}">
- <div class="label"> </div>
- <div class="input">
- <h:selectBooleanCheckbox value="#{documentHome.minorRevision}" tabindex="3"/>
- Minor change, don't create a new revision
- </div>
- </s:div>
-
- <s:div id="feedSwitch">
- <s:div styleClass="entry">
- <div class="label"> </div>
- <div class="input">
- <h:selectBooleanCheckbox value="#{documentHome.pushOnSiteFeed}" tabindex="3"/>
- Push document onto site news syndication feed
- </div>
- </s:div>
- </s:div>
-
</div>
</a:region>
@@ -255,14 +261,14 @@
rendered="#{documentHome.enabledPreview}"
styleClass="shadowContainer"><div class="shadow1"><div class="shadow2">
<s:div id="documentDisplay" styleClass="documentDisplay"><j4j:idProxy id="documentDisplay_" />
- <s:div rendered="#{currentDocument.nameAsTitle}"><h1 class="documentTitle">#{currentDocument.name}</h1></s:div>
+ <s:div rendered="#{documentHome.instance.nameAsTitle}"><h1 class="documentTitle">#{documentHome.instance.name}</h1></s:div>
<wiki:formattedText value="#{documentHome.instance.content}"
linkStyleClass="regularLink"
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
thumbnailLinkStyleClass="regularLink"
renderBaseDocument="#{documentHome.instance}"
- renderBaseDirectory="#{currentDirectory}"
+ renderBaseDirectory="#{documentHome.parentDirectory}"
enablePlugins="true"/>
</s:div>
</div></div></s:div>
1.10 +5 -7 jboss-seam/examples/wiki/view/adminHome.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: adminHome.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/adminHome.xhtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- adminHome.xhtml 17 Aug 2007 13:00:25 -0000 1.9
+++ adminHome.xhtml 25 Aug 2007 17:59:21 -0000 1.10
@@ -16,9 +16,7 @@
<ui:define name="controlTwo">
- <s:link id="exit" styleClass="linkNavigation"
- action="#{browser.exitConversation(true)}"
- accesskey="E"><u>E</u>xit</s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
</ui:define>
@@ -62,10 +60,10 @@
<div id="formTabs">
<ul>
- <li id="systemStatsTab"><a href="#systemStats">System Statistics</a></li>
- <li id="rolesPermissionsTab"><a href="#rolesPermissions">Roles & Permissions</a></li>
- <li id="linkProtocolsTab"><a href="#linkProtocols">Link Protocols</a></li>
- <li id="systemPrefsTab"><a href="#systemPrefs">Preferences</a></li>
+ <li id="systemStatsTab"><a href="#systemStats" accesskey="Y">S<u>y</u>stem Statistics</a></li>
+ <li id="rolesPermissionsTab"><a href="#rolesPermissions" accesskey="O">R<u>o</u>les & Permissions</a></li>
+ <li id="linkProtocolsTab"><a href="#linkProtocols" accesskey="L"><u>L</u>ink Protocols</a></li>
+ <li id="systemPrefsTab"><a href="#systemPrefs" accesskey="R">P<u>r</u>eferences</a></li>
</ul>
<div id="systemStats">
1.19 +11 -16 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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- userList.xhtml 17 Aug 2007 13:00:25 -0000 1.18
+++ userList.xhtml 25 Aug 2007 17:59:21 -0000 1.19
@@ -12,14 +12,11 @@
<ui:define name="controlTwo">
- <s:link id="createUser" styleClass="linkNavigation" action="createUser" accesskey="C"
- rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}" propagation="none">
- <f:param name="lastConversationId" value="#{conversation.id}"/>
- <u>C</u>reate Account</s:link>
-
- <s:link id="exit" styleClass="linkNavigation"
- action="#{browser.exitConversation(true)}"
- accesskey="E"><u>E</u>xit</s:link>
+ <s:link id="createUser" styleClass="linkNavigation" accesskey="C" view="/userRegister.xhtml" propagation="none"
+ rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"><u>C</u>reate Account
+ </s:link>
+
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
</ui:define>
@@ -43,22 +40,22 @@
<h:panelGroup>
<h:outputText styleClass="label" value="Username:"/> 
- <h:inputText id="username" value="#{userSearch.exampleUser.username}" maxlength="35" size="10" tabindex="1"/>
+ <h:inputText id="username" value="#{userSearch.exampleUser.username}" maxlength="35" size="8" tabindex="1"/>
</h:panelGroup>
<h:panelGroup>
<h:outputText styleClass="label" value="First name:"/> 
- <h:inputText id="firstname" value="#{userSearch.exampleUser.firstname}" maxlength="35" size="10" tabindex="2"/>
+ <h:inputText id="firstname" value="#{userSearch.exampleUser.firstname}" maxlength="35" size="8" tabindex="2"/>
</h:panelGroup>
<h:panelGroup>
<h:outputText styleClass="label" value="Last name:"/> 
- <h:inputText id="lastname" value="#{userSearch.exampleUser.lastname}" maxlength="35" size="10" tabindex="3"/>
+ <h:inputText id="lastname" value="#{userSearch.exampleUser.lastname}" maxlength="35" size="8" tabindex="3"/>
</h:panelGroup>
<h:panelGroup>
<h:outputText styleClass="label" value="E-mail:"/> 
- <h:inputText id="email" value="#{userSearch.exampleUser.email}" maxlength="35" size="10" tabindex="4"/>
+ <h:inputText id="email" value="#{userSearch.exampleUser.email}" maxlength="35" size="8" tabindex="4"/>
</h:panelGroup>
<h:panelGroup>
@@ -176,7 +173,7 @@
E-mail address
</h:commandLink>
</f:facet>
- #{u.email}
+ <h:outputLink value="#{wiki:escapeEmailURL(wiki:concat('mailto:', u.email))}">#{wiki:escapeAtSymbol(u.email)}</h:outputLink>
</h:column>
<h:column>
@@ -195,9 +192,7 @@
</h:column>
<h:column rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
- <s:link action="editUser" propagation="none"
- styleClass="buttonNonpersistent">
- <f:param name="lastConversationId" value="#{conversation.id}"/>
+ <s:link styleClass="buttonNonpersistent" view="/userHome.xhtml" propagation="none">
<f:param name="userId" value="#{u.id}"/>
<span class="buttonLabel">Edit</span>
</s:link>
More information about the jboss-cvs-commits
mailing list