diff --git a/assets/css/extra.css b/assets/css/extra.css index 1b93da7..e7bd764 100644 --- a/assets/css/extra.css +++ b/assets/css/extra.css @@ -97,7 +97,6 @@ margin: 33px 0 0 0; } - .form-regestration .errorlist { color: red; width: 360px; @@ -112,14 +111,14 @@ color: #777620; } -#document-send-contact a, #document-send-order a , #document-send a { +#document-send-contact a, #document-send-order a, #document-send a { float: left; font-family: 'pfdintextcomppro-regular', sans-serif; color: #373737; font-size: 15px; - border:0; + border: 0; padding: 0px; - text-transform:lowercase; + text-transform: lowercase; } .documentsChat a.file-link, .documentsChat a.file-link:link, .documentsChat a.file-link:visited { @@ -129,8 +128,8 @@ font-family: Arial, Verdana, Helvetica, sans-serif; font-size: 12px; font-style: italic; - padding:0; - background:none; + padding: 0; + background: none; float: none; margin: 19px 0 -10px 0; } @@ -139,7 +138,6 @@ font-size: 20px; } - #message-chat-order-space, #message-chat-team-space { height: 312px; display: block; @@ -151,7 +149,7 @@ } .infoProfile .dropdown-menu .icon_mm3 a span.badge-count { - left:120px; + left: 120px; background: none; background-color: #FF0027; color: white; @@ -159,13 +157,12 @@ height: 25px; line-height: 25px; text-align: center; - font-size:14px; + font-size: 14px; border-radius: 100%; top: 1px; } - .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; @@ -212,12 +207,11 @@ -webkit-transform: scale(1.03); -moz-transform: scale(1.03); transform: scale(1.03); - box-shadow: 0 0 10px rgba(0,0,0,0.7); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.7); z-index: 999; } - -.count-tab{ +.count-tab { margin-left: 10px; width: 35px; height: 35px; @@ -235,7 +229,7 @@ background-color: #ebebeb; } -li a:active .count-tab, li a:hover .count-tab{ +li a:active .count-tab, li a:hover .count-tab { background-color: #FF0027; color: white; } @@ -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; + +} diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html index 4f83f33..288ca0d 100644 --- a/users/templates/contractor_filter.html +++ b/users/templates/contractor_filter.html @@ -201,7 +201,7 @@

{{ team.name }}

- +
Свободен
@@ -322,8 +322,13 @@

{{ contractor.get_full_name }} [{{ contractor.username }}]

- -
Свободен
+ + + {% if contractor.contractor_status == 'free' %} +
Свободен
+ {% else %} +
Занят
+ {% endif %} diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index abba5e7..41bcc4c 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -139,6 +139,8 @@

Свободен
+ +