[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Fri Aug 31 11:18:26 EDT 2007
User: cbauer
Date: 07/08/31 11:18:26
Modified: examples/wiki/view docEdit.xhtml fileEdit.xhtml
dirEdit.xhtml userRegister.xhtml userHome.xhtml
search.xhtml
Log:
Status indicator for ajax requests
Revision Changes Path
1.40 +12 -9 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.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- docEdit.xhtml 25 Aug 2007 20:07:58 -0000 1.39
+++ docEdit.xhtml 31 Aug 2007 15:18:26 -0000 1.40
@@ -49,10 +49,13 @@
</ui:include>
</s:span>
+
<div id="docEditFormContainer" class="shadowContainer"><div class="shadow1"><div class="shadow2">
- <h:form>
+ <h:form id="docEditForm">
<div class="form">
+ <ui:include src="includes/statusIndicator.xhtml"/>
+
<script type="text/javascript">jQuery(function() {
jQuery('#formTabs').tabs(2, {onClick: function(){formTabClicked()} });
});</script>
@@ -91,7 +94,7 @@
<ui:param name="fieldId" value="name"/>
<ui:define name="label">Name</ui:define>
<h:inputText tabindex="2" size="70" maxlength="255" required="true" value="#{documentHome.instance.name}">
- <a:support event="onblur" reRender="nameDecorate"/>
+ <a:support status="docEditForm:status" event="onblur" reRender="nameDecorate"/>
</h:inputText>
</s:decorate>
@@ -116,7 +119,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.pushOnFeeds}" tabindex="3">
- <a:support event="onchange" reRender="pushOnSiteFeedSwitchUnmanaged"/>
+ <a:support status="docEditForm:status" event="onchange" reRender="pushOnSiteFeedSwitchUnmanaged"/>
</h:selectBooleanCheckbox>
Create entry on parent directory feeds
</div>
@@ -147,7 +150,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.pushOnFeeds}" tabindex="3">
- <a:support event="onchange" reRender="pushOnSiteFeedSwitch"/>
+ <a:support status="docEditForm:status" event="onchange" reRender="pushOnSiteFeedSwitch"/>
</h:selectBooleanCheckbox>
Push changes onto feeds of parent directories
</div>
@@ -189,8 +192,8 @@
rows="#{docEditorPreferences.properties['regularEditAreaRows']}"
id="contentTextArea"
value="#{documentHome.formContent}">
- <a:support rendered="#{documentHome.enabledPreview}" event="onkeyup" reRender="preview" requestDelay="3000" eventsQueue="editKeyPress"/>
- <a:support event="onblur" reRender="contentDecorate"/>
+ <a:support status="docEditForm:status" rendered="#{documentHome.enabledPreview}" event="onkeyup" reRender="preview" requestDelay="3000" eventsQueue="editKeyPress"/>
+ <a:support status="docEditForm:status" event="onblur" reRender="contentDecorate"/>
</h:inputTextarea>
<div id="contentTextEditResizeHandle" class="textEditResizeHandle" style="display:none"/>
</div>
@@ -200,7 +203,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.enabledPreview}" tabindex="3">
- <a:support event="onchange" reRender="preview,contentDecorate,pluginSwitch"/>
+ <a:support status="docEditForm:status" event="onchange" reRender="preview,contentDecorate,pluginSwitch"/>
</h:selectBooleanCheckbox>
Show interactive preview
</div>
@@ -211,7 +214,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.showPluginPrefs}" tabindex="3">
- <a:support event="onchange" reRender="preview"/>
+ <a:support status="docEditForm:status" event="onchange" reRender="preview"/>
</h:selectBooleanCheckbox>
Show plugin settings in preview
</div>
@@ -248,7 +251,7 @@
<div class="label">Options:</div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.instance.enableComments}" tabindex="3">
- <a:support event="onchange" reRender="commentFormSwitch"/>
+ <a:support status="docEditForm:status" event="onchange" reRender="commentFormSwitch"/>
</h:selectBooleanCheckbox>
Enable comments
</div>
1.22 +11 -6 jboss-seam/examples/wiki/view/fileEdit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: fileEdit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/fileEdit.xhtml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- fileEdit.xhtml 27 Aug 2007 22:22:30 -0000 1.21
+++ fileEdit.xhtml 31 Aug 2007 15:18:26 -0000 1.22
@@ -41,8 +41,11 @@
</ui:include>
</s:span>
- <h:form enctype="multipart/form-data">
+ <h:form id="fileEditForm" enctype="multipart/form-data">
<div class="form">
+
+ <ui:include src="includes/statusIndicator.xhtml"/>
+
<div class="formHead">
<h:outputText value="Create file" rendered="#{!fileHome.managed}"/>
<h:outputText value="Edit file" rendered="#{fileHome.managed}"/>
@@ -76,7 +79,9 @@
<s:decorate id="nameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:define name="label">Name</ui:define>
- <h:inputText tabindex="1" size="50" maxlength="255" required="true" value="#{fileHome.instance.name}"/>
+ <h:inputText size="50" maxlength="255" required="true" tabindex="1" value="#{fileHome.instance.name}">
+ <a:support status="fileEditForm:status" event="onblur" reRender="nameDecorate"/>
+ </h:inputText>
</s:decorate>
<ui:include src="includes/accessLevelSelector.xhtml"/>
@@ -105,7 +110,7 @@
var="imp"
label="#{imp.description}"
noSelectionLabel="Don't convert file"/>
- <a:support event="onchange" reRender="uploadControl"/>
+ <a:support status="fileEditForm:status" event="onchange" reRender="uploadControl"/>
</h:selectOneMenu>
</div>
</div>
@@ -124,13 +129,13 @@
<h:panelGrid columns="1">
<h:panelGroup>
<a:region>
- <a:commandLink id="zoomOut" tabindex="2" action="#{fileHome.zoomPreviewOut}" reRender="imagePreview" alt="Zoom Out">
+ <a:commandLink status="fileEditForm:status" id="zoomOut" tabindex="2" action="#{fileHome.zoomPreviewOut}" reRender="imagePreview" alt="Zoom Out">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/minus.gif" width="18" height="18"/>
</a:commandLink>
- <a:commandLink id="actualSize" tabindex="2" action="#{fileHome.zoomActualSize}" reRender="imagePreview" alt="Actual Size">
+ <a:commandLink status="fileEditForm:status" id="actualSize" tabindex="2" action="#{fileHome.zoomActualSize}" reRender="imagePreview" alt="Actual Size">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/equals.gif" width="18" height="18"/>
</a:commandLink>
- <a:commandLink id="zoomIn" tabindex="2" action="#{fileHome.zoomPreviewIn}" reRender="imagePreview" alt="Zoom In">
+ <a:commandLink status="fileEditForm:status" id="zoomIn" tabindex="2" action="#{fileHome.zoomPreviewIn}" reRender="imagePreview" alt="Zoom In">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/plus.gif" width="18" height="18"/>
</a:commandLink>
</a:region>
1.30 +7 -2 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.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- dirEdit.xhtml 27 Aug 2007 03:09:19 -0000 1.29
+++ dirEdit.xhtml 31 Aug 2007 15:18:26 -0000 1.30
@@ -42,6 +42,9 @@
<h:form id="directoryEditForm">
<div class="form">
+
+<ui:include src="includes/statusIndicator.xhtml"/>
+
<div class="formHead">
<h:outputText value="New directory" rendered="#{!directoryHome.managed}"/>
<h:outputText value="Edit directory" rendered="#{directoryHome.managed}"/>
@@ -74,14 +77,14 @@
<s:decorate id="nameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:define name="label">Name</ui:define>
<h:inputText size="25" maxlength="255" required="true" tabindex="1" value="#{directoryHome.instance.name}">
- <a:support event="onblur" reRender="nameDecorate"/>
+ <a:support status="directoryEditForm:status" event="onblur" reRender="nameDecorate"/>
</h:inputText>
</s:decorate>
<s:decorate id="descriptionDecorate" template="includes/formFieldDecorate.xhtml">
<ui:define name="label">Description</ui:define>
<h:inputText size="50" maxlength="512" required="false" tabindex="1" value="#{directoryHome.instance.description}">
- <a:support event="onblur" reRender="descriptionDecorate"/>
+ <a:support status="directoryEditForm:status" event="onblur" reRender="descriptionDecorate"/>
</h:inputText>
</s:decorate>
@@ -119,6 +122,7 @@
<h:column>
<a:commandLink rendered="#{uiComponent['directoryEditForm:menuItemTable'].rowIndex != 0}"
+ status="directoryEditForm:status"
action="#{directoryHome.moveNode(uiComponent['directoryEditForm:menuItemTable'].rowIndex, uiComponent['directoryEditForm:menuItemTable'].rowIndex-1)}"
reRender="menuItemTable, defaultDocumentSelector">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/up.gif" width="18" height="18"/>
@@ -126,6 +130,7 @@
</h:column>
<h:column>
<a:commandLink rendered="#{uiComponent['directoryEditForm:menuItemTable'].rowIndex != uiComponent['directoryEditForm:menuItemTable'].rowCount-1}"
+ status="directoryEditForm:status"
action="#{directoryHome.moveNode(uiComponent['directoryEditForm:menuItemTable'].rowIndex, uiComponent['directoryEditForm:menuItemTable'].rowIndex+1)}"
reRender="menuItemTable, defaultDocumentSelector">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/down.gif" width="18" height="18"/>
1.9 +10 -7 jboss-seam/examples/wiki/view/userRegister.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userRegister.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userRegister.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- userRegister.xhtml 25 Aug 2007 17:59:21 -0000 1.8
+++ userRegister.xhtml 31 Aug 2007 15:18:26 -0000 1.9
@@ -19,8 +19,11 @@
<ui:define name="content">
-<h:form>
+<h:form id="userRegisterForm">
<div class="form">
+
+ <ui:include src="includes/statusIndicator.xhtml"/>
+
<div class="formHead">
<h:outputText rendered="#{not s:hasPermission('User', 'isAdmin', currentUser)}" value="Register new account"/>
<h:outputText rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}" value="Create new account"/>
@@ -31,28 +34,28 @@
<s:decorate id="firstnameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:define name="label">First name</ui:define>
<h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.firstname}">
- <a:support event="onblur" reRender="firstnameDecorate"/>
+ <a:support status="userRegisterForm:status" event="onblur" reRender="firstnameDecorate"/>
</h:inputText>
</s:decorate>
<s:decorate id="lastnameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:define name="label">Last name</ui:define>
<h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.lastname}">
- <a:support event="onblur" reRender="lastnameDecorate"/>
+ <a:support status="userRegisterForm:status" event="onblur" reRender="lastnameDecorate"/>
</h:inputText>
</s:decorate>
<s:decorate id="emailDecorate" template="includes/formFieldDecorate.xhtml">
<ui:define name="label">E-Mail</ui:define>
<h:inputText tabindex="3" size="40" maxlength="255" required="true" value="#{userHome.instance.email}">
- <a:support event="onblur" reRender="emailDecorate"/>
+ <a:support status="userRegisterForm:status" event="onblur" reRender="emailDecorate"/>
</h:inputText>
</s:decorate>
<s:decorate id="usernameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:define name="label">Username</ui:define>
<h:inputText tabindex="4" size="16" maxlength="16" required="true" id="username" value="#{userHome.instance.username}">
- <a:support event="onblur" action="#{userHome.validateUsername}" reRender="usernameDecorate"/>
+ <a:support status="userRegisterForm:status" event="onblur" action="#{userHome.validateUsername}" reRender="usernameDecorate"/>
</h:inputText>
</s:decorate>
@@ -60,7 +63,7 @@
<ui:define name="label">Password</ui:define>
<h:inputSecret tabindex="5" size="15" maxlength="15"
redisplay="true" value="#{userHome.password}">
- <a:support event="onblur" action="#{userHome.validatePassword}" reRender="passwordDecorate"/>
+ <a:support status="userRegisterForm:status" event="onblur" action="#{userHome.validatePassword}" reRender="passwordDecorate"/>
</h:inputSecret>
</s:decorate>
@@ -68,7 +71,7 @@
<ui:define name="label">Repeat password</ui:define>
<h:inputSecret tabindex="6" size="15" maxlength="15"
redisplay="true" value="#{userHome.passwordControl}">
- <a:support event="onblur" action="#{userHome.validatePasswordControl}" reRender="passwordControlDecorate"/>
+ <a:support status="userRegisterForm:status" event="onblur" action="#{userHome.validatePasswordControl}" reRender="passwordControlDecorate"/>
</h:inputSecret>
</s:decorate>
1.13 +15 -13 jboss-seam/examples/wiki/view/userHome.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userHome.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome.xhtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- userHome.xhtml 25 Aug 2007 17:59:21 -0000 1.12
+++ userHome.xhtml 31 Aug 2007 15:18:26 -0000 1.13
@@ -31,6 +31,8 @@
<h:form id="userHomeForm" enctype="multipart/form-data">
<div class="form">
+ <ui:include src="includes/statusIndicator.xhtml"/>
+
<script type="text/javascript">jQuery(function() {
jQuery('#formTabs').tabs(2, {onClick: function(){formTabClicked()} });
});</script>
@@ -57,7 +59,7 @@
<ui:param name="fieldId" value="firstname"/>
<ui:define name="label">First name</ui:define>
<h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.firstname}">
- <a:support event="onblur" reRender="firstnameDecorate"/>
+ <a:support status="userHomeForm:status" event="onblur" reRender="firstnameDecorate"/>
</h:inputText>
</s:decorate>
@@ -66,7 +68,7 @@
<ui:param name="fieldId" value="lastname"/>
<ui:define name="label">Last name</ui:define>
<h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.lastname}">
- <a:support event="onblur" reRender="lastnameDecorate"/>
+ <a:support status="userHomeForm:status" event="onblur" reRender="lastnameDecorate"/>
</h:inputText>
</s:decorate>
@@ -76,7 +78,7 @@
<ui:define name="label">E-Mail</ui:define>
<h:inputText tabindex="3" size="40" maxlength="255" required="true" value="#{userHome.instance.email}"
disabled="#{userHome.instance.username == guestUser.username}">
- <a:support event="onblur" reRender="emailDecorate"/>
+ <a:support status="userHomeForm:status" event="onblur" reRender="emailDecorate"/>
</h:inputText>
</s:decorate>
@@ -87,7 +89,7 @@
<h:inputText tabindex="4" size="16" maxlength="16" required="true" value="#{userHome.instance.username}"
disabled="#{userHome.instance.username == adminUser.username
or userHome.instance.username == guestUser.username}">
- <a:support event="onblur" action="#{userHome.validateUsername}" reRender="usernameDecorate"/>
+ <a:support status="userHomeForm:status" event="onblur" action="#{userHome.validateUsername}" reRender="usernameDecorate"/>
</h:inputText>
</s:decorate>
@@ -98,7 +100,7 @@
<h:inputSecret tabindex="5" size="15" maxlength="15"
redisplay="true" value="#{userHome.password}"
disabled="#{userHome.instance.username == guestUser.username}">
- <a:support event="onblur" action="#{userHome.validatePassword}" reRender="passwordDecorate"/>
+ <a:support status="userHomeForm:status" event="onblur" action="#{userHome.validatePassword}" reRender="passwordDecorate"/>
</h:inputSecret>
</s:decorate>
@@ -109,7 +111,7 @@
<h:inputSecret tabindex="6" size="15" maxlength="15"
redisplay="true" value="#{userHome.passwordControl}"
disabled="#{userHome.instance.username == guestUser.username}">
- <a:support event="onblur" action="#{userHome.validatePasswordControl}" reRender="passwordControlDecorate"/>
+ <a:support status="userHomeForm:status" event="onblur" action="#{userHome.validatePasswordControl}" reRender="passwordControlDecorate"/>
</h:inputSecret>
</s:decorate>
@@ -181,7 +183,7 @@
<ui:param name="fieldId" value="website"/>
<ui:define name="label">Website</ui:define>
<h:inputText tabindex="1" size="60" maxlength="1000" value="#{userHome.instance.profile.website}">
- <a:support event="onblur" reRender="websiteDecorate"/>
+ <a:support status="userHomeForm:status" event="onblur" reRender="websiteDecorate"/>
</h:inputText>
</s:decorate>
@@ -190,7 +192,7 @@
<ui:param name="fieldId" value="location"/>
<ui:define name="label">Location</ui:define>
<h:inputText tabindex="1" size="40" maxlength="255" value="#{userHome.instance.profile.location}">
- <a:support event="onblur" reRender="locationDecorate"/>
+ <a:support status="userHomeForm:status" event="onblur" reRender="locationDecorate"/>
</h:inputText>
</s:decorate>
@@ -199,7 +201,7 @@
<ui:param name="fieldId" value="occupation"/>
<ui:define name="label">Occupation</ui:define>
<h:inputText tabindex="1" size="60" maxlength="1000" value="#{userHome.instance.profile.occupation}">
- <a:support event="onblur" reRender="occupationDecorate"/>
+ <a:support status="userHomeForm:status" event="onblur" reRender="occupationDecorate"/>
</h:inputText>
</s:decorate>
1.6 +5 -2 jboss-seam/examples/wiki/view/search.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: search.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/search.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- search.xhtml 25 Aug 2007 17:59:21 -0000 1.5
+++ search.xhtml 31 Aug 2007 15:18:26 -0000 1.6
@@ -23,6 +23,8 @@
<h:form id="searchForm">
<s:div styleClass="form" id="searchControl">
+ <ui:include src="includes/statusIndicator.xhtml"/>
+
<a:region>
<h:panelGrid columns="5"
@@ -44,7 +46,7 @@
var="se"
label="#{se.description}"
noSelectionLabel="All"/>
- <a:support event="onchange" reRender="searchControl, searchPager, searchResult" action="#{wikiSearch.search}"/>
+ <a:support status="searchForm:status" event="onchange" reRender="searchControl, searchPager, searchResult" action="#{wikiSearch.search}"/>
</h:selectOneMenu>
</h:panelGrid>
@@ -66,11 +68,12 @@
<f:selectItem itemLabel="5" itemValue="5"/>
<f:selectItem itemLabel="15" itemValue="15"/>
<f:selectItem itemLabel="50" itemValue="50"/>
- <a:support event="onchange" reRender="searchControl, searchPager, searchResult" action="#{wikiSearch.search}"/>
+ <a:support status="searchForm:status" event="onchange" reRender="searchControl, searchPager, searchResult" action="#{wikiSearch.search}"/>
</h:selectOneMenu>
</h:panelGrid>
<a:commandLink id="find" styleClass="buttonNonpersistent" reRender="workspaceSwitcher, searchControl, searchPager, searchResult"
+ status="searchForm:status"
action="#{wikiSearch.search()}"
tabindex="1" accesskey="F"><span class="buttonLabel"><u>F</u>ind</span></a:commandLink>
More information about the jboss-cvs-commits
mailing list