Merge lp:~allenap/launchpad/ui-convert-bug-portlet-x-3.0-bug-427275 into lp:launchpad

[Gavin Panella]

[Gavin Panella (allenap)]

This branch converts all the bug-portlet-*.pt templates to observe 3.0
rules:

  Converted:

    bug-portlet-attachments.pt
    bug-portlet-duplicates.pt
    bug-portlet-questions.pt
    bug-portlet-specs.pt
    bug-portlet-watch.pt

  Tidied:

    bug-portlet-privacy.pt

  No change needed:

    bug-portlet-subscribers-content.pt
    bug-portlet-subscribers.pt
    bug-portlet-notified.pt

  Unused, removed:

    bug-portlet-cve.pt

./bin/test -vvct lp/bugs/.*/stories

Lint free.

[Paul Hummer (rockstar)]

Thanks for the branch!

review: Approve

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2009-09-09 09:00:58 +0000
+++ lib/lp/bugs/browser/configure.zcml	2009-09-10 16:14:04 +0000
@@ -1007,9 +1007,6 @@
                 name="+portlet-duplicates"
                 template="../templates/bug-portlet-duplicates.pt"/>
             <browser:page
-                name="+portlet-cve"
-                template="../templates/bug-portlet-cve.pt"/>
-            <browser:page
                 name="+portlet-attachments"
                 template="../templates/bug-portlet-attachments.pt"/>
             <browser:page

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-create-question.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-create-question.txt	2009-09-04 09:45:19 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-create-question.txt	2009-09-10 20:38:38 +0000
@@ -93,7 +93,7 @@
     Bug #10:
 
     >>> portlet = find_portlet(user_browser.contents, 'Related questions')
-    >>> question_anchor = portlet.div.a
+    >>> question_anchor = portlet.a
     >>> question_anchor
     <a href=".../ubuntu/+source/linux-source-2.6.15/+question/...">another
     test bug</a>

=== modified file 'lib/lp/bugs/templates/bug-portlet-attachments.pt'
--- lib/lp/bugs/templates/bug-portlet-attachments.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bug-portlet-attachments.pt	2009-09-10 16:13:39 +0000
@@ -1,37 +1,27 @@
 <div
-  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="portlet" id="portlet-attachments"
-  tal:condition="context/attachments"
-  tal:define="current_task view/current_bugtask;
-              url current_task/fmt:url"
->
-
+    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="portlet" id="portlet-attachments"
+    tal:condition="context/attachments">
   <h2>Bug attachments</h2>
-
-  <div class="portletBody">
-    <div class="portletContent">
-      <ul>
-        <li class="download"
-            tal:repeat="attachment context/attachments">
-          <a tal:attributes="href attachment/libraryfile/http_url"
-             tal:content="attachment/title"
-             class="sprite download-icon">
-            Attachment Title
-          </a>
-          <small>
-            (<a tal:attributes="href attachment/fmt:url">edit</a>)
-          </small>
-        </li>
-      </ul>
-      <ul style="text-align: right">
-        <li>
-          <a tal:attributes="href string:$url/+addcomment" class="sprite add">
-            Add
-          </a>
-        </li>
-      </ul>
-    </div>
-  </div>
+  <ul>
+    <li class="download"
+        tal:repeat="attachment context/attachments">
+      <a tal:attributes="href attachment/libraryfile/http_url"
+         tal:content="attachment/title"
+         class="sprite download-icon">
+        Attachment Title
+      </a>
+      <small>
+        (<a tal:attributes="href attachment/fmt:url">edit</a>)
+      </small>
+    </li>
+  </ul>
+  <ul>
+    <li>
+      <a tal:attributes="href view/current_bugtask/fmt:url/+addcomment"
+         class="sprite add">Add</a>
+    </li>
+  </ul>
 </div>

=== removed file 'lib/lp/bugs/templates/bug-portlet-cve.pt'
--- lib/lp/bugs/templates/bug-portlet-cve.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bug-portlet-cve.pt	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-<div
-  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="portlet" id="portlet-cve" tal:condition="context/cves"
-  tal:define="current_task view/current_bugtask;
-              url current_task/fmt:url"
->
-  <h2>
-    <abbr title="Common Vulnerabilities and Exposures index">CVE</abbr>
-    references
-  </h2>
-  <div class="portletBody">
-
-      <ul>
-        <li class="cve" tal:repeat="cve context/cves">
-          <a tal:attributes="href cve/fmt:url;
-                             title cve/description/fmt:shorten/40"
-             tal:content="cve/sequence"
-             >2002-1342</a>
-        </li>
-      </ul>
-
-  </div>
-</div>

=== modified file 'lib/lp/bugs/templates/bug-portlet-duplicates.pt'
--- lib/lp/bugs/templates/bug-portlet-duplicates.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bug-portlet-duplicates.pt	2009-09-10 16:13:39 +0000
@@ -1,22 +1,15 @@
 <div
-  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="portlet" id="portlet-duplicates"
-  tal:condition="context/duplicates"
->
-
+    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="portlet" id="portlet-duplicates"
+    tal:condition="context/duplicates">
   <h2>Duplicates of this bug</h2>
-
-  <div class="portletBody">
-    <div class="portletContent">
-        <div tal:repeat="dupe view/duplicates">
-          <a tal:attributes="href dupe/url;
-                             title dupe/title;
-                             class context/image:sprite_css">
-             Bug #<span tal:replace="dupe/id">3445</span>
-          </a>
-        </div>
-    </div>
-  </div>
+  <ul>
+    <li tal:repeat="dupe view/duplicates">
+      <a tal:content="string: Bug #${dupe/id}"
+         tal:attributes="href dupe/url; title dupe/title;
+                         class context/image:sprite_css" />
+    </li>
+  </ul>
 </div>

=== modified file 'lib/lp/bugs/templates/bug-portlet-privacy.pt'
--- lib/lp/bugs/templates/bug-portlet-privacy.pt	2009-08-10 21:07:02 +0000
+++ lib/lp/bugs/templates/bug-portlet-privacy.pt	2009-09-10 20:18:28 +0000
@@ -9,28 +9,21 @@
   tal:define="link context/menu:context/visibility"
 >
   <div tal:condition="not:context/private" id="privacy-text">
-    <a
-      tal:condition="link/enabled"
-      tal:attributes="href link/path; title link/text"
-      class="sprite edit"
-      id="privacy-link"
-    >This report is public</a>
-    <tal:unchangeable condition="not:link/enabled"
-    >This report is public</tal:unchangeable>
+    <a class="sprite edit" id="privacy-link"
+       tal:attributes="href link/path; title link/text"
+       tal:condition="link/enabled">This report is public</a>
+    <tal:unchangeable condition="not:link/enabled">
+      This report is public
+    </tal:unchangeable>
   </div>
   <div tal:condition="context/private" id="privacy-text">
-    <a
-      tal:condition="link/enabled"
+    <a class="sprite edit" id="privacy-link"
       tal:attributes="href link/path; title link/text"
-      class="sprite edit"
-      id="privacy-link"
-    >This report is <strong>private</strong></a>
-    <tal:unchangeable condition="not:link/enabled"
-    >This report is private</tal:unchangeable>
+      tal:condition="link/enabled">This report is <strong>private</strong></a>
+    <tal:unchangeable condition="not:link/enabled">
+      This report is private
+    </tal:unchangeable>
   </div>
-  <div
-    tal:condition="context/security_related"
-    class="sprite security"
-    id="security-message"
-  >Security vulnerability</div>
+  <div class="sprite security" id="security-message"
+       tal:condition="context/security_related">Security vulnerability</div>
 </div>

=== modified file 'lib/lp/bugs/templates/bug-portlet-questions.pt'
--- lib/lp/bugs/templates/bug-portlet-questions.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bug-portlet-questions.pt	2009-09-10 20:18:28 +0000
@@ -1,24 +1,16 @@
 <div
-  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="portlet" id="portlet-questions"
-  tal:condition="context/questions"
->
-
+    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="portlet" id="portlet-questions"
+    tal:condition="context/questions">
   <h2>Related questions</h2>
-
-  <div class="portletBody portletContent">
-
-    <ul>
-      <li tal:repeat="question context/questions" class="question-row">
-        <span tal:content="question/target/displayname"
-              tal:attributes="class question/image:sprite_css">Ubuntu</span>:
-        <a tal:attributes="href question/fmt:url"
-           tal:content="question/title">question title here</a>
-      </li>
-    </ul>
-
-  </div>
-
+  <ul>
+    <li tal:repeat="question context/questions" class="question-row">
+      <span tal:content="question/target/displayname"
+            tal:attributes="class question/image:sprite_css">Ubuntu</span>:
+      <a tal:attributes="href question/fmt:url"
+         tal:content="question/title">question title here</a>
+    </li>
+  </ul>
 </div>

=== modified file 'lib/lp/bugs/templates/bug-portlet-specs.pt'
--- lib/lp/bugs/templates/bug-portlet-specs.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bug-portlet-specs.pt	2009-09-10 20:18:28 +0000
@@ -1,15 +1,12 @@
 <div
-  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="portlet" id="portlet-blueprints"
-  tal:condition="context/specifications"
->
+    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="portlet" id="portlet-blueprints"
+    tal:condition="context/specifications">
   <h2>Related blueprints</h2>
-  <div class="portletBody">
-    <table>
-      <tr tal:repeat="spec context/specifications"
-          tal:replace="structure spec/@@+listing-compact" />
-    </table>
-  </div>
+  <ul>
+    <li tal:repeat="spec context/specifications"
+        tal:content="structure spec/fmt:link" />
+  </ul>
 </div>

=== modified file 'lib/lp/bugs/templates/bug-portlet-watch.pt'
--- lib/lp/bugs/templates/bug-portlet-watch.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bug-portlet-watch.pt	2009-09-10 20:18:28 +0000
@@ -1,26 +1,21 @@
 <div
-  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="portlet" id="portlet-watches"
-  tal:condition="context/watches"
-  tal:define="current_task view/current_bugtask;
-              url current_task/fmt:url">
+    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="portlet" id="portlet-watches"
+    tal:condition="context/watches">
   <h2>Remote bug watches</h2>
-  <div class="portletBody portletContent">
-    <ul style="padding-left:0;">
-      <li tal:repeat="watch context/watches">
-        <span class="sprite bug-remote" />
-        <a tal:replace="structure watch/fmt:external-link" />
-        <tal:block tal:condition="watch/remotestatus">
-          <br />[<span tal:content="watch/remotestatus" />]
-        </tal:block>&nbsp;<a 
-           tal:attributes="href watch/fmt:url"
-           class="sprite edit"
-           alt="Change watch details"
-           ><span class="invisible-link">[edit]</span></a>
-      </li>
-    </ul>
-    <p>Bug watches keep track of this bug in other bug trackers.</p>
-  </div>
+  <ul>
+    <li tal:repeat="watch context/watches">
+      <span class="sprite bug-remote" />
+      <a tal:replace="structure watch/fmt:external-link" />
+      <tal:block tal:condition="watch/remotestatus">
+        <br />[<span tal:content="watch/remotestatus" />]
+        </tal:block>&nbsp;<a
+        tal:attributes="href watch/fmt:url"
+        class="sprite edit" alt="Change watch details"
+        ><span class="invisible-link">[edit]</span></a>
+    </li>
+  </ul>
+  <p>Bug watches keep track of this bug in other bug trackers.</p>
 </div>