правки с сервера

project/static/css/style.css

@@ -273,10 +273,16 @@ ul.messagelist li.error { background-image: url(../img/icon-error.gif); }
 .ui-dialog .save_btn:hover {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;width:215px;height:72px;background:#ffca3e;border-radius:0;}
 .ui-dialog .save_btn span {width:215px;display:table-cell;vertical-align:middle;text-align:right;text-transform:uppercase;text-decoration:none;font-size:22px;color:#4e5661;}
 .ui-dialog .cancel_btn {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-weight:bold;border:none;width:120px;height:72px;background:none;border-radius:0;}
-.ui-dialog .cancel_btn span {width:215px;display:table-cell;vertical-align:middle;text-align:center;text-decoration:underline;font-size:14px;color:#498dd0;font-weight:normal;}
+.ui-dialog .cancel_btn span {width:215px;display:table-cell;vertical-align:middle;text-align:center;text-decoration:none;color:#646669;font-weight:normal;display: inline;
-.ui-dialog .cancel_btn span:hover {width:215px;display:table-cell;vertical-align:middle;text-align:center;text-decoration:none;font-size:14px;color:#498dd0;font-weight:normal;}
+  font-family: "Arial Narrow", Arial, sans-serif;
-
+  font-size: 22px;
-.client-edit-form_dlg .save_btn span {background:url(../img/save.png) no-repeat 20px top;}
+  text-transform: uppercase;
+  padding: 25px;
+  border: none;
+  cursor: pointer;
+  background:#f8f8f8;}
+.ui-dialog .cancel_btn span:hover {background:#dddddd;}
+.client-edit-form_dlg .save_btn span {background:url(../img/save.png) no-repeat 30px;}
 .yellow-btn {color:#4e5661;background:#fed13e;}
 .btn {display:inline-block;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;height:72px;background:#fed13e;border-radius:0;}
 .btn:hover {display:inline-block;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;border:none;height:72px;background:#ffca3e;border-radius:0;}
@@ -299,7 +305,8 @@ form label {font-style:italic;}
 .form-field: {width:210px;}
 
 input, select, textarea { font-family: Arial,Helvetica,sans-serif;background:#f8f8f8;}
-
+.buttons input {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;padding:25px;border:none;cursor: pointer;}
+.buttons input:hover {background:#dddddd;}
 fieldset {
     padding: 0 0 10px;
     border-style: none none solid;
@@ -368,7 +375,9 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; }
 #accounts .main { color: green; font-size: 11px; text-align: center; padding-left: 10px; vertical-align: top; }
 
 .add-link, .add-row {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;}
-.add-link {}
+.add-link, .add-row:hover {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;}
+.add-client-link {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;}
+.add-client-link:hover {background: url(../img/icon-add.png) no-repeat right;padding: 0 25px 0 0;line-height: 22px;display: inline-block;}
 .add-row {margin-top:4px;}
 .edit-link a, .delete-link a { text-decoration: none; }
 
@@ -382,7 +391,7 @@ ul { clear: both; list-style: none; margin: 0; padding: 0; }
 .doc-panel a.invoice-add-doc {background:url(../img/sign-add.png)left center no-repeat;}
 .doc-panel a.email-link {background:url(../img/sign-email.png)left center no-repeat;}
 .doc-panel a.edit-link {background:url(../img/sign-edit.png)left center no-repeat;}
-.doc-panel a.delete-link {background:url(../img/icon-delete.png)7px center no-repeat;}
+.doc-panel a.delete-link {background:url(../img/icon-delete.png)7px center no-repeat;  width: 200px;}
 .doc-panel .doc-panel-header {background:#f7f7f7;padding:5px 18px;font-size:16px;}
 .doc-panel .doc-panel-header:first-child {border-bottom:1px solid #dedede;}
 .preview-col2 .doc-panel {box-sizing:border-box;}
@@ -476,16 +485,18 @@ a.delete { vertical-align: top; }
 .doc-form table.doc-list.dover td.qty input[type=text] { width: 96px; }
 .doc-form table.doc-list.dover td.units input[type=text] { width: 96px; }
 
-.doc-form .buttons input[name=submit] {cursor:pointer;padding:10px 40px 10px 75px;background:url(../img/save.png) no-repeat left 30px center #fed13e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;}
+.doc-form .buttons input[name=submit] {cursor:pointer;padding:25px 15px 25px 65px;background:url(../img/save.png) no-repeat left 25px center #fed13e;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;}
-.doc-form .buttons input[name=submit]:hover {padding:10px 40px 10px 75px;background:url(../img/save.png) no-repeat left 30px center #ffca3e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;}
+.doc-form .buttons input[name=submit]:hover {padding:25px 15px 25px 65px;background:url(../img/save.png) no-repeat left 25px center #ffca3e;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;}
-#add-new {text-decoration: none;text-transform: uppercase;font-size: 22px;padding:10px 40px 10px 75px;background:url(../img/add-new.png) no-repeat left 30px center #fed13e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;}
+#add-new {text-decoration: none;text-transform: uppercase;font-size: 22px;padding:10px 40px 10px 75px;background:url(../img/add-new.png) no-repeat left 30px center #fed13e;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;}
-#add-new:hover {text-decoration: none;text-transform: uppercase;font-size: 22px;padding:10px 40px 10px 75px;background:url(../img/add-new.png) no-repeat left 30px center #ffca3e;color:#4e5661;font-weight:normal;font-family:"Arial Narrow", Arial, sans-serif;}
+#add-new:hover {text-decoration: none;text-transform: uppercase;font-size: 22px;padding:10px 40px 10px 75px;background:url(../img/add-new.png) no-repeat left 30px center #ffca3e;color:#4e5661;font-family:"Arial Narrow", Arial, sans-serif;}
 .doc-email-form input#id_to { width: 100%;margin-bottom: 10px;font-family: Arial; }
 .doc-email-form textarea { width: 100%; margin-left: 2px;font-family: Arial; }
 .doc-email-form #doc_format ul li { display: inline; }
 
 .delete-row {display:inline-block;width:21px;height:21px;background:url(../img/close.png) no-repeat center center;opacity:0.5;}
 .delete-row:hover {display:inline-block;width:21px;height:21px;background:url(../img/close.png) no-repeat center center;opacity:1;}
+.delete-link {display:inline-block;width:21px;height:21px;background:url(../img/close.png) no-repeat center center;opacity:0.5;}
+.delete-link:hover {display:inline-block;width:21px;height:21px;background:url(../img/close.png) no-repeat center center;opacity:1;}
 
 .filters #id_client, .filters #id_invoice { width: 99%; }
 
@@ -554,6 +565,7 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; }
 #footer {background:url('../img/footer-bg.jpg')#38424c;height:100px;position: absolute; bottom: 0px; width:100%;z-index:10;}
 #footer-content {width:1200px;margin:0 auto;}
 #footer-content a {margin-right: 15px;text-decoration: none;color:#607c99;}
+#footer-content a:hover {margin-right: 15px;text-decoration: none;color:#4d94bd;}
 .footer-text {position:relative;padding:25px 0 10px 0;color:#fff;}
 
 #menu {width: 100%;height:50px;position:relative;overflow:visible;}
@@ -575,7 +587,7 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; }
 #menu .other_docs_menu li:first-child {border-top:none;}
 #menu .other_docs_menu li a {line-height:50px;padding-left:10px;display:inline-block;width:100%;}
 
-.preview-wrapper {width:1200px;background:url(../img/darker-bg.png);margin-bottom:70px;}
+.preview-wrapper {width:1200px;background:#ebebeb;margin-bottom:70px;}
 .preview {width:785px;height:500px;overflow:scroll;float:left;margin:15px 0 15px 15px;}
 .list-col1 {float: left; width: 785px;padding-bottom:50px;}
 .list-col2 {float:left;width:382px;padding: 0; border-left:#dedede 1px solid;}
@@ -610,11 +622,11 @@ tr.doc-row:hover {cursor:pointer;}
 .del_image {display:block;width:27px;height:20px;background:url(../img/icon-delete.png)7px center no-repeat;position:absolute;top:0;right:0;}
 .del_image.hidden {display:none;}
 .img_field {position:relative;}
-.img_field img{min-height:1px;top:0;bottom:0;left:0;right:0;position:absolute;margin:auto;}
+.img_field img{min-height:1px;top:0;bottom:0;left:0;right:0;position:absolute;margin:auto;  width: 170px;}
 .rel {position:relative;}
 .img_field {border:1px solid #f2f2f2;}
 .profile_btns {margin: 10px; padding:10px;}
-.profile_btns input {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;font-weight:bold;padding:25px;border:none;cursor: pointer;}
+.profile_btns input {display:inline;font-family:"Arial Narrow", Arial, sans-serif;font-size:22px;text-transform:uppercase;padding:25px;border:none;cursor: pointer;}
 .profile_btns input:hover {background:#dddddd;}
 .profile_btns .yellow-btn.save {background:#fed13e url(../img/save.png) no-repeat 25px center;padding:25px 15px 25px 60px;cursor: pointer;}
 .profile_btns .yellow-btn.save:hover {background:#ffca3e url(../img/save.png) no-repeat 25px center;padding:25px 15px 25px 60px;}

project/templates/customer/clients/list_item.html

@@ -8,12 +8,12 @@
     <td>{{ obj.contact_phone }}</td>
     <td class="center">
         <a class="client edit-link" href="{% url 'customer_clients_edit' obj.pk %}" title="Редактировать контрагента">
-            <img src="{{ STATIC_URL }}img/icon-edit.png" alt="Редактировать" title="Редактировать контрагента" />
+            <img src="{{ STATIC_URL }}img/sign-edit.png" alt="Редактировать" title="Редактировать контрагента" />
         </a>
     </td>
     <td class="center">
         <a class="client delete-link" href="{% url 'customer_clients_delete' obj.pk %}" title="Удалить контрагента">
-            <img src="{{ STATIC_URL }}img/icon-delete.png" alt="[X]" title="Удалить контрагента" />
+            
         </a>
     </td>
 </tr>

project/templates/customer/profile/edit.html

@@ -368,7 +368,7 @@
                     {% else %}
                         <img src="{{ STATIC_URL }}img/upload-boss_sign.png" />
                     {% endif %}
-                    {{ form.boss_sign.errors }}
+                    
                     <a href="#" class='del_image{% if not form.boss_sign.value %} hidden{% endif %}'></a>
                 </div>
 				<p style="position: absolute; margin-top: 65px; font-size: 11px; padding: 2px 0 0 25px;color:#c5c5c5;font-style: italic;">Подпись руководителя</p>
@@ -383,7 +383,7 @@
                         <img src="{{ STATIC_URL }}img/upload-glavbuh_sign.png" />
                     {% endif %}
                     
-                    {{ form.glavbuh_sign.errors }}
+                    
                     <a href="#" class='del_image{% if not form.glavbuh_sign.value %} hidden{% endif %}'></a>
                 </div>
 				<p style="position: absolute; margin-top:65px;margin-left: 230px; font-size: 11px; padding: 2px 0 0 0;color:#c5c5c5;font-style: italic;">Подпись бухгалтера</p>
@@ -412,7 +412,7 @@
                 <div class='hidden'>
                     {{ form.stamp }}
                     {{ form.del_stamp }}
-                    {{ form.stamp.errors }}
+                    
                 </div>
             </div>
 			<div id="logo" class="field img_load">

project/templates/myauth/delete_profile.html

@@ -23,16 +23,20 @@
             </form>
         </div>
     </div>
-    <div class='list-col2'>
+	<div id="blackbox" style="top:180px!Important;">
+	<div class="bb-triangle"></div>
+    <div class='bb-text'>
         <p>Неееееееееееет!!!</p>
         <p>Пожалуйста, не делайте этого!</p>
         <p>Документор вам ещё пригодится.</p>
-         
+        </br> 
         <p>Ваши документы могут храниться здесь вечно и это абсолютно бесплатно.</p>
         <p>Вы сможете скачать их в любое время - как знать, может они понадобятся Вам снова?</p>
+		</br>
         <p>Если Вы решите вернуться позже, то Вам не придётся повторно указывать свои реквизиты и вносить в систему контрагентов...</p>
          
         <p>Останьтесь, а? ;-)</p>
     </div>
 </div>
+</div>
 {% endblock %}