From 8843064acafb6b6e7ec1462d94b4b5631a15b2ef Mon Sep 17 00:00:00 2001 From: pavel Date: Sat, 2 May 2015 11:54:27 +0000 Subject: [PATCH 1/3] tour bugs --- templates/client/service/tour.html | 13 ++- .../static_client/js/_modules/page.tour.js | 83 +++++++++++++++++++ 2 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 templates/client/static_client/js/_modules/page.tour.js diff --git a/templates/client/service/tour.html b/templates/client/service/tour.html index 85580e47..fbda2f6e 100644 --- a/templates/client/service/tour.html +++ b/templates/client/service/tour.html @@ -293,7 +293,8 @@
- + {% include 'includes/event_steps.html' with event=exposition filter=filter %} + {% comment %}
{% trans 'Или организуйте поездку самостоятельно' %}:
@@ -319,7 +320,7 @@
- + {% endcomment %}
{% trans 'Отзывы клиентов' %}:
@@ -462,4 +463,12 @@
+{% if request.GET.debug == '1' %} + +{% else %} + +{% endif %} + {% endblock %} \ No newline at end of file diff --git a/templates/client/static_client/js/_modules/page.tour.js b/templates/client/static_client/js/_modules/page.tour.js new file mode 100644 index 00000000..2af20db5 --- /dev/null +++ b/templates/client/static_client/js/_modules/page.tour.js @@ -0,0 +1,83 @@ +var EXPO = EXPO || {}; //isolated namespace +if (EXPO.tour) { + console.warn('WARNING: EXPO.tour is already defined!'); +} else { + EXPO.tour = (function () { + /** + * private (visible inside this module only) variables + */ + /** + * @type {Object} - module API interafce realization + */ + var that = {}; + /** + * @type {Object} default setting + */ + that.opt = {}; + /** + * dependencies.Place where you can switch on dependencies for module + * @type {EXPO.common|*} - mostly used in project functions and data (block.common.js) + */ + var com = EXPO.common; + + /** + * current module general initialization + * @param {Object} options - options recieved from web page view + */ + that.init = function (options) { + /** + * default module options + * @type {Object} + */ + this.opt = { + fromDateId:"id_fr", + toDateId:"id_to" + + }; + // settings extending + $.extend(this.opt, options); + // begin of initialization + var self = this, + opt = this.opt, + $dateFrom = $(document.getElementById(opt.fromDateId)), + $dateTo = $(document.getElementById(opt.toDateId)); + $(function () { + $.datepicker.setDefaults($.datepicker.regional["ru"]); + + $dateFrom.datepicker({ + dateFormat: 'dd.mm.yy', + showOn: 'button', + showOtherMonths: true, + constrainInput: true, + onClose: function( selectedDate ) { + $dateTo.datepicker( "option", "minDate", selectedDate ); + } + }).inputmask("99.99.9999",{ + showMaskOnHover:false, + insertMode:false, + 'oncomplete': function () { + $activeField = this; + } + }); + $dateTo.datepicker({ + dateFormat: 'dd.mm.yy', + showOn: 'button', + showOtherMonths: true, + constrainInput: true, + onClose: function( selectedDate ) { + $dateFrom.datepicker( "option", "maxDate", selectedDate ); + } + }).inputmask("99.99.9999",{ + showMaskOnHover:false, + insertMode:false, + 'oncomplete': function () { + $activeField = this; + } + }); + }); + + + }; + return that; + }()); +} From 1d8b6052a7dcb7b811bd82efd050541efbd9cec0 Mon Sep 17 00:00:00 2001 From: pavel Date: Sat, 2 May 2015 12:02:22 +0000 Subject: [PATCH 2/3] remove price from translator page --- templates/client/service/translator.html | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/templates/client/service/translator.html b/templates/client/service/translator.html index bb68036e..ff083aa9 100644 --- a/templates/client/service/translator.html +++ b/templates/client/service/translator.html @@ -159,8 +159,12 @@
+ {% comment %}
{% trans 'от' %} {{ service.price }} {{ service.currency }} / {% trans 'день' %}
-
+ {% endcomment %} + + +
{% if service.price %} {% endif %} @@ -184,8 +188,12 @@
-
{% trans 'от' %} {{ service.price }} {{ service.currency }} / {% trans 'день' %}
-
+ {% comment %} + +
{% trans 'от' %} {{ service.price }} {{ service.currency }} / {% trans 'день' %}
+ {% endcomment %} + +
{% trans 'Сделать запрос' %}
From ab25d518453fd069a871f389a3018ac775401865 Mon Sep 17 00:00:00 2001 From: pavel Date: Sat, 2 May 2015 12:34:28 +0000 Subject: [PATCH 3/3] some minor bugs --- templates/client/service/participation.html | 4 ++-- templates/client/service/tickets.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/client/service/participation.html b/templates/client/service/participation.html index 21f1e25c..ca2760b9 100644 --- a/templates/client/service/participation.html +++ b/templates/client/service/participation.html @@ -171,8 +171,8 @@
- {% trans '

Укажите в запросе исходную информацию о Ваших целях и задачах, и мы проверим, насколько'%} - {% if object %} {{ object.name }} {%else %} {% trans 'событие' %}{%endif %} {% trans 'им соответствует. Если событие подходит, мы свяжемся с организаторами, чтобы уточнить наличие свободных площадей и вместе с Вами начнем создавать концепцию Вашего участия

' %} + {% trans '

Укажите в запросе исходную информацию о Ваших целях и задачах, и мы подберем'%} + {% if object %} {{ object.name }} {%else %} {% trans 'выставку' %}{%endif %} {% trans 'которая будет им соответствовать. Далее мы свяжемся с организаторами, чтобы уточнить наличие свободных площадей и цены, и вместе с Вами начнем создавать концепцию Вашего участия.

' %}
{% if messages %} diff --git a/templates/client/service/tickets.html b/templates/client/service/tickets.html index cac15dc7..9895bd36 100644 --- a/templates/client/service/tickets.html +++ b/templates/client/service/tickets.html @@ -162,7 +162,7 @@
-
{% trans 'Регистрация' %} {{ service.price }} {{ service.currency }} + {% trans 'билет организатора' %}
+
{% trans 'Регистрация 2000 руб.' %} {{ service.price }} {{ service.currency }} + {% trans 'билет организатора' %}
{% trans 'Сделать запрос' %}