Merge lp:~michael.nelson/ubuntu-webcatalog/978000-recommended-apps-2 into lp:ubuntu-webcatalog
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Anthony Lenton | ||||
Approved revision: | 120 | ||||
Merged at revision: | 111 | ||||
Proposed branch: | lp:~michael.nelson/ubuntu-webcatalog/978000-recommended-apps-2 | ||||
Merge into: | lp:ubuntu-webcatalog | ||||
Prerequisite: | lp:~michael.nelson/ubuntu-webcatalog/978000-recommended-apps | ||||
Diff against target: |
331 lines (+91/-63) 12 files modified
django_project/config/main.cfg (+1/-1) src/webcatalog/context_processors.py (+9/-9) src/webcatalog/schema.py (+1/-0) src/webcatalog/static/css/carousel.css (+2/-2) src/webcatalog/static/css/webcatalog.css (+6/-2) src/webcatalog/templates/webcatalog/application_detail.html (+26/-9) src/webcatalog/templates/webcatalog/recommended_apps.html (+12/-0) src/webcatalog/templates/webcatalog/recommended_apps_widget.html (+18/-20) src/webcatalog/tests/test_utilities.py (+2/-2) src/webcatalog/tests/test_views.py (+11/-16) src/webcatalog/utilities.py (+2/-1) src/webcatalog/views.py (+1/-1) |
||||
To merge this branch: | bzr merge lp:~michael.nelson/ubuntu-webcatalog/978000-recommended-apps-2 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Anthony Lenton (community) | Approve | ||
Review via email: mp+102709@code.launchpad.net |
Commit message
Add recommended apps to the details page side-bar.
Description of the change
Overview
========
Originally I'd planned to have the recommendations in a carousel like this:
(hence the work on dry-ing up the carousel templates), but after chatting, we decided to put them in the side bar like this:
which is what this branch now does.
I decided not to include a default link for non-js, as it would be ugly in the side-bar, and the functionality of adding the recommendations is a progressive enhancement anyway (and not required to use the page).
`fab test`
NOTE: I've modified the name of a context_processor below and updated main.cfg, but I've not yet checked if our settings for deploy inherit from this main.cfg, or whether we need to make the same change there.
NOTE2: I just realised we'll need to provide the recommender api (sreclient.py) in the deploy and afaik it's not yet packaged. The previous branch pulls it in via bzr. Let me know the best way forward and I'll do it in the morning.
Looks fine