Merge lp:~rockstar/launchpad/change-recipe-link into lp:launchpad

[Paul Hummer]

This branch redesigns some of the branch page to accomodate a new relationship with source package recipes. The Code team has all discussed this, and we've decided that combining all these relationships in the same place is the best way to go. Now merge proposals, source package recipes, linked bugs and linked blueprints are all in the same "portlet" area. I think this will help demonstrate the point of this branch better than any other property of the branch itself. You can now easily see everything that depends on this branch.

A screenshot of this change can be found at: https://devpad.canonical.com/~rockstar/branch-relations.png

[Curtis Hovey (sinzui)]

I like the consolidate presentation.

review: Approve (ui)

[Eleanor Berger (intellectronica)]

Looks great, with one exception. Please avoid using an inline javascript event handler, and the same by creating an event handler using YUI.

review: Needs Fixing (code)

[Paul Hummer (rockstar)]

The inline javascript event handler is not new, just moved. I plan on redoing all of the branch page itself in the next pipe of this branch, and I'll make sure to cover that then.

[Eleanor Berger (intellectronica)]

review: Approve (code)

=== added file 'lib/canonical/launchpad/images/source-package-recipe.png'
Binary files lib/canonical/launchpad/images/source-package-recipe.png	1970-01-01 00:00:00 +0000 and lib/canonical/launchpad/images/source-package-recipe.png	2010-05-25 04:39:31 +0000 differ
=== modified file 'lib/canonical/launchpad/templates/launchpad-graphics.pt'
--- lib/canonical/launchpad/templates/launchpad-graphics.pt	2009-09-17 22:05:48 +0000
+++ lib/canonical/launchpad/templates/launchpad-graphics.pt	2010-05-25 04:39:31 +0000
@@ -756,6 +756,11 @@
         <td>To be used when a branch is being upgraded.</td>
       </tr>
       <tr>
+        <td>source-package-recipe</td>
+        <td><img src="/@@/source-package-recipe" /></td>
+        <td>Represents a source package recipe.</td>
+      </tr>
+      <tr>
         <td colspan="3">
           <h2>Packages</h2>
         </td>

=== modified file 'lib/lp/blueprints/stories/standalone/xx-branch-links.txt'
--- lib/lp/blueprints/stories/standalone/xx-branch-links.txt	2009-09-22 10:48:09 +0000
+++ lib/lp/blueprints/stories/standalone/xx-branch-links.txt	2010-05-25 04:39:31 +0000
@@ -44,7 +44,7 @@
     >>> browser.getControl('Blueprint').value = ['canvas']
     >>> browser.getControl('Continue').click()
     >>> printSpecBranchLinks(browser)
-    Support &lt;canvas&gt; Objects (Medium) - edit
+    Support &lt;canvas&gt; Objects edit
 
 
 == From the blueprint page ==
@@ -116,7 +116,7 @@
     >>> browser.open(
     ...     'http://code.launchpad.dev/~name12/firefox/main')
     >>> printSpecBranchLinks(browser)
-    Support &lt;canvas&gt; Objects (Medium) - edit
+    Support &lt;canvas&gt; Objects edit
 
 Clicking on the edit link shows the form.  Unfortunately the
 testbrowser cannot handle javascript.  In these situations

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2010-04-21 02:50:20 +0000
+++ lib/lp/code/browser/branch.py	2010-05-25 04:39:31 +0000
@@ -197,7 +197,7 @@
     facet = 'branches'
     title = 'Edit branch'
     links = (
-        'edit', 'reviewer', 'edit_whiteboard', 'delete', 'create_recipe')
+        'edit', 'reviewer', 'edit_whiteboard', 'delete')
 
     def branch_is_import(self):
         return self.context.branch_type == BranchType.IMPORTED
@@ -224,11 +224,6 @@
         text = 'Set branch reviewer'
         return Link('+reviewer', text, icon='edit')
 
-    def create_recipe(self):
-        enabled = config.build_from_branch.enabled
-        text = 'Create source package recipe'
-        return Link('+new-recipe', text, enabled=enabled, icon='add')
-
 
 class BranchContextMenu(ContextMenu, HasRecipesMenuMixin):
     """Context menu for branches."""
@@ -236,7 +231,7 @@
     usedfor = IBranch
     facet = 'branches'
     links = [
-        'add_subscriber', 'browse_revisions', 'link_bug',
+        'add_subscriber', 'browse_revisions', 'create_recipe', 'link_bug',
         'link_blueprint', 'register_merge', 'source', 'subscription',
         'edit_status', 'edit_import', 'upgrade_branch', 'view_recipes']
 
@@ -322,6 +317,11 @@
         return Link(
             '+upgrade', 'Upgrade this branch', icon='edit', enabled=enabled)
 
+    def create_recipe(self):
+        enabled = config.build_from_branch.enabled
+        text = 'Create packaging recipe'
+        return Link('+new-recipe', text, enabled=enabled, icon='add')
+
 
 class DecoratedBug:
     """Provide some additional attributes to a normal bug."""
@@ -470,6 +470,16 @@
                 if check_permission('launchpad.View', proposal)]
 
     @property
+    def recipe_count_text(self):
+        count = self.context.getRecipes().count()
+        if count == 0:
+            return 'No recipes'
+        elif count == 1:
+            return '1 recipe'
+        else:
+            return '%s recipes' % count
+
+    @property
     def is_import_branch_with_no_landing_candidates(self):
         """Is the branch an import branch with no landing candidates?"""
         if self.landing_candidates:

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-05-18 15:21:49 +0000
+++ lib/lp/code/browser/configure.zcml	2010-05-25 04:39:31 +0000
@@ -392,6 +392,9 @@
             name="++branch-pending-merges"
             template="../templates/branch-pending-merges.pt" />
         <browser:page
+            name="++branch-recipes"
+            template="../templates/branch-recipes.pt" />
+        <browser:page
             name="++branch-import-details"
             template="../templates/branch-import-details.pt" />
         <browser:page

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-19 17:03:40 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-05-25 04:39:31 +0000
@@ -74,7 +74,7 @@
 
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.chef)
-        browser.getLink('Create source package recipe').click()
+        browser.getLink('Create packaging recipe').click()
 
         browser.getControl(name='field.name').value = 'daily'
         browser.getControl('Description').value = 'Make some food!'
@@ -114,7 +114,7 @@
 
         # A new recipe can be created from the branch page.
         browser = self.getUserBrowser(canonical_url(branch), user=self.chef)
-        browser.getLink('Create source package recipe').click()
+        browser.getLink('Create packaging recipe').click()
 
         browser.getControl(name='field.name').value = 'daily'
         browser.getControl('Description').value = 'Make some food!'

=== modified file 'lib/lp/code/stories/branches/xx-bug-branch-links.txt'
--- lib/lp/code/stories/branches/xx-bug-branch-links.txt	2010-04-07 14:57:03 +0000
+++ lib/lp/code/stories/branches/xx-bug-branch-links.txt	2010-05-25 04:39:31 +0000
@@ -56,7 +56,7 @@
     >>> browser.getControl('Bug #').value = "9"
     >>> browser.getControl('Continue').click()
     >>> printBugBranchLinks(browser)
-    Bug #9: Thunderbird crashes Unknown Unknown
+    Bug #9: Thunderbird crashes
 
 Attempting to link to the same bug again gives no error.
 
@@ -91,7 +91,7 @@
     >>> browser.open(
     ...     'http://code.launchpad.dev/~name12/gnome-terminal/klingon')
     >>> printBugBranchLinks(browser)
-    Bug #9: Thunderbird crashes Unknown Unknown
+    Bug #9: Thunderbird crashes
 
 ... but an anonymous user cannot.
 
@@ -130,7 +130,7 @@
 
     >>> browser.getLink('~name12/gnome-terminal/scanned').click()
     >>> printBugBranchLinks(browser)
-    Bug #11: Make Jokosher use autoaudiosink Undecided New
+    Bug #11: Make Jokosher use autoaudiosink
 
 
 Quick branch registration

=== modified file 'lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt'
--- lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2010-04-21 02:06:38 +0000
+++ lib/lp/code/stories/sourcepackagerecipes/xx-recipe-listings.txt	2010-05-25 04:39:31 +0000
@@ -29,13 +29,14 @@
     >>> nopriv_browser = setupBrowser(
     ...     auth='Basic [e-mail]:test')
 
+There should be a link on the branch page that says "No recipes" that leads to
+the recipe listings page.
+
 The link to the source package recipe listings should not be shown.
 
     >>> nopriv_browser.open(recipeless_branch_url)
-    >>> nopriv_browser.getLink('View source package recipes')
-    Traceback (most recent call last):
-    ...
-    LinkNotFoundError
+    >>> print nopriv_browser.getLink('No recipes').url
+    http://code.launchpad.dev/%7Eperson-name.../product-name.../branch.../+recipes
 
 Create a new sample branch, but this time create some source package branches
 to go along with them.
@@ -53,12 +54,13 @@
 
     >>> logout()
 
-The link to source package recipes should now be shown.  Let's click through.
+Since there are 3 recipes associated with this branch now, the link should now
+read "3 recipes." Let's click through.
 
     >>> nopriv_browser.open(branch_url)
-    >>> nopriv_browser.getLink('View source package recipes').click()
+    >>> nopriv_browser.getLink('3 recipes').click()
     >>> print nopriv_browser.url
-    http://code.launchpad.dev/~person-name.../product-name.../branch.../+recipes
+    http://code.launchpad.dev/%7Eperson-name.../product-name.../branch.../+recipes
 
 The "Base branch" column should not be shown.
 

=== modified file 'lib/lp/code/templates/branch-index.pt'
--- lib/lp/code/templates/branch-index.pt	2010-04-19 03:36:55 +0000
+++ lib/lp/code/templates/branch-index.pt	2010-05-25 04:39:31 +0000
@@ -12,8 +12,9 @@
     .logtail {
       padding-left: 2em;
     }
-    #merge-summary {
-      margin: 1em 0;
+    #merge-summary, #recipe-summary {
+      margin-top: .5em;
+      margin-bottom: .1em;
     }
     #download-url dt, #upload-url dt {
       font-weight: normal;
@@ -100,12 +101,15 @@
     </div>
   </div>
 
-  <div class="yui-g" tal:condition="view/show_merge_links">
+  <div class="yui-g">
 
-    <div class="portlet" id="branch-merges">
-      <h2>Branch merges</h2>
+    <div class="portlet" id="branch-relations">
       <tal:branch-pending-merges
-          replace="structure context/@@++branch-pending-merges" />
+           replace="structure context/@@++branch-pending-merges" />
+      <tal:branch-recipes
+           replace="structure context/@@++branch-recipes" />
+      <tal:related-bugs-specs
+           replace="structure context/@@++branch-related-bugs-specs" />
     </div>
 
   </div>
@@ -117,14 +121,6 @@
     </div>
   </div>
 
-  <div class="yui-g">
-    <div id="related-bugs-and-blueprints" class="portlet">
-      <h2>Related bugs and blueprints</h2>
-      <tal:related-bugs-specs
-          replace="structure context/@@++branch-related-bugs-specs" />
-    </div>
-  </div>
-
   <div id="branch-import-details"
        class="yui-g"
        tal:condition="context/branch_type/enumvalue:IMPORTED">
@@ -213,14 +209,6 @@
     </li>
   </ul>
 
-  <div
-    style="margin-top: 1.5em"
-    tal:define="link context/menu:context/view_recipes"
-    tal:condition="link/enabled"
-    >
-    <a tal:replace="structure link/fmt:link" />
-  </div>
-
       </div>
 
 </div>

=== modified file 'lib/lp/code/templates/branch-pending-merges.pt'
--- lib/lp/code/templates/branch-pending-merges.pt	2010-01-14 23:24:10 +0000
+++ lib/lp/code/templates/branch-pending-merges.pt	2010-05-25 04:39:31 +0000
@@ -1,11 +1,13 @@
 <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">
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  tal:define="context_menu context/menu:context"
+  tal:condition="view/show_merge_links">
 
+  <h3>Branch merges</h3>
   <div id="merge-links"
-       tal:condition="view/show_merge_links"
-       tal:define="context_menu context/menu:context">
+       class="actions">
     <div id="merge-summary">
 
       <div id="landing-candidates"

=== added file 'lib/lp/code/templates/branch-recipes.pt'
--- lib/lp/code/templates/branch-recipes.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/code/templates/branch-recipes.pt	2010-05-25 04:39:31 +0000
@@ -0,0 +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"
+  tal:define="context_menu context/menu:context"
+  id="related-bugs-and-blueprints">
+
+  <h3>Related source package recipes</h3>
+
+  <div id="recipe-links" class="actions">
+    <div id="recipe-summary">
+      <img src="/@@/source-package-recipe" />
+      <a href="+recipes" tal:content="structure view/recipe_count_text">
+        1 branch
+      </a>
+      based off of this branch.
+
+    </div>
+
+    <div
+      tal:define="link context_menu/create_recipe"
+      tal:condition="link/enabled"
+      tal:replace="structure link/render"
+      />
+  </div>
+
+</div>

=== modified file 'lib/lp/code/templates/branch-related-bugs-specs.pt'
--- lib/lp/code/templates/branch-related-bugs-specs.pt	2010-03-01 18:41:31 +0000
+++ lib/lp/code/templates/branch-related-bugs-specs.pt	2010-05-25 04:39:31 +0000
@@ -4,11 +4,29 @@
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   tal:define="context_menu context/menu:context">
 
+  <h3>Related bugs</h3>
   <div id="buglinks" class="actions">
     <div id="buglink-list">
       <tal:bugs tal:define="branch context;
                             show_edit python:True;">
-        <metal:bug-branch-links use-macro="context/@@+macros/bug-branch-links"/>
+
+        <ul tal:repeat="bug view/linked_bugs">
+          <li tal:condition="bug/required:launchpad.View"
+              tal:define="bugtask bug/bugtask;
+                          show_edit show_edit|Nothing"
+              tal:attributes="id string:buglink-${bug/id}"
+              class="bug-branch-summary">
+            <tal:buglink content="structure bugtask/fmt:link" />
+            <tal:buglink-edit condition="show_edit|nothing">
+              <a title="Remove link"
+                 class="delete-buglink"
+                 tal:attributes="href string:+bug/${bug/id}/+delete;
+                                 id string:delete-buglink-${bug/id}">
+                <img src="/@@/remove"/>
+              </a>
+            </tal:buglink-edit>
+          </li>
+        </ul>
       </tal:bugs>
     </div>
 
@@ -21,14 +39,28 @@
          tal:attributes="href link/url"
          tal:content="link/text" />
     </div>
-
   </div>
 
+  <h3>Related blueprints</h3>
   <div class="actions">
     <tal:blueprints tal:define="branch context;
                             show_edit python:True;">
-      <metal:spec-branch-links
-          use-macro="context/@@+macros/spec-branch-links"/>
+      <ul tal:repeat="spec_branch context/spec_links">
+      <li tal:define="has_edit_permission spec_branch/required:launchpad.AnyPerson;
+                      show_edit show_edit|nothing;
+                      show_edit python: show_edit and has_edit_permission;
+                      spec spec_branch/specification;"
+          class="spec-branch-summary">
+          <tal:link replace="structure spec/fmt:link" />
+          <tal:show-edit condition="show_edit|nothing">
+            <a tal:attributes="href spec_branch/fmt:url;
+                               onclick string:return switchSpecBranchFormAndSummary('${spec_branch/id}')">
+              edit<img src="/@@/edit"/>
+            </a>
+          </tal:show-edit>
+        </li>
+
+      </ul>
     </tal:blueprints>
     <div
       tal:define="link context_menu/link_blueprint"