Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into artur

assets/css/extra.css

@@ -149,3 +149,18 @@
 .-green-glyphicon.glyphicon.glyphicon-question-sign {
     color: green;
 }
+
+.infoProfile .dropdown-menu .icon_mm3 a span.badge-count {
+    left:120px;
+    background: none;
+    background-color: #FF0027;
+    color: white;
+    width: 25px;
+    height: 25px;
+    line-height: 25px;
+    text-align: center;
+    font-size:14px;
+    border-radius: 100%;
+    top: 1px;
+
+}

assets/css/main.css

@@ -213,17 +213,17 @@ ul li {
 }
 
 .changeBlock1 {
-    float: right;
-    margin-right: -15px;
-    background-color: rgba(0,0,0,0.7);
-}
-
-.changeBlock2 {
     float: left;
     margin-left: -15px;
     background-color: rgba(255,0,6,0.7);
 }
 
+.changeBlock2 {
+    float: right;
+    margin-right: -15px;
+    background-color: rgba(0,0,0,0.7);
+}
+
 .changeBlock > a {
     border: none;
     cursor: pointer;
@@ -6024,4 +6024,4 @@ input[type="radio"]{
     -moz-transform: scale(1.04);
     transform: scale(1.04);
 }
-/*end_new*/
+/*end_new*/

projects/templates/contractor_portfolio_edit.html

@@ -12,6 +12,7 @@
             </div>
 
     <form method="post" enctype="multipart/form-data" id="worksell-add-form">{% csrf_token %}
+        {{ form.errors }}
         <div class="textAreaBlock2 text-nn box-sizing disTab">
             <p>Название <span style="color: red">{{ form.name.errors.as_text }}</span></p>
             <input type="text" class="box-sizing" name="{{ form.name.html_name }}" value="{{ form.name.value }}">
@@ -26,7 +27,7 @@
         <div class="textAreaBlock2 text-nn box-sizing disTab">
             <p>Специализации</p>
          </div>
-
+<div class="-spec-select-container">
             <div class="col-lg-3">
                 <input type='hidden' class="-spec-select -spec-select-level-1" style="width: 100%">
             </div>
@@ -43,10 +44,10 @@
                 <input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%">
             </div>
 
-            <input type="hidden" id="chosenSpecId" name="{{ form.specialization.html_name }}"
+            <input type="hidden" class="-chosen-spec-id" name="{{ form.specialization.html_name }}"
                    value="{{ form.specialization.value }}">
 
-
+</div>
         <div class="textAreaBlock2 text-nn box-sizing disTab">
            <p>Бюджет{{ form.budget.errors.as_text }}</p>
             <div class="row">
@@ -84,9 +85,19 @@
 
         </div>
 
+        <div class="textAreaBlock2 text-nn box-sizing disTab">
+            <p>Фотографии</p>
+            {% for p in form.instance.photos.all %}
+                <div class="col-lg-3">
+                   <img src="{{ p }}" width="200" height="200"/>
+                </div>
+            {% endfor %}
+        </div>
+
         <div class="textAreaBlock2 text-nn box-sizing disTab">
 {#            <input type="file" name="{{ form.img.html_name }}"  >#}
             <input type="hidden" name="{{ form.user.html_name }}" value="{{ form.user.value }}" >
+            <input type="hidden" name="{{ form.images_ids.html_name }}" value="{{ form.user.value }}" >
 
         </div>
         <div class="searchF1 polsF1 polsFF links-filter">

templates/partials/header.html

@@ -99,7 +99,10 @@
                                   </a>
                                 </li>
                                 <li class="icon_mm3">
-                                    <a href="{% url 'chat:chat-user' %}">Сообщения<span></span></a>
+                                    <a href="{% url 'chat:chat-user' %}">Сообщения<span></span>
+                                        {% if request.user %}
+                                            {% count_new_message request.user %}
+                                        {% endif %}</a>
                                 </li>
                                 <li class="icon_mm4">
                                     <a href="{% url 'wallets:score-detail' pk=request.user.pk %}">Счет<span></span></a>

users/templates/templatetags/user_new_count.html

@@ -0,0 +1 @@
+<span class="badge badge-count">{{ new_count }}</span>

users/templatetags/user_tags.py

@@ -28,5 +28,9 @@ def has_group(user, group_name):
     groups = user.groups.all().values_list('name', flat=True)
     return True if group_name in groups else False
 
-def count_new_message(user):
-    pass
+@register.inclusion_tag('templatetags/user_new_count.html', takes_context=True)
+def count_new_message(context, user):
+    new_count = 3
+    return {
+        'new_count': new_count,
+    }