Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-04-02 22:30:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into rename-templatetag-module

Browse source
This commit is contained in:
Andrew Ingram 2013-05-21 00:05:25 +01:00
commit 262c759604
9 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.rst
View file

@ -15,3 +15,4 @@ Developers
* Andrew Ingram (@AndrewIngram)
* Gregor Müllegger (@gregmuellegger)
* Rivo Laks (@rivol)
* Chris Lawlor (@chrislawlor)

7
djadmin2/templates/admin2/bootstrap/base.html
View file

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>django-admin2</title>
<title>{% block title %}Site administration{% endblock %} | django-admin2</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap -->
<link href="{{ STATIC_URL }}themes/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
@ -46,6 +46,11 @@
</div>
<div class="container-fluid">
<div class="row">
<div class="span10">
<h3>{% block page_title %}Site administration{% endblock %}</h3>
</div>
</div>
{% block content %}{% endblock %}
</div>

1
djadmin2/templates/admin2/bootstrap/index.html
View file

@ -2,7 +2,6 @@
{% load admin2_tags %}
{% block content %}
<h3>Site administration</h3>
<div class="row">
<div class="span7">

4
djadmin2/templates/admin2/bootstrap/model_add_form.html
View file

@ -1,5 +1,9 @@
{% extends "admin2/bootstrap/base.html" %}
{% block title %}Add {{ model }}{% endblock %}
{% block page_title %}Add {{ model }}{% endblock %}
{% block content %}
<form method="post">

8
djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
View file

@ -1,10 +1,16 @@
{% extends "admin2/bootstrap/base.html" %}
{% block title %}Are you sure?{% endblock %}
{% block page_title %}Are you sure?{% endblock %}
{% block content %}
<p>Are you sure you want to delete the {{ model }} "{{ object }}"? All of the following related items will be deleted:</p>
TODO
<form method="post">
{% csrf_token %}
delete {{ object }}
{{ form.as_p }}
<input type="submit"/>
</form>

4
djadmin2/templates/admin2/bootstrap/model_detail.html
View file

@ -1,5 +1,9 @@
{% extends "admin2/bootstrap/base.html" %}
{% block title %}{{ object }}{% endblock %}
{% block page_title %}{{ object }}{% endblock %}
{% block content %}
{{ object }}

11
djadmin2/templates/admin2/bootstrap/model_edit_form.html
View file

@ -1,14 +1,11 @@
{% extends "admin2/bootstrap/base.html" %}
{% block title %}Change {{ model }}{% endblock %}
{% block page_title %}Change {{ model }}{% endblock %}
{% block content %}
<div class="row">
<div class="span10">
<h3>Change {{ model }}</h3>
</div>
</div>
<div class="row">
<div class="span12">
<form method="post">

10
djadmin2/templates/admin2/bootstrap/model_list.html
View file

@ -1,13 +1,11 @@
{% extends "admin2/bootstrap/base.html" %}
{% load admin2_tags %}
{% block content %}
<div class="row">
<div class="span10">
<h3>Select {{ model }} to change</h3>
</div>
</div>
{% block title %}Select {{ model }} to change{% endblock %}
{% block page_title %}Select {{ model }} to change{% endblock %}
{% block content %}
<div class="row">
<div class="span12">

13
djadmin2/views.py
View file

@ -57,6 +57,8 @@ class AdminModel2Mixin(Admin2Mixin, AccessMixin):
'has_add_permission': self.model_admin.has_add_permission(self.request),
'has_edit_permission': self.model_admin.has_edit_permission(self.request),
'has_delete_permission': self.model_admin.has_delete_permission(self.request),
'model': self.get_model()._meta.verbose_name,
'model_pluralized': self.get_model()._meta.verbose_name_plural
})
return context
@ -87,7 +89,6 @@ class IndexView(Admin2Mixin, generic.TemplateView):
class ModelListView(Admin2Mixin, generic.ListView):
default_template_name = "model_list.html"
permission_type = 'view'
@ -113,11 +114,6 @@ class ModelEditFormView(AdminModel2Mixin, generic.UpdateView):
default_template_name = "model_edit_form.html"
permission_type = 'change'
def get_context_data(self, **kwargs):
context = super(ModelEditFormView, self).get_context_data(**kwargs)
context['model'] = self.get_model()._meta.verbose_name
return context
class ModelAddFormView(AdminModel2Mixin, generic.CreateView):
form_class = None
@ -125,6 +121,11 @@ class ModelAddFormView(AdminModel2Mixin, generic.CreateView):
default_template_name = "model_add_form.html"
permission_type = 'add'
def get_context_data(self, **kwargs):
context = super(ModelAddFormView, self).get_context_data(**kwargs)
context['model'] = self.get_model()._meta.verbose_name
return context
def get_success_url(self):
view_name = 'admin2:{}_{}_detail'.format(self.app_label, self.model_name)
return reverse(view_name, kwargs={'pk': self.object.pk})