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

[Brad Crittenden]

Update the +download page providing more information about releases and re-arranging to better present existing information.

[Brad Crittenden (bac)]

= Summary =

Bug 419742 suggested new information to present on the $product/+download page and
ways to make it more presentable.

== Proposed fix ==

Re-arrange lots of the data:
* Remove the extra information about verification and just present the help link.
* Move the release date into the header.
* Put 'release notes' and 'changelog' into a collapsible field called 'Release
information'.
* Add '(+) Add download file' under the release table.
* Keep the link at the end for each release but add the series name to it for
distinguishing it.[1]
* Make each release a portlet.[2]

[1] beuno had asked that this entire line be removed. I restored it because if a
release has no download files there is no place to add the '(+) Add download file'
menu link. Releases with no files are just skipped in the body of this page. So it
made sense to bring it back and just list all of the releases in one place. We often
get complaints from users that it is too hard to figure out where to go to add
download files I was hesitant to remove one place they may have grown used to using.

[2] I have made each use the 'top-portlet' class and conditionally insert the border.
 This requires less code reorganization than conditionally choosing a class. TAL is
really bad when you need to select attributes conditionally, basically you have to
violate DRY all over the place.

== Pre-implementation notes ==

Lots of discussion with beuno. Unfortunately I have not been able to have a
discussion with mbp but hope to early next week to see if he still has any issues.

== Implementation details ==

As above.

== Tests ==

bin/test -vv -t xx-product-files.txt

== Demo and Q/A ==

https://launchpad.dev/firefox/+download

Also go to any other project and add some releases and download files.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/templates/product-files.pt
  lib/canonical/launchpad/icing/style-3-0.css
  lib/lp/registry/stories/product/xx-product-files.txt
  lib/lp/registry/templates/productrelease-portlet-data.pt

[Brad Crittenden (bac)]

Screenshots:
http://people.canonical.com/~bac/download-bazaar.png

Shows a project with a couple of releases within a single series.

http://people.canonical.com/~bac/download-firefox.png

Shows a project with multiple series and releases. Some releases have no download files and are skipped.

[Paul Hummer (rockstar)]

review: Approve

[Martin Albisetti (beuno)]

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2009-10-20 16:45:23 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2009-10-22 20:20:27 +0000
@@ -233,6 +233,10 @@
 .footer .lp-branding {
     float: left;
     }
+.portlet-border {
+    border-top: 1px solid #EBEBEB;
+    padding: 1em 0;
+    }
 .portlet, .aside {
     clear: both;
     border-top: 1px solid #EBEBEB;

=== modified file 'lib/lp/registry/stories/product/xx-product-files.txt'
--- lib/lp/registry/stories/product/xx-product-files.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/registry/stories/product/xx-product-files.txt	2009-10-22 20:20:27 +0000
@@ -33,11 +33,11 @@
     >>> 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.
+    0.9.2 (One (secure) Tree Hill) release from the trunk series released 2004-10-15
+    Release information
     Release notes:
     Security fixes
      * 250180 - [Windows] Disallow access to insecure shell: protocol.
-    Released: 2004-10-15
     File                            Description   Downloads
     firefox-0.9.2.orig.tar.gz (md5)               -
 
@@ -99,7 +99,8 @@
     Download project files
     Mozilla Thunderbird...
     No download files exist for this project...
-    Add download file for release: 0.8
+    Add download file to the trunk series for release: 0.8
+
     >>> tbird_owner.getControl('Delete Files')
     Traceback (most recent call last):
     ...
@@ -114,8 +115,8 @@
     >>> firefox_owner.open('http://launchpad.dev/firefox/+download')
     >>> for tag in find_tags_by_class(firefox_owner.contents, 'add-files'):
     ...     print extract_text(tag)
-    Add download file for release: 0.9.2, 0.9.1, 0.9
-    Add download file for release: 1.0.0
+    Add download file to the trunk series for release: 0.9.2, 0.9.1, 0.9
+    Add download file to the 1.0 series for release: 1.0.0
 
 If a project has a series with no releases associated with it, that
 series should not show up in the list.
@@ -129,8 +130,8 @@
     >>> firefox_owner.open('http://launchpad.dev/firefox/+download')
     >>> for tag in find_tags_by_class(firefox_owner.contents, 'add-files'):
     ...     print extract_text(tag)
-    Add download file for release: 0.9.2, 0.9.1, 0.9
-    Add download file for release: 1.0.0
+    Add download file to the trunk series for release: 0.9.2, 0.9.1, 0.9
+    Add download file to the 1.0 series for release: 1.0.0
 
 If a release is added to the new series the series will appear in
 the list.
@@ -150,9 +151,9 @@
     >>> firefox_owner.open('http://launchpad.dev/firefox/+download')
     >>> for tag in find_tags_by_class(firefox_owner.contents, 'add-files'):
     ...     print extract_text(tag)
-    Add download file for release: 0.9.2, 0.9.1, 0.9
-    Add download file for release: 3.14159
-    Add download file for release: 1.0.0
+    Add download file to the trunk series for release: 0.9.2, 0.9.1, 0.9
+    Add download file to the 3.0 series for release: 3.14159
+    Add download file to the 1.0 series for release: 1.0.0
 
 
 == Adding new files ==

=== modified file 'lib/lp/registry/templates/product-files.pt'
--- lib/lp/registry/templates/product-files.pt	2009-08-31 23:58:26 +0000
+++ lib/lp/registry/templates/product-files.pt	2009-10-22 20:20:27 +0000
@@ -17,13 +17,9 @@
      tal:define="has_edit context/required:launchpad.Edit">
 
   <p tal:condition="view/has_download_files">
-    After you've downloaded a file, you can verify its authenticity using
-    <tal:hasdownloadfiles condition="view/any_download_files_with_signatures">
-    either </tal:hasdownloadfiles>its MD5 sum
-    <tal:hasdownloadfiles condition="view/any_download_files_with_signatures">
-    or signature</tal:hasdownloadfiles>. (<a
+    <a
     href="/+help/verify-downloads.html" target="help">How do I verify a
-    download?</a>)
+    download?</a>
   </p>
   <br />
 
@@ -45,37 +41,52 @@
       tal:repeat="series view/sorted_series_list"
       tal:attributes="id string:series_${series/name}">
 
+      <div tal:condition="not: repeat/series/start" class="portlet-border" />
+
       <tal:seriesfilesexist condition="series/has_release_files">
         <tal:releases repeat="release series/releases">
-          <div tal:condition="release/files">
-            <h2 style="font-size: 1.2em">
+          <tal:releasefilesexist condition="release/files">
+          <div tal:condition="not: repeat/release/start" class="portlet-border" />
+          <div tal:condition="release/files" class="top-portlet">
+            <h2 style="font-size: 1.2em; float:left;">
               <a tal:attributes="href release/fmt:url">
-                <span tal:replace="release/name_with_codename" /> release</a>,
+                <span tal:replace="release/name_with_codename" /> release</a>
               from the
               <a tal:attributes="href series/fmt:url"
-                 tal:content="series/name">name</a> series.
+                 tal:content="series/name">name</a> series released
+              <span
+                 tal:attributes="title release/datereleased/fmt:datetime"
+                 tal:content="release/datereleased/fmt:approximatedate" />
             </h2>
 
-            <div id="release_notes">
-              <h3>Release notes:</h3>
-              <tal:notes condition="release/release_notes"
-                  define="notes release/release_notes/fmt:shorten/800">
-                <div tal:content="structure notes/fmt:text-to-html">
-                  Release notes
-                </div>
-              </tal:notes>
-              <div tal:condition="not: release/release_notes">
-                <em>This release does not have release notes.</em>
-              </div>
-              <div>
-                <strong>Released:</strong>
-                <span
-                  tal:attributes="title release/datereleased/fmt:datetime"
-                  tal:content="release/datereleased/fmt:approximatedate" />
-              </div>
-            </div>
-
-            <table class="listing">
+            <div style="clear:both;" />
+
+            <div id="release_information"
+               tal:condition="python: release.release_notes or release.changelog">
+
+              <fieldset class="collapsible collapsed" style="padding: 0px;">
+                <legend>Release information</legend>
+
+                <div tal:condition="release/release_notes">
+                  <strong>Release notes:</strong>
+                  <div id="release_notes" style="margin-bottom: 0px;"
+                       tal:define="notes release/release_notes/fmt:shorten/800"
+                       tal:content="structure notes/fmt:text-to-html">
+                    ProductRelease.release_notes
+                  </div>
+                </div>
+
+                <div tal:condition="release/changelog">
+                  <strong>Changelog:</strong>
+                  <div id="changelog" style="margin-bottom: 0px;"
+                       tal:content="structure release/changelog/fmt:obfuscate-email/fmt:text-to-html">
+                    ProductRelease.changelog.
+                  </div>
+                </div>
+              </fieldset>
+            </div> <!-- release information -->
+
+            <table class="listing" style="margin-top: 1em;">
               <thead>
                 <tr>
                   <th width="35%">File</th>
@@ -105,6 +116,17 @@
               </tfoot>
             </table>
           </div>
+          <div tal:condition="not: release/total_downloads"
+               style="margin-top: 2em;">
+          </div>
+
+          <div style="float:right"
+               tal:define="link release/menu:context/add_file"
+               tal:condition="link/enabled">
+            <a tal:replace="structure link/fmt:link" />
+          </div>
+          <div style="clear:both" />
+          </tal:releasefilesexist>
         </tal:releases>
         <br />
 
@@ -112,7 +134,9 @@
 
       <p tal:condition="has_edit" class="add-files">
         <tal:releases condition="series/releases">
-          Add download file for release:
+          Add download file to the
+          <a tal:attributes="href series/fmt:url"
+             tal:content="series/name">name</a> series for release:
           <tal:release repeat="release series/releases">
             <a tal:attributes="href string:${series/name}/${release/version}/+adddownloadfile"
                tal:content="release/version"
@@ -130,4 +154,5 @@
   </form>
 </div>
 </body>
-</html>
+</html
+>

=== modified file 'lib/lp/registry/templates/productrelease-portlet-data.pt'
--- lib/lp/registry/templates/productrelease-portlet-data.pt	2009-09-11 01:25:30 +0000
+++ lib/lp/registry/templates/productrelease-portlet-data.pt	2009-10-22 20:20:27 +0000
@@ -67,10 +67,9 @@
   </div>
 
   <div class="top-portlet">
-    <h2>
-      Release notes
-       &nbsp; <a tal:replace="structure view/release/menu:context/edit/fmt:icon" />
-    </h2>
+    <h2 style="float:left">Release notes &nbsp;</h2>
+    <a tal:replace="structure view/release/menu:context/edit/fmt:icon" />
+    <div style="clear:both" />
 
     <div id="release-notes"
       tal:content="structure view/release/release_notes/fmt:text-to-html"
@@ -82,10 +81,9 @@
       <em>This release does not have release notes.</em>
     </p>
 
-    <h2>
-      Changelog
-      &nbsp; <a tal:replace="structure view/release/menu:context/edit/fmt:icon" />
-    </h2>
+    <h2 style="float:left">Changelog &nbsp;</h2>
+    <a tal:replace="structure view/release/menu:context/edit/fmt:icon" />
+    <div style="clear:both" />
 
     <fieldset class="collapsible collapsed" style="padding: 0px;"
       tal:condition="view/release/changelog">