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

Merge pull request #73 from merwok-forks/cleanup-markup 

Don't hard-code media type for favicon
pull/74/head
Fabio Caccamo 2020-01-20 16:37:06 +01:00 committed by GitHub
parent 42dda3d91d b3ac5df522
commit e51e4e3ae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ https://github.com/fabiocaccamo/django-admin-interface
{% get_admin_interface_version as version %} {% get_admin_interface_version as version %}
{# https://github.com/elky/django-flat-responsive#important-note #} {# https://github.com/elky/django-flat-responsive#important-note #}
<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' %}?v={{ version }}" /> <link rel="stylesheet" href="{% static 'admin/css/responsive.css' %}?v={{ version }}">
{% include "admin_interface/favicon.html" %} {% include "admin_interface/favicon.html" %}
{% include "admin_interface/related-modal.html" %} {% include "admin_interface/related-modal.html" %}
{% endblock %} {% endblock %}
@ -51,9 +51,9 @@ https://github.com/fabiocaccamo/django-admin-interface
<h1 id="site-name"> <h1 id="site-name">
{% if theme.logo_visible %} {% if theme.logo_visible %}
{% if theme.logo %} {% if theme.logo %}
<img class="logo" style="display:none;" src="{{ theme.logo.url }}" {% if theme.logo.width %}width="{{ theme.logo.width }}"{% endif %} {% if theme.logo.height %}height="{{ theme.logo.height }}"{% endif %} /> <img class="logo" style="display:none;" src="{{ theme.logo.url }}" {% if theme.logo.width %}width="{{ theme.logo.width }}"{% endif %} {% if theme.logo.height %}height="{{ theme.logo.height }}"{% endif %}>
{% else %} {% else %}
<img class="logo default" style="display:none;" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="104" height="36" /> <img class="logo default" style="display:none;" src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" width="104" height="36">
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if theme.title_visible %} {% if theme.title_visible %}

2
admin_interface/templates/admin_interface/favicon.html
View File

@ -1,7 +1,7 @@
{% load static %} {% load static %}
{% if theme.favicon %} {% if theme.favicon %}
<link rel="icon" type="image/x-icon" href="{{ theme.favicon.url }}?v={{ version }}" /> <link rel="icon" href="{{ theme.favicon.url }}?v={{ version }}">
{% if theme.env_visible_in_favicon %} {% if theme.env_visible_in_favicon %}
<script type="text/javascript" src="{% static 'admin_interface/favico/favico-0.3.10-patched.min.js' %}?v={{ version }}"></script> <script type="text/javascript" src="{% static 'admin_interface/favico/favico-0.3.10-patched.min.js' %}?v={{ version }}"></script>
<script type="text/javascript"> <script type="text/javascript">

4
admin_interface/templates/admin_interface/language_chooser.html
View File

@ -5,7 +5,7 @@
{% for language in languages %} {% for language in languages %}
<form class="language-chooser-hidden-form" id="language-chooser-hidden-form-{{ language.code }}" action="{{ language.activation_url }}" method="POST"> <form class="language-chooser-hidden-form" id="language-chooser-hidden-form-{{ language.code }}" action="{{ language.activation_url }}" method="POST">
{% csrf_token %} {% csrf_token %}
<input name="language" type="hidden" value="{{ language.code }}" /> <input name="language" type="hidden" value="{{ language.code }}">
</form> </form>
{% endfor %} {% endfor %}
<form class="language-chooser-select-form"> <form class="language-chooser-select-form">
@ -17,4 +17,4 @@
</select> </select>
</form> </form>
</div> </div>
{% endif %} {% endif %}

2
admin_interface/templates/admin_interface/related-modal.html
View File

@ -1,7 +1,7 @@
{% load static %} {% load static %}
{% if theme.related_modal_active %} {% if theme.related_modal_active %}
<link rel="stylesheet" type="text/css" href="{% static 'admin_interface/magnific-popup/magnific-popup.css' %}?v={{ version }}" /> <link rel="stylesheet" type="text/css" href="{% static 'admin_interface/magnific-popup/magnific-popup.css' %}?v={{ version }}">
<script type="text/javascript" src="{% static 'admin_interface/magnific-popup/jquery.magnific-popup.js' %}?v={{ version }}"></script> <script type="text/javascript" src="{% static 'admin_interface/magnific-popup/jquery.magnific-popup.js' %}?v={{ version }}"></script>
<script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}?v={{ version }}"></script> <script type="text/javascript" src="{% static 'admin_interface/related-modal/related-modal.js' %}?v={{ version }}"></script>
{% endif %} {% endif %}