Merge lp:~tsimonq2/ubuntu-cdimage/add-lubuntu-css into lp:ubuntu-cdimage

Proposed by Simon Quigley
Status: Merged
Merged at revision: 1708
Proposed branch: lp:~tsimonq2/ubuntu-cdimage/add-lubuntu-css
Merge into: lp:ubuntu-cdimage
Diff against target: 31 lines (+17/-1)
1 file modified
lib/cdimage/tree.py (+17/-1)
To merge this branch: bzr merge lp:~tsimonq2/ubuntu-cdimage/add-lubuntu-css
Reviewer Review Type Date Requested Status
Steve Langasek Needs Fixing
Review via email: mp+337123@code.launchpad.net

Description of the change

This adds some more little touches, such as making the Lubuntu logo go to Lubuntu.me and adding a favicon from the Lubuntu includes.

To post a comment you must log in.
Revision history for this message
Simon Quigley (tsimonq2) wrote :

Please note that cdimage-css should be pulled from one more time on the cdimage server to get the latest favicon once this is merged.

Revision history for this message
Steve Langasek (vorlon) :
review: Needs Fixing
1709. By Simon Quigley

Revert unrelated changes.

Revision history for this message
Simon Quigley (tsimonq2) wrote :

Better?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/cdimage/tree.py'
2--- lib/cdimage/tree.py 2018-02-02 21:03:58 +0000
3+++ lib/cdimage/tree.py 2018-02-04 16:48:20 +0000
4@@ -1207,11 +1207,27 @@
5 "<link rel=\"icon\" type=\"image/png\" "
6 "href=\"http://www.kubuntu.org/themes/kubuntu10.04/"
7 "favicon.ico\">", file=header)
8+ if self.project in ("lubuntu", "lubuntu-next"):
9+ print(
10+ "<link rel=\"icon\" type=\"image/png\" "
11+ "href=\"http://cdimage.ubuntu.com/include/lubuntu/"
12+ "favicon.png\" />", file=header)
13 print(dedent("""\
14 </head>
15 <body><div id="pageWrapper">
16
17- <div id="header"><a href="http://www.ubuntu.com/"></a></div>
18+ """), file=header)
19+
20+ if self.project in ("lubuntu", "lubuntu-next"):
21+ print(
22+ "<div id=\"header\"><a href=\"https://lubuntu.me\">"
23+ "</a></div>", file=header)
24+ else:
25+ print(
26+ "<div id=\"header\"><a href=\"http://www.ubuntu.com\">"
27+ "</a></div>", file=header)
28+
29+ print(dedent("""\
30
31 <h1>%s</h1>
32

Subscribers

People subscribed via source and target branches