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

#ARC-25 Fixes bugs

Browse Source
remotes/origin/PR-39
Mukhtar 10 years ago
parent cdee589e41
commit 6ff106e640
6 changed files with 22 additions and 32 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. 1
      chat/templates/chat_contractor.html
  2. 2
      chat/templates/chat_customer.html
  3. 23
      specializations/templates/templatetags/specializations_widget.html
  4. 2
      templates/partials/base.html
  5. 6
      users/models.py
  6. 20
      users/templates/contractor_profile.html

1
chat/templates/chat_contractor.html
Unescape View File

@ -91,7 +91,6 @@
<!-- Tab2 chat order block --> <!-- Tab2 chat order block -->
<div class="chatBlock disTab tab-pane fade" id="tab2"> <div class="chatBlock disTab tab-pane fade" id="tab2">
<div class="col-lg-3 wrMessages"> <div class="col-lg-3 wrMessages">
<div class="messageBlock box-sizing disTab"> <div class="messageBlock box-sizing disTab">
<p>Заказы</p> <p>Заказы</p>
{% for order in orders %} {% for order in orders %}

2
chat/templates/chat_customer.html
Unescape View File

@ -82,7 +82,7 @@
<div class="textAreaBlock2 box-sizing disTab"> <div class="textAreaBlock2 box-sizing disTab">
<p>Для заметок</p> <p>Для заметок</p>
<textarea id="chat2"></textarea> <textarea id="chat2"></textarea>
<a href="javascript:void()">сохранить</a> <a href="#">сохранить</a>
</div> </div>
</div> </div>
</div> </div>

23
specializations/templates/templatetags/specializations_widget.html
Unescape View File

@ -1,23 +0,0 @@
<div class="dashedCol4">
<p class="specUser">Специализации:</p>
<div class="special_inner">
{% for spec in specializations %}
<div class="insetSpec">
<span>{{ spec }}</span>
<span>2-й</span>
</div>
{% endfor %}
</div>
</div>
{# <div class="dashedCol4 dashedCol44 dashedColColor">#}
{# <p class="specUser">#}
{# Специализации:#}
{# </p>#}
{# <div class="insetSpec">#}
{# <span>Интерьеры</span>#}
{# </div>#}
{# #}
{# <div class="insetSpec">#}
{# <span>Визуализация/3D</span>#}
{# </div>#}
{# </div>#}

2
templates/partials/base.html
Unescape View File

@ -37,7 +37,7 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<div style="position: absolute; left: 0; bottom: 0; padding: 6px; color: black; background-color: {% if request.user.is_contractor %}#BADA55{% else %}#C0FFEE{% endif %}; z-index: 50"> <div style="position: absolute; left: 0; top: 0; padding: 6px; color: black; background-color: {% if request.user.is_contractor %}#BADA55{% else %}#C0FFEE{% endif %}; z-index: 50">
{{ request.user }}<br> {{ request.user }}<br>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}

6
users/models.py
Unescape View File

@ -158,6 +158,12 @@ class User(AbstractBaseUser, PermissionsMixin):
def get_profile_image(self): def get_profile_image(self):
return self.avatar return self.avatar
def get_gender(self):
if self.gender:
return 'Мужчина' if self.gender == 'male' else 'Женщина'
else:
return None
USERNAME_FIELD = 'username' USERNAME_FIELD = 'username'
REQUIRED_FIELDS = [] REQUIRED_FIELDS = []
objects = UserManager() objects = UserManager()

20
users/templates/contractor_profile.html
Unescape View File

@ -27,6 +27,12 @@
</a> </a>
<span></span> <span></span>
</li> </li>
<li class="icon_um1">
<a href="{% url 'users:user-profile-edit' pk=contractor.pk %}">
редактировать профиль
</a>
<span></span>
</li>
{% endif %} {% endif %}
{% if contractor.pk != request.user.pk and request.user.is_contractor %} {% if contractor.pk != request.user.pk and request.user.is_contractor %}
@ -267,18 +273,18 @@
</div> </div>
<div id="tab13" class="tab-pane fade"> <div id="tab13" class="tab-pane fade">
<div class="col-lg-9 resume">
<div class="col-lg-9">
<div class="col-lg-12 resume">
<form enctype="multipart/form-data"> <form enctype="multipart/form-data">
<input type="hidden" name="text" value="Hello"> <input type="hidden" name="text" value="Hello">
<div class="upload2 up-l1"> <div class="upload2 up-l1">
<input type="file" name="upload" id="upload-resume"> <input type="file" name="upload" id="upload-resume">
<p>Загрузить резюме</p> <p>Загрузить резюме</p>
</div> </div>
</form> </form>
{#w#}
</div> </div>
<div class="col-lg-9 resume-block"> <div class="col-lg-12 resume-block">
<div class="block-is box-sizing"> <div class="block-is box-sizing">
<div class="block-i"> <div class="block-i">
{% thumbnail contractor.avatar "176x160" crop="center" as im %} {% thumbnail contractor.avatar "176x160" crop="center" as im %}
@ -296,11 +302,12 @@
class="download-summ">скачать резюме</a> class="download-summ">скачать резюме</a>
{% endif %} {% endif %}
<p class="who-summ"> <p class="who-summ">
{{ contractor.gender }}, {{ contractor.date_of_birth }} {{ contractor.get_gender }}, {{ contractor.date_of_birth }}
</p> </p>
<div class="list-summ-block"> <div class="list-summ-block">
<div class="col-lg-4"> <div class="col-lg-4">
<ul class="list-summ"> <ul class="list-summ">
{% if contractor.website %} {% if contractor.website %}
<li>{{ contractor.website }}</li> <li>{{ contractor.website }}</li>
{% endif %} {% endif %}
@ -321,7 +328,7 @@
</div> </div>
<div class="col-lg-12 wr-inset-pluss"> <div class="col-lg-12 wr-inset-pluss">
<div class="pluss-block" id="resume-text-out"> <div class="pluss-block" id="resume-text-out">
{{ contractor.contractor_resume.text }} {{ contractor.contractor_resume.text | safe }}
</div> </div>
<a href="#" data-toggle="modal" data-target="#resume-text-edit"> <a href="#" data-toggle="modal" data-target="#resume-text-edit">
@ -430,6 +437,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
<div id="tab14" class="tab-pane fade"> <div id="tab14" class="tab-pane fade">

Write Preview
Loading…
Cancel
Save