Merge lp://staging/~zematynnad/ubuntu-webcatalog/buttons__938167 into lp://staging/ubuntu-webcatalog
Status: | Merged |
---|---|
Approved by: | Danny Tamez |
Approved revision: | 79 |
Merged at revision: | 76 |
Proposed branch: | lp://staging/~zematynnad/ubuntu-webcatalog/buttons__938167 |
Merge into: | lp://staging/ubuntu-webcatalog |
Diff against target: |
355 lines (+83/-86) 6 files modified
src/webcatalog/static/css/webcatalog.css (+8/-24) src/webcatalog/templates/webcatalog/application_detail.html (+2/-2) src/webcatalog/templates/webcatalog/install_options_snippet.html (+12/-7) src/webcatalog/templatetags/webcatalog.py (+19/-19) src/webcatalog/tests/test_templatetags.py (+35/-30) src/webcatalog/tests/test_views.py (+7/-4) |
To merge this branch: | bzr merge lp://staging/~zematynnad/ubuntu-webcatalog/buttons__938167 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Danny Tamez (community) | Approve | ||
Michael Nelson (community) | Approve | ||
Review via email: mp+96836@code.staging.launchpad.net |
Commit message
Several button fixes
Description of the change
Overview
=========
This branch adds fancy download buttons for apps an also has some drive by fixes for 2 related bugs.
Details
=========
For bug 938167 - new buttons are being used and replace the old grey buttons. Here are some screenshots:
Purchase button: http://
Free button: http://
Download ubuntu: http://
For bug 861593 - the issue with bad wrapping and button display has been alleviated. Screenshots:
Chrome button: http://
Chrome also available: http://
Since this anchor was really a link to the download page and not a download itself I left this as a link and not a button.
For bug 944254 - the text about the app not being available for your operating system has been removed.
To Test
========
$fab bootstrap test
On Fri, Mar 9, 2012 at 10:31 PM, Danny Tamez <email address hidden> wrote: simplest- image-hosting. net/png- 0-ac2075 simplest- image-hosting. net/png- 0-gr2075 simplest- image-hosting. net/png- 0-wg2075
> Overview
> =========
> This branch adds fancy download buttons for apps an also has some drive by fixes for 2 related bugs.
>
> Details
> =========
> For bug 938167 - new buttons are being used and replace the old grey buttons. Here are some screenshots:
> Purchase button: http://
> Free button: http://
> Download ubuntu: http://
Cool - I like the purchase and free buttons. I'm not sure about the
download ubuntu button there though? It seems a bit out of place there
next to the app, and would perhaps belong elsewhere on the page (ie.
where there's space to say "Haven't tried Ubuntu? [[Download Ubuntu
graphic/link]]"). But if it's something you've already discussed in a
pre-imp. with someone, great.
I've put that comment on the bug so if there is a discussion, it can
happen there. I realise that's not something you'd changed (it's an
option to the template tag), but it may or may not be worth
discussing.
> simplest- image-hosting. net/png- 0-io2075 simplest- image-hosting. net/png- 0-jv2086
> For bug 861593 - the issue with bad wrapping and button display has been alleviated. Screenshots:
> Chrome button: http://
> Chrome also available: http://
> Since this anchor was really a link to the download page and not a download itself I left this as a link and not a button.
Yikes - yes, +1 for that being a link. The link looks much more
natural. I've put a few comments with the inline changes related to
this.
>
> For bug 944254 - the text about the app not being available for your operating system has been removed.
I've added a comment on that bug too (we should use {% trans %} for
the title of the images).
Other comments inline below.
> /code.launchpad .net/~zematynna d/ubuntu- webcatalog/ buttons_ _938167/ +merge/ 96836 /static/ css/webcatalog. css' static/ css/webcatalog. css 2012-03-08 20:27:19 +0000 static/ css/webcatalog. css 2012-03-09 21:30:35 +0000 /static/ images/ scbutton- free-200px. png' static/ images/ scbutton- free-200px. png 1970-01-01 00:00:00 +0000 and src/webcatalog/ static/ images/ scbutton- free-200px. png 2012-03-09 21:30:35 +0000 differ /static/ images/ scbutton- non-free- 200px.png' static/ images/ scbutton- non-free- 200px.png 1970-01-01 00:00:00 +0000 and src/webcatalog/ static/ images/ scbutton- non-free- 200px.png 2012-03-09 21:30:35 +0000 differ /templates/ webcatalog/ install_ options_ snippet. html' templates/ webcatalog/ install_ options_ snippet. html 2011-09-19 21:33:34 +0000 templates/ webcatalog/ install_ options_ snippet. html 2012-03-09 21:30:35 +0000
> To Test
> ========
> $fab bootstrap test
>
> --
> https:/
> You are subscribed to branch lp:ubuntu-webcatalog.
>
> === modified file 'src/webcatalog
> --- src/webcatalog/
> +++ src/webcatalog/
> === added file 'src/webcatalog
> Binary files src/webcatalog/
> === added file 'src/webcatalog
> Binary files src/webcatalog/
> === modified file 'src/webcatalog
> --- src/webcatalog/
> +++ src/webcatalog/
> @@ -1,16 +1,20 @@
> {% load i18n %}
> {% if message_text %}
> - {{ message_text }}
> -{% endif %}{% if...