Launchpad itself

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

  1. 444988-remove-reference-to-karmic-on-ppa-page
  2. Merge into devel
Proposed by Michael Nelson
Status: Merged
Approved by: Michael Nelson
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~michael.nelson/launchpad/444988-remove-reference-to-karmic-on-ppa-page
Merge into: lp:launchpad
Diff against target: 117 lines (+22/-25)
3 files modified
lib/canonical/launchpad/icing/style.css (+0/-7)
lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt (+9/-9)
lib/lp/soyuz/templates/archive-index.pt (+13/-9)
To merge this branch: bzr merge lp:~michael.nelson/launchpad/444988-remove-reference-to-karmic-on-ppa-page
Reviewer Review Type Date Requested Status
Curtis Hovey (community) ui Approve
Henning Eggers (community) code Approve
Eleanor Berger (community) ui* Approve
Review via email: mp+20114@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

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.

Revision history for this message
Eleanor Berger (intellectronica) :
review: Approve (ui*)
Revision history for this message
Henning Eggers (henninge) :
review: Approve (code)
Revision history for this message
Curtis Hovey (sinzui) wrote :

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

review: Approve (ui)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
953}953}
954954
955/* PPA installation instructions slider.*/955/* PPA installation instructions slider.*/
956#pre-karmic-systems-slide-trigger {
957 cursor: pointer;
958 color: #093; /* for the underline on hover */
959}
960#pre-karmic-systems-slide-trigger:hover {
961 text-decoration: underline
962}
963#ppa-install-slide-trigger {956#ppa-install-slide-trigger {
964 cursor: pointer;957 cursor: pointer;
965 color: #093; /* for the underline on hover */958 color: #093; /* for the underline on hover */
966959
=== 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 @@
281 Adding this PPA to your system281 Adding this PPA to your system
282 You can update your system with unsupported packages from this282 You can update your system with unsupported packages from this
283 untrusted PPA by adding ppa:cprov/ppa to your system's Software Sources.283 untrusted PPA by adding ppa:cprov/ppa to your system's Software Sources.
284 Not using Ubuntu 9.10 (Karmic)?284 (Read about installing)
285 Technical details about this PPA285 Technical details about this PPA
286 ...286 ...
287 For questions and bugs with software in this PPA please contact287 For questions and bugs with software in this PPA please contact
288 Celso Providelo.288 Celso Providelo.
289289
290There is a link within this section pointing users to the 'help'
291wiki, which contains more documentation about the PPA installation
292procedure.
293
294 >>> print anon_browser.getLink('Read about installing').url
295 http://launchpad.dev/+help/soyuz/ppa-sources-list.html
296
290The PPA owner reference is a link to its profile page.297The PPA owner reference is a link to its profile page.
291298
292 >>> print anon_browser.getLink('Celso Providelo').url299 >>> print anon_browser.getLink('Celso Providelo').url
@@ -304,7 +311,7 @@
304 >>> print extract_text(tech_details)311 >>> print extract_text(tech_details)
305 This PPA can be added to your system manually by copying312 This PPA can be added to your system manually by copying
306 the lines below and adding them to your system's software313 the lines below and adding them to your system's software
307 sources. (Read about installing)314 sources.
308 Display sources.list entries for:315 Display sources.list entries for:
309 Choose your Ubuntu version316 Choose your Ubuntu version
310 Breezy Badger Autotest (6.6.6)317 Breezy Badger Autotest (6.6.6)
@@ -314,13 +321,6 @@
314 deb-src http://ppa.launchpad.dev/cprov/ppa/ubuntu321 deb-src http://ppa.launchpad.dev/cprov/ppa/ubuntu
315 YOUR_UBUNTU_VERSION_HERE main322 YOUR_UBUNTU_VERSION_HERE main
316323
317There is a link within this section pointing users to the 'help'
318wiki, which contains more documentation about the PPA installation
319procedure.
320
321 >>> print anon_browser.getLink('Read about installing').url
322 http://launchpad.dev/+help/soyuz/ppa-sources-list.html
323
324When present PPA 'Build dependencies' and 'Signing key' will also be324When present PPA 'Build dependencies' and 'Signing key' will also be
325presented within this section. See below.325presented within this section. See below.
326326
327327
=== 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 @@
8181
82 <tal:is-active condition="archive_active">82 <tal:is-active condition="archive_active">
8383
84 <tal:comment replace="nothing">
85 XXX Michael Nelson 2010-02-25 bug=440512: Until we have
86 apt-add-repository backported, we can't simply state one
87 explicit solution here. Until then we just state a general
88 solution with the details in the linked help.
89 </tal:comment>
90
84 <p>You can update your system with unsupported packages from91 <p>You can update your system with unsupported packages from
85 this untrusted PPA by <a href="/+help/soyuz/ppa-sources-list.html"92 this untrusted PPA by adding <strong
86 target="help">adding</a> <strong
87 tal:content="context/fmt:reference">ppa:cprov/ppa</strong>93 tal:content="context/fmt:reference">ppa:cprov/ppa</strong>
88 to your system's Software Sources.94 to your system's Software Sources.
89 <span id="pre-karmic-systems-slide-trigger"95 (<a href="/+help/soyuz/ppa-sources-list.html"
90 >Not using Ubuntu 9.10 (Karmic)?</span></p>96 target="help">Read about installing</a>)
97 </p>
9198
92 <div id="ppa-install-slide-trigger">99 <div id="ppa-install-slide-trigger">
93 <div class="widget-header">100 <div class="widget-header">
94 <p>Technical details about this PPA</p>101 Technical details about this PPA
95 </div>102 </div>
96 </div>103 </div>
97104
98 <div class="widget-body">105 <div class="widget-body">
99 <p>This PPA can be added to your system manually by copying106 <p>This PPA can be added to your system manually by copying
100 the lines below and adding them to your system's software107 the lines below and adding them to your system's software
101 sources. (<a href="/+help/soyuz/ppa-sources-list.html"108 sources. </p>
102 target="help">Read about installing</a>)</p>
103 <tal:entries replace="structure view/sources_list_entries" />109 <tal:entries replace="structure view/sources_list_entries" />
104 <dl id="signing-key"110 <dl id="signing-key"
105 tal:define="signing_key context/signing_key"111 tal:define="signing_key context/signing_key"
@@ -173,8 +179,6 @@
173 }179 }
174 Y.on('click', toggle_body_visibility,180 Y.on('click', toggle_body_visibility,
175 '#ppa-install-slide-trigger');181 '#ppa-install-slide-trigger');
176 Y.on('click', toggle_body_visibility,
177 '#pre-karmic-systems-slide-trigger');
178});182});
179 </script>183 </script>
180 </tal:is-active>184 </tal:is-active>