diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html index 121260e6..0935e902 100644 --- a/templates/client/includes/exposition/exposition_object.html +++ b/templates/client/includes/exposition/exposition_object.html @@ -243,7 +243,7 @@
{% trans 'Участники' %}

{% trans 'Привлекайте целевых посетителей на стенд' %}

-

Рекламировать участника

+

Рекламировать участника

{% endif %} {% endwith %} @@ -283,37 +283,42 @@
{% if exposition.area %} {% else %} -

 Статистика

+ {% if exposition.members or exposition.visitors or exposition.foundation_year %} +

 Статистика

+ {% endif %} {% endif %} -
+ {% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %} +
- {% if exposition.area %} -
-
{% trans 'Общая выставочная площадь' %}
-
- {{ exposition.area }} {% trans 'м²' %} + {% if exposition.area %} +
+
{% trans 'Общая выставочная площадь' %}
+
+ {{ exposition.area }} {% trans 'м²' %} -
-
+
+
- {% endif %} + {% endif %} -
+
- {% if exposition.members %} -
{{ exposition.members }} {% trans 'участников' %}
- {% endif %} - {% if exposition.visitors %} -
{{ exposition.visitors }} {% trans 'посетителей' %}
- {% endif %} - {% if exposition.foundation_year %} -
{% trans 'Основано в' %} {{ exposition.foundation_year }} {% trans 'году' %}
- {% endif %} -
-
+ {% if exposition.members %} +
{{ exposition.members }} {% trans 'участников' %}
+ {% endif %} + {% if exposition.visitors %} +
{{ exposition.visitors }} {% trans 'посетителей' %}
+ {% endif %} + {% if exposition.foundation_year %} +
{% trans 'Основано в' %} {{ exposition.foundation_year }} {% trans 'году' %}
+ {% endif %} +
+
+ {% endif %} - + + {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place %} @@ -368,7 +373,6 @@ {% endfor %} - {% include 'client/popups/advertise_member.html' with form=advertising_form %} {% endif %} @@ -408,6 +412,9 @@ buttonClass:'note-button', inputClass:'note-text' }, + advertise:{ + id:"advert-member-form" + }, addCalendarText:"{% trans 'В расписание' %}", removeCalendarText:"{% trans 'Из расписания' %}" }); diff --git a/templates/client/popups/advertise_member.html b/templates/client/popups/advertise_member.html index 566e88a3..b17c1238 100644 --- a/templates/client/popups/advertise_member.html +++ b/templates/client/popups/advertise_member.html @@ -1,43 +1,46 @@ {% load static %} {% load i18n %} -
{{ form.country }}
-
+
+
{{ form.city }}
-
+
+
diff --git a/templates/client/static_client/js/_modules/page.exposition.object.js b/templates/client/static_client/js/_modules/page.exposition.object.js index 8a1ff300..ba15ad74 100644 --- a/templates/client/static_client/js/_modules/page.exposition.object.js +++ b/templates/client/static_client/js/_modules/page.exposition.object.js @@ -77,7 +77,7 @@ if (EXPO.exposition.object){ if ($(this).hasClass(self.opt.visit.activeClass)){ /** - * Планирую посетить + * I plan to visit */ $('.'+self.opt.visit.activeClass).hide().siblings('.'+self.opt.visit.passiveClass).show(); @@ -88,7 +88,7 @@ if (EXPO.exposition.object){ }else{ /** - * отказываюсь от посещения + * refuse to visit */ $('.'+self.opt.visit.passiveClass).hide().siblings('.'+self.opt.visit.activeClass).show(); $('#'+self.opt.visit.visitorsListId).children(".current").remove(); @@ -102,7 +102,23 @@ if (EXPO.exposition.object){ } return false; }); - + /** + * advertise form validation + */ + $('#'+this.opt.advertise.id).on("submit", function () { + var formData = $(this).serialize(), + formUrl = $(this).attr("action"), + /** + * executes after AJAX get request is complete + * @param data - data recieved from server ex + */ + handler = function (data) { + console.log(data); + + }; + com.getRequest(formData,formUrl,handler); + return false; + }); };