launchpad-reviewers team mailing list archive

["Thiago F. Pappacena" <pappacena@xxxxxxxxx>]

Thiago F. Pappacena has proposed merging ~pappacena/launchpad:comment-editing-ui-list-revisions-codereview into launchpad:master with ~pappacena/launchpad:comment-editing-ui-list-revisions-bugcomment as a prerequisite.

Commit message:
Adding comment revision lits to code review page

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pappacena/launchpad/+git/launchpad/+merge/403285
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pappacena/launchpad:comment-editing-ui-list-revisions-codereview into launchpad:master.

diff --git a/lib/lp/code/stories/branches/xx-code-review-comments.txt b/lib/lp/code/stories/branches/xx-code-review-comments.txt
index 30d3a26..d0575b0 100644
--- a/lib/lp/code/stories/branches/xx-code-review-comments.txt
+++ b/lib/lp/code/stories/branches/xx-code-review-comments.txt
@@ -38,6 +38,7 @@ to the main merge proposal page.
     ...             print(extract_text(tag))
 
     >>> print_comments('boardCommentDetails')
+    Revision history for this message
     Eric the Viking (eric) wrote ...
     >>> print_comments('comment-text')
     This is a very long comment about what things should be done to the
@@ -111,6 +112,7 @@ are also displayed in the new proposal.
     source branch to land it. When this comment is replied to, it should
     wrap the line properly.
     >>> print_comments('boardCommentDetails', anon_browser, index=0)
+    Revision history for this message
     Eric the Viking (eric) wrote ... ago:
     Posted in a previous version of this proposal #
     >>> details = find_tags_by_class(
@@ -132,6 +134,7 @@ comment' link.
     >>> eric_browser.getControl('Save Comment').click()
 
     >>> print_comments('boardCommentDetails', eric_browser, index=2)
+    Revision history for this message
     Eric the Viking ... ago: #
     >>> print_comments('boardCommentActivity', eric_browser, index=0)
     review: Abstain (timeless)
diff --git a/lib/lp/code/templates/codereviewcomment-header.pt b/lib/lp/code/templates/codereviewcomment-header.pt
index 77c4650..3d2b976 100644
--- a/lib/lp/code/templates/codereviewcomment-header.pt
+++ b/lib/lp/code/templates/codereviewcomment-header.pt
@@ -3,6 +3,25 @@
    xmlns:metal="http://xml.zope.org/namespaces/metal";
    omit-tag="">
 
+<div class="message-revision-container">
+  <div class="message-revision-container-header">
+    <span>Revision history for this message</span>
+    <img src="/+icing/build/overlay/assets/skins/sam/images/close.gif"
+         class="message-revision-close"/>
+  </div>
+  <script type="text/template">
+    <div class='message-revision-item'>
+      <div class='message-revision-title'>
+          <a class="js-action">
+              Revision #{revision}, created at  {date_created}
+          </a>
+      </div>
+      <div class='message-revision-body'>{content}</div>
+    </div>
+  </script>
+  <div class="message-revision-list"></div>
+</div>
+
 <table>
   <tbody>
     <tr>
@@ -19,11 +38,12 @@
           tal:content="context/comment_date/fmt:displaydate">
           7 minutes ago
         </time><span class="editable-message-last-edit-date"><tal:last-edit condition="context/date_last_edited">
-            (last edit <time
+            <a href="#" class="editable-message-last-edit-link"
+               tal:condition="context/date_last_edited">(last edit <time
                 itemprop="editTime"
                 tal:attributes="title context/date_last_edited/fmt:datetime;
                   datetime context/date_last_edited/fmt:isodate"
-                tal:content="context/date_last_edited/fmt:displaydate" />)</tal:last-edit>:
+                tal:content="context/date_last_edited/fmt:displaydate" />)</a></tal:last-edit>:
           </span>
         <span
           tal:condition="context/from_superseded"