incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vdic...@apache.org
Subject svn commit: r819728 - in /incubator/esme/trunk/server/src/main/webapp: scripts/display_messages.js templates-hidden/message.html
Date Mon, 28 Sep 2009 20:59:27 GMT
Author: vdichev
Date: Mon Sep 28 20:59:26 2009
New Revision: 819728

URL: http://svn.apache.org/viewvc?rev=819728&view=rev
Log:
Show conversation link in Web UI.

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=819728&r1=819727&r2=819728&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:59:26
2009
@@ -44,6 +44,7 @@
       var msgPool = '';
       if (cometMsg.pool) msgPool = 'in pool ' + cometMsg.pool.name;
       var msgSource = cometMsg.source;
+      var msgConversation = cometMsg.conversation;
       var msgReason = ""
       for (r in cometReason) {
         if (r == "resent_from")
@@ -81,8 +82,15 @@
           attr('onclick', 'javascript:resend_msg(' + id + ');' +
                                      'clearResend("resend_' + id + '")');
       }
-      var reply = newMsg.find('#reply');
-      reply.attr('href', "javascript:setReplyTo(" + id + ", '" + msgBody + "')");
+      newMsg.find('#reply').attr('href',
+        "javascript:setReplyTo(" + id + ", '"+ msgBody + "')");
+      var conversation = newMsg.find('#conversation');
+      if (msgConversation != 0) {
+        conversation.attr('href',
+          '/conversation/' + msgConversation);
+      } else {
+        conversation.css("display", "none");
+      }
       for (var tagIndex=0; tagIndex < msgTags.length; tagIndex++) {
         var newTag = tagTemplate.clone(true).attr('id',msgTags[tagIndex]);
         newTag.find('a')

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=819728&r1=819727&r2=819728&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:59:26
2009
@@ -70,7 +70,8 @@
                                 <p id="tag"><a href="tag/tag2">tag2</a></p>
                               </td>
                               <td><button id="resend" class="btn">Resend</button><br/>
-                                  <a href="#" id="reply">reply</a></td>
+                                  <a href="#" id="reply">reply</a><br/>
+                                  <a id="conversation">conversation</a></td>
                             </tr>
                           </tbody>
                         </table>



Mime
View raw message