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

[Chris Johnston]

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

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2014-05-28 21:17:40 +0000
+++ lib/canonical/launchpad/icing/style.css	2014-05-29 07:44:00 +0000
@@ -238,11 +238,11 @@
     border-left: 1px solid #ddd;
 }
 .boardCommentBody {padding: 0.5em 12px 0;}
-.boardBugActivityBody {
+.boardCommentActivity {
   padding: 0.5em 12px;
   background-color: #fafafa;
 }
-.boardBugActivityBody table {
+.boardCommentActivity table {
   margin-bottom: 0.5em;
   margin-top: 0.5em;
 }
 
=== modified file 'lib/lp/bugs/templates/bugcomment-macros.pt'
--- lib/lp/bugs/templates/bugcomment-macros.pt	2012-09-21 02:51:51 +0000
+++ lib/lp/bugs/templates/bugcomment-macros.pt	2014-05-29 07:44:00 +0000
@@ -40,7 +40,7 @@
       7 minutes ago
     </span>
   </div>
-  <div class="boardBugActivityBody">
+  <div class="boardCommentActivity">
     <metal:activity-table
         metal:use-macro="context/@@bugcomment-macros/activity-table" />
   </div>
 
=== modified file 'lib/lp/code/stories/branches/xx-code-review-comments.txt'
--- lib/lp/code/stories/branches/xx-code-review-comments.txt	2014-05-29 07:08:17 +0000
+++ lib/lp/code/stories/branches/xx-code-review-comments.txt	2014-05-29 07:44:00 +0000
@@ -132,7 +132,7 @@
 
     >>> print_comments('boardCommentDetails', eric_browser, index=2)
     Eric the Viking ... ago: #
-    >>> print_comments('boardBugActivityBody', eric_browser, index=0)
+    >>> print_comments('boardCommentActivity', eric_browser, index=0)
     review: Abstain (timeless)
     >>> print_comments('boardCommentBody', eric_browser, index=2)
 
 
=== modified file 'lib/lp/services/comments/templates/comment.pt'
--- lib/lp/services/comments/templates/comment.pt	2014-05-29 07:08:17 +0000
+++ lib/lp/services/comments/templates/comment.pt	2014-05-29 07:44:00 +0000
@@ -17,7 +17,7 @@
          tal:content="structure context/@@+comment-body">
       The comment body
     </div>
-    <div class="boardBugActivityBody"
+    <div class="boardCommentActivity"
          tal:condition="context/has_footer"
          tal:content="structure context/@@+comment-footer">
       Activity or other footer details.