From e0f6275268a9198b7ce1d3ec962cb0d747476ec0 Mon Sep 17 00:00:00 2001 From: "Denis V. Dedkov" Date: Sat, 16 May 2015 15:37:53 +0500 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D1=8B=D0=B9=20=D1=88?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD.=20=D0=A1=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=20=D0=BD=D0=B0=D1=81=D0=BB=D0=B5=D0=B4=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/asuzr/attend_order.html | 7 ++++++- templates/asuzr/attendance.html | 10 ---------- templates/asuzr/base.html | 23 +++++++++++++++++++++++ templates/asuzr/orders.html | 19 ++++++++----------- templates/asuzr/orders_detail.html | 9 --------- templates/asuzr/plan_balance.html | 9 --------- templates/asuzr/prod_list.html | 16 +++++++--------- 7 files changed, 44 insertions(+), 49 deletions(-) create mode 100644 templates/asuzr/base.html diff --git a/templates/asuzr/attend_order.html b/templates/asuzr/attend_order.html index 304d0ea..e9118d0 100644 --- a/templates/asuzr/attend_order.html +++ b/templates/asuzr/attend_order.html @@ -1,3 +1,7 @@ +{% extends "asuzr/base.html" %} + +{% block title %}Таблица посещаемости{% endblock %} +{% block page %} @@ -5,4 +9,5 @@
{% include 'asuzr/attendance.html' %}{% include 'asuzr/orders_detail.html' %}
-{% include 'asuzr/plan_balance.html' %} \ No newline at end of file +{% include 'asuzr/plan_balance.html' %} +{% endblock %} diff --git a/templates/asuzr/attendance.html b/templates/asuzr/attendance.html index 0f318aa..0a58694 100644 --- a/templates/asuzr/attendance.html +++ b/templates/asuzr/attendance.html @@ -1,11 +1,3 @@ - - - Таблица посещаемости - - - - -

Таблица посещаемости

{% if attend_list %}
- - \ No newline at end of file diff --git a/templates/asuzr/base.html b/templates/asuzr/base.html new file mode 100644 index 0000000..5e038d7 --- /dev/null +++ b/templates/asuzr/base.html @@ -0,0 +1,23 @@ + + + Автоматическая система учета заказов студии мебели Рекорд + + +{% block menu %} + +{% endblock %} +

{% block title %}Заголовок страницы{% endblock %}

+ +{% block page %} +Тело страницы +{% endblock %} + +{% block footer %} +
+{% endblock %} + + diff --git a/templates/asuzr/orders.html b/templates/asuzr/orders.html index 4e8c599..67acb00 100644 --- a/templates/asuzr/orders.html +++ b/templates/asuzr/orders.html @@ -1,12 +1,9 @@ - - - - - - - -

{% if archive %} Архивная таблица заказов {% else %} Таблица выхода заказов {% endif %}

- +{% extends "asuzr/base.html" %} + +{% block title %}{% if archive %} Архивная таблица заказов {% else %} Таблица выхода заказов {% endif %}{% endblock %} + +{% block page %} +
{% if order_list %} @@ -49,5 +46,5 @@

Список заказов пуст

{% endif %}
- - \ No newline at end of file + +{% endblock %} diff --git a/templates/asuzr/orders_detail.html b/templates/asuzr/orders_detail.html index 8ebb8bf..e09cdd0 100644 --- a/templates/asuzr/orders_detail.html +++ b/templates/asuzr/orders_detail.html @@ -1,10 +1,3 @@ - - - Заказы - - - -

Заказы на {{ d_date }}

{% if order_list %} @@ -37,5 +30,3 @@

Список заказов пуст

{% endif %}
- - \ No newline at end of file diff --git a/templates/asuzr/plan_balance.html b/templates/asuzr/plan_balance.html index a5154eb..3431319 100644 --- a/templates/asuzr/plan_balance.html +++ b/templates/asuzr/plan_balance.html @@ -1,10 +1,3 @@ - - - - - - -

Справочно:

- - \ No newline at end of file diff --git a/templates/asuzr/prod_list.html b/templates/asuzr/prod_list.html index e722461..8866a00 100644 --- a/templates/asuzr/prod_list.html +++ b/templates/asuzr/prod_list.html @@ -1,10 +1,8 @@ - - - Типы изделий - - - - +{% extends "asuzr/base.html" %} + +{% block title %}Типы изделий{% endblock %} + +{% block page %} {% if product_list %}
{{ balance }}