Merge lp:~mars/django-preflight/use-admin-template-by-default into lp:django-preflight

Proposed by Māris Fogels
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: 12
Merged at revision: 18
Proposed branch: lp:~mars/django-preflight/use-admin-template-by-default
Merge into: lp:django-preflight
Diff against target: 12 lines (+1/-1)
1 file modified
preflight/views.py (+1/-1)
To merge this branch: bzr merge lp:~mars/django-preflight/use-admin-template-by-default
Reviewer Review Type Date Requested Status
Łukasz Czyżykowski Pending
Canonical ISD hackers Pending
Review via email: mp+77384@code.launchpad.net

Commit message

Changed the default display template to the Django admin theme.

Description of the change

This branch changes the preflight default template to the Django admin theme and removes the project's dependency on our own custom django-themes package.

All tests pass.

I would be happy to test this in a live browser if someone can point me to some instructions for doing so (I did not find any instructions for browser-based testing in the README).

To post a comment you must log in.
Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

Just run:

$ cd example_project
$ manage.py runserver

and go to http://localhost:8000/preflight

Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

argh,

$ python manage.py runserver

of course

Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

Also, you will need to add django.contrib.admin to the list of installed applications. Feel free to update example_project/settings.py file.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

No approved revision specified.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

No approved revision specified.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

No approved revision specified.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

No approved revision specified.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

No approved revision specified.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

No approved revision specified.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

No approved revision specified.

Revision history for this message
ISD Branch Mangler (isd-branches-mangler) wrote :

No approved revision specified.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'preflight/views.py'
2--- preflight/views.py 2011-02-07 16:06:51 +0000
3+++ preflight/views.py 2011-09-28 18:30:36 +0000
4@@ -17,7 +17,7 @@
5 raise Http404
6
7 base_template = getattr(settings, 'PREFLIGHT_BASE_TEMPLATE',
8- "index.1col.html")
9+ "admin/base.html")
10 table_class = getattr(settings, 'PREFLIGHT_TABLE_CLASS', "listing")
11
12 return render_to_response("preflight/overview.html", {

Subscribers

People subscribed via source and target branches