esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r925131 - in /incubator/esme/trunk/server/src/main: resources/ESMEBase.properties resources/ESMEUI.properties scala/bootstrap/liftweb/Boot.scala webapp/templates-hidden/base.html
Date Fri, 19 Mar 2010 08:20:52 GMT
Author: rhirsch
Date: Fri Mar 19 08:20:52 2010
New Revision: 925131

URL: http://svn.apache.org/viewvc?rev=925131&view=rev
Log:
[ESME-100] Finish web UI
Daily hour

Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
    incubator/esme/trunk/server/src/main/resources/ESMEUI.properties
    incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html

Modified: incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMEBase.properties?rev=925131&r1=925130&r2=925131&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEBase.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEBase.properties Fri Mar 19 08:20:52
2010
@@ -121,3 +121,5 @@ base_conv_menu=Conversations
 base_users_menu=Users
 
 base_profile_menu=Settings
+base_profile_public=Public
+

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=925131&r1=925130&r2=925131&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Fri Mar 19 08:20:52 2010
@@ -36,6 +36,7 @@ ui_login_password=Password
 ui_login_password_repeat=Password (retype) 
 ui_login_login=Login
 ui_login_openid=Or Login using Open ID
+ui_login_email=Email
 
 ui_default_conversation=Conversation
 ui_default_footer=Apache ESME 2009 - An Apache Incubator Project

Modified: incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=925131&r1=925130&r2=925131&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/bootstrap/liftweb/Boot.scala Fri Mar 19 08:20:52
2010
@@ -130,7 +130,7 @@ class Boot {
           Loc.Snippet("user_info", TagDisplay.userInfo))) ::
         Menu(Loc("about", List("static", "about"), S.?("base_menu_about"), Hidden)) ::
         Menu(Loc("tag", List("info_view", "tag"), "Tag", Hidden, Loc.Snippet("tag_display",
TagDisplay.display))) ::
-        Menu(Loc("public", List("info_view", "public"), "Public")) ::
+        Menu(Loc("public", List("info_view", "public"), S.?("base_profile_public"))) ::
         Menu(Loc("sign_up", List("signup"), S.?("base_menu_signup"),
           Snippet("signup", User.signupForm),
           Unless(User.loggedIn_? _, S.?("base_menu_sign_up_error")))) ::

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html?rev=925131&r1=925130&r2=925131&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html Fri Mar 19 08:20:52
2010
@@ -45,12 +45,10 @@
                     <div id="top-menu">
                         <ul>
                             <li>
-                                 <lift:Menu.item name="public"/>
-                                | 
+                                 <lift:Menu.item name="public"/> | 
                             </li>
                             <li>
-                              <lift:Menu.item name="profile"/>
-                                | 
+                              <lift:Menu.item name="profile"/> | 
                             </li>
                         </ul>
                         <lift:Menu.item name="logout">



Mime
View raw message