Merge lp://staging/~michael.nelson/rnr-server/684631-moderation-dashboard into lp://staging/rnr-server
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Łukasz Czyżykowski | ||||
| Approved revision: | 103 | ||||
| Merged at revision: | 107 | ||||
| Proposed branch: | lp://staging/~michael.nelson/rnr-server/684631-moderation-dashboard | ||||
| Merge into: | lp://staging/rnr-server | ||||
| Diff against target: |
222 lines (+73/-45) 8 files modified
.bzrignore (+1/-0) django_project/config_dev/urls.py (+6/-10) src/reviewsapp/templates/reviewsapp/overview.html (+22/-0) src/reviewsapp/tests/test_auth.py (+1/-1) src/reviewsapp/tests/test_views.py (+17/-1) src/reviewsapp/urls.py (+4/-1) src/reviewsapp/views/__init__.py (+21/-0) src/reviewsapp/views/moderation.py (+1/-32) |
||||
| To merge this branch: | bzr merge lp://staging/~michael.nelson/rnr-server/684631-moderation-dashboard | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Łukasz Czyżykowski (community) | Approve | ||
| Matthew Paul Thomas | ui | Pending | |
|
Review via email:
|
|||
Commit message
Adds a stub overview of the reviews app and a redirect from the root url (rather than 404).
Description of the change
Overview
========
I was about to start on the moderation dashboard:
https:/
but realised that we don't yet have a landing page for:
https:/
This branch:
1) Adds a redirect from / to /reviews/ (later we can remove this if there are other apps on the same domain, or if the domain changes to one without the 'reviews' subdomain etc).
2) Adds a simple view/template for /reviews/ which is unprotected and just explains a bit about what reviews.x.com is, like this:
http://
(Note: I had to shrink the page a bit to take the screenshot).
I'm not sure if this page is necessary or desired - hence checking with you Matthew. We could just redirect to the protected moderation panel instead, but it might leave non-moderators confused if they reach the URL.
Anyway, if it is something you want, please let me know the text and an appropriate image.
Thanks!
Good