Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 67577 invoked from network); 5 Nov 2010 17:36:52 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 5 Nov 2010 17:36:52 -0000 Received: (qmail 802 invoked by uid 500); 5 Nov 2010 17:37:24 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 767 invoked by uid 500); 5 Nov 2010 17:37:23 -0000 Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: esme-dev@incubator.apache.org Delivered-To: mailing list esme-commits@incubator.apache.org Received: (qmail 758 invoked by uid 99); 5 Nov 2010 17:37:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Nov 2010 17:37:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Nov 2010 17:37:22 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A52832388994; Fri, 5 Nov 2010 17:36:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1031677 - in /incubator/esme/trunk/server/src/main: scala/org/apache/esme/lib/ scala/org/apache/esme/snippet/ webapp/ webapp/info_view/ webapp/templates-hidden/ Date: Fri, 05 Nov 2010 17:36:08 -0000 To: esme-commits@incubator.apache.org From: esjewett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101105173608.A52832388994@eris.apache.org> Author: esjewett Date: Fri Nov 5 17:36:07 2010 New Revision: 1031677 URL: http://svn.apache.org/viewvc?rev=1031677&view=rev Log: [ESME-302] Add update box to conversation, tag, and public timelines. All messages are now rendered using message_core.html template. Added: incubator/esme/trunk/server/src/main/webapp/info_view/messages.html - copied unchanged from r1031659, incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html Removed: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala 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/public.html incubator/esme/trunk/server/src/main/webapp/info_view/tag.html incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_update_box.html incubator/esme/trunk/server/src/main/webapp/templates-hidden/timeline_personal.html Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala?rev=1031677&r1=1031676&r2=1031677&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala (original) +++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/ConversationMgr.scala Fri Nov 5 17:36:07 2010 @@ -55,13 +55,14 @@ object ConversationMgr { val cid = S.param("cid").map(toLong).openOr(-1L) val messages = Message.findMessages(List(cid)) - val user = User.currentUser + val user = User.currentUser + var msgPool:Long = 0 def followOrUnfollow: NodeSeq = { val ret: Box[NodeSeq] = for { u <- user m = messages.values.toList.first - } yield { + } yield { if (!m.followers.contains(u)) { ajaxButton("Follow conversation", () => { m.followers += u @@ -84,7 +85,9 @@ object ConversationMgr { def updateFollow: JsCmd = SetHtml("following", followOrUnfollow) - bind("conv", in, + bind("conv", in, + "conversationId" -> cid, + "messagePool" -> messages.values.toList.first.pool.is, "cometTimeline" -> cometTimeline, "followButton" -> followOrUnfollow ) } Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala?rev=1031677&r1=1031676&r2=1031677&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala (original) +++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/snippet/TagDisplay.scala Fri Nov 5 17:36:07 2010 @@ -80,7 +80,8 @@ object TagDisplay { }}.getOrElse(Text("")) - bind("tag", in, "name" -> name, + bind("tag", in, + "name" -> name, "each" -> MessageUtils.bindMessages(messageList) _, "cometTimeline" -> cometTimeline, "followButton" -> followOrUnfollow ) 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=1031677&r1=1031676&r2=1031677&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/webapp/index.html (original) +++ incubator/esme/trunk/server/src/main/webapp/index.html Fri Nov 5 17:36:07 2010 @@ -19,7 +19,7 @@ - +
error_major 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=1031677&r1=1031676&r2=1031677&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 Fri Nov 5 17:36:07 2010 @@ -17,16 +17,22 @@ under the License. * --> - -
-

ui_default_conversation

-
-
- - - - -
+ + +
+

+ ui_default_conversation + +

+ + +
+
+ +
+ Modified: incubator/esme/trunk/server/src/main/webapp/info_view/public.html URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/public.html?rev=1031677&r1=1031676&r2=1031677&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/webapp/info_view/public.html (original) +++ incubator/esme/trunk/server/src/main/webapp/info_view/public.html Fri Nov 5 17:36:07 2010 @@ -19,7 +19,8 @@
-

ui_public_title

+

ui_public_title

+
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=1031677&r1=1031676&r2=1031677&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 Fri Nov 5 17:36:07 2010 @@ -20,11 +20,17 @@
-

ui_tag_title ''

+

+ ui_tag_title '' + +

+
-
- +
-
+
+ \ No newline at end of file Modified: incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html?rev=1031677&r1=1031676&r2=1031677&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html (original) +++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message_core.html Fri Nov 5 17:36:07 2010 @@ -18,27 +18,37 @@ -->
- -