Merge lp:~bac/launchpad/bug-429248 into lp:launchpad

[Brad Crittenden]

Fix text describing a project's lack of file downloads.

= Summary =

Text describing the status of a project's download files was confusing.

== Proposed fix ==

Change the text.

== Pre-implementation notes ==

Chat with Curtis.

== Implementation details ==

As above.

== Tests ==

bin/test -vvt xx-product-files.txt

== Demo and Q/A ==

https://launchpad.dev/applets

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:

I'll fix these.

  lib/lp/registry/templates/product-index.pt
  lib/lp/registry/stories/product/xx-product-files.txt

./lib/lp/registry/stories/product/xx-product-files.txt
       1: narrative uses a moin header.
      20: want exceeds 78 characters.
      36: want exceeds 78 characters.
      45: narrative uses a moin header.
     110: narrative uses a moin header.
     159: narrative uses a moin header.
     380: narrative uses a moin header.
     435: narrative uses a moin header.
     474: narrative uses a moin header.

[Curtis Hovey (sinzui)]

Thanks for the text fix.

review: Approve (code)

=== modified file 'lib/lp/registry/stories/product/xx-product-files.txt'
--- lib/lp/registry/stories/product/xx-product-files.txt	2010-08-02 18:59:44 +0000
+++ lib/lp/registry/stories/product/xx-product-files.txt	2010-08-25 19:42:49 +0000
@@ -1,4 +1,6 @@
-= Downloadable Files =
+==================
+Downloadable Files
+==================
 
 Launchpad can show a product's downloadable files, by series, with
 links to each.
@@ -9,7 +11,7 @@
     >>> content = find_tag_by_id(anon_browser.contents, 'downloads')
     >>> print extract_text(content)
     Downloads
-    APTonCD does not have any download files.
+    APTonCD does not have any download files registered with Launchpad.
 
 Any user can see a project with a release without files has no downlaod files.
 
@@ -17,7 +19,8 @@
     >>> content = find_tag_by_id(anon_browser.contents, 'downloads')
     >>> print extract_text(content)
     Downloads
-    Mozilla Thunderbird does not have any download files.
+    Mozilla Thunderbird does not have any download files
+    registered with Launchpad.
 
 Any user can see a projects download files organised by series. For each
 series, the owner sees a heading, summary, table of files, and links to each
@@ -33,7 +36,8 @@
     >>> anon_browser.getLink('All downloads').click()
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'project-downloads'))
-    0.9.2 (One (secure) Tree Hill) release from the trunk series released 2004-10-15
+    0.9.2 (One (secure) Tree Hill) release from the trunk series
+    released 2004-10-15
     Release information
     Release notes:
     Security fixes
@@ -42,7 +46,8 @@
     firefox_0.9.2.orig.tar.gz (md5)               -
 
 
-== Deletion is only for the privileged ==
+Deletion is only for the privileged
+===================================
 
 As an anonymous user the files for download should be shown, but not
 the delete options.
@@ -107,7 +112,8 @@
     LookupError: label 'Delete Files'
 
 
-== The download file layout ==
+The download file layout
+========================
 
 When a project has a series with one or more releases, an option to
 add download files for each release in that series is presented.
@@ -156,7 +162,8 @@
     Add download file to the 1.0 series for release: 1.0.0
 
 
-== Adding new files ==
+Adding new files
+================
 
 In order to add new files, the admin can click on the link release
 link provided under the series name, or navigate to the product
@@ -377,7 +384,8 @@
     foo.txt
 
 
-== Downloading and deleting files ==
+Downloading and deleting files
+==============================
 
 Download one of the files.
 
@@ -432,7 +440,8 @@
     foo.txt
 
 
-== Listing on the ProductRelease page ==
+Listing on the ProductRelease page
+==================================
 
 Download files are shown on the page for the product release.
 Non-administrators do not have the delete option.
@@ -471,7 +480,8 @@
     [u'1 file has been deleted.']
 
 
-== Scheme redirection ==
+Scheme redirection
+==================
 
 Files may be downloaded over http or https with the URL for the
 librarian file constructed based upon the scheme of the original

=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt	2010-08-13 21:30:24 +0000
+++ lib/lp/registry/templates/product-index.pt	2010-08-25 19:42:49 +0000
@@ -258,8 +258,8 @@
             tal:attributes="href link/fmt:url;
                             title link/summary">All downloads</a>
            <tal:no-files condition="not: release">
-             <tal:name replace="context/displayname" /> does not have any
-              download files.
+             <tal:name replace="context/displayname" />
+             does not have any download files registered with Launchpad.
            </tal:no-files>
         </p>
       </div>