Ubuntu Apps Directory

Merge lp:~elachuni/ubuntu-webcatalog/design-improvements into lp:ubuntu-webcatalog

  1. design-improvements
  2. Merge into trunk
Proposed by Anthony Lenton
Status: Merged
Approved by: Danny Tamez
Approved revision: 98
Merged at revision: 97
Proposed branch: lp:~elachuni/ubuntu-webcatalog/design-improvements
Merge into: lp:ubuntu-webcatalog
Diff against target: 941 lines (+207/-137)
15 files modified
src/webcatalog/models/applications.py (+2/-2)
src/webcatalog/schema.py (+1/-1)
src/webcatalog/static/css/carousel.css (+17/-9)
src/webcatalog/static/css/webcatalog.css (+50/-27)
src/webcatalog/static/light/css/styles.css (+40/-26)
src/webcatalog/templates/light/index.1col.html (+28/-22)
src/webcatalog/templates/webcatalog/application_detail.html (+4/-2)
src/webcatalog/templates/webcatalog/department_overview.html (+14/-10)
src/webcatalog/templates/webcatalog/department_overview_snippet.html (+7/-7)
src/webcatalog/templates/webcatalog/featured_apps_widget.html (+5/-2)
src/webcatalog/templates/webcatalog/index.html (+24/-17)
src/webcatalog/templates/webcatalog/search_results.html (+3/-3)
src/webcatalog/templates/webcatalog/top_rated_apps_widget.html (+5/-2)
src/webcatalog/tests/test_models.py (+6/-6)
src/webcatalog/views.py (+1/-1)
To merge this branch: bzr merge lp:~elachuni/ubuntu-webcatalog/design-improvements
Reviewer Review Type Date Requested Status
Danny Tamez (community) Approve
Review via email: mp+100902@code.launchpad.net

Commit message

Layout improvements suggested by design.

Description of the change

Overview
========
This branch implements a few layout improvements suggested by design, and makes the general style and layout closer to uds.ubuntu.com.

Details
=======
A few screenshots of what the finished layout looks like:
 - Main index: http://people.canonical.com/~anthony/UAD-index.png
 - Department overview: http://people.canonical.com/~anthony/UAD-science-engineering.png
 - Application details: http://people.canonical.com/~anthony/UAD-app-details.png
 - Search results: http://people.canonical.com/~anthony/UAD-search-results.png
 - Search, no results: http://people.canonical.com/~anthony/UAD-no-search-results.png

Specific fixes implemented, in order of appearance in the diff:
 - Renamed the first step in the breadcrumb trail to "All Apps"
 - Updated the number of top-rated apps in the featured widget to 18 (3 slides, 6 apps per slide)
 - A bunch of css changes to implement the layout shown in the screenshots
 - Resized all department icons down to 24x24px
 - More css changes
 - Retrieve the Ubuntu font from Google.
 - Template changes to move the sidebar to the left, rearrange department icons as a portlet.
 - Restored breadcrumbs on the application details page (why was it commented out in the first place?)
 - More template changes to implement the layout shown in the screenshots
 - Test fixes to expect the changed breadcrumbs

To post a comment you must log in.
Revision history for this message
Danny Tamez (zematynnad) wrote :

Anthony all of the changes look and work great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/webcatalog/models/applications.py'
2--- src/webcatalog/models/applications.py 2012-03-29 21:47:54 +0000
3+++ src/webcatalog/models/applications.py 2012-04-05 01:52:19 +0000
4@@ -150,7 +150,7 @@
5 if depts.count():
6 crumbs = depts[0].crumbs(distro=self.distroseries.code_name)
7 else:
8- crumbs = [{'name': 'Get Software', 'url': reverse('wc-index')}]
9+ crumbs = [{'name': 'All Apps', 'url': reverse('wc-index')}]
10 crumbs.append({'name': self.name, 'url': reverse('wc-package-detail',
11 args=[self.distroseries.code_name, self.package_name])})
12 return crumbs
13@@ -211,7 +211,7 @@
14 if self.parent:
15 crumbs = self.parent.crumbs(distro=distro)
16 else:
17- crumbs = [{'name': 'Get Software', 'url': reverse('wc-index')}]
18+ crumbs = [{'name': 'All Apps', 'url': reverse('wc-index')}]
19 kwargs = {'dept_slug_or_id': self.slug}
20 if distro is not None:
21 kwargs['distro'] = distro
22
23=== modified file 'src/webcatalog/schema.py'
24--- src/webcatalog/schema.py 2012-03-26 14:56:25 +0000
25+++ src/webcatalog/schema.py 2012-04-05 01:52:19 +0000
26@@ -63,7 +63,7 @@
27 webcatalog.convoy_root = StringConfigOption()
28 webcatalog.featured_apps = LinesConfigOption(item=StringConfigOption(),
29 default=[])
30- webcatalog.number_top_rated_apps = IntConfigOption(default=8)
31+ webcatalog.number_top_rated_apps = IntConfigOption(default=18)
32 webcatalog.screenshots_base_url = StringConfigOption(
33 default='http://screenshots.ubuntu.com/')
34
35
36=== modified file 'src/webcatalog/static/css/carousel.css'
37--- src/webcatalog/static/css/carousel.css 2012-03-20 22:23:31 +0000
38+++ src/webcatalog/static/css/carousel.css 2012-04-05 01:52:19 +0000
39@@ -15,7 +15,7 @@
40 position: absolute;
41 z-index: 20;
42 left: 50%;
43- top: 87%;
44+ bottom: 5px;
45 margin-left: -35px;
46 }
47 .carousel .pagination li {
48@@ -107,14 +107,14 @@
49 /* Featured apps carousel */
50 .featured-widget {
51 background: url("/assets/images/pattern-featured.gif") repeat scroll 0 0 #ebe9e7;
52- border: 2px solid #aea79f;
53+ border: 1px solid #aea79f;
54 border-radius: 4px 4px 4px 4px;
55- margin-bottom: 30px;
56+ margin: 28px 0 30px 222px;
57 overflow: hidden;
58 padding: 5px;
59 }
60 .featured-widget .carousel-wrapper{
61- height: 140px;
62+ height: 320px;
63 }
64 .featured-widget div.carousel-container {
65 background-color: #fff;
66@@ -124,17 +124,25 @@
67 padding: 10px;
68 }
69
70-#content .featured-widget table {
71- width: 874px;
72-}
73+#content .featured-widget table p, #content .featured-widget table a {
74+ font-size: 12px;
75+}
76+#content .featured-widget table tr {
77+ border-bottom: 1px dotted #AEA79F;
78+}
79+
80+#content .featured-widget table tr.lastrow {
81+ border-bottom: 0;
82+}
83+
84 #content .featured-widget table td {
85 border-right: 1px dotted #AEA79F;
86 border-bottom: 0;
87- padding: 0 10px;
88+ padding: 10px 10px 0;
89 width: 202px;
90 }
91
92-#content .featured-widget table td.lastrow {
93+#content .featured-widget table td.lastcol {
94 border-right: 0;
95 }
96
97
98=== modified file 'src/webcatalog/static/css/webcatalog.css'
99--- src/webcatalog/static/css/webcatalog.css 2012-03-23 20:14:03 +0000
100+++ src/webcatalog/static/css/webcatalog.css 2012-04-05 01:52:19 +0000
101@@ -1,7 +1,6 @@
102 #content {
103- padding: 0 16px 32px 16px;
104- margin: 0 16px 64px;
105- background-color: #f7f7f7;
106+ padding: 0 0 32px;
107+ margin: 0 0 64px;
108 -moz-border-radius: 0 0 4px 4px;
109 -webkit-border-radius: 0 0 4px 4px;
110 -khtml-border-radius: 0 0 4px 4px;
111@@ -32,10 +31,10 @@
112 background: white url("/assets/images/sc-gradient.png") repeat-x top;
113 -moz-box-shadow: #bbb 2px 2px 5px 1px;
114 -webkit-box-shadow: #bbb 2px 2px 5px 1px;
115- margin: 12px 0 20px;
116+ margin: 0 0 20px;
117 font-size: 14px;
118 width: 684px;
119- float: left;
120+ float: right;
121 }
122
123 #sc-mockup h2 {
124@@ -110,13 +109,15 @@
125
126 /* End software centre mockup */
127
128-/* Right sidebar */
129-#rightbar {
130- float: right;
131+/* Left sidebar */
132+#leftbar {
133+ float: left;
134 width: 206px;
135- margin-top: 28px;
136 }
137
138+.portlet {
139+ margin-bottom: 32px;
140+}
141 .portletheader {
142 padding: 10px 8px;
143 font-size: 14px;
144@@ -139,9 +140,10 @@
145 }
146
147 ul.portletactions li a, ul.portletactions li span {
148- padding: 8px;
149+ padding: 4px 8px 4px 4px;
150 display: block;
151 color: black;
152+ line-height: 24px;
153 }
154
155 ul.portletactions li.active span, ul.portletactions a:hover {
156@@ -149,11 +151,11 @@
157 color: #E24912;
158 text-decoration: none;
159 }
160-/* End right sidebar */
161+/* End left sidebar */
162
163 .main-column {
164 width: 684px;
165- float: left;
166+ float: right;
167 }
168 #application-list td {
169 padding: 8px 0;
170@@ -177,28 +179,33 @@
171 }
172
173 .department {
174- width: 300px;
175- height: 56px;
176- float: left;
177+ width: 206px;
178 }
179
180 .department h3 {
181- margin-bottom: 8px;
182- padding-top: 8px;
183- line-height: 32px;
184+ line-height: 24px;
185 }
186
187 .department h3 a {
188- line-height: 32px;
189+ line-height: 24px;
190 }
191
192 #search-box.main {
193- margin-left: 270px;
194- width: 350px;
195+ margin: auto;
196+ width: 380px;
197+ border: 1px solid #AEA79F;
198+ border-radius: 4px 4px 4px 4px;
199+ float: left;
200+ box-shadow: 0 0 0 0;
201+}
202+#search-container h3 {
203+ float: left;
204+ line-height: 26px;
205+ margin-right: 32px;
206 }
207
208 #search-box.main #search-box-input {
209- width: 300px;
210+ width: 320px;
211 }
212 .install-bar {
213 background: #B1CEE6;
214@@ -214,8 +221,8 @@
215 }
216 .dept-icon {
217 float:left;
218- width:56px;
219- height:48px;
220+ width:32px;
221+ height:24px;
222 }
223
224 .icon64 {
225@@ -265,7 +272,6 @@
226 /* Breadcrumbs styles */
227 #breadcrumbs {
228 height: 25px;
229- margin: 16px 0;
230 }
231
232 #breadcrumbs li {
233@@ -359,11 +365,13 @@
234 border-bottom: 1px dotted gray;
235 }
236
237-.emaillinkportlet .portletheader, .debtags .portletheader {
238+.emaillinkportlet .portletheader, .debtags .portletheader, .versions .portletheader {
239 background: #bbb;
240- margin-bottom: 8px;
241 }
242
243+#emailForm {
244+ margin-top: 8px;
245+}
246 #emailForm label {
247 display: inline;
248 padding-bottom: 3px;
249@@ -400,3 +408,18 @@
250 list-style-type: circle;
251 margin-left: 16px;
252 }
253+
254+#search-container {
255+ background: url("/assets/images/pattern-featured.gif") repeat scroll 0 0 #ebe9e7;
256+ margin: 28px 0 30px 222px;
257+ padding: 5px;
258+ border: 1px solid #aea79f;
259+ border-radius: 4px 4px 4px 4px;
260+ height: 43px;
261+}
262+
263+h4.not-found {
264+ font-size: 32px;
265+ margin: 32px;
266+ color: #888;
267+}
268\ No newline at end of file
269
270=== modified file 'src/webcatalog/static/images/arrow-sprite.png'
271Binary files src/webcatalog/static/images/arrow-sprite.png 2012-03-05 23:14:54 +0000 and src/webcatalog/static/images/arrow-sprite.png 2012-04-05 01:52:19 +0000 differ
272=== modified file 'src/webcatalog/static/images/dept_icons/3d.png'
273Binary files src/webcatalog/static/images/dept_icons/3d.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/3d.png 2012-04-05 01:52:19 +0000 differ
274=== modified file 'src/webcatalog/static/images/dept_icons/accessories.png'
275Binary files src/webcatalog/static/images/dept_icons/accessories.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/accessories.png 2012-04-05 01:52:19 +0000 differ
276=== modified file 'src/webcatalog/static/images/dept_icons/astronomy.png'
277Binary files src/webcatalog/static/images/dept_icons/astronomy.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/astronomy.png 2012-04-05 01:52:19 +0000 differ
278=== modified file 'src/webcatalog/static/images/dept_icons/biology.png'
279Binary files src/webcatalog/static/images/dept_icons/biology.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/biology.png 2012-04-05 01:52:19 +0000 differ
280=== modified file 'src/webcatalog/static/images/dept_icons/board-games.png'
281Binary files src/webcatalog/static/images/dept_icons/board-games.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/board-games.png 2012-04-05 01:52:19 +0000 differ
282=== modified file 'src/webcatalog/static/images/dept_icons/card-games.png'
283Binary files src/webcatalog/static/images/dept_icons/card-games.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/card-games.png 2012-04-05 01:52:19 +0000 differ
284=== modified file 'src/webcatalog/static/images/dept_icons/chat.png'
285Binary files src/webcatalog/static/images/dept_icons/chat.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/chat.png 2012-04-05 01:52:19 +0000 differ
286=== modified file 'src/webcatalog/static/images/dept_icons/chemistry.png'
287Binary files src/webcatalog/static/images/dept_icons/chemistry.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/chemistry.png 2012-04-05 01:52:19 +0000 differ
288=== modified file 'src/webcatalog/static/images/dept_icons/computing-robotics.png'
289Binary files src/webcatalog/static/images/dept_icons/computing-robotics.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/computing-robotics.png 2012-04-05 01:52:19 +0000 differ
290=== modified file 'src/webcatalog/static/images/dept_icons/debugging.png'
291Binary files src/webcatalog/static/images/dept_icons/debugging.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/debugging.png 2012-04-05 01:52:19 +0000 differ
292=== modified file 'src/webcatalog/static/images/dept_icons/developer-tools.png'
293Binary files src/webcatalog/static/images/dept_icons/developer-tools.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/developer-tools.png 2012-04-05 01:52:19 +0000 differ
294=== modified file 'src/webcatalog/static/images/dept_icons/drawing.png'
295Binary files src/webcatalog/static/images/dept_icons/drawing.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/drawing.png 2012-04-05 01:52:19 +0000 differ
296=== modified file 'src/webcatalog/static/images/dept_icons/education.png'
297Binary files src/webcatalog/static/images/dept_icons/education.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/education.png 2012-04-05 01:52:19 +0000 differ
298=== modified file 'src/webcatalog/static/images/dept_icons/electronics.png'
299Binary files src/webcatalog/static/images/dept_icons/electronics.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/electronics.png 2012-04-05 01:52:19 +0000 differ
300=== modified file 'src/webcatalog/static/images/dept_icons/engineering.png'
301Binary files src/webcatalog/static/images/dept_icons/engineering.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/engineering.png 2012-04-05 01:52:19 +0000 differ
302=== modified file 'src/webcatalog/static/images/dept_icons/file-sharing.png'
303Binary files src/webcatalog/static/images/dept_icons/file-sharing.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/file-sharing.png 2012-04-05 01:52:19 +0000 differ
304=== modified file 'src/webcatalog/static/images/dept_icons/fonts.png'
305Binary files src/webcatalog/static/images/dept_icons/fonts.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/fonts.png 2012-04-05 01:52:19 +0000 differ
306=== modified file 'src/webcatalog/static/images/dept_icons/games.png'
307Binary files src/webcatalog/static/images/dept_icons/games.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/games.png 2012-04-05 01:52:19 +0000 differ
308=== modified file 'src/webcatalog/static/images/dept_icons/geography.png'
309Binary files src/webcatalog/static/images/dept_icons/geography.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/geography.png 2012-04-05 01:52:19 +0000 differ
310=== modified file 'src/webcatalog/static/images/dept_icons/geology.png'
311Binary files src/webcatalog/static/images/dept_icons/geology.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/geology.png 2012-04-05 01:52:19 +0000 differ
312=== modified file 'src/webcatalog/static/images/dept_icons/graphic-interface-design.png'
313Binary files src/webcatalog/static/images/dept_icons/graphic-interface-design.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/graphic-interface-design.png 2012-04-05 01:52:19 +0000 differ
314=== modified file 'src/webcatalog/static/images/dept_icons/graphics.png'
315Binary files src/webcatalog/static/images/dept_icons/graphics.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/graphics.png 2012-04-05 01:52:19 +0000 differ
316=== modified file 'src/webcatalog/static/images/dept_icons/ides.png'
317Binary files src/webcatalog/static/images/dept_icons/ides.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/ides.png 2012-04-05 01:52:19 +0000 differ
318=== modified file 'src/webcatalog/static/images/dept_icons/internet.png'
319Binary files src/webcatalog/static/images/dept_icons/internet.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/internet.png 2012-04-05 01:52:19 +0000 differ
320=== modified file 'src/webcatalog/static/images/dept_icons/localization.png'
321Binary files src/webcatalog/static/images/dept_icons/localization.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/localization.png 2012-04-05 01:52:19 +0000 differ
322=== modified file 'src/webcatalog/static/images/dept_icons/mail.png'
323Binary files src/webcatalog/static/images/dept_icons/mail.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/mail.png 2012-04-05 01:52:19 +0000 differ
324=== modified file 'src/webcatalog/static/images/dept_icons/mathematics.png'
325Binary files src/webcatalog/static/images/dept_icons/mathematics.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/mathematics.png 2012-04-05 01:52:19 +0000 differ
326=== modified file 'src/webcatalog/static/images/dept_icons/office.png'
327Binary files src/webcatalog/static/images/dept_icons/office.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/office.png 2012-04-05 01:52:19 +0000 differ
328=== modified file 'src/webcatalog/static/images/dept_icons/painting.png'
329Binary files src/webcatalog/static/images/dept_icons/painting.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/painting.png 2012-04-05 01:52:19 +0000 differ
330=== modified file 'src/webcatalog/static/images/dept_icons/photography.png'
331Binary files src/webcatalog/static/images/dept_icons/photography.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/photography.png 2012-04-05 01:52:19 +0000 differ
332=== modified file 'src/webcatalog/static/images/dept_icons/physics.png'
333Binary files src/webcatalog/static/images/dept_icons/physics.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/physics.png 2012-04-05 01:52:19 +0000 differ
334=== modified file 'src/webcatalog/static/images/dept_icons/profiling.png'
335Binary files src/webcatalog/static/images/dept_icons/profiling.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/profiling.png 2012-04-05 01:52:19 +0000 differ
336=== modified file 'src/webcatalog/static/images/dept_icons/publishing.png'
337Binary files src/webcatalog/static/images/dept_icons/publishing.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/publishing.png 2012-04-05 01:52:19 +0000 differ
338=== modified file 'src/webcatalog/static/images/dept_icons/puzzles.png'
339Binary files src/webcatalog/static/images/dept_icons/puzzles.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/puzzles.png 2012-04-05 01:52:19 +0000 differ
340=== modified file 'src/webcatalog/static/images/dept_icons/role-playing.png'
341Binary files src/webcatalog/static/images/dept_icons/role-playing.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/role-playing.png 2012-04-05 01:52:19 +0000 differ
342=== modified file 'src/webcatalog/static/images/dept_icons/scanning-ocr.png'
343Binary files src/webcatalog/static/images/dept_icons/scanning-ocr.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/scanning-ocr.png 2012-04-05 01:52:19 +0000 differ
344=== modified file 'src/webcatalog/static/images/dept_icons/science-engineering.png'
345Binary files src/webcatalog/static/images/dept_icons/science-engineering.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/science-engineering.png 2012-04-05 01:52:19 +0000 differ
346=== modified file 'src/webcatalog/static/images/dept_icons/sound-video.png'
347Binary files src/webcatalog/static/images/dept_icons/sound-video.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/sound-video.png 2012-04-05 01:52:19 +0000 differ
348=== modified file 'src/webcatalog/static/images/dept_icons/sports.png'
349Binary files src/webcatalog/static/images/dept_icons/sports.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/sports.png 2012-04-05 01:52:19 +0000 differ
350=== modified file 'src/webcatalog/static/images/dept_icons/themes-tweaks.png'
351Binary files src/webcatalog/static/images/dept_icons/themes-tweaks.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/themes-tweaks.png 2012-04-05 01:52:19 +0000 differ
352=== modified file 'src/webcatalog/static/images/dept_icons/universal-access.png'
353Binary files src/webcatalog/static/images/dept_icons/universal-access.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/universal-access.png 2012-04-05 01:52:19 +0000 differ
354=== modified file 'src/webcatalog/static/images/dept_icons/version-control.png'
355Binary files src/webcatalog/static/images/dept_icons/version-control.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/version-control.png 2012-04-05 01:52:19 +0000 differ
356=== modified file 'src/webcatalog/static/images/dept_icons/viewers.png'
357Binary files src/webcatalog/static/images/dept_icons/viewers.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/viewers.png 2012-04-05 01:52:19 +0000 differ
358=== modified file 'src/webcatalog/static/images/dept_icons/web-browsers.png'
359Binary files src/webcatalog/static/images/dept_icons/web-browsers.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/web-browsers.png 2012-04-05 01:52:19 +0000 differ
360=== modified file 'src/webcatalog/static/images/dept_icons/web-development.png'
361Binary files src/webcatalog/static/images/dept_icons/web-development.png 2012-03-09 17:28:02 +0000 and src/webcatalog/static/images/dept_icons/web-development.png 2012-04-05 01:52:19 +0000 differ
362=== modified file 'src/webcatalog/static/light/css/styles.css'
363--- src/webcatalog/static/light/css/styles.css 2012-03-12 09:05:19 +0000
364+++ src/webcatalog/static/light/css/styles.css 2012-04-05 01:52:19 +0000
365@@ -2,26 +2,24 @@
366 font-family: 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
367 color: #333;
368 background: white url(/assets/light/images/body_bg.png);
369- font-size: 12px;
370+ font-size: 14px;
371 line-height: 16px;
372 margin: 0px;
373 padding: 0px;
374 }
375 #container {
376 background: #f7f6f5;
377- margin: 0px auto 20px;
378+ margin: 0 auto;
379 padding: 0px;
380- width: 976px;
381+ width: 980px;
382 }
383 #container-inner {
384 background-color: #fff;
385 }
386 #header, #container-inner {
387- -moz-border-radius: 0px 0px 5px 5px;
388- -webkit-border-bottom-left-radius: 5px;
389- -webkit-border-bottom-right-radius: 5px;
390- -moz-box-shadow: #bbb 0px 0px 5px;
391- -webkit-box-shadow: #bbb 0px 0px 5px;
392+ -moz-border-radius: 0px 0px 4px 4px;
393+ -webkit-border-bottom-left-radius: 4px;
394+ -webkit-border-bottom-right-radius: 4px;
395 }
396 #header {
397 background: #dd4814 url(/assets/light/images/header_bg.png) top left repeat-x;
398@@ -33,7 +31,6 @@
399
400 #menu-search {
401 height: 40px;
402- margin: 0 16px;
403 }
404 #search-box {
405 margin-left: 720px;
406@@ -55,7 +52,7 @@
407 border-width: 1px medium medium 1px;
408 margin: 8px 0 0 8px;
409 padding: 1px;
410- font-size: 12px;
411+ font-size: 14px;
412 }
413 #search-box-button {
414 float: left;
415@@ -81,14 +78,13 @@
416 }
417
418 #title {
419- padding: 28px 24px;
420+ padding: 18px 0px;
421 }
422
423 #content {
424 padding: 24px 240px 32px 160px;
425 margin: 0 16px 64px;
426 width: 544px;
427- background-color: #f7f7f7;
428 -moz-border-radius: 4px;
429 -webkit-border-radius: 4px;
430 }
431@@ -122,9 +118,9 @@
432
433 #copyright {
434 color: #aea79f;
435- font-size: 10px;
436+ font-size: 12px;
437 margin: 0 16px;
438- padding: 40px 0 0 0;
439+ padding: 0;
440 height: 40px;
441 line-height: 14px;
442 }
443@@ -141,12 +137,11 @@
444 #ubuntu-header {
445 background-image: url(/assets/light/images/header_logo.png);
446 background-repeat: no-repeat;
447+ float: left;
448 height: 32px;
449- left: 841px;
450- margin: 0;
451- padding: 0;
452- position: absolute;
453- top: 16px;
454+ margin: 0 0 0 20px;
455+ position: relative;
456+ top: 14px;
457 width: 117px;
458 overflow: hidden;
459 text-indent: -9999px;
460@@ -156,12 +151,31 @@
461 height: 100%;
462 width: 100%;
463 }
464+h2#ubuntu-apps-directory {
465+ margin: 0;
466+ padding: 0;
467+}
468+#ubuntu-apps-directory a {
469+ color: #fff;
470+ float: left;
471+ text-decoration: none;
472+ font-size: 18px;
473+ text-transform: lowercase;
474+ position: relative;
475+ top: 25px;
476+ left: 5px;
477+}
478+.inner-wrapper {
479+ border-radius: 0 0 4px 4px;
480+ box-shadow: 0 2px 3px #C9C9C9;
481+ padding: 0 20px;
482+}
483
484 #footer {
485 padding-top: 16px;
486 }
487 #footer * {
488- font-size: 10px;
489+ font-size: 12px;
490 line-height: 16px;
491 }
492 #footer p {
493@@ -173,7 +187,7 @@
494 font-weight: bold;
495 }
496 #footer .footer-div {
497- height: 152px;
498+ height: 102px;
499 width: 144px;
500 float: left;
501 margin-left: 16px;
502@@ -242,7 +256,7 @@
503 padding-top: 8px;
504 }
505 h3 {
506- font-size: 16px;
507+ font-size: 18px;
508 line-height: 20px;
509 margin-bottom: 8px;
510 padding-top: 8px;
511@@ -254,7 +268,7 @@
512 color: #fff;
513 }
514 h4 {
515- font-size: 12px;
516+ font-size: 14px;
517 line-height: 16px;
518 }
519 h4.link-news {
520@@ -270,11 +284,11 @@
521 }
522 h5 {
523 color: #333;
524- font-size: 10px;
525+ font-size: 14px;
526 line-height: 14px;
527 }
528 p {
529- font-size: 12px;
530+ font-size: 14px;
531 line-height: 16px;
532 margin-bottom: 8px;
533 }
534@@ -348,7 +362,7 @@
535 }
536 p.small-text {
537 color: #333;
538- font-size: 10px;
539+ font-size: 12px;
540 }
541
542 .newsfeed {
543
544=== modified file 'src/webcatalog/static/light/images/body_bg.png'
545Binary files src/webcatalog/static/light/images/body_bg.png 2011-04-12 13:16:43 +0000 and src/webcatalog/static/light/images/body_bg.png 2012-04-05 01:52:19 +0000 differ
546=== modified file 'src/webcatalog/templates/light/index.1col.html'
547--- src/webcatalog/templates/light/index.1col.html 2012-03-12 09:05:19 +0000
548+++ src/webcatalog/templates/light/index.1col.html 2012-04-05 01:52:19 +0000
549@@ -3,6 +3,7 @@
550 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
551 <head>
552 <title>{% block title %}{% endblock %}</title>
553+ <link rel="stylesheet" type="text/css" media="all" href="https://fonts.googleapis.com/css?family=Ubuntu:300,300italic,400,400italic" />
554 {% block head_extra %}
555 <link rel="stylesheet" type="text/css" href="{% url wc-combo %}?light/css/reset.css&light/css/styles.css&light/css/forms.css"/>
556 {% endblock %}
557@@ -13,6 +14,7 @@
558 <div id="header">
559 {% block logo %}
560 <h1 id="ubuntu-header"><a href="http://www.ubuntu.com/">Ubuntu</a></h1>
561+ <h2 id="ubuntu-apps-directory"><a href="/">Apps Directory</a></h2>
562 {% endblock %}
563 {% block menus %}
564 <ul id="main-menu">
565@@ -27,31 +29,35 @@
566 </ul>
567 {% endblock %}
568 </div>
569- <div id="menu-search">
570- {% block search %}
571- <div id="search-box">
572- <form id="sitesearch" action="http://www.ubuntu.com/search/node" method="post">
573- <input type="text" maxlength="128" name="search_theme_form" id="search-box-input"
574- value="Type to search" title="Enter the terms you wish to search for."
575- onblur="if(this.value==&#039;&#039;){this.value=&#039;Type to search&#039;;}"
576- onfocus="if(this.value==&#039;Type to search&#039;){this.value=&#039;&#039;}"
577- />
578- <button type="submit" name="op" id="search-box-button"><span>go</span></button>
579- <input type="hidden" name="form_build_id" id="form-967ff0ccc1a2f6f6d92f3e8c0822866d" value="form-967ff0ccc1a2f6f6d92f3e8c0822866d" />
580- <input type="hidden" name="form_token" id="a-unique-id" value="656a58b3b2c4f37a2af1d6b188a4a595" />
581- <input type="hidden" name="form_id" id="edit-search-theme-form" value="search_theme_form" />
582- </form>
583- </div>
584- {% endblock %}
585- </div>
586- <div id="title">
587- <h1>{% block header %}{% endblock %}</h1>
588- </div>
589+ <div class="inner-wrapper">
590+ <div id="menu-search">
591+ {% block search %}
592+ <div id="search-box">
593+ <form id="sitesearch" action="http://www.ubuntu.com/search/node" method="post">
594+ <input type="text" maxlength="128" name="search_theme_form" id="search-box-input"
595+ value="Type to search" title="Enter the terms you wish to search for."
596+ onblur="if(this.value==&#039;&#039;){this.value=&#039;Type to search&#039;;}"
597+ onfocus="if(this.value==&#039;Type to search&#039;){this.value=&#039;&#039;}"
598+ />
599+ <button type="submit" name="op" id="search-box-button"><span>go</span></button>
600+ <input type="hidden" name="form_build_id" id="form-967ff0ccc1a2f6f6d92f3e8c0822866d" value="form-967ff0ccc1a2f6f6d92f3e8c0822866d" />
601+ <input type="hidden" name="form_token" id="a-unique-id" value="656a58b3b2c4f37a2af1d6b188a4a595" />
602+ <input type="hidden" name="form_id" id="edit-search-theme-form" value="search_theme_form" />
603+ </form>
604+ </div>
605+ {% endblock %}
606+ </div>
607+{% block header_container %}
608+ <div id="title">
609+ <h1>{% block header %}{% endblock %}</h1>
610+ </div>
611+{% endblock %}
612 {% block content_container %}
613- <div id="content" class="clearfix content-area">
614+ <div id="content" class="clearfix content-area">
615 {% block content %}{% endblock %}
616+ </div>
617+{% endblock %}
618 </div>
619-{% endblock %}
620 </div>
621 <div id="footer" class="clearfix">
622 {% block footer %}
623
624=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
625--- src/webcatalog/templates/webcatalog/application_detail.html 2012-03-23 22:41:16 +0000
626+++ src/webcatalog/templates/webcatalog/application_detail.html 2012-04-05 01:52:19 +0000
627@@ -33,8 +33,7 @@
628 <p class='success message'>{{ message }}</p>
629 {% endfor %}
630 {% endif %}
631- <!-- {% include "webcatalog/breadcrumbs_snippet.html" %} -->
632- <div id="rightbar">
633+ <div id="leftbar">
634 <div class="portlet">
635 <div class="portletheader">Available versions</div>
636 <ul class="portletactions">
637@@ -69,6 +68,8 @@
638 </div>
639 {% endif %}
640 </div>
641+<div class="main-column">
642+ {% include "webcatalog/breadcrumbs_snippet.html" %}
643 <div id="sc-mockup">
644 <div class="header">
645 {% rating_summary application.ratings_average 'large' application.ratings_total %}
646@@ -118,4 +119,5 @@
647 </div>
648 </div>
649 </div>
650+</div>
651 {% endblock %}
652
653=== modified file 'src/webcatalog/templates/webcatalog/department_overview.html'
654--- src/webcatalog/templates/webcatalog/department_overview.html 2012-03-12 15:30:15 +0000
655+++ src/webcatalog/templates/webcatalog/department_overview.html 2012-04-05 01:52:19 +0000
656@@ -5,10 +5,20 @@
657 {% block header %}{% trans "Ubuntu Apps Directory" %} &mdash; {{ dept.name }}{% endblock %}
658
659 {% block content %}
660- {% include "webcatalog/breadcrumbs_snippet.html" %}
661
662- <div id="rightbar">
663+ <div id="leftbar">
664+{% if subdepts %}
665 <div class="portlet">
666+ <div class="portletheader">Sub departments</div>
667+ <ul class="portletactions">
668+{% for dept in subdepts %}
669+ {% include "webcatalog/department_overview_snippet.html" %}
670+{% endfor %}
671+ </ul>
672+ </div>
673+ <p style="clear:both"/>
674+{% endif %}
675+ <div class="portlet versions">
676 <div class="portletheader">Available versions</div>
677 <ul class="portletactions">
678 {% for ds in available_distroseries %}
679@@ -24,13 +34,7 @@
680 </div>
681
682 <div class="main-column">
683-{% if subdepts %}
684-<h3>{% trans "Subsections" %}:</h3>
685-
686-{% for dept in subdepts %}
687- {% include "webcatalog/department_overview_snippet.html" %}
688-{% endfor %}
689-{% endif %}
690+ {% include "webcatalog/breadcrumbs_snippet.html" %}
691
692 <p style="clear:both"/>
693
694@@ -41,7 +45,7 @@
695 {% endwith %}
696 {% include "webcatalog/batch_navigation.html" %}
697 {% else %}
698-<p>{% trans "No applications found." %}</p>
699+<h4 class="not-found">{% trans "No applications found." %}</p>
700 {% endif %}
701 </div>
702
703
704=== modified file 'src/webcatalog/templates/webcatalog/department_overview_snippet.html'
705--- src/webcatalog/templates/webcatalog/department_overview_snippet.html 2012-03-12 15:30:15 +0000
706+++ src/webcatalog/templates/webcatalog/department_overview_snippet.html 2012-04-05 01:52:19 +0000
707@@ -1,8 +1,8 @@
708- <div class="department">
709- <div class="dept-icon">
710- <a href="{% url wc-department dept_slug_or_id=dept.slug %}">
711- <img width="48" height="48"
712- src="{{ STATIC_URL }}images/dept_icons/{{ dept.slug }}.png"/>
713- </a></div>
714- <h3><a href="{% url wc-department dept_slug_or_id=dept.slug %}">{{ dept.name }}</a></h3>
715+<li class="department">
716+ <a href="{% url wc-department dept_slug_or_id=dept.slug %}">
717+ <div class="dept-icon">
718+ <img width="24" height="24"
719+ src="{{ STATIC_URL }}images/dept_icons/{{ dept.slug }}.png"/>
720 </div>
721+ {{ dept.name }}</a>
722+</li>
723
724=== modified file 'src/webcatalog/templates/webcatalog/featured_apps_widget.html'
725--- src/webcatalog/templates/webcatalog/featured_apps_widget.html 2012-03-20 22:23:31 +0000
726+++ src/webcatalog/templates/webcatalog/featured_apps_widget.html 2012-04-05 01:52:19 +0000
727@@ -14,13 +14,16 @@
728 <li class="slide{% if forloop.counter > 1%} disabled{% endif %}">
729 <table class="apps"><tr>
730 {% for app in featured_apps %}
731- <td{% if forloop.counter|divisibleby:4 %} class="lastrow"{% endif %}>
732+ <td{% if forloop.counter|divisibleby:3 %} class="lastcol"{% endif %}>
733 <a href="{% url wc-package-detail package_name=app.package_name %}"><img class="icon64" src="{{ app.icon_url_or_default }}"/></a>
734 <h4><a href="{% url wc-package-detail package_name=app.package_name %}">{{ app.name }}</a></h4>
735 <p>{{ app.departments.all.0.name }} | <b>{% if app.price %}${{ app.price }}{% else %}FREE{% endif %}</b></p>
736 <p>{{ app.comment }}</p>
737 </td>
738- {% if forloop.counter|divisibleby:4 and not forloop.last %}
739+ {% if forloop.counter|divisibleby:3 and not forloop.counter|divisibleby:6 %}
740+ </tr><tr class="lastrow">
741+ {% endif %}
742+ {% if forloop.counter|divisibleby:6 and not forloop.last %}
743 </tr></table>
744 </li>
745 <li class="slide{% if forloop.counter > 1%} disabled{% endif %}">
746
747=== modified file 'src/webcatalog/templates/webcatalog/index.html'
748--- src/webcatalog/templates/webcatalog/index.html 2012-03-16 19:27:47 +0000
749+++ src/webcatalog/templates/webcatalog/index.html 2012-04-05 01:52:19 +0000
750@@ -2,7 +2,7 @@
751 {% load i18n %}
752
753 {% block title %}{% trans "Ubuntu Apps Directory" %}{% endblock %}
754-{% block header %}{% trans "Ubuntu Apps Directory" %}{% endblock %}
755+{% block header_container %}{% endblock %}
756 {% block search %}{% endblock %}
757
758 {% block head_extra %}
759@@ -19,26 +19,20 @@
760 </div>
761 {% endif %}
762
763-{% if featured_apps %}
764-<div class="featured-widget">
765- {% include "webcatalog/featured_apps_widget.html" %}
766-</div>
767-{% endif %}
768-
769-{% if top_rated_apps %}
770-<div class="featured-widget">
771- {% include "webcatalog/top_rated_apps_widget.html" %}
772- </div>
773-{% endif %}
774-
775-<h3>{% trans "Browse application departments" %}:</h3>
776-
777+<div id="leftbar">
778+ <div class="portlet">
779+ <div class="portletheader">App departments</div>
780+ <ul class="portletactions">
781 {% for dept in depts %}
782 {% include "webcatalog/department_overview_snippet.html" %}
783 {% endfor %}
784+ </ul>
785+ </div>
786+ <p style="clear:both"/>
787+</div>
788
789-<p style="clear:both"/>
790-<h3>{% trans "Or, search for an application" %}:</h3>
791+<div id="search-container">
792+<h3>{% trans "Search for an application" %}:</h3>
793
794 <div id="search-box" class="main">
795 <form id="sitesearch" action="{% url wc-search %}" method="get">
796@@ -47,5 +41,18 @@
797 <button type="submit" name="op" id="search-box-button"><span>go</span></button>
798 </form>
799 </div>
800+</div>
801+
802+{% if featured_apps %}
803+<div class="featured-widget">
804+ {% include "webcatalog/featured_apps_widget.html" %}
805+</div>
806+{% endif %}
807+
808+{% if top_rated_apps %}
809+<div class="featured-widget">
810+ {% include "webcatalog/top_rated_apps_widget.html" %}
811+ </div>
812+{% endif %}
813
814 {% endblock %}
815
816=== modified file 'src/webcatalog/templates/webcatalog/search_results.html'
817--- src/webcatalog/templates/webcatalog/search_results.html 2011-07-20 15:27:06 +0000
818+++ src/webcatalog/templates/webcatalog/search_results.html 2012-04-05 01:52:19 +0000
819@@ -5,9 +5,8 @@
820
821 {% block header %}{% trans "Search results" %}{% endblock %}
822 {% block content %}
823- {% include "webcatalog/breadcrumbs_snippet.html" %}
824
825- <div id="rightbar">
826+ <div id="leftbar">
827 <div class="portlet">
828 <div class="portletheader">Search within</div>
829 <ul class="portletactions">
830@@ -24,6 +23,7 @@
831 </div>
832
833 <div class="main-column">
834+ {% include "webcatalog/breadcrumbs_snippet.html" %}
835 {% if query %}
836 <h3>{% blocktrans %}Searched for "{{query}}"{% endblocktrans %}</h3>
837 {% if page.object_list %}
838@@ -33,7 +33,7 @@
839 {% endwith %}
840 {% include "webcatalog/batch_navigation.html" %}
841 {% else %}
842-<p>{% trans "No applications found." %}</p>
843+<h4 class="not-found">{% trans "No applications found." %}</p>
844 {% endif %}
845 {% else %}
846 <h3>{% trans "You didn't search for anything!" %}</h3>
847
848=== modified file 'src/webcatalog/templates/webcatalog/top_rated_apps_widget.html'
849--- src/webcatalog/templates/webcatalog/top_rated_apps_widget.html 2012-03-20 22:23:31 +0000
850+++ src/webcatalog/templates/webcatalog/top_rated_apps_widget.html 2012-04-05 01:52:19 +0000
851@@ -15,7 +15,7 @@
852 <li class="slide{% if forloop.counter > 1%} disabled{% endif %}">
853 <table class="apps"><tr>
854 {% for app in top_rated_apps %}
855- <td{% if forloop.counter|divisibleby:4 %} class="lastrow"{% endif %}>
856+ <td{% if forloop.counter|divisibleby:3 %} class="lastcol"{% endif %}>
857 <a href="{% url wc-package-detail package_name=app.package_name %}"><img class="icon64" src="{{ app.icon_url_or_default }}"/></a>
858 <h4><a href="{% url wc-package-detail package_name=app.package_name %}">{{ app.name }}</a></h4>
859 <p>{{ app.departments.all.0.name }} | <b>{% if app.price %}${{ app.price }}{% else %}FREE{% endif %}</b></p>
860@@ -24,7 +24,10 @@
861 {% rating_summary app.ratings_average 'small' app.ratings_total %}
862 </div>
863 </td>
864- {% if forloop.counter|divisibleby:4 and not forloop.last %}
865+ {% if forloop.counter|divisibleby:3 and not forloop.counter|divisibleby:6 %}
866+ </tr><tr class="lastrow">
867+ {% endif %}
868+ {% if forloop.counter|divisibleby:6 and not forloop.last %}
869 </tr></table>
870 </li>
871 <li class="slide{% if forloop.counter > 1%} disabled{% endif %}">
872
873=== modified file 'src/webcatalog/tests/test_models.py'
874--- src/webcatalog/tests/test_models.py 2012-03-16 17:18:41 +0000
875+++ src/webcatalog/tests/test_models.py 2012-04-05 01:52:19 +0000
876@@ -66,7 +66,7 @@
877 def test_crumbs_no_department(self):
878 app = self.factory.make_application()
879 self.assertEquals([], list(app.departments.all()))
880- expected = [{'name': 'Get Software', 'url': reverse('wc-index')},
881+ expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
882 {'name': app.name, 'url': reverse('wc-package-detail',
883 args=[app.distroseries.code_name, app.package_name])}]
884
885@@ -77,7 +77,7 @@
886 app.categories = 'Game;'
887 app.update_departments()
888 dept = app.departments.get()
889- expected = [{'name': 'Get Software', 'url': reverse('wc-index')},
890+ expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
891 {'name': dept.name, 'url': reverse('wc-department',
892 kwargs={'distro': app.distroseries.code_name,
893 'dept_slug_or_id': dept.slug})},
894@@ -91,7 +91,7 @@
895 app.categories = 'RolePlaying;'
896 app.update_departments()
897 dept = app.departments.get()
898- expected = [{'name': 'Get Software', 'url': reverse('wc-index')},
899+ expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
900 {'name': dept.parent.name, 'url': reverse('wc-department',
901 kwargs={'distro': app.distroseries.code_name,
902 'dept_slug_or_id': dept.parent.slug})},
903@@ -125,7 +125,7 @@
904 class DepartmentTestCase(TestCaseWithFactory):
905 def test_crumbs_no_parent(self):
906 dept = self.factory.make_department('Foo')
907- expected = [{'name': 'Get Software', 'url': reverse('wc-index')},
908+ expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
909 {'name': dept.name, 'url': reverse('wc-department',
910 kwargs={'dept_slug_or_id': dept.slug})}]
911
912@@ -134,7 +134,7 @@
913 def test_crumbs_with_parent(self):
914 parent = self.factory.make_department('Foo')
915 dept = self.factory.make_department('Bar', parent=parent)
916- expected = [{'name': 'Get Software', 'url': reverse('wc-index')},
917+ expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
918 {'name': dept.parent.name, 'url': reverse('wc-department',
919 kwargs={'dept_slug_or_id': dept.parent.slug})},
920 {'name': dept.name, 'url': reverse('wc-department',
921@@ -145,7 +145,7 @@
922 def test_crumbs_with_distroseries(self):
923 parent = self.factory.make_department('Foo')
924 dept = self.factory.make_department('Bar', parent=parent)
925- expected = [{'name': 'Get Software', 'url': reverse('wc-index')},
926+ expected = [{'name': 'All Apps', 'url': reverse('wc-index')},
927 {'name': dept.parent.name, 'url': reverse('wc-department',
928 kwargs={'distro': 'frobbly',
929 'dept_slug_or_id': dept.parent.slug})},
930
931=== modified file 'src/webcatalog/views.py'
932--- src/webcatalog/views.py 2012-03-30 10:42:48 +0000
933+++ src/webcatalog/views.py 2012-04-05 01:52:19 +0000
934@@ -90,7 +90,7 @@
935 apps = Application.objects.filter(is_latest=True)
936 apps = apps.filter(reduce(operator.or_, ors)).order_by('name')
937
938- crumbs = [{'name': 'Get Software', 'url': reverse('wc-index')},
939+ crumbs = [{'name': 'All Apps', 'url': reverse('wc-index')},
940 {'name': 'Search results', 'url': request.build_absolute_uri()},
941 ]
942

Subscribers

People subscribed via source and target branches