esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From esjew...@apache.org
Subject svn commit: r991520 - in /incubator/esme/branches/pubsubhubbub-2: ./ server/ server/src/main/resources/ server/src/main/scala/bootstrap/liftweb/ server/src/main/scala/org/apache/esme/lib/ server/src/main/scala/org/apache/esme/liftwebext/ server/src/mai...
Date Wed, 01 Sep 2010 13:04:30 GMT
Author: esjewett
Date: Wed Sep  1 13:04:29 2010
New Revision: 991520

URL: http://svn.apache.org/viewvc?rev=991520&view=rev
Log:
Merging latest version of trunk into the pubsubhubbub-2 branch, per Imtiaz's request

Removed:
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/public.html
Modified:
    incubator/esme/branches/pubsubhubbub-2/   (props changed)
    incubator/esme/branches/pubsubhubbub-2/CHANGES.txt
    incubator/esme/branches/pubsubhubbub-2/server/pom.xml
    incubator/esme/branches/pubsubhubbub-2/server/src/main/resources/ESMEUI.properties
    incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/bootstrap/liftweb/Boot.scala
    incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
    incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala
    incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/AccessPool.scala
    incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Action.scala
    incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Message.scala
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/index.html
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/info_view/streams.html
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_action.js
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_pool.js
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_token.js
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_track.js
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages.js
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages_top.js
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_single_message.js
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/esme_streams.js
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/pretty.js
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base.html
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base_top.html
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/default.html
    incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/message.html

Propchange: incubator/esme/branches/pubsubhubbub-2/
------------------------------------------------------------------------------
    svn:mergeinfo = /incubator/esme/trunk:985896-991517

Modified: incubator/esme/branches/pubsubhubbub-2/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/CHANGES.txt?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/CHANGES.txt (original)
+++ incubator/esme/branches/pubsubhubbub-2/CHANGES.txt Wed Sep  1 13:04:29 2010
@@ -1,5 +1,86 @@
 ESME Change Log
 
+Release 1.1-incubating - 09/10/2010
+
+ESME-14	        Redesign, rework, write unit tests for, and fully document API
+ESME-100	Finish web UI
+ESME-103	"Tabs on Message Page"
+ESME-108        View my pools" functionality
+ESME-117	Current Filter Info on Streams page
+ESME-126	Remove delete icons from tables
+ESME-127	Remove sorting from tables where it doesn't make sense
+ESME-147	Images in the user view are not scaled
+ESME-155	DB Problems during Tomcat shutdown
+ESME-160	Move to Lift 2.0
+ESME-161	Move the existing JMX interface to Ostrich
+ESME-163	Search in the web interface is case sensitive (and not in a good way)
+ESME-165	Remove blanks from property files
+ESME-169	"Exception on Strems Page based on message model - ""asJS"""
+ESME-171	"Display of user avatar is missing"
+ESME-172	"User list is displayed incorrectly with extralong user names"
+ESME-173	"Stream UI can't deal with extra long messages"
+ESME-174	"Popular links aren't links"
+ESME-175	IE 7 doesn't work at all with new layout
+ESME-176	"Sign-up Page is broken"
+ESME-177	"Add links to users in streams page"
+ESME-179	"Resend is broken"
+ESME-180	Creating a new pool doesn't lead to a ajax-based refresh
+ESME-181	"Clicking ""reply"" link provides no feedback"
+ESME-182	"On sign-in form, ""Enter""/""Return"" key does not submit the form"
+ESME-183	"On the sign-in page, the footer is on the right side of the page"
+ESME-184	Regular action that don't generate messages push real messages out of user timeline
+ESME-185	"Menu overlaps avatar"
+ESME-186	"Popular message and link formatting is currently not working"
+ESME-187	Layout of message input interface - improvement suggestion
+ESME-189	"Clicking on a menu link shouldn't make the item disappear - should only be unclickable"
+ESME-190	Strange issue on Streams page
+ESME-192	"Install JQuery UI ""Redmond"" theme from http://jqueryui.com/themeroller/ for modal dialogs and tabs"
+ESME-194	User Page is buggy
+ESME-196	"Message layout in IE6 is broken"
+ESME-197	API2: Add the messageid when creating new messages
+ESME-198	Action: We need an action that tests for a specific message id
+ESME-199	API2: the replyto element seems not to be filled when retrieving via the api
+ESME-200	GET /users/actions don't retrieve disabled actions
+ESME-201	API2: a PUT to /users/action/MESSAGEID results in a 403
+ESME-202	Conversation view is broken"
+ESME-203	Clicking ""reply"" link on a message should populate pool with the same pool as the message - ""remove reply"" should remove the pool"
+ESME-204	On ""My Contacts"" page both tabs are labelled ""Followers"" - one should be ""Following"""
+ESME-205	Search is broken
+ESME-206	Login via Open-ID is broken
+ESME-207	"Main (IE7) - Message display (tools area!) is broken - linked to <div class=""separator"">"
+ESME-208	[IE7] Message resend broken
+ESME-209	[IE7] Public - errors?
+ESME-210	Users (IE7) - word wrap broken
+ESME-211	Search ignores pools
+ESME-212	Messages from pools aren't hidden
+ESME-216	Can't add a user to a pool
+ESME-217	You can create an action with empty test / action fields
+ESME-223	Date format on users pages doesn't work
+ESME-224	Feed Actor Date parser error
+ESME-226	reduce log entries
+ESME-227	Empty search shouldn't be possible
+ESME-229	tags are present twice on streams page
+ESME-230	action-based filters don't work on streams
+ESME-231	footer on streams page doesn't adjust to longer streams
+ESME-232	add logchanger
+ESME-234	Reply doesn't work when message conatins chars that must be encoded
+ESME-236	Clean Web UI Files
+ESME-237	Script paths are wrong in Tomcat
+ESME-238	Sort pool drop alphabetically
+ESME-239	[IE7] Message reply doesn't work
+ESME-240	Can't create RSS feed based action UI
+ESME-241	No error when adding an unknown user to a pool
+ESME-242	The use of metadata in the api2 currently doesn't work
+ESME-243	Pool selectbox option value wrong
+ESME-257	Pools with an empty description result in an error in the pool edit view
+ESME-259	Pool selector in streams doesn't work anymore
+ESME-260	User pages aren't protected with authentication
+ESME-261	"User Id shown in actions when using ""&"""
+ESME-262	Pool Id shown in actions display instead of pool description
+ESME-263	Action test with day isn't restricted to correct days of week
+ESME-264	Logout from a user pages is wrong
+
+
 Release 1.0-incubating - 02/28/2010
 
 ESME-12 List of missing REST APIs functionality

Modified: incubator/esme/branches/pubsubhubbub-2/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/pom.xml?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/pom.xml (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/pom.xml Wed Sep  1 13:04:29 2010
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.esme</groupId>
     <artifactId>esme-server</artifactId>
-    <version>apache-esme-1.0-RC1-incubating</version>
+    <version>apache-esme-1.1-RC1-incubating</version>
     <packaging>war</packaging>
     <name>Apache Enterprise Social Messaging Experiment (ESME)</name>
      <url>http://incubator.apache.org/esme</url>

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/resources/ESMEUI.properties
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/resources/ESMEUI.properties?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/resources/ESMEUI.properties (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/resources/ESMEUI.properties Wed Sep  1 13:04:29 2010
@@ -42,8 +42,11 @@ 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
+ui_default_footer=Apache ESME 2010 - An Apache Incubator Project
 ui_default_title=Enterprise Social Messaging Experiment
+ui_default_on_esme=Now on ESME
+ui_default_pagetitle=ESME
+
 
 ui_pool_manage=My Pools
 ui_pool_create=Create New Pool

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/bootstrap/liftweb/Boot.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/bootstrap/liftweb/Boot.scala?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/bootstrap/liftweb/Boot.scala (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/bootstrap/liftweb/Boot.scala Wed Sep  1 13:04:29 2010
@@ -158,16 +158,19 @@ class Boot {
     // Register Auth methods that are used in ESME
     
     UserAuth.register(UserPwdAuthModule)
-    UserAuth.register(OpenIDAuthModule)
+    UserAuth.register(OpenIDAuthModule)  
+                      
+    def ifIsLoggedIn = If(User.loggedIn_? _, strFuncToFailMsg(() => S.?("base_error_not_logged_in")))
 
     // Build SiteMap
     val entries = Menu(Loc("Home", List("index"), "Home")) ::
-        Menu(Loc("user", List("info_view", "user"), "User Info", Hidden,
+        Menu(Loc("user", List("info_view", "user"), "User Info", ifIsLoggedIn,
           Loc.Snippet("user_info", TagDisplay.userInfo))) ::
         logLevel.menu  ::
-        Menu(Loc("tag", List("info_view", "tag"), "Tag", Hidden, Loc.Snippet("tag_display", TagDisplay.display))) ::
-        Menu(Loc("public", List("info_view", "public"), S.?("base_profile_public"))) ::
-        Menu(Loc("contacts", List("info_view", "contacts"), S.?("base_profile_contacts"))) ::
+        Menu(Loc("tag", List("info_view", "tag"), "Tag", ifIsLoggedIn,
+          Loc.Snippet("tag_display", TagDisplay.display))) ::
+        Menu(Loc("public", List("info_view", "public"), S.?("base_profile_public"), ifIsLoggedIn)) ::
+        Menu(Loc("contacts", List("info_view", "contacts"), S.?("base_profile_contacts"), ifIsLoggedIn)) ::
         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/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/lib/StreamMgr.scala Wed Sep  1 13:04:29 2010
@@ -64,75 +64,80 @@ object StreamMgr {
   object resenderId extends RequestVar[Long](AnyResender)
   object filterResent_? extends RequestVar[Boolean](false)
   object poolId extends RequestVar[Long](PublicPool)
-  object filterPools_? extends RequestVar[Boolean](false)
-
-  def displayStream(in: NodeSeq): NodeSeq = {
-    // get the span name to update
-    val spanName = S.attr("the_id") openOr "StreamSpan"
+  object filterPools_? extends RequestVar[Boolean](false)  
+  object spanName extends RequestVar[String]("StreamSpan")     
+  object displayStreamNodes extends RequestVar[NodeSeq](Text(""))  
+  
+  def updateSpan(): JsCmd = SetHtml(spanName, doRender(displayStreamNodes))    
+  
+  // bind the dynamic content to the incoming nodeseq
+  def doRender(in: NodeSeq): NodeSeq = {   
     // get the current user
     val user = User.currentUser
-
-    // bind the dynamic content to the incoming nodeseq
-    def doRender(): NodeSeq = {
-      val resentQuery = 
-      if (filterResent_?.is == false) Nil
-      else {
-        val queryParam = resenderId.is match {
-          case AnyResender => NotBy(Mailbox.resentBy, Empty)
-          case id => By(Mailbox.resentBy, id)
-        }
-        List(In(Message.id,Mailbox.message,By(Mailbox.user, user), queryParam))
+  
+    val resentQuery = 
+    if (filterResent_?.is == false) Nil
+    else {
+      val queryParam = resenderId.is match {
+        case AnyResender => NotBy(Mailbox.resentBy, Empty)
+        case id => By(Mailbox.resentBy, id)
       }
-      
-      val poolsQuery = 
-      if (filterPools_?.is == false) Nil
-      else List(poolId.is match {
-        case PublicPool => By(Message.pool, Empty)
-        case id => By(Message.pool, id)
-      })
-      
-      val query = poolsQuery :::
-                  resentQuery :::
-                  List[QueryParam[Message]](OrderBy(Message.id, Descending), MaxRows(10)) 
+      List(In(Message.id,Mailbox.message,By(Mailbox.user, user), queryParam))
+    }
+    
+    val poolsQuery = 
+    if (filterPools_?.is == false) Nil
+    else List(poolId.is match {
+      case PublicPool => By(Message.pool, Empty)
+      case id => By(Message.pool, id)
+    })
+    
+    val query = poolsQuery :::
+                resentQuery :::
+                List[QueryParam[Message]](OrderBy(Message.id, Descending), MaxRows(10)) 
+       
+    def profileImage(u: User): NodeSeq = {
+        var imageUrl = u.imageUrl.toString
+        if (imageUrl.length > 0) 
+          <img width="30px" src={imageUrl}/>
+        else
+           <img width="30px" src="/images/avatar.jpg"/>
+     }
          
-      def profileImage(u: User): NodeSeq = {
-          var imageUrl = u.imageUrl.toString
-          if (imageUrl.length > 0) 
-            <img width="30px" src={imageUrl}/>
-          else
-             <img width="30px" src="/images/avatar.jpg"/>
-       }
-           
-      //XXX copy from lib.UserMgr
-      def nicknameWithProfileLink(u: User): NodeSeq = {
-    		  <a href={"/user/" + urlEncode(u.nickname.is)}>{u.niceName}</a>
-      	}
-      	
-      val dateFormatter = new SimpleDateFormat("yyyy/MM/dd HH:mm")
-          
+    //XXX copy from lib.UserMgr
+    def nicknameWithProfileLink(u: User): NodeSeq = {
+  		  <a href={"/user/" + urlEncode(u.nickname.is)}>{u.niceName}</a>
+    	}
+    	
+    val dateFormatter = new SimpleDateFormat("yyyy/MM/dd HH:mm")
         
-      Message.findAll(query: _*) match {
-        case Nil => NodeSeq.Empty
-        case xs => bind("disp", in,
-                        "item" -> 
-                        (lst => xs.flatMap(i => bind("item", lst,
-                                                     "author" -> i.author.obj.map(nicknameWithProfileLink).openOr(Text("")),
-                                                     "imageUrl" -> i.author.obj.map(profileImage).openOr(Text("")),
-                                                     "text" -> i.getBody,
-                                                     "date" -> dateFormatter.format(i.getWhen)
-                ))))
-      }
+      
+    Message.findAll(query: _*) match {
+      case Nil => NodeSeq.Empty
+      case xs => bind("disp", in,
+                      "item" -> 
+                      (lst => xs.flatMap(i => bind("item", lst,
+                                                   "author" -> i.author.obj.map(nicknameWithProfileLink).openOr(Text("")),
+                                                   "imageUrl" -> i.author.obj.map(profileImage).openOr(Text("")),
+                                                   "text" -> i.getBody,
+                                                   "date" -> dateFormatter.format(i.getWhen)
+              ))))
     }
-    def updateSpan(): JsCmd = SetHtml(spanName, doRender())
+  }  
+  
 
-    updateStream.set(updateSpan)
-    doRender()
+  def displayStream(in: NodeSeq): NodeSeq = {    
+      
+    updateStream.set(updateSpan)    
+    displayStreamNodes.set(in)                               
+  
+    doRender(in)
   }
 
-  def streamFilters(in: NodeSeq): NodeSeq = {
+  def streamFilters(in: NodeSeq): NodeSeq = {   
+  
     import org.apache.esme.model.AccessPool
-    import net.liftweb.common.Empty
-    val redisplayStream = updateStream.is
+    import net.liftweb.common.Empty              
     val resenderInput = "resender_input"
     val poolInput = "pool_input"
     val filterResentInput = "filter_resent_input"
@@ -162,7 +167,7 @@ object StreamMgr {
       poolId.set(pool)
       filterResent_?.set(filterResent)
       filterPools_?.set(filterPools)
-      redisplayStream()
+      updateStream()
     }
 
     /*
@@ -212,5 +217,4 @@ object StreamMgr {
                                        "id" -> filterPoolsInput)
     )
   }
-
 }

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/liftwebext/SHtml.scala Wed Sep  1 13:04:29 2010
@@ -1,4 +1,23 @@
-package org.apache.esme.liftwebext
+/**
+ * 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.
+ */
+ 
+ package org.apache.esme.liftwebext
 
 import _root_.net.liftweb._
 import http._
@@ -13,13 +32,6 @@ import JE._
 import JsCmds._
 import _root_.scala.xml._
 
-/**
- * Created by IntelliJ IDEA.
- * User: imtiaz
- * Date: Jun 27, 2010
- * Time: 11:40:19 AM
- * To change this template use File | Settings | File Templates.
- */
 
 object SHtml {
   import net.liftweb.http.js.JsCmds.JsCrVar

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/AccessPool.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/AccessPool.scala?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/AccessPool.scala (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/AccessPool.scala Wed Sep  1 13:04:29 2010
@@ -43,6 +43,13 @@ object AccessPool extends AccessPool wit
     ap.creator(User.currentUser)
     ap
   }
+
+  def getPoolName(poolId: long) = {
+    AccessPool.find(poolId) match {
+      case Full(p) => p.getName
+      case _ => "ERROR"
+    }
+  }
 }
 
 class AccessPool extends LongKeyedMapper[AccessPool] {

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Action.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Action.scala?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Action.scala (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Action.scala Wed Sep  1 13:04:29 2010
@@ -265,6 +265,7 @@ class Action extends LongKeyedMapper[Act
     def testFunc = (testExpr(is): @unchecked) match {
       case Success(v, _) => Action.toFunc(v)
     }
+   
   }
   
   object uniqueId extends MappedUniqueId(this, 32) {
@@ -280,7 +281,14 @@ class Action extends LongKeyedMapper[Act
 
   def setTest(in: String): Box[Action] = try {
     testExpr(in) match {
-      case Success(v, _) => Full(this.theTest(v.toStr))
+      case Success(testAction: TestAction, _) =>
+         testAction.error match {
+            case Some(msg) =>
+              net.liftweb.common.Failure(msg  + " - " + testAction.toStr, Empty, Empty)
+            case None =>
+              Full(this.theTest(testAction.toStr))
+         }
+      //case Success(v, _) => Full(this.theTest(v.toStr))
       case Failure(m, _) => net.liftweb.common.Failure(m, Empty, Empty)
       case Error(m, _) => net.liftweb.common.Failure(m, Empty, Empty)
     }
@@ -318,7 +326,7 @@ class Action extends LongKeyedMapper[Act
     test={theTest.is}
     action={theAction.is}
     enabled={enabled.toString}></action>
-
+  
 }
 
 class PerformMatcher(val func: Action.TestFunc, val performId: Long,
@@ -351,6 +359,7 @@ object TestAction {
 }
 
 sealed trait TestAction {
+  var error: Option[String] = None
   def toStr: String
   def toDisplayStr: String = toStr
 }
@@ -362,13 +371,16 @@ case object SentToMeAction extends TestA
 }
 case class NotAction(action: TestAction) extends TestAction {
   def toStr = "not( "+action.toStr+" )"
+  override def toDisplayStr = "not( "+action.toDisplayStr+" )"
 }
 case class OrAction(left: TestAction, right: TestAction) extends TestAction {
   def toStr = left.toStr + " | " + right.toStr
+  override def toDisplayStr = left.toDisplayStr + " | " + right.toDisplayStr
 }
 
 case class AndAction(left: TestAction, right: TestAction) extends TestAction {
   def toStr = left.toStr + " &  " + right.toStr
+  override def toDisplayStr = left.toDisplayStr + " &  " + right.toDisplayStr
 }
 
 case class AtUserAction(userId: Long) extends TestAction {
@@ -386,6 +398,7 @@ case object PoolAction extends TestActio
 
 case class PoolAction(poolId: Long) extends TestAction {
   def toStr = "pool:" + poolId
+  override def toDisplayStr = "pool:" + AccessPool.getPoolName(poolId)
 }
 
 case object ResentAction extends TestAction {
@@ -439,6 +452,7 @@ case class HashAction(hashId: Long, str:
 
 case class ParenAction(action: TestAction) extends TestAction {
   def toStr = "( "+action.toStr+" )"
+  override def toDisplayStr = "( "+action.toDisplayStr+" )"
 }
 
 case class PercentAction(percent: Int) extends TestAction {
@@ -484,6 +498,15 @@ case class DateTestAction(dateType: Date
       case xs => xs.mkString("(", ", ", ")")
     }
   )
+
+  error =
+    dateType match {
+      case DayDateType   => if (what.exists((x) => x < 1 || x > 7)) Some("Invalid day value") else None
+      case DateDateType  => if (what.exists((x) => x < 1 || x > 31)) Some("Invalid date value") else None
+      case MonthDateType => if (what.exists((x) => x < 1 || x > 11)) Some("Invalid month value") else None
+      case HourDateType  => if (what.exists((x) => x < 0 || x > 23)) Some("Invalid hour value") else None
+      case MinuteDateType  => if (what.exists((x) => x < 0 || x > 59)) Some("Invalid minute value") else None
+    }
 }
 
 sealed trait OprType {

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Message.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Message.scala?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Message.scala (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/scala/org/apache/esme/model/Message.scala Wed Sep  1 13:04:29 2010
@@ -393,7 +393,7 @@ class Message extends LongKeyedMapper[Me
         case e: Elem if e.label == "url" =>
           e.attribute("url").flatMap(url =>
             e.attribute("uniqueId").map(id =>
-              <xml:group> <a href={"/u/"+id} target="_blank">{url}</a> </xml:group>)).
+              <xml:group> <a class="tiplelement" href={"/u/"+id} target="_blank" title={url}>{url.toString.substring(0,20)}...</a> </xml:group>)).
           getOrElse(Text("") )
 
         case e: Elem if e.label == "em" =>

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/index.html?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/index.html (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/index.html Wed Sep  1 13:04:29 2010
@@ -57,7 +57,7 @@
 			<lift:comet type="SinglePublicTimeline"/>
 			<!--updates-box -->
 			<div class="gray-box">
-			<h1>Now on ESME</h1>
+			<h1><lift:loc>ui_default_on_esme</lift:loc></h1>
 			<div class = "mesg-box">
 			   <div id="timeline_messages">
 				<div id="message">

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/info_view/streams.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/info_view/streams.html?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/info_view/streams.html (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/info_view/streams.html Wed Sep  1 13:04:29 2010
@@ -16,64 +16,64 @@
  specific language governing permissions and limitations      *
  under the License.                                           *
 -->
-<lift:surround with="base" at="left">     
+<lift:surround with="base" at="left">
+  <link rel="stylesheet" type="text/css" href="../style/style.css"/>
   <lift:TableSorterSnip/>
   <div id="back-header">
-    <h1><b><lift:loc>ui_streams_manage</lift:loc></b></h1>  
-  </div>
-   
-  <!---CONTENT BOX-->
-  <div class="container-streams"> 
-    <div class="StreamUI">
-	    <lift:streamFilters>
-			  <table class="tablesorter" >
-			    <thead>
-				    <tr>
-					    <th class="tipelement" title="These are users that you follow">
-						    <lift:loc>ui_streams_filter_resender</lift:loc> <main:resent/>
-					    </th>
-					    <th align="center" class="tipelement" title="Filter by messages that have been resent by those you follow. ">
-						    <lift:loc>ui_streams_resent_active</lift:loc> <main:filterResent/>
-					    </th>
-					    <th class="tipelement" title="These are pools in which you are a member">
-						    <lift:loc>ui_streams_filter_pool</lift:loc> <main:pools/> 
-					    </th>
-					    <th align="center">
-						    <lift:loc>ui_streams_pool_active</lift:loc> <main:filterPools/>
-					    </th>
-				    </tr>
-				  </thead>
-			  </table>
-		  </lift:streamFilters>
-    </div>
-    
-    <div class ="stream_body">
-      <table id="esme-table" class="tablesorter">            
-        <thead>
+    <h1><b><lift:loc>ui_streams_manage</lift:loc></b></h1>
+     
+	  <!---CONTENT BOX-->
+	  <div class="container-streams">  
+	    <div class="StreamUI">
+			  <lift:streamFilters>
+					<table class="tablesorter" >
+					  <thead>
+						  <tr>
+							  <th class="tipelement" title="These are users that you follow">
+								  <lift:loc>ui_streams_filter_resender</lift:loc> <main:resent/>
+							  </th>
+							  <th align="center" class="tipelement" title="Filter by messages that have been resent by those you follow. ">
+								  <lift:loc>ui_streams_resent_active</lift:loc> <main:filterResent/>
+							  </th>
+							  <th class="tipelement" title="These are pools in which you are a member">
+								  <lift:loc>ui_streams_filter_pool</lift:loc> <main:pools/> 
+							  </th>
+							  <th align="center">
+								  <lift:loc>ui_streams_pool_active</lift:loc> <main:filterPools/>
+							  </th>
+						  </tr>
+						</thead>
+					</table>
+				</lift:streamFilters>
+		  </div>
+	    <div class ="stream_body">  
+        <table id="esme-table" class="tablesorter">        
+          <thead>
             <tr>
-                <th></th>
-                <th><lift:loc>ui_user_list_nickname</lift:loc></th>
-                <th><lift:loc>ui_user_list_last_message</lift:loc></th>
-                <th><lift:loc>ui_user_list_last_message_date</lift:loc></th>
+              <th></th>
+              <th><lift:loc>ui_user_list_nickname</lift:loc></th>
+              <th><lift:loc>ui_user_list_last_message</lift:loc></th>
+              <th><lift:loc>ui_user_list_last_message_date</lift:loc></th>
             </tr>
-        </thead>
-        <tbody id="StreamSpan">         
-          <lift:displayStream>                  
-            <disp:item>
-              <tr class="user_row">
-                <td><item:imageUrl/></td>
-                <td>
-                  <div class="user_name">
-                    <item:author/>
-	                </div>
-                </td>
-                <td class="user_message"><item:text/></td>
-                <td><item:date/></td>
-              </tr>
-            </disp:item>
-          </lift:displayStream>
-        </tbody>
-      </table>
-    </div> 
-  </div>    
+          </thead>              
+          <tbody id="StreamSpan">         
+            <lift:displayStream>                  
+              <disp:item>
+                <tr class="user_row">
+                  <td><item:imageUrl/></td>
+                  <td>
+                    <div class="user_name">
+                      <item:author/>
+                    </div>
+                  </td>
+                  <td class="user_message"><item:text/></td>
+                  <td><item:date/></td>
+                </tr>
+              </disp:item>
+            </lift:displayStream>
+          </tbody>
+        </table>
+      </div>
+	  </div>
+	</div>           
 </lift:surround>
\ No newline at end of file

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_action.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_action.js?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_action.js (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_action.js Wed Sep  1 13:04:29 2010
@@ -1,3 +1,22 @@
+/*
+ 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.                                           *
+*/
+
 // <![CDATA[
 /*
  * function to display action modal dialog

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_pool.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_pool.js?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_pool.js (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_pool.js Wed Sep  1 13:04:29 2010
@@ -1,3 +1,22 @@
+/*
+ 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.                                           *
+*/
+
 // <![CDATA[
 /*
  * function to display new_pool modal dialog

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_token.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_token.js?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_token.js (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_token.js Wed Sep  1 13:04:29 2010
@@ -1,3 +1,21 @@
+/*
+ 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.                                           *
+*/
 // <![CDATA[
 /*
  * function to display token modal dialog

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_track.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_track.js?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_track.js (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/dialog_track.js Wed Sep  1 13:04:29 2010
@@ -1,3 +1,22 @@
+/*
+ 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.                                           *
+*/
+
 // <![CDATA[
 /*
  * displayMessages called by lift:comet, type="Timeline" and type="PublicTimeline"

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages.js?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages.js (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages.js Wed Sep  1 13:04:29 2010
@@ -125,9 +125,15 @@ function displayMessages(msgArray, eleme
       if (cometResent) {
         resendButton.css("display", "none");
       } else {
-        resendButton.attr('id', 'resend_' + id).
+        resendButton
+            .attr('id', 'resend_' + id)
+            .click(function() { resend_msg(id);
+                                clearResend("resend_" + id );
+                                return false;})
+          /*
           attr('onclick', 'javascript:resend_msg(' + id + ');' +
                                      'clearResend("resend_' + id + '")');
+          */
       }
       
       

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages_top.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages_top.js?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages_top.js (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_messages_top.js Wed Sep  1 13:04:29 2010
@@ -158,9 +158,16 @@ function displayMessages(msgArray, eleme
       if (cometResent) {
         resendButton.css("display", "none");
       } else {
+        resendButton
+            .attr('id', 'resend_' + id)
+            .click(function() { resend_msg(id);
+                                clearResend("resend_" + id );
+                                return false;})        
+        /*
         resendButton.attr('id', 'resend_' + id).
           attr('onclick', 'javascript:resend_msg(' + id + ');' +
                                      'clearResend("resend_' + id + '")');
+        */
       }
 
 

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_single_message.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_single_message.js?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_single_message.js (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/display_single_message.js Wed Sep  1 13:04:29 2010
@@ -124,9 +124,15 @@ function displayMessages(msgArray, eleme
       if (cometResent) {
         resendButton.css("display", "none");
       } else {
-        resendButton.attr('id', 'resend_' + id).
+        resendButton
+            .attr('id', 'resend_' + id)
+            .click(function() { resend_msg(id);
+                                clearResend("resend_" + id );
+                                return false;})
+          /*
           attr('onclick', 'javascript:resend_msg(' + id + ');' +
                                      'clearResend("resend_' + id + '")');
+          */
       }
       newMsg.find('#reply').attr('href',
         "javascript:setReplyTo(" + id + ", '"+ msgBody + "', " + msgPoolId + ")");

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/esme_streams.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/esme_streams.js?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/esme_streams.js (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/esme_streams.js Wed Sep  1 13:04:29 2010
@@ -7,13 +7,7 @@
  "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     
-   
-   $("#prob_test").bind('DOMSubtreeModified', function() 
-    { 
-       alert ('hi'); 
-    } 
-);             *
+   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  *

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/pretty.js
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/pretty.js?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/pretty.js (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/scripts/pretty.js Wed Sep  1 13:04:29 2010
@@ -10,9 +10,14 @@ function prettyDate(myDate){
 	var date = myDate,
 		diff = (((new Date()).getTime() - date.getTime()) / 1000),
 		day_diff = Math.floor(diff / 86400);
+		
+	
 			
-	if ( isNaN(day_diff) || day_diff < 0 || day_diff >= 31 )
+	if ( isNaN(day_diff) || day_diff < 0 )
 		return;
+		
+	if ( day_diff >= 31 )
+		return "more than 1 month ago";
 			
 	return day_diff == 0 && (
 			diff < 60 && "just now" ||

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base.html?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base.html (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base.html Wed Sep  1 13:04:29 2010
@@ -47,7 +47,7 @@
             <div id="container">
                 <div id="header">
                     <div id="logo">
-                        <h1><a href="/">ESME</a></h1>
+                        <h1><a href="/"><lift:loc>ui_default_pagetitle</lift:loc></a></h1>
                     </div>
                     <div id="top-menu">
                         <ul>
@@ -150,7 +150,7 @@
                 <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> |
+				<a href="http://blog.esme.us/"><lift:loc>custom_text_link3</lift:loc></a> 
 				<br />
                 <lift:loc>ui_default_footer</lift:loc>
           <br />

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base_top.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base_top.html?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base_top.html (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/base_top.html Wed Sep  1 13:04:29 2010
@@ -1,3 +1,4 @@
+
 <!--
  Licensed to the Apache Software Foundation (ASF) under one   *
  or more contributor license agreements.  See the NOTICE file *
@@ -47,7 +48,7 @@
             <div id="container">
                 <div id="header">
                     <div id="logo">
-                        <h1><a href="/">ESME</a></h1>
+                        <h1><a href="/"><lift:loc>ui_default_pagetitle</lift:loc></a></h1>
                     </div>
                     <div id="top-menu">
                         <ul>
@@ -150,7 +151,7 @@
                 <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> |
+				<a href="http://blog.esme.us/"><lift:loc>custom_text_link3</lift:loc></a> 
 				<br />
                 <lift:loc>ui_default_footer</lift:loc>
           <br />

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/default.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/default.html?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/default.html (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/default.html Wed Sep  1 13:04:29 2010
@@ -54,7 +54,7 @@
                 <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> |
+				<a href="http://blog.esme.us/"><lift:loc>custom_text_link3</lift:loc></a> 
 				<br />
                 <lift:loc>ui_default_footer</lift:loc>
           <br />

Modified: incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/message.html?rev=991520&r1=991519&r2=991520&view=diff
==============================================================================
--- incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/branches/pubsubhubbub-2/server/src/main/webapp/templates-hidden/message.html Wed Sep  1 13:04:29 2010
@@ -76,7 +76,8 @@
                                             var rep_msg = text
                                             if (text.length > 50)
                                              rep_msg = text.substr(0, 47) + "..."
-                                            jQuery('#reply-to-span').html(rep_msg);	
+                                            jQuery('#reply-to-span').html(rep_msg);
+                                            jQuery('#vMsg').val("@" + author + " ")	
                                             jQuery('#vMsg').focus()
 					    jQuery('#vPool').val(msgPool);
                                         }



Mime
View raw message