From cbd8173342de58450b8063e8590bb2ba03d03f78 Mon Sep 17 00:00:00 2001 From: shishman Date: Fri, 19 Aug 2016 18:17:06 +0300 Subject: [PATCH 1/4] css edited --- assets/css/main.css | 22 ++++++++++++++-------- users/templates/contractor_office.html | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 7e2b3f7..4a9dcfa 100644 --- a/assets/css/main.css +++ b/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; @@ -5568,7 +5569,7 @@ input[type="radio"]:checked + span { } .dashedCol4 { width: 254px; - height: 239px; + height: 199px; position: absolute; overflow: hidden; display: block; @@ -5732,4 +5733,9 @@ input[type="radio"]:checked + span { .linkSort button:focus{ outline: none; } +.executorBlock .dashedCol4{ + height: 136px; + margin: 11px 0 0 0; + padding: 26px 24px 26px 24px; +} /*end_new*/ \ No newline at end of file diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index 4aec367..de876f1 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -103,7 +103,7 @@ {{ contractor.team }}

Россия, Москва

- {#

На сайте 8 лет и 3 месяца

#} + {#

На сайте 8 лет и 3 месяца

#}

На сайте {{ contractor.team.created }}

Кол-во человек: {{ participants_count }} @@ -153,7 +153,7 @@

-
+
{% for p in portfolios %}
From e7ccbc914c78949a7bde0c3592fada08ecb015b8 Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Fri, 19 Aug 2016 18:39:43 +0300 Subject: [PATCH 2/4] Add production logging support --- archilance/settings/prod.py | 33 +++++++++++++++++++++++++++++++++ archilance/views.py | 12 +++++++----- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/archilance/settings/prod.py b/archilance/settings/prod.py index b961979..4acb948 100644 --- a/archilance/settings/prod.py +++ b/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", + }, + } +} diff --git a/archilance/views.py b/archilance/views.py index feec3a6..6f4a147 100644 --- a/archilance/views.py +++ b/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' From 659e860c3b5404790bb798914781a1afa37ee5d1 Mon Sep 17 00:00:00 2001 From: shishman Date: Fri, 19 Aug 2016 19:48:48 +0300 Subject: [PATCH 3/4] css edited --- assets/css/main.css | 24 ++++++++++++++++++++++-- users/templates/user_profile_edit.html | 20 ++++++++++---------- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 4a9dcfa..0bf5b8c 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -5248,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; @@ -5578,7 +5578,7 @@ input[type="radio"]:checked + span { .dashedCol4:after { content: ""; position: absolute; - height: 50px; + height: 23px; width: 100%; background: #fff; bottom: 0; @@ -5738,4 +5738,24 @@ input[type="radio"]:checked + span { 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*/ \ No newline at end of file diff --git a/users/templates/user_profile_edit.html b/users/templates/user_profile_edit.html index 419bfe9..04016ae 100644 --- a/users/templates/user_profile_edit.html +++ b/users/templates/user_profile_edit.html @@ -6,8 +6,8 @@ {% block content %} {% include 'partials/header.html' %} -
-
+
+
{% csrf_token %} @@ -99,7 +99,7 @@
-
+
{{ form.date_of_birth }}
@@ -115,7 +115,7 @@ -

{{ text }}

+

{{ text }}    

{% endfor %}
@@ -123,7 +123,7 @@
Сайт
Skype
-{#
Электронная почта:
#} +{#
Электронная почта:
#}
Телефон
@@ -136,9 +136,9 @@
-{#
#} -{# #} -{#
#} +{#
#} +{# #} +{#
#}
@@ -160,6 +160,6 @@ {% include 'partials/footer.html' %} -
-
+
+
{% endblock %} From 5118d9ffbb57a55a9894723df97ac038066e16af Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Fri, 19 Aug 2016 21:12:40 +0300 Subject: [PATCH 4/4] #ARC-26 Yandex Money: Successfull testing with production server's self-signed SSL --- wallets/templates/tmp_yandex_money_request_example.html | 1 - wallets/views.py | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wallets/templates/tmp_yandex_money_request_example.html b/wallets/templates/tmp_yandex_money_request_example.html index 0dbfe09..832616d 100755 --- a/wallets/templates/tmp_yandex_money_request_example.html +++ b/wallets/templates/tmp_yandex_money_request_example.html @@ -9,7 +9,6 @@

scid:

sum:

customerNumber:

-

paymentType:

transactionId:

diff --git a/wallets/views.py b/wallets/views.py index 6ede462..eed87d9 100644 --- a/wallets/views.py +++ b/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('
{msg}
'.format(msg=pformat(form.errors))) # Debug + return HttpResponse(res, content_type='application/xml') + # return HttpResponse('
{msg}
'.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('
{msg}
'.format(msg=pformat(form.errors))) # Debug + return HttpResponse(res, content_type='application/xml') + # return HttpResponse('
{msg}
'.format(msg=pformat(form.errors))) # Debug