[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Fri Jul 6 10:38:37 EDT 2007
User: cbauer
Date: 07/07/06 10:38:37
Modified: examples/wiki/view docHistory.xhtml
userRegister.xhtml dirDisplay.xhtml search.xhtml
fileEdit.xhtml docEdit.xhtml adminHome.xhtml
message.xhtml userList.xhtml dirEdit.xhtml
docDisplay.xhtml userHome.xhtml
Log:
Compiles and runs on latest Seam CVS
Revision Changes Path
1.8 +15 -16 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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- docHistory.xhtml 26 Apr 2007 15:11:51 -0000 1.7
+++ docHistory.xhtml 6 Jul 2007 14:38:37 -0000 1.8
@@ -5,6 +5,7 @@
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/#{wikiPreferences.themeName}/template.xhtml">
@@ -16,18 +17,18 @@
<ui:define name="screenname">Document History</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlRight">
+<ui:define name="controlTwo">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit</s:link>
@@ -38,8 +39,8 @@
<h:form rendered="#{historicalNodeList.rowCount >0}">
<div class="form">
-<div class="formHead">Document History: #{currentNode.name}</div>
-<div class="formFields formBorder wideLabels">
+ <div class="formHead">Document History: #{currentNode.name}</div>
+ <div class="formFields formBorder wideLabels">
<s:div styleClass="entry">
<div class="label">Current revision:</div>
@@ -82,20 +83,17 @@
<h:dataTable id="historyTable" var="hnode" style="width:50%"
value="#{historicalNodeList}"
styleClass="datatable topLeftBottomBorder"
- headerClass="sortableHeader rightBorder"
columnClasses="onePercentColumn rightBorder alignCenter,
twentyPercentColumn rightBorder alignLeft,
- defaultColumn rightBorder alignCenter"
- rowClasses="rowOdd,rowEven"
+ twentyPercentColumn rightBorder alignCenter"
+ rowClasses="rowEven, rowOdd"
cellpadding="0" cellspacing="0" border="0">
<h:column>
- <f:facet name="header">#</f:facet>
#{hnode.revision}
</h:column>
<h:column>
- <f:facet name="header">Last Modified</f:facet>
<h:outputText value="#{hnode.lastModifiedOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
</h:outputText>
@@ -103,9 +101,9 @@
</h:column>
<h:column>
- <h:commandLink id="diff"
- action="#{nodeHistory.diff}"
- tabindex="3" styleClass="buttonNonpersistent"><span class="buttonLabel">Diff</span></h:commandLink>
+ <a:commandLink id="diff"
+ action="#{nodeHistory.diff}" reRender="messageBoxContainer, diffResult"
+ tabindex="3" styleClass="buttonNonpersistent"><span class="buttonLabel">Diff</span></a:commandLink>
<h:commandLink id="rollback"
action="#{nodeHistory.rollback}"
tabindex="4" styleClass="buttonNonpersistent"
@@ -118,12 +116,13 @@
</s:div>
</div>
-
</div>
</h:form>
-<s:div id="diffOutput" rendered="#{not empty nodeHistory.diffResult}">
+<s:div id="diffResult">
+ <s:div id="diffOutput" rendered="#{not empty nodeHistory.diffResult}">
<h:outputText value="#{nodeHistory.diffResult}" escape="false"/>
+ </s:div>
</s:div>
</ui:define>
1.6 +4 -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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- userRegister.xhtml 12 Jun 2007 12:30:00 -0000 1.5
+++ userRegister.xhtml 6 Jul 2007 14:38:37 -0000 1.6
@@ -17,20 +17,20 @@
<ui:define name="screenname">Registration</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlLeft"> </ui:define>
+<ui:define name="controlOne"> </ui:define>
-<ui:define name="controlRight">
+<ui:define name="controlTwo">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit</s:link>
1.19 +23 -12 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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- dirDisplay.xhtml 12 Jun 2007 18:42:46 -0000 1.18
+++ dirDisplay.xhtml 6 Jul 2007 14:38:37 -0000 1.19
@@ -16,18 +16,18 @@
<ui:define name="screenname">#{currentDirectory.name}</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlRight">
+<ui:define name="controlTwo">
<h:panelGroup rendered="#{!empty currentDirectory.parent}">
<s:link id="createDir" styleClass="linkNavigation" action="createDir" accesskey="S"
@@ -68,16 +68,26 @@
<div class="directoryPathPanel">
<h:panelGroup>
<ui:repeat var="directory" value="#{currentDirectoryPath}">
- <s:button view="/dirDisplay.xhtml" value="#{directory.name}" styleClass="directoryButton" tabindex="1">
+ <s:link view="/dirDisplay.xhtml" value="#{directory.name}" styleClass="directoryButton" tabindex="1">
<f:param name="nodeId" value="#{directory.id}"/>
- </s:button>
+ </s:link>
<h:outputText value="/" styleClass="directorySeparator" rendered="#{directory != currentDirectory}"/>
</ui:repeat>
</h:panelGroup>
</div>
<s:div styleClass="directoryEmpty" rendered="#{empty currentDirectory.children}">
- <h:outputText value="This directory is empty."/>
+ <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: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)}"
+ value="This directory is empty."/>
+
</s:div>
<h:dataTable id="directoryTable" var="node"
@@ -93,7 +103,6 @@
<h:column>
<f:facet name="header">
- Test
<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}"/>
@@ -124,26 +133,28 @@
</f:facet>
<s:span rendered="#{wiki:isDirectory(node)}">
- <s:link id="browseDirectory" value="#{node.name}" view="/dirDisplay.xhtml"
+ <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}"/>
</s:link>
- <h:outputText value="#{node.name}" rendered="#{!s:hasPermission('Node','read',node)}"/>
+ <h:outputText value="#{wiki:truncateString(node.name, 40, '...')}" rendered="#{!s:hasPermission('Node','read',node)}"/>
</s:span>
<s:span rendered="#{wiki:isDocument(node)}">
- <h:outputLink value="#{wiki:renderURL(node)}" rendered="#{s:hasPermission('Node','read',node)}" tabindex="2">#{node.name}</h:outputLink>
+ <h:outputLink value="#{wiki:renderURL(node)}" rendered="#{s:hasPermission('Node','read',node)}" tabindex="2">
+ <h:outputText value="#{wiki:truncateString(node.name, 40, '...')}"/>
+ </h:outputLink>
<h:outputText value="#{node.name}" rendered="#{!s:hasPermission('Node','read',node)}"/>
</s:span>
<s:span rendered="#{wiki:isFile(node) and s:hasPermission('Node', 'edit', node)}">
- <s:link id="editFile" value="#{node.name}" action="editFile" tabindex="2">
+ <s:link id="editFile" value="#{wiki:truncateString(node.name, 30, '...')}" action="editFile" tabindex="2">
<f:param name="fileId" value="#{node.id}"/>
</s:link>
<h:outputText value=" (#{wiki:displayFilesize(node.filesize)}, #{node.contentType})"/>
</s:span>
<s:span rendered="#{wiki:isFile(node) and !s:hasPermission('Node', 'edit', node)}">
- <h:outputText value="#{node.name} (#{wiki:displayFilesize(node.filesize)}, #{node.contentType})"/>
+ <h:outputText value="#{wiki:truncateString(node.name, 30, '...')} (#{wiki:displayFilesize(node.filesize)}, #{node.contentType})"/>
</s:span>
</h:column>
1.3 +12 -11 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- search.xhtml 12 Jun 2007 18:42:46 -0000 1.2
+++ search.xhtml 6 Jul 2007 14:38:37 -0000 1.3
@@ -18,18 +18,18 @@
<ui:define name="screenname">Search: #{wikiSearch.simpleQuery}</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlRight">
+<ui:define name="controlTwo">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit</s:link>
@@ -42,12 +42,12 @@
<a:region>
- <h:panelGrid columns="5" style="margin-bottom: 15px;"
+ <h:panelGrid columns="5"
styleClass="datatable topLeftBottomBorder"
headerClass="regularHeader rightBorder"
columnClasses="twentyPercentColumn formFields, twentyPercentColumn formFields,
twentyPercentColumn formFields, twentyPercentColumn formFields,
- tenPercentColumn alignRight rightBorder formFields"
+ defaultColumn alignCenter rightBorder formFields"
cellpadding="0" cellspacing="0" border="0">
<f:facet name="header">
@@ -56,8 +56,7 @@
<h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
<h:outputText styleClass="label" value="In: "/>
- <h:selectOneMenu value="#{wikiSearch.selectedSearchableEntity}" tabindex="1"
- converter="searchableEntityConverter">
+ <h:selectOneMenu value="#{wikiSearch.selectedSearchableEntity}" tabindex="1">
<s:selectItems value="#{searchRegistry.searchableEntities}"
var="se"
label="#{se.description}"
@@ -68,7 +67,7 @@
<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="35" maxlength="1000" tabindex="1"/>
+ <h:inputText value="#{wikiSearch.simpleQuery}" size="30" maxlength="1000" tabindex="1"/>
</h:panelGrid>
<s:span rendered="#{not empty wikiSearch.selectedSearchableEntity}"> </s:span>
@@ -98,12 +97,12 @@
<s:div rendered="#{!empty wikiSearch.selectedSearchableEntity}">
- <h:dataTable id="searchOptionsTable" style="margin-bottom: 15px;"
+ <h:dataTable id="searchOptionsTable"
rendered="#{not empty wikiSearch.selectedSearchableEntity}"
var="search"
value="#{wikiSearch.searches[wikiSearch.selectedSearchableEntity]}"
styleClass="datatable topBorder topLeftBottomBorder"
- columnClasses="tenPercentColumn alignLeft, defaultColumn alignLeft formFields rightBorder"
+ columnClasses="tenPercentColumn alignLeft formFields, defaultColumn alignLeft formFields rightBorder"
cellpadding="0" cellspacing="0" border="0">
<h:column>
@@ -197,7 +196,9 @@
</h:dataTable>
- <h:outputText value="No hits, please try again." rendered="#{wikiSearch.totalCount == 0}"/>
+ <s:div styleClass="formFields minorPadding" rendered="#{wikiSearch.totalCount == 0}">
+ <h:outputText value="No hits, please try again."/>
+ </s:div>
</s:div>
1.18 +3 -3 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- fileEdit.xhtml 12 Jun 2007 17:51:00 -0000 1.17
+++ fileEdit.xhtml 6 Jul 2007 14:38:37 -0000 1.18
@@ -21,18 +21,18 @@
<h:outputText value="Edit File" rendered="#{fileHome.managed}"/>
</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlRight">
+<ui:define name="controlTwo">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit Editor</s:link>
1.35 +25 -8 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.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- docEdit.xhtml 21 Jun 2007 11:05:48 -0000 1.34
+++ docEdit.xhtml 6 Jul 2007 14:38:37 -0000 1.35
@@ -22,18 +22,18 @@
<h:outputText value="Edit document" rendered="#{documentHome.managed}"/>
</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlRight">
+<ui:define name="controlTwo">
<s:link id="uploadFile" styleClass="linkNavigation" action="uploadFile" accesskey="F" propagation="none"
rendered="#{s:hasPermission('Node', 'create', documentHome.parentDirectory)}">
@@ -49,7 +49,9 @@
<ui:define name="content">
- <div id="formMessageBox" class="messageBox"><table id="formMessageTable"/></div>
+ <script type="text/javascript">jQuery(function() {
+ clearContentBackground();
+ });</script>
<s:span rendered="#{documentHome.managed}">
<ui:include src="includes/directorySelector.xhtml">
@@ -69,6 +71,7 @@
</ui:include>
</s:span>
+ <div id="docEditFormContainer" class="shadowContainer"><div class="shadow1"><div class="shadow2">
<h:form>
<div class="form">
@@ -267,18 +270,32 @@
</div>
</h:form>
- <s:div styleClass="documentDisplay" id="preview">
- <s:div rendered="#{documentHome.enabledPreview}">
+ </div></div></div>
+
+ <br/>
+
+ <s:div id="preview">
+ <s:div id="documentDisplayContainer" 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>
<wiki:formattedText value="#{documentHome.instance.content}"
linkStyleClass="regularLink"
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
- thumbnailLinkStyleClass="regularLink"/>
+ thumbnailLinkStyleClass="regularLink"
+ renderBaseDocument="#{documentHome.instance}"
+ renderBaseDirectory="#{currentDirectory}"/>
+ </s:div>
+ </div></div></s:div>
+
+ <s:div rendered="#{documentHome.enabledPreview}">
+ <br/>
<ui:include src="includes/attachmentDisplay.xhtml"/>
</s:div>
+
</s:div>
+
</ui:define>
<ui:define name="footer"> </ui:define>
1.8 +72 -69 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.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- adminHome.xhtml 21 Jun 2007 11:05:48 -0000 1.7
+++ adminHome.xhtml 6 Jul 2007 14:38:37 -0000 1.8
@@ -20,20 +20,20 @@
<h:outputText value="System Administration"/>
</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlLeft"> </ui:define>
+<ui:define name="controlOne"> </ui:define>
-<ui:define name="controlRight">
+<ui:define name="controlTwo">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit</s:link>
@@ -71,8 +71,6 @@
}
</script>
-<div id="formMessageBox" class="messageBox"><table id="formMessageTable"/></div>
-
<h:form><div class="form">
<script type="text/javascript">jQuery(function() {
@@ -87,8 +85,8 @@
<li id="systemPrefsTab"><a href="#systemPrefs">Preferences</a></li>
</ul>
- <div id="systemStats" style="padding:10px;">
-
+ <div id="systemStats">
+ <div class="formFields" style="padding: 20px;">
<a:region>
<a:jsFunction name="reloadIndexStatistics"
@@ -144,15 +142,18 @@
action="#{adminHome.resetSearchIndex()}"><span class="buttonLabel">Rebuild Index</span></a:commandLink>
</h:column>
</h:dataTable>
- </a:region>
+ </a:region>
+ </div>
</div>
<div id="rolesPermissions">
Not Implemented
</div>
- <div id="linkProtocols" style="padding:10px;">
+ <div id="linkProtocols">
+ <div class="formFields" style="padding: 20px;">
+ <a:region>
<p>
Link protocols enable custom prefixes in wiki text links, e.g. you can write
@@ -161,7 +162,6 @@
rendered broken.
</p>
- <a:region>
<h:dataTable id="linkProtocolTable" var="lp"
value="#{linkProtocols}"
rendered="#{linkProtocols.rowCount >0}"
@@ -213,16 +213,19 @@
</div>
</div>
</s:div>
- </a:region>
+ </a:region>
+ </div>
</div>
<div id="systemPrefs">
+ <div class="formFields">
<ui:include src="includes/preferencesEditor.xhtml">
<ui:param name="tabId" value="systemPrefsTab"/>
<ui:param name="preferenceComponents" value="#{systemPreferenceComponents}"/>
</ui:include>
</div>
+ </div>
</div>
1.4 +3 -3 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- message.xhtml 4 Apr 2007 10:38:11 -0000 1.3
+++ message.xhtml 6 Jul 2007 14:38:37 -0000 1.4
@@ -10,9 +10,9 @@
<ui:define name="screenname">Message</ui:define>
-<ui:define name="headerTopRight"> </ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
-<ui:define name="headerBottomRight"> </ui:define>
+<ui:define name="headerTopTwo"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
+<ui:define name="headerBottomTwo"> </ui:define>
<ui:define name="sidebar"> </ui:define>
1.17 +12 -11 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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- userList.xhtml 7 May 2007 11:42:31 -0000 1.16
+++ userList.xhtml 6 Jul 2007 14:38:37 -0000 1.17
@@ -16,18 +16,18 @@
<ui:define name="screenname">Member List</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlRight">
+<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}"/>
@@ -40,16 +40,16 @@
<ui:define name="content">
- <h:form id="main">
+ <h:form>
<div class="form" id="userSearchControl">
- <h:panelGrid columns="6" style="margin-bottom: 15px;"
- styleClass="datatable topLeftBottomBorder"
- headerClass="regularHeader rightBorder"
+ <h:panelGrid columns="6"
+ styleClass="datatable"
+ headerClass="regularHeader"
columnClasses="tenPercentColumn formFields, tenPercentColumn formFields, tenPercentColumn formFields,
tenPercentColumn formFields, twentyPercentColumn alignRight formFields,
- defaultColumn alignRight rightBorder formFields"
+ defaultColumn alignRight formFields"
cellpadding="0" cellspacing="0" border="0">
<f:facet name="header">
@@ -85,7 +85,7 @@
</h:selectOneMenu>
</h:panelGroup>
- <h:commandLink id="find" styleClass="button"
+ <h:commandLink id="find" styleClass="buttonNonpersistent"
action="#{userSearch.find()}"
tabindex="6" accesskey="F"><span class="buttonLabel"><u>F</u>ind</span></h:commandLink>
@@ -135,7 +135,8 @@
twentyPercentColumn rightBorder alignLeft,
twentyPercentColumn rightBorder alignLeft,
twentyPercentColumn rightBorder alignLeft,
- defaultColumn rightBorder alignCenter"
+ defaultColumn rightBorder alignLeft,
+ tenPercentColumn rightBorder alignCenter"
rowClasses="rowOdd,rowEven"
cellpadding="0" cellspacing="0" border="0">
1.25 +6 -6 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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- dirEdit.xhtml 21 Jun 2007 06:07:29 -0000 1.24
+++ dirEdit.xhtml 6 Jul 2007 14:38:37 -0000 1.25
@@ -22,18 +22,18 @@
<h:outputText value="Edit directory" rendered="#{directoryHome.managed}"/>
</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlRight">
+<ui:define name="controlTwo">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit Editor</s:link>
@@ -104,7 +104,7 @@
<h:selectOneMenu value="#{directoryHome.instance.defaultDocument}" converter="#{restrictedEntityConverter}" tabindex="2">
<s:selectItems value="#{directoryHome.childDocuments}"
var="document"
- label="#{document.name}"
+ label="#{wiki:truncateString(document.name, 40, '...')}"
noSelectionLabel="No default document"/>
</h:selectOneMenu>
</div>
@@ -162,7 +162,7 @@
dragValue="#{node}">
<rich:dndParam name="label" type="drag"><h:outputText value="#{node.name}"/></rich:dndParam>
</rich:dragSupport>
- <h:outputText value="#{node.name}" style="cursor:move"/>
+ <h:outputText value="#{wiki:truncateString(node.name, 40, '...')}" style="cursor:move"/>
</a:outputPanel>
</h:column>
@@ -176,7 +176,7 @@
<h:selectBooleanCheckbox value="#{directoryHome.hasFeed}" tabindex="2"
disabled="#{empty directoryHome.instance.parent}"/>
Enable syndication feed (disabling invalidates subcriber link)
- <a:commandLink id="resetFeed" reRender="messageBox"
+ <a:commandLink id="resetFeed" reRender="messageBoxContainer"
action="#{directoryHome.resetFeed}"
rendered="#{!empty directoryHome.instance.feed}"
styleClass="buttonNonpersistent"><span class="buttonLabel">Reset Feed</span></a:commandLink>
1.19 +25 -16 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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- docDisplay.xhtml 12 Jun 2007 18:42:46 -0000 1.18
+++ docDisplay.xhtml 6 Jul 2007 14:38:37 -0000 1.19
@@ -19,11 +19,11 @@
<ui:define name="screenname">#{currentDocument.name}</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft">
+<ui:define name="headerBottomOne">
<ui:include src="includes/breadcrumb.xhtml"/>
</ui:define>
@@ -32,7 +32,7 @@
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlRight">
+<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>
@@ -46,20 +46,29 @@
<ui:define name="content">
- <s:div id="documentDisplay" styleClass="documentDisplay">
- <j4j:idProxy id="documentDisplay_" />
+ <script type="text/javascript">jQuery(function() {
+ 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}"
linkStyleClass="regularLink"
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
- thumbnailLinkStyleClass="regularLink"/>
+ thumbnailLinkStyleClass="regularLink"
+ renderBaseDocument="#{currentDocument}"
+ renderBaseDirectory="#{currentDirectory}"/>
+ </s:div>
+ </div></div></div>
<ui:include src="includes/attachmentDisplay.xhtml"/>
+
<ui:include src="includes/commentsDisplay.xhtml"/>
- <ui:include src="includes/commentForm.xhtml"/>
- </s:div>
+ <ui:include src="includes/commentForm.xhtml"/>
</ui:define>
1.10 +8 -10 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.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- userHome.xhtml 7 May 2007 11:42:31 -0000 1.9
+++ userHome.xhtml 6 Jul 2007 14:38:37 -0000 1.10
@@ -20,20 +20,20 @@
<h:outputText value="Member Account '#{userHome.instance.username}'"/>
</ui:define>
-<ui:define name="headerTopRight">
+<ui:define name="headerTopTwo">
<ui:include src="includes/userControl.xhtml"/>
</ui:define>
-<ui:define name="headerBottomLeft"> </ui:define>
+<ui:define name="headerBottomOne"> </ui:define>
<ui:define name="sidebar">
<ui:include src="includes/searchControl.xhtml"/>
<ui:include src="includes/mainMenu.xhtml"/>
</ui:define>
-<ui:define name="controlLeft"> </ui:define>
+<ui:define name="controlOne"> </ui:define>
-<ui:define name="controlRight">
+<ui:define name="controlTwo">
<s:link id="exit" styleClass="linkNavigation"
action="#{browser.exitConversation(true)}"
accesskey="E"><u>E</u>xit</s:link>
@@ -47,8 +47,6 @@
</ui:include>
</s:span>
-<div id="formMessageBox" class="messageBox"><table id="formMessageTable"/></div>
-
<h:form>
<div class="form">
@@ -58,9 +56,9 @@
<div id="formTabs">
<ul>
- <li id="userProfileTab"><a href="#userProfile">Profile</a></li>
- <li id="userAccountTab"><a href="#userAccount">Account</a></li>
- <li id="userPrefsTab"><a href="#userPreferences">Preferences</a></li>
+ <li id="userProfileTab"><a href="#userProfile" accesskey="o">Pr<u>o</u>file</a></li>
+ <li id="userAccountTab"><a href="#userAccount" accesskey="c">A<u>c</u>count</a></li>
+ <li id="userPrefsTab"><a href="#userPreferences" accesskey="r">P<u>r</u>eferences</a></li>
</ul>
<div id="userProfile">
@@ -168,7 +166,7 @@
</div>
<div id="userPreferences">
- <div class="formFields wideLabels">
+ <div class="formFields">
<ui:include src="includes/preferencesEditor.xhtml">
<ui:param name="tabId" value="userPrefsTab"/>
<ui:param name="preferenceComponents" value="#{userPreferenceComponents}"/>
More information about the jboss-cvs-commits
mailing list