From c2ed69cb8a402c6cc79d0f3f163945f0a03e0565 Mon Sep 17 00:00:00 2001 From: fefa4ka Date: Mon, 5 Oct 2015 16:56:12 +0300 Subject: [PATCH] blablab trash ebala pizda --- app/settings.py | 8 ++++++++ djangocms_forms/forms.py | 5 +++++ .../js/djangocms_forms/djangocms_forms.js | 6 ++++++ zsite/static/bower.json | 3 ++- zsite/static/js/forms.js | 4 ++-- zsite/static/less/consultation.less | 18 ++++++++++++------ zsite/static/less/main.less | 3 +++ .../plugins/feature/people_list.html | 10 +++++----- .../templates/form_template/consultation.html | 6 +++--- 9 files changed, 46 insertions(+), 17 deletions(-) diff --git a/app/settings.py b/app/settings.py index a0c5394..a0a44d2 100644 --- a/app/settings.py +++ b/app/settings.py @@ -51,6 +51,12 @@ GIT_KEY_PATH = '/Users/fefa4ka/.ssh/deploy_rsa' GIT_KEY_NAME = 'github_rsa' +EMAIL_HOST = 'smtp.yandex.ru' +EMAIL_HOST_PASSWORD = 'cntyjuhfa,kznm' +EMAIL_PORT = 587 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = "info@stenograph.us" +DEFAULT_FROM_EMAIL = u"Стеня Графов " ROOT_URLCONF = 'app.urls' @@ -112,6 +118,8 @@ PIPELINE_JS = { 'vendor/angular-bootstrap/ui-bootstrap.js', 'vendor/angular-bootstrap/ui-bootstrap-tpls.js', 'vendor/jquery/dist/jquery.min.js', + 'vendor/jquery.inputmask/dist/inputmask/inputmask.js', + 'vendor/jquery.inputmask/dist/inputmask/jquery.inputmask.js', ), 'output_filename': 'js/vendor.js', } diff --git a/djangocms_forms/forms.py b/djangocms_forms/forms.py index 932a506..a905aab 100644 --- a/djangocms_forms/forms.py +++ b/djangocms_forms/forms.py @@ -260,6 +260,7 @@ class FormBuilder(forms.Form): user = request.user if request.user.is_authenticated() else None # Если есть сессия для этой формы, то сохраняем в неё. form_slug = "form-%d" % (self.form_definition.plugin_reference.id or self.form_definition.id) + if request.session.get(form_slug, False): try: form_instance = FormSubmission.objects.get(id=request.session.get(form_slug, False)) @@ -283,7 +284,11 @@ class FormBuilder(forms.Form): def email_submission(self, form_data, request, referrer): # Отправляем, только если конец сессии + # Если есть сессия для этой формы, то сохраняем в неё. + form_slug = "form-%d" % (self.form_definition.plugin_reference.id or self.form_definition.id) + send = False + for data in form_data: if data['name'] == 'end_session': request.session[form_slug] = None diff --git a/djangocms_forms/static/js/djangocms_forms/djangocms_forms.js b/djangocms_forms/static/js/djangocms_forms/djangocms_forms.js index 134158b..8fb3659 100644 --- a/djangocms_forms/static/js/djangocms_forms/djangocms_forms.js +++ b/djangocms_forms/static/js/djangocms_forms/djangocms_forms.js @@ -13,6 +13,12 @@ server_error: 'We\'re sorry. Something Unexpected Happened. Please Try Again Later.' }; + $('input[type=tel]').inputmask("+7 999 999-99-99"); + + if(typeof consultation != "undefined") { + $('input[name=sotrudnik]').val(consultation.name); + } + this.each(function(options) { var options = $.extend( {}, defaults, options) ; diff --git a/zsite/static/bower.json b/zsite/static/bower.json index e73e3ab..4dbb316 100644 --- a/zsite/static/bower.json +++ b/zsite/static/bower.json @@ -4,7 +4,8 @@ "devDependencies": { "angular": "1.3.6", "bootstrap": "3.3.5", - "angular-bootstrap": "~0.10.0" + "angular-bootstrap": "~0.10.0", + "jquery.inputmask": "*" }, "dependencies": {} } diff --git a/zsite/static/js/forms.js b/zsite/static/js/forms.js index afeb563..7f93aeb 100644 --- a/zsite/static/js/forms.js +++ b/zsite/static/js/forms.js @@ -9,7 +9,7 @@ angular.module('zuykov') $scope.open = function (form_id) { - console.log('open'); + var modalInstance = $modal.open({ animation: $scope.animationsEnabled, templateUrl: 'modalFormTemplate-' + form_id + '.html', @@ -38,7 +38,7 @@ angular.module('zuykov') // It is not the same as the $modal service used above. .controller('ModalFormInstanceCtrl', function ($scope, $modalInstance, items, $log, $timeout) { - $log.info('opened modal'); + $timeout(function () { $('.forms').djangocms_forms(); }, 1000); diff --git a/zsite/static/less/consultation.less b/zsite/static/less/consultation.less index 5c2d7a0..2f3f97d 100644 --- a/zsite/static/less/consultation.less +++ b/zsite/static/less/consultation.less @@ -10,10 +10,6 @@ margin-top: 18px; } - - label { - width: 25%; - } .help-text { margin-top: 10px; @@ -35,6 +31,16 @@ .btn-consultation:extend(.btn-default, .btn-xs) {} } -.content { +.content, .consultation-person { .btn-consultation:extend(.btn-primary) {} -} \ No newline at end of file +} + +.consultation-person { + .modal-form { + text-align: right; + } + + .btn-consultation { + margin-bottom: 10px; + } +} diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less index f88babf..7a547f0 100644 --- a/zsite/static/less/main.less +++ b/zsite/static/less/main.less @@ -28,6 +28,9 @@ @import 'tabs.less'; +h1 { + font-weight: 600; +} .breadcrumb { padding: 0; diff --git a/zsite/templates/aldryn_people/plugins/feature/people_list.html b/zsite/templates/aldryn_people/plugins/feature/people_list.html index 34f8d70..73c770f 100644 --- a/zsite/templates/aldryn_people/plugins/feature/people_list.html +++ b/zsite/templates/aldryn_people/plugins/feature/people_list.html @@ -31,12 +31,12 @@

{{ person.name }}, {{ person.function|lower }}, {% trans 'answer your questions' %}

-
- {% static_placeholder request.current_page.parent.reverse_id %} - {% trans 'Free Consultation' %} -
+ {% endfor %} -
{% endif %} \ No newline at end of file diff --git a/zsite/templates/form_template/consultation.html b/zsite/templates/form_template/consultation.html index e4d9ac4..4141527 100644 --- a/zsite/templates/form_template/consultation.html +++ b/zsite/templates/form_template/consultation.html @@ -1,6 +1,6 @@ {% load cms_tags djangocms_forms_tags i18n sekizai_tags staticfiles %} -
+