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 2011/05/15 11:51:42 UTC
svn commit: r1103302 - in /esme/trunk/server/src/main:
scala/org/apache/esme/comet/SinglePublicTimeline.scala
scala/org/apache/esme/comet/Timeline.scala webapp/info_view/streams.html
webapp/scripts/pretty.js webapp/templates-hidden/base.html
Author: esjewett
Date: Sun May 15 09:51:42 2011
New Revision: 1103302
URL: http://svn.apache.org/viewvc?rev=1103302&view=rev
Log:
[ESME-328] [ESME-308] Re-introduce prettification of message times and update message times in the timeline every 30 seconds.
Modified:
esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala
esme/trunk/server/src/main/webapp/info_view/streams.html
esme/trunk/server/src/main/webapp/scripts/pretty.js
esme/trunk/server/src/main/webapp/templates-hidden/base.html
Modified: esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala?rev=1103302&r1=1103301&r2=1103302&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/comet/SinglePublicTimeline.scala Sun May 15 09:51:42 2011
@@ -89,7 +89,12 @@ class SinglePublicTimeline extends Timel
<div class="update2">
<a class="author"/>
<div class="msgbody"/>
- <div class="supp_data"/>
+ <div class="supp_data">
+ <span class="supp_pool"/>
+ <span class="supp_date"/>
+ <span class="supp_millidate" style="display:none"/>
+ <span class="supp_reason"/>
+ </div>
</div>
</div>
}
Modified: esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala?rev=1103302&r1=1103301&r2=1103302&view=diff
==============================================================================
--- esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala (original)
+++ esme/trunk/server/src/main/scala/org/apache/esme/comet/Timeline.scala Sun May 15 09:51:42 2011
@@ -76,7 +76,12 @@ trait Timeline extends CometActor {
<div class="update2">
<a href="" class="author"/>
<div class="msgbody"/>
- <div class="supp_data"/>
+ <div class="supp_data">
+ <span class="supp_pool"/>
+ <span class="supp_date"/>
+ <span class="supp_millidate" style="display:none"/>
+ <span class="supp_reason"/>
+ </div>
<div class="actions">
<a href="#" class="resend resend_link">
<lift:loc>ui_messages_message_label_resend</lift:loc>
@@ -94,7 +99,7 @@ trait Timeline extends CometActor {
protected def prependMessage(m:Message, r:MailboxReason, rs:Boolean) {
val newMessage = renderMessage((m,r,rs))
- val update = PrependHtml(jsId, newMessage)
+ val update = PrependHtml(jsId, newMessage) & Run("calculateDates();")
partialUpdate(update)
}
@@ -140,9 +145,9 @@ trait Timeline extends CometActor {
}
val authorHref = LiftRules.context.path + "/user/" + authorNickname
-
-// TODO: Put date in the "ago" format
- val messageDateStr = toInternetDate(m._1.when)
+
+ val messageDate = toInternetDate(m._1.when)
+
val messageReason = if(m._2.attr.length > 0){
if(m._2.attr.key == "resent_from") {
"resent by " + User.find(m._2.attr.value).map(_.nickname).openOr("")
@@ -151,14 +156,14 @@ trait Timeline extends CometActor {
}
} else {
"via " + m._1.source
- }
-
- val suppString = messagePool + " " + messageDateStr + " " + messageReason
+ }
("#avatar [src]" #> imageUrl &
".updates-box [id]" #> messageId &
".msgbody *" #> messageBody &
- ".supp_data *" #> suppString &
+ ".supp_pool *" #> messagePool &
+ ".supp_millidate *" #> messageDate &
+ ".supp_reason *" #> messageReason &
".reply [href]" #> replyHref &
convTransform &
".author [href]" #> authorHref &
Modified: esme/trunk/server/src/main/webapp/info_view/streams.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/info_view/streams.html?rev=1103302&r1=1103301&r2=1103302&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/info_view/streams.html (original)
+++ esme/trunk/server/src/main/webapp/info_view/streams.html Sun May 15 09:51:42 2011
@@ -45,11 +45,7 @@
</thead>
</table>
</div>
- <div id="stream_timeline_messages">
- <head>
- <script src="/scripts/display_messages_top.js" type="text/javascript"/>
- <script src="/scripts/pretty.js" type="text/javascript"/>
- </head>
+ <div id="stream_timeline_messages">
<stream:cometTimeline />
</div>
</div>
Modified: esme/trunk/server/src/main/webapp/scripts/pretty.js
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/scripts/pretty.js?rev=1103302&r1=1103301&r2=1103302&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/scripts/pretty.js (original)
+++ esme/trunk/server/src/main/webapp/scripts/pretty.js Sun May 15 09:51:42 2011
@@ -39,3 +39,23 @@ if ( typeof jQuery != "undefined" )
jQuery(this).text( date );
});
};
+
+// Added by Ethan
+// Find all divs with class "supp_data" and populate the child div "supp_date"
+// based on the contents of the child div "supp_isodate".
+
+function calculateDates() {
+ var message_date = "";
+
+ jQuery(".supp_data").each(function(){
+ message_date = prettyDate(new Date($(this).children(".supp_millidate").html()));
+ $(this).children(".supp_date").html(message_date);
+ });
+}
+
+jQuery(document).ready(function(){
+ calculateDates();
+});
+window.setInterval(calculateDates, 30000);
+
+
Modified: esme/trunk/server/src/main/webapp/templates-hidden/base.html
URL: http://svn.apache.org/viewvc/esme/trunk/server/src/main/webapp/templates-hidden/base.html?rev=1103302&r1=1103301&r2=1103302&view=diff
==============================================================================
--- esme/trunk/server/src/main/webapp/templates-hidden/base.html (original)
+++ esme/trunk/server/src/main/webapp/templates-hidden/base.html Sun May 15 09:51:42 2011
@@ -39,7 +39,8 @@
<script src="/scripts/jquery.TipTip.js" type="text/javascript"/>
<script src="/scripts/esme_tool_tip.js" type="text/javascript"/>
<script src="/scripts/jquery.validate.js" type="text/javascript"/>
- <script src="/scripts/esme_validate.js" type="text/javascript"/>
+ <script src="/scripts/esme_validate.js" type="text/javascript"/>
+ <script src="/scripts/pretty.js" type="text/javascript"/>
</head>
<body id="back">
<div id="messages" class="esme_message_bar" style="display: none"></div>