[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian.bauer at jboss.com
Fri Feb 16 11:26:45 EST 2007
User: cbauer
Date: 07/02/16 11:26:45
Modified: examples/wiki/view docDisplay.xhtml dirEdit.xhtml
docEdit.xhtml
Added: examples/wiki/view dirDisplay.xhtml
Removed: examples/wiki/view dirBrowser.xhtml
Log:
Fixed the Wiki, basics work now
Revision Changes Path
1.2 +8 -8 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- docDisplay.xhtml 1 Feb 2007 07:08:26 -0000 1.1
+++ docDisplay.xhtml 16 Feb 2007 16:26:45 -0000 1.2
@@ -5,13 +5,13 @@
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/wikitaglib"
- template="themes/default/template.xhtml">
+ xmlns:wiki="http://jboss.com/products/seam/wiki"
+ template="themes/#{globalPrefs.themeName}/template.xhtml">
<ui:define name="pluginCSS">
- <link href="themes/default/css/languageSelector.css" rel="stylesheet" type="text/css"/>
- <link href="themes/default/css/breadcrumb.css" rel="stylesheet" type="text/css"/>
- <link href="themes/default/css/mainMenu.css" rel="stylesheet" type="text/css"/>
+ <link href="#{themePath}/css/languageSelector.css" rel="stylesheet" type="text/css"/>
+ <link href="#{themePath}/css/breadcrumb.css" rel="stylesheet" type="text/css"/>
+ <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
</ui:define>
<ui:define name="screenname">Display Document</ui:define>
@@ -34,9 +34,9 @@
<h:panelGroup>
<s:link id="createDoc" styleClass="linkNavigation" value="Create" action="createDoc"/>
- <s:link id="editDoc" styleClass="linkNavigation" value="Edit" view="/doc/edit.xhtml"/>
+ <s:link id="editDoc" styleClass="linkNavigation" value="Edit" action="editDoc"/>
<s:link id="discussDoc" styleClass="linkNavigation" value="Discuss"/>
- <s:link id="browseDir" styleClass="linkNavigation" value="Browse" action="browseDir" propagation="none"/>
+ <s:link id="browseDir" styleClass="linkNavigation" value="Browse" action="browseDir"/>
</h:panelGroup>
</div>
@@ -44,7 +44,7 @@
<ui:define name="content">
<s:div styleClass="documentDisplay">
- <wiki:formattedText value="#{currentDocument.content}"/>
+ <wiki:formattedText value="#{currentDocument.content}" linkStyleClass="regularLink" brokenLinkStyleClass="brokenLink"/>
</s:div>
</ui:define>
1.2 +8 -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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- dirEdit.xhtml 1 Feb 2007 07:08:26 -0000 1.1
+++ dirEdit.xhtml 16 Feb 2007 16:26:45 -0000 1.2
@@ -5,12 +5,11 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
- template="themes/default/template.xhtml">
-
+ template="themes/#{globalPrefs.themeName}/template.xhtml">
<ui:define name="pluginCSS">
- <link href="themes/default/css/languageSelector.css" rel="stylesheet" type="text/css"/>
- <link href="themes/default/css/mainMenu.css" rel="stylesheet" type="text/css"/>
+ <link href="#{themePath}/css/languageSelector.css" rel="stylesheet" type="text/css"/>
+ <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
</ui:define>
<ui:define name="screenname">
@@ -29,8 +28,8 @@
</ui:define>
<ui:define name="control">
- <s:link id="exit" value="Exit Editor" styleClass="linkNavigation" action="#{directoryBrowser.redirectToLastBrowsedPage()}"
- propagation="end"/>
+ <s:link id="exit" value="Exit Editor" styleClass="linkNavigation"
+ action="#{browser.redirectToLastBrowsedPage()}" propagation="end"/>
</ui:define>
<ui:define name="content">
@@ -148,7 +147,9 @@
<div class="label"> </div>
<div class="input">
<h:commandButton id="preview" value="Preview" styleClass="buttonNonpersistent"
- action="#{directoryHome.previewMenuItems()}"/>
+ action="#{directoryHome.previewMenuItems()}"
+ rendered="#{childNodes.rowCount>0}"/>
+
<h:commandButton id="save" value="Save" styleClass="button"
action="#{directoryHome.persist}"
rendered="#{!directoryHome.managed}"/>
1.2 +7 -7 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- docEdit.xhtml 1 Feb 2007 07:08:26 -0000 1.1
+++ docEdit.xhtml 16 Feb 2007 16:26:45 -0000 1.2
@@ -5,12 +5,12 @@
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/wikitaglib"
- template="themes/default/template.xhtml">
+ xmlns:wiki="http://jboss.com/products/seam/wiki"
+ template="themes/#{globalPrefs.themeName}/template.xhtml">
<ui:define name="pluginCSS">
- <link href="themes/default/css/languageSelector.css" rel="stylesheet" type="text/css"/>
- <link href="themes/default/css/mainMenu.css" rel="stylesheet" type="text/css"/>
+ <link href="#{themePath}/css/languageSelector.css" rel="stylesheet" type="text/css"/>
+ <link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
</ui:define>
<ui:define name="screenname">
@@ -29,8 +29,8 @@
</ui:define>
<ui:define name="control">
- <s:link id="exit" value="Exit Editor" styleClass="linkNavigation" action="#{browser.redirectToLastBrowsedPage()}"
- propagation="end"/>
+ <s:link id="exit" value="Exit Editor" styleClass="linkNavigation"
+ action="#{browser.redirectToLastBrowsedPage()}" propagation="end"/>
</ui:define>
<ui:define name="content">
@@ -104,7 +104,7 @@
</h:form>
<s:div styleClass="documentDisplay" rendered="#{documentHome.enabledPreview}">
- <wiki:formattedText value="#{currentDocument.content}"/>
+ <wiki:formattedText value="#{documentHome.instance.content}" linkStyleClass="regularLink" brokenLinkStyleClass="brokenLink"/>
</s:div>
</ui:define>
1.1 date: 2007/02/16 16:26:45; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/dirDisplay.xhtml
Index: dirDisplay.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/#{globalPrefs.themeName}/template.xhtml">
<ui:define name="pluginCSS">
<link href="#{themePath}/css/languageSelector.css" rel="stylesheet" type="text/css"/>
<link href="#{themePath}/css/mainMenu.css" rel="stylesheet" type="text/css"/>
</ui:define>
<ui:define name="screenname">Browse Directory</ui:define>
<ui:define name="headerTopRight">
<ui:include src="plugins/languageSelector/plugin.xhtml"/>
</ui:define>
<ui:define name="headerBottomLeft"> </ui:define>
<ui:define name="headerBottomRight"> </ui:define>
<ui:define name="sidebar">
<ui:include src="plugins/mainMenu/plugin.xhtml"/>
</ui:define>
<ui:define name="control">
<div id="controlDocument">
<!-- Real directory -->
<h:panelGroup rendered="#{!empty currentDirectory.parent}">
<s:link id="createDir" styleClass="linkNavigation" value="New Subdirectory" action="createDir"/>
<s:link id="editDir" styleClass="linkNavigation" value="Edit Directory" action="editDir"/>
<s:link id="createDoc" styleClass="linkNavigation" value="New Document" action="createDoc"/>
</h:panelGroup>
<!-- Virtual root directory -->
<h:panelGroup rendered="#{empty currentDirectory.parent}">
<s:link id="createArea" styleClass="linkNavigation" value="New Area" action="createDir"/>
<s:link id="editArea" styleClass="linkNavigation" value="Edit Areas" action="editDir"/>
</h:panelGroup>
</div>
</ui:define>
<ui:define name="content">
<div class="directoryPathPanel">
<h:panelGroup>
<ui:repeat var="directory" value="#{currentDirectoryPath}">
<s:button view="/dirDisplay.xhtml" value="#{directory.name}" styleClass="directoryButton" propagation="none">
<f:param name="nodeId" value="#{directory.id}"/>
</s:button>
<h:outputText value="/" styleClass="directorySeparator" rendered="#{directory != currentDirectory}"/>
</ui:repeat>
</h:panelGroup>
</div>
<s:div style="padding: 5px;" rendered="#{empty currentDirectory.children}">
<h:outputText value="This directory is empty."/>
</s:div>
<h:dataTable id="directoryTable" var="node"
value="#{currentDirectory.children}"
rendered="#{!empty currentDirectory.children}"
styleClass="directoryList"
columnClasses="iconColumn,nameColumn,permissionsColumn,lastModifiedColumn"
rowClasses="rowOdd,rowEven"
cellpadding="0" cellspacing="0" border="0">
<h:column>
<h:graphicImage value="themes/default/img/icon.dir.gif"
width="18" height="20"
rendered="#{wiki:isDirectory(node)}"/>
<h:graphicImage value="themes/default/img/icon.doc.gif"
width="18" height="20"
rendered="#{wiki:isDocument(node)}"/>
</h:column>
<h:column>
<s:div rendered="#{wiki:isDirectory(node)}">
<s:link id="browseDirectory" value="#{node.name}" view="/dirDisplay.xhtml" propagation="none">
<f:param name="nodeId" value="#{node.id}"/>
</s:link>
</s:div>
<s:div rendered="#{wiki:isDocument(node)}">
<h:outputLink value="#{wiki:renderURL(node)}">#{node.name}</h:outputLink>
</s:div>
</h:column>
<h:column>
johndoe aGroup rwxrwx---
</h:column>
<h:column>
<h:outputText value="#{node.lastModifiedOn}">
<f:convertDateTime type="both"/>
</h:outputText>
</h:column>
</h:dataTable>
</ui:define>
<ui:define name="footer">
Footer
</ui:define>
</ui:composition>
More information about the jboss-cvs-commits
mailing list