Hopiu/django-admin2
1
0
Fork 0
mirror of https://github.com/jazzband/django-admin2.git synced 2026-03-21 00:20:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #177 from audreyr/develop

Browse source 
Merge in @paurosello's commit
This commit is contained in:
Audrey Roy 2013-06-03 14:05:39 -07:00
commit b3bb9dbf82
10 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
djadmin2/templates/admin2/bootstrap/actions/delete_selected_confirmation.html
View file

@ -1,9 +1,9 @@
{% extends "admin2/bootstrap/base.html" %}
{% load i18n %}
{% block title %}Are you sure?{% endblock %}
{% block title %}Are you sure?{% endblock title %}
{% block page_title %}Are you sure?{% endblock %}
{% block page_title %}Are you sure?{% endblock page_title %}
{% block content %}

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

@ -4,9 +4,9 @@
{% block breadcrumbs %}
<li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
<li class="active">{{ app_label|title }}</li>
{% endblock %}
{% endblock breadcrumbs %}
{% block page_title %}{% blocktrans with app_label=app_label|title %}{{ app_label }} administration{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans with app_label=app_label|title %}{{ app_label }} administration{% endblocktrans %}{% endblock page_title %}
{% block content %}
<div class="row">

2
djadmin2/templates/admin2/bootstrap/auth/logout.html
View file

@ -6,7 +6,7 @@
{% block breadcrumbs %}
<li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
<li class="active">{% trans "Logout" %}</li>
{% endblock %}
{% endblock breadcrumbs %}
{% block content %}
<div class="row">

6
djadmin2/templates/admin2/bootstrap/auth/password_change_done.html
View file

@ -3,13 +3,13 @@
{% load i18n %}
{% load admin2_tags %}
{% block title %}{% trans 'Password change successful' %}{% endblock %}
{% block page_title %}{% trans 'Password change successful' %}{% endblock %}
{% block title %}{% trans 'Password change successful' %}{% endblock title %}
{% block page_title %}{% trans 'Password change successful' %}{% endblock page_title %}
{% block breadcrumbs %}
<li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
<li class="active">{% trans "Password change successful" %}</li>
{% endblock %}
{% endblock breadcrumbs %}
{% block content %}
<div class="row">

4
djadmin2/templates/admin2/bootstrap/auth/password_change_form.html
View file

@ -3,13 +3,13 @@
{% load i18n %}
{% load admin2_tags %}
{% block page_title %}{% trans "Password change" %}: {{ form.user }}{% endblock %}
{% block page_title %}{% trans "Password change" %}: {{ form.user }}{% endblock page_title %}
{% block breadcrumbs %}
<li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
<li class="active">{% trans "Password change" %} <span class="divider">/</span></li>
<li class="active">{{ form.user }}</li>
{% endblock %}
{% endblock breadcrumbs %}
{% block content %}
<div class="row">

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

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>{% block title %}Site administration{% endblock %} | django-admin2</title>
<title>{% block title %}Site administration{% endblock title %} | django-admin2</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap -->
{% block css %}
@ -76,6 +76,5 @@
<script src="http://code.jquery.com/jquery.js"></script>
<script src="{{ STATIC_URL }}themes/bootstrap/js/bootstrap.min.js"></script>
{% endblock javascript %}
</body>
</html>

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

@ -1,9 +1,9 @@
{% extends "admin2/bootstrap/base.html" %}
{% load admin2_tags i18n %}
{% block title %}{% trans "Are you sure?" %}{% endblock %}
{% block title %}{% trans "Are you sure?" %}{% endblock title %}
{% block page_title %}{% trans "Are you sure?" %}{% endblock %}
{% block page_title %}{% trans "Are you sure?" %}{% endblock page_title %}
{% block breadcrumbs %}
<li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
@ -11,7 +11,7 @@
<li><a href="{% url view|admin2_urlname:"index" %}">{{ model_name_pluralized|title }}</a> <span class="divider">/</span></li>
<li><a href="{% url view|admin2_urlname:"detail" pk=object.pk %}">{{ object }}</a> <span class="divider">/</span></li>
<li class="active">{% trans "Delete" %}</li>
{% endblock %}
{% endblock breadcrumbs %}
{% block content %}

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

@ -2,16 +2,16 @@
{% load admin2_tags %}
{% block title %}{{ object }}{% endblock %}
{% block title %}{{ object }}{% endblock title %}
{% block page_title %}{{ object }}{% endblock %}
{% block page_title %}{{ object }}{% endblock page_title%}
{% block breadcrumbs %}
<li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
<li><a href="{% url "admin2:app_index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>
<li><a href="{% url view|admin2_urlname:"index" %}">{{ model_name_pluralized|title }}</a> <span class="divider">/</span></li>
<li class="active">{{ object }}</li>
{% endblock %}
{% endblock breadcrumbs %}
{% block content %}

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

@ -1,9 +1,9 @@
{% extends "admin2/bootstrap/base.html" %}
{% load admin2_tags i18n %}
{% block title %}{% blocktrans with model_name=model_name %}Select {{ model_name }} to change{% endblocktrans %}{% endblock %}
{% block title %}{% blocktrans with model_name=model_name %}Select {{ model_name }} to change{% endblocktrans %}{% endblock title %}
{% block page_title %}{% blocktrans with model_name=model_name %}Select {{ model_name }} to change{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans with model_name=model_name %}Select {{ model_name }} to change{% endblocktrans %}{% endblock page_title %}
{% block javascript %}{{ block.super }}
<script src="/static/themes/bootstrap/js/actions.js"></script>
@ -13,7 +13,7 @@
<li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
<li><a href="{% url "admin2:app_index" app_label=app_label %}">{{ app_label|title }}</a> <span class="divider">/</span></li>
<li class="active">{{ model_name_pluralized|title }}</li>
{% endblock %}
{% endblock breadcrumbs %}
{% block content %}

6
djadmin2/templates/admin2/bootstrap/model_update_form.html
View file

@ -2,9 +2,9 @@
{% load admin2_tags i18n %}
{% block title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock %}
{% block title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock title %}
{% block page_title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans with action=action model_name=model_name %}{{ action }} {{ model_name }}{% endblocktrans %}{% endblock page_title %}
{% block breadcrumbs %}
<li><a href="{% url "admin2:dashboard" %}">Home</a> <span class="divider">/</span></li>
@ -17,7 +17,7 @@
<li class="active">{% trans 'Change' %}</li>
{% endif %}
{% endblock %}
{% endblock breadcrumbs %}
{% block content %}