Launchpad itself

Merge lp:~cjohnston/launchpad/bBAB-bCA into lp:launchpad

  1. bBAB-bCA
  2. Merge into devel
Proposed by Chris Johnston
Status: Merged
Merged at revision: 17026
Proposed branch: lp:~cjohnston/launchpad/bBAB-bCA
Merge into: lp:launchpad
Diff against target: 56 lines (+5/-5)
4 files modified
lib/canonical/launchpad/icing/style.css (+2/-2)
lib/lp/bugs/templates/bugcomment-macros.pt (+1/-1)
lib/lp/code/stories/branches/xx-code-review-comments.txt (+1/-1)
lib/lp/services/comments/templates/comment.pt (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/launchpad/bBAB-bCA
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+221325@code.launchpad.net

Commit message

Rename boardBugActivityBody to boardCommentActivity as it is now used in places other than bugs

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/icing/style.css'
2--- lib/canonical/launchpad/icing/style.css 2014-05-28 21:17:40 +0000
3+++ lib/canonical/launchpad/icing/style.css 2014-05-29 07:44:00 +0000
4@@ -238,11 +238,11 @@
5 border-left: 1px solid #ddd;
6 }
7 .boardCommentBody {padding: 0.5em 12px 0;}
8-.boardBugActivityBody {
9+.boardCommentActivity {
10 padding: 0.5em 12px;
11 background-color: #fafafa;
12 }
13-.boardBugActivityBody table {
14+.boardCommentActivity table {
15 margin-bottom: 0.5em;
16 margin-top: 0.5em;
17 }
18
19=== modified file 'lib/lp/bugs/templates/bugcomment-macros.pt'
20--- lib/lp/bugs/templates/bugcomment-macros.pt 2012-09-21 02:51:51 +0000
21+++ lib/lp/bugs/templates/bugcomment-macros.pt 2014-05-29 07:44:00 +0000
22@@ -40,7 +40,7 @@
23 7 minutes ago
24 </span>
25 </div>
26- <div class="boardBugActivityBody">
27+ <div class="boardCommentActivity">
28 <metal:activity-table
29 metal:use-macro="context/@@bugcomment-macros/activity-table" />
30 </div>
31
32=== modified file 'lib/lp/code/stories/branches/xx-code-review-comments.txt'
33--- lib/lp/code/stories/branches/xx-code-review-comments.txt 2014-05-29 07:08:17 +0000
34+++ lib/lp/code/stories/branches/xx-code-review-comments.txt 2014-05-29 07:44:00 +0000
35@@ -132,7 +132,7 @@
36
37 >>> print_comments('boardCommentDetails', eric_browser, index=2)
38 Eric the Viking ... ago: #
39- >>> print_comments('boardBugActivityBody', eric_browser, index=0)
40+ >>> print_comments('boardCommentActivity', eric_browser, index=0)
41 review: Abstain (timeless)
42 >>> print_comments('boardCommentBody', eric_browser, index=2)
43
44
45=== modified file 'lib/lp/services/comments/templates/comment.pt'
46--- lib/lp/services/comments/templates/comment.pt 2014-05-29 07:08:17 +0000
47+++ lib/lp/services/comments/templates/comment.pt 2014-05-29 07:44:00 +0000
48@@ -17,7 +17,7 @@
49 tal:content="structure context/@@+comment-body">
50 The comment body
51 </div>
52- <div class="boardBugActivityBody"
53+ <div class="boardCommentActivity"
54 tal:condition="context/has_footer"
55 tal:content="structure context/@@+comment-footer">
56 Activity or other footer details.