Merge lp://staging/~michael.nelson/ubuntu-webcatalog/987851-display-multiple-apps-from-banner into lp://staging/ubuntu-webcatalog
Proposed by
Michael Nelson
Status: | Merged |
---|---|
Approved by: | Łukasz Czyżykowski |
Approved revision: | 128 |
Merged at revision: | 120 |
Proposed branch: | lp://staging/~michael.nelson/ubuntu-webcatalog/987851-display-multiple-apps-from-banner |
Merge into: | lp://staging/ubuntu-webcatalog |
Diff against target: |
201 lines (+100/-8) 8 files modified
src/webcatalog/models/applications.py (+10/-4) src/webcatalog/templates/webcatalog/application_list.html (+30/-0) src/webcatalog/templates/webcatalog/department_overview.html (+1/-1) src/webcatalog/templates/webcatalog/search_results.html (+1/-1) src/webcatalog/tests/test_models.py (+2/-1) src/webcatalog/tests/test_views.py (+35/-1) src/webcatalog/urls.py (+1/-0) src/webcatalog/views.py (+20/-0) |
To merge this branch: | bzr merge lp://staging/~michael.nelson/ubuntu-webcatalog/987851-display-multiple-apps-from-banner |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Canonical Consumer Applications Hackers | Pending | ||
Review via email: mp+104922@code.staging.launchpad.net |
Commit message
Support exhibit links for multiple packages.
Description of the change
Overview
========
Adds an /applications/
Updates Exhibit.
`fab test`
You can demo locally by importing exhibits from production and clicking on the book exhibit. The result will look like this (note: icons not imported on my local machine).
http://
To post a comment you must log in.
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.