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

assets/css/extra.css

@@ -97,7 +97,6 @@
     margin: 33px 0 0 0;
 }
 
-
 .form-regestration .errorlist {
     color: red;
     width: 360px;
@@ -139,7 +138,6 @@
     font-size: 20px;
 }
 
-
 #message-chat-order-space, #message-chat-team-space {
     height: 312px;
     display: block;
@@ -165,7 +163,6 @@
 
 }
 
-
 .deleteOrder:after {
     content: '';
     position: absolute;
@@ -177,7 +174,6 @@
     top: 2px;
 }
 
-
 .deleteOrder, .deleteOrder:link, .deleteOrder:visited {
     color: #5a5a5a;
     font-size: 14px;
@@ -189,7 +185,6 @@
     font-style: italic;
 }
 
-
 .trashedOrderBlock {
     width: 100%;
     float: left;
@@ -216,7 +211,6 @@
     z-index: 999;
 }
 
-
 .count-tab {
     margin-left: 10px;
     width: 35px;
@@ -249,3 +243,33 @@ li a:active .count-tab,  li a:hover .count-tab{
 .-bold {
     font-weight: bold;
 }
+
+.mainContainer {
+    background-repeat: repeat;
+    height: 100%;
+}
+
+.nameExecutor a:link, .nameExecutor:visited, .nameExecutor a {
+    -ms-word-break: break-all;
+    word-break: break-all;
+
+
+    -webkit-hyphens: auto;
+    -moz-hyphens: auto;
+    hyphens: auto;
+    white-space: -moz-pre-wrap;
+
+
+    white-space: pre-wrap; /* css-3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    word-wrap: break-word; /* Internet Explorer 5.5+ */
+    /*width:100px;*/
+}
+
+.busy {
+    background-color: red;
+}
+.busy::after {
+    border-color: red transparent transparent red;
+
+}

users/templates/contractor_filter.html

@@ -201,7 +201,7 @@
                                 <p class="nameExecutor">
                                     <a href="{% url 'users:team-profile' pk=team.pk %}">{{ team.name }}</a>
                                 </p>
-                                <p class="navv2">На сайте 8 лет и 3 месяца</p>
+                                <p class="navv2">На сайте c {{ team.created|date:"d M Y"}}</p>
                                 <div class="statusUser">Свободен</div>
                             </div>
                             
@@ -322,8 +322,13 @@
                                 <p class="nameExecutor">
                                     <a href="{% url 'users:contractor-profile' pk=contractor.pk %}">{{ contractor.get_full_name }} [{{ contractor.username }}]</a>
                                 </p>
-                                <p class="navv2">На сайте 8 лет и 3 месяца</p>
+                                <p class="navv2">На сайте c {{ contractor.created|date:"d M Y"}}</p>
+
+                                {% if contractor.contractor_status == 'free' %}
                                     <div class="statusUser">Свободен</div>
+                                {% else %}
+                                    <div class="statusUser busy">Занят</div>
+                                {% endif %}
                             </div>
                             
                             

users/templates/contractor_office.html

@@ -139,6 +139,8 @@
                                 </p>
 
                                 <div class="statusUser st-new">Свободен</div>
+
+
                             </div>
 
                             <div class="col-lg-4">