Merge lp://staging/~zematynnad/ubuntu-webcatalog/buttons__938167 into lp://staging/ubuntu-webcatalog

Proposed by Danny Tamez
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
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://simplest-image-hosting.net/png-0-ac2075
Free button: http://simplest-image-hosting.net/png-0-gr2075
Download ubuntu: http://simplest-image-hosting.net/png-0-wg2075

For bug 861593 - the issue with bad wrapping and button display has been alleviated. Screenshots:
Chrome button: http://simplest-image-hosting.net/png-0-io2075
Chrome also available: http://simplest-image-hosting.net/png-0-jv2086
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

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :
Download full text (9.1 KiB)

On Fri, Mar 9, 2012 at 10:31 PM, Danny Tamez <email address hidden> wrote:
> 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://simplest-image-hosting.net/png-0-ac2075
> Free button: http://simplest-image-hosting.net/png-0-gr2075
> Download ubuntu: http://simplest-image-hosting.net/png-0-wg2075

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.

>
> For bug 861593 - the issue with bad wrapping and button display has been alleviated. Screenshots:
> Chrome button: http://simplest-image-hosting.net/png-0-io2075
> Chrome also available: http://simplest-image-hosting.net/png-0-jv2086
> 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.

>
> To Test
> ========
> $fab bootstrap test
>
> --
> https://code.launchpad.net/~zematynnad/ubuntu-webcatalog/buttons__938167/+merge/96836
> You are subscribed to branch lp:ubuntu-webcatalog.
>
> === modified file 'src/webcatalog/static/css/webcatalog.css'
> --- src/webcatalog/static/css/webcatalog.css    2012-03-08 20:27:19 +0000
> +++ src/webcatalog/static/css/webcatalog.css    2012-03-09 21:30:35 +0000
> === added file 'src/webcatalog/static/images/scbutton-free-200px.png'
> Binary files src/webcatalog/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
> === added file 'src/webcatalog/static/images/scbutton-non-free-200px.png'
> Binary files src/webcatalog/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
> === modified file 'src/webcatalog/templates/webcatalog/install_options_snippet.html'
> --- src/webcatalog/templates/webcatalog/install_options_snippet.html    2011-09-19 21:33:34 +0000
> +++ src/webcatalog/templates/webcatalog/install_options_snippet.html    2012-03-09 21:30:35 +0000
> @@ -1,16 +1,20 @@
>  {% load i18n %}
>  {% if message_text %}
> -  {{ message_text }}
> -{% endif %}{% if...

Read more...

Revision history for this message
Danny Tamez (zematynnad) wrote :

Fixed the {{STATIC_URL}} issue. We were already using the static context processor but the templatetag was overwriting the RequestContext and thus the context processor values were no longer available. I changed the template tag to instead modify the RequestContext with the new values instead of creating an entirely new context.

As for the {{ trans }} issues: none of the application is translated and so we decided there's really no point in doing that.

Changed the tooltip on the non-free button to say 'Buy it' instead of 'Get it'.

We discussed the placement of the download/install button and decided it would probably look better beneath the description to the left of the screenshot or just underneath the screenshot. I left it underneath the description and here are screenies of each:
button below description: http://simplest-image-hosting.net/png-0-hj2158
button below screenshot: http://simplest-image-hosting.net/png-0-tn2158

Revision history for this message
Michael Nelson (michael.nelson) wrote :
Download full text (8.7 KiB)

Hey Danny,

I've just moved your replies inline so I can see what the context was...

On Mon, Mar 12, 2012 at 11:07 AM, Michael Nelson
<email address hidden> wrote:
> On Fri, Mar 9, 2012 at 10:31 PM, Danny Tamez <email address hidden> wrote:
>> 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://simplest-image-hosting.net/png-0-ac2075
>> Free button: http://simplest-image-hosting.net/png-0-gr2075
>> Download ubuntu: http://simplest-image-hosting.net/png-0-wg2075
>
> 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.

On Tue, Mar 13, 2012 at 4:02 AM, Danny Tamez <email address hidden> wrote:
> We discussed the placement of the download/install button and decided it would probably look better beneath the description to the left of the screenshot or just underneath the screenshot.  I left it underneath the description and here are screenies of each:
> button below description: http://simplest-image-hosting.net/png-0-hj2158
> button below screenshot: http://simplest-image-hosting.net/png-0-tn2158

If Anthony is happy with that placement, great. My comment above
wasn't about placement, in fact I thought the purchase and free
buttons looked great where they were (but I'm no designer). My comment
was just specifically about the "Download *Ubuntu*" button - it's not
something you've changed in this branch, just something I noticed that
it seems to lack any context (that is, as a non-Ubuntu user, I'd
expect something like "{{ app_name }} is available for Ubuntu. Haven't
tried Ubuntu? [[ Download Ubuntu graphic/link ]]"), which obviously
wouldn't fit up the top. But anyway, it's not a change of yours, just
something I thought while looking at the screenshots, so feel free to
ignore.

>
>>
>> For bug 861593 - the issue with bad wrapping and button display has been alleviated. Screenshots:
>> Chrome button: http://simplest-image-hosting.net/png-0-io2075
>> Chrome also available: http://simplest-image-hosting.net/png-0-jv2086
>> 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 {% ...

Read more...

Revision history for this message
Michael Nelson (michael.nelson) wrote :

On Tue, Mar 13, 2012 at 10:52 AM, Michael Nelson
<email address hidden> wrote:
>> {% trans %} and does this title make sense here?
>
> I think you missed this question? (at least, I don't see it answered
> or updated in your branch). That is, it's a "Download Ubuntu" button,
> but the title text says "Get it from the Ubuntu Software Centre!"

So that's being updated right now, and...
>
>>>     if useragent.distroseries == application.distroseries.code_name:
>>>         # If both the distroseries and architecture matches, install away,
>>> @@ -104,9 +105,7 @@
>>>         template_context['display_install_button'] = True
>>>         return template_context
>>>     else:
>>> -        template_context['message_text'] = _(
>>> -            '{application_name} is not available for your operating '
>>> -            'system.').format(application_name=application.name)
>>> +        template_context['message_text'] = ''
>>
>> See comment on bug about this.
>
> Let me know what you think about this. The comment on the bug will
> give more context at:
>
> https://bugs.launchpad.net/ubuntu-webcatalog/+bug/944254/comments/3
>
> If you've already discussed it with someone, made a decision, and just
> not updated the bug, no probs, otherwise let me know.

You mentioned that we're already doing the right thing in the other
case... great!

Thanks Danny

Revision history for this message
Michael Nelson (michael.nelson) :
review: Approve
Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Danny Tamez (zematynnad) wrote :

Already went over these changes with noodles/achuni

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches