Briq
/
django-admin-interface
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed theme active check in templates

pull/17/head
Fabio Caccamo 2017-05-04 17:42:11 +02:00
parent 49538ed582
commit fdf3b418f9
2 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
admin_interface/templates/admin/base_site.html
View File

@ -10,8 +10,6 @@
{% get_admin_interface_theme as theme %} {% get_admin_interface_theme as theme %}
<style type="text/css"> <style type="text/css">
{% if theme.active %}
#header { #header {
height:auto; height:auto;
min-height:40px; min-height:40px;
@ -424,7 +422,6 @@
padding:7px 14px 8px 14px !important; padding:7px 14px 8px 14px !important;
margin-top:1px !important; margin-top:1px !important;
} }
.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-tabs-active a,
@ -533,14 +530,6 @@
{{ theme.css|safe }} {{ theme.css|safe }}
{% endif %} {% endif %}
{% else %}
#branding h1 img.logo {
display:none;
}
{% endif %}
</style> </style>
{% endblock %} {% endblock %}
@ -550,25 +539,20 @@
{% block branding %} {% block branding %}
{% get_admin_interface_theme as theme %} {% get_admin_interface_theme as theme %}
<h1 id="site-name"> <h1 id="site-name">
{% if theme.active %}
{% if theme.logo_visible and theme.logo %} {% if theme.logo_visible and theme.logo %}
<img class="logo" src="{{ theme.logo.url }}" width="{{ theme.logo.width }}" height="{{ theme.logo.height }}" /> <img class="logo" src="{{ theme.logo.url }}" width="{{ theme.logo.width }}" height="{{ theme.logo.height }}" />
{% endif %} {% endif %}
{% if theme.title_visible %} {% if theme.title_visible %}
<span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span> <span>{% if theme.title %}{% trans theme.title %}{% else %}{% trans 'Django administration' %}{% endif %}</span>
{% endif %} {% endif %}
{% else %}
{% trans 'Django administration' %}
{% endif %}
</h1> </h1>
{% endblock %} {% endblock %}
{% block bodyclass %}admin-interface flat-theme{% endblock %} {% block bodyclass %}admin-interface flat-theme{% endblock %}
{% block blockbots %} {% block blockbots %}
{{ block.super }} {{ block.super }}
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0"> <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1.0, maximum-scale=1.0">
<link rel="stylesheet" type="text/css" href="{% static "admin/css/responsive.css" %}" />
{% endblock %} {% endblock %}
{% block sidebar %} {% block sidebar %}

6
admin_interface/templates/admin/filter.html
View File

@ -8,11 +8,7 @@
{% else %} {% else %}
{% comment %} {# Use the default list filter template -> https://github.com/django/django/blob/master/django/contrib/admin/templates/admin/filter.html #}
Use the default list filter template -> https://github.com/django/django/blob/master/django/contrib/admin/templates/admin/filter.html
{% endcomment %}
<h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}</h3> <h3>{% blocktrans with filter_title=title %} By {{ filter_title }} {% endblocktrans %}</h3>
<ul> <ul>