mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#ARC-11

Browse Source
remotes/origin/setup
ArturBaybulatov 10 years ago
parent 10f29e18c2
commit c25343f8a6
12 changed files with 140 additions and 204 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. 16
      assets/css/dev-colors.css
  2. 4
      projects/models.py
  3. 1
      templates/partials/base.html
  4. 74
      users/templates/customer_profile_current_projects.html
  5. 73
      users/templates/customer_profile_open_projects.html
  6. 15
      users/templates/customer_profile_reviews.html
  7. 63
      users/templates/customer_profile_trashed_projects.html
  8. 69
      users/templates/partials/customer_profile_info_block.html
  9. 15
      users/templates/tmp.html
  10. 6
      users/templatetags/user_tags.py
  11. 4
      users/urls.py
  12. 4
      users/views.py

16
assets/css/dev-colors.css
Unescape View File

@ -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}

4
projects/models.py
Unescape View File

@ -92,8 +92,8 @@ class Project(models.Model):
STATES = ( STATES = (
('active', 'Активный'), ('active', 'Активный'),
('trash', 'В корзине'), ('trashed', 'В корзине'),
('delete', 'Удален'), ('deleted', 'Удален'),
) )
budget = models.DecimalField(max_digits=10, decimal_places=0) budget = models.DecimalField(max_digits=10, decimal_places=0)

1
templates/partials/base.html
Unescape View File

@ -18,6 +18,7 @@
<link rel='stylesheet' href='{% static "css/main.css" %}'> <link rel='stylesheet' href='{% static "css/main.css" %}'>
<link rel='stylesheet' href='{% static "css/extra.css" %}'> <!-- Our additional CSS --> <link rel='stylesheet' href='{% static "css/extra.css" %}'> <!-- Our additional CSS -->
<link rel='stylesheet' href='{% static "css/dev-colors.css" %}'> <!-- Dev-time only, temporary!!! -->
</head> </head>
<body> <body>

74
users/templates/customer_profile_current_projects.html
Unescape View File

@ -1,77 +1,17 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% load user_tags %}
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<div class="container mainScore mainBlock2"> <div class="container mainScore mainBlock2">
<div class="row"> <div class="row">
<div class="col-lg-12"> {% include 'partials/customer_profile_info_block.html' %}
<div class="col-lg-3 divCol3">
<div class="avatar new-mar"> <h1>Current projects will be here</h1>
<div class="avatarInset">
<img src="img/profile.jpg" alt="profile-image"> {% include 'partials/footer.html' %}
</div>
</div>
</div>
<div class="col-lg-9 divCol9">
<div class="col-lg-4">
<p class="nameUser">
{{ object.get_full_name }} [ivanov_petr]
</p>
<p class="cityUser">Россия, Москва</p>
<p class="navv">На сайте {{ object.created }}</p>
</div>
<div class="col-lg-4 new-er">
<ul class="rettList">
<li><a href="javascript:void(0)">Рейтинг: <span> 0</span></a></li>
<li><a href="javascript:void(0)">Безопасные сделки: <span> 0</span></a></li>
<li>
<a href="javascript:void(0)">
Отзывы:
<span> + 0</span>
<small> 0</small>
<mark> - 0</mark>
</a>
</li>
</ul>
</div>
<div class="col-lg-4">
<a href="javascript:void(0)" class="new-prop new-prop1">показать контакты</a>
<a href="javascript:void(0)" class="new-prop new-prop2">написать сообщение</a>
<a href="javascript:void(0)" class="new-red">редактировать профиль</a>
</div>
</div>
<div class="col-lg-9 divCol9 new-mar2">
<div class="profileTabs2 tabs-new">
<ul class="nav nav-tabs nav-justified">
<li role="presentation" class="active">
<a href="#">Открытые проекты</a>
</li>
<li role="presentation">
<a href="#">Текущие проекты</a>
<div class="roundsCount">
<div class="countR">0</div>
<div class="countG">0</div>
</div>
</li>
<li role="presentation">
<a href="#">Отзывы</a>
<div class="roundsCount">
<div class="countG">0</div>
</div>
</li>
</ul>
</div>
</div>
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

73
users/templates/customer_profile_open_projects.html
Unescape View File

@ -5,75 +5,8 @@
<div class="container mainScore mainBlock2"> <div class="container mainScore mainBlock2">
<div class="row"> <div class="row">
<div class="col-lg-12"> {% include 'partials/customer_profile_info_block.html' %}
<div class="col-lg-3 divCol3">
<div class="avatar new-mar">
<div class="avatarInset">
<img src="img/profile.jpg" alt="profile-image">
</div>
</div>
</div>
<div class="col-lg-9 divCol9">
<div class="col-lg-4">
<p class="nameUser">
{{ object.get_full_name }} [ivanov_petr]
</p>
<p class="cityUser">Россия, Москва</p>
<p class="navv">На сайте {{ object.created }}</p>
</div>
<div class="col-lg-4 new-er">
<ul class="rettList">
<li><a href="javascript:void(0)">Рейтинг: <span> 0</span></a></li>
<li><a href="javascript:void(0)">Безопасные сделки: <span> 0</span></a></li>
<li>
<a href="javascript:void(0)">
Отзывы:
<span> + 0</span>
<small> 0</small>
<mark> - 0</mark>
</a>
</li>
</ul>
</div>
<div class="col-lg-4">
<a href="javascript:void(0)" class="new-prop new-prop1">показать контакты</a>
<a href="javascript:void(0)" class="new-prop new-prop2">написать сообщение</a>
<a href="javascript:void(0)" class="new-red">редактировать профиль</a>
</div>
</div>
<div class="col-lg-9 divCol9 new-mar2">
<div class="profileTabs2 tabs-new">
<ul class="nav nav-tabs nav-justified">
<li role="presentation" class="active">
<a href="#">Открытые проекты</a>
</li>
<li role="presentation">
<a href="#">Текущие проекты</a>
<div class="roundsCount">
<div class="countR">0</div>
<div class="countG">0</div>
</div>
</li>
<li role="presentation">
<a href="#">Отзывы</a>
<div class="roundsCount">
<div class="countG">0</div>
</div>
</li>
</ul>
</div>
</div>
</div>
<div class="buttonGP disTab"> <div class="buttonGP disTab">
<div class="btn-group valProject2"> <div class="btn-group valProject2">
<a href="{% url 'users:customer-profile-open-projects' pk=user.pk %}" class="btn btn-default" disabled> <a href="{% url 'users:customer-profile-open-projects' pk=user.pk %}" class="btn btn-default" disabled>
@ -81,7 +14,7 @@
<span><mark>2</mark> / <span>35</span></span> <span><mark>2</mark> / <span>35</span></span>
</a> </a>
<a href="{% url 'users:customer-profile-deleted-projects' pk=user.pk %}" class="btn btn-default"> <a href="{% url 'users:customer-profile-trashed-projects' pk=user.pk %}" class="btn btn-default">
Корзина Корзина
<span><mark></mark><span>7</span></span> <span><mark></mark><span>7</span></span>
</a> </a>

15
users/templates/customer_profile_reviews.html
Unescape View File

@ -0,0 +1,15 @@
{% extends 'partials/base.html' %}
{% block content %}
{% include 'partials/header.html' %}
<div class="container mainScore mainBlock2">
<div class="row">
{% include 'partials/customer_profile_info_block.html' %}
<h1>Reviews will be here</h1>
{% include 'partials/footer.html' %}
</div>
</div>
{% endblock %}

63
users/templates/customer_profile_deleted_projects.html → users/templates/customer_profile_trashed_projects.html
Unescape View File

@ -5,65 +5,8 @@
<div class="container mainScore mainBlock2"> <div class="container mainScore mainBlock2">
<div class="row"> <div class="row">
<div class="col-lg-12"> {% include 'partials/customer_profile_info_block.html' %}
<div class="col-lg-3 divCol3">
<div class="avatar new-mar">
<div class="avatarInset">
<img src="img/profile.jpg" alt="profile-image">
</div>
</div>
</div>
<div class="col-lg-9 divCol9">
<div class="col-lg-4">
<p class="nameUser">
{{ object.get_full_name }} [ivanov_petr]
</p>
<p class="cityUser">Россия, Москва</p>
<p class="navv">На сайте 8 лет и 3 месяца</p>
</div>
<div class="col-lg-4 new-er">
<ul class="rettList">
<li><a href="javascript:void(0)">Рейтинг: <span> 1245</span></a></li>
<li><a href="javascript:void(0)">Безопасные сделки: <span> 5</span></a></li>
<li>
<a href="javascript:void(0)">
Отзывы:
<span> + 385</span>
<small> 0</small>
<mark> - 0</mark>
</a>
</li>
</ul>
</div>
<div class="col-lg-4">
<a href="javascript:void(0)" class="new-prop new-prop1">показать контакты</a>
<a href="javascript:void(0)" class="new-prop new-prop2">написать сообщение</a>
<a href="javascript:void(0)" class="new-red">редактировать профиль</a>
</div>
</div>
<div class="col-lg-9 divCol9 new-mar2">
<div class="profileTabs2 tabs-new">
<ul class="nav nav-tabs nav-justified">
<li role="presentation" class="active">
<a href="#">Открытые проекты</a>
</li>
<li role="presentation">
<a href="#">Текущие проекты</a>
<div class="roundsCount">
<div class="countR">1</div>
<div class="countG">2</div>
</div>
</li>
<li role="presentation">
<a href="#">Отзывы</a>
<div class="roundsCount">
<div class="countG">2</div>
</div>
</li>
</ul>
</div>
</div>
</div>
<div class="buttonGP disTab"> <div class="buttonGP disTab">
<div class="btn-group valProject2"> <div class="btn-group valProject2">
<a href="{% url 'users:customer-profile-open-projects' pk=user.pk %}" class="btn btn-default"> <a href="{% url 'users:customer-profile-open-projects' pk=user.pk %}" class="btn btn-default">
@ -71,7 +14,7 @@
<span><mark>2</mark> / <span>35</span></span> <span><mark>2</mark> / <span>35</span></span>
</a> </a>
<a href="{% url 'users:customer-profile-deleted-projects' pk=user.pk %}" class="btn btn-default" disabled> <a href="{% url 'users:customer-profile-trashed-projects' pk=user.pk %}" class="btn btn-default" disabled>
Корзина Корзина
<span><mark></mark><span>7</span></span> <span><mark></mark><span>7</span></span>
</a> </a>

69
users/templates/partials/customer_profile_info_block.html
Unescape View File

@ -0,0 +1,69 @@
<div class="col-lg-12">
<div class="col-lg-3 divCol3">
<div class="avatar new-mar">
<div class="avatarInset">
<img src="img/profile.jpg" alt="profile-image">
</div>
</div>
</div>
<div class="col-lg-9 divCol9">
<div class="col-lg-4">
<p class="nameUser">
{{ object.get_full_name }} [ivanov_petr]
</p>
<p class="cityUser">Россия, Москва</p>
<p class="navv">На сайте {{ object.created }}</p>
</div>
<div class="col-lg-4 new-er">
<ul class="rettList">
<li><a href="javascript:void(0)">Рейтинг: <span> 0</span></a></li>
<li><a href="javascript:void(0)">Безопасные сделки: <span> 0</span></a></li>
<li>
<a href="javascript:void(0)">
Отзывы:
<span> + 0</span>
<small> 0</small>
<mark> - 0</mark>
</a>
</li>
</ul>
</div>
<div class="col-lg-4">
<a href="javascript:void(0)" class="new-prop new-prop1">показать контакты</a>
<a href="javascript:void(0)" class="new-prop new-prop2">написать сообщение</a>
<a href="javascript:void(0)" class="new-red">редактировать профиль</a>
</div>
</div>
<div class="col-lg-9 divCol9 new-mar2">
<div class="profileTabs2 tabs-new">
<ul class="nav nav-tabs nav-justified">
<li role="presentation" class="active">
<a href="{% url 'users:customer-profile-open-projects' pk=user.pk %}">Открытые проекты</a>
</li>
<li role="presentation">
<a href="{% url 'users:customer-profile-current-projects' pk=user.pk %}">Текущие проекты</a>
<div class="roundsCount">
<div class="countR">0</div>
<div class="countG">0</div>
</div>
</li>
<li role="presentation">
<a href="{% url 'users:customer-profile-reviews' pk=user.pk %}">Отзывы</a>
<div class="roundsCount">
<div class="countG">0</div>
</div>
</li>
</ul>
</div>
</div>
</div>

15
users/templates/tmp.html
Unescape View File

@ -0,0 +1,15 @@
{% extends 'partials/base.html' %}
{% block content %}
{% include 'partials/header.html' %}
<div class="container mainScore mainBlock2">
<div class="row">
{% include 'partials/customer_profile_info_block.html' %}
<h1>Hello there</h1>
{% include 'partials/footer.html' %}
</div>
</div>
{% endblock %}

6
users/templatetags/user_tags.py
Unescape View File

@ -5,4 +5,8 @@ register = template.Library()
@register.filter('has_group') @register.filter('has_group')
def has_group(user, group_name): def has_group(user, group_name):
groups = user.groups.all().values_list('name', flat=True) groups = user.groups.all().values_list('name', flat=True)
return True if group_name in groups else False return True if group_name in groups else False
@register.simple_tag
def test():
return 'Hello there'

4
users/urls.py
Unescape View File

@ -3,7 +3,7 @@ from django.contrib.auth.views import login, logout
from .views import ( from .views import (
ContractorListView, ContractorOfficeDetailView, ContractorProfileDetailView, ContractorListView, ContractorOfficeDetailView, ContractorProfileDetailView,
CustomerProfileCurrentProjectsView, CustomerProfileDeletedProjectsView, CustomerProfileOpenProjectsView, CustomerProfileCurrentProjectsView, CustomerProfileTrashedProjectsView, CustomerProfileOpenProjectsView,
CustomerProfileReviewsView, UserDetailView, UserInfoListView, UserListView, UserView, CustomerProfileReviewsView, UserDetailView, UserInfoListView, UserListView, UserView,
) )
@ -12,7 +12,7 @@ app_name = 'users'
urlpatterns = [ urlpatterns = [
urls.url(r'^customers/(?P<pk>\d+)/$', CustomerProfileOpenProjectsView.as_view(), name='customer-profile-open-projects'), urls.url(r'^customers/(?P<pk>\d+)/$', CustomerProfileOpenProjectsView.as_view(), name='customer-profile-open-projects'),
urls.url(r'^customers/(?P<pk>\d+)/deleted-projects/$', CustomerProfileDeletedProjectsView.as_view(), name='customer-profile-deleted-projects'), urls.url(r'^customers/(?P<pk>\d+)/trashed-projects/$', CustomerProfileTrashedProjectsView.as_view(), name='customer-profile-trashed-projects'),
urls.url(r'^customers/(?P<pk>\d+)/current-projects/$', CustomerProfileCurrentProjectsView.as_view(), name='customer-profile-current-projects'), urls.url(r'^customers/(?P<pk>\d+)/current-projects/$', CustomerProfileCurrentProjectsView.as_view(), name='customer-profile-current-projects'),
urls.url(r'^customers/(?P<pk>\d+)/reviews/$', CustomerProfileReviewsView.as_view(), name='customer-profile-reviews'), urls.url(r'^customers/(?P<pk>\d+)/reviews/$', CustomerProfileReviewsView.as_view(), name='customer-profile-reviews'),

4
users/views.py
Unescape View File

@ -75,9 +75,9 @@ class CustomerProfileOpenProjectsView(TemplateView):
template_name = 'customer_profile_open_projects.html' template_name = 'customer_profile_open_projects.html'
class CustomerProfileDeletedProjectsView(TemplateView): class CustomerProfileTrashedProjectsView(TemplateView):
model = User model = User
template_name = 'customer_profile_deleted_projects.html' template_name = 'customer_profile_trashed_projects.html'
class CustomerProfileCurrentProjectsView(TemplateView): class CustomerProfileCurrentProjectsView(TemplateView):

Write Preview
Loading…
Cancel
Save