service layout fix

app/settings.py

@@ -348,6 +348,7 @@ CMS_TEMPLATES = (
 DJANGOCMS_FORMS_TEMPLATES = (
     ('djangocms_forms/form_template/default.html', 'Default'),
     ('form_template/consultation.html', 'Consultation'),
+    ('form_template/order_modal.html', 'Order Modal'),
     ('form_template/product_class.html', 'Trademark Product Class'),
 )
 

djangocms_forms/cms_plugins.py

@@ -134,7 +134,7 @@ plugin_pool.register_plugin(FormPlugin)
 
 
 class FormResultsPlugin(CMSPluginBase):
-    name = 'Form Results'
+    name = 'Form Order Number'
     module = settings.DJANGOCMS_FORMS_PLUGIN_MODULE
     cache = False
     render_template = 'djangocms_forms/form_template/results.html'
@@ -153,3 +153,25 @@ class FormResultsPlugin(CMSPluginBase):
         return context
 
 plugin_pool.register_plugin(FormResultsPlugin)
+
+
+class FormDetailResultsPlugin(CMSPluginBase):
+    name = 'Form Detail Results'
+    module = settings.DJANGOCMS_FORMS_PLUGIN_MODULE
+    cache = False
+    render_template = 'djangocms_forms/form_template/detail_results.html'
+
+    def render(self, context, instance, placeholder):
+        context = super(FormDetailResultsPlugin, self).render(context, instance, placeholder)
+        request = context['request']
+
+        if request.session.get('last-completed-form-id', False):
+            try:
+                form_instance = FormSubmission.objects.get(id=request.session.get('last-completed-form-id', False))
+                context['results'] = form_instance
+            except (FormSubmission.DoesNotExist):
+                pass
+
+        return context
+
+plugin_pool.register_plugin(FormDetailResultsPlugin)

djangocms_forms/forms.py

@@ -271,9 +271,6 @@ class FormBuilder(forms.Form):
                         request.session[form_slug] = None
                         form_instance = None
 
-                    if data['name'] == 'end_session':
-                        request.session['last-completed-form-id'] = form_instance.id
-
                 if form_instance:
                     form_instance.form_data += form_data
                     form_instance.save()
@@ -310,6 +307,7 @@ class FormBuilder(forms.Form):
         for data in form_data:
             if data['name'] == 'end_session':
                 request.session[form_slug] = None
+                request.session['last-completed-form-id'] = form_instance.id
                 send = True
             if data['type'] == 'email':
                 client_mail_to = data['value']

djangocms_forms/templates/djangocms_forms/form_template/detail_results.html

@@ -0,0 +1,17 @@
+{% load cms_tags  djangocms_forms_tags i18n sekizai_tags staticfiles %}
+
+<h1 class="l-offset-top">{{ results.plugin.name }}</h1>
+
+{% if request.LANGUAGE_CODE == 'ru' %}
+<ul class="list-unstyled list-inline">
+    <li><a href="{{ current_page.parent.get_absolute_url }}">{{ current_page.parent }}</a></li>
+    <li>&rarr;</li>
+    <li><a href="{{ request.META.HTTP_REFERER }}">{{ results.plugin.name }}</a></li>
+    <li>&rarr;</li>
+    <li>Консультация</li>
+</ul>
+
+<h2 class="m-offset-top">Ваше обращение <strong>№ {{ results.id }}</strong> зарегистрировано</h2>
+{% else %}
+<h2>Your message is registered under <strong>№ {{ results.id }}</strong></h2>
+{% endif %}

zsite/static/less/consultation.less

@@ -1,4 +1,4 @@
-.modal-consultation {
+.modal-consultation, .modal-form {
     img { 
         float: left;
         width: 30%; }

zsite/static/less/header.less

@@ -27,6 +27,8 @@
     opacity: 0.5;
 
     line-height: 17px;
+
+    font-size: 14px;
   }
 }
 

zsite/static/less/main.less

@@ -119,6 +119,30 @@ h1 {
 }
 
 
+.xs-offset-top {
+  margin-top: 5px
+}
+
+.xs-offset-bottom {
+  margin-bottom: 5px
+}
+
+.m-offset-top {
+  margin-top: 30px
+}
+
+.m-offset-bottom {
+  margin-bottom: 30px
+}
+
+.l-offset-top {
+  margin-top: 60px
+}
+
+.l-offset-bottom {
+  margin-bottom: 60px
+}
+
 
 @media print {
   .no-print, .menu, .menu-xs, .header-menu, .header-menu-font, .theory-block, .about-clients, .consultation-person, #cms_toolbar {

zsite/static/less/service.less

@@ -106,6 +106,10 @@
     margin-top: -7px;
 }
 
+.sub-content .bill {
+    margin-top: 20px;
+}
+
 .bill {
     margin-top: 62px;
     

zsite/templates/base.html

@@ -26,7 +26,7 @@
                     <a href="/{{request.LANGUAGE_CODE}}/">
                         <img src="{% with 'imgs/logo_'|add:request.LANGUAGE_CODE|add:'.svg' as image_static %}{% static image_static %}{% endwith %}">
                     </a>
-                    <h5 class="slogan">{% trans 'Intellectual Property Protection' %}</h5>
+                    <h2 class="slogan">{% trans 'Intellectual Property Protection' %}</h2>
                 </div>
                 <div class="header-content">
                 {% if request.current_page.parent %}

zsite/templates/form_template/order_modal.html

@@ -0,0 +1,85 @@
+{% load cms_tags  djangocms_forms_tags i18n sekizai_tags staticfiles %}
+
+<div class="order order-form" ng-controller="ModalFormCtrl" class="modal-form">
+<script type="text/ng-template" id="modalFormTemplate-{{ instance.id }}.html">
+    <div class="modal-body modal-form">
+        <img src="{% with 'imgs/phone.png' as image_static %}{% static image_static %}{% endwith %}">
+        <div class="forms" id="{{ instance.form_id }}">
+            {% if instance.title %}
+                <h3 class="title">{{ instance.title }}</h3>
+            {% endif %}
+            {% if instance.description %}
+                <div class="description">
+                    {{ instance.description|safe }}
+                </div>
+            {% endif %}
+            <div class="form-wrapper">
+                <form action="{{ form.submission_url }}" method="POST" enctype="multipart/form-data" onsubmit="yaCounter950321.reachGoal('Order'); return true;">
+                    <div class="form-errors" style="display:none;"></div>
+                    {% for field in form.visible_fields %}
+                        <div class="field-wrapper {{ field|input_class }} {{ field.css_classes }}">
+                            {% if field.help_text %}
+                                <div id="help-text-{{ field.auto_id }}" class="help-text">{{ field.help_text|safe }}</div>
+                            {% endif %}
+                            <div class="field-errors" style="display:none;"></div>
+                            {% if field|is_checkbox %}
+                                {{ field }}
+                            {% endif %}
+                            <label for="{{ field.id_for_label }}">
+                                {{ field.label }}
+                            </label>
+                            {% if not field|is_checkbox %}
+                                <p>{{ field }}</p>
+                            {% endif %}
+                        </div>
+                    {% endfor %}
+                    {% csrf_token %}
+                    {% for hidden in form.hidden_fields %}
+                        {{ hidden }}
+                    {% endfor %}
+                    <div class="button-wrapper submit">
+                        <button class="form-button btn btn-primary" type="submit" value="{{ instance.submit_btn_txt }}">{{ instance.submit_btn_txt }}</button>
+                    </div>
+                </form>
+            </div>
+            <div class="form-success" style="display: none;">
+                {% if instance.post_submit_msg %}
+                    <p>{{ instance.post_submit_msg|safe }}</p>
+                {% else %}
+                    {% blocktrans %}
+                        <h3>Submission successful</h3>
+                        <p>Thank You! Your form has been successfully submitted!</p>
+                    {% endblocktrans %}
+                {% endif %}
+            </div>
+        </div>
+    </div>
+        
+
+    </form>
+</div>
+</script>
+
+<button class="btn btn-consultation xs-offset-bottom" ng-click="open('{{ instance.id }}');" onclick="yaCounter950321.reachGoal('OrderOpen'); return true;" value="">{{ instance.title }}</button>
+<p>Вы можете <em>обратить к нам с вопросом</em> или <em>заказать услугу</em> «{{ instance.name }}»</p>
+</div>
+
+{% addtoblock "js" %}
+    <script src="{% static 'js/djangocms_forms/libs/jquery.form.min.js' %}"></script>
+    <script src="{% static 'js/djangocms_forms/djangocms_forms.js' %}"></script>
+    <script type="text/javascript">
+    $(function() {
+        if(typeof consultation_link == "undefined") {
+            $( "[href^='#order'" ).click(function(e) {
+                event.preventDefault();
+
+                angular.element($('.order-form')[0]).scope().open({{ instance.id }});
+                yaCounter950321.reachGoal('OrderOpen');
+            });
+
+            consultation_link = true;
+        } 
+    });    
+    </script>
+
+{% endaddtoblock %}