Merge branch 'master' of https://bitbucket.org/PekopT/archilance into artur

chat/templates/chat_contractor.html

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

chat/templates/chat_customer.html

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

specializations/templates/templatetags/specializations_widget.html

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

templates/partials/base.html

@@ -37,7 +37,7 @@
     {% endfor %}
 {% 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>
 
     {% if request.user.is_authenticated %}

users/models.py

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

users/templates/contractor_profile.html

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