From 8892675cf7dd3d7a1dd25010a16122fcb5b20bbe Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Mon, 6 Jun 2016 17:04:03 +0300 Subject: [PATCH] Update --- projects/templates/projects/project_list.html | 2 +- .../contractor_project-detail.html | 0 .../customer_project-detail.html | 0 templates/home.html | 38 ++--------- templates/partials/base.html | 2 +- templates/partials/footer.html | 67 +++++++++++++++++++ templates/partials/header.html | 40 +++++++++++ 7 files changed, 113 insertions(+), 36 deletions(-) rename {projects/templates => templates}/contractor_project-detail.html (100%) rename {projects/templates => templates}/customer_project-detail.html (100%) create mode 100644 templates/partials/footer.html create mode 100644 templates/partials/header.html diff --git a/projects/templates/projects/project_list.html b/projects/templates/projects/project_list.html index 84e7a07..96f0764 100644 --- a/projects/templates/projects/project_list.html +++ b/projects/templates/projects/project_list.html @@ -1,6 +1,6 @@ {% extends 'partials/base.html' %} -{% block content %} +{% block content %}

Биржа проектов

diff --git a/projects/templates/contractor_project-detail.html b/templates/contractor_project-detail.html similarity index 100% rename from projects/templates/contractor_project-detail.html rename to templates/contractor_project-detail.html diff --git a/projects/templates/customer_project-detail.html b/templates/customer_project-detail.html similarity index 100% rename from projects/templates/customer_project-detail.html rename to templates/customer_project-detail.html diff --git a/templates/home.html b/templates/home.html index a2a2189..db77790 100644 --- a/templates/home.html +++ b/templates/home.html @@ -2,42 +2,10 @@ {% load staticfiles %} - {% block content %}
-
-
-
-
- -
-
- -
-
- регистрация -
-
-
-
-
+ {% include 'partials/header.html' %} +

Основная задача сайта

@@ -46,6 +14,7 @@ {{ user.groups.all }}
+
@@ -69,6 +38,7 @@
+
diff --git a/templates/partials/base.html b/templates/partials/base.html index 28cc497..5f8b91d 100644 --- a/templates/partials/base.html +++ b/templates/partials/base.html @@ -1,7 +1,7 @@ {% load staticfiles %} - + diff --git a/templates/partials/footer.html b/templates/partials/footer.html new file mode 100644 index 0000000..d564e6d --- /dev/null +++ b/templates/partials/footer.html @@ -0,0 +1,67 @@ +{% extends 'partials/base.html' %} + +{% load staticfiles %} + + + diff --git a/templates/partials/header.html b/templates/partials/header.html new file mode 100644 index 0000000..717b0fc --- /dev/null +++ b/templates/partials/header.html @@ -0,0 +1,40 @@ +{% load staticfiles %} + +
+
+
+
+ +
+ +
+ +
+ +
+ регистрация +
+
+
+
+