From c8928007366c87af7375abfb5769bdeef5ba512c Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Mon, 6 Jun 2016 18:09:42 +0300 Subject: [PATCH] Update --- .../templates/projects/project_detail.html | 33 +- projects/templates/projects/project_list.html | 409 +++++++++--------- {review => reviews}/__init__.py | 0 {review => reviews}/admin.py | 0 {review => reviews}/apps.py | 0 .../migrations/0001_initial.py | 0 .../migrations/0002_auto_20160531_0906.py | 0 {review => reviews}/migrations/__init__.py | 0 {review => reviews}/models.py | 0 {review => reviews}/tests.py | 0 {review => reviews}/views.py | 0 .../specializations/specialization.html | 1 + .../specialization_detail.html | 1 + .../specializations/specialization_list.html | 3 +- templates/home.html | 8 +- templates/partials/base.html | 3 - templates/partials/footer.html | 2 - templates/partials/header.html | 76 +++- templates/partials/pagination.html | 21 + templates/{ => trash}/chat1.html | 0 templates/{ => trash}/comparison.html | 0 templates/{ => trash}/contractor-balance.html | 0 templates/{ => trash}/contractor-filter.html | 0 .../{ => trash}/contractor_my-office.html | 0 ...contractor_my-office_deleted-projects.html | 0 .../contractor_my-office_open-projects.html | 0 .../contractor_portfolio-detail.html | 0 .../contractor_project-detail.html | 0 .../contractor_public-profile.html | 0 .../contractor_public-profile_edit.html | 0 .../contractor_work-for-sell-detail.html | 0 .../contractor_works-for-sell.html | 0 templates/{ => trash}/customer_balance.html | 0 .../{ => trash}/customer_create-project.html | 0 .../{ => trash}/customer_project-detail.html | 0 ...tomer_public-profile_deleted-projects.html | 0 .../customer_public-profile_edit.html | 0 ...customer_public-profile_open-projects.html | 0 .../etc_raspechatka-dokumentov.html | 0 templates/{ => trash}/etc_text.html | 0 templates/{ => trash}/project-filter.html | 2 +- templates/{ => trash}/sign-up_universal.html | 0 {worksell => work_sell}/__init__.py | 0 {worksell => work_sell}/admin.py | 0 {worksell => work_sell}/apps.py | 0 .../migrations/0001_initial.py | 0 .../migrations/__init__.py | 0 {worksell => work_sell}/models.py | 0 {worksell => work_sell}/tests.py | 0 {worksell => work_sell}/views.py | 0 50 files changed, 307 insertions(+), 252 deletions(-) rename {review => reviews}/__init__.py (100%) rename {review => reviews}/admin.py (100%) rename {review => reviews}/apps.py (100%) rename {review => reviews}/migrations/0001_initial.py (100%) rename {review => reviews}/migrations/0002_auto_20160531_0906.py (100%) rename {review => reviews}/migrations/__init__.py (100%) rename {review => reviews}/models.py (100%) rename {review => reviews}/tests.py (100%) rename {review => reviews}/views.py (100%) create mode 100644 templates/partials/pagination.html rename templates/{ => trash}/chat1.html (100%) rename templates/{ => trash}/comparison.html (100%) rename templates/{ => trash}/contractor-balance.html (100%) rename templates/{ => trash}/contractor-filter.html (100%) rename templates/{ => trash}/contractor_my-office.html (100%) rename templates/{ => trash}/contractor_my-office_deleted-projects.html (100%) rename templates/{ => trash}/contractor_my-office_open-projects.html (100%) rename templates/{ => trash}/contractor_portfolio-detail.html (100%) rename templates/{ => trash}/contractor_project-detail.html (100%) rename templates/{ => trash}/contractor_public-profile.html (100%) rename templates/{ => trash}/contractor_public-profile_edit.html (100%) rename templates/{ => trash}/contractor_work-for-sell-detail.html (100%) rename templates/{ => trash}/contractor_works-for-sell.html (100%) rename templates/{ => trash}/customer_balance.html (100%) rename templates/{ => trash}/customer_create-project.html (100%) rename templates/{ => trash}/customer_project-detail.html (100%) rename templates/{ => trash}/customer_public-profile_deleted-projects.html (100%) rename templates/{ => trash}/customer_public-profile_edit.html (100%) rename templates/{ => trash}/customer_public-profile_open-projects.html (100%) rename templates/{ => trash}/etc_raspechatka-dokumentov.html (100%) rename templates/{ => trash}/etc_text.html (100%) rename templates/{ => trash}/project-filter.html (99%) rename templates/{ => trash}/sign-up_universal.html (100%) rename {worksell => work_sell}/__init__.py (100%) rename {worksell => work_sell}/admin.py (100%) rename {worksell => work_sell}/apps.py (100%) rename {worksell => work_sell}/migrations/0001_initial.py (100%) rename {worksell => work_sell}/migrations/__init__.py (100%) rename {worksell => work_sell}/models.py (100%) rename {worksell => work_sell}/tests.py (100%) rename {worksell => work_sell}/views.py (100%) diff --git a/projects/templates/projects/project_detail.html b/projects/templates/projects/project_detail.html index a5bc0d9..a16a048 100644 --- a/projects/templates/projects/project_detail.html +++ b/projects/templates/projects/project_detail.html @@ -1,7 +1,11 @@ {% extends 'partials/base.html' %} + {% load staticfiles %} +{% load humanize %} + + {% block content %} - {% load humanize %} + {% include 'partials/header.html' %}

{{ object }}

@@ -193,7 +197,6 @@
{% for answer in object.answers.all %} -
@@ -262,29 +265,11 @@
{% endfor %} -
+
- + {% include 'partials/pagination.html' %}
+ + {% include 'partials/footer.html' %} {% endblock %} diff --git a/projects/templates/projects/project_list.html b/projects/templates/projects/project_list.html index 96f0764..5856acf 100644 --- a/projects/templates/projects/project_list.html +++ b/projects/templates/projects/project_list.html @@ -1,207 +1,212 @@ {% extends 'partials/base.html' %} {% block content %} -
-

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

-
-
-
-
-
-
Тип работ:
-
Специализации:
-
-
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
- -
-
- - найти исполнителя - -
-
- - Очистить фильт - -
-
-
-
-

Расширенный поиск

- -
-
-
-
-
-
-
-
Тип работ:
-
Специализации:
-
-
-
-
-
- + {% include 'partials/header.html' %} + +
+
+
+

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

+
+
+
+
+
+
Тип работ:
+
Специализации:
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ + найти исполнителя + +
+
+ + Очистить фильт + +
+
+
+
+

Расширенный поиск

+ +
+
+
+
+
+
+
+
Тип работ:
+
Специализации:
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +

Требуется допуск (СРО)

+
+
+
+
+
+
+

Список проектов

+
+

Сортировать по:

+ + цене + + + + cорту + + + + рейтенгу + + + + дате размещения + + + + ответам + + + + просмотрам + + +
+
+
+ {% for proj in object_list %} +
+
+

+ {{ proj }} +

+
    +
  • + Объект "{{ proj.realty.name }}" +
    • +
  • + 2 ответ от имени группы +
    • +
+

+ {{ proj.text }} +

+
    +
  • + {{ proj.created }} +
    • +
  • + 523 +
    • +
  • + 523 +
    • +
  • + {{ proj.user }} +
    • +
+
+
+

+ {{ proj.price }} +

+
    +
  • + Безопасная сделка +
    • +
  • + Стадия: "П" +
    • +
  • + Отказаться и перемстить + в корзину +
    • +
+
-
- -
-
- -
-
- -
-
-
-
- -

Требуется допуск (СРО)

-
-
-
-
-
-
-

Список проектов

-
-

Сортировать по:

- - цене - - - - cорту - - - - рейтенгу - - - - дате размещения - - - - ответам - - - - просмотрам - - -
-
-
- {% for proj in object_list %} -
-
-

- {{ proj }} -

-
    -
  • - Объект "{{ proj.realty.name }}" -
    • -
  • - 2 ответ от имени группы -
    • -
-

- {{ proj.text }} -

-
    -
  • - {{ proj.created }} -
    • -
  • - 523 -
    • -
  • - 523 -
    • -
  • - {{ proj.user }} -
    • -
-
-
-

- {{ proj.price }} -

-
    -
  • - Безопасная сделка -
    • -
  • - Стадия: "П" -
    • -
  • - Отказаться и переместить - в корзину -
    • -
-
-
- {% endfor %} - -
-
- -
- + {% endfor %} +
+
+ {% include 'partials/pagination.html' %} +
+ + {% include 'partials/footer.html' %} +
+
{% endblock %} diff --git a/review/__init__.py b/reviews/__init__.py similarity index 100% rename from review/__init__.py rename to reviews/__init__.py diff --git a/review/admin.py b/reviews/admin.py similarity index 100% rename from review/admin.py rename to reviews/admin.py diff --git a/review/apps.py b/reviews/apps.py similarity index 100% rename from review/apps.py rename to reviews/apps.py diff --git a/review/migrations/0001_initial.py b/reviews/migrations/0001_initial.py similarity index 100% rename from review/migrations/0001_initial.py rename to reviews/migrations/0001_initial.py diff --git a/review/migrations/0002_auto_20160531_0906.py b/reviews/migrations/0002_auto_20160531_0906.py similarity index 100% rename from review/migrations/0002_auto_20160531_0906.py rename to reviews/migrations/0002_auto_20160531_0906.py diff --git a/review/migrations/__init__.py b/reviews/migrations/__init__.py similarity index 100% rename from review/migrations/__init__.py rename to reviews/migrations/__init__.py diff --git a/review/models.py b/reviews/models.py similarity index 100% rename from review/models.py rename to reviews/models.py diff --git a/review/tests.py b/reviews/tests.py similarity index 100% rename from review/tests.py rename to reviews/tests.py diff --git a/review/views.py b/reviews/views.py similarity index 100% rename from review/views.py rename to reviews/views.py diff --git a/specializations/templates/specializations/specialization.html b/specializations/templates/specializations/specialization.html index 8ae917f..f7ee02c 100644 --- a/specializations/templates/specializations/specialization.html +++ b/specializations/templates/specializations/specialization.html @@ -1,4 +1,5 @@ {% extends '_layout.html' %} + {% block content %}

Angular setup diff --git a/specializations/templates/specializations/specialization_detail.html b/specializations/templates/specializations/specialization_detail.html index efe0bbe..dc01ba3 100644 --- a/specializations/templates/specializations/specialization_detail.html +++ b/specializations/templates/specializations/specialization_detail.html @@ -1,4 +1,5 @@ {% extends 'partials/base.html' %} + {% block content %} {{ object }} {% endblock %} diff --git a/specializations/templates/specializations/specialization_list.html b/specializations/templates/specializations/specialization_list.html index 6dada02..c322153 100644 --- a/specializations/templates/specializations/specialization_list.html +++ b/specializations/templates/specializations/specialization_list.html @@ -1,4 +1,5 @@ {% extends 'partials/base.html' %} + {% block content %}

Специализации

{% load mptt_tags %} @@ -29,7 +30,7 @@
- {% block js_block %} + {% block js %} - \ No newline at end of file + diff --git a/templates/sign-up_universal.html b/templates/trash/sign-up_universal.html similarity index 100% rename from templates/sign-up_universal.html rename to templates/trash/sign-up_universal.html diff --git a/worksell/__init__.py b/work_sell/__init__.py similarity index 100% rename from worksell/__init__.py rename to work_sell/__init__.py diff --git a/worksell/admin.py b/work_sell/admin.py similarity index 100% rename from worksell/admin.py rename to work_sell/admin.py diff --git a/worksell/apps.py b/work_sell/apps.py similarity index 100% rename from worksell/apps.py rename to work_sell/apps.py diff --git a/worksell/migrations/0001_initial.py b/work_sell/migrations/0001_initial.py similarity index 100% rename from worksell/migrations/0001_initial.py rename to work_sell/migrations/0001_initial.py diff --git a/worksell/migrations/__init__.py b/work_sell/migrations/__init__.py similarity index 100% rename from worksell/migrations/__init__.py rename to work_sell/migrations/__init__.py diff --git a/worksell/models.py b/work_sell/models.py similarity index 100% rename from worksell/models.py rename to work_sell/models.py diff --git a/worksell/tests.py b/work_sell/tests.py similarity index 100% rename from worksell/tests.py rename to work_sell/tests.py diff --git a/worksell/views.py b/work_sell/views.py similarity index 100% rename from worksell/views.py rename to work_sell/views.py