You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@esme.apache.org by es...@apache.org on 2010/10/10 14:36:23 UTC
svn commit: r1006282 [2/2] - in /incubator/esme/branches/tagandconversationfollow: ./ src/main/resources/ src/main/resources/props/ src/main/scala/bootstrap/liftweb/ src/main/scala/org/apache/esme/actor/ src/main/scala/org/apache/esme/api/ src/main/sca...

Modified: incubator/esme/branches/tagandconversationfollow/src/main/webapp/templates-hidden/message.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/tagandconversationfollow/src/main/webapp/templates-hidden/message.html?rev=1006282&r1=1006281&r2=1006282&view=diff
==============================================================================
--- incubator/esme/branches/tagandconversationfollow/src/main/webapp/templates-hidden/message.html (original)
+++ incubator/esme/branches/tagandconversationfollow/src/main/webapp/templates-hidden/message.html Sun Oct 10 12:36:21 2010
@@ -24,8 +24,7 @@
         <script src="scripts/display_messages_top.js" type="text/javascript"/> 
         <script src="scripts/pretty.js" type="text/javascript"/> 
 </head>
-
-	<div id="left">
+        <div id="left">
 		<div id="back-header">
 			<!---UPDATE BOX -->
 			<div class="container-update">
@@ -76,7 +75,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);
                                         }
@@ -103,36 +103,39 @@
 		<!--updates-box -->
 		<lift:comet type="Timeline"/>
 		<div id="personal_timeline_messages">
+		
 			<div class="updates-box" id="message">
 				<div class="avatar">
-					<img id="avatar" width="50px"/>
-				</div>
-				<div class="update">
-					<div id="body"></div>
-					<div class="info">
-						<a href="" id="author"></a>
-						<div class="time">
-							<div id="supp_data"></div>
-						</div>
-					</div>
-				</div>
-				<div class="time">  </div>
-				<div id="msgPool" style="display: none">  </div>
-				<div class="actions">
-					<a href="#"  id="resend">
-						<lift:loc>ui_messages_message_label_resend</lift:loc>
-					</a>
-					<span id="resend">| </span>
-					 <a href="#" id="reply">
-						<lift:loc>ui_messages_message_label_reply</lift:loc>
-					</a>
-					<span id="conversation">| </span>
-					<a id="conversation">
-					<lift:loc>ui_messages_message_label_conversation</lift:loc>
-					</a>
-				</div>
-				<div class="separator">                    </div>
-			</div>
-		</div>
+					<img id="avatar" width="40px"/>
+				</div> <!--end avatar-->
+				<div class="update2">
+					
+					<div class="info2">
+						<a href="" id="author"/>
+						<div id="msgbody"/>
+						<div class="supp_data_class" id="supp_data"/>
+					</div> <!--end info2-->
+					
+
+					<div class="actions">
+						<a href="#"  id="resend">
+							<lift:loc>ui_messages_message_label_resend</lift:loc>
+						</a>
+						<span id="resend">| </span>
+						 <a href="#" id="reply">
+							<lift:loc>ui_messages_message_label_reply</lift:loc>
+						</a>
+						<span id="conversation">| </span>
+						<a id="conversation">
+						<lift:loc>ui_messages_message_label_conversation</lift:loc>
+						</a>
+					</div> <!--end actions-->
+					 <div id="msgsep" class="separator"></div>  <!-- separator works here but is too short--> 
+				</div> <!--end update2-->
+			            	
+			</div> <!--end updates-box-->
+			<!-- <div id="msgsep" class="separator"/> seprator should be here but doesn't work--> 
+			
+	</div>		
 	</div>
 </lift:surround>
\ No newline at end of file

Modified: incubator/esme/branches/tagandconversationfollow/src/main/webapp/templates-hidden/message_core.html
URL: http://svn.apache.org/viewvc/incubator/esme/branches/tagandconversationfollow/src/main/webapp/templates-hidden/message_core.html?rev=1006282&r1=1006281&r2=1006282&view=diff
==============================================================================
--- incubator/esme/branches/tagandconversationfollow/src/main/webapp/templates-hidden/message_core.html (original)
+++ incubator/esme/branches/tagandconversationfollow/src/main/webapp/templates-hidden/message_core.html Sun Oct 10 12:36:21 2010
@@ -18,26 +18,31 @@
 -->
 
 <div id="timeline_messages">
-<head>
-        <script src="../scripts/display_messages.js" type="text/javascript"/> 
-        <script src="../scripts/pretty.js" type="text/javascript"/> 
-</head>
-	<div class="updates-box" id="message">
-		<div class="avatar">
-			<img id="avatar" width="50px"/>
-		</div>
-		<div class="update">
-			<div id="body"></div>
-			<div class="info">
-				<a href="" id="author"></a>
-				<div class="time">
-					<div id="supp_data"></div>
-				</div>
-			</div>
-		</div>
-		<div class="time">  </div>
-		<div class="separator">                    </div>
-	</div>
-</div>		
+    <head>
+        <script src="../scripts/display_messages_top.js" type="text/javascript" />
+        <script src="../scripts/pretty.js" type="text/javascript" />
+    </head>
+    <div class="updates-box" id="message">
+        <div class="avatar">
+            <img id="avatar" width="40px" />
+        </div>
+        <!--end avatar-->
+        <div class="update2">
+            <div class="info2">
+                <a href="" id="author" />
+                <div id="msgbody" />
+                <div class="supp_data_class" id="supp_data" />
+            </div>
+            <!--end info2-->
+            <div class="actions"></div>
+            <!--end actions-->
+            <div id="msgsep" class="separator"></div>
+            <!-- separator works here but is too short-->
+        </div>
+        <!--end update2-->
+    </div>
+    <!--end updates-box-->
+    <!-- <div id="msgsep" class="separator"/> seprator should be here but doesn't work-->
+</div>
 				
 

Modified: incubator/esme/branches/tagandconversationfollow/src/test/scala/org/apache/esme/api/API2Test.scala
URL: http://svn.apache.org/viewvc/incubator/esme/branches/tagandconversationfollow/src/test/scala/org/apache/esme/api/API2Test.scala?rev=1006282&r1=1006281&r2=1006282&view=diff
==============================================================================
--- incubator/esme/branches/tagandconversationfollow/src/test/scala/org/apache/esme/api/API2Test.scala (original)
+++ incubator/esme/branches/tagandconversationfollow/src/test/scala/org/apache/esme/api/API2Test.scala Sun Oct 10 12:36:21 2010
@@ -370,6 +370,32 @@ object Api2Specs extends Specification w
         for (session_res <- post("user/messages", "message" -> "test message")) {
           session_res.code must be equalTo 403
         }
+      }      
+      
+      "with XML metadata" in {
+        for{
+          session <- post_session       
+          mess_res <- session.post("user/messages",
+            "message" -> "test POST message",
+            "metadata" -> """<outer><meta><metameta>"Hello"</metameta></meta><onlymeta>Meta</onlymeta></outer>""")              
+        } {
+          mess_res.code must be equalTo 200                                     
+          (mess_res.xml.open_! \ "message") must \\ (<body>test POST message</body>)    
+          (mess_res.xml.open_! \\ "metadata").toString must be equalTo """<metadata><outer><meta><metameta>&quot;Hello&quot;</metameta></meta><onlymeta>Meta</onlymeta></outer></metadata>"""         
+        }
+      }  
+      
+      "with JSON metadata" in {
+        for{
+          session <- post_session       
+          mess_res <- session.post("user/messages",
+            "message" -> "test POST message",
+            "metadata" -> """"meta":[{"place":{"place_type":"city","region":"CA+"}},{"song":{"artist":"Prince","songtitle":"Never+Let+Me+Down"}}]""")              
+        } {
+          mess_res.code must be equalTo 200                        
+          (mess_res.xml.open_! \ "message") must \\ (<body>test POST message</body>)    
+          (mess_res.xml.open_! \\ "metadata").text must be equalTo """"meta":[{"place":{"place_type":"city","region":"CA+"}},{"song":{"artist":"Prince","songtitle":"Never+Let+Me+Down"}}]"""         
+        }
       }
     }