mitri4
/
dokumentor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added custom tag - for check md5 file hash.Added him in template for custom js scripts

Browse Source
feature/docker
Dmitriy Shesterkin 9 years ago
parent f280d9dac3
commit f03fc5f043
6 changed files with 33 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 12
      src/commons/templatetags/my_tags.py
  3. 12
      src/dokumentor/templates/base.html
  4. 12
      src/dokumentor/templates/customer/clients/list.html
  5. 8
      src/dokumentor/templates/docs/_base/base_add.html
  6. 8
      src/dokumentor/templates/docs/_base/base_edit.html

2
Makefile
Unescape View File

@ -53,7 +53,7 @@ shell:
# target: collectstatic - Run collectstatic # target: collectstatic - Run collectstatic
collectstatic: collectstatic:
python manage.py collectstatic --noinput python src/manage.py collectstatic --noinput
clean_temp: clean_temp:

12
src/commons/templatetags/my_tags.py
Unescape View File

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os import os
from hashlib import md5
from django import template from django import template
from django.conf import settings from django.conf import settings
@ -63,3 +64,14 @@ def to_float(value):
else: else:
result = value result = value
return result return result
@register.simple_tag
def file_version(path):
"""Вернуть md5-хэш от статического файла."""
full_path = os.path.join(settings.STATIC_ROOT, path)
print(full_path)
try:
return md5(open(full_path, 'rb').read()).hexdigest()
except IOError:
return ''

12
src/dokumentor/templates/base.html
Unescape View File

@ -1,5 +1,5 @@
{# spaceless #}<!DOCTYPE html> {# spaceless #}<!DOCTYPE html>
{% load static cms_tags sekizai_tags menu_tags pytils_numeral %} {% load static cms_tags sekizai_tags menu_tags pytils_numeral my_tags %}
{% url 'myauth_login' as myauth_login %} {% url 'myauth_login' as myauth_login %}
{% url 'myauth_register' as myauth_register %} {% url 'myauth_register' as myauth_register %}
@ -10,7 +10,7 @@
<link rel="shortcut icon" href="{% static 'favicon.ico' %}" /> <link rel="shortcut icon" href="{% static 'favicon.ico' %}" />
<link rel="stylesheet" href="{% static 'css/ui-lightness/jquery-ui-1.10.3.custom.css' %}" /> <link rel="stylesheet" href="{% static 'css/ui-lightness/jquery-ui-1.10.3.custom.css' %}" />
<link rel="stylesheet" href="{% static 'css/suggestions.css' %}" /> <link rel="stylesheet" href="{% static 'css/suggestions.css' %}" />
<link rel="stylesheet" href="{% static 'css/style.css' %}?t=1489695908" /> <link rel="stylesheet" href="{% static 'css/style.css' %}?ver={% file_version 'css/style.css' %}" />
{% render_block "css" %} {% render_block "css" %}
</head> </head>
<body> <body>
@ -131,11 +131,11 @@
<script src="{% static 'js/lib/jquery.cookie.js' %}"></script> <script src="{% static 'js/lib/jquery.cookie.js' %}"></script>
<script src="{% static 'js/lib/handlebars-v4.0.5.js' %}"></script> <script src="{% static 'js/lib/handlebars-v4.0.5.js' %}"></script>
<script src="{% static 'js/csrf.js' %}"></script> <script src="{% static 'js/csrf.js' %}?ver={% file_version 'js/csrf.js' %}"></script>
<script src="{% static 'js/commons.js' %}"></script> <script src="{% static 'js/commons.js' %}?ver={% file_version 'js/commons.js' %}"></script>
<script src="{% static 'js/dialogs.js' %}"></script> <script src="{% static 'js/dialogs.js' %}?ver={% file_version 'js/dialogs.js' %}"></script>
<script src="{% static 'js/callback.js' %}"></script> <script src="{% static 'js/callback.js' %}?ver={% file_version 'js/callback.js' %}"></script>
{% include 'autocomplete_light/static.html' %} {% include 'autocomplete_light/static.html' %}
<script> <script>
$(document).ready(function() { $(document).ready(function() {

12
src/dokumentor/templates/customer/clients/list.html
Unescape View File

@ -1,4 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load static my_tags %}
{% block title %}Контрагенты{% endblock %} {% block title %}Контрагенты{% endblock %}
@ -7,7 +8,6 @@
<div class='content-white'> <div class='content-white'>
<div class='btn yellow-btn docs-btn'> <div class='btn yellow-btn docs-btn'>
<a class="client add-client-link" href="{% url 'customer_clients_add' %}" title="Добавить контрагента"> <a class="client add-client-link" href="{% url 'customer_clients_add' %}" title="Добавить контрагента">
{# <a class="client add-client-link2" href="{% url 'customer_clients_add' %}" title="Добавить контрагента">#}
Добавить контрагента Добавить контрагента
</a> </a>
</div> </div>
@ -46,12 +46,12 @@
{% endblock %} {% endblock %}
{% block js %} {% block js %}
<script src="{{ STATIC_URL }}js/client.commons.js"></script> <script src="{% static 'js/client.commons.js' %}?ver={% file_version 'js/client.commons.js' %}"></script>
<script src="{{ STATIC_URL }}js/client.list.js"></script> <script src="{% static 'js/client.list.js' %}?ver={% file_version 'js/client.list.js' %}"></script>
<script src="{{ STATIC_URL }}js/paginator.js"></script> <script src="{% static 'js/paginator.js' %}?ver={% file_version 'js/paginator.js' %}"></script>
<script src="{{ STATIC_URL }}js/lib/jquery.suggestions.min.js"></script> <script src="{% static 'js/lib/jquery.suggestions.min.js' %}"></script>
<script src="{{ STATIC_URL }}js/client/search-external-api.js"></script> <script src="{% static 'js/client/search-external-api.js' %}?ver={% file_version 'js/client/search-external-api.js' %}"></script>
{% include 'hbs/bank-tpl.html' %} {% include 'hbs/bank-tpl.html' %}

8
src/dokumentor/templates/docs/_base/base_add.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load static %} {% load static my_tags %}
{% block title %}Добавить {{ padeji.vinit }}{% endblock %} {% block title %}Добавить {{ padeji.vinit }}{% endblock %}
@ -20,10 +20,10 @@
{% endblock %} {% endblock %}
{% block js %} {% block js %}
<script src="{% static 'js/client.commons.js' %}"></script> <script src="{% static 'js/client.commons.js' %}?ver={% file_version 'js/client.commons.js' %}"></script>
<script src="{% static 'js/docs/client.form.js' %}"></script> <script src="{% static 'js/docs/client.form.js' %}?ver={% file_version 'js/docs/client.form.js' %}"></script>
<script src="{% static 'js/lib/jquery.suggestions.min.js' %}"></script> <script src="{% static 'js/lib/jquery.suggestions.min.js' %}"></script>
<script src="{% static 'js/client/search-external-api.js' %}"></script> <script src="{% static 'js/client/search-external-api.js' %}?ver={% file_version 'js/client/search-external-api.js' %}"></script>
{% include 'hbs/bank-tpl.html' %} {% include 'hbs/bank-tpl.html' %}
{% include form_template_js %} {% include form_template_js %}
{% endblock %} {% endblock %}

8
src/dokumentor/templates/docs/_base/base_edit.html
Unescape View File

@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load static %} {% load static my_tags %}
{% block title %}Редактировать {{ padeji.vinit }}{% endblock %} {% block title %}Редактировать {{ padeji.vinit }}{% endblock %}
@ -23,10 +23,10 @@
{% endblock %} {% endblock %}
{% block js %} {% block js %}
<script src="{% static 'js/client.commons.js' %}"></script> <script src="{% static 'js/client.commons.js' %}?ver={% file_version 'js/client.commons.js' %}"></script>
<script src="{% static 'js/docs/client.form.js' %}"></script> <script src="{% static 'js/docs/client.form.js' %}?ver={% file_version 'js/docs/client.form.js' %}"></script>
<script src="{% static 'js/lib/jquery.suggestions.min.js' %}"></script> <script src="{% static 'js/lib/jquery.suggestions.min.js' %}"></script>
<script src="{% static 'js/client/search-external-api.js' %}"></script> <script src="{% static 'js/client/search-external-api.js' %}?ver={% file_version 'js/client/search-external-api.js' %}"></script>
{% include 'hbs/bank-tpl.html' %} {% include 'hbs/bank-tpl.html' %}
{% include form_template_js %} {% include form_template_js %}
{% endblock %} {% endblock %}

Write Preview
Loading…
Cancel
Save