[jboss-cvs] jboss-seam/examples/wiki/view/includes ...
Christian Bauer
christian at hibernate.org
Sat Aug 25 13:59:24 EDT 2007
User: cbauer
Date: 07/08/25 13:59:24
Modified: examples/wiki/view/includes commentsDisplay.xhtml
preferencesEditor.xhtml wikiTextEditor.xhtml
searchControl.xhtml commentForm.xhtml
attachmentDisplay.xhtml breadcrumb.xhtml
userControl.xhtml mainMenu.xhtml
Log:
Major refactoring of navigation
Revision Changes Path
1.8 +12 -9 jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: commentsDisplay.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- commentsDisplay.xhtml 17 Aug 2007 13:00:25 -0000 1.7
+++ commentsDisplay.xhtml 25 Aug 2007 17:59:24 -0000 1.8
@@ -1,4 +1,4 @@
-<s:span id="commentsDisplay"
+<s:span id="comments" styleClass="commentsDisplay"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
@@ -7,7 +7,7 @@
xmlns:s="http://jboss.com/products/seam/taglib">
<s:div styleClass="shadowContainer" style="margin-top:25px"
- rendered="#{not empty commentHome.comments and currentDocument.enableComments}"><div class="shadow1"><div class="shadow2">
+ rendered="#{not empty commentHome.comments and documentHome.instance.enableComments}"><div class="shadow1"><div class="shadow2">
<h:dataTable value="#{commentHome.comments}" var="c"
styleClass="datatable rightBorder leftBorder topBorder bottomBorder"
@@ -25,16 +25,19 @@
</div>
<div class="commentAuthorDate">
- <span class="commentDate"><h:outputText value="#{c.createdOn}">
+ <span class="commentDate">
+ <h:outputText value="#{c.createdOn}">
<f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
- </h:outputText></span>
+ </h:outputText>
+ <h:outputText value=" #{wikiPreferences.timeZone}"/>
+ </span>
<s:span> (
<s:span styleClass="commentAuthor" rendered="#{empty c.fromUserHomepage}">#{c.fromUserName}</s:span>
<s:span styleClass="commentAuthor" rendered="#{!empty c.fromUserHomepage}"><a
href="http://#{c.fromUserHomepage}">#{c.fromUserName}</a></s:span>
- <s:span styleClass="commentAuthor" rendered="#{!empty c.fromUserEmail}">, <a
- href="mailto:#{c.fromUserEmail}">#{c.fromUserEmail}</a></s:span>
- )
+ <s:span styleClass="commentAuthor" rendered="#{!empty c.fromUserEmail}">, 
+ <h:outputLink value="#{wiki:escapeEmailURL(wiki:concat('mailto:', c.fromUserEmail))}">#{wiki:escapeAtSymbol(c.fromUserEmail)}</h:outputLink>
+ </s:span>)
</s:span>
</div>
@@ -43,7 +46,7 @@
</s:div>
<div align="right">
- <h:form rendered="#{s:hasPermission('Comment', 'delete', currentDocument)}">
+ <h:form rendered="#{s:hasPermission('Comment', 'delete', documentHome.instance)}">
<a:commandLink action="#{commentHome.remove(c.id)}" reRender="content"
styleClass="button"><span class="buttonLabel">Remove Comment</span></a:commandLink>
</h:form>
1.5 +5 -1 jboss-seam/examples/wiki/view/includes/preferencesEditor.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: preferencesEditor.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/preferencesEditor.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- preferencesEditor.xhtml 12 Jun 2007 12:30:04 -0000 1.4
+++ preferencesEditor.xhtml 25 Aug 2007 17:59:24 -0000 1.5
@@ -48,10 +48,14 @@
</s:div>
<s:div rendered="#{v.preferenceProperty.type.simpleName == 'String'}">
- <h:inputText value="#{v.value}" size="32">
+ <h:inputText value="#{v.value}" size="25" rendered="#{!v.preferenceProperty.longStringAllowed}">
<a:support event="onblur" action="#{preferenceEditor.validate}"
reRender="preferenceValidationErrors, preferenceComponentList"/>
</h:inputText>
+ <h:inputTextarea value="#{v.value}" rows="10" cols="35" style="margin:5px;" rendered="#{v.preferenceProperty.longStringAllowed}">
+ <a:support event="onblur" action="#{preferenceEditor.validate}"
+ reRender="preferenceValidationErrors, preferenceComponentList"/>
+ </h:inputTextarea>
</s:div>
<s:div rendered="#{v.preferenceProperty.type.simpleName == 'Long'}">
1.2 +3 -2 jboss-seam/examples/wiki/view/includes/wikiTextEditor.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: wikiTextEditor.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/wikiTextEditor.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- wikiTextEditor.xhtml 17 Aug 2007 13:00:25 -0000 1.1
+++ wikiTextEditor.xhtml 25 Aug 2007 17:59:24 -0000 1.2
@@ -8,7 +8,7 @@
<!-- TODO: Most of this Javascript could be made generic and not rendered for each and every text editor... -->
-<script type="text/javascript">if (!$.browser.safari) {
+<script type="text/javascript">if (!$.browser.safari && !$.browser.msie) {
/* Assign resize handle to text area */
jQuery(function() {
jQuery("##{namingContainer}\\:#{textEditorId}TextEditDiv").Resizable({
@@ -20,6 +20,7 @@
jQuery("##{namingContainer}\\:#{textEditorId}TextArea").css({ height: size.height + "px" });
}
});
+ jQuery("##{namingContainer}\\:#{textEditorId}TextEditResizeHandle").show();
})
}
;
@@ -110,7 +111,7 @@
requestDelay="3000" ajaxSingle="true"
eventsQueue="editKeyPress"/>
</h:inputTextarea>
- <s:div id="#{textEditorId}TextEditResizeHandle" styleClass="textEditResizeHandle"/>
+ <s:div id="#{textEditorId}TextEditResizeHandle" styleClass="textEditResizeHandle" style="display:none;"/>
</s:div>
</s:validateAll>
1.7 +2 -2 jboss-seam/examples/wiki/view/includes/searchControl.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: searchControl.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/searchControl.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- searchControl.xhtml 12 Jun 2007 12:30:04 -0000 1.6
+++ searchControl.xhtml 25 Aug 2007 17:59:24 -0000 1.7
@@ -10,8 +10,8 @@
<h:inputText styleClass="searchControlInput" id="searchControlSearchString" value="#{wikiSearch.simpleQuery}"
onclick="clickClear(this, 'Search...')" onblur="clickRecall(this, 'Search...')"
size="15" maxlength="1000" tabindex="60"/>
- <h:commandLink styleClass="searchControlLink" tabindex="61" accesskey="F" action="search">
- <u>F</u>ind
+ <h:commandLink styleClass="searchControlLink" tabindex="61" accesskey="F" action="search"><u>F</u>ind
+ <f:param name="conversationPropagation" value="none"/>
</h:commandLink>
</h:panelGroup>
</h:form>
1.8 +10 -14 jboss-seam/examples/wiki/view/includes/commentForm.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: commentForm.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/commentForm.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- commentForm.xhtml 17 Aug 2007 13:00:25 -0000 1.7
+++ commentForm.xhtml 25 Aug 2007 17:59:24 -0000 1.8
@@ -1,5 +1,5 @@
<s:div styleClass="shadowContainer" style="margin-top:25px"
- rendered="#{currentDocument.enableComments and currentDocument.enableCommentForm}"
+ rendered="#{documentHome.instance.enableComments and documentHome.instance.enableCommentForm}"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
@@ -12,18 +12,14 @@
<div class="form">
<div class="formHead bottomBorder">
- <a:commandLink tabindex="102" rendered="#{!param.showCommentForm}" accesskey="T"
- onclick="jQuery('.hiddenCommentForm').show();jQuery('#commentForm\\:commentTextArea').focus();">
- <span>Pos<u>t</u> Comment</span>
- </a:commandLink>
+ <h:outputLink tabindex="102" rendered="#{empty param.showCommentForm}" accesskey="T"
+ value="#{wiki:renderURL(currentDocument)}?showCommentForm=true#commentForm">Pos<u>t</u> Comment</h:outputLink>
- <s:fragment rendered="#{param.showCommentForm}">
- Post Comment
- </s:fragment>
+ <s:fragment rendered="#{not empty param.showCommentForm}">Post Comment</s:fragment>
</div>
- <div style="#{!param.showCommentForm ? 'display:none;' : ''}" class="hiddenCommentForm formFields formBorder wideLabels">
+ <div style="#{empty param.showCommentForm ? 'display:none;' : ''}" class="hiddenCommentForm formFields formBorder wideLabels">
<s:decorate id="userNameDecorate" template="formFieldDecorate.xhtml">
<ui:define name="label">Name</ui:define>
@@ -62,8 +58,8 @@
<ui:param name="valueBinding" value="#{commentHome.comment.text}"/>
<ui:param name="valueMaxLength" value="8000"/>
<ui:param name="valueRequired" value="true"/>
- <ui:param name="previewBaseDocument" value="#{currentDocument}"/>
- <ui:param name="previewBaseDirectory" value="#{currentDirectory}"/>
+ <ui:param name="previewBaseDocument" value="#{documentHome.instance}"/>
+ <ui:param name="previewBaseDirectory" value="#{documentHome.instance.parent}"/>
</ui:include>
<s:div rendered="#{!identity.loggedIn}">
@@ -84,12 +80,12 @@
</div>
- <div style="#{!param.showCommentForm ? 'display:none;' : ''}" class="hiddenCommentForm formControls wideLabels">
+ <div style="#{empty param.showCommentForm? 'display:none;' : ''}" class="hiddenCommentForm formControls wideLabels">
<div class="entry">
<div class="label"> </div>
<div class="input">
- <a:commandLink action="#{commentHome.persist}" tabindex="102" reRender="commentsDisplay, commentForm" accesskey="S"
+ <a:commandLink action="#{commentHome.persist}" tabindex="102" reRender="comments, commentForm" accesskey="S"
oncomplete="jQuery('.hiddenCommentForm').show();jQuery('#commentForm\\:userNameDecorate\\:userName').focus();"
styleClass="button"><span class="buttonLabel">Po<u>s</u>t Comment</span></a:commandLink>
1.12 +1 -1 jboss-seam/examples/wiki/view/includes/attachmentDisplay.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: attachmentDisplay.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/attachmentDisplay.xhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- attachmentDisplay.xhtml 17 Aug 2007 13:00:25 -0000 1.11
+++ attachmentDisplay.xhtml 25 Aug 2007 17:59:24 -0000 1.12
@@ -6,7 +6,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:s="http://jboss.com/products/seam/taglib"><div class="shadow1"><div class="shadow2">
-<s:div id="attachmentDisplay" styleClass="attachmentDisplay">
+<s:div id="attachments" styleClass="attachmentDisplay">
<h:dataTable value="#{wikiTextAttachments}" var="link"
styleClass="datatable rightBorder leftBorder topBorder bottomBorder"
1.4 +17 -9 jboss-seam/examples/wiki/view/includes/breadcrumb.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: breadcrumb.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/breadcrumb.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- breadcrumb.xhtml 17 Aug 2007 13:00:25 -0000 1.3
+++ breadcrumb.xhtml 25 Aug 2007 17:59:24 -0000 1.4
@@ -6,18 +6,26 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:s="http://jboss.com/products/seam/taglib">
- <h:panelGroup>
- <ui:repeat var="directory" value="#{currentDirectoryPath}">
- <h:outputLink value="#{wiki:renderURL(directory)}" styleClass="itemLink" rendered="#{!empty directory.parent}">
- <h:outputText value="#{wiki:truncateString(directory.name, 25, '...')}"/>
+ <h:panelGroup styleClass="breadcrumbPanel">
+
+ <h:outputLink value="#{wiki:renderURL(node)}" styleClass="itemLink breadcrumbRoot">
+ <h:outputText value="#{wiki:truncateString(wikiRoot.name, 25, '...')}"/>
+ </h:outputLink>
+ <h:outputText styleClass="itemSeparator breadcrumbRoot" value="·"/>
+
+ <ui:repeat var="node" value="#{breadcrumb}">
+
+ <h:outputLink value="#{wiki:renderURL(node)}" styleClass="itemLink" rendered="#{wiki:isDirectory(node)}">
+ <h:outputText value="#{wiki:truncateString(node.name, 25, '...')}"/>
+ </h:outputLink>
+
+ <h:outputLink value="#{wiki:renderURL(node)}" styleClass="itemText" rendered="#{!wiki:isDirectory(node)}">
+ <h:outputText value="#{wiki:truncateString(node.name, 30, '...')}"/>
</h:outputLink>
- <!-- middot: · -->
- <h:outputText styleClass="itemSeparator" value="/"
- rendered="#{!empty currentDocument and !empty directory.parent}"/>
- </ui:repeat>
- <h:outputText styleClass="itemText" value="#{wiki:truncateString(currentDocument.name, 30, '...')}"/>
+ <h:outputText styleClass="itemSeparator" value="·" rendered="#{wiki:isDirectory(node)}"/>
+ </ui:repeat>
</h:panelGroup>
</div>
\ No newline at end of file
1.11 +15 -25 jboss-seam/examples/wiki/view/includes/userControl.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userControl.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/userControl.xhtml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- userControl.xhtml 17 Aug 2007 13:00:25 -0000 1.10
+++ userControl.xhtml 25 Aug 2007 17:59:24 -0000 1.11
@@ -3,28 +3,25 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:s="http://jboss.com/products/seam/taglib">
<s:div rendered="#{not identity.loggedIn}">
- <h:panelGroup>
+ <h:panelGroup styleClass="userControlPanel">
+
<h:outputLabel styleClass="userControlLabel" for="loginUsername" value="Username:"/>
<h:inputText styleClass="userControlInput" id="loginUsername" value="#{identity.username}" size="8" tabindex="50"/>
<h:outputLabel styleClass="userControlLabel" for="loginPassword" value="Password:"/>
- <h:inputSecret styleClass="userControlInput" id="loginPassword" value="#{identity.password}" size="8" tabindex="51"/>
- <h:commandLink styleClass="userControlLink" action="#{identity.login}" tabindex="52" accesskey="L"><u>L</u>ogin</h:commandLink>
+ <h:inputSecret styleClass="userControlInput" id="loginPassword" value="#{identity.password}" size="8" tabindex="50"/>
+ <h:commandLink styleClass="userControlLink" action="#{identity.login}" tabindex="50" accesskey="L"><u>L</u>ogin</h:commandLink>
- <s:link styleClass="userControlLink" action="register" tabindex="53" accesskey="R" propagation="none"
- rendered="#{userManagementPreferences.properties['enableRegistration']}">
- <f:param name="lastConversationId" value="#{conversation.id}"/>
- <u>R</u>egister
+ <s:link styleClass="userControlLink" tabindex="50" accesskey="R" view="/userRegister.xhtml" propagation="none"
+ rendered="#{userManagementPreferences.properties['enableRegistration']}"><u>R</u>egister
</s:link>
- <s:link styleClass="userControlLink" action="listUsers" tabindex="54" accesskey="M" propagation="none">
- <f:param name="lastConversationId" value="#{conversation.id}"/>
- <u>M</u>embers
- </s:link>
+ <s:link styleClass="userControlLink" tabindex="50" accesskey="M" view="/userList.xhtml" propagation="none"><u>M</u>embers</s:link>
</h:panelGroup>
@@ -32,29 +29,22 @@
<s:div rendered="#{identity.loggedIn}">
- <h:panelGroup>
+ <h:panelGroup styleClass="userControlPanel">
<h:outputText styleClass="userControlLabel" value="(#{currentUser.fullname})"/>
<s:link styleClass="userControlLink" action="#{authenticator.logout}" tabindex="70" accesskey="L"><u>L</u>ogout</s:link>
- <h:outputLink styleClass="userControlLink" value="#{wiki:renderHomeURL(currentUser)}"
- rendered="#{!empty currentUser.memberHome}" tabindex="72" accesskey="H"><u>H</u>ome</h:outputLink>
+ <h:outputLink styleClass="userControlLink" tabindex="70" accesskey="H" value="#{wiki:renderHomeURL(currentUser)}"
+ rendered="#{!empty currentUser.memberHome}"><u>H</u>ome</h:outputLink>
- <s:link styleClass="userControlLink" action="editUser" tabindex="71" accesskey="P" propagation="none">
- <f:param name="lastConversationId" value="#{conversation.id}"/>
+ <s:link styleClass="userControlLink" tabindex="70" accesskey="P" view="/userHome.xhtml" propagation="none"><u>P</u>rofile
<f:param name="userId" value="#{currentUser.id}"/>
- <u>P</u>rofile
</s:link>
- <s:link styleClass="userControlLink" action="listUsers" tabindex="73" accesskey="M" propagation="none">
- <f:param name="lastConversationId" value="#{conversation.id}"/>
- <u>M</u>embers
- </s:link>
+ <s:link styleClass="userControlLink" tabindex="70" accesskey="M" view="/userList.xhtml" propagation="none"><u>M</u>embers</s:link>
- <s:link styleClass="userControlLink" action="adminHome" tabindex="74" accesskey="A" propagation="none"
- rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
- <f:param name="lastConversationId" value="#{conversation.id}"/>
- <u>A</u>dmin
+ <s:link styleClass="userControlLink" tabindex="70" accesskey="A" view="/adminHome.xhtml" propagation="none"
+ rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"><u>A</u>dmin
</s:link>
</h:panelGroup>
1.5 +11 -3 jboss-seam/examples/wiki/view/includes/mainMenu.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: mainMenu.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/mainMenu.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- mainMenu.xhtml 17 Aug 2007 13:00:25 -0000 1.4
+++ mainMenu.xhtml 25 Aug 2007 17:59:24 -0000 1.5
@@ -8,8 +8,16 @@
xmlns:rich="http://richfaces.ajax4jsf.org/rich"
xmlns:s="http://jboss.com/products/seam/taglib">
+ <s:div styleClass="shadowContainer"><div class="shadow1"><div class="shadow2"><div class="mainMenuContainer">
+
+ <div class="mainMenuHeader"><ui:insert name="mainMenuHeader"> </ui:insert></div>
+
<ui:include src="mainMenuItem.xhtml">
<ui:param name="node" value="#{menu.root}"/>
</ui:include>
+ <div class="mainMenuFooter"><ui:insert name="mainMenuFooter"> </ui:insert></div>
+
+ </div></div></div></s:div>
+
</div>
More information about the jboss-cvs-commits
mailing list