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/10 14:39:04 UTC
svn commit: r921348 - in /incubator/esme/branches/ui-2010-03-05/src/main:
resources/ESMEUI.properties
scala/org/apache/esme/comet/SinglePublicTimeline.scala
webapp/scripts/display_single_message.js
webapp/templates-hidden/upw_login_form.html
Author: rhirsch
Date: Wed Mar 10 13:39:03 2010
New Revision: 921348
URL: http://svn.apache.org/viewvc?rev=921348&view=rev
Log:
[ESME-100] Finish web UI
Modified:
incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties
incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js
incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html
Modified: incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties?rev=921348&r1=921347&r2=921348&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/resources/ESMEUI.properties Wed Mar 10 13:39:03 2010
@@ -31,6 +31,7 @@ ui_login_email=Email
ui_login_password=Password
ui_login_password_repeat=Password (retype)
ui_login_login=Login
+ui_login_openid=Or Login using Open ID
ui_default_conversation=Conversation
ui_default_footer=Apache ESME 2009 - An Apache Incubator Project
Modified: incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala?rev=921348&r1=921347&r2=921348&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala Wed Mar 10 13:39:03 2010
@@ -67,7 +67,7 @@ class SinglePublicTimeline extends Comet
}
override def lowPriority = {
- case ForceRender =>
+ case SingleForceRender =>
reRender(false)
case Distributor.NewMessage(msg) =>
@@ -84,4 +84,4 @@ class SinglePublicTimeline extends Comet
}
}
-case object ForceRender
+case object SingleForceRender
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js?rev=921348&r1=921347&r2=921348&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js Wed Mar 10 13:39:03 2010
@@ -2,6 +2,17 @@
/*
* displayMessages called by lift:comet, type="Timeline" and type="PublicTimeline"
*/
+
+function login()
+{
+ if (document.forms[0].openID.value != "") {
+ document.forms[0].action='/open_id/login';
+ }
+ else
+ document.forms[0].action='/authentication/login';
+
+ document.forms[0].submit();
+}
function msgDateCompare(msg1, msg2)
{
Modified: incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html?rev=921348&r1=921347&r2=921348&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html (original)
+++ incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/upw_login_form.html Wed Mar 10 13:39:03 2010
@@ -1,23 +1,27 @@
+
+
<div id="login-box">
+
+
<div class="top-login"></div>
<div class="mid-login">
- <form action="/authentication/login" method="post" >
+ <form name="loginFrm" action="javascript:login()" method="post" >
<div class="form">
<div class="post-form-row">
- <label>Username</label>
+ <label> <lift:loc>ui_login_email</lift:loc></label>
<input type="text" name="username" value="" class="inputBox2"/><!--narrow input field-->
</div>
<div class="post-form-row">
- <label>Password</label>
+ <label><lift:loc>ui_login_password</lift:loc></label>
<input type="password" name="password" value="" class="inputBox2"/><!--narrow input field-->
</div>
<div class="line"></div>
- <div class="post-form-row">
- <label>Or Login using Open ID</label>
+ <div class="post-form-row">
+ <label><lift:loc>ui_login_openid</lift:loc></label>
<input type="text" name="openID" value="" class="inputBox2"/><!--narrow input field-->
</div>
@@ -39,4 +43,4 @@
<div class="box-right">
<h3><a href="http://en.wikipedia.org/wiki/Microblogging"><lift:loc>custom_heading_3_title</lift:loc></a></h3>
<lift:loc>custom_heading_3_body</lift:loc></div>
- </div><!--login-box-->
\ No newline at end of file
+ </div><!--login-box "-->
\ No newline at end of file