You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by rh...@apache.org on 2010/03/29 13:26:37 UTC
svn commit: r928722 - in /incubator/esme/trunk/server/src/main: resources/
scala/org/apache/esme/model/ webapp/ webapp/auth_view/
webapp/templates-hidden/
Author: rhirsch
Date: Mon Mar 29 11:26:36 2010
New Revision: 928722
URL: http://svn.apache.org/viewvc?rev=928722&view=rev
Log:
[ESME-100] Finish web UI
Daily hour / extended :->
Modified:
incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
incubator/esme/trunk/server/src/main/webapp/auth_view/index.html
incubator/esme/trunk/server/src/main/webapp/signup.html
incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html
Modified: incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEUI.properties?rev=928722&r1=928721&r2=928722&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Mon Mar 29 11:26:36 2010
@@ -93,7 +93,7 @@ ui_user_author=Author
ui_user_message=Message
ui_user_date=Date
-
+ui_token_title=Tokens
ui_token_title_manage=Manage your tokens
ui_token_title_create=Create a token
ui_token_revoke=Revoke
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala?rev=928722&r1=928721&r2=928722&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala Mon Mar 29 11:26:36 2010
@@ -99,14 +99,14 @@ object User extends User with KeyedMetaM
def genForm(xhtml: NodeSeq): NodeSeq = {
bind("signup", xhtml,
- "nickname" _id_> user.nickname.toForm,
- "firstname" _id_> user.firstName.toForm,
- "lastname" _id_> user.lastName.toForm,
- "image_url" _id_> user.imageUrl.toForm,
- "timezone" _id_> user.timezone.toForm,
- "locale" _id_> user.locale.toForm,
+ "nickname" -%> user.nickname.toForm,
+ "firstname" -%> user.firstName.toForm,
+ "lastname" -%> user.lastName.toForm,
+ "image_url" -%> user.imageUrl.toForm,
+ "timezone" -%> user.timezone.toForm,
+ "locale" -%> user.locale.toForm,
"credentials" -> auth.toForm,
- "submit" _id_> SHtml.submit(S.?("base_user_ui_signup"), doSubmit))
+ "submit" -%> SHtml.submit(S.?("base_user_ui_signup"), doSubmit))
}
Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala?rev=928722&r1=928721&r2=928722&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/UserAuth.scala Mon Mar 29 11:26:36 2010
@@ -27,6 +27,16 @@ import common._
import Helpers._
import http._
+import net.liftweb._
+import http._
+import js._
+import js.jquery._
+import http.jquery._
+import JqJsCmds._
+import JsCmds._
+import SHtml._
+import JE._
+
import scala.xml._
import org.apache.esme.actor._
@@ -145,9 +155,9 @@ object UserPwdAuthModule extends AuthMod
TemplateFinder.findAnyTemplate("templates-hidden" :: "upw_signup_form" :: Nil).map(
xhtml =>
bind("signup", xhtml,
- "email" -> SHtml.text(email, s => email = s.trim.toLowerCase),
- "pwd1" -> SHtml.password(pwd1, s => pwd1 = s.trim),
- "pwd2" -> SHtml.password(pwd2, s => pwd2 = s.trim))
+ "email" -%> SHtml.text(email, s => email = s.trim.toLowerCase),
+ "pwd1" -%> SHtml.password(pwd1, s => pwd1 = s.trim),
+ "pwd2" -%> SHtml.password(pwd2, s => pwd2 = s.trim))
) openOr NodeSeq.Empty
def validate: List[FieldError] = (
@@ -161,6 +171,7 @@ object UserPwdAuthModule extends AuthMod
) ::: (
if (pwd1 != pwd2) {
val msg = S.?("base_user_err_mismatch_password")
+ DisplayMessage("messages", <b>{msg}</b>, 3 seconds, 3 seconds);
S.error(msg)
List(FieldError(new FieldIdentifier {
override def uniqueFieldId: Box[String] = Full("pwd1")
Modified: incubator/esme/trunk/server/src/main/webapp/auth_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/auth_view/index.html?rev=928722&r1=928721&r2=928722&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/auth_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/auth_view/index.html Mon Mar 29 11:26:36 2010
@@ -27,7 +27,9 @@
<script type="text/javascript" src="../scripts/dialog_token.js"> </script>
<lift:TableSorterSnip/>
</head>
- <div class="demo">
+ <div id="back-header">
+ <h1><lift:loc>ui_token_title</lift:loc></h1>
+ <div class="container-settings">
<div id="messages"></div>
<span id="TokenSpan">
<lift:ignore>
@@ -62,8 +64,8 @@
<item:createdDate/>
</td>
<td>
- <item:revoke style="background-color:#fff;">
- <img valign="center" style="background-color:#fff;" src="/images/delete.gif"/>
+ <item:revoke>
+ <img valign="center" src="/images/cancel.png"/>
</item:revoke>
</td>
</tr>
@@ -91,5 +93,6 @@
<lift:loc>ui_token_title_create</lift:loc>
</button>
</div>
+ </div>
<!-- End demo -->
</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/signup.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/signup.html?rev=928722&r1=928721&r2=928722&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/signup.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/signup.html Mon Mar 29 11:26:36 2010
@@ -18,58 +18,62 @@
-->
<lift:surround with="default" at="login">
- <div id="signup-box">
- <div id="mid-signup">
- <h2><label><lift:loc>ui_sign_up_intro</lift:loc> </label></h2>
- <lift:signup form="post">
- <div class="form">
- <div>
- <signup:credentials/>
- </div>
- <div>
- <div class="post-form-row">
- <label for="nickname">
- <lift:loc>ui_sign_up_nickname</lift:loc>
- <br/>
- <signup:nickname class="inputBox2"/>
- </label>
- </div>
- <label for="firstname">
- <lift:loc>ui_sign_up_firstname</lift:loc>
- <br/>
- <signup:firstname/>
- </label>
- <br/>
- <label for="lastname">
- <lift:loc>ui_sign_up_lastname</lift:loc>
- <br/>
- <signup:lastname/>
- </label>
- <br/>
- <label for="image_url">
- <lift:loc>ui_sign_up_image_url</lift:loc>
- <br/>
- <signup:image_url/>
- </label>
- <br/>
- <label for="timezone">
- <lift:loc>ui_sign_up_timezone</lift:loc>
- <br/>
- <signup:timezone/>
- </label>
- <br/>
- <label for="locale">
- <lift:loc>ui_sign_up_locale</lift:loc>
- <br/>
- <signup:locale/>
- </label>
- </div>
- </div>
- <label for="submit">
- <signup:submit id="submit"/>
- </label>
- </lift:signup>
- </div>
- </div>
+<div id="content">
+ <div class="gray-box signup">
+ <div id="messages"></div>
+ <h1><lift:loc>ui_sign_up_intro</lift:loc></h1>
+
+ <lift:signup form="post">
+ <div id="form-signup">
+ <signup:credentials/>
+
+ <div class="post-form-row">
+ <label><lift:loc>ui_sign_up_nickname</lift:loc></label>
+ <signup:nickname class="inputBox2"/>
+ </div>
+
+ <div class="post-form-row">
+ <label><lift:loc>ui_sign_up_firstname</lift:loc></label>
+ <signup:firstname class="inputBox2"/>
+ </div>
+
+ <div class="post-form-row">
+ <label> <lift:loc>ui_sign_up_lastname</lift:loc></label>
+ <signup:lastname class="inputBox2"/>
+ </div>
+
+ <div class="post-form-row">
+ <label> <lift:loc>ui_sign_up_image_url</lift:loc></label>
+ <signup:image_url class="inputBox2"/>
+ </div>
+
+
+ <div class="post-form-row">
+ <label> <lift:loc>ui_sign_up_timezone</lift:loc></label>
+ <signup:timezone class="inputBox2"/>
+ </div>
+
+ <div class="post-form-row">
+ <label> <lift:loc>ui_sign_up_locale</lift:loc></label>
+ <signup:locale class="inputBox2"/>
+ </div>
+
+ <div class="post-form-row">
+ <div class="submit-btn">
+ <signup:submit type="image" src="images/btn-signup-big.gif" />
+ </div>
+ </div>
+
+ </div><!--form-signup-->
+ </lift:signup>
+
+ </div><!--gray-box-->
+
+
+
+
+</div><!--content-->
+
+
</lift:surround>
\ No newline at end of file
Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html?rev=928722&r1=928721&r2=928722&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_signup_form.html Mon Mar 29 11:26:36 2010
@@ -17,22 +17,18 @@
under the License. *
-->
<lift:xml_group>
- <label for="email">
- <lift:loc>ui_login_email</lift:loc>
- <br/>
- <signup:email/><lift:msg id="email"/>
- </label>
- <br/>
- <label for="pwd1">
- <lift:loc>ui_login_password</lift:loc>
- <br/>
- <signup:pwd1/><lift:msg id="pwd1"/>
- </label>
- <br/>
- <label for="pwd2">
- <lift:loc>ui_login_password_repeat</lift:loc>
- <br/>
- <signup:pwd2/>
- </label>
- <br/>
+<div class="post-form-row">
+ <label><lift:loc>ui_login_email</lift:loc></label>
+ <signup:email class="inputBox2"/>
+ </div>
+
+ <div class="post-form-row">
+ <label><lift:loc>ui_login_password</lift:loc></label>
+ <signup:pwd1 class="inputBox2"/>
+ </div>
+
+ <div class="post-form-row">
+ <label> <lift:loc>ui_login_password_repeat</lift:loc></label>
+ <signup:pwd2 class="inputBox2"/>
+ </div>
</lift:xml_group>