Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 9662 invoked from network); 28 Sep 2009 20:59:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Sep 2009 20:59:49 -0000 Received: (qmail 71890 invoked by uid 500); 28 Sep 2009 20:59:49 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 71865 invoked by uid 500); 28 Sep 2009 20:59:49 -0000 Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: esme-dev@incubator.apache.org Delivered-To: mailing list esme-commits@incubator.apache.org Received: (qmail 71853 invoked by uid 99); 28 Sep 2009 20:59:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Sep 2009 20:59:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Sep 2009 20:59:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1D9E5238889C; Mon, 28 Sep 2009 20:59:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: esme-commits@incubator.apache.org From: vdichev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090928205927.1D9E5238889C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@

tag2


- reply + reply
+ conversation