Merge lp:~rockstar/launchpad/recipe-ui-bugs into lp:launchpad

[Paul Hummer]

This branch fixes a few bugs, all of which we've talked about. You've already seen this diff, I just need you to say "yes"

[Robert Collins (lifeless)]

DoIt

review: Approve

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-07-19 10:51:39 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-07-21 15:04:53 +0000
@@ -113,7 +113,7 @@
             Make some food!
 
             Recipe information
-            Build daily: True
+            Build schedule: Built daily
             Owner: Master Chef
             Base branch: lp://dev/~chef/ratatouille/veggies
             Debian version: 0\+\{revno\}
@@ -309,7 +309,7 @@
             This is stuff
 
             Recipe information
-            Build daily: False
+            Build schedule: Built on request
             Owner: Master Chef
             Base branch: lp://dev/~chef/ratatouille/meat
             Debian version: 0\+\{revno\}
@@ -419,8 +419,7 @@
             This is stuff
 
             Recipe information
-            Build daily:
-            False
+            Build schedule: Built on request
             Owner: Master Chef
             Base branch: lp://dev/~chef/ratatouille/meat
             Debian version: 0\+\{revno\}
@@ -455,7 +454,7 @@
             This recipe .*changes.
 
             Recipe information
-            Build daily: False
+            Build schedule: Built on request
             Owner: Master Chef
             Base branch: lp://dev/~chef/chocolate/cake
             Debian version: 0\+\{revno\}
@@ -753,7 +752,6 @@
             Archive:       PPA named build for Owner
             Series:        Squirrel
             Pocket:        Release
-            Result:        .* in ubuntu 3.14
             Binary builds:
             itanic build of .* 3.14 in ubuntu squirrel RELEASE""",
             main_text)
@@ -766,14 +764,6 @@
             source_package_recipe_build=build, version='3.14',
             component=multiverse)
 
-    def test_render_sourcepackage_release(self):
-        """SourcePackageReleases are shown if set."""
-        release = self.makeBuildAndRelease()
-        main_text = self.getMainText(
-            release.source_package_recipe_build, '+index')
-        self.assertTextMatchesExpressionIgnoreWhitespace("""\
-            Result: .* in ubuntu 3.14""", main_text)
-
     def makeBinaryBuild(self, release, architecturetag):
         """Make a binary build with specified release and architecturetag."""
         distroarchseries = self.factory.makeDistroArchSeries(

=== modified file 'lib/lp/code/templates/branch-recipes.pt'
--- lib/lp/code/templates/branch-recipes.pt	2010-06-24 05:19:16 +0000
+++ lib/lp/code/templates/branch-recipes.pt	2010-07-21 15:04:53 +0000
@@ -13,7 +13,7 @@
       <a href="+recipes" tal:content="structure view/recipe_count_text">
         1 branch
       </a>
-      based off of this branch.
+      using this branch.
 
     </div>
 

=== modified file 'lib/lp/code/templates/sourcepackagerecipe-index.pt'
--- lib/lp/code/templates/sourcepackagerecipe-index.pt	2010-05-26 14:37:41 +0000
+++ lib/lp/code/templates/sourcepackagerecipe-index.pt	2010-07-21 15:04:53 +0000
@@ -37,8 +37,13 @@
         <h2>Recipe information</h2>
         <div class="two-column-list">
           <dl id="build_daily">
-            <dt>Build daily:</dt>
-            <dd tal:content="context/build_daily" />
+            <dt>Build schedule:</dt>
+            <dd tal:condition="context/build_daily">
+              Built daily
+            </dd>
+            <dd tal:condition="not:context/build_daily">
+              Built on request
+            </dd>
           </dl>
 
           <dl id="owner">

=== modified file 'lib/lp/code/templates/sourcepackagerecipebuild-index.pt'
--- lib/lp/code/templates/sourcepackagerecipebuild-index.pt	2010-07-14 10:09:35 +0000
+++ lib/lp/code/templates/sourcepackagerecipebuild-index.pt	2010-07-21 15:04:53 +0000
@@ -78,8 +78,6 @@
           <dd><span tal:replace="context/pocket/title">Release</span></dd>
       </dl>
       <dl>
-        <dt tal:condition="context/source_package_release">Result:</dt>
-        <dd tal:condition="context/source_package_release" tal:content="structure context/source_package_release/fmt:link"></dd>
         <dt>Binary builds:</dt>
         <dd tal:repeat="binary view/binary_builds"
             tal:content="structure binary/fmt:link">