diff --git a/assets/css/dev-colors.css b/assets/css/dev-colors.css new file mode 100755 index 0000000..4b9b371 --- /dev/null +++ b/assets/css/dev-colors.css @@ -0,0 +1,16 @@ +.a {background-color: #ffbfbf !important} .b {background-color: #ffe1bf !important} +.c {background-color: #fbffbf !important} .d {background-color: #bfffc8 !important} +.e {background-color: #bff2ff !important} .f {background-color: #bfd0ff !important} +.g {background-color: #d0bfff !important} .h {background-color: #ffbfea !important} +.i {background-color: #ff8080 !important} .j {background-color: #ffc480 !important} +.k {background-color: #f6ff80 !important} .l {background-color: #b2ff80 !important} +.m {background-color: #80a2ff !important} .n {background-color: #a280ff !important} +.o {background-color: #ff80d5 !important} .p {background-color: #ff4040 !important} +.q {background-color: #40ff59 !important} .r {background-color: #40ffbf !important} +.s {background-color: #40d9ff !important} .t {background-color: #7340ff !important} +.u {background-color: #d940ff !important} .v {background-color: #ff8800 !important} +.w {background-color: #eeff00 !important} .x {background-color: #ff00aa !important} +.y {background-color: #999999 !important} .z {background-color: #997373 !important} + +.-borders {border: 1px solid red} +.-underline {text-decoration: underline} diff --git a/projects/models.py b/projects/models.py index 9327e66..2f24027 100644 --- a/projects/models.py +++ b/projects/models.py @@ -92,8 +92,8 @@ class Project(models.Model): STATES = ( ('active', 'Активный'), - ('trash', 'В корзине'), - ('delete', 'Удален'), + ('trashed', 'В корзине'), + ('deleted', 'Удален'), ) budget = models.DecimalField(max_digits=10, decimal_places=0) diff --git a/templates/partials/base.html b/templates/partials/base.html index 145a00b..3e629f1 100644 --- a/templates/partials/base.html +++ b/templates/partials/base.html @@ -18,6 +18,7 @@ +
diff --git a/users/templates/customer_profile_current_projects.html b/users/templates/customer_profile_current_projects.html index 977f259..0fe6fb8 100644 --- a/users/templates/customer_profile_current_projects.html +++ b/users/templates/customer_profile_current_projects.html @@ -1,77 +1,17 @@ {% extends 'partials/base.html' %} +{% load user_tags %} + {% block content %} {% include 'partials/header.html' %}
- - {{ object.get_full_name }} [ivanov_petr] -
- -Россия, Москва
- -
- - {{ object.get_full_name }} [ivanov_petr] -
- -Россия, Москва
- -