Merge ~pappacena/launchpad:comment-editing-ui-list-revisions-codereview into launchpad:master

Proposed by Thiago F. Pappacena
Status: Merged
Approved by: Thiago F. Pappacena
Approved revision: ba383cfc0b05db6b222625ed0043f9eec51bdd38
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~pappacena/launchpad:comment-editing-ui-list-revisions-codereview
Merge into: launchpad:master
Prerequisite: ~pappacena/launchpad:comment-editing-ui-list-revisions-bugcomment
Diff against target: 73 lines (+25/-2)
2 files modified
lib/lp/code/stories/branches/xx-code-review-comments.txt (+3/-0)
lib/lp/code/templates/codereviewcomment-header.pt (+22/-2)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+403285@code.launchpad.net

Commit message

Adding comment revision list to code review page

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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.
38 ... print(extract_text(tag))38 ... print(extract_text(tag))
3939
40 >>> print_comments('boardCommentDetails')40 >>> print_comments('boardCommentDetails')
41 Revision history for this message
41 Eric the Viking (eric) wrote ...42 Eric the Viking (eric) wrote ...
42 >>> print_comments('comment-text')43 >>> print_comments('comment-text')
43 This is a very long comment about what things should be done to the44 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.
111 source branch to land it. When this comment is replied to, it should112 source branch to land it. When this comment is replied to, it should
112 wrap the line properly.113 wrap the line properly.
113 >>> print_comments('boardCommentDetails', anon_browser, index=0)114 >>> print_comments('boardCommentDetails', anon_browser, index=0)
115 Revision history for this message
114 Eric the Viking (eric) wrote ... ago:116 Eric the Viking (eric) wrote ... ago:
115 Posted in a previous version of this proposal #117 Posted in a previous version of this proposal #
116 >>> details = find_tags_by_class(118 >>> details = find_tags_by_class(
@@ -132,6 +134,7 @@ comment' link.
132 >>> eric_browser.getControl('Save Comment').click()134 >>> eric_browser.getControl('Save Comment').click()
133135
134 >>> print_comments('boardCommentDetails', eric_browser, index=2)136 >>> print_comments('boardCommentDetails', eric_browser, index=2)
137 Revision history for this message
135 Eric the Viking ... ago: #138 Eric the Viking ... ago: #
136 >>> print_comments('boardCommentActivity', eric_browser, index=0)139 >>> print_comments('boardCommentActivity', eric_browser, index=0)
137 review: Abstain (timeless)140 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 @@
3 xmlns:metal="http://xml.zope.org/namespaces/metal"3 xmlns:metal="http://xml.zope.org/namespaces/metal"
4 omit-tag="">4 omit-tag="">
55
6<div class="message-revision-container">
7 <div class="message-revision-container-header">
8 <span>Revision history for this message</span>
9 <img src="/+icing/build/overlay/assets/skins/sam/images/close.gif"
10 class="message-revision-close"/>
11 </div>
12 <script type="text/template">
13 <div class='message-revision-item'>
14 <div class='message-revision-title'>
15 <a class="js-action">
16 Revision #{revision}, created at {date_created}
17 </a>
18 </div>
19 <div class='message-revision-body'>{content}</div>
20 </div>
21 </script>
22 <div class="message-revision-list"></div>
23</div>
24
6<table>25<table>
7 <tbody>26 <tbody>
8 <tr>27 <tr>
@@ -19,11 +38,12 @@
19 tal:content="context/comment_date/fmt:displaydate">38 tal:content="context/comment_date/fmt:displaydate">
20 7 minutes ago39 7 minutes ago
21 </time><span class="editable-message-last-edit-date"><tal:last-edit condition="context/date_last_edited">40 </time><span class="editable-message-last-edit-date"><tal:last-edit condition="context/date_last_edited">
22 (last edit <time41 <a href="#" class="editable-message-last-edit-link"
42 tal:condition="context/date_last_edited">(last edit <time
23 itemprop="editTime"43 itemprop="editTime"
24 tal:attributes="title context/date_last_edited/fmt:datetime;44 tal:attributes="title context/date_last_edited/fmt:datetime;
25 datetime context/date_last_edited/fmt:isodate"45 datetime context/date_last_edited/fmt:isodate"
26 tal:content="context/date_last_edited/fmt:displaydate" />)</tal:last-edit>:46 tal:content="context/date_last_edited/fmt:displaydate" />)</a></tal:last-edit>:
27 </span>47 </span>
28 <span48 <span
29 tal:condition="context/from_superseded"49 tal:condition="context/from_superseded"