[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Sat Apr 21 04:13:50 EDT 2007
User: cbauer
Date: 07/04/21 04:13:50
Modified: examples/wiki/view userRegister.xhtml userList.xhtml
index.html userHome.xhtml
Log:
Kicked out jCaptcha and replaced with simple math captcha
Revision Changes Path
1.2 +3 -3 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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- userRegister.xhtml 4 Apr 2007 10:38:11 -0000 1.1
+++ userRegister.xhtml 21 Apr 2007 08:13:50 -0000 1.2
@@ -118,15 +118,15 @@
</s:decorate>
<s:div styleClass="entry">
- <div class="label">Verification image:</div>
+ <div class="label">Verification question:</div>
<div class="output">
- <h:graphicImage value="/seam/resource/captcha?#{captcha.id}" style="border: 1px solid black;"/>
+ What is the result of <h:outputText value="#{captcha.question}"/>?
</div>
</s:div>
<s:decorate>
<s:div styleClass="entry">
- <div class="label">Enter the letters:</div>
+ <div class="label">Enter response:</div>
<div class="input">
<h:inputText tabindex="7" size="15" id="verifyCaptcha" value="#{captcha.response}" required="true"/>
</div>
1.12 +1 -0 jboss-seam/examples/wiki/view/userList.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userList.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList.xhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- userList.xhtml 4 Apr 2007 10:38:11 -0000 1.11
+++ userList.xhtml 21 Apr 2007 08:13:50 -0000 1.12
@@ -146,6 +146,7 @@
</f:facet>
<h:outputLink value="#{wiki:renderHomeURL(u)}" rendered="#{!empty u.memberHome}">#{u.username}</h:outputLink>
<h:outputText rendered="#{empty u.memberHome}">#{u.username}</h:outputText>
+ <h:outputText rendered="#{!empty u.activationCode}"> (Not Activated)</h:outputText>
</h:column>
<h:column>
1.3 +1 -1 jboss-seam/examples/wiki/view/index.html
(In the diff below, changes in quantity of whitespace are not shown.)
Index: index.html
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- index.html 18 Mar 2007 22:02:25 -0000 1.2
+++ index.html 21 Apr 2007 08:13:50 -0000 1.3
@@ -1,5 +1,5 @@
<html>
<head>
- <meta http-equiv="Refresh" content="0; URL=9.html">
+ <meta http-equiv="Refresh" content="0; URL=display.seam">
</head>
</html>
\ No newline at end of file
1.3 +9 -4 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- userHome.xhtml 19 Apr 2007 18:36:12 -0000 1.2
+++ userHome.xhtml 21 Apr 2007 08:13:50 -0000 1.3
@@ -80,7 +80,8 @@
<div class="label">E-Mail:</div>
<div class="input">
<h:inputText tabindex="3" size="40" maxlength="255" required="true"
- id="email" value="#{userHome.instance.email}">
+ id="email" value="#{userHome.instance.email}"
+ disabled="#{userHome.instance.username == guestUser.username}">
<a:support event="onblur" reRender="emailDecorate"/>
</h:inputText>
</div>
@@ -92,7 +93,9 @@
<div class="label">Username:</div>
<div class="input">
<h:inputText tabindex="4" size="16" maxlength="16" required="true"
- id="username" value="#{userHome.instance.username}">
+ id="username" 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"/>
</h:inputText>
</div>
@@ -104,7 +107,8 @@
<div class="label">Password:</div>
<div class="input">
<h:inputSecret tabindex="5" size="15" maxlength="15"
- id="password" redisplay="true" value="#{userHome.password}">
+ id="password" redisplay="true" value="#{userHome.password}"
+ disabled="#{userHome.instance.username == guestUser.username}">
<a:support event="onblur" action="#{userHome.validatePassword}" reRender="passwordDecorate"/>
</h:inputSecret>
</div>
@@ -116,7 +120,8 @@
<div class="label">Repeat password:</div>
<div class="input">
<h:inputSecret tabindex="6" size="15" maxlength="15"
- id="passwordControl" redisplay="true" value="#{userHome.passwordControl}">
+ id="passwordControl" redisplay="true" value="#{userHome.passwordControl}"
+ disabled="#{userHome.instance.username == guestUser.username}">
<a:support event="onblur" action="#{userHome.validatePasswordControl}" reRender="passwordControlDecorate"/>
</h:inputSecret>
</div>
More information about the jboss-cvs-commits
mailing list