incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From esjew...@apache.org
Subject svn commit: r1023839 - in /incubator/esme/trunk/server/src/main: scala/org/apache/esme/actor/Distributor.scala scala/org/apache/esme/comet/PublicTimeline.scala webapp/info_view/public.html
Date Mon, 18 Oct 2010 15:12:51 GMT
Author: esjewett
Date: Mon Oct 18 15:12:50 2010
New Revision: 1023839

URL: http://svn.apache.org/viewvc?rev=1023839&view=rev
Log:
[ESME-290] Fix the public timeline issue introduced by the refactoring for [ESME-287] and
[ESME-289]

Modified:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
    incubator/esme/trunk/server/src/main/webapp/info_view/public.html

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala?rev=1023839&r1=1023838&r2=1023839&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/Distributor.scala Mon
Oct 18 15:12:50 2010
@@ -69,7 +69,7 @@ object Distributor extends LiftActor {
       case ListenObject(listenable, who) => listenable match {
         case u:User => findOrCreateUser(u.id) ! UserActor.Listen(who) 
         case c:Message => ConvDistributor ! ConvDistributor.Listen(c,who)   
-        case x => println("This is all wrong " + x)
+        case x =>
       }              
       
       case UnlistenObject(listenable, who) => listenable match {

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala?rev=1023839&r1=1023838&r2=1023839&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
(original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/comet/PublicTimeline.scala
Mon Oct 18 15:12:50 2010
@@ -59,7 +59,7 @@ class PublicTimeline extends CometActor 
     scheduled = false
     val msgMap = Message.findMessages(messages)
     val toDisplay = messages.flatMap(msgMap.get)
-    val jsId = "timeline_messages";
+    val jsId = "public_timeline_messages";
 
     OnLoad(JsCrVar(jsId, JsArray(
         toDisplay.map(m => JsObj(("message", m.asJs)) ) :_*)) &

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=1023839&r1=1023838&r2=1023839&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 Mon Oct 18 15:12:50
2010
@@ -18,14 +18,14 @@
 -->
 
 <lift:surround with="base" at="left">
-	<div id="back-header">
-	<div id="left">
-	<h1><lift:loc>ui_public_title</lift:loc></h1>
-        <div class="container-public">
-		<!--updates-box -->
-		<lift:comet type="PublicTimeline"/>
-		<lift:embed what="templates-hidden/message_core"/>
+	<div id="back-header"> 
+	  <h1><lift:loc>ui_public_title</lift:loc></h1>  
 	</div>
-	</div>
-</div><!-- End demo -->
+  <div class="container-aux"> 
+    <div id="public_timeline_messages">  
+  		<!--updates-box -->
+  		<lift:comet type="PublicTimeline"/>
+  		<lift:embed what="templates-hidden/message_core"/>   
+  	</div>    
+  </div>
 </lift:surround>
\ No newline at end of file



Mime
View raw message