Merge lp:~michael.nelson/launchpad/444988-remove-reference-to-karmic-on-ppa-page into lp:launchpad

[Michael Nelson]

Remove the now redundant 'Not using karmic?' ajax link on the PPA page.

[Michael Nelson (michael.nelson)]

Summary
=======

This branch removes the now redundant "Not using karmic?" ajax link that currently expands the technical details section.

It also replaces the two help links that were going to the same place with one single link that is always visible.

Finally, a small tweak to improve the spacing around the slider widget header.

Details
=======

I was hoping to chat with mrevell about this, as he recently added the second link to the help (after updating the help text), but he's not here this week. But now that we have all the details for the installation procedure for both karmic and pre-karmic users available inline, we no longer need to differentiate the process with a "Not using karmic" link (which, as the bug implies, makes no sense at all when the PPA itself doesn't publish karmic packages).

As the XXX says, this will all be much easier once we have apt-get-repository support backported to other distroseries.

To test
=======
bin/test -vvt xx-ubuntu-ppas.txt

Screenshot of changes
=====================
http://people.canonical.com/~michaeln/tmp/444988-adding-this-ppa.png

No lint.

[Eleanor Berger (intellectronica)]

review: Approve (ui*)

[Henning Eggers (henninge)]

review: Approve (code)

[Curtis Hovey (sinzui)]

Thanks for removing the duplicate language. That has bothered me in the past.

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/icing/style.css'
--- lib/canonical/launchpad/icing/style.css	2010-02-25 13:11:28 +0000
+++ lib/canonical/launchpad/icing/style.css	2010-02-26 07:14:17 +0000
@@ -953,13 +953,6 @@
 }
 
 /* PPA installation instructions slider.*/
-#pre-karmic-systems-slide-trigger {
-    cursor: pointer;
-    color: #093; /* for the underline on hover */
-}
-#pre-karmic-systems-slide-trigger:hover {
-    text-decoration: underline
-}
 #ppa-install-slide-trigger {
     cursor: pointer;
     color: #093; /* for the underline on hover */

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2010-02-11 11:36:15 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2010-02-26 07:14:17 +0000
@@ -281,12 +281,19 @@
     Adding this PPA to your system
     You can update your system with unsupported packages from this
     untrusted PPA by adding ppa:cprov/ppa to your system's Software Sources.
-    Not using Ubuntu 9.10 (Karmic)?
+    (Read about installing)
     Technical details about this PPA
     ...
     For questions and bugs with software in this PPA please contact
     Celso Providelo.
 
+There is a link within this section pointing users to the 'help'
+wiki, which contains more documentation about the PPA installation
+procedure.
+
+    >>> print anon_browser.getLink('Read about installing').url
+    http://launchpad.dev/+help/soyuz/ppa-sources-list.html
+
 The PPA owner reference is a link to its profile page.
 
     >>> print anon_browser.getLink('Celso Providelo').url
@@ -304,7 +311,7 @@
     >>> print extract_text(tech_details)
     This PPA can be added to your system manually by copying
     the lines below and adding them to your system's software
-    sources. (Read about installing)
+    sources.
     Display sources.list entries for:
       Choose your Ubuntu version
       Breezy Badger Autotest (6.6.6)
@@ -314,13 +321,6 @@
     deb-src http://ppa.launchpad.dev/cprov/ppa/ubuntu
       YOUR_UBUNTU_VERSION_HERE main
 
-There is a link within this section pointing users to the 'help'
-wiki, which contains more documentation about the PPA installation
-procedure.
-
-    >>> print anon_browser.getLink('Read about installing').url
-    http://launchpad.dev/+help/soyuz/ppa-sources-list.html
-
 When present PPA 'Build dependencies' and 'Signing key' will also be
 presented within this section. See below.
 

=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
--- lib/lp/soyuz/templates/archive-index.pt	2010-02-12 13:49:19 +0000
+++ lib/lp/soyuz/templates/archive-index.pt	2010-02-26 07:14:17 +0000
@@ -81,25 +81,31 @@
 
       <tal:is-active condition="archive_active">
 
+        <tal:comment replace="nothing">
+          XXX Michael Nelson 2010-02-25 bug=440512: Until we have
+          apt-add-repository backported, we can't simply state one
+          explicit solution here. Until then we just state a general
+          solution with the details in the linked help.
+        </tal:comment>
+
         <p>You can update your system with unsupported packages from
-          this untrusted PPA by <a href="/+help/soyuz/ppa-sources-list.html"
-          target="help">adding</a> <strong
+          this untrusted PPA by adding <strong
           tal:content="context/fmt:reference">ppa:cprov/ppa</strong>
           to your system's Software Sources.
-          <span id="pre-karmic-systems-slide-trigger"
-            >Not using Ubuntu 9.10 (Karmic)?</span></p>
+          (<a href="/+help/soyuz/ppa-sources-list.html"
+              target="help">Read about installing</a>)
+        </p>
 
         <div id="ppa-install-slide-trigger">
           <div class="widget-header">
-            <p>Technical details about this PPA</p>
+            Technical details about this PPA
           </div>
         </div>
 
         <div class="widget-body">
           <p>This PPA can be added to your system manually by copying
              the lines below and adding them to your system's software
-             sources. (<a href="/+help/soyuz/ppa-sources-list.html"
-                          target="help">Read about installing</a>)</p>
+             sources. </p>
           <tal:entries replace="structure view/sources_list_entries" />
           <dl id="signing-key"
               tal:define="signing_key context/signing_key"
@@ -173,8 +179,6 @@
     }
     Y.on('click', toggle_body_visibility,
          '#ppa-install-slide-trigger');
-    Y.on('click', toggle_body_visibility,
-         '#pre-karmic-systems-slide-trigger');
 });
         </script>
       </tal:is-active>