[jboss-cvs] jboss-seam/examples/wiki/view/includes ...
Christian Bauer
christian at hibernate.org
Tue Dec 18 23:29:20 EST 2007
User: cbauer
Date: 07/12/18 23:29:20
Modified: examples/wiki/view/includes
formFieldDecorate.xhtml wikiTextPreview.xhtml
accessLevelSelector.xhtml mainMenuItem.xhtml
commentForm.xhtml helpPopup.xhtml
attachmentDisplay.xhtml breadcrumb.xhtml
ownerSelector.xhtml directorySelector.xhtml
commentsDisplay.xhtml preferencesEditor.xhtml
wikiTextEditor.xhtml pluginPreferencesForm.xhtml
popupDialog.xhtml searchControl.xhtml
userControl.xhtml helpPopupButton.xhtml
statusIndicator.xhtml
Added: examples/wiki/view/includes
userInfo.xhtml wikiUploadEditor.xhtml
wikiUploadImageEditor.xhtml
writeProtectionSelector.xhtml tagEditor.xhtml
captchaEntry.xhtml userInfoLink.xhtml
Removed: examples/wiki/view/includes
deleteConfirmation.xhtml
Log:
Major rewrite of the most of the application
Revision Changes Path
1.3 +10 -7 jboss-seam/examples/wiki/view/includes/formFieldDecorate.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: formFieldDecorate.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/formFieldDecorate.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- formFieldDecorate.xhtml 6 Jul 2007 14:38:36 -0000 1.2
+++ formFieldDecorate.xhtml 19 Dec 2007 04:29:19 -0000 1.3
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.com/products/seam/taglib">
- <div class="entry #{invalid?'errorDiv':''}">
+ <div class="entry #{invalid?'errorEntry':''}">
<s:div rendered="#{not empty tabId}">
<s:span rendered="#{invalid}">
@@ -19,12 +19,15 @@
</s:span>
</s:div>
- <h:panelGroup rendered="#{invalid}">
+ <s:div styleClass="errorMessage" rendered="#{invalid}">
+ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/attention.gif"
width="18" height="18"
styleClass="attentionImage"/>
<s:span styleClass="attentionMessage"> <s:message/></s:span>
- </h:panelGroup>
+ </h:panelGrid>
+ </s:div>
+
<div class="label"><ui:insert name="label"/>:</div>
<div class="input">
<s:validateAll>
1.2 +4 -4 jboss-seam/examples/wiki/view/includes/wikiTextPreview.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: wikiTextPreview.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/wikiTextPreview.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- wikiTextPreview.xhtml 24 Sep 2007 08:23:21 -0000 1.1
+++ wikiTextPreview.xhtml 19 Dec 2007 04:29:19 -0000 1.2
@@ -6,15 +6,15 @@
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:wiki="http://jboss.com/products/seam/wiki">
-<s:div id="#{textPreviewId}" styleClass="entry">
- <s:div styleClass="textPreview input" rendered="#{not empty valueBinding}">
+<s:div id="#{textPreviewId}">
+ <s:div styleClass="textPreview" rendered="#{not empty valueBinding}">
<wiki:formattedText value="#{valueBinding}"
linkStyleClass="regularLink"
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
thumbnailLinkStyleClass="regularLink"
- renderBaseDocument="#{baseDocument}"
- renderBaseDirectory="#{baseDirectory}"
+ linkBaseFilet="#{baseDocument}"
+ currentAreaNumber="#{baseDirectory.areaNumber}"
enablePlugins="false"/>
</s:div>
</s:div>
1.7 +7 -7 jboss-seam/examples/wiki/view/includes/accessLevelSelector.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: accessLevelSelector.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/accessLevelSelector.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- accessLevelSelector.xhtml 9 Nov 2007 15:08:25 -0000 1.6
+++ accessLevelSelector.xhtml 19 Dec 2007 04:29:19 -0000 1.7
@@ -5,17 +5,17 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:s="http://jboss.com/products/seam/taglib"
- rendered="#{currentUser != guestUser}">
+ rendered="#{!currentUser.guest}">
<s:div styleClass="entry">
<div class="label">#{messages['lacewiki.label.ReadableBy']}:</div>
<div class="input">
- <h:selectOneMenu value="#{nodeHome.readAccessLevel}" tabindex="1">
+ <h:selectOneMenu value="#{home.readAccessLevel}" tabindex="1">
<s:selectItems value="#{assignableAccessLevelsList}"
var="aLvl"
label="Role: #{wiki:truncateString(aLvl.roleNames, 40, '...')}"
- noSelectionLabel="#{currentUser.id == nodeHome.instance.createdBy.id
- || empty nodeHome.instance.createdBy
+ noSelectionLabel="#{currentUser.id == home.instance.createdBy.id
+ || empty home.instance.createdBy
? wiki:concat('User: ', currentUser.username)
: null}"/>
</h:selectOneMenu>
@@ -25,12 +25,12 @@
<s:div styleClass="entry">
<div class="label">#{messages['lacewiki.label.WritableBy']}:</div>
<div class="input">
- <h:selectOneMenu value="#{nodeHome.writeAccessLevel}" tabindex="1">
+ <h:selectOneMenu value="#{home.writeAccessLevel}" tabindex="1">
<s:selectItems value="#{assignableAccessLevelsList}"
var="aLvl"
label="Role: #{wiki:truncateString(aLvl.roleNames, 40, '...')}"
- noSelectionLabel="#{currentUser.id == nodeHome.instance.createdBy.id
- || empty nodeHome.instance.createdBy
+ noSelectionLabel="#{currentUser.id == home.instance.createdBy.id
+ || empty home.instance.createdBy
? wiki:concat('User: ', currentUser.username)
: null}"/>
</h:selectOneMenu>
1.2 +1 -1 jboss-seam/examples/wiki/view/includes/mainMenuItem.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: mainMenuItem.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/mainMenuItem.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mainMenuItem.xhtml 17 Aug 2007 13:00:25 -0000 1.1
+++ mainMenuItem.xhtml 19 Dec 2007 04:29:19 -0000 1.2
@@ -7,7 +7,7 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:s="http://jboss.com/products/seam/taglib">
-<c:forEach var="childWrapper" items="#{node.wrappedChildren}">
+<c:forEach var="childWrapper" items="#{node.wrappedChildrenSorted}">
<s:div styleClass="level#{childWrapper.level}">
<s:div styleClass="level#{childWrapper.level}Body">
<h:outputText styleClass="level#{childWrapper.level}Marker" value="·"/>
1.19 +90 -70 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.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- commentForm.xhtml 20 Nov 2007 08:05:11 -0000 1.18
+++ commentForm.xhtml 19 Dec 2007 04:29:19 -0000 1.19
@@ -1,5 +1,4 @@
<s:div styleClass="box" style="margin-top:25px"
- 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"
@@ -11,117 +10,138 @@
<h:form id="commentForm" styleClass="commentForm">
<div class="form">
- <ui:include src="statusIndicator.xhtml"/>
+ <ui:include src="statusIndicator.xhtml">
+ <ui:param name="statusId" value="commentFormStatus"/>
+ </ui:include>
<div class="formHead bottomBorder">
- <h:outputLink tabindex="102" rendered="#{empty param.showCommentForm}"
+ <script type="text/javascript">
+ function scrollToCommentForm() {
+ window.scrollTo(0, jQuery('#commentForm').offset().top)
+ }
+ </script>
+
+ <s:fragment rendered="#{param.showCommentForm or commentHome.showForm}">
+ <script type="text/javascript">jQuery(function () {scrollToCommentForm(); })</script>
+ <script type="text/javascript">startSessionTimeoutCheck();</script>
+ </s:fragment>
+
+ <s:fragment rendered="#{not param.showCommentForm and not commentHome.showForm}">
+ <script type="text/javascript">stopSessionTimeoutCheck();</script>
+ </s:fragment>
+
+ <s:link tabindex="102" rendered="#{!commentHome.showForm}"
+ action="#{commentHome.newComment()}"
accesskey="#{messages['lacewiki.button.commentForm.PostComment.accesskey']}"
- styleClass="buttonNonpersistent"
- value="#{wiki:renderURL(currentDocument)}?showCommentForm=true#commentForm">
- <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.commentForm.PostComment']}"/>
- </h:outputLink>
+ styleClass="buttonNonpersistent">
+ <h:outputText escape="false" styleClass="buttonLabel"
+ value="#{messages['lacewiki.button.commentForm.PostComment']}"/>
+ </s:link>
- <s:fragment rendered="#{not empty param.showCommentForm}">
+ <s:fragment rendered="#{commentHome.showForm}">
<h:outputText value="#{messages['lacewiki.label.commentForm.PostComment']}"/>
</s:fragment>
</div>
- <s:div style="#{empty param.showCommentForm ? 'display:none;' : ''}"
- styleClass="hiddenCommentForm formFields formBorder wideLabels">
+ <s:div rendered="#{commentHome.showForm}"
+ styleClass="formFields formBorder #{commentHome.instance.ownedByRegularUser ? '' : 'wideLabels'}">
+ <s:fragment rendered="#{not commentHome.instance.ownedByRegularUser}">
+ <a:region>
<s:decorate id="userNameDecorate" template="formFieldDecorate.xhtml">
<ui:define name="label">#{messages['lacewiki.label.commentForm.Name']}</ui:define>
- <h:inputText tabindex="1" size="40" maxlength="100" required="true"
- id="userName" value="#{commentHome.comment.fromUserName}">
- <a:support status="commentForm:status" event="onblur" reRender="userNameDecorate"/>
+ <h:inputText styleClass="ajaxSupport" tabindex="1" size="40" maxlength="100" required="true"
+ id="userName" value="#{commentHome.instance.fromUserName}">
+ <a:support status="commentFormStatus" event="onblur" reRender="userNameDecorate" oncomplete="onAjaxRequestComplete()"/>
</h:inputText>
</s:decorate>
+ </a:region>
<s:decorate id="userEmailDecorate" template="formFieldDecorate.xhtml">
<ui:define name="label">#{messages['lacewiki.label.commentForm.Email']}</ui:define>
<h:inputText tabindex="1" size="40" maxlength="255" required="false"
- id="userEmail" value="#{commentHome.comment.fromUserEmail}">
+ id="userEmail" value="#{commentHome.instance.fromUserEmail}">
</h:inputText>
</s:decorate>
<s:decorate id="userHomepageDecorate" template="formFieldDecorate.xhtml">
<ui:define name="label">#{messages['lacewiki.label.commentForm.Homepage']}</ui:define>
<h:inputText tabindex="1" size="40" maxlength="1000" required="false"
- id="userHomepage" value="#{commentHome.comment.fromUserHomepage}">
+ id="userHomepage" value="#{commentHome.instance.fromUserHomepage}">
</h:inputText>
</s:decorate>
+ </s:fragment>
+ <a:region>
<s:decorate id="subjectDecorate" template="formFieldDecorate.xhtml">
<ui:define name="label">#{messages['lacewiki.label.commentForm.Subject']}</ui:define>
- <h:inputText tabindex="1" size="40" maxlength="255" required="true"
- id="subject" value="#{commentHome.comment.subject}">
- <a:support status="commentForm:status" event="onblur" reRender="subjectDecorate"/>
+ <h:inputText styleClass="ajaxSupport" tabindex="1" size="40" maxlength="255" required="true"
+ id="subject" value="#{commentHome.instance.subject}">
+ <a:support status="commentFormStatus" event="onblur" reRender="subjectDecorate" oncomplete="onAjaxRequestComplete()"/>
</h:inputText>
</s:decorate>
+ </a:region>
<ui:include src="wikiTextEditor.xhtml">
<ui:param name="textEditorId" value="comment"/>
<ui:param name="textPreviewId" value="commentPreview"/>
<ui:param name="namingContainer" value="commentForm"/>
+ <ui:param name="statusId" value="commentFormStatus"/>
<ui:param name="label" value="#{messages['lacewiki.label.commentForm.Comment']}"/>
- <ui:param name="valueBinding" value="#{commentHome.comment.text}"/>
+ <ui:param name="valueBinding" value="#{commentHome.instance.content}"/>
<ui:param name="valueMaxLength" value="32768"/>
<ui:param name="valueRequired" value="true"/>
- <ui:param name="textEditorColumns" value="50"/>
+ <ui:param name="textEditorColumns" value="#{commentHome.instance.ownedByRegularUser ? '80' : '52'}"/>
<ui:param name="textEditorRows" value="10"/>
</ui:include>
- <s:div styleClass="wideMarginLeft">
<ui:include src="wikiTextPreview.xhtml">
<ui:param name="textPreviewId" value="commentPreview"/>
- <ui:param name="valueBinding" value="#{commentHome.comment.text}"/>
+ <ui:param name="valueBinding" value="#{commentHome.instance.content}"/>
<ui:param name="enablePlugins" value="false"/>
- <ui:param name="baseDocument" value="#{documentHome.instance}"/>
- <ui:param name="baseDirectory" value="#{documentHome.instance.parent}"/>
+ <ui:param name="baseDocument" value="#{currentDocument}"/>
+ <ui:param name="baseDirectory" value="#{currentDocument.parent}"/>
</ui:include>
- </s:div>
- <s:div rendered="#{!identity.loggedIn}">
- <s:div styleClass="entry">
- <div class="label">#{messages['lacewiki.label.VerificationQuestion']}:</div>
- <div class="output">
- #{messages['lacewiki.label.VerificationQuestionQuestion']} <h:outputText value="#{captcha.question}"/>?
- </div>
- </s:div>
-
- <s:decorate id="verifyCaptchaDecorate" template="formFieldDecorate.xhtml">
- <ui:define name="label">#{messages['lacewiki.label.VerificationEnterResponse']}</ui:define>
- <h:inputSecret tabindex="1" size="5" maxlength="5" required="true"
- redisplay="true" id="verifyCaptcha" value="#{captcha.response}">
- </h:inputSecret>
+ <s:decorate id="verifyCaptchaEntry" template="captchaEntry.xhtml">
+ <ui:param name="statusId" value="commentFormStatus"/>
+ <ui:param name="rendered" value="#{!identity.loggedIn}"/>
</s:decorate>
- </s:div>
</s:div>
- <div style="#{empty param.showCommentForm? 'display:none;' : ''}" class="hiddenCommentForm formControls wideLabels">
+ <s:div rendered="#{commentHome.showForm}"
+ styleClass="formControls #{commentHome.instance.ownedByRegularUser ? '' : 'wideLabels'}">
<div class="entry">
<div class="label"> </div>
<div class="input">
- <a:commandLink action="#{commentHome.persist}" tabindex="1" reRender="commentDisplayForm"
+ <a:commandLink id="post"
+ action="#{commentHome.persist}" tabindex="1"
+ reRender="commentDisplayForm, messageBoxContainer"
accesskey="#{messages['lacewiki.button.commentForm.Post.accesskey']}"
- status="commentForm:status"
- oncomplete="jQuery('.hiddenCommentForm').show();jQuery('#commentForm\\:userNameDecorate\\:userName').focus(); wrapBoxes();"
- styleClass="button">
+ status="commentFormStatus"
+ eventsQueue="ajaxEventQueue"
+ oncomplete="onAjaxRequestComplete()"
+ styleClass="button sessionEventTrigger">
<h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.commentForm.Post']}"/>
</a:commandLink>
- <h:outputLink value="#{wiki:renderURL(currentDocument)}#commentForm" styleClass="buttonNonpersistent" tabindex="1"
- accesskey="#{messages['lacewiki.button.CancelExit.accesskey']}">
+ <a:commandLink action="#{commentHome.cancel}" tabindex="1"
+ reRender="commentDisplayForm, messageBoxContainer"
+ immediate="true"
+ eventsQueue="ajaxEventQueue"
+ accesskey="#{messages['lacewiki.button.CancelExit.accesskey']}"
+ oncomplete="onAjaxRequestComplete()"
+ styleClass="buttonNonpersistent sessionEventTrigger">
<h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.CancelExit']}"/>
- </h:outputLink>
+ </a:commandLink>
</div>
</div>
- </div>
+ </s:div>
</div>
</h:form>
1.5 +9 -10 jboss-seam/examples/wiki/view/includes/helpPopup.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: helpPopup.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/helpPopup.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- helpPopup.xhtml 9 Nov 2007 15:08:25 -0000 1.4
+++ helpPopup.xhtml 19 Dec 2007 04:29:19 -0000 1.5
@@ -44,24 +44,22 @@
<s:div id="helpSelector">
<h:panelGrid columns="3" styleClass="fullWidth"
+
columnClasses="alignLeft fivePercentColumn, alignLeft defaultColumn, alignRight tenPercentColumn">
<h:outputText value="#{messages['lacewiki.label.help.Browse']}:"/>
- <h:form id="helpSelectorForm">
- <h:selectOneMenu
- value="#{help.selectedNode}"
- converter="#{nestedSetNodeWrapperRestrictedEntityConverter}">
+ <h:form id="helpSelectorForm" style="display:inline;">
+ <h:selectOneMenu value="#{help.selectedNode}" styleClass="ajaxSupport" converter="#{nestedSetNodeWrapperRestrictedEntityConverter}">
<s:selectItems value="#{help.root.wrappedChildren}"
var="helpNode"
- label="#{wiki:repeatString(' ',helpNode.level)}#{wiki:isDocument(helpNode.wrappedNode) ? '·' : '' }#{wiki:truncateString(helpNode.wrappedNode.name, 40, '...')}"
- noSelectionLabel="#{help.root.wrappedNode.name}"/>
- <a:support event="onchange" reRender="helpSelectorFullscreenLink, helpContent"/>
+ label="#{wiki:repeatString(' ',helpNode.level-1)}#{wiki:truncateString(helpNode.wrappedNode.name, 40, '...')}"/>
+ <a:support event="onchange" reRender="helpSelectorForm, helpSelectorFullscreenLink, helpContent" oncomplete="onAjaxRequestComplete()"/>
</h:selectOneMenu>
</h:form>
<h:panelGroup>
<s:span id="helpSelectorFullscreenLink">
- <h:outputLink value="#{wiki:renderURL(help.selectedNode.wrappedNode)}"
- rendered="#{not empty help.selectedNode}"
+ <h:outputLink value="#{wiki:renderURL(help.selectedDocument)}"
+ rendered="#{not empty help.selectedDocument}"
styleClass="buttonNonpersistent"
tabindex="1">
<h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.help.OpenFullscreen']}"/>
@@ -95,7 +93,8 @@
</script>
</s:fragment>
</s:div>
+
</ui:define>
- <ui:define name="dialogControls"></ui:define>
+ <ui:define name="dialogControls"/>
</ui:decorate>
1.15 +15 -11 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- attachmentDisplay.xhtml 12 Oct 2007 16:31:26 -0000 1.14
+++ attachmentDisplay.xhtml 19 Dec 2007 04:29:19 -0000 1.15
@@ -1,38 +1,42 @@
-<s:div styleClass="box" style="margin-top:25px"
- rendered="#{wiki:sizeOf(wikiTextAttachments) > 0}"
+<s:div styleClass="attachmentDisplay box"
+ rendered="#{wikiTextAttachments.size() > 0}"
xmlns="http://www.w3.org/1999/xhtml"
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:s="http://jboss.com/products/seam/taglib">
-<s:div id="attachments" styleClass="attachmentDisplay">
<h:dataTable value="#{wikiTextAttachments}" var="link"
+ id="attachmentTable"
styleClass="datatable rightBorder leftBorder topBorder bottomBorder"
headerClass="regularHeader alignLeft"
columnClasses="fivePercentColumn alignLeft, defaultColumn alignLeft"
rowClasses="rowOdd,rowEven"
cellpadding="0" cellspacing="0" border="0">
+
<h:column>
<f:facet name="header">#{messages['lacewiki.label.attachmentDisplay.Attachments']}:</f:facet>
<h:panelGrid columns="3" columnClasses="onePercentColumn alignRight, onePercentColumn alignLeft, onePercentColumn alignRight">
- <s:span><a name="attachment#{uiComponent['directoryEditForm:menuItemTable'].rowIndex + 1}"/></s:span>
- <h:outputText value="# #{uiComponent['directoryEditForm:menuItemTable'].rowIndex + 1}"/>
- <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{fileMetaMap[link.node.contentType].displayIcon}"
- width="18" height="20"/>
+ <s:span><a name="attachment#{uiComponent['attachmentTable'].rowIndex + 1}"/></s:span>
+ <h:outputText value="# #{uiComponent['attachmentTable'].rowIndex + 1}"/>
+
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes[link.file.contentType].displayIcon}"
+ rendered="#{not empty uploadTypes[link.file.contentType]}" width="18" height="20"/>
+
+ <h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/#{uploadTypes['generic'].displayIcon}"
+ rendered="#{empty uploadTypes[link.file.contentType]}" width="18" height="20"/>
</h:panelGrid>
</h:column>
<h:column>
<h:panelGroup>
- <h:outputLink value="#{wiki:renderURL(link.node)}">
- <h:outputText value="#{link.node.name}"/>
+ <h:outputLink value="#{wiki:renderURL(link.file)}">
+ <h:outputText value="#{link.file.name}"/>
 
- <h:outputText value="(#{link.node.filename}, #{wiki:displayFilesize(link.node.filesize)}, #{link.node.contentType})"/>
+ <h:outputText value="(#{link.file.filename}, #{wiki:displayFilesize(link.file.filesize)}, #{link.file.contentType})"/>
</h:outputLink>
</h:panelGroup>
</h:column>
</h:dataTable>
</s:div>
-</s:div>
\ No newline at end of file
1.9 +3 -3 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- breadcrumb.xhtml 20 Nov 2007 08:05:11 -0000 1.8
+++ breadcrumb.xhtml 19 Dec 2007 04:29:19 -0000 1.9
@@ -16,12 +16,12 @@
<ui:repeat var="node" value="#{breadcrumb}">
- <h:outputLink value="#{wiki:renderURL(node)}" styleClass="itemLink" rendered="#{wiki:isDirectory(node)}">
+ <h:outputLink value="#{wiki:renderURL(node)}" styleClass="itemLink" rendered="#{node.isInstance('WikiDirectory')}">
<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 value="#{wiki:renderURL(node)}" styleClass="itemText" rendered="#{!node.isInstance('WikiDirectory')}">
+ <h:outputText value="#{wiki:truncateString(node.name, 35, '...')}"/>
<h:outputText rendered="#{!empty param.day || !empty param.month || !empty param.year || !empty param.tag}" value=" (showing"/>
<h:outputText rendered="#{!empty param.day}" value=" #{param.day}."/>
1.9 +20 -16 jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ownerSelector.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ownerSelector.xhtml 20 Nov 2007 08:05:11 -0000 1.8
+++ ownerSelector.xhtml 19 Dec 2007 04:29:19 -0000 1.9
@@ -55,8 +55,8 @@
<h:inputText id="email" value="#{userSearch.exampleUser.email}" maxlength="35" size="10" tabindex="20"/>
</h:panelGroup>
- <a:commandLink id="find" styleClass="buttonNonpersistent" reRender="dialogOwnerSelectionContent"
- oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
+ <a:commandLink id="find" styleClass="buttonNonpersistent sessionEventTrigger" reRender="dialogOwnerSelectionContent"
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
action="#{userSearch.find()}"
tabindex="20"
accesskey="#{messages['lacewiki.button.userList.Find.accesskey']}">
@@ -73,16 +73,16 @@
rendered="#{userSearch.rowCount > 0}">
<a:commandLink action="#{userSearch.firstPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="20"
- oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
- reRender="dialogOwnerSelectionContent">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
+ reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.first.gif" width="13" height="11"/>
</a:commandLink>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
rendered="#{!userSearch.previousPageAvailable}"/>
<a:commandLink action="#{userSearch.previousPage()}" rendered="#{userSearch.previousPageAvailable}" tabindex="20"
- oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
- reRender="dialogOwnerSelectionContent">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
+ reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.previous.gif" width="13" height="11"/>
</a:commandLink>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
@@ -91,16 +91,16 @@
<h:outputText value="#{messages['lacewiki.label.userList.Found']} #{userSearch.rowCount} #{messages['lacewiki.label.userList.Members']}"/>
<a:commandLink action="#{userSearch.nextPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="20"
- oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
- reRender="dialogOwnerSelectionContent">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
+ reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.next.gif" width="13" height="11"/>
</a:commandLink>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
rendered="#{!userSearch.nextPageAvailable}"/>
<a:commandLink action="#{userSearch.lastPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="20"
- oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
- reRender="dialogOwnerSelectionContent">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
+ reRender="dialogOwnerSelectionContent" styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.last.gif" width="13" height="11"/>
</a:commandLink>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
@@ -126,7 +126,8 @@
<h:column>
<f:facet name="header">
<a:commandLink action="#{userSearch.sortBy('username')}" tabindex="20" reRender="dialogOwnerSelectionContent"
- oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
+ styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
@@ -141,7 +142,8 @@
<h:column>
<f:facet name="header">
<a:commandLink action="#{userSearch.sortBy('firstname')}" tabindex="20" reRender="dialogOwnerSelectionContent"
- oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
+ styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
@@ -155,7 +157,8 @@
<h:column>
<f:facet name="header">
<a:commandLink action="#{userSearch.sortBy('lastname')}" tabindex="20" reRender="dialogOwnerSelectionContent"
- oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
+ styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
@@ -169,7 +172,8 @@
<h:column>
<f:facet name="header">
<a:commandLink action="#{userSearch.sortBy('email')}" tabindex="20" reRender="dialogOwnerSelectionContent"
- oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')">
+ oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog'); onAjaxRequestComplete()"
+ styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.up.gif" width="8" height="8"
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
@@ -182,8 +186,8 @@
<h:column>
<a:commandLink action="#{home.selectOwner(u.id)}"
- reRender="ownerDisplay" styleClass="buttonNonpersistent closeDialog"
- tabindex="20">
+ reRender="ownerDisplay" oncomplete="onAjaxRequestComplete()"
+ styleClass="buttonNonpersistent closeDialog sessionEventTrigger" tabindex="20">
<h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.ownerSelector.Select']}"/>
</a:commandLink>
</h:column>
1.5 +2 -5 jboss-seam/examples/wiki/view/includes/directorySelector.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: directorySelector.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/directorySelector.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- directorySelector.xhtml 4 May 2007 19:30:33 -0000 1.4
+++ directorySelector.xhtml 19 Dec 2007 04:29:19 -0000 1.5
@@ -7,7 +7,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:j4j="http://javascript4jsf.dev.java.net/"
xmlns:rich="http://richfaces.ajax4jsf.org/rich">
-
+<!--
<ui:param name="dialogId" value="dialogDirectorySelection"/>
<ui:define name="dialogInit">
<script type="text/javascript">jQuery(function() {
@@ -24,8 +24,6 @@
<ui:define name="dialogTitle">Select parent directory...</ui:define>
<ui:define name="dialogContent">
- Tree disabled, Richfaces issues...
- <!-- /*
<h:form rendered="false">
<rich:tree id="directoryTree" switchType="ajax"
value="#{writableDirectoryTree}" var="d"
@@ -41,9 +39,8 @@
</rich:treeNode>
</rich:tree>
</h:form>
- */ -->
</ui:define>
-
+-->
</ui:decorate>
1.18 +109 -51 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- commentsDisplay.xhtml 15 Nov 2007 12:53:03 -0000 1.17
+++ commentsDisplay.xhtml 19 Dec 2007 04:29:19 -0000 1.18
@@ -8,82 +8,140 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:s="http://jboss.com/products/seam/taglib">
-<s:div styleClass="box" style="margin-top:25px"
- rendered="#{not empty commentHome.comments and documentHome.instance.enableComments}">
+<s:div styleClass="box" rendered="#{not empty commentQuery.comments}">
<h:panelGrid columns="1"
- styleClass="datatable rightBorder leftBorder topBorder bottomBorder"
- columnClasses="commentColumn" rowClasses="rowOdd, rowEven"
+ styleClass="datatable"
+ columnClasses="commentColumn"
cellpadding="0" cellspacing="0" border="0">
<f:facet name="header">
- <s:div styleClass="regularHeader alignLeft">
- <h:outputText value="#{wiki:sizeOf(commentHome.comments)} #{messages['lacewiki.label.commentsDisplay.Comment']}:"
- rendered="#{wiki:sizeOf(commentHome.comments) == 1}"/>
- <h:outputText value="#{wiki:sizeOf(commentHome.comments)} #{messages['lacewiki.label.commentsDisplay.Comments']}:"
- rendered="#{wiki:sizeOf(commentHome.comments) > 1}"/>
+ <s:div styleClass="regularHeader alignLeft topBorder bottomBorder rightBorder leftBorder">
+ <h:outputText value="#{commentQuery.comments.size()} #{titleSingular}:"
+ rendered="#{commentQuery.comments.size() == 1}"/>
+ <h:outputText value="#{commentQuery.comments.size()} #{titlePlural}:"
+ rendered="#{commentQuery.comments.size() > 1}"/>
</s:div>
</f:facet>
- <c:forEach var="c" items="#{commentHome.comments}">
- <s:span>
+ <c:forEach var="c" items="#{commentQuery.comments}">
+
+ <s:div style="margin-left:#{c.level > 1 ? c.level : ''}0px;"
+ styleClass="#{c.level > 1 ? 'commentLevel' : 'commentFirstLevel'}">
+
<a id="comment#{c.id}"/>
- <s:div styleClass="commentSubject undecoratedLink" rendered="#{documentHome.instance.name != c.subject}">
- <h:outputLink value="#{wiki:renderCommentURL(currentDocument, c)}">
+ <h:panelGrid columns="3" styleClass="commentHeader"
+ columnClasses="commentSubject, commentAuthorInfo smallFont, commentAuthorPortrait"
+ cellpadding="0" cellspacing="0" border="0">
+
+ <s:div styleClass="undecoratedLink largeFont" rendered="#{currentDocument.name != c.subject}">
+ <h:outputLink value="#{wiki:renderURL(c)}">
<h:outputText value="#{c.subject}"/>
</h:outputLink>
</s:div>
+ <s:div styleClass="largeFont" rendered="#{currentDocument.name == c.subject}">
+ <h:outputText value=" "/>
+ </s:div>
- <div class="commentAuthorDate">
- <span class="commentLink undecoratedLink">
- <h:outputLink value="#{wiki:renderCommentURL(currentDocument, c)}">
- <h:outputText value="#{messages['lacewiki.label.Link']}"/>
- </h:outputLink>
- </span>
- <h:outputText value=" | "/>
- <span class="commentDate">
+ <s:fragment>
+ <s:div>
+ <s:span styleClass="commentDate">
<h:outputText value="#{c.createdOn}">
<f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
</h:outputText>
<h:outputText value=" #{wikiPreferences.timeZone}"/>
- </span>
+ </s:span>
<h:outputText value=" | "/>
- <s:span>
- <s:span styleClass="commentAuthor" rendered="#{empty c.fromUserHomepage}">#{c.fromUserName}</s:span>
- <s:span styleClass="commentAuthor" rendered="#{!empty c.fromUserHomepage}"><a
- href="#{c.fromUserHomepage}">#{c.fromUserName}</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 styleClass="commentLink undecoratedLink">
+ <h:outputLink value="#{wiki:renderURL(c)}">
+ <h:outputText value="#{messages['lacewiki.label.Link']}"/>
+ </h:outputLink>
</s:span>
+ </s:div>
+ <s:div rendered="#{c.ownedByRegularUser}">
+ <s:span styleClass="undecoratedLink">
+ <s:link view="/userInfo_#{skin}.xhtml" propagation="none">
+ <f:param name="userId" value="#{c.createdBy.id}"/>
+ <h:outputText value="#{c.createdBy.fullname}"/>
+ </s:link>
</s:span>
- </div>
+ <h:outputText value=" | "/>
+ <h:outputLink value="#{wiki:escapeEmailURL(wiki:concat('mailto:', c.createdBy.email))}">
+ <h:outputText value="#{wiki:escapeAtSymbol(c.createdBy.email)}"/>
+ </h:outputLink>
+ </s:div>
+ <s:div rendered="#{not c.ownedByRegularUser}">
+ <h:outputText rendered="#{empty c.fromUserHomepage}" value="#{c.fromUserName}"/>
+ <s:fragment rendered="#{not empty c.fromUserHomepage}">
+ <a href="#{c.fromUserHomepage}">#{c.fromUserName}</a>
+ </s:fragment>
+ <s:fragment rendered="#{not empty c.fromUserEmail}">
+ <h:outputText value=" | "/>
+ <h:outputLink value="#{wiki:escapeEmailURL(wiki:concat('mailto:', c.fromUserEmail))}">
+ <h:outputText value="#{wiki:escapeAtSymbol(c.fromUserEmail)}"/>
+ </h:outputLink>
+ </s:fragment>
+ </s:div>
+ </s:fragment>
+
+ <s:fragment rendered="#{c.ownedByRegularUser and !empty c.createdBy.profile.imageContentType}">
+ <s:span styleClass="undecoratedLink">
+ <s:link view="/userInfo_#{skin}.xhtml" propagation="none">
+ <f:param name="userId" value="#{c.createdBy.id}"/>
+ <s:graphicImage styleClass="commentAuthorPortraitImage" value="#{c.createdBy.profile.image}">
+ <s:transformImageSize width="30" maintainRatio="true"/>
+ </s:graphicImage>
+ </s:link>
+ </s:span>
+ </s:fragment>
+
+ </h:panelGrid>
- <s:div styleClass="commentText" rendered="#{c.useWikiText}">
- <wiki:formattedText value="#{c.text}"
+ <s:div styleClass="commentText" rendered="#{c.useWikiText and not empty currentDocument.areaNumber}">
+ <wiki:formattedText value="#{c.content}"
linkStyleClass="regularLink"
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
thumbnailLinkStyleClass="regularLink"
- renderBaseDocument="#{documentHome.instance}"
- renderBaseDirectory="#{documentHome.parentDirectory}"
+ linkBaseFile="#{currentDocument}"
+ currentAreaNumber="#{currentDocument.areaNumber}"
enablePlugins="false"/>
</s:div>
- <s:div styleClass="commentText" rendered="#{not c.useWikiText and documentHome.instance.name != c.subject}" style="margin-top:15px;">
- <h:outputText value="#{wiki:escapeHTML(c.text, true)}" escape="false"/>
+ <s:div styleClass="commentText" rendered="#{not c.useWikiText and currentDocument.name != c.subject}" style="margin-top:15px;">
+ <h:outputText value="#{wiki:escapeHTML(c.content, true)}" escape="false"/>
</s:div>
- <s:div styleClass="commentText" rendered="#{not c.useWikiText and documentHome.instance.name == c.subject}">
- <h:outputText value="#{wiki:escapeHTML(c.text, true)}" escape="false"/>
+ <s:div styleClass="commentText" rendered="#{not c.useWikiText and currentDocument.name == c.subject}">
+ <h:outputText value="#{wiki:escapeHTML(c.content, true)}" escape="false"/>
+ </s:div>
+
+ <s:div styleClass="commentSignature"
+ rendered="#{not empty c.createdBy.profile.signature and not empty currentDocument.areaNumber}">
+ <s:div styleClass="commentSignatureSeparator">
+ <h:outputText value=" "/>
+ </s:div>
+ <wiki:formattedText value="#{c.createdBy.profile.signature}"
+ linkStyleClass="regularLink"
+ brokenLinkStyleClass="brokenLink"
+ attachmentLinkStyleClass="regularLink"
+ thumbnailLinkStyleClass="regularLink"
+ linkBaseFile="#{currentDocument}"
+ currentAreaNumber="#{currentDocument.areaNumber}"
+ enablePlugins="false"/>
</s:div>
- <div align="right">
- <h:form rendered="#{s:hasPermission('Comment', 'delete', documentHome.instance)}">
- <a:commandLink action="#{commentHome.remove(c.id)}" reRender="comments" oncomplete="wrapBoxes();"
- styleClass="button"><span class="buttonLabel">#{messages['lacewiki.button.commentsDisplay.RemoveComment']}</span></a:commandLink>
+ <div align="right" class="commentControls">
+
+ <h:form>
+ <h:panelGroup>
+ <ui:insert name="controls"/>
+ </h:panelGroup>
</h:form>
+
</div>
- </s:span>
+ </s:div>
</c:forEach>
</h:panelGrid>
</s:div>
</s:span>
+
1.6 +11 -11 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- preferencesEditor.xhtml 25 Aug 2007 17:59:24 -0000 1.5
+++ preferencesEditor.xhtml 19 Dec 2007 04:29:19 -0000 1.6
@@ -11,13 +11,13 @@
<a:region>
<h:dataTable id="preferenceComponentList" var="prefComp"
value="#{preferenceComponents}"
- styleClass="formListTable"
+ styleClass="formListTable sessionEventTrigger"
cellpadding="0" cellspacing="0" border="0"
columnClasses="formListItem">
<h:column>
<a:commandLink action="#{preferenceEditor.selectPreferenceComponent(prefComp)}"
- reRender="preferenceComponentList, propertyPanel"
+ reRender="preferenceComponentList, propertyPanel" oncomplete="onAjaxRequestComplete()"
styleClass="#{prefComp == preferenceEditor.preferenceComponent ? 'selectedItem' : ''}">
#{prefComp.description}
</a:commandLink>
@@ -32,7 +32,7 @@
<h:dataTable id="propertyTable" var="v"
rendered="#{not empty preferenceEditor.preferenceComponent}"
value="#{preferenceEditor.preferenceValues}"
- styleClass="datatable topLeftBottomBorder rightBorder"
+ styleClass="datatable topLeftBottomBorder rightBorder sessionEventTrigger"
columnClasses="twentyPercentColumn alignLeft minorPadding,
twentyPercentColumn alignLeft, defaultColumn alignCenter rightBorder"
rowClasses="rowEven,rowOdd"
@@ -48,8 +48,8 @@
</s:div>
<s:div rendered="#{v.preferenceProperty.type.simpleName == 'String'}">
- <h:inputText value="#{v.value}" size="25" rendered="#{!v.preferenceProperty.longStringAllowed}">
- <a:support event="onblur" action="#{preferenceEditor.validate}"
+ <h:inputText styleClass="ajaxSupport" value="#{v.value}" size="25" rendered="#{!v.preferenceProperty.longStringAllowed}">
+ <a:support event="onblur" action="#{preferenceEditor.validate}" oncomplete="onAjaxRequestComplete()"
reRender="preferenceValidationErrors, preferenceComponentList"/>
</h:inputText>
<h:inputTextarea value="#{v.value}" rows="10" cols="35" style="margin:5px;" rendered="#{v.preferenceProperty.longStringAllowed}">
@@ -59,25 +59,25 @@
</s:div>
<s:div rendered="#{v.preferenceProperty.type.simpleName == 'Long'}">
- <h:inputText value="#{v.value}" size="5">
+ <h:inputText styleClass="ajaxSupport" value="#{v.value}" size="5">
<f:converter converterId="javax.faces.Long"/>
- <a:support event="onblur" action="#{preferenceEditor.validate}"
+ <a:support event="onblur" action="#{preferenceEditor.validate}" oncomplete="onAjaxRequestComplete()"
reRender="preferenceValidationErrors, preferenceComponentList, propertyPanel"/>
</h:inputText>
</s:div>
<s:div rendered="#{v.preferenceProperty.type.simpleName == 'Double'}">
- <h:inputText value="#{v.value}" size="10">
+ <h:inputText styleClass="ajaxSupport" value="#{v.value}" size="10">
<f:converter converterId="javax.faces.Double"/>
- <a:support event="onblur" action="#{preferenceEditor.validate}"
+ <a:support event="onblur" action="#{preferenceEditor.validate}" oncomplete="onAjaxRequestComplete()"
reRender="preferenceValidationErrors, preferenceComponentList"/>
</h:inputText>
</s:div>
<s:div rendered="#{v.preferenceProperty.type.simpleName == 'Date'}">
- <h:inputText id="dt" value="#{v.value}">
+ <h:inputText styleClass="ajaxSupport" id="dt" value="#{v.value}">
<f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
- <a:support event="onblur" action="#{preferenceEditor.validate}"
+ <a:support event="onblur" action="#{preferenceEditor.validate}" oncomplete="onAjaxRequestComplete()"
reRender="preferenceValidationErrors, preferenceComponentList"/>
</h:inputText>
<s:selectDate for="dt" dateFormat="dd. MMM yyyy, HH:mm">
1.9 +55 -43 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- wikiTextEditor.xhtml 9 Nov 2007 15:08:25 -0000 1.8
+++ wikiTextEditor.xhtml 19 Dec 2007 04:29:19 -0000 1.9
@@ -9,17 +9,16 @@
<!-- TODO: Most of this Javascript could be made generic and not rendered for each and every
text editor on the page (luckily we usually have just one)... -->
-<script type="text/javascript" src="#{wikiPreferences.baseUrl}/seam/resource/remoting/resource/remote.js"></script>
<script type="text/javascript" src="#{wikiPreferences.baseUrl}/seam/resource/remoting/interface.js?wikiTextEditor"></script>
<script type="text/javascript">
- /* Set text area resize on backing bean */
- Seam.Remoting.displayLoadingMessage = function() {};
- Seam.Remoting.hideLoadingMessage = function() {};
Seam.Remoting.getContext().setConversationId('#{conversation.id}');
+ /* Set text area resize on backing bean */
var wikiTextEditor = Seam.Component.getInstance("wikiTextEditor");
function storeTextAreaRows(editorId, textAreaRows) {
+ /* TODO: Causes seam/hibernate passivation version mismatch errors if followed by an AJAX request, disabled.
wikiTextEditor.setTextAreaRows(editorId, textAreaRows, noopCallback);
+ */
}
function noopCallback() {}
</script>
@@ -49,18 +48,10 @@
};
</script>
- <s:span id="#{textEditorId}MessageLabel"
- styleClass="#{wiki:hasMessage(namingContainer, wiki:concat(textEditorId, 'TextArea'))?'label errorDiv':'label'}">
+ <s:div id="#{textEditorId}MessageLabel"
+ styleClass="#{wiki:hasMessage(namingContainer, wiki:concat(textEditorId, 'TextArea'))?'label errorEntry':'label'}">
<s:div>
- <ui:decorate template="helpPopupButton.xhtml">
- <ui:param name="label" value="?"/>
- <ui:param name="width" value="550"/>
- <ui:param name="height" value="350"/>
- <ui:param name="top" value="100"/>
- <ui:param name="left" value="100"/>
- <ui:param name="helpDocument" value="Wiki Text Markup"/>
- </ui:decorate>
<h:outputText value="#{label}:"/>
<s:fragment rendered="#{not empty textPreviewId}">
<br/>
@@ -68,12 +59,14 @@
</s:fragment>
</s:div>
- <h:panelGrid columns="2" rendered="#{wiki:hasMessage(namingContainer, wiki:concat(textEditorId, 'TextArea'))}">
+ <s:div styleClass="errorMessage" rendered="#{wiki:hasMessage(namingContainer, wiki:concat(textEditorId, 'TextArea'))}">
+ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/attention.gif"
width="18" height="18"
styleClass="attentionImage"/>
<s:span styleClass="attentionMessage"> <span id="#{textEditorId}MessageText"><h:message for="#{textEditorId}TextArea"/></span></s:span>
</h:panelGrid>
+ </s:div>
<s:fragment rendered="#{!empty tabId}">
<s:span rendered="#{wiki:hasMessage(namingContainer, wiki:concat(textEditorId, 'TextArea'))}">
@@ -88,14 +81,19 @@
</s:span>
</s:fragment>
- </s:span>
+ </s:div>
<div class="input">
+
<s:validateAll>
<s:div id="#{textEditorId}TextEditDiv" styleClass="textEditResizable">
+
+ <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"
+ columnClasses="textArea, textAreaHelp">
+
<h:inputTextarea id="#{textEditorId}TextArea"
- style="line-height: 15px"
+ styleClass="ajaxSupport"
tabindex="1"
cols="#{empty textEditorColumns ? '58' : textEditorColumns}"
rows="#{not empty wikiTextEditor.getTextAreaRows(textEditorId)
@@ -106,17 +104,31 @@
<a:support event="onkeyup"
action="#{wikiTextEditor.validate(textEditorId, valueBinding)}"
reRender="#{textEditorId}MessageLabel, #{textPreviewId}"
- status="#{namingContainer}:status"
+ status="#{statusId}"
ignoreDupResponses="true"
requestDelay="3000"
ajaxSingle="true"
- eventsQueue="textEditKeyPress"
+ eventsQueue="ajaxEventQueue"
+ oncomplete="onAjaxRequestComplete()"
rendered="#{not empty textPreviewId}"/>
</h:inputTextarea>
+
+ <ui:decorate template="helpPopupButton.xhtml">
+ <ui:param name="label" value="?"/>
+ <ui:param name="width" value="550"/>
+ <ui:param name="height" value="350"/>
+ <ui:param name="top" value="100"/>
+ <ui:param name="left" value="100"/>
+ <ui:param name="helpDocument" value="Wiki Text Markup"/>
+ </ui:decorate>
+
+ </h:panelGrid>
+
<s:div id="#{textEditorId}TextEditResizeHandle" styleClass="textEditResizeHandle" style="display:none;"/>
</s:div>
</s:validateAll>
+
</div>
</s:div>
1.7 +1 -1 jboss-seam/examples/wiki/view/includes/pluginPreferencesForm.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pluginPreferencesForm.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/pluginPreferencesForm.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- pluginPreferencesForm.xhtml 14 Nov 2007 10:19:44 -0000 1.6
+++ pluginPreferencesForm.xhtml 19 Dec 2007 04:29:19 -0000 1.7
@@ -16,7 +16,7 @@
<h:outputText styleClass="pluginPreferencesEditorTitleText" value="#{pluginPreferencesEditor.preferenceComponent.description}"/>
<a:commandLink action="#{pluginPreferencesEditor.apply}" tabindex="1"
- reRender="#{pluginDiv}"
+ reRender="#{pluginDiv}" oncomplete="onAjaxRequestComplete()"
styleClass="buttonNonpersistent"><span class="buttonLabel">Apply</span></a:commandLink>
</h:panelGrid>
1.7 +1 -0 jboss-seam/examples/wiki/view/includes/popupDialog.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: popupDialog.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/popupDialog.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- popupDialog.xhtml 12 Oct 2007 16:31:26 -0000 1.6
+++ popupDialog.xhtml 19 Dec 2007 04:29:19 -0000 1.7
@@ -38,4 +38,5 @@
</s:div>
<s:div styleClass="popupDialogResizeHandle" id="#{dialogId}ResizeHandle" rendered="#{not disableResize}"/>
+
</s:div>
1.11 +3 -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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- searchControl.xhtml 20 Nov 2007 08:05:11 -0000 1.10
+++ searchControl.xhtml 19 Dec 2007 04:29:19 -0000 1.11
@@ -5,13 +5,14 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:s="http://jboss.com/products/seam/taglib">
- <h:form id="searchControlForm">
+ <!-- TODO: This form doesn't work on a timeout session, not every page times it out... -->
+ <h:form id="searchControlForm" styleClass="sessionEventTrigger">
<h:panelGroup styleClass="searchControlTable">
<h:inputText styleClass="searchControlInput" id="searchControlSearchString" value="#{wikiSearch.simpleQuery}"
onclick="clickClear(this, '#{messages['lacewiki.label.searchControl.Search']}')"
onblur="clickRecall(this, '#{messages['lacewiki.label.searchControl.Search']}')"
size="15" maxlength="1000" tabindex="60"/>
- <h:commandLink styleClass="searchControlLink" tabindex="61"
+ <h:commandLink styleClass="searchControlLink sessionEventTrigger" tabindex="61"
accesskey="#{messages['lacewiki.button.searchControl.Find.accesskey']}"
action="search">
<h:outputText escape="false" value="#{messages['lacewiki.button.searchControl.Find']}"/>
1.17 +17 -14 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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- userControl.xhtml 20 Nov 2007 08:05:11 -0000 1.16
+++ userControl.xhtml 19 Dec 2007 04:29:19 -0000 1.17
@@ -1,4 +1,4 @@
-<h:form id="userControl"
+<h:form id="userControl" styleClass="userControlForm"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
@@ -10,6 +10,7 @@
<h:panelGroup styleClass="userControlPanel">
+ <s:span styleClass="sessionEventTrigger">
<h:outputLabel styleClass="userControlLabel" for="loginUsername" value="#{messages['lacewiki.label.userControl.Username']}:"/>
<h:inputText styleClass="userControlInput" id="loginUsername" value="#{identity.username}" size="8" tabindex="50"/>
<h:outputLabel styleClass="userControlLabel" for="loginPassword" value="#{messages['lacewiki.label.userControl.Password']}:"/>
@@ -18,6 +19,7 @@
accesskey="#{messages['lacewiki.button.userControl.Login.accesskey']}">
<h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Login']}"/>
</h:commandLink>
+ </s:span>
<s:link styleClass="userControlLink" tabindex="50"
accesskey="#{messages['lacewiki.button.userControl.Register.accesskey']}"
@@ -39,21 +41,22 @@
<s:div rendered="#{identity.loggedIn}">
<h:panelGroup styleClass="userControlPanel">
- <h:outputText styleClass="userControlLabel" value="(#{currentUser.fullname})"/>
- <s:link styleClass="userControlLink" action="#{authenticator.logout}" tabindex="70"
+ <h:outputText styleClass="userControlLabel sessionEventTrigger" value="(#{currentUser.fullname})"/>
+
+ <s:link styleClass="userControlLink sessionEventTrigger" action="#{authenticator.logout}" tabindex="70"
accesskey="#{messages['lacewiki.button.userControl.Logout.accesskey']}">
<h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Logout']}"/>
</s:link>
- <h:outputLink styleClass="userControlLink" tabindex="70"
+ <h:outputLink styleClass="userControlLink sessionEventTrigger" tabindex="70"
accesskey="#{messages['lacewiki.button.userControl.Home.accesskey']}"
- value="#{wiki:renderHomeURL(currentUser)}"
+ value="#{wiki:renderURL(currentUser.memberHome)}"
rendered="#{!empty currentUser.memberHome}">
<h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Home']}"/>
</h:outputLink>
- <s:link styleClass="userControlLink" tabindex="70"
+ <s:link styleClass="userControlLink sessionEventTrigger" tabindex="70"
accesskey="#{messages['lacewiki.button.userControl.Profile.accesskey']}"
view="/userHome_#{skin}.xhtml" propagation="none">
<h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Profile']}"/>
1.2 +2 -2 jboss-seam/examples/wiki/view/includes/helpPopupButton.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: helpPopupButton.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/helpPopupButton.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- helpPopupButton.xhtml 24 Sep 2007 08:23:21 -0000 1.1
+++ helpPopupButton.xhtml 19 Dec 2007 04:29:19 -0000 1.2
@@ -1,7 +1,7 @@
<a:commandLink
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
ajaxSingle="true"
- oncomplete="showHelpPopup( '#{width}', '#{height}', '#{top}', '#{left}' )"
+ oncomplete="showHelpPopup( '#{width}', '#{height}', '#{top}', '#{left}' ); onAjaxRequestComplete()"
reRender="dialogHelpContent"
action="#{help.selectDocumentByName(helpDocument)}"
- styleClass="buttonNonpersistent"><span class="buttonLabel">#{label}</span></a:commandLink>
+ styleClass="buttonNonpersistent sessionEventTrigger"><span class="buttonLabel">#{label}</span></a:commandLink>
\ No newline at end of file
1.4 +1 -1 jboss-seam/examples/wiki/view/includes/statusIndicator.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: statusIndicator.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/statusIndicator.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- statusIndicator.xhtml 9 Nov 2007 15:08:25 -0000 1.3
+++ statusIndicator.xhtml 19 Dec 2007 04:29:19 -0000 1.4
@@ -7,7 +7,7 @@
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:s="http://jboss.com/products/seam/taglib">
- <a:status id="status">
+ <a:status id="#{statusId}" forceId="true">
<f:facet name="start">
<s:div styleClass="statusStart">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/statusindicator.gif" width="20" height="25"/>
1.1 date: 2007/12/19 04:29:19; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/includes/userInfo.xhtml
Index: userInfo.xhtml
===================================================================
<s:fragment
xmlns="http://www.w3.org/1999/xhtml"
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:c="http://java.sun.com/jstl/core"
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:s="http://jboss.com/products/seam/taglib">
<div class="box">
<div class="boxHeader">
<h:outputText value="#{user.fullname}"/>
<div>
<h:outputLink value="#{wiki:escapeEmailURL(wiki:concat('mailto:', user.email))}">
<h:outputText value="#{wiki:escapeAtSymbol(user.email)}"/>
</h:outputLink>
</div>
</div>
<div class="boxContent userInfoProfileContent">
<s:div styleClass="#{!empty user.profile.bio ? 'userInfoPortraitWithBio' : 'userInfoPortrait'}"
rendered="#{!empty user.profile.imageContentType}">
<s:graphicImage styleClass="userInfoPortraitImage"
value="#{user.profile.image}">
<s:transformImageSize width="80" maintainRatio="true"/>
</s:graphicImage>
</s:div>
<s:span styleClass="userInfoBio" rendered="#{!empty user.profile.bio}">
<wiki:formattedText value="#{user.profile.bio}"
linkStyleClass="regularLink"
brokenLinkStyleClass="brokenLink"
attachmentLinkStyleClass="regularLink"
thumbnailLinkStyleClass="regularLink"
linkBaseFile="#{wikiStart}"
currentAreaNumber="#{wikiStart.areaNumber}"
internalTargetFrame="_top"
externalTargetFrame="_top"
enablePlugins="false"/>
</s:span>
<s:div rendered="#{!empty user.profile.website}" styleClass="userInfoEntry">
<span class="userInfoEntryLabel">#{messages['lacewiki.label.userHome.Website']}:</span>
<span class="userInfoEntryLink">
<h:outputLink target="_top" value="#{user.profile.website}">#{wiki:truncateString(user.profile.website, 40, '...')}</h:outputLink>
</span>
</s:div>
<s:div rendered="#{!empty user.profile.location}" styleClass="userInfoEntry">
<span class="userInfoEntryLabel">#{messages['lacewiki.label.userHome.Location']}:</span>
<span class="userInfoEntryText">
<h:outputText value="#{user.profile.location}"/>
</span>
</s:div>
<s:div rendered="#{!empty user.profile.occupation}" styleClass="userInfoEntry">
<span class="userInfoEntryLabel">#{messages['lacewiki.label.userHome.Occupation']}:</span>
<span class="userInfoEntryText">
<h:outputText value="#{user.profile.occupation}"/>
</span>
</s:div>
<s:div styleClass="userInfoEntry"
rendered="#{empty user.profile.imageContentType
and empty user.profile.bio
and empty user.profile.website
and empty user.profile.location
and empty user.profile.occupation}">
<h:outputText value="#{messages['lacewiki.label.userInfo.NoProfile']}"/>
</s:div>
</div>
<s:div styleClass="boxFooter"/>
</div>
</s:fragment>
1.1 date: 2007/12/19 04:29:19; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/includes/wikiUploadEditor.xhtml
Index: wikiUploadEditor.xhtml
===================================================================
<s:div xmlns="http://www.w3.org/1999/xhtml"
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:wiki="http://jboss.com/products/seam/wiki"
xmlns:s="http://jboss.com/products/seam/taglib">
</s:div>
1.1 date: 2007/12/19 04:29:19; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/includes/wikiUploadImageEditor.xhtml
Index: wikiUploadImageEditor.xhtml
===================================================================
<s:div xmlns="http://www.w3.org/1999/xhtml"
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:wiki="http://jboss.com/products/seam/wiki"
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:s="http://jboss.com/products/seam/taglib">
<div class="entry sessionEventTrigger">
<div class="label">#{messages['lacewiki.label.uploadEdit.OriginalImageSize']}:</div>
<div class="output">
#{editor.instance.sizeX} x #{editor.instance.sizeY} #{messages['lacewiki.label.uploadEdit.Pixel']}
</div>
</div>
<s:div styleClass="entry" id="imagePreview">
<div class="label">#{messages['lacewiki.label.uploadEdit.ImagePreview']}:</div>
<div class="output">
<h:panelGrid columns="1">
<h:panelGroup>
<a:region>
<a:commandLink status="uploadEditFormStatus" id="zoomOut" tabindex="2" action="#{editor.zoomPreviewOut}"
reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/minus.gif" width="18" height="18"/>
</a:commandLink>
<a:commandLink status="uploadEditFormStatus" id="actualSize" tabindex="2" action="#{editor.zoomActualSize}"
reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/equals.gif" width="18" height="18"/>
</a:commandLink>
<a:commandLink status="uploadEditFormStatus" id="zoomIn" tabindex="2" action="#{editor.zoomPreviewIn}"
reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()"
styleClass="sessionEventTrigger">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/plus.gif" width="18" height="18"/>
</a:commandLink>
</a:region>
</h:panelGroup>
<h:outputLink value="#{facesContext.externalContext.requestContextPath}/servlets/files/download.seam?fileId=#{editor.instance.id}">
<s:graphicImage value="#{editor.instance.data}" style="border: 1px solid black;">
<s:transformImageSize width="#{editor.imagePreviewSize}" maintainRatio="true"/>
</s:graphicImage>
</h:outputLink>
</h:panelGrid>
</div>
</s:div>
<div class="entry sessionEventTrigger">
<div class="label">#{messages['lacewiki.label.uploadEdit.ShowInDocuments']}:</div>
<div class="input">
<h:selectOneMenu value="#{editor.instance.thumbnail}" styleClass="" tabindex="4">
<f:selectItem itemLabel="#{messages['lacewiki.label.uploadEdit.SmallThumbnail']}" itemValue="S"/>
<f:selectItem itemLabel="#{messages['lacewiki.label.uploadEdit.MediumThumbnail']}" itemValue="M"/>
<f:selectItem itemLabel="#{messages['lacewiki.label.uploadEdit.LargeThumbnail']}" itemValue="L"/>
<f:selectItem itemLabel="#{messages['lacewiki.label.uploadEdit.FullSize']}" itemValue="F"/>
<f:selectItem itemLabel="#{messages['lacewiki.label.uploadEdit.AsAttachment']}" itemValue="A"/>
<a:support event="onchange" status="uploadEditFormStatus" action="#{editor.selectThumbnail}"
reRender="imagePreview, messageBoxContainer" oncomplete="onAjaxRequestComplete()"/>
</h:selectOneMenu>
</div>
</div>
</s:div>
1.1 date: 2007/12/19 04:29:19; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/includes/writeProtectionSelector.xhtml
Index: writeProtectionSelector.xhtml
===================================================================
<s:div id="writeProtectionSelector"
xmlns="http://www.w3.org/1999/xhtml"
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:wiki="http://jboss.com/products/seam/wiki"
xmlns:s="http://jboss.com/products/seam/taglib"
rendered="#{currentUser.admin}">
<s:div styleClass="entry">
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{home.instance.writeProtected}" tabindex="1"/>
<h:outputText value="#{messages['lacewiki.label.WriteProtected']}"/>
</div>
</s:div>
</s:div>
1.1 date: 2007/12/19 04:29:19; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/includes/tagEditor.xhtml
Index: tagEditor.xhtml
===================================================================
<s:fragment
xmlns="http://www.w3.org/1999/xhtml"
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:wiki="http://jboss.com/products/seam/wiki"
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:s="http://jboss.com/products/seam/taglib">
<s:div styleClass="entry">
<div class="label">
<h:outputText value="#{messages['lacewiki.label.tagEdit.Tags']}:"/>
</div>
<div class="input">
<h:inputText id="tagsInput" styleClass="ajaxSupport" tabindex="1" size="70" maxlength="1024" required="false" value="#{home.tagString}">
<a:support event="onblur" reRender="popularTagsList" oncomplete="onAjaxRequestComplete()"/>
</h:inputText>
</div>
</s:div>
<script type="text/javascript">
function appendTag(tag) {
oldValue = jQuery('##{namingContainer}\\:tagsInput').val();
if (oldValue != null && oldValue.length > 0) {
jQuery('##{namingContainer}\\:tagsInput').val(
trimString(oldValue) + (stringEndsWith(trimString(oldValue), ",") ? " " : ", ") + tag
);
} else {
jQuery('##{namingContainer}\\:tagsInput').val(tag);
}
refreshPopularTagsList();
}
</script>
<a:jsFunction name="refreshPopularTagsList"
reRender="popularTagsList"/>
<s:div styleClass="entry" id="popularTagsList">
<div class="label">
<h:outputText value="#{messages['lacewiki.label.tagEdit.PopularTags']}:"/>
</div>
<div class="input">
<h:panelGroup>
<ui:repeat var="tagCount" value="#{home.popularTags}">
<s:span styleClass="undecoratedLink">
<s:fragment rendered="#{not home.isTagInTagString(tagCount.tag)}">
<h:outputLink value="#" styleClass="sessionEventTrigger"
onclick="appendTag('#{tagCount.tag}')">#{tagCount.tag}</h:outputLink>
  
</s:fragment>
</s:span>
</ui:repeat>
</h:panelGroup>
 
</div>
</s:div>
</s:fragment>
1.1 date: 2007/12/19 04:29:19; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/includes/captchaEntry.xhtml
Index: captchaEntry.xhtml
===================================================================
<ui:composition
xmlns="http://www.w3.org/1999/xhtml"
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:s="http://jboss.com/products/seam/taglib">
<s:div styleClass="entry #{invalid?'errorEntry':''}">
<s:fragment rendered="#{rendered}">
<s:div styleClass="errorMessage" rendered="#{invalid}">
<h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/attention.gif"
width="18" height="18"
styleClass="attentionImage"/>
<s:span styleClass="attentionMessage"> <s:message/></s:span>
</h:panelGrid>
</s:div>
<div class="label">#{messages['lacewiki.label.VerificationQuestion']}:</div>
<div class="input">
<s:validateAll>
<h:inputText tabindex="1" size="6" maxlength="6" required="true" id="verifyCaptcha" value="#{captcha.response}"/>
<h:graphicImage value="/seam/resource/captcha?nocache=#{wiki:generateRandomNumber()}" styleClass="captchaImage"/>
</s:validateAll>
</div>
</s:fragment>
</s:div>
</ui:composition>
1.1 date: 2007/12/19 04:29:19; author: cbauer; state: Exp;jboss-seam/examples/wiki/view/includes/userInfoLink.xhtml
Index: userInfoLink.xhtml
===================================================================
<s:fragment
xmlns="http://www.w3.org/1999/xhtml"
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:c="http://java.sun.com/jstl/core"
xmlns:wiki="http://jboss.com/products/seam/wiki"
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:s="http://jboss.com/products/seam/taglib">
<s:div styleClass="undecoratedLink" rendered="#{wiki:isRegularUser(user)}">
<s:link view="/userInfo_#{skin}.xhtml" propagation="none">
<f:param name="userId" value="#{user.id}"/>
<h:outputText value="#{user.fullname}"/>
</s:link>
</s:div>
<s:div rendered="#{not wiki:isRegularUser(user)}">
<h:outputText value="#{user.fullname}"/>
</s:div>
</s:fragment>
More information about the jboss-cvs-commits
mailing list