Launchpad itself

Merge lp:~barry/launchpad/434761-homepage into lp:launchpad

  1. 434761-homepage
  2. Merge into devel
Proposed by Barry Warsaw
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~barry/launchpad/434761-homepage
Merge into: lp:launchpad
Diff against target: None lines
To merge this branch: bzr merge lp:~barry/launchpad/434761-homepage
Reviewer Review Type Date Requested Status
Brad Crittenden (community) release-critical Approve
Paul Hummer (community) code Approve
Martin Albisetti (community) ui Approve
Review via email: mp+12252@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Albisetti (beuno) wrote :

Land and rc please!

THANK YOU BARRY

review: Approve (ui)
Revision history for this message
Paul Hummer (rockstar) :
review: Approve (code)
Revision history for this message
Brad Crittenden (bac) wrote :

Thanks Barry. This branch makes the front page look very welcoming.

review: Approve (release-critical)

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-3-0.css'
2--- lib/canonical/launchpad/icing/style-3-0.css 2009-09-22 13:49:41 +0000
3+++ lib/canonical/launchpad/icing/style-3-0.css 2009-09-22 20:40:37 +0000
4@@ -278,6 +278,7 @@
5 Use the following 'application' colors for table column headings,
6 app stats etc.
7
8+Launchpad-Gold: #F8C300
9 Answers: #3840BE
10 Blueprints: #3594BB
11 Bugs: #9F2B33
12@@ -304,6 +305,9 @@
13 strong.translations-stat {
14 color: #BB3A84;
15 }
16+.launchpad-gold {
17+ color: #F8C300;
18+ }
19
20
21 /* Default text presentation */
22@@ -684,7 +688,7 @@
23 margin-top: -2px;
24 }
25
26-/* For the Latest updates portlet
27+/* For the Latest updates portlet
28 * at https://launchpad.dev/~cprov/+archive/ppa */
29 ul.latest-ppa-updates .duration {
30 font-size: 75%;
31@@ -840,3 +844,92 @@
32 table.translation-stats tfoot td {
33 text-align:center;
34 }
35+
36+/* Home page */
37+.homepage {
38+ margin: auto;
39+ width: 90%;
40+ max-width: 80em;
41+}
42+.homepage-portlet {
43+ margin-bottom: 3em;
44+ line-height: 140%;
45+}
46+.homepage-portlet h2 {
47+ border-bottom: 1px solid;
48+ margin-top: 2em;
49+ font-size: 167%;
50+ }
51+.homepage-whatslaunchpad h2 {
52+ font-size: 189%;
53+ font-weight: bold;
54+ line-height: 110%;
55+ margin-bottom: 0.5em;
56+}
57+#homepage-whatslaunchpad ul {
58+ margin-left: 1em;
59+ margin-bottom: 0.5em;
60+}
61+#homepage-whatslaunchpad ul,
62+#homepage-whatslaunchpad-tour {
63+ font-size: 116%;
64+ font-weight: bold;
65+}
66+#homepage-stats {
67+ max-width: 50em;
68+ margin: auto;
69+ padding-top: 0.5em;
70+ color: gray;
71+ font-size: 83.3%
72+}
73+#homepage-blogposts {
74+ padding-right: 4em;
75+}
76+#homepage-blogposts .blogdate {
77+ font-size: 85%;
78+ color: grey;
79+}
80+.homepage-blogposts-older {
81+ font-weight: bold;
82+}
83+.homepage-getstarted h2 {
84+ border-bottom: 1px solid;
85+ margin-top: 1em;
86+ font-size: 161%;
87+ }
88+#homepage-featured {
89+ width: 100%;
90+}
91+#homepage-featured ul {
92+ width: 48%;
93+}
94+#homepage-featured-left {
95+ float: left;
96+}
97+#homepage-featured-right {
98+ float: right;
99+}
100+#homepage-featured-top img {
101+ float: left;
102+}
103+#homepage-featured-top-title {
104+ height: 64px;
105+ display: block;
106+ margin-left: 70px;
107+}
108+#homepage-featured-top-title span{
109+ font-size: 131%;
110+ font-weight: bold;
111+ position: relative;
112+ top: 20px;
113+}
114+#homepage-featured-top-text {
115+ margin-top: 0.5em;
116+ margin-bottom: 1em;
117+ border-bottom: 1px solid #888888;
118+}
119+.homepage-featured-more {
120+ font-weight: bold;
121+ margin-top: 2em;
122+ clear: both;
123+}
124
125=== modified file 'lib/canonical/launchpad/icing/style.css'
126--- lib/canonical/launchpad/icing/style.css 2009-09-22 16:24:20 +0000
127+++ lib/canonical/launchpad/icing/style.css 2009-09-22 20:40:37 +0000
128@@ -1576,116 +1576,6 @@
129 #locationbar {
130 height: 1em;
131 }
132-
133-#homepage {
134- margin: auto;
135- width: 90%;
136- max-width: 80em;
137-}
138-
139-.homepage-portlet {
140- margin-bottom: 3em;
141- line-height: 140%;
142-}
143-
144-.homepage-portlet h2 {
145- margin-bottom: 0.5em;
146- font-size: 131%;
147-}
148-
149-/* Home: search form */
150-
151-#homepage-searchform {
152- text-align: center;
153-}
154-
155-#homepage-stats {
156- max-width: 50em;
157- margin: auto;
158- padding-top: 0.5em;
159- color: gray;
160- font-size: 83.3%
161-}
162-
163-/* Home: What's launchpad */
164-
165-#homepage-whatslaunchpad ul {
166- margin-left: 1em;
167- margin-bottom: 0.5em;
168-}
169-
170-#homepage-whatslaunchpad ul,
171-#homepage-whatslaunchpad-tour {
172- font-size: 116%;
173- font-weight: bold;
174-}
175-
176-/* Home: blog posts */
177-
178-#homepage-blogposts {
179- padding-right: 4em;
180-}
181-
182-#homepage-blogposts .blogdate {
183- font-size: 85%;
184- color: grey;
185-}
186-
187-#homepage-blogposts-older {
188- text-align: right;
189-}
190-
191-/* Home: Get started */
192-
193-#homepage-getstarted ul {
194- margin-top: 0.5em;
195-}
196-
197-/* Home: Featured projects */
198-
199-#homepage-featured {
200- width: 100%;
201-}
202-
203-#homepage-featured ul {
204- width: 48%;
205-}
206-
207-#homepage-featured-left {
208- float: left;
209-}
210-
211-#homepage-featured-right {
212- float: right;
213-}
214-
215-#homepage-featured-top img {
216- float: left;
217-}
218-#homepage-featured-top-title {
219- height: 64px;
220- display: block;
221- margin-left: 70px;
222-}
223-
224-#homepage-featured-top-title span{
225- font-size: 131%;
226- font-weight: bold;
227- position: relative;
228- top: 20px;
229-}
230-
231-#homepage-featured-top-text {
232- margin-top: 0.5em;
233- margin-bottom: 1em;
234-}
235-
236-#homepage-featured-more {
237- margin-top: 0.5em;
238- text-align: right;
239- clear: both;
240-}
241-
242 /* -- Notices -- */
243
244 .important-notice-container {
245
246=== modified file 'lib/canonical/launchpad/templates/root-index.pt'
247--- lib/canonical/launchpad/templates/root-index.pt 2009-09-18 23:48:15 +0000
248+++ lib/canonical/launchpad/templates/root-index.pt 2009-09-22 20:40:37 +0000
249@@ -32,42 +32,19 @@
250 </tal:comment>
251 <!-- Is your project registered yet? -->
252
253- <div id="homepage">
254+ <div id="homepage" class="homepage">
255
256- <div class="top-portlet">
257+ <div class="top-portlet" style="border-bottom: 1px solid;">
258 <img src="/@@/launchpad-logo-and-name.png"
259 alt=""
260 style="margin: 0 9em 1em 0"/>
261- <form id="homepage-searchform"
262- xml:lang="en" lang="en" dir="ltr"
263- tal:attributes="action string:${rooturl}+search"
264- method="get" accept-charset="UTF-8">
265- <input id="text" type="text" name="field.text" size="45" />
266- <input id="search" type="submit" value="Search Launchpad" />
267- </form>
268- <div id="homepage-stats">
269- <strong class="registry-stat"
270- tal:content="view/project_count/fmt:intcomma">123</strong>&nbsp;projects,
271- <strong class="bugs-stat"
272- tal:content="view/bug_count/fmt:intcomma">123</strong>&nbsp;bugs,
273- <strong class="code-stat"
274- tal:content="view/branch_count/fmt:intcomma">123</strong>&nbsp;branches,
275- <strong class="translations-stat"
276- tal:content="view/translation_count/fmt:intcomma">123</strong>&nbsp;translations,
277- <strong class="answers-stat"
278- tal:content="view/answer_count/fmt:intcomma">123</strong>&nbsp;answers,
279- <strong class="blueprints-stat"
280- tal:content="view/blueprint_count/fmt:intcomma">123</strong>&nbsp;blueprints,
281- and&nbsp;counting...
282- </div>
283 </div>
284
285- <div class="yui-gc">
286-
287+ <div class="yui-g">
288 <div class="yui-u first">
289- <div id="homepage-whatslaunchpad" class="homepage-portlet"
290+ <div class="homepage-whatslaunchpad"
291 tal:condition="not:view/user">
292- <h2>Launchpad is a software collaboration platform that provides:</h2>
293+ <h2><span class="launchpad-gold">Launchpad</span> is a software collaboration platform that provides:</h2>
294 <ul tal:define="apphomes view/apphomes">
295 <li><a tal:attributes="href apphomes/bugs"><img src="/@@/bug" alt="" /></a>
296 <a tal:attributes="href apphomes/bugs">Bug tracking</a></li>
297@@ -124,13 +101,35 @@
298 Find out more about Launchpad's privacy features for your commercial projects.
299 </li>
300 </ul>
301- <div id="homepage-blogposts-older">
302- <a href="http://blog.launchpad.net">&gt; Read the blog</a>
303+ <div class="homepage-blogposts-older">
304+ <a href="http://blog.launchpad.net">Read the blog</a>
305 </div>
306 </div>
307 </div>
308
309 <div class="yui-u">
310+ <form id="homepage-searchform"
311+ xml:lang="en" lang="en" dir="ltr"
312+ tal:attributes="action string:${rooturl}+search"
313+ method="get" accept-charset="UTF-8">
314+ <input id="text" type="text" name="field.text" size="25%" />
315+ <input id="search" type="submit" value="Search Launchpad" />
316+ </form>
317+ <div id="homepage-stats">
318+ <strong class="registry-stat"
319+ tal:content="view/project_count/fmt:intcomma">123</strong>&nbsp;projects,
320+ <strong class="bugs-stat"
321+ tal:content="view/bug_count/fmt:intcomma">123</strong>&nbsp;bugs,
322+ <strong class="code-stat"
323+ tal:content="view/branch_count/fmt:intcomma">123</strong>&nbsp;branches,
324+ <strong class="translations-stat"
325+ tal:content="view/translation_count/fmt:intcomma">123</strong>&nbsp;translations,
326+ <strong class="answers-stat"
327+ tal:content="view/answer_count/fmt:intcomma">123</strong>&nbsp;answers,
328+ <strong class="blueprints-stat"
329+ tal:content="view/blueprint_count/fmt:intcomma">123</strong>&nbsp;blueprints,
330+ and&nbsp;counting...
331+ </div>
332 <div id="homepage-getstarted" class="homepage-portlet">
333 <h2>Get started</h2>
334 <tal:logged_out condition="not:view/user" omit-tag="">
335@@ -188,8 +187,9 @@
336 <a tal:replace="structure project/fmt:link" />
337 </li>
338 </ul>
339- <div id="homepage-featured-more">
340- <a href="/projects">Browse all <strong class="registry-stat"
341+ <div class="homepage-featured-more">
342+ <a href="/projects">Browse all
343+ <strong class="registry-stat"
344 tal:content="view/project_count">42</strong> projects</a>!
345 </div>
346 <div tal:condition="context/required:launchpad.Admin"
347
348=== modified file 'lib/lp/registry/stories/foaf/xx-changepassword.txt'
349--- lib/lp/registry/stories/foaf/xx-changepassword.txt 2009-09-11 20:12:19 +0000
350+++ lib/lp/registry/stories/foaf/xx-changepassword.txt 2009-09-22 20:56:12 +0000
351@@ -58,5 +58,5 @@
352 >>> print anon_browser.url
353 http://launchpad.dev
354 >>> print extract_text(find_main_content(anon_browser.contents))
355- 20 projects,
356+ Recent Launchpad blog posts
357 ...