[jboss-cvs] jboss-seam/examples/wiki/view/includes ...
Christian Bauer
christian at hibernate.org
Wed Jan 2 00:36:16 EST 2008
User: cbauer
Date: 08/01/02 00:36:16
Modified: examples/wiki/view/includes userControl.xhtml
searchControl.xhtml
Log:
JBSEAM-2421 - Forgot password reset feature
Revision Changes Path
1.20 +93 -87 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.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- userControl.xhtml 1 Jan 2008 13:00:20 -0000 1.19
+++ userControl.xhtml 2 Jan 2008 05:36:16 -0000 1.20
@@ -7,8 +7,7 @@
xmlns:a="https://ajax4jsf.dev.java.net/ajax"
xmlns:s="http://jboss.com/products/seam/taglib">
-
-<s:fragment rendered="#{not identity.loggedIn}">
+<s:fragment rendered="#{not identity.loggedIn and empty resetPasswordOfUser}">
<ui:decorate template="popupDialog.xhtml">
<ui:param name="dialogId" value="passwordReset"/>
@@ -16,13 +15,13 @@
<ui:param name="disableResize" value="true"/>
<ui:define name="dialogInit">
<script type="text/javascript">jQuery(function() {
- var offset = jQuery("#userControl\\:openPasswordResetPopup").offset();
+ var offset = jQuery("#loginForm\\:openPasswordResetPopup").offset();
jsf('passwordResetPopup')
.css({ width: "400px", height: "115px",
top: offset.top+10+"px", left: offset.left-200+"px"
})
.jqm({
- trigger: jQuery("#userControl\\:openPasswordResetPopup"),
+ trigger: jQuery("#loginForm\\:openPasswordResetPopup"),
closeClass: "closeDialog",
onShow: fadeInPopupDialog,
onHide: fadeOutPopupDialog
@@ -31,20 +30,20 @@
</ui:define>
<ui:define name="dialogTitle">#{messages['lacewiki.label.resetPassword.DialogTitle']}</ui:define>
<ui:define name="dialogContent">
- <h:form id="resetPasswordForm" styleClass="resetPasswordForm">
+ <h:form id="resetPasswordRequestForm" styleClass="resetPasswordRequestForm">
<div class="form">
<div class="formFields">
<s:decorate id="nameDecorate" template="formFieldDecorate.xhtml">
- <ui:param name="fieldId" value="resetPasswordUsername"/>
+ <ui:param name="fieldId" value="userPasswordResetUsername"/>
<ui:define name="label">#{messages['lacewiki.label.resetPassword.Username']}</ui:define>
- <h:inputText tabindex="51" size="16" maxlength="16" value="#{authenticator.resetPasswordUsername}"/>
+ <h:inputText tabindex="51" size="16" maxlength="16" value="#{userPasswordReset.username}"/>
</s:decorate>
<s:decorate id="emailDecorate" template="formFieldDecorate.xhtml">
- <ui:param name="fieldId" value="resetPasswordEmail"/>
+ <ui:param name="fieldId" value="userPasswordResetEmail"/>
<ui:define name="label">#{messages['lacewiki.label.resetPassword.Email']}</ui:define>
- <h:inputText tabindex="51" size="32" maxlength="255" value="#{authenticator.resetPasswordEmail}"/>
+ <h:inputText tabindex="51" size="32" maxlength="255" value="#{userPasswordReset.email}"/>
</s:decorate>
</div>
@@ -55,7 +54,7 @@
<a:commandLink styleClass="buttonNonpersistent sessionEventTrigger closeDialog" tabindex="51"
reRender="messageBoxContainer, passwordReset"
oncomplete="onAjaxRequestComplete()"
- action="#{authenticator.sendResetPasswordEmail}">
+ action="#{userPasswordReset.sendResetPasswordEmail}">
<h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.resetPassword.Reset']}"/>
</a:commandLink>
@@ -72,92 +71,99 @@
</ui:decorate>
</s:fragment>
-<h:form id="userControl" styleClass="userControlForm">
+<s:div id="userControlPanel" styleClass="userControlPanel sessionEventTrigger">
+
+ <h:form id="resetPasswordForm" styleClass="resetPasswordForm" rendered="#{not empty resetPasswordOfUser}">
+
+ <h:outputText styleClass="label" value="Reset password of '#{resetPasswordOfUser.username}':"/>
+ <h:inputSecret styleClass="input" id="password" value="#{userPasswordReset.password}" size="8" tabindex="50"/>
+
+ <h:outputText styleClass="label" value="Repeat:"/>
+ <h:inputSecret styleClass="input" id="passwordControl" value="#{userPasswordReset.passwordControl}" size="8" tabindex="50"/>
- <s:div rendered="#{not identity.loggedIn}">
+ <h:commandLink styleClass="button" action="#{userPasswordReset.reset}" tabindex="50">
+ <h:outputText styleClass="buttonLabel" value="Reset"/>
+ </h:commandLink>
+
+ </h:form>
- <h:panelGroup styleClass="userControlPanel">
+ <s:fragment rendered="#{not identity.loggedIn}">
- <s:span styleClass="sessionEventTrigger">
+ <h:form id="loginForm" styleClass="loginForm" rendered="#{empty resetPasswordOfUser}">
- <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:outputText styleClass="label" value="#{messages['lacewiki.label.userControl.Username']}:"/>
+ <h:inputText styleClass="input" id="loginUsername" value="#{identity.username}" size="8" tabindex="50"/>
- <h:outputLabel styleClass="userControlLabel" for="loginPassword" value="#{messages['lacewiki.label.userControl.Password']}"/>
- <h:outputText value="("/>
- <h:outputLink value="#" id="openPasswordResetPopup"
- styleClass="userControlLink" style="padding:0;margin:0;border:0;" tabindex="50">
- <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.ResetPassword']}"/>
+ <s:span styleClass="label">
+ <h:outputText value="#{messages['lacewiki.label.userControl.Password']} "/>
+ <h:outputLink value="#" id="openPasswordResetPopup" tabindex="50">
+ <h:outputText styleClass="linkText" escape="false" value="(#{messages['lacewiki.button.userControl.ResetPassword']})"/>
</h:outputLink>
- <h:outputText value="):" style="padding-right:5px;"/>
- <h:inputSecret styleClass="userControlInput" id="loginPassword" value="#{identity.password}" size="8" tabindex="50"/>
+ <h:outputText value=":"/>
+ </s:span>
+ <h:inputSecret styleClass="input" id="loginPassword" value="#{identity.password}" size="8" tabindex="50"/>
- <h:commandLink styleClass="userControlLink" action="#{identity.login}" tabindex="50"
+ <h:commandLink action="#{identity.login}" tabindex="50" styleClass="link"
accesskey="#{messages['lacewiki.button.userControl.Login.accesskey']}">
- <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Login']}"/>
+ <h:outputText styleClass="linkText" escape="false" value="#{messages['lacewiki.button.userControl.Login']}"/>
</h:commandLink>
- </s:span>
- <s:link styleClass="userControlLink" tabindex="50"
+ </h:form>
+
+ <s:link tabindex="50" styleClass="link"
accesskey="#{messages['lacewiki.button.userControl.Register.accesskey']}"
view="/userRegister_#{skin}.xhtml" propagation="none"
rendered="#{preferences.get('UserManagement').enableRegistration}">
- <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Register']}"/>
+ <h:outputText styleClass="linkText" escape="false" value="#{messages['lacewiki.button.userControl.Register']}"/>
</s:link>
- <s:link styleClass="userControlLink" tabindex="50"
+ <s:link tabindex="50" styleClass="link"
accesskey="#{messages['lacewiki.button.userControl.Members.accesskey']}"
view="/userList_#{skin}.xhtml" propagation="none">
- <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Members']}"/>
+ <h:outputText styleClass="linkText" escape="false" value="#{messages['lacewiki.button.userControl.Members']}"/>
</s:link>
- </h:panelGroup>
+ </s:fragment>
- </s:div>
+ <s:fragment rendered="#{identity.loggedIn}">
- <s:div rendered="#{identity.loggedIn}">
+ <h:outputText styleClass="label" value="(#{currentUser.fullname})"/>
- <h:panelGroup styleClass="userControlPanel">
-
- <h:outputText styleClass="userControlLabel sessionEventTrigger" value="(#{currentUser.fullname})"/>
-
- <s:link styleClass="userControlLink sessionEventTrigger" action="#{authenticator.logout}" tabindex="70"
+ <s:link styleClass="link" action="#{authenticator.logout}" tabindex="70"
accesskey="#{messages['lacewiki.button.userControl.Logout.accesskey']}">
- <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Logout']}"/>
+ <h:outputText styleClass="linkText" escape="false" value="#{messages['lacewiki.button.userControl.Logout']}"/>
</s:link>
- <h:outputLink styleClass="userControlLink sessionEventTrigger" tabindex="70"
+ <h:outputLink styleClass="link" tabindex="70"
accesskey="#{messages['lacewiki.button.userControl.Home.accesskey']}"
value="#{wiki:renderURL(currentUser.memberHome)}"
rendered="#{!empty currentUser.memberHome}">
- <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Home']}"/>
+ <h:outputText styleClass="linkText" escape="false" value="#{messages['lacewiki.button.userControl.Home']}"/>
</h:outputLink>
- <s:link styleClass="userControlLink sessionEventTrigger" tabindex="70"
+ <s:link styleClass="link" 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']}"/>
+ <h:outputText styleClass="linkText" escape="false" value="#{messages['lacewiki.button.userControl.Profile']}"/>
<f:param name="userId" value="#{currentUser.id}"/>
</s:link>
- <s:link styleClass="userControlLink" tabindex="70"
+ <s:link styleClass="link" tabindex="70"
accesskey="#{messages['lacewiki.button.userControl.Members.accesskey']}"
view="/userList_#{skin}.xhtml" propagation="none">
- <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Members']}"/>
+ <h:outputText styleClass="linkText" escape="false" value="#{messages['lacewiki.button.userControl.Members']}"/>
</s:link>
- <s:link styleClass="userControlLink" tabindex="70"
+ <s:link styleClass="link" tabindex="70"
accesskey="#{messages['lacewiki.button.userControl.Admin.accesskey']}"
view="/adminHome_#{skin}.xhtml" propagation="none"
rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
- <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Admin']}"/>
+ <h:outputText styleClass="linkText" escape="false" value="#{messages['lacewiki.button.userControl.Admin']}"/>
</s:link>
- </h:panelGroup>
-
- </s:div>
+ </s:fragment>
-</h:form>
+</s:div>
</s:fragment>
1.12 +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.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- searchControl.xhtml 19 Dec 2007 04:29:19 -0000 1.11
+++ searchControl.xhtml 2 Jan 2008 05:36:16 -0000 1.12
@@ -7,7 +7,7 @@
<!-- 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:panelGrid columns="2" styleClass="searchControlTable" cellpadding="0" cellspacing="0" border="0">
<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']}')"
@@ -18,7 +18,7 @@
<h:outputText escape="false" value="#{messages['lacewiki.button.searchControl.Find']}"/>
<f:param name="conversationPropagation" value="none"/>
</h:commandLink>
- </h:panelGroup>
+ </h:panelGrid>
</h:form>
</div>
More information about the jboss-cvs-commits
mailing list