← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~huwshimi/launchpad/portlet-classes-removal-244384 into lp:launchpad

 

Huw Wilkins has proposed merging lp:~huwshimi/launchpad/portlet-classes-removal-244384 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #244384 in Launchpad itself: "portletBody and portletContent are obsolete"
  https://bugs.launchpad.net/launchpad/+bug/244384

For more details, see:
https://code.launchpad.net/~huwshimi/launchpad/portlet-classes-removal-244384/+merge/113692

Since 2008 portletBody and portletContent have been redundant classes. This branch removes all reference to them.
-- 
https://code.launchpad.net/~huwshimi/launchpad/portlet-classes-removal-244384/+merge/113692
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~huwshimi/launchpad/portlet-classes-removal-244384 into lp:launchpad.
=== renamed file 'lib/canonical/launchpad/icing/css/components/portlet.css' => 'lib/canonical/launchpad/icing/css/components/portlets.css'
=== renamed file 'lib/canonical/launchpad/icing/css/components/pofiling_info.css' => 'lib/canonical/launchpad/icing/css/components/profiling_info.css'
=== renamed file 'lib/canonical/launchpad/icing/css/components/sidebar_components.css' => 'lib/canonical/launchpad/icing/css/components/sidebar_portlets.css'
--- lib/canonical/launchpad/icing/css/components/sidebar_components.css	2012-05-17 20:55:46 +0000
+++ lib/canonical/launchpad/icing/css/components/sidebar_portlets.css	2012-07-06 06:08:22 +0000
@@ -1,17 +1,15 @@
-/* =========================
-   Universal
+/******************************************************************************
    Side portlets
 */
 .side {
     padding: 0.5em;
     }
 .side .portlet {
-    width: 90%;
-    margin: 0 auto 1em;
+    margin: 0 0 1em 0;
+    padding: 0.5em;
+    background: #fbfbfb;
     border: 1px solid #dedede;
     border-radius: 5px;
-    padding: 0.5em;
-    background: #fbfbfb;
     }
 .side h2 {
     font-size: 16px;
@@ -21,9 +19,15 @@
     font-size: 14px;
     line-height: 18px;
     }
-.side ul {
-    background: #fbfbfb;
+.side div.breaker,
+.side li.breaker {
+    margin: 8px 0;
+    border-top: 1px solid #e3e3e3;
     }
+
+/******************************************************************************
+ Downloads portlet
+*/
 .downloads li {
     margin: 0;
     padding: 2px 0 0;
@@ -39,27 +43,33 @@
     padding-right: 40px;
     color: #fff;
     }
+.downloads .version,
+.downloads .released {
+    background: #d3e3c7;
+    padding: 0.2em 1em;
+    }
 .downloads .version {
     border-radius: 5px 5px 0 0;
-    background: #d3e3c7;
-    padding: 0.2em 1em;
     }
 .downloads .released {
     margin: .3em 0 .5em 0;
     border-radius: 0 0 5px 5px;
-    background: #d3e3c7;
-    padding: 0.2em 1em;
     }
 .downloads .alternate {
     padding: 0 0 0 1em;
     }
+
+/******************************************************************************
+ Involvement portlet
+*/
 .involvement li {
     border-top: 1px solid #d0d0d0;
     padding: 0;
     font-weight: bold;
     }
+.involvement li.first,
 .involvement li.single {
-    border-top: 0;
+    border-top: none;
     }
 .involvement a {
     display: block;
@@ -68,9 +78,7 @@
 .involvement li.disabled {
     color: #cccccc;
     }
-.involvement-service-links li.disabled img {
-    margin-bottom: 0;
-    }
+.involvement-service-links li.disabled img,
 .involvement-service-links li.disabled span {
     margin-bottom: 0;
     }
@@ -86,6 +94,10 @@
     text-decoration: none;
     background-color: #eee;
     }
+
+/******************************************************************************
+ Announcements portlet
+*/
 .announcements li {
     margin-bottom: 0.5em;
     /* Some announcements have long strings of characters as section headers
@@ -106,3 +118,17 @@
 .announcement .registered {
     margin-top: -2px;
     }
+
+/******************************************************************************
+ Data list portlet
+*/
+.side ul.data-list li {
+    padding-bottom: 0;
+    }
+.side ul.data-list span.count {
+    display: inline-block;
+    min-width: 3em;
+    text-align: right;
+    padding-right: 0.25em;
+    }
+

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2012-06-04 17:47:25 +0000
+++ lib/canonical/launchpad/icing/style.css	2012-07-06 06:08:22 +0000
@@ -665,23 +665,6 @@
   display: inline;
 }
 
-/* Tags portlet */
-.tag-list {
-    margin-bottom: 0.5em;
-    }
-.tag-list li {
-    padding-bottom: 0;
-    }
-.tag-count {
-    display: inline-block;
-    min-width: 1.5em;
-    text-align: right;
-    padding-right: 0.25em;
-    }
-.edit-official-tags {
-    margin-top: 1em;
-}
-
 /* === Translations === */
 
 .translation code {font-weight: bold;} /* an interpolation code, such as %i */

=== modified file 'lib/lp/answers/browser/questiontarget.py'
--- lib/lp/answers/browser/questiontarget.py	2012-02-17 04:09:06 +0000
+++ lib/lp/answers/browser/questiontarget.py	2012-07-06 06:08:22 +0000
@@ -113,7 +113,7 @@
         return """
             <div id="involvement" class="portlet involvement">
               <ul>
-                <li style="border: none">
+                <li class="single">
                   <a class="menu-link-ask_question sprite answers"
                     href="%s">Ask a question</a>
                 </li>

=== modified file 'lib/lp/answers/templates/faq-portlet-related-questions.pt'
--- lib/lp/answers/templates/faq-portlet-related-questions.pt	2012-06-11 00:03:25 +0000
+++ lib/lp/answers/templates/faq-portlet-related-questions.pt	2012-07-06 06:08:22 +0000
@@ -7,9 +7,6 @@
   tal:condition="questions" >
 
     <h2>Related questions</h2>
-
-    <div class="portletBody">
-
       <ul>
         <li class="question-row" tal:repeat="question questions">
           <tal:description
@@ -20,7 +17,4 @@
              class="sprite question"># Title</a>
         </li>
       </ul>
-
-    </div>
-
 </div>

=== modified file 'lib/lp/app/templates/navigationmenu-related-pages.pt'
--- lib/lp/app/templates/navigationmenu-related-pages.pt	2009-08-25 18:50:32 +0000
+++ lib/lp/app/templates/navigationmenu-related-pages.pt	2012-07-06 06:08:22 +0000
@@ -2,7 +2,7 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal";
   xmlns:i18n="http://xml.zope.org/namespaces/i18n";
   id="related-pages" class="portlet">
-  <h2 tal:content="view/title">Menu title</h2>
+  <h2 tal:condition="view/title" tal:content="view/title">Menu title</h2>
 
   <ul>
     <tal:link tal:repeat="link view/links">

=== modified file 'lib/lp/blueprints/browser/specificationtarget.py'
--- lib/lp/blueprints/browser/specificationtarget.py	2012-05-17 07:46:56 +0000
+++ lib/lp/blueprints/browser/specificationtarget.py	2012-07-06 06:08:22 +0000
@@ -454,7 +454,7 @@
         return """
             <div id="involvement" class="portlet involvement">
               <ul>
-                <li style="border: none">
+                <li class="first">
                   <a class="menu-link-register_blueprint sprite blueprints"
                     href="%s">Register a blueprint</a>
                 </li>

=== modified file 'lib/lp/blueprints/templates/specification-portlet-blocked.pt'
--- lib/lp/blueprints/templates/specification-portlet-blocked.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/specification-portlet-blocked.pt	2012-07-06 06:08:22 +0000
@@ -9,8 +9,6 @@
 
     <h2>Blocks</h2>
 
-    <div class="portletBody portletContent">
-
       <ul tal:condition="blocked_specs">
         <li class="spec" tal:repeat="spec blocked_specs">
           <a tal:attributes="href spec/fmt:url"
@@ -20,8 +18,6 @@
       <p tal:condition="not: blocked_specs">
         No blueprints are blocked on this one.
       </p>
-	
-    </div>
 
   </div>
 </tal:blocked_specs>

=== modified file 'lib/lp/blueprints/templates/specification-portlet-dependencies.pt'
--- lib/lp/blueprints/templates/specification-portlet-dependencies.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/specification-portlet-dependencies.pt	2012-07-06 06:08:22 +0000
@@ -9,8 +9,6 @@
 
     <h2>Depends</h2>
 
-    <div class="portletBody portletContent">
-
       <ul>
         <li class="spec" tal:repeat="spec dependencies">
           <a tal:attributes="href spec/fmt:url"
@@ -20,8 +18,6 @@
           <i>No spec dependencies.</i>
         </li>
       </ul>
-	
-    </div>
 
   </div>
 </tal:spec_deps>

=== modified file 'lib/lp/blueprints/templates/specification-portlet-subscribers-content.pt'
--- lib/lp/blueprints/templates/specification-portlet-subscribers-content.pt	2011-06-10 02:27:37 +0000
+++ lib/lp/blueprints/templates/specification-portlet-subscribers-content.pt	2012-07-06 06:08:22 +0000
@@ -3,7 +3,6 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal";
   xmlns:metal="http://xml.zope.org/namespaces/metal";
   xmlns:i18n="http://xml.zope.org/namespaces/i18n";
-  class="portletBody"
   tal:define="
 	blueprint context;
 	subscriptions view/sorted_subscriptions">

=== modified file 'lib/lp/blueprints/templates/sprint-portlet-attendees.pt'
--- lib/lp/blueprints/templates/sprint-portlet-attendees.pt	2012-03-02 16:17:46 +0000
+++ lib/lp/blueprints/templates/sprint-portlet-attendees.pt	2012-07-06 06:08:22 +0000
@@ -8,8 +8,7 @@
 
   <h2>Attendees</h2>
 
-  <div class="portletBody portletContent"
-       tal:define="attendances context/attendances">
+  <div tal:define="attendances context/attendances">
 
     <ul>
       <li tal:repeat="attendance attendances">

=== modified file 'lib/lp/blueprints/templates/sprint-portlet-details.pt'
--- lib/lp/blueprints/templates/sprint-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/blueprints/templates/sprint-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -7,8 +7,6 @@
 <div class="portlet" id="portlet-details">
 
   <h2>Meeting details</h2>
-
-  <div class="portletBody portletContent">
     <tal:has_home_page condition="context/home_page">
       <img src="/@@/link" />
       <a tal:attributes="href context/home_page">
@@ -34,7 +32,5 @@
       <br />
     </tal:has_address>
 
-  </div>
-
 </div>
 </tal:root>

=== modified file 'lib/lp/bugs/javascript/tests/test_bugtarget_portlet_bugtags.js'
--- lib/lp/bugs/javascript/tests/test_bugtarget_portlet_bugtags.js	2012-02-10 10:07:48 +0000
+++ lib/lp/bugs/javascript/tests/test_bugtarget_portlet_bugtags.js	2012-07-06 06:08:22 +0000
@@ -9,7 +9,7 @@
         name: 'Tags list',
 
         tearDown: function() {
-                Y.one('.portletBody').remove();
+                Y.one('.test-wrapper').remove();
                 Y.one('#show-more-tags-link').addClass('hidden');
                 Y.one('#show-fewer-tags-link').addClass('hidden');
             },
@@ -19,9 +19,9 @@
             module.setup_taglist({io_provider: mockio});
             mockio.success({
                 responseText:
-                    '<div class="portletBody"><div class="section">' +
+                    '<div class="test-wrapper">' +
                     '<h2>Tags</h2><ul class="tag-list">' +
-                    '</ul></div></div>',
+                    '</ul></div>',
                 responseHeaders: {'Content-type': 'text/html'}});
             Y.Assert.areEqual('/launchpad/+bugtarget-portlet-tags-content',
                               mockio.last_request.url,
@@ -33,9 +33,9 @@
             module.setup_taglist({io_provider: mockio});
             mockio.success({
                 responseText:
-                    '<div class="portletBody"><div class="section">' +
+                    '<div class="test-wrapper">' +
                     '<h2>Tags</h2><ul class="tag-list">' +
-                    '</ul></div></div>',
+                    '</ul></div>',
                 responseHeaders: {'Content-type': 'text/html'}});
             var tags = Y.all('.tag-list li');
             var show_more_link = Y.one('#show-more-tags-link');
@@ -51,7 +51,7 @@
 
         test_twenty_tags_or_fewer: function() {
             var mockio = new Y.lp.testing.mockio.MockIo();
-            var response = '<div class="portletBody"><div class="section">' +
+            var response = '<div class="test-wrapper">' +
                 '<h2>Tags</h2><ul class="tag-list">';
             var i;
             module.setup_taglist({io_provider: mockio});
@@ -59,7 +59,7 @@
                 response += '<li><span class="tag-count">'+i+'</span>' +
                     '<a href="+bugs?field.tag=crash">tag'+i+'</a></li>';
             }
-            response += '</ul></div></div>';
+            response += '</ul></div>';
             mockio.success({
                 responseText: response,
                 responseHeaders: {'Content-type': 'text/html'}});
@@ -76,7 +76,7 @@
 
         test_more_than_twenty_tags: function() {
             var mockio = new Y.lp.testing.mockio.MockIo();
-            var response = '<div class="portletBody"><div class="section">' +
+            var response = '<div class="test-wrapper">' +
                 '<h2>Tags</h2><ul class="tag-list">';
             var i;
             module.setup_taglist({io_provider: mockio});
@@ -84,7 +84,7 @@
                 response += '<li><span class="tag-count">' + i + '</span>' +
                     '<a href="+bugs?field.tag=crash">tag'+ i + '</a></li>';
             }
-            response += '</ul></div></div>';
+            response += '</ul></div>';
             mockio.success({
                 responseText: response,
                 responseHeaders: {'Content-type': 'text/html'}});

=== modified file 'lib/lp/bugs/templates/buglisting-default.pt'
--- lib/lp/bugs/templates/buglisting-default.pt	2012-06-15 16:23:50 +0000
+++ lib/lp/bugs/templates/buglisting-default.pt	2012-07-06 06:08:22 +0000
@@ -128,7 +128,7 @@
     <div id="bug-portlets" tal:condition="view/should_show_bug_information">
       <div id="involvement" class="portlet">
         <ul class="involvement">
-          <li style="border: 0">
+          <li class="first">
             <a href="+filebug" class="menu-link-filebug sprite bugs">
               Report a bug
             </a>

=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt'
--- lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt	2012-05-18 05:31:54 +0000
+++ lib/lp/bugs/templates/bugtarget-portlet-bugfilters-content.pt	2012-07-06 06:08:22 +0000
@@ -6,136 +6,107 @@
     template can be rendered by a view that does not have count
     information available.
   </tal:comment>
-<table class="bug-links">
-<tbody>
-  <tr tal:define="count view/new_bugs_count|nothing;
+<ul class="data-list">
+  <li tal:define="count view/new_bugs_count|nothing;
                   plural string: New bugs;
                   singular string: New bug;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href string:${view/new_bugs_url}">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
-    </td>
-  </tr>
-  <tr tal:define="count view/open_bugs_count|nothing;
+  </li>
+  <li tal:define="count view/open_bugs_count|nothing;
                   plural string: Open bugs;
                   singular string: Open bug;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href string:${view/open_bugs_url}">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
-    </td>
-  </tr>
-  <tr tal:define="count view/inprogress_bugs_count|nothing;
+  </li>
+  <li tal:define="count view/inprogress_bugs_count|nothing;
                   plural string: In-progress bugs;
                   singular string: In-progress bug;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href view/inprogress_bugs_url">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
-    </td>
-  </tr>
-  <tr tal:define="count view/critical_bugs_count|nothing;
+  </li>
+  <li tal:define="count view/critical_bugs_count|nothing;
                   plural string: Critical bugs;
                   singular string: Critical bug;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href string:${view/critical_bugs_url}">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
-    </td>
-  </tr>
-  <tr tal:define="count view/high_bugs_count|nothing;
+  </li>
+  <li tal:define="count view/high_bugs_count|nothing;
                   plural string: High importance bugs;
                   singular string: High importance bug;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href view/high_bugs_url">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
-    </td>
-  </tr>
-  <tr tal:condition="view/expirable_bugs_url"
+  </li>
+  <li tal:condition="view/expirable_bugs_url"
       tal:define="count view/expirable_bugs_count|nothing;
                   plural string: Incomplete bugs;
                   singular string: Incomplete bug;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href string:${view/expirable_bugs_url}">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
       (can expire)
-    </td>
-  </tr>
-  <tal:comment condition="nothing">
-    This empty table row is used to create space between filter groups.
-  </tal:comment>
-  <tr><td colspan="2"><br /></td></tr>
-  <tr tal:condition="view/user"
+  </li>
+  <li class="breaker"></li>
+  <li tal:condition="view/user"
       tal:define="count view/my_bugs_count|nothing;
                   plural string: Bugs assigned to me;
                   singular string: Bug assigned to me;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href string:${view/my_bugs_url}">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
-    </td>
-  </tr>
-  <tr tal:condition="view/user"
+  </li>
+  <li tal:condition="view/user"
       tal:define="count view/my_reported_bugs_count|nothing;
                   plural string: Bugs reported by me;
                   singular string: Bug reported by me;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href string:${view/my_reported_bugs_url}">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
-    </td>
-  </tr>
-  <tr tal:condition="view/user">
+  </li>
+  <li tal:condition="view/user">
     <tal:comment condition="nothing">
       No count here, because generating it is expensive.
     </tal:comment>
-    <td class="bugs-count" />
-    <td class="bugs-link">
+    <span class="count"></span>
       <a tal:attributes="href string:${view/my_affecting_bugs_url}">
       Bugs affecting me
       </a>
-    </td>
-  </tr>
-
-  <tr><td colspan="2"><br /></td></tr>
-
-  <tr>
+  </li>
+  <li class="breaker"></li>
+  <li>
     <tal:comment condition="nothing">
       No count here, because generating it is expensive.
     </tal:comment>
-    <td class="bugs-count" />
-    <td class="bugs-link">
+    <span class="count"></span>
       <a tal:attributes="href string:${view/bugs_fixed_elsewhere_url}">
       Bugs fixed elsewhere
       </a>
-    </td>
-  </tr>
-  <tr tal:define="count view/bugs_with_patches_count|nothing;
+  </li>
+  <li tal:define="count view/bugs_with_patches_count|nothing;
                   plural string: Bugs with patches;
                   singular string: Bug with a patch;">
-    <td class="bugs-count" tal:content="count"/>
-    <td class="bugs-link">
+    <span class="count" tal:content="count"/>
       <a tal:attributes="href string:${context/fmt:url}/+patches">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
-    </td>
-  </tr>
-  <tr tal:define="count view/open_cve_bugs_count|nothing;
+  </li>
+  <li tal:define="count view/open_cve_bugs_count|nothing;
                   plural string: Open CVE bugs;
                   singular string: Open CVE bug;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href string:${view/open_cve_bugs_url}">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
@@ -146,19 +117,15 @@
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
       </span>
-    </td>
-  </tr>
-  <tr tal:condition="view/pending_bugwatches_url"
+  </li>
+  <li tal:condition="view/pending_bugwatches_url"
       tal:define="count view/pending_bugwatches_count|nothing;
                   plural string: Bugs need forwarding upstream;
                   singular string: Bug needs forwarding upstream;">
-    <td class="bugs-count" tal:content="count" />
-    <td class="bugs-link">
+    <span class="count" tal:content="count" />
       <a tal:attributes="href string:${view/pending_bugwatches_url}">
       <metal:message use-macro="context/@@+base-layout-macros/plural-message"/>
       </a>
-    </td>
-  </tr>
-</tbody>
-</table>
+  </li>
+</ul>
 </tal:portlet-bug-filters-content>

=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-bugtags.pt'
--- lib/lp/bugs/templates/bugtarget-portlet-bugtags.pt	2012-02-10 10:07:48 +0000
+++ lib/lp/bugs/templates/bugtarget-portlet-bugtags.pt	2012-07-06 06:08:22 +0000
@@ -17,12 +17,10 @@
   </script>
   <a href="" id="show-more-tags-link" class="js-action hidden">Show more tags&hellip;</a>
   <a href="" id="show-fewer-tags-link" class="js-action hidden">Show fewer tags&hellip;</a>
-  <ul class="edit-official-tags">
-    <li tal:condition="view/show_manage_tags_link">
-      <a class="sprite edit"
-         tal:attributes="href context/fmt:url/+manage-official-tags">
-        Edit official tags
-      </a>
-    </li>
-  </ul>
+  <div class="breaker"></div>
+  <a class="sprite edit"
+     tal:condition="view/show_manage_tags_link"
+     tal:attributes="href context/fmt:url/+manage-official-tags">
+    Edit official tags
+  </a>
 </div>

=== modified file 'lib/lp/bugs/templates/bugtarget-portlet-tags-content.pt'
--- lib/lp/bugs/templates/bugtarget-portlet-tags-content.pt	2011-11-17 03:09:28 +0000
+++ lib/lp/bugs/templates/bugtarget-portlet-tags-content.pt	2012-07-06 06:08:22 +0000
@@ -1,17 +1,16 @@
-<div xmlns:tal="http://xml.zope.org/namespaces/tal";
+<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal";
      xmlns:metal="http://xml.zope.org/namespaces/metal";
-     xmlns:i18n="http://xml.zope.org/namespaces/i18n";
-     class="portletBody">
-  <div class="section" tal:define="tags_cloud_data view/tags_cloud_data">
+     xmlns:i18n="http://xml.zope.org/namespaces/i18n";>
+  <tal:block define="tags_cloud_data view/tags_cloud_data">
     <h2>Tags</h2>
-    <ul class="tag-list">
+    <ul class="data-list">
       <li tal:repeat="tag_info tags_cloud_data">
         <span tal:content="tag_info/count"
-              class="tag-count" />
+              class="count" />
         <a tal:content="tag_info/tag"
          tal:attributes="href tag_info/url" />
       </li>
     </ul>
-  </div>
-</div>
+  </tal:block>
+</tal:block>
 

=== modified file 'lib/lp/bugs/templates/bugtask-portlet-milestonebugs.pt'
--- lib/lp/bugs/templates/bugtask-portlet-milestonebugs.pt	2009-09-16 17:05:13 +0000
+++ lib/lp/bugs/templates/bugtask-portlet-milestonebugs.pt	2012-07-06 06:08:22 +0000
@@ -8,17 +8,14 @@
 
   <h2>Milestone-targeted bugs</h2>
 
-  <div class="portletBody">
-    <table width="100%">
-      <tr tal:repeat="milestone_openbugs milestone_buglistings">
-        <td>
-          <a href=""
-             tal:content="milestone_openbugs/title"
-             tal:attributes="href milestone_openbugs/url">sid</a>
-        </td>
-        <td><span tal:replace="milestone_openbugs/count">2</span></td>
-      </tr>
-    </table>
-  </div>
+  <ul class="data-list">
+    <li tal:repeat="milestone_openbugs milestone_buglistings">
+      <span tal:content="milestone_openbugs/count"
+            class="count">2</span>
+      <a href=""
+         tal:content="milestone_openbugs/title"
+         tal:attributes="href milestone_openbugs/url">sid</a>
+    </li>
+  </ul>
 
 </div>

=== modified file 'lib/lp/bugs/templates/bugtask-portlet-seriesbugs.pt'
--- lib/lp/bugs/templates/bugtask-portlet-seriesbugs.pt	2009-08-17 16:02:53 +0000
+++ lib/lp/bugs/templates/bugtask-portlet-seriesbugs.pt	2012-07-06 06:08:22 +0000
@@ -8,17 +8,14 @@
 
   <h2>Series-targeted bugs</h2>
 
-  <div class="portletBody">
-    <table width="100%">
-      <tr tal:repeat="series_openbugs series_buglistings">
-        <td>
-          <a href=""
-             tal:content="series_openbugs/title"
-             tal:attributes="href series_openbugs/url">sid</a>
-        </td>
-        <td><span tal:replace="series_openbugs/count">2</span></td>
-      </tr>
-    </table>
-  </div>
+  <ul class="data-list">
+    <li tal:repeat="series_openbugs series_buglistings">
+      <span tal:content="series_openbugs/count"
+            class="count">2</span>
+      <a href=""
+         tal:content="series_openbugs/title"
+         tal:attributes="href series_openbugs/url">sid</a>
+    </li>
+  </ul>
 
 </div>

=== modified file 'lib/lp/bugs/templates/cve-portlet-bugs2.pt'
--- lib/lp/bugs/templates/cve-portlet-bugs2.pt	2010-05-21 13:46:35 +0000
+++ lib/lp/bugs/templates/cve-portlet-bugs2.pt	2012-07-06 06:08:22 +0000
@@ -6,8 +6,6 @@
 
     <h2>Related bugs</h2>
 
-    <div class="portletBody portletContent">
-
       <ul tal:condition="links">
         <li class="sprite bug" tal:repeat="link links">
           <a tal:attributes="href link/bug/fmt:url">#<span
@@ -17,7 +15,6 @@
       </ul>
 
       <p tal:condition="not: links"><i>No related bugs.</i></p>
-    </div>
 
     <ul>
       <li>

=== modified file 'lib/lp/bugs/templates/cve-portlet-details.pt'
--- lib/lp/bugs/templates/cve-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/cve-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -5,8 +5,6 @@
   class="portlet" id="portlet-details">
 
   <h2><span tal:replace="context/displayname">CVE-2005-3242</span> details</h2>
-
-  <div class="portletBody portletContent">
 	
     <b>CVE</b>-<span tal:replace="context/sequence">1999-3425</span><br />
     <b>Status:</b>
@@ -16,7 +14,6 @@
     <a tal:attributes="href context/url">CVE page on Mitre.org</a> for
     more details.
     <br />
-  </div>
 
 </div>
 

=== modified file 'lib/lp/bugs/templates/cve-portlet-references.pt'
--- lib/lp/bugs/templates/cve-portlet-references.pt	2009-09-07 13:38:16 +0000
+++ lib/lp/bugs/templates/cve-portlet-references.pt	2012-07-06 06:08:22 +0000
@@ -6,8 +6,6 @@
 
   <h2>References</h2>
 
-  <div class="portletBody portletContent">
-
     <ul style="margin-left: 20px">
       <li class="webref" tal:repeat="ref context/references">
         <span tal:replace="ref/source">SOURCE</span>:
@@ -19,6 +17,4 @@
       </li>
     </ul>
 
-  </div>
-
 </div>

=== modified file 'lib/lp/bugs/templates/malone-portlet-bugmail-filtering-faq.pt'
--- lib/lp/bugs/templates/malone-portlet-bugmail-filtering-faq.pt	2010-06-10 06:25:43 +0000
+++ lib/lp/bugs/templates/malone-portlet-bugmail-filtering-faq.pt	2012-07-06 06:08:22 +0000
@@ -4,11 +4,9 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n";
   class="portlet" id="portlet-help">
   <h2>Managing Launchpad Bugs e-mail</h2>
-  <div class="portletBody portletContent">
     <p>Every e-mail message sent by the Launchpad Bug Tracker includes one or
       more <a href="https://help.launchpad.net/Bugs/Subscriptions";
     ><code>X-Launchpad-Bug:</code></a> headers. You can use tools such as
     <a href="http://www.procmail.org";>procmail</a> to create custom filters
     based on this header.</p>
-  </div>
 </div>

=== modified file 'lib/lp/bugs/templates/person-team-bugs-macro.pt'
--- lib/lp/bugs/templates/person-team-bugs-macro.pt	2011-09-02 01:19:40 +0000
+++ lib/lp/bugs/templates/person-team-bugs-macro.pt	2012-07-06 06:08:22 +0000
@@ -10,8 +10,6 @@
 
     <h2><span tal:replace="context/title" />'s teams</h2>
 
-    <div class="portletBody">
-
       <table>
         <tal:teams repeat="team context/teams_participated_in">
           <tr tal:condition="team/@@+restricted-membership/userCanViewMembership">
@@ -24,7 +22,6 @@
           </tr>
         </tal:teams>
       </table>
-    </div>
   </div>
 </metal:block>
 </tal:root>

=== modified file 'lib/lp/bugs/templates/structural-subscription-target-portlet-subscribers.pt'
--- lib/lp/bugs/templates/structural-subscription-target-portlet-subscribers.pt	2011-01-21 08:12:29 +0000
+++ lib/lp/bugs/templates/structural-subscription-target-portlet-subscribers.pt	2012-07-06 06:08:22 +0000
@@ -6,8 +6,7 @@
 
   <h2>Subscribers</h2>
 
-  <div class="portletBody portletContent"
-       tal:define="subscriptions context/bug_subscriptions;
+  <div tal:define="subscriptions context/bug_subscriptions;
                    parent_target context/parent_subscription_target;
                    target_type context/target_type_display">
     <b tal:content="view/target_label">To all Foobar bugs</b>:

=== modified file 'lib/lp/bugs/tests/bug.py'
--- lib/lp/bugs/tests/bug.py	2012-04-16 23:02:44 +0000
+++ lib/lp/bugs/tests/bug.py	2012-07-06 06:08:22 +0000
@@ -295,9 +295,8 @@
     """
     browser.open(
         'http://bugs.launchpad.dev/%s/+portlet-bugfilters' % target)
-    table = BeautifulSoup(browser.contents).find('table', 'bug-links')
-    [tbody_info] = table('tbody')
-    print_table(tbody_info)
+    ul = BeautifulSoup(browser.contents).find('ul', 'data-list')
+    print_ul(ul)
 
 
 def print_bugfilters_portlet_filled(browser, target):
@@ -316,8 +315,17 @@
     browser.open(
         'http://bugs.launchpad.dev'
         '/%s/+bugtarget-portlet-bugfilters-stats' % target)
-    table = BeautifulSoup('<table>%s</table>' % browser.contents)
-    print_table(table)
+    ul = BeautifulSoup(browser.contents).find('ul', 'data-list')
+    print_ul(ul)
+
+
+def print_ul(ul):
+    """Print the data from a list."""
+    li_content = []
+    for li in ul.findAll('li'):
+        li_content.append(extract_text(li))
+    if len(li_content) > 0:
+        print '\n'.join(li_content)
 
 
 def print_bug_tag_anchors(anchors):

=== modified file 'lib/lp/code/templates/branch-portlet-subscribers.pt'
--- lib/lp/code/templates/branch-portlet-subscribers.pt	2011-07-01 14:14:55 +0000
+++ lib/lp/code/templates/branch-portlet-subscribers.pt	2012-07-06 06:08:22 +0000
@@ -3,8 +3,7 @@
   xmlns:metal="http://xml.zope.org/namespaces/metal";
   xmlns:i18n="http://xml.zope.org/namespaces/i18n";
   class="portlet" id="portlet-subscribers">
-  <div class="portletBody portletContent"
-       tal:define="context_menu view/context/menu:context">
+  <div tal:define="context_menu view/context/menu:context">
 
     <div>
       <div class="section">

=== modified file 'lib/lp/code/templates/branchmergeproposal-pagelet-subscribers.pt'
--- lib/lp/code/templates/branchmergeproposal-pagelet-subscribers.pt	2009-09-17 19:52:18 +0000
+++ lib/lp/code/templates/branchmergeproposal-pagelet-subscribers.pt	2012-07-06 06:08:22 +0000
@@ -5,7 +5,6 @@
   class="portlet" id="portlet-subscribers">
 
   <h2 class="unnecessary">Subscribers</h2>
-  <div class="portletBody portletContent">
 
     <p>
       <tal:people tal:condition="view/has_subscribers">
@@ -30,7 +29,6 @@
         <li tal:content="structure subscriber/fmt:link"/>
       </ul>
     </div>
-  </div>
 </div>
 
 

=== modified file 'lib/lp/registry/templates/distributionmirror-portlet-details.pt'
--- lib/lp/registry/templates/distributionmirror-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/distributionmirror-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -6,8 +6,6 @@
 
   <h2><span tal:replace="context/title">Name</span> mirror details</h2>
 
-  <div class="portletBody portletContent">
-
     <b>Registrant:</b>
     <a tal:replace="structure context/owner/fmt:link" /><br />
 
@@ -27,6 +25,5 @@
     </b>
     <br />
 
-  </div>
 </div>
 

=== modified file 'lib/lp/registry/templates/poll-portlet-details.pt'
--- lib/lp/registry/templates/poll-portlet-details.pt	2011-01-05 19:18:57 +0000
+++ lib/lp/registry/templates/poll-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -6,8 +6,6 @@
 
 <div class="portlet" id="portlet-details">
   <h2><span tal:replace="context/name" /></h2>
-  
-  <div class="portletBody portletContent">
 	
     <b>Title:</b>
     <span tal:replace="context/title" /><br />
@@ -32,7 +30,5 @@
     <b>Secrecy:</b>
     <span tal:replace="context/secrecy/title" /><br />
 
-  </div>
-
 </div>
 </tal:root>

=== modified file 'lib/lp/registry/templates/sourcepackage-portlet-associations.pt'
--- lib/lp/registry/templates/sourcepackage-portlet-associations.pt	2010-05-13 18:55:10 +0000
+++ lib/lp/registry/templates/sourcepackage-portlet-associations.pt	2012-07-06 06:08:22 +0000
@@ -7,8 +7,7 @@
   <div id="portlet-associations">
     <h2>Upstream connections</h2>
 
-    <div class="portletBody portletContent"
-         tal:define="series context/productseries">
+    <div tal:define="series context/productseries">
       <tal:has_series condition="series">
         <div tal:content="structure context/@@+upstream-connections"/>
 

=== modified file 'lib/lp/registry/templates/sourcepackage-portlet-releases.pt'
--- lib/lp/registry/templates/sourcepackage-portlet-releases.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/registry/templates/sourcepackage-portlet-releases.pt	2012-07-06 06:08:22 +0000
@@ -7,7 +7,6 @@
 <div class="portlet" id="portlet-releases">
   <h2>Releases in <span
   tal:replace="context/distribution/displayname" /></h2>
-  <div class="portletBody portletContent">
   <ul>
     <li tal:repeat="release context/releases">
       <a tal:content="release/version"
@@ -17,6 +16,5 @@
   <p tal:condition="not: context/releases">
     <i>No releases are currently registered for this package.</i>
   </p>
-  </div>
 </div>
 </tal:root>

=== modified file 'lib/lp/registry/templates/team-portlet-mailinglist.pt'
--- lib/lp/registry/templates/team-portlet-mailinglist.pt	2010-12-15 18:42:36 +0000
+++ lib/lp/registry/templates/team-portlet-mailinglist.pt	2012-07-06 06:08:22 +0000
@@ -7,7 +7,6 @@
 <div id="mailing-lists" class="portlet">
   <h2>Mailing list</h2>
 
-  <div class="portletBody portletContent">
     <div
       tal:define="archive_url view/archive_url"
       tal:condition="archive_url">
@@ -56,6 +55,5 @@
           replace="structure context/menu:overview/moderate_mailing_list/fmt:link-icon" />
       </li>
     </ul>
-  </div>
 </div>
 </tal:root>

=== modified file 'lib/lp/registry/templates/team-portlet-membership.pt'
--- lib/lp/registry/templates/team-portlet-membership.pt	2012-02-01 15:31:32 +0000
+++ lib/lp/registry/templates/team-portlet-membership.pt	2012-07-06 06:08:22 +0000
@@ -13,7 +13,7 @@
     </span>
   </h2>
 
-  <div id="membership-summary" class="portletBody portletContent"
+  <div id="membership-summary"
     style="margin-bottom: 1.5em;">
     <div>
       <div id="membership-counts"

=== modified file 'lib/lp/soyuz/templates/binarypackagerelease-portlet-details.pt'
--- lib/lp/soyuz/templates/binarypackagerelease-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/binarypackagerelease-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -5,8 +5,6 @@
   class="portlet" id="portlet-details">
   <h2><span tal:replace="context/name" /> details</h2>
 
-  <div class="portletBody portletContent">
-
     <b>Package version:</b>
     <span tal:replace="context/version" /><br />
 
@@ -24,5 +22,4 @@
     <b>Priority:</b>
     <span tal:replace="context/priority/title" /><br />
 
-  </div>
 </div>

=== modified file 'lib/lp/soyuz/templates/builder-portlet-details.pt'
--- lib/lp/soyuz/templates/builder-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/builder-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -4,7 +4,6 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n";
   class="portlet" id="portlet-details">
    <h2><span tal:replace="context/title">BUILDER</span> details</h2>
-   <div class="portletBody portletContent">
 
      <b>Name</b>: <span tal:replace="context/title"/><br/>
 
@@ -22,5 +21,4 @@
 
      <b>Owner</b>
      <a tal:replace="structure context/owner/fmt:link">OWNER</a>
-   </div>
 </div>

=== modified file 'lib/lp/soyuz/templates/distributionsourcepackage-portlet-pub-details.pt'
--- lib/lp/soyuz/templates/distributionsourcepackage-portlet-pub-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distributionsourcepackage-portlet-pub-details.pt	2012-07-06 06:08:22 +0000
@@ -12,8 +12,7 @@
     </tal:distribution>
   </h2>
 
-  <div class="portletBody portletContent"
-       tal:define="cr context/currentrelease">
+  <div tal:define="cr context/currentrelease">
 
     <div tal:condition="context/current_publishing_records">
       <tal:block repeat="item view/all_published_in_active_distroseries">

=== modified file 'lib/lp/soyuz/templates/distroarchseries-portlet-details.pt'
--- lib/lp/soyuz/templates/distroarchseries-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroarchseries-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -7,9 +7,6 @@
     <h2>Details for <span tal:replace="context/displayname">warty
     i386</span></h2>
 
-    <div class="portletBody">
-        <div class="portletContent">
-
             <b>Architecture tag:</b>
             <a tal:attributes="href context/fmt:url"
                tal:content="context/architecturetag" >
@@ -25,6 +22,4 @@
             <b><span tal:content="context/package_count">4234</span> binary
             packages</b><br />
 
-        </div>
-    </div>
 </div>

=== modified file 'lib/lp/soyuz/templates/distroarchseriesbinarypackage-portlet-details.pt'
--- lib/lp/soyuz/templates/distroarchseriesbinarypackage-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroarchseriesbinarypackage-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -10,8 +10,7 @@
   <span tal:replace="context/distribution/name">ubuntu</span>
   <span tal:replace="context/distroseries/name">hoary</span></h2>
 
-  <div class="portletBody portletContent"
-       tal:define="cr context/currentrelease">
+  <div tal:define="cr context/currentrelease">
 
     <tal:has_currentrelease condition="cr">
       <b>Current release:</b>

=== modified file 'lib/lp/soyuz/templates/distroarchseriesbinarypackage-portlet-releases.pt'
--- lib/lp/soyuz/templates/distroarchseriesbinarypackage-portlet-releases.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroarchseriesbinarypackage-portlet-releases.pt	2012-07-06 06:08:22 +0000
@@ -4,7 +4,6 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n";
   class="portlet" id="portlet-releases">
   <h2>Package releases</h2>
-  <div class="portletBody portletContent">
     <ul>
       <li tal:repeat="release context/releases">
         <a tal:attributes="href release/fmt:url"
@@ -16,5 +15,4 @@
       tal:replace="context/displayname">displayname</span> 
       have yet been published.</i>
     </p>
-  </div>
 </div>

=== modified file 'lib/lp/soyuz/templates/distroseriesbinarypackage-portlet-details.pt'
--- lib/lp/soyuz/templates/distroseriesbinarypackage-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroseriesbinarypackage-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -8,8 +8,4 @@
       <span tal:replace="context/distribution/name">ubuntu</span>
       <span tal:replace="context/distroseries/name">hoary</span></h2>
 
-  <div class="portletBody portletContent">
-
-  </div>
-
 </div>

=== modified file 'lib/lp/soyuz/templates/distroseriesbinarypackage-portlet-published.pt'
--- lib/lp/soyuz/templates/distroseriesbinarypackage-portlet-published.pt	2009-09-04 09:32:51 +0000
+++ lib/lp/soyuz/templates/distroseriesbinarypackage-portlet-published.pt	2012-07-06 06:08:22 +0000
@@ -6,8 +6,6 @@
 
   <h2>Published versions</h2>
 
-  <div class="portletBody portletContent">
-
     <ul tal:condition="context/current_publishings">
       <li class="binary package" tal:repeat="pub context/current_publishings">
         <a tal:attributes="href
@@ -29,5 +27,4 @@
     <p tal:condition="not: context/current_publishings">
       <i>Not published at present.</i>
     </p>
-  </div>
 </div>

=== modified file 'lib/lp/soyuz/templates/distroseriessourcepackagerelease-portlet-details.pt'
--- lib/lp/soyuz/templates/distroseriessourcepackagerelease-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/distroseriessourcepackagerelease-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -8,8 +8,6 @@
   <span tal:replace="context/version">2.0.39</span>" (source)
   in <span tal:replace="context/distribution/name">ubuntu</span></h2>
 
-  <div class="portletBody portletContent">
-
     <b>Series:</b>
     <a tal:attributes="href context/distroseries/fmt:url">
       <span tal:replace="context/distribution/name">ubuntu</span>
@@ -19,6 +17,4 @@
     <span tal:replace="context/pocket/title">Release</span><br />
     <div tal:replace="structure context/sourcepackagerelease/@@+portlet-details-content" />
 
-  </div>
-
 </div>

=== modified file 'lib/lp/soyuz/templates/sourcepackagerelease-portlet-builds.pt'
--- lib/lp/soyuz/templates/sourcepackagerelease-portlet-builds.pt	2010-05-14 08:45:43 +0000
+++ lib/lp/soyuz/templates/sourcepackagerelease-portlet-builds.pt	2012-07-06 06:08:22 +0000
@@ -8,8 +8,6 @@
 
   <h2>Builds</h2>
 
-  <div class="portletBody portletContent">
-
     <ul>
       <li tal:repeat="build context/builds">
         <a tal:attributes="href build/fmt:url">
@@ -25,7 +23,5 @@
       </li>
     </ul>
 
-  </div>
-
 </div>
 </tal:root>

=== modified file 'lib/lp/soyuz/templates/sourcepackagerelease-portlet-details.pt'
--- lib/lp/soyuz/templates/sourcepackagerelease-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/soyuz/templates/sourcepackagerelease-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -9,11 +9,7 @@
   <h2><span tal:replace="context/title">source package "foobar"
   2.3.1-2</span></h2>
 
-  <div class="portletBody portletContent">
-
-    <div tal:replace="structure context/@@+portlet-details-content" />
-
-  </div>
+  <div tal:replace="structure context/@@+portlet-details-content" />
 
 </div>
 </tal:root>

=== modified file 'lib/lp/soyuz/templates/sourcepackagerelease-portlet-distroseries.pt'
--- lib/lp/soyuz/templates/sourcepackagerelease-portlet-distroseries.pt	2009-09-07 11:40:40 +0000
+++ lib/lp/soyuz/templates/sourcepackagerelease-portlet-distroseries.pt	2012-07-06 06:08:22 +0000
@@ -8,8 +8,6 @@
 
   <h2>Published in</h2>
 
-  <div class="portletBody portletContent">
-
     <ul tal:condition="context/current_publishings">
       <li class="package-source"
           tal:repeat="drspr context/current_publishings">
@@ -22,6 +20,5 @@
     <p tal:condition="not: context/current_publishings">
       <i>Not published anywhere yet.</i>
     </p>
-  </div>
 </div>
 </tal:root>

=== modified file 'lib/lp/testing/doc/pagetest-helpers.txt'
--- lib/lp/testing/doc/pagetest-helpers.txt	2011-12-22 06:17:50 +0000
+++ lib/lp/testing/doc/pagetest-helpers.txt	2012-07-06 06:08:22 +0000
@@ -253,29 +253,21 @@
     ...   <body>
     ...     <div class="portlet">
     ...       <h2>Portlet 1</h2>
-    ...       <div class="portletBody portletContent">
-    ...         Contents of portlet 1
-    ...       </div>
+    ...       Contents of portlet 1
     ...     </div>
     ...     <div class="portlet">
     ...       <h2>Portlet 2</h2>
-    ...       <div class="portletBody portletContent">
-    ...         Contents of portlet 2
-    ...       </div>
+    ...       Contents of portlet 2
     ...     </div>
     ...     <div class="portlet">
     ...       <h2>Portlet 3</h2>
-    ...       <div class="portletBody portletContent">
-    ...         Contents of portlet 3
-    ...       </div>
+    ...       Contents of portlet 3
     ...     </div>
     ...     <div class="portlet">
     ...       <h2> Portlet
     ...           with title broken
     ...           on multiple lines </h2>
-    ...       <div class="portletBody portletContent">
-    ...         Contents of the portlet.
-    ...       </div>
+    ...       Contents of the portlet.
     ...     </div>
     ...     <div id="maincontent">
     ...       Main content area
@@ -291,9 +283,7 @@
     >>> print find_portlet(content, 'Portlet 2')
     <div class="portlet">
       <h2>Portlet 2</h2>
-      <div class="portletBody portletContent">
-        Contents of portlet 2
-      </div>
+      Contents of portlet 2
     </div>
 
 When looking for a portlet to match, any two sequences of whitespace are

=== modified file 'lib/lp/translations/templates/language-portlet-details.pt'
--- lib/lp/translations/templates/language-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/language-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -6,7 +6,6 @@
   <h2 tal:content="context/englishname">
     Spanish
   </h2>
-  <div class="portletBody portletContent">
     <b>English name:</b>
     <tal:englishname replace="context/englishname">Spanish</tal:englishname>
     <br />
@@ -24,5 +23,4 @@
     <tal:direction replace="context/direction/title">
       Left to Right
     </tal:direction>
-  </div>
 </div>

=== modified file 'lib/lp/translations/templates/language-portlet-top-contributors.pt'
--- lib/lp/translations/templates/language-portlet-top-contributors.pt	2010-04-17 17:31:00 +0000
+++ lib/lp/translations/templates/language-portlet-top-contributors.pt	2012-07-06 06:08:22 +0000
@@ -5,7 +5,6 @@
   class="portlet" id="portlet-top-contributors"
   tal:condition="view/top_contributors">
   <h2>Top contributors</h2>
-  <div class="portletBody portletContent">
     <p>
       These are the top translation contributors who have stated they have
       a particular interest in
@@ -18,5 +17,4 @@
         <a tal:replace="structure contributor/fmt:link">Guilherme Salgado</a>
       </li>
     </ul>
-  </div>
 </div>

=== modified file 'lib/lp/translations/templates/pofile-portlet-details.pt'
--- lib/lp/translations/templates/pofile-portlet-details.pt	2010-04-19 08:11:52 +0000
+++ lib/lp/translations/templates/pofile-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -8,9 +8,6 @@
 
   <h2>Translation file details</h2>
 
-  <div class="portletBody">
-  <div class="portletContent">
-
     <ul>
       <li>
         <span tal:content="context/language/englishname" class="sprite language">Language</span>
@@ -93,9 +90,5 @@
       <span tal:replace="context/potemplate/description" /><br />
     </tal:block>
 
-  </div>
-
-  </div>
-
 </div>
 </tal:root>

=== modified file 'lib/lp/translations/templates/pofile-portlet-stats.pt'
--- lib/lp/translations/templates/pofile-portlet-stats.pt	2010-12-02 11:01:43 +0000
+++ lib/lp/translations/templates/pofile-portlet-stats.pt	2012-07-06 06:08:22 +0000
@@ -8,10 +8,6 @@
 
     <h2>Statistics</h2>
 
-    <div class="portletBody">
-
-        <div class="portletContent">
-
             <b>Messages:</b>
             <span tal:replace="context/messageCount">N</span>
             <br/>
@@ -47,9 +43,5 @@
                   tal:content="structure context/@@+barchart">--</span>
             <br />
 
-        </div>
-
-    </div>
-
 </div>
 </tal:root>

=== modified file 'lib/lp/translations/templates/potemplate-portlet-details.pt'
--- lib/lp/translations/templates/potemplate-portlet-details.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/potemplate-portlet-details.pt	2012-07-06 06:08:22 +0000
@@ -7,9 +7,6 @@
 <div class="portlet" id="portlet-details">
 
     <h2>Template details</h2>
-
-    <div class="portletBody">
-        <div class="portletContent">
             <span tal:replace="view/num_messages" /><br />
             <img alt="" src="/@@/language" />
             <span tal:replace="context/language_count">421</span>
@@ -46,7 +43,5 @@
               POTemplate Description
             </span>
             <i tal:condition="not: context/description">None given</i><br/>
-        </div>
-    </div>
 </div>
 </tal:root>

=== modified file 'lib/lp/translations/templates/potemplate-portlet-langstats.pt'
--- lib/lp/translations/templates/potemplate-portlet-langstats.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/potemplate-portlet-langstats.pt	2012-07-06 06:08:22 +0000
@@ -9,8 +9,6 @@
   <h2>Statistics for template
       "<span tal:replace="context/name">templatename</span>"</h2>
 
-  <div class="portletBody portletContent">
-
     <tal:block repeat="pofile view/requestPoFiles">
       <span tal:replace="pofile/language/englishname">Latin</span>:<br />
       <a tal:attributes="href pofile/fmt:url"
@@ -27,7 +25,5 @@
       </li>
     </ul>
 
-  </div>
-
 </div>
 </tal:root>

=== modified file 'lib/lp/translations/templates/product-portlet-obsolete-translatables.pt'
--- lib/lp/translations/templates/product-portlet-obsolete-translatables.pt	2009-11-01 20:18:32 +0000
+++ lib/lp/translations/templates/product-portlet-obsolete-translatables.pt	2012-07-06 06:08:22 +0000
@@ -8,7 +8,6 @@
      tal:condition="context/obsolete_translatable_series">
   <h3>All product series with obsolete templates</h3>
 
-  <div class="portletBody portletContent">
     <ul>
       <li class="translations"
         tal:repeat="series context/obsolete_translatable_series">
@@ -16,6 +15,5 @@
            tal:attributes="href series/fmt:url">series title</a>
       </li>
     </ul>
-  </div>
 </div>
 </tal:root>

=== modified file 'lib/lp/translations/templates/product-portlet-translatables.pt'
--- lib/lp/translations/templates/product-portlet-translatables.pt	2010-12-21 15:13:17 +0000
+++ lib/lp/translations/templates/product-portlet-translatables.pt	2012-07-06 06:08:22 +0000
@@ -8,7 +8,6 @@
      tal:condition="context/translatable_series">
   <h3>All translatable series</h3>
 
-  <div class="portletBody portletContent">
     <ul>
       <li class="translations"
           tal:repeat="series context/translatable_series">
@@ -17,7 +16,6 @@
           series title</a>
       </li>
     </ul>
-  </div>
 </div>
 
 <div tal:condition="context/required:launchpad.Edit">
@@ -25,7 +23,6 @@
        tal:condition="view/untranslatable_series">
     <h3>Set up translations for a series</h3>
 
-    <div class="portletBody portletContent">
       <ul>
         <li class="translations"
             tal:repeat="series view/untranslatable_series">
@@ -40,7 +37,6 @@
             automatic import</a>.
         </li>
       </ul>
-    </div>
   </div>
 </div>
 
@@ -49,8 +45,6 @@
 
   <h3>All translatable distribution packages</h3>
 
-  <div class="portletBody portletContent ">
-
     <ul>
       <li class="translations"
           tal:repeat="pkg context/translatable_packages">
@@ -60,8 +54,6 @@
       </li>
     </ul>
 
-  </div>
-
 </div>
 
 <div class="portlet"

=== modified file 'lib/lp/translations/templates/rosetta-portlet-groups.pt'
--- lib/lp/translations/templates/rosetta-portlet-groups.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/translations/templates/rosetta-portlet-groups.pt	2012-07-06 06:08:22 +0000
@@ -8,10 +8,6 @@
 
   <h2>Translation groups in Launchpad</h2>
 
-  <div class="portletBody">
-
-    <div class="portletContent">
-
       <ul>
         <li tal:repeat="group context/translation_groups">
           <a tal:attributes="href string:/translations/groups/${group/name}/"
@@ -19,7 +15,5 @@
         </li>
       </ul>
 
-    </div>
-  </div>
 </div>
 </tal:root>