blablab trash ebala pizda

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"Стеня Графов <info@stenograph.us>"
 
 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',
     }

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

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) ;
 

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": {}
 }

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);

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) {}
-}
+}
+
+.consultation-person { 
+    .modal-form {
+        text-align: right;
+    }
+
+    .btn-consultation {
+        margin-bottom: 10px;
+    }
+}

zsite/static/less/main.less

@@ -28,6 +28,9 @@
 
 @import 'tabs.less';
 
+h1 {
+  font-weight: 600;
+}
 
 .breadcrumb {
   padding: 0;

zsite/templates/aldryn_people/plugins/feature/people_list.html

@@ -31,12 +31,12 @@
         <div class="people-description">
             <p><a href="{{ person.get_absolute_url }}">{{ person.name }}</a>, {{ person.function|lower }}, <nobr><em>{% trans 'answer your questions' %}</em></nobr></p>
         </div>
-        <div class="people-controls">
+        <script type="text/javascript">
-            {% static_placeholder request.current_page.parent.reverse_id %}
+            var consultation = {
-            <a class="btn btn-primary">{% trans 'Free Consultation' %}</a>
+                name: '{{ person.name }}'
-        </div>
+            };
+        </script>
         {% endfor %}
     </div>
-    <div class="clearfix"></div>
 {% endif %}
 </div>

zsite/templates/form_template/consultation.html

@@ -1,6 +1,6 @@
 {% load cms_tags  djangocms_forms_tags i18n sekizai_tags staticfiles %}
 
-<div ng-controller="ModalFormCtrl">
+<div ng-controller="ModalFormCtrl" class="modal-form">
 <script type="text/ng-template" id="modalFormTemplate-{{ instance.id }}.html">
     <div class="modal-body modal-consultation">
         <img src="{% with 'imgs/phone.png' as image_static %}{% static image_static %}{% endwith %}">
@@ -14,7 +14,7 @@
                 </div>
             {% endif %}
             <div class="form-wrapper">
-                <form action="{{ form.submission_url }}" method="POST" enctype="multipart/form-data">
+                <form action="{{ form.submission_url }}" method="POST" enctype="multipart/form-data" >
                     <div class="form-errors" style="display:none;"></div>
                     {% for field in form.visible_fields %}
                         <div class="field-wrapper {{ field|input_class }} {{ field.css_classes }}">
@@ -29,7 +29,7 @@
                                 {{ field.label }}
                             </label>
                             {% if not field|is_checkbox %}
-                                {{ field }}
+                                <p>{{ field }}</p>
                             {% endif %}
                         </div>
                     {% endfor %}