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

archilance/settings/prod.py

@@ -17,3 +17,36 @@ DEBUG = True
 TEMPLATE_DEBUG = True
 THUMBNAIL_DEBUG = True
 SECRET_KEY = 'vb6@b9zj7^f!^+x*e8=e!oundyu1!e*&0i(3gu2xwo4%fx4h&n'
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'formatters': {
+        'main_formatter': {
+            'format': '%(levelname)s:%(name)s: %(message)s '
+                      '(%(asctime)s; %(filename)s:%(lineno)d)',
+            'datefmt': "%Y-%m-%d %H:%M:%S",
+        },
+    },
+    'handlers': {
+        'production_file': {
+            'level': 'DEBUG',
+            'class': 'logging.handlers.RotatingFileHandler',
+            'filename': 'main.log',
+            'maxBytes': 1024 * 1024 * 5,  # 5 MB
+            'backupCount': 7,
+            'formatter': 'main_formatter',
+        }
+    },
+    'loggers': {
+        'django.request': {
+            'handlers': ['production_file'],
+            'level': 'ERROR',
+            'propagate': True,
+        },
+        '': {
+            'handlers': ['production_file'],
+            'level': "DEBUG",
+        },
+    }
+}

archilance/views.py

@@ -1,14 +1,16 @@
-from django.views.generic import TemplateView, View
+from django.core.files.base import ContentFile
 from django.shortcuts import render
 from django.template.loader import render_to_string
-from django.core.files.base import ContentFile
-from work_sell.models import Picture
-from projects.models import Order
+from django.views.generic import TemplateView, View
+import logging
+
+from chat.models import Documents
 from common.models import MainPage, PrintDocuments
+from projects.models import Order
 from users.models import ContractorResumeFiles
-from chat.models import Documents
 from work_sell.models import Picture
 
+
 class HomeTemplateView(View):
     template_name = 'home.html'
 

assets/css/main.css

@@ -1113,7 +1113,7 @@ footer:after {
     float: left;
     background-color: #F2F2F2;
     position: relative;
-    padding: 30px 0 0 0;
+    padding: 30px 0 30px 0;
 }
 
 .titleF1 {
@@ -1243,9 +1243,9 @@ footer:after {
     background: none; 
 }
 
-.searchF1 {
+/*.searchF1 {
     margin: 18px 0 0 0;
-}
+}*/
 
 .searchInp {
     width: 100%;
@@ -1371,6 +1371,7 @@ label {
     display: block;
     position: relative;
     float: left;
+    margin-right: 10px;
 }
 
 input[type="checkbox"] + span {
@@ -1399,7 +1400,7 @@ input[type="checkbox"]:checked + span {
     font-weight: bold;
     color: #2c2c2c;
     float: left;
-    margin: 2px 0 0 18px;
+    margin: 2px 0 0 0px;
 }
 
 .linkSort {
@@ -2030,7 +2031,7 @@ input[type="checkbox"]:checked + span {
 
 .galleryWork2 {
     width: 75%;
-    float: left;
+    float: right;
 }
 
 .galleryWork2 .col-lg-4:hover {
@@ -2062,9 +2063,9 @@ input[type="checkbox"]:checked + span {
     border-color: #DFDFDF;
 }
 
-.polsF3 {
+/*.polsF3 {
     margin-bottom: 23px;
-}
+}*/
 
 .mLeft {
     float: left;
@@ -5247,7 +5248,7 @@ input[type="radio"]:checked + span {
     padding: 0 15px;
     font-size: 15px;
     background-color: white;
-    color: #9c9c9c;
+    color: #444;
     float: left;
     margin-right: 26px;
     font-family: 'Arial-MT-Regular', sans-serif;
@@ -5568,7 +5569,7 @@ input[type="radio"]:checked + span {
 }
 .dashedCol4 {
     width: 254px;
-    height: 239px;
+    height: 199px;
     position: absolute;
     overflow: hidden;
     display: block;
@@ -5577,7 +5578,7 @@ input[type="radio"]:checked + span {
 .dashedCol4:after {
     content: "";
     position: absolute;
-    height: 50px;
+    height: 23px;
     width: 100%;
     background: #fff;
     bottom: 0;
@@ -5732,4 +5733,29 @@ input[type="radio"]:checked + span {
 .linkSort button:focus{
     outline: none;
 }
+.executorBlock .dashedCol4{
+    height: 136px;
+    margin: 11px 0 0 0;
+    padding: 26px 24px 26px 24px;
+}
+.doneBlock .new-dashed .dashedCol44{
+    height: 117px;
+    margin-left: -35px;
+}
+#fileUploadContainer .list-new-new{
+    margin-top: 15px;
+    margin-bottom: 15px;
+}
+#fileUploadContainer .list-new-new li{
+    margin: 4px 0 4px 0;
+}
+.birth_edit_dat .bootstrap-select:not([class*="col-"]):not([class*="form-control"]):not(.input-group-btn){
+    width: 190px;
+}
+.btn-submit-link{
+    color: #333 !important;
+    background: #fff;
+    border-color: #ccc !important;
+    margin-bottom: 0 !important
+}
 /*end_new*/

users/templates/contractor_office.html

@@ -103,7 +103,7 @@
                                 {{ contractor.team }}
                             </p>
                             <p class="cityUser">Россия, Москва</p>
-                            {#							<p class="navv">На сайте 8 лет и 3 месяца</p>#}
+                            {#                          <p class="navv">На сайте 8 лет и 3 месяца</p>#}
                             <p class="navv">На сайте {{ contractor.team.created }}</p>
                             <p class="navv">
                                 Кол-во человек: <span>{{ participants_count }}</span>
@@ -153,7 +153,7 @@
                     <div class="tab-content">
                         <div id="tab11" class="tab-pane fade in active">
 
-                            <div class="galleryWork2 disTab">
+                            <div class="galleryWork2 disTab col-lg-9">
                                 {% for p in portfolios %}
                                     <div class="col-lg-4">
                                         <div class="insetCol box-sizing disTab">

users/templates/user_profile_edit.html

@@ -6,8 +6,8 @@
 {% block content %}
     {% include 'partials/header.html' %}
     
-	<div class="container mainScore">
-		<div class="row">
+    <div class="container mainScore">
+        <div class="row">
             <form action="{% url 'users:user-profile-edit' pk=pk %}" method="POST" enctype="multipart/form-data" novalidate>
                 {% csrf_token %}
                 
@@ -99,7 +99,7 @@
                         </div>
                         
                         <div class="polsF1 disTab">
-                            <div class="col-lg-7">
+                            <div class="col-lg-7 birth_edit_dat">
                                 {{ form.date_of_birth }}
                             </div>
                             
@@ -115,7 +115,7 @@
                                         <span></span>
                                     </label>
                                     
-                                    <p>{{ text }}</p>
+                                    <p>{{ text }}&nbsp;&nbsp;&nbsp;&nbsp;</p>
                                 {% endfor %}
                             </div>
                         </div>
@@ -123,7 +123,7 @@
                         <div class="titleF1 titleF2 disTab">
                             <div class="col-lg-3">Сайт</div>
                             <div class="col-lg-3">Skype</div>
-{#    						<div class="col-lg-3">Электронная почта:</div>#}
+{#                          <div class="col-lg-3">Электронная почта:</div>#}
                             <div class="col-lg-3">Телефон</div>
                         </div>
                         
@@ -136,9 +136,9 @@
                                 <input type="text" name="{{ form.skype.html_name }}" value="{{ form.skype.value }}" class="box-sizing surr surr2" placeholder="nokia770">
                             </div>
                             
-{#    						<div class="col-lg-3">#}
-{#    							<input type="text" name="{{ form.email.html_name }}" value="{{ form.email.value }}" class="box-sizing surr surr2" placeholder="example@gmail.com">#}
-{#    						</div>#}
+{#                          <div class="col-lg-3">#}
+{#                              <input type="text" name="{{ form.email.html_name }}" value="{{ form.email.value }}" class="box-sizing surr surr2" placeholder="example@gmail.com">#}
+{#                          </div>#}
                             
                             <div class="col-lg-3">
                                 <input type="text" name="{{ form.phone.html_name }}" value="{{ form.phone.value }}" class="box-sizing surr surr2" placeholder="+7 999 999 44 02">
@@ -160,6 +160,6 @@
             </form>
             
             {% include 'partials/footer.html' %}
-		</div>
-	</div>
+        </div>
+    </div>
 {% endblock %}

wallets/templates/tmp_yandex_money_request_example.html

@@ -9,7 +9,6 @@
                     <p>scid: <input type='text' name='scid' value='{{ YANDEX_MONEY.scid }}'></p>
                     <p>sum: <input type='text' name='sum' value='100'></p>
                     <p>customerNumber: <input type='text' name='customerNumber' value='123'></p>
-                    <p>paymentType: <input type='text' name='paymentType' value='AC'></p>
                     
                     <p>transactionId: <input type='text' name='transactionId' value='{{ transaction.pk }}'></p>
                     

wallets/views.py

@@ -9,6 +9,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import DetailView, CreateView
 from django.views.generic.base import View
 from pprint import pprint, pformat
+import logging
 
 from .forms import WithDrawForm, TmpCheckOrderForm, TmpPaymentAvisoForm
 from .models import InvoiceHistory, WithDraw, Transaction
@@ -143,8 +144,8 @@ class TmpCheckOrderView(View):
                 shop_id=form.cleaned_data.get('shopId'),
             )
             
-            # return HttpResponse(res, content_type='application/xml')
-            return HttpResponse('<pre>{msg}</pre>'.format(msg=pformat(form.errors))) # Debug
+            return HttpResponse(res, content_type='application/xml')
+            # return HttpResponse('<pre>{msg}</pre>'.format(msg=pformat(form.errors))) # Debug
 
 
 class TmpPaymentAvisoView(View):
@@ -180,5 +181,5 @@ class TmpPaymentAvisoView(View):
                     techMessage="Payment aviso, validation error"/>
             """.format(date=timezone.now().isoformat())
             
-            # return HttpResponse(res, content_type='application/xml')
-            return HttpResponse('<pre>{msg}</pre>'.format(msg=pformat(form.errors))) # Debug
+            return HttpResponse(res, content_type='application/xml')
+            # return HttpResponse('<pre>{msg}</pre>'.format(msg=pformat(form.errors))) # Debug