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
1=== modified file 'lib/canonical/launchpad/icing/style.css'
2--- lib/canonical/launchpad/icing/style.css 2010-02-25 13:11:28 +0000
3+++ lib/canonical/launchpad/icing/style.css 2010-02-26 07:14:17 +0000
4@@ -953,13 +953,6 @@
5 }
6
7 /* PPA installation instructions slider.*/
8-#pre-karmic-systems-slide-trigger {
9- cursor: pointer;
10- color: #093; /* for the underline on hover */
11-}
12-#pre-karmic-systems-slide-trigger:hover {
13- text-decoration: underline
14-}
15 #ppa-install-slide-trigger {
16 cursor: pointer;
17 color: #093; /* for the underline on hover */
18
19=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
20--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-02-11 11:36:15 +0000
21+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2010-02-26 07:14:17 +0000
22@@ -281,12 +281,19 @@
23 Adding this PPA to your system
24 You can update your system with unsupported packages from this
25 untrusted PPA by adding ppa:cprov/ppa to your system's Software Sources.
26- Not using Ubuntu 9.10 (Karmic)?
27+ (Read about installing)
28 Technical details about this PPA
29 ...
30 For questions and bugs with software in this PPA please contact
31 Celso Providelo.
32
33+There is a link within this section pointing users to the 'help'
34+wiki, which contains more documentation about the PPA installation
35+procedure.
36+
37+ >>> print anon_browser.getLink('Read about installing').url
38+ http://launchpad.dev/+help/soyuz/ppa-sources-list.html
39+
40 The PPA owner reference is a link to its profile page.
41
42 >>> print anon_browser.getLink('Celso Providelo').url
43@@ -304,7 +311,7 @@
44 >>> print extract_text(tech_details)
45 This PPA can be added to your system manually by copying
46 the lines below and adding them to your system's software
47- sources. (Read about installing)
48+ sources.
49 Display sources.list entries for:
50 Choose your Ubuntu version
51 Breezy Badger Autotest (6.6.6)
52@@ -314,13 +321,6 @@
53 deb-src http://ppa.launchpad.dev/cprov/ppa/ubuntu
54 YOUR_UBUNTU_VERSION_HERE main
55
56-There is a link within this section pointing users to the 'help'
57-wiki, which contains more documentation about the PPA installation
58-procedure.
59-
60- >>> print anon_browser.getLink('Read about installing').url
61- http://launchpad.dev/+help/soyuz/ppa-sources-list.html
62-
63 When present PPA 'Build dependencies' and 'Signing key' will also be
64 presented within this section. See below.
65
66
67=== modified file 'lib/lp/soyuz/templates/archive-index.pt'
68--- lib/lp/soyuz/templates/archive-index.pt 2010-02-12 13:49:19 +0000
69+++ lib/lp/soyuz/templates/archive-index.pt 2010-02-26 07:14:17 +0000
70@@ -81,25 +81,31 @@
71
72 <tal:is-active condition="archive_active">
73
74+ <tal:comment replace="nothing">
75+ XXX Michael Nelson 2010-02-25 bug=440512: Until we have
76+ apt-add-repository backported, we can't simply state one
77+ explicit solution here. Until then we just state a general
78+ solution with the details in the linked help.
79+ </tal:comment>
80+
81 <p>You can update your system with unsupported packages from
82- this untrusted PPA by <a href="/+help/soyuz/ppa-sources-list.html"
83- target="help">adding</a> <strong
84+ this untrusted PPA by adding <strong
85 tal:content="context/fmt:reference">ppa:cprov/ppa</strong>
86 to your system's Software Sources.
87- <span id="pre-karmic-systems-slide-trigger"
88- >Not using Ubuntu 9.10 (Karmic)?</span></p>
89+ (<a href="/+help/soyuz/ppa-sources-list.html"
90+ target="help">Read about installing</a>)
91+ </p>
92
93 <div id="ppa-install-slide-trigger">
94 <div class="widget-header">
95- <p>Technical details about this PPA</p>
96+ Technical details about this PPA
97 </div>
98 </div>
99
100 <div class="widget-body">
101 <p>This PPA can be added to your system manually by copying
102 the lines below and adding them to your system's software
103- sources. (<a href="/+help/soyuz/ppa-sources-list.html"
104- target="help">Read about installing</a>)</p>
105+ sources. </p>
106 <tal:entries replace="structure view/sources_list_entries" />
107 <dl id="signing-key"
108 tal:define="signing_key context/signing_key"
109@@ -173,8 +179,6 @@
110 }
111 Y.on('click', toggle_body_visibility,
112 '#ppa-install-slide-trigger');
113- Y.on('click', toggle_body_visibility,
114- '#pre-karmic-systems-slide-trigger');
115 });
116 </script>
117 </tal:is-active>