launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #01783
[Merge] lp:~thumper/launchpad/recipe-help into lp:launchpad/devel
Tim Penhey has proposed merging lp:~thumper/launchpad/recipe-help into lp:launchpad/devel.
Requested reviews:
Matthew Revell (matthew.revell): help text
Launchpad code reviewers (launchpad-reviewers)
Related bugs:
#667258 Branch overview page should link to source package help
https://bugs.launchpad.net/bugs/667258
#667274 +new-recipe needs an introductory sentence plus a link to help
https://bugs.launchpad.net/bugs/667274
#667277 "Build daily" on +new-recipe is ambiguous
https://bugs.launchpad.net/bugs/667277
This branch adds some help references to the recipe pages.
Not a lot to this branch.
--
https://code.launchpad.net/~thumper/launchpad/recipe-help/+merge/39922
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~thumper/launchpad/recipe-help into lp:launchpad/devel.
=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml 2010-10-20 03:44:49 +0000
+++ lib/lp/code/browser/configure.zcml 2010-11-03 03:33:55 +0000
@@ -1262,7 +1262,7 @@
permission="launchpad.AnyPerson"
facet="branches"
name="+new-recipe"
- template="../../app/templates/generic-edit.pt"/>
+ template="../templates/sourcepackagerecipe-new.pt"/>
<browser:page
for="lp.code.interfaces.sourcepackagerecipe.ISourcePackageRecipe"
layer="lp.code.publisher.CodeLayer"
=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-10-26 15:47:24 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-11-03 03:33:55 +0000
@@ -119,7 +119,7 @@
browser.getControl(name='field.name').value = 'daily'
browser.getControl('Description').value = 'Make some food!'
browser.getControl('Secret Squirrel').click()
- browser.getControl('Build daily').click()
+ browser.getControl('Automatically build each day').click()
browser.getControl('Create Recipe').click()
pattern = """\
@@ -182,7 +182,7 @@
browser.getControl(name='field.name').value = 'daily'
browser.getControl('Description').value = 'Make some food!'
browser.getControl('Secret Squirrel').click()
- browser.getControl('Build daily').click()
+ browser.getControl('Automatically build each day').click()
browser.getControl('Owner').displayValue = ['Good Chefs']
browser.getControl('Create Recipe').click()
@@ -277,7 +277,7 @@
browser.getControl(name='field.name').value = 'daily'
browser.getControl('Description').value = 'Make some food!'
- browser.getControl('Build daily').click()
+ browser.getControl('Automatically build each day').click()
browser.getControl('Create Recipe').click()
self.assertEqual(
extract_text(find_tags_by_class(browser.contents, 'message')[2]),
=== added file 'lib/lp/code/help/related-recipes.html'
--- lib/lp/code/help/related-recipes.html 1970-01-01 00:00:00 +0000
+++ lib/lp/code/help/related-recipes.html 2010-11-03 03:33:55 +0000
@@ -0,0 +1,30 @@
+<html>
+ <head>
+ <title>Related source package recipes</title>
+ <link rel="stylesheet" type="text/css"
+ href="/+icing/yui/cssreset/reset.css" />
+ <link rel="stylesheet" type="text/css"
+ href="/+icing/yui/cssfonts/fonts.css" />
+ <link rel="stylesheet" type="text/css"
+ href="/+icing/yui/cssbase/base.css" />
+ </head>
+ <body>
+ <h1>Related source package recipes</h1>
+
+ <p>
+ You can ask Launchpad to make an automatic daily build
+ of the code in this branch and place the resultant package(s)
+ in your chosen PPA. (<a href="https://help.launchpad.net/Packaging/SourceBuilds"; target="_blank">Read more</a>)
+ </p>
+
+ <p>A "recipe" is a description of the steps bzr-builder should take to
+ construct a source package from the various bzr branches. Its format
+ specifies:</p>
+ <ul class="bulleted">
+ <li>where to use the code from (trunk branch, beta branch, etc.), where to get the packaging from (separate branch? ubuntu branch?)</li>
+ <li>the correct package version (so users will still be able to upgrade to the stable version of the distro once it gets released)</li>
+ <li>what to modify to make the source build properly</li>
+ </ul>
+
+ </body>
+</html>
=== modified file 'lib/lp/code/interfaces/sourcepackagerecipe.py'
--- lib/lp/code/interfaces/sourcepackagerecipe.py 2010-09-08 15:29:51 +0000
+++ lib/lp/code/interfaces/sourcepackagerecipe.py 2010-11-03 03:33:55 +0000
@@ -168,7 +168,8 @@
" build a source package for"),
readonly=False)
build_daily = exported(Bool(
- title=_("Build daily")))
+ title=_("Automatically build each day, if the source has changed"),
+ description=_("You can manually request a build at any time.")))
name = exported(TextLine(
title=_("Name"), required=True,
=== modified file 'lib/lp/code/templates/branch-recipes.pt'
--- lib/lp/code/templates/branch-recipes.pt 2010-07-21 13:22:25 +0000
+++ lib/lp/code/templates/branch-recipes.pt 2010-11-03 03:33:55 +0000
@@ -15,6 +15,9 @@
</a>
using this branch.
+ <a href="/+help/related-recipes.html" target="help" class="sprite maybe">
+ <span class="invisible-link">Tag help</span>
+ </a>
</div>
<span
=== added file 'lib/lp/code/templates/sourcepackagerecipe-new.pt'
--- lib/lp/code/templates/sourcepackagerecipe-new.pt 1970-01-01 00:00:00 +0000
+++ lib/lp/code/templates/sourcepackagerecipe-new.pt 2010-11-03 03:33:55 +0000
@@ -0,0 +1,29 @@
+<html
+ xmlns="http://www.w3.org/1999/xhtml";
+ xmlns:tal="http://xml.zope.org/namespaces/tal";
+ xmlns:metal="http://xml.zope.org/namespaces/metal";
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n";
+ metal:use-macro="view/macro:page/main_only"
+ i18n:domain="launchpad">
+ <body>
+ <div metal:fill-slot="main">
+
+ <div>
+ <p>A "recipe" is a description of the steps bzr-builder should take to
+ construct a source package from the various bzr branches. Its format
+ specifies:</p>
+ <ul class="bulleted">
+ <li>where to use the code from (trunk branch, beta branch, etc.), where to get the packaging from (separate branch? ubuntu branch?)</li>
+ <li>the correct package version (so users will still be able to upgrade to the stable version of the distro once it gets released)</li>
+ <li>what to modify to make the source build properly</li>
+ </ul>
+
+ <p>We strongly recommend that you test your recipe locally first.
+ <a href="https://help.launchpad.net/Packaging/SourceBuilds/GettingStarted";>Read more...</a></p>
+
+ </div>
+
+ <div metal:use-macro="context/@@launchpad_form/form" />
+ </div>
+ </body>
+</html>
Follow ups
