Author: vdichev
Date: Mon Sep 28 20:31:04 2009
New Revision: 819721
URL: http://svn.apache.org/viewvc?rev=819721&view=rev
Log:
Web UI cleanup.
Modified:
incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
Modified:
incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js?rev=819721&r1=819720&r2=819721&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js
(original)
+++ incubator/esme/trunk/server/src/main/webapp/scripts/display_messages.js Mon
Sep 28 20:31:04 2009
@@ -1,103 +1,103 @@
- // <![CDATA[
- /*
- * displayMessages called by lift:comet, type="Timeline" and
type="PublicTimeline"
- */
-
- function msgDateCompare(msg1, msg2)
- {
- return parseInt(msg1.message.when) - parseInt(msg2.message.when);
+// <![CDATA[
+/*
+ * displayMessages called by lift:comet, type="Timeline" and
type="PublicTimeline"
+ */
+
+function msgDateCompare(msg1, msg2)
+{
+ return parseInt(msg1.message.when) - parseInt(msg2.message.when);
+}
+
+function displayMessages(msgArray, elementId)
+{
+ // Select the first element in table id="timeline_messages"
+ // with id="message" as the message template
+ if (msgTemplate == null) {
+ // var msgTemplate =
jQuery('span.'+spanId+' message:first');
+ var msgTemplate = jQuery('#'+elementId+' #message:first');
+ var tagTemplate = msgTemplate.find('#tag:first');
+ var msgInsertPt = jQuery('#'+elementId);
+
+ // Now we have the template, make the existing instances invisible
+ jQuery('#'+elementId+' *[id=message]').hide();
+ }
+
+ // Sort the messages into date order
+ msgArray.sort(msgDateCompare);
+
+ for (var msgIndex in msgArray)
+ {
+ // Marshall the data from the Comet-supplied message
+ var cometMsg = msgArray[msgIndex].message;
+ var cometReason = msgArray[msgIndex].reason;
+ var cometResent = msgArray[msgIndex].resent;
+ var msgId = "message_"+cometMsg.id;
+
+ // Only do this if the message is not already in the table
+ if (jQuery('#'+elementId+' #'+msgId).size() == 0)
+ {
+ var msgAuthor = cometMsg.author;
+ var msgBody = jQuery(cometMsg.text).find('body').html();
+ var msgDateObj = new Date(parseInt(cometMsg.when));
+ var msgDateStr = 'on ' + msgDateObj.toLocaleDateString() +
+ ' ' + msgDateObj.toLocaleTimeString();
+ var msgPool = '';
+ if (cometMsg.pool) msgPool = 'in pool ' + cometMsg.pool.name;
+ var msgSource = cometMsg.source;
+ var msgReason = ""
+ for (r in cometReason) {
+ if (r == "resent_from")
+ msgReason = "resent by " + cometReason[r].nickname;
+ else
+ msgReason = "caused by " + r;
+ break
}
+ var msgTags = jQuery(cometMsg.text).find('tags > tag').get();
+ for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
+ // Replace each tag element with the plain tag text
+ msgTags[tagIndex] = jQuery(msgTags[tagIndex]).attr('name');
+ }
+
+ // Put the marshalled data into a copy of the template
+ var newMsg = msgTemplate.clone(true).attr('id',msgId);
+
+ newMsg.find('#author').text(msgAuthor.nickname);
- function displayMessages(msgArray, elementId)
- {
- // Select the first element in table id="timeline_messages"
- // with id="message" as the message template
- if (msgTemplate == null) {
- // var msgTemplate =
jQuery('span.'+spanId+' message:first');
- var msgTemplate = jQuery('#'+elementId+' #message:first');
- var tagTemplate = msgTemplate.find('#tag:first');
- var msgInsertPt = jQuery('#'+elementId);
-
- // Now we have the template, make the existing instances invisible
- jQuery('#'+elementId+' *[id=message]').hide();
- }
-
- // Sort the messages into date order
- msgArray.sort(msgDateCompare);
-
- for (var msgIndex in msgArray)
- {
- // Marshall the data from the Comet-supplied message
- var cometMsg = msgArray[msgIndex].message;
- var cometReason = msgArray[msgIndex].reason;
- var cometResent = msgArray[msgIndex].resent;
- var msgId = "message_"+cometMsg.id;
-
- // Only do this if the message is not already in the table
- if (jQuery('#'+elementId+' #'+msgId).size() == 0)
- {
- var msgAuthor = cometMsg.author;
- var msgBody = jQuery(cometMsg.text).find('body').html();
- var msgDateObj = new Date(parseInt(cometMsg.when));
- var msgDateStr = 'on ' + msgDateObj.toLocaleDateString() +
- ' ' + msgDateObj.toLocaleTimeString();
- var msgPool = '';
- if (cometMsg.pool) msgPool = 'in pool ' + cometMsg.pool.name;
- var msgSource = cometMsg.source;
- var msgReason = ""
- for (r in cometReason) {
- if (r == "resent_from")
- msgReason = "resent by " + cometReason[r].nickname;
- else
- msgReason = "caused by " + r;
- break
- }
- var msgTags = jQuery(cometMsg.text).find('tags > tag').get();
- for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
- // Replace each tag element with the plain tag text
- msgTags[tagIndex] = jQuery(msgTags[tagIndex]).attr('name');
- }
-
- // Put the marshalled data into a copy of the template
- var newMsg = msgTemplate.clone(true).attr('id',msgId);
-
- newMsg.find('#author').text(msgAuthor.nickname);
-
- var avatar = newMsg.find('#avatar')
- .attr('src', msgAuthor.imageurl)
- .attr('alt',msgAuthor.firstname + ' ' + msgAuthor.lastname);
-
- newMsg.find('#body').html(msgBody);
- newMsg.find('#pool').text(msgPool);
- newMsg.find('#source').text(msgSource);
- newMsg.find('#reason').text(msgReason);
- newMsg.find('#when').text(msgDateStr);
- var id = cometMsg.id;
- var resendButton = newMsg.find('#resend');
- if (cometResent) {
- resendButton.css("display", "none");
- } else {
- resendButton.attr('id', 'resend_' + id).
- attr('onclick', 'javascript:resend_msg(' + id + ');' +
- 'clearResend("resend_' + id + '")');
- }
- var reply = newMsg.find('#reply');
- reply.attr('href', "javascript:setReplyTo(" + id + ", '" + msgBody
+ "')");
- for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
- var newTag =
tagTemplate.clone(true).attr('id',msgTags[tagIndex]);
- newTag.find('a')
- .attr('href','tag/'+msgTags[tagIndex])
- .text(msgTags[tagIndex]);
- newTag.insertBefore(newMsg.find('#tag:first'));
- }
-
- // Remove any old tags from the template
- newMsg.find('*[id=tag]').remove();
-
- // Insert the updated copy of the message into the page
- newMsg.prependTo(msgInsertPt).show();
- }
- }
+ var avatar = newMsg.find('#avatar')
+ .attr('src', msgAuthor.imageurl)
+ .attr('alt',msgAuthor.firstname + ' ' + msgAuthor.lastname);
+
+ newMsg.find('#body').html(msgBody);
+ newMsg.find('#pool').text(msgPool);
+ newMsg.find('#source').text(msgSource);
+ newMsg.find('#reason').text(msgReason);
+ newMsg.find('#when').text(msgDateStr);
+ var id = cometMsg.id;
+ var resendButton = newMsg.find('#resend');
+ if (cometResent) {
+ resendButton.css("display", "none");
+ } else {
+ resendButton.attr('id', 'resend_' + id).
+ attr('onclick', 'javascript:resend_msg(' + id + ');' +
+ 'clearResend("resend_' + id + '")');
}
- // ]]>
+ var reply = newMsg.find('#reply');
+ reply.attr('href', "javascript:setReplyTo(" + id + ", '" + msgBody +
"')");
+ for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
+ var newTag = tagTemplate.clone(true).attr('id',msgTags[tagIndex]);
+ newTag.find('a')
+ .attr('href','tag/'+msgTags[tagIndex])
+ .text(msgTags[tagIndex]);
+ newTag.insertBefore(newMsg.find('#tag:first'));
+ }
+
+ // Remove any old tags from the template
+ newMsg.find('*[id=tag]').remove();
+
+ // Insert the updated copy of the message into the page
+ newMsg.prependTo(msgInsertPt).show();
+ }
+ }
+}
+// ]]>
Modified:
incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html?rev=819721&r1=819720&r2=819721&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
(original)
+++ incubator/esme/trunk/server/src/main/webapp/templates-hidden/message.html
Mon Sep 28 20:31:04 2009
@@ -72,27 +72,6 @@
<td><button id="resend"
class="btn">Resend</button><br/>
<a href="#" id="reply">reply</a></td>
</tr>
- <tr id="message">
- <td><img id="avatar"
src="http://static.twitter.com/images/default_profile_bigger.png";
alt="Anonymous" width="50px"/><div id="author">anon</div></td>
- <td class="message">
- <div class="outer">
- <div class="inner clear">
- <p class="text" id="body">This is
another test message in the HTML for designers.</p>
- </div>
- <div class="metainfo">
- <span id="pool">in pool PUBLIC</span>
- <span id="reason">resent by me</span>
- <span id="when"
class="date">yesterday</span>
- </div>
- </div>
- </td>
- <td id="tags" class="tag">
- <p id="tag"><a href="tag/tag1">tag1</a></p>
- <p id="tag"><a href="tag/tag3">tag3</a></p>
- </td>
- <td><button id="resend"
class="btn">Resend</button><br/>
- <a href="#" id="reply">reply</a></td>
- </tr>
</tbody>
</table>
</div>
![http://static.twitter.com/images/default_profile_bigger.png"](http://static.twitter.com/images/default_profile_bigger.png"){kind=link}