incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhir...@apache.org
Subject svn commit: r923106 - in /incubator/esme/trunk/server/src/main: resources/ scala/bootstrap/liftweb/ scala/org/apache/esme/comet/ scala/org/apache/esme/lib/ scala/org/apache/esme/model/ scala/org/apache/esme/snippet/ webapp/ webapp/action_view/ webapp/a...
Date Mon, 15 Mar 2010 07:55:02 GMT
Author: rhirsch
Date: Mon Mar 15 07:55:00 2010
New Revision: 923106

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

Added:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
    incubator/esme/trunk/server/src/main/webapp/images/avatar1.jpg
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar1.jpg
    incubator/esme/trunk/server/src/main/webapp/images/avatar2.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/avatar2.gif
    incubator/esme/trunk/server/src/main/webapp/images/bg-back.jpg
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-back.jpg
    incubator/esme/trunk/server/src/main/webapp/images/bg-box-right.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-box-right.gif
    incubator/esme/trunk/server/src/main/webapp/images/bg-home.jpg
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-home.jpg
    incubator/esme/trunk/server/src/main/webapp/images/bg-main-header.jpg
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-main-header.jpg
    incubator/esme/trunk/server/src/main/webapp/images/bg-right-back.jpg
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-right-back.jpg
    incubator/esme/trunk/server/src/main/webapp/images/bg-search.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-search.gif
    incubator/esme/trunk/server/src/main/webapp/images/bg-tabs.png
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-tabs.png
    incubator/esme/trunk/server/src/main/webapp/images/bg-update.png
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/bg-update.png
    incubator/esme/trunk/server/src/main/webapp/images/btn-search.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-search.gif
    incubator/esme/trunk/server/src/main/webapp/images/btn-signon.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signon.gif
    incubator/esme/trunk/server/src/main/webapp/images/btn-signout.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signout.gif
    incubator/esme/trunk/server/src/main/webapp/images/btn-signup.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-signup.gif
    incubator/esme/trunk/server/src/main/webapp/images/btn-update.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/btn-update.gif
    incubator/esme/trunk/server/src/main/webapp/images/esme-logo.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/esme-logo.gif
    incubator/esme/trunk/server/src/main/webapp/images/heading-bg.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-bg.gif
    incubator/esme/trunk/server/src/main/webapp/images/heading-left.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-left.gif
    incubator/esme/trunk/server/src/main/webapp/images/heading-right.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading-right.gif
    incubator/esme/trunk/server/src/main/webapp/images/heading.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.gif
    incubator/esme/trunk/server/src/main/webapp/images/heading.png
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading.png
    incubator/esme/trunk/server/src/main/webapp/images/heading1.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/heading1.gif
    incubator/esme/trunk/server/src/main/webapp/images/line.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/line.gif
    incubator/esme/trunk/server/src/main/webapp/images/login-bg.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bg.gif
    incubator/esme/trunk/server/src/main/webapp/images/login-bot.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-bot.gif
    incubator/esme/trunk/server/src/main/webapp/images/login-top.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/login-top.gif
    incubator/esme/trunk/server/src/main/webapp/images/tab.gif
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/images/tab.gif
    incubator/esme/trunk/server/src/main/webapp/info_view/public.html
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/info_view/public.html
    incubator/esme/trunk/server/src/main/webapp/scripts/display_single_message.js
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/display_single_message.js
    incubator/esme/trunk/server/src/main/webapp/scripts/pretty.js
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/scripts/pretty.js
    incubator/esme/trunk/server/src/main/webapp/style/style.css
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/style/style.css
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html
      - copied, changed from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/public.html
      - copied unchanged from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/public.html
Modified:
    incubator/esme/trunk/server/src/main/resources/ESMEBase.properties
    incubator/esme/trunk/server/src/main/resources/ESMECustom.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/scala/org/apache/esme/comet/TagCloud.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/User.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
    incubator/esme/trunk/server/src/main/webapp/action_view/index.html
    incubator/esme/trunk/server/src/main/webapp/auth_view/index.html
    incubator/esme/trunk/server/src/main/webapp/index.html
    incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
    incubator/esme/trunk/server/src/main/webapp/info_view/search.html
    incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
    incubator/esme/trunk/server/src/main/webapp/info_view/tag.html
    incubator/esme/trunk/server/src/main/webapp/info_view/user.html
    incubator/esme/trunk/server/src/main/webapp/info_view/users.html
    incubator/esme/trunk/server/src/main/webapp/pools_view/index.html
    incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html
    incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
    incubator/esme/trunk/server/src/main/webapp/signup.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html
    incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html
    incubator/esme/trunk/server/src/main/webapp/track_view/index.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=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEBase.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEBase.properties Mon Mar 15 07:55:00 2010
@@ -116,4 +116,4 @@ base_conv_menu=Conversations
 
 base_users_menu=Users
 
-base_profile_menu=Edit Profile
+base_profile_menu=Settings

Modified: incubator/esme/trunk/server/src/main/resources/ESMECustom.properties
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/resources/ESMECustom.properties?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMECustom.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMECustom.properties Mon Mar 15 07:55:00 2010
@@ -17,4 +17,21 @@
  * under the License.
  */
 custom_mail_from_adress=esme@esme.apache.org
-custom_mail_subject=Message from ESME
\ No newline at end of file
+custom_mail_subject=Message from ESME
+
+custom_opening_main_title=Getting Started on ESME
+custom_opening_main_body=Apache Enterprise Social Messaging Experiment (ESME) is a secure and highly scalable microsharing and micromessaging platform that allows people to discover and meet one another and get controlled access to other sources of information, all in a business process context.ESME is based on the idea that you - the user - decide what information is useful for you.  There are various ways to discover what other users are posting information that may be relevant for you 1) Use "Tracks" to follow terms that may be of interest for you, 2) Use the public timeline to find others who posts may be of interest 3) Use the search function to find others who posts meet certain criterien, 4) Post your thoughts, ideas, etc and others with similar interests will enter into conversations with you
+
+custom_heading_1_title=ASF 
+custom_heading_1_body=Apache Software Foundation (ASF) provides support for the Apache community of open-source software projects. 
+
+custom_heading_2_title=Apache Incubator 
+custom_heading_2_body=Incubator project is the entry path into The Apache Software Foundation (ASF) for projects and codebases wishing to become part of the Foundation's efforts. 
+
+
+custom_heading_3_title=Microblogging 
+custom_heading_3_body=Microblogs differ from a traditional blogs in that their content is typically much smaller, in both actual size and aggregate file size. 
+
+custom_text_link1=home
+custom_text_link2=getting started
+custom_text_link3=blog

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=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/trunk/server/src/main/resources/ESMEUI.properties Mon Mar 15 07:55:00 2010
@@ -16,6 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+ 
+ui_base_error=Error:
+ui_base_notife=FYI:
+ 
 ui_sign_up_intro=Create a new account
 ui_sign_up_basic_info=Basic User Information
 ui_sign_up_details=Account holder details
@@ -31,6 +35,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
@@ -123,9 +128,9 @@ ui_messages_your_timeline=Your timeline
 ui_messages_message_label_author=Author
 ui_messages_message_label_message=Message
 ui_messages_message_label_tags=Tags
-ui_messages_message_label_resend=Resend
-ui_messages_message_label_reply=Reply
-ui_messages_message_label_conversation=Conversation
+ui_messages_message_label_resend=resend
+ui_messages_message_label_reply=reply
+ui_messages_message_label_conversation=conversation
 ui_messages_message_label_public_timeline=Public Timeline
 ui_messages_message_label_message_remove_reply=remove reply
 ui_messages_message_label_contacts=Contacts

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=923106&r1=923105&r2=923106&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 Mon Mar 15 07:55:00 2010
@@ -122,6 +122,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("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/scala/org/apache/esme/comet/TagCloud.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/TagCloud.scala?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/TagCloud.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/TagCloud.scala Mon Mar 15 07:55:00 2010
@@ -64,31 +64,15 @@ class TagCloud extends CometActor /* wit
 
   def render = {
     val messages = lookupMessages()
-    //Sort the tags & words to put the most prominent in the middle
-    <div id="tagcloud">
-      <p id="tag-para">Tags</p>
-      <p>
+    //Sort the tags & words to put the most prominent in the middle 
+    <p>
         {
           for ((name, weight) <- Tag.centreWeightedTopNTagFreqs(messages, 20))
           yield <xml:group><a href={"/tag/" + name}
-              style={"font-size: "+(0.5F + weight)+"em; text-decoration: none;"}>{
+              style={"font-size: "+(0.5F + weight)+"em;"}>{
                 name}</a> </xml:group>
         }
-      </p>
-      <p/>
-      {/*
-      <p id="word-para">Words</p>
-      <p>
-        {
-          for ((name, weight) <- Message.centreWeightedTopNWordFreqs(messages, 20))
-          yield <xml:group><a href={"/search/" + name}
-              style={"font-size: "+(0.5F + weight)+"em; text-decoration: none;"}>{
-                name}</a> </xml:group>
-        }
-      </p>
-      */
-      }
-    </div>
+    </p>
   }
 
 

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/UserMgr.scala Mon Mar 15 07:55:00 2010
@@ -85,9 +85,9 @@ object UserMgr {
 
   private def profileImage(imageUrl: String): NodeSeq = {
     if (imageUrl.length > 0) 
-      <img src={imageUrl}/>
+      <img width="30px" src={imageUrl}/>
     else
-      <p/>
+      <img width="30px" src="/images/avatar.jpg"/>
   }
 
 }

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=923106&r1=923105&r2=923106&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 15 07:55:00 2010
@@ -60,7 +60,6 @@ object User extends User with KeyedMetaM
     source("profile").
     
     setTextAndTags(S.?("base_user_msg_change", in.nickname, in.wholeName, in.imageUrl), Nil, Empty).
- //   setTextAndTags("User " + in.nickname + " changed profile. Name: " + in.wholeName + ", Image: " + in.imageUrl, Nil, Empty).
      foreach{ msg =>
       if (msg.save) {
         Distributor ! Distributor.AddMessageToMailbox(in.id, msg, ProfileReason(in.id))
@@ -252,12 +251,23 @@ class User extends KeyedMapper[Long, Use
     case (_, l) if l.length > 1 => l
     case (_, _) => niceName
   }
+  
+  /**
+   * URL to the image that the user has provided def image_url: String = new URL(imageUrl).toString
+   */
+ 
+  
+  
+  def image_url: String = (imageUrl.is) match {
+    case (f) if f.length > 1 => f
+    case (_) => "/images/avatar.jpg"
+  }
 
   def needsChange_? : Boolean = this.nickname.is.startsWith("chang") &&
   this.firstName.startsWith("Unkn") && this.lastName.startsWith("Unkn")
 
   def image: Option[NodeSeq] = tryo(Text((new URL(imageUrl)).toString)).toOption
-
+  
   def tracking: List[Tracking] =
   Tracking.findAll(By(Tracking.user, this),
                    By(Tracking.disabled, false),

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/UserSnip.scala Mon Mar 15 07:55:00 2010
@@ -84,6 +84,7 @@ object JsonResender extends JsonHandler{
 class UserSnip extends DispatchSnippet {
   def dispatch: DispatchIt = 
   Map("name" -> userName _,
+      "userImage" -> userImage _,
       "postScript" -> postScript _,
       "followers" -> followers _,
       "following" -> following _,
@@ -133,6 +134,13 @@ class UserSnip extends DispatchSnippet {
     
     Text(User.currentUser.map(_.wholeName) openOr "")
   }
+  
+  def userImage(in: NodeSeq) = {
+    if (User.currentUser.map(_.needsChange_?) openOr false)
+    S.redirectTo("/user_mgt/edit")
+    
+    Text(User.currentUser.map(_.image_url) openOr "")
+  }
 
   def accessPools(in: NodeSeq): NodeSeq = {
     for(user <- User.currentUser.toSeq;
@@ -148,13 +156,12 @@ class UserSnip extends DispatchSnippet {
     {Script(JsonPoster.jsCmd)}
     {Script(Function("post_msg", List(),
                      JsonPoster.call("post",
-                                      JsObj("msg" -> ValById("textdude"),
-                                            "tags" -> ValById("tagdude"),
-                                            "access_pool" -> ValById("access_pool"),
+                                      JsObj("msg" -> ValById("vMsg"),
+                                            "tags" -> ValById("vTag"),
+                                            "access_pool" -> ValById("vPool"),
                                             "reply-to" -> JsVar("currentConvNumber"))) &
-                     SetValById("textdude", "") &
-                     SetValById("tagdude", "") &
-                     SetValById("access_pool", "0") &
+                     SetValById("vMsg", "") &
+                     SetValById("vPool", "0") &
                      JsRaw("clearReplyTo();")
         ))
     }

Modified: incubator/esme/trunk/server/src/main/webapp/action_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/action_view/index.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/action_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/action_view/index.html Mon Mar 15 07:55:00 2010
@@ -17,7 +17,7 @@
  under the License.                                           *
 -->
 
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
 
 	<lift:Style.header />
 	<lift:TableSorterSnip/>

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=923106&r1=923105&r2=923106&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 15 07:55:00 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
     <lift:Style.header/><lift:TableSorterSnip/><!-- STYLESHEETS <lift:Style.header /> -->
     <link rel="stylesheet" type="text/css" href="../style/reset.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="../style/text.css" media="screen" />

Modified: incubator/esme/trunk/server/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/index.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/index.html Mon Mar 15 07:55:00 2010
@@ -16,22 +16,67 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
- <lift:UserSnip.loggedIn>
+
+<lift:UserSnip.loggedIn>
     <logged:in>
         <lift:surround with="message" at="content"/>
+                                 <lift:Msgs>
+                     <lift:error_msg>Error:</lift:error_msg>
+                     <lift:notice_msg>FYI:</lift:notice_msg>
+                     <lift:error_class>error_major</lift:error_class>
+                     <lift:notice_msg><lift:loc>ui_base_note</lift:loc></lift:notice_msg>
+                     <lift:notice_class>note_major</lift:notice_class>
+                 </lift:Msgs>
     </logged:in>
     <logged:out>
         <lift:surround with="default" at="content">
-            <div>
-                <fieldset>
-                    <legend>
-                        <lift:loc>ui_default_conversation</lift:loc>
-                    </legend>
-                    <div style="height: 500px; overflow: auto">
-                        <lift:comet type="PublicTimeline"/>
+          	<!---BLUE HEADER-->
+	<div id="container-2nd-level-bg">
+		<div id="container-2nd-level">
+		       <h1><span><lift:loc>custom_opening_main_title</lift:loc></span></h1>
+		       <p><lift:loc>custom_opening_main_body</lift:loc> </p>
+		</div><!--container-2nd-level-->
+	 <link rel="stylesheet" href="../style/style.css" type="text/css" media="screen" />
+	</div><!--container-2nd-level-bg-->
+	<!--END BLUE HEADER-->	
+      <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/><script id="json" src="/classpath/json.js" type="text/javascript"/><script src="/scripts/display_single_message.js" type="text/javascript"/> <script src="/scripts/pretty.js" type="text/javascript"/>
+
+	 <lift:comet type="SinglePublicTimeline"/>
+	 
+	                    <!--updates-box -->
+                    <lift:comet type="SinglePublicTimeline"/> 
+                    <div class="separator">
                     </div>
-                </fieldset>
-            </div>
+                    <table>
+                      <tbody id="timeline_messages">
+                       <tr id="message">
+                      <div id="timeline_messages">
+                       <div class="updates-box">
+                        <div class="avatar">
+                            <img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
+                        </div>
+                        <div class="update2">
+                            <div class="info2" >
+                                <a href="" id="author">-</a>
+                            </div>
+                            <div id="body">-</div>
+                            <div class="time">
+                                <table><tr><td><div id="pool"> -</div></td><td>   </td><td> <div id="when"> -</div></td><td><div id="reason"> -</div></td><td> <div id="source"> -</div></td></tr></table>
+                            </div>
+                            <div id="tags" class="tags">
+                                <p id="tag">
+                                  <a href="tag/tag1">-</a>
+                                </p>
+                                <p id="tag">
+                                  <a href="tag/tag2">-</a>
+                                </p>
+                            </div>
+                        </div>
+                      </div>
+                      </div>
+                      </tr>
+                       </tbody>
+                     </table>
         </lift:surround>
     </logged:out>
 </lift:UserSnip.loggedIn>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/conversation.html Mon Mar 15 07:55:00 2010
@@ -16,15 +16,21 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
+    <lift:Style.header/><lift:TableSorterSnip/><!-- STYLESHEETS <lift:Style.header /> -->
+    <link rel="stylesheet" type="text/css" href="../style/reset.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="../style/text.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="../style/grid.css" media="screen" />
+    <link rel="stylesheet" type="text/css" href="../style/layout.css" media="screen" />
     <script src="/scripts/display_messages.js" type="text/javascript"/>
-    <fieldset>
-        <legend>
-            <lift:loc>ui_default_conversation</lift:loc>
-        </legend>
+        <script type="text/javascript" src="../scripts/esme_table_sorter.js">
+    </script>
+    <div class="box-title-aux">
+   <h3><a href=""><lift:loc>ui_default_conversation</lift:loc></a></h3>
+     </div>
         <div class="b-list">
             <lift:displayConversation/>
             <lift:embed what="templates-hidden/timeline"/>
         </div>
-    </fieldset>
+       
 </lift:surround>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/search.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/search.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/search.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/search.html Mon Mar 15 07:55:00 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
   <script src="/scripts/display_messages.js" type="text/javascript"/>
   
   Search for <lift:searchTerm/>

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/streams.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/streams.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/streams.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/streams.html Mon Mar 15 07:55:00 2010
@@ -17,7 +17,7 @@
  under the License.                                           *
 -->
 
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
     <lift:Style.header/><lift:TableSorterSnip/><!-- STYLESHEETS <lift:Style.header /> -->
     <link rel="stylesheet" type="text/css" href="../style/reset.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="../style/text.css" media="screen" />

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/tag.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/tag.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/tag.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/tag.html Mon Mar 15 07:55:00 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
     <script type="text/javascript" src="../scripts/esme_table_sorter.js">
     </script>
     <lift:TableSorterSnip/>

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/user.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/user.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/user.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/user.html Mon Mar 15 07:55:00 2010
@@ -17,7 +17,7 @@
  under the License.                                           *
 -->
 
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
     <lift:Style.header/><lift:TableSorterSnip/><!-- STYLESHEETS  -->
     <link rel="stylesheet" type="text/css" href="../style/reset.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="../style/text.css" media="screen" />

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/users.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/users.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/users.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/users.html Mon Mar 15 07:55:00 2010
@@ -16,14 +16,13 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
     <script type="text/javascript" src="../scripts/esme_table_sorter.js">
     </script>
     <lift:TableSorterSnip/>
-    <fieldset style="width: 80em">
-        <legend>
-            <lift:loc>ui_user_list_title</lift:loc>
-        </legend>
+    <div class="box-title-aux">
+      <h3><a href=""><lift:loc>ui_user_list_title</lift:loc></a></h3>
+     </div>
         <table id="esme-table" class="tablesorter">
             <thead>
                 <tr>
@@ -67,5 +66,4 @@
                 </lift:displayUsers>
             </tbody>
         </table>
-    </fieldset>
 </lift:surround>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/pools_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/pools_view/index.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/pools_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/pools_view/index.html Mon Mar 15 07:55:00 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
     <lift:Style.header/><lift:TableSorterSnip/><!-- STYLESHEETS <lift:Style.header /> -->
     <link rel="stylesheet" type="text/css" href="../style/reset.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="../style/text.css" media="screen" />

Modified: incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/profile_view/edit.html Mon Mar 15 07:55:00 2010
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
   <lift:editProfile form="post">
     <table id="profile">
       <tbody>

Modified: incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js (original)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js Mon Mar 15 07:55:00 2010
@@ -58,8 +58,9 @@ function displayMessages(msgArray, eleme
       var msgAuthor = cometMsg.author;
       var msgBody = jQuery(cometMsg.text).find('body').html();
       var msgDateObj = new Date(parseInt(cometMsg.when));
-      var msgDateStr = 'on ' + msgDateObj.toLocaleDateString() +
-        ' ' + msgDateObj.toLocaleTimeString();
+      
+      var msgDateStr = prettyDate(msgDateObj);
+      
       var msgPool = '';
       if (cometMsg.pool) msgPool = 'in pool ' + cometMsg.pool.name;
       var msgSource = cometMsg.source;
@@ -87,6 +88,9 @@ function displayMessages(msgArray, eleme
       if (!msgAuthor.imageurl)
       	msgAuthor.imageurl="/images/avatar.jpg"
       	
+     if (!msgPool)
+      	msgPool="public"
+      	
       var avatar = newMsg.find('#avatar')
       .attr('src', msgAuthor.imageurl)
       .attr('alt',msgAuthor.firstname + ' ' + msgAuthor.lastname);

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=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/signup.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/signup.html Mon Mar 15 07:55:00 2010
@@ -16,66 +16,60 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
- 
- <lift:surround with="default" at="content">
-    <div>
-        <h2><lift:loc>ui_sign_up_intro</lift:loc></h2>
-        <lift:signup form="post">
-            <div>
-                <fieldset>
-                    <legend>
-                        <lift:loc>ui_sign_up_basic_info</lift:loc>
-                    </legend>
-                    <div>
-                        <signup:credentials/>
-                    </div>
-                </fieldset>
-                <fieldset>
-                    <legend>
-                        <lift:loc>ui_sign_up_details</lift:loc>
-                    </legend>
-                    <div>
-                        <label for="nickname">
-                            <lift:loc>ui_sign_up_nickname</lift:loc>
-                            <br/>
-                            <signup:nickname/> <lift:msg id="users_nickname"/>
-                        </label>
-                        <br/>
-                        <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>
-                </fieldset>
-            </div>
-            <label for="submit">
-                <signup:submit id="submit"/>
-            </label>
-        </lift:signup>
+
+<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>
 </lift:surround>
\ No newline at end of file

Copied: incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html (from r923098, incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html)
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html?p2=incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html&p1=incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html&r1=923098&r2=923106&rev=923106&view=diff
==============================================================================
--- incubator/esme/branches/ui-2010-03-05/src/main/webapp/templates-hidden/base.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/base.html Mon Mar 15 07:55:00 2010
@@ -49,7 +49,7 @@
                                 | 
                             </li>
                             <li>
-                                <a href="">Settings</a>
+                              <lift:Menu.item name="profile"/>
                                 | 
                             </li>
                         </ul>
@@ -180,4 +180,4 @@
          </div> 
          </div> 
     </body>
-</html>
+</html>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/default.html Mon Mar 15 07:55:00 2010
@@ -16,69 +16,58 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
+
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/" xml:lang="eng">
     <head>
         <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
         <title><lift:loc>ui_default_title</lift:loc></title>
-        <lift:Style.header/><script id="jquery" src="/classpath/jquery.js" type="text/javascript"/><script id="json" src="/classpath/json.js" type="text/javascript"/>
+        <meta http-equiv="Content-Language" content="en-US" />
+        <meta http-equiv="Content-Script-Type" content="text/javascript" />
+        <meta http-equiv="Content-Style-Type" content="text/css" />
+        <meta http-equiv="imagetoolbar" content="no" />
+        <link rel="stylesheet" href="style/style.css" type="text/css" media="screen" />
+        <script id="jquery" src="/classpath/jquery.js" type="text/javascript"/><script id="json" src="/classpath/json.js" type="text/javascript"/>
     </head>
-    <body>
-        <div class="container">
-            <div class="head">
-                <a class="logo" href="/"><img src="/images/esme.png" alt="ESME" /></a>
-                <ul class="b-primary">
-                    <li>
-                        <lift:Menu.item name="sign_up"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="EditUser"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="about"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="list_users"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="trackMgt"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="actionMgt"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="authToken"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="accessPools"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="streams"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="profile"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="logout"/>
-                    </li>
-                </ul>
-            </div>
-            <table>
-                <tr>
-                    <td width="75%">
-                        <div>
-                            <lift:bind name="content" />
-                        </div>
-                    </td>
-                    <td>
-                        <lift:UserSnip.loginForm/><lift:msgs/>
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div class="foot">
-            <center>
+    <body id="home">
+        <div id="container-bg">
+            <div class="container">
+                <div id="header">
+                    <div id="logo"> 
+                        <h1><a href="/"><lift:loc>ui_default_title</lift:loc></a></h1>
+                    </div>
+                    <div id="top-menu">
+                        <lift:Menu.item name="sign_up">
+                       <img src="images/btn-signup.gif" alt="" />
+                    </lift:Menu.item>
+                    </div>
+                </div>
+                <!--// ENDS HEADER -->
+                <div id="left">
+                  <lift:bind name="content" />
+                </div><!--left   -->
+                <div id="right">
+                <lift:bind name="login">
+                 <lift:UserSnip.loginForm/> 
+                </lift:bind>
+                 <lift:Msgs>
+                     <lift:error_msg>Error:</lift:error_msg>
+                     <lift:notice_msg>FYI:</lift:notice_msg>
+                     <lift:error_class>error_major</lift:error_class>
+                     <lift:notice_msg><lift:loc>ui_base_note</lift:loc></lift:notice_msg>
+                     <lift:notice_class>note_major</lift:notice_class>
+                 </lift:Msgs>
+                </div><!--right -->
+           </div><!--// ENDS CONTAINER -->
+        </div><!--// ENDS CONTAINER-BG -->
+        <div class="footer">
+            <div class="ftr-links">			
+				<a href="http://cwiki.apache.org/confluence/display/ESME/Index"><lift:loc>custom_text_link1</lift:loc></a> |
+				<a href="http://cwiki.apache.org/confluence/display/ESME/Index#Index-GettingStarted"><lift:loc>custom_text_link2</lift:loc></a> |
+				<a href="http://blog.esme.us/"><lift:loc>custom_text_link3</lift:loc></a> |
+				<br />
                 <lift:loc>ui_default_footer</lift:loc>
-            </center>
+          <br />
+         </div> 
         </div>
     </body>
 </html>

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html Mon Mar 15 07:55:00 2010
@@ -1,301 +1,118 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one   *
- or more contributor license agreements.  See the NOTICE file *
- distributed with this work for additional information        *
- regarding copyright ownership.  The ASF licenses this file   *
- to you under the Apache License, Version 2.0 (the            *
- "License"); you may not use this file except in compliance   *
- with the License.  You may obtain a copy of the License at   *
-                                                              *
-   http://www.apache.org/licenses/LICENSE-2.0                 *
-                                                              *
- Unless required by applicable law or agreed to in writing,   *
- software distributed under the License is distributed on an  *
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- KIND, either express or implied.  See the License for the    *
- specific language governing permissions and limitations      *
- under the License.                                           *
--->
- <html xmlns="http://www.w3.org/1999/xhtml" xmlns:lift="http://liftweb.net/" xml:lang="eng">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-        <title><lift:loc>ui_default_title</lift:loc></title>
-        <lift:Style.header/><script id="jquery" src="/classpath/jquery.js" type="text/javascript"/><script id="json" src="/classpath/json.js" type="text/javascript"/><script src="/scripts/display_messages.js" type="text/javascript"/>
-    </head>
-    <body>
-        <div class="container">
-            <div class="head">
-                <img src="/images/esme.png" alt="ESME" /><img src="/images/ajax-loader.gif" style="display: none" id="ajax-loader"/>
-                <ul class="b-primary">
-                    <li>
-                        <lift:Menu.item name="sign_up"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="EditUser"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="about"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="list_users"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="trackMgt"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="actionMgt"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="authToken"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="accessPools"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="streams"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="profile"/>
-                    </li>
-                    <li>
-                        <lift:Menu.item name="logout"/>
-                    </li>
-                </ul>
-            </div>
-            <table class="l-page l-page-massage">
-                <tbody>
-                    <tr>
-                        <td class="l-page-r">
-                            <div class="l-top">
-                                <div id="tabs">
-                                    <dl class="messages">
-                                        <dt class="caption">
-                                            <lift:loc>ui_messages_your_timeline</lift:loc>
-                                        </dt>
-                                        <dd>
-                                            <div class="b-list">
-                                                <table>
-                                                    <thead>
-                                                        <tr>
-                                                            <th>
-                                                                <lift:loc>ui_messages_message_label_author</lift:loc>
-                                                            </th>
-                                                            <th>
-                                                                <lift:loc>ui_messages_message_label_message</lift:loc>
-                                                            </th>
-                                                            <th>
-                                                                <lift:loc>ui_messages_message_label_tags</lift:loc>
-                                                            </th>
-                                                        </tr>
-                                                    </thead>
-                                                    <lift:comet type="Timeline"/>
-                                                    <tbody id="personal_timeline_messages">
-                                                        <tr id="message">
-                                                            <td>
-                                                                <img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
-                                                                <div id="author">
-                                                                    -
-                                                                </div>
-                                                            </td>
-                                                            <td class="message">
-                                                                <div class="outer">
-                                                                    <div class="inner clear">
-                                                                        <p class="text" id="body">
-                                                                            -
-                                                                        </p>
-                                                                    </div>
-                                                                    <div class="metainfo">
-                                                                        <span id="pool">-</span>
-                                                                        <span id="reason">-</span>
-                                                                        <span id="when" class="date">-</span>
-                                                                    </div>
-                                                                </div>
-                                                            </td>
-                                                            <td id="tags" class="tag">
-                                                                <p id="tag">
-                                                                    <a href="tag/tag1">-</a>
-                                                                </p>
-                                                                <p id="tag">
-                                                                    <a href="tag/tag2">-</a>
-                                                                </p>
-                                                            </td>
-                                                            <td>
-                                                                <button id="resend" class="btn">
-                                                                    <lift:loc>ui_messages_message_label_resend</lift:loc>
-                                                                </button>
-                                                                <br/>
-                                                                <a href="#" id="reply"><lift:loc>ui_messages_message_label_reply</lift:loc></a>
-                                                                <br/>
-                                                                <a id="conversation"><lift:loc>ui_messages_message_label_conversation</lift:loc></a>
-                                                            </td>
-                                                        </tr>
-                                                    </tbody>
-                                                </table>
-                                            </div>
-                                        </dd>
-                                    </dl>
-                                    <lift:UserSnip.resendScript/>
-                                    <dl class="tagclouds">
-                                        <dt class="caption">
-                                            <lift:loc>ui_messages_message_label_public_timeline</lift:loc>
-                                        </dt>
-                                        <dd>
-                                            <div class="b-list">
-                                                <lift:comet type="PublicTimeline"/>
-                                                <lift:embed what="templates-hidden/timeline"/>
-                                            </div>
-                                        </dd>
-                                    </dl>
-                                </div>
-                            </div>
-                        </td>
-                        <td class="l-page-l">
-                            <div class="b-edit">
-                                <h2 class="title"><lift:loc>ui_messages_message_label_welcome</lift:loc><span class="name"><lift:UserSnip.name/></span></h2>
-                                <div class="b-popup-c">
-                                    <div class="row clear">
-                                        <label>
-                                            <lift:loc>ui_messages_message_label_message_request</lift:loc>
-                                        </label>
-                                        <textarea rows="4" cols="20" id="textdude" style="width: 90%"/>
-                                    </div>
-                                    <div class="row clear" style="display: none;" id="reply-to-div">
-                                        <lift:loc>ui_messages_message_label_message_reply</lift:loc>
-                                        <span id="reply-to-span">&nbsp;</span>
-                                        <button onclick="clearReplyTo()">
-                                            <lift:loc>ui_messages_message_label_message_remove_reply</lift:loc>
-                                        </button>
-                                    </div>
-                                    <div class="row clear" style="display: none">
-                                        <label>
-                                            <lift:loc>ui_messages_message_label_message_tag</lift:loc>
-                                        </label>
-                                        <input id="tagdude" style="width: 90%"/>
-                                        <div class="note clear">
-                                            <span class="l"><lift:loc>ui_messages_message_label_message_tag_note</lift:loc></span>
-                                            <span class="r"><lift:loc>ui_messages_message_label_message_tag_not_required</lift:loc></span>
-                                        </div>
-                                    </div>
-                                    <div class="row clear">
-                                        <label>
-                                            <lift:loc>ui_messages_message_label_message_pool</lift:loc>
-                                        </label>
-                                        <select id="access_pool">
-                                            <option id="0"><lift:loc>ui_messages_message_label_message_pool_public</lift:loc></option>
-                                            <lift:UserSnip.accessPools/>
-                                        </select>
-                                    </div>
-                                    <div class="row clear">
-                                        <button class="btn" onclick="javascript:post_msg();">
-                                            <lift:loc>ui_messages_message_update</lift:loc>
-                                        </button>
-                                    </div>
-                                    <script>
-                                        // <![CDATA[
-                                        var currentConvNumber = 0;
-                                        
-                                        function setReplyTo(id, text){
-                                            currentConvNumber = id;
-                                            document.getElementById('reply-to-div').style.display = "block";
-                                            jQuery('#reply-to-span').html(text);
-                                        }
-                                        
-                                        function clearReplyTo(){
-                                            currentConvNumber = 0;
-                                            document.getElementById('reply-to-div').style.display = "none";
-                                        }
-                                        
-                                        function clearResend(id){
-                                            document.getElementById(id).style.display = "none"
-                                        }
-                                        
-                                        // ]]>
-                                    </script>
-                                    <lift:UserSnip.postScript/>
-                                </div>
-                                <div class="b-cloud">
-                                    <lift:comet type="TagCloud"/>
-                                </div>
-                                <div class="b-stats">
-                                    <p id="stats-para">
-                                        <lift:loc>ui_messages_message_label_popular</lift:loc>
-                                    </p>
-                                    <lift:UserSnip.popular>
-                                        <table>
-                                            <thead>
-                                                <tr>
-                                                    <th>
-                                                        <lift:loc>ui_messages_message_header_popular_resent</lift:loc>
-                                                    </th>
-                                                    <th>
-                                                        <lift:loc>ui_messages_message_header_popular_message</lift:loc>
-                                                    </th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                <disp:item>
-                                                    <tr>
-                                                        <td>
-                                                            <item:freq/>
-                                                        </td>
-                                                        <td>
-                                                            <item:author/>:<item:text/><!--<item:date/>-->
-                                                        </td>
-                                                    </tr>
-                                                </disp:item>
-                                            </tbody>
-                                        </table>
-                                    </lift:UserSnip.popular>
-                                </div>
-                                <div class="b-stats">
-                                    <p id="stats-para">
-                                        <lift:loc>ui_messages_message_label_popular_links</lift:loc>
-                                    </p>
-                                    <lift:UserSnip.links>
-                                        <table>
-                                            <thead>
-                                                <tr>
-                                                    <th>
-                                                        <lift:loc>ui_messages_message_header_popular_links_clicked</lift:loc>
-                                                    </th>
-                                                    <th>
-                                                        <lift:loc>ui_messages_message_header_popular_links_link</lift:loc>
-                                                    </th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                <disp:item>
-                                                    <tr>
-                                                        <td>
-                                                            <item:freq/>
-                                                        </td>
-                                                        <td>
-                                                            <item:url/>
-                                                        </td>
-                                                    </tr>
-                                                </disp:item>
-                                            </tbody>
-                                        </table>
-                                    </lift:UserSnip.links>
-                                </div>
-                                    <div class="bugs">
-                                        <form action="/info_view/search" class="b-primay">
-                                            <input style="height: 20px; background: #c9d8ea;" name="term"/>
-                                          <button class="btn" onclick="javascript:form.submit();">
-                                            <lift:loc>ui_messages_search</lift:loc>
-                                        </button>                                          
-                                        </form>
-                                    </div>
-                            </div>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-        <div class="foot">
-            <center>
-                <lift:loc>ui_default_footer</lift:loc>
-            </center>
-        </div>
-    </body>
-</html>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one   *
+ or more contributor license agreements.  See the NOTICE file *
+ distributed with this work for additional information        *
+ regarding copyright ownership.  The ASF licenses this file   *
+ to you under the Apache License, Version 2.0 (the            *
+ "License"); you may not use this file except in compliance   *
+ with the License.  You may obtain a copy of the License at   *
+                                                              *
+   http://www.apache.org/licenses/LICENSE-2.0                 *
+                                                              *
+ Unless required by applicable law or agreed to in writing,   *
+ software distributed under the License is distributed on an  *
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ KIND, either express or implied.  See the License for the    *
+ specific language governing permissions and limitations      *
+ under the License.                                           *
+-->
+
+<lift:surround with="base" at="left">
+                <div id="left">
+                    <div id="back-header">
+                        <!---UPDATE BOX -->
+                        <div class="container-update">
+                            <h3><lift:loc>ui_messages_message_label_message_request</lift:loc></h3>
+                                <div id="form-update">
+                                    <div class="post-form-row">
+                                        <label>
+                                            Share with
+                                        </label>
+                                        <select id="vPool" class="inputBox2">
+                                            <option value="0"><lift:loc>ui_messages_message_label_message_pool_public</lift:loc></option>
+                                            <lift:UserSnip.accessPools/>
+                                        </select>
+                                    </div>
+                                    <div class="row clear" style="display: none">
+                                        <input id="tagdude" style="width: 90%"/>
+                                    </div>
+                                    <div class="post-form-row">
+                                        <textarea class="inputBox2" id="vMsg" rows="5" cols="80%"></textarea>
+                                        <div class="row clear" style="display: none">
+                                        <input id="vTag" style="width: 90%"/>
+                                        </div>
+                                        <div class="update-btn">
+                                            <input type="image" onclick="javascript:post_msg();" src="images/btn-update.gif" />
+                                        </div>
+                                    </div>
+                                    
+                                    <script>
+                                        // <![CDATA[
+                                        var currentConvNumber = 0;
+                                        
+                                        function setReplyTo(id, text){
+                                            currentConvNumber = id;
+                                            //document.getElementById('reply-to-div').style.display = "block";
+                                            jQuery('#reply-to-span').html(text);
+                                        }
+                                        
+                                        function clearReplyTo(){
+                                            currentConvNumber = 0;
+                                            // document.getElementById('reply-to-div').style.display = "none";
+                                        }
+                                        
+                                        function clearResend(id){
+                                            document.getElementById(id).style.display = "none"
+                                        }
+                                        
+                                        // ]]>
+                                        
+                                        
+                                    </script>
+                                    <lift:UserSnip.postScript/>
+                                </div>
+                        </div><!--END UPDATE BOX-->
+                    </div><lift:UserSnip.resendScript/>
+                    <!--updates-box -->
+                    <!--updates-box -->
+                   <lift:comet type="Timeline"/> 
+                    <div class="separator">
+                    </div>
+                    <table>
+                      <tbody id="personal_timeline_messages">
+                       <tr id="message">
+                      <div id="personal_timeline_messages">
+                       <div class="updates-box">
+                        <div class="avatar">
+                            <img id="avatar" src="/images/avatar.jpg" alt="Anonymous" width="50px"/>
+                        </div>
+                        <div class="update2">
+                            <div class="info2" >
+                                <a href="" id="author">-</a>
+                            </div>
+                            <div id="body">-</div>
+                            <div class="time">
+                                <table><tr><td><div id="pool"> -</div></td><td>   </td><td> <div id="when"> -</div></td><td><div id="reason"> -</div></td><td> <div id="source"> -</div></td></tr></table>
+                            </div>
+                            <div id="tags" class="tags">
+                                <p id="tag">
+                                  <a href="tag/tag1">-</a>
+                                </p>
+                                <p id="tag">
+                                  <a href="tag/tag2">-</a>
+                                </p>
+                            </div>
+                            <div class="actions">
+                                <a href="javascript:resend_msg();"> <lift:loc>ui_messages_message_label_resend</lift:loc></a>
+                                | <a href="#" id="reply"><lift:loc>ui_messages_message_label_reply</lift:loc></a>
+                                <a id="conversation">|  <lift:loc>ui_messages_message_label_conversation</lift:loc></a>
+                            </div>
+                        </div>
+                      </div>
+                      </div>
+                      </tr>
+                       </tbody>
+                     </table>
+                      </div>
+                    <!--updates-box-->
+ </lift:surround>

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/openid_login_form.html Mon Mar 15 07:55:00 2010
@@ -1,32 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one   *
- or more contributor license agreements.  See the NOTICE file *
- distributed with this work for additional information        *
- regarding copyright ownership.  The ASF licenses this file   *
- to you under the Apache License, Version 2.0 (the            *
- "License"); you may not use this file except in compliance   *
- with the License.  You may obtain a copy of the License at   *
-                                                              *
-   http://www.apache.org/licenses/LICENSE-2.0                 *
-                                                              *
- Unless required by applicable law or agreed to in writing,   *
- software distributed under the License is distributed on an  *
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- KIND, either express or implied.  See the License for the    *
- specific language governing permissions and limitations      *
- under the License.                                           *
--->
+<form id="openid_submit" class="clear" method="post" action="/open_id/login">
  
- <form id="openid_submit" class="clear" method="post" action="/open_id/login">
-    <div class="b-open-l">
-        <p class="input">
-            <label for="open_id_field">
-                <lift:loc>ui_open_id_title</lift:loc>
-            </label>
-            <input type="text" name="open_id" id="open_id_field"/>
-        </p>
-        <p class="button">
-            <img onclick="document.getElementById('openid_submit').submit()" src="/images/sign-on.png" alt="Sign On" />
-        </p>
-    </div>
 </form>
\ No newline at end of file

Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/upw_login_form.html Mon Mar 15 07:55:00 2010
@@ -16,20 +16,48 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
- <form method="post" action="/authentication/login">
-    <label for="username">
-        <lift:loc>ui_login_user</lift:loc>
-        <br/>
-        <input type="text" name="username" value="" id="username"/>
-    </label>
-    <br/>
-    <label for="password">
-        <lift:loc>ui_login_password</lift:loc>
-        <br/>
-        <input type="password" name="password" value="" id="password"/>
-    </label>
-    <br/>
-    <label for="login">
-        <input type="submit" value="Login" id="login"/>
-    </label>
-</form>
\ No newline at end of file
+
+        
+	<div id="login-box">
+	
+
+		<div class="top-login"></div>
+		<div class="mid-login">
+			<form name="loginFrm" action="javascript:login()" method="post" >
+				<div class="form">
+						<div class="post-form-row">
+							<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><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><lift:loc>ui_login_openid</lift:loc></label>
+							<input type="text" name="openID" value="" class="inputBox2"/><!--narrow input field-->
+						</div>	
+						
+				</div>
+				<div class="login-btn">
+					<input type="image" src="images/btn-signon.gif" />
+					
+				</div>
+			</form>
+		</div>
+		<div class="bot-login"></div>
+		<div class="box-right">
+                        <h3><a href="http://www.apache.org/"><lift:loc>custom_heading_1_title</lift:loc></a></h3>
+                       <p><lift:loc>custom_heading_1_body</lift:loc></p>
+                       </div>
+                    <div class="box-right">
+                        <h3><a href="http://incubator.apache.org/"><lift:loc>custom_heading_2_title</lift:loc></a></h3>
+                        <lift:loc>custom_heading_2_body</lift:loc></div>
+                    <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

Modified: incubator/esme/trunk/server/src/main/webapp/track_view/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/track_view/index.html?rev=923106&r1=923105&r2=923106&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/track_view/index.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/track_view/index.html Mon Mar 15 07:55:00 2010
@@ -16,7 +16,12 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="default" at="content">
+<lift:surround with="base" at="left">
+
+ <link rel="stylesheet" href="../style/dialog_test.css" type="text/css" media="screen" />
+ 
+
+
     <lift:Style.header/><lift:TableSorterSnip/><!-- STYLESHEETS <lift:Style.header /> -->
     <link rel="stylesheet" type="text/css" href="../style/reset.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="../style/text.css" media="screen" />
@@ -26,10 +31,13 @@
     <!--[if IE 6]><link rel="stylesheet" type="text/css" href="../style/ie6.css" media="screen" /><![endif]--><!--[if gte IE 7]><link rel="stylesheet" type="text/css" href="../style/ie.css" media="screen" /><![endif]--><!-- JAVASCRIPT -->
     <script type="text/javascript" src="../scripts/jquery-ui-1.7.2.custom.min.js">
     </script>
+     <script type="text/javascript" src="../scripts/dialog_test.js">
+    </script>
     <script type="text/javascript" src="../scripts/esme.js">
     </script>
     <script type="text/javascript" src="../scripts/esme_table_sorter.js">
     </script>
+
     <div class="demo">
         <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
             <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
@@ -109,4 +117,6 @@
             </div>
         </div>
     </div><!-- End demo -->
+    
+  
 </lift:surround>
\ No newline at end of file



Mime
View raw message