Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

templates/client/popups/advertise.html

@@ -31,6 +31,7 @@
 			<div class="pwf-buttons-line">
 				<button type="submit" class="submit">{% trans 'Заказать услугу' %}</button>
 			</div>
+			<input type="hidden" id="id_type" name="type" value="">
 		</form>
 	</div>
 </div>

templates/client/simple_pages/advertising.html

@@ -100,10 +100,10 @@
 
 	</table>
 
-							</div>
-						</div>
+</div>
+</div>
 
-						<div class="tad-price">
+<div class="tad-price">
 	<ul>
 
 		<li>
@@ -119,7 +119,7 @@
 				<div class="btn-wrap">
 					<div class="order-button">
 						<span class="ob-price">{% trans 'от' %} 10 000 <em class="rub"><i>{% trans 'руб.' %}</i></em> до 80 000 <em class="rub"><i>{% trans 'руб.' %}</i></em></span>
-												<a class="ob-text pw-open" href="#pw-advertise">{% trans 'Заказать услугу' %}</a>
+						<a class="ob-text pw-open advert-modal" href="#pw-advertise" data-type-title="{% trans 'Баннерная реклама' %}">{% trans 'Заказать услугу' %}</a>
 					</div>
 
 					<div class="tad-prise-descr">{% trans 'за месяц размещения' %}</div>
@@ -141,7 +141,7 @@
 				<div class="btn-wrap">
 					<div class="order-button">
 						<span class="ob-price">5 000 <em class="rub"><i>{% trans 'руб.' %}</i></em></span>
-												<a class="ob-text pw-open" href="#pw-advertise">{% trans 'Заказать услугу' %}</a>
+						<a class="ob-text pw-open advert-modal" href="#pw-advertise" data-type-title="{% trans 'Приоритетное размещение событий в каталоге' %}">{% trans 'Заказать услугу' %}</a>
 					</div>
 
 					<div class="tad-prise-descr">{% trans 'за месяц размещения в ТОП в 1 тематике' %}</div>
@@ -161,7 +161,7 @@
 				<div class="btn-wrap">
 					<div class="order-button">
 						<span class="ob-price">12 000 <em class="rub"><i>{% trans 'руб.' %}</i></em></span>
-												<a class="ob-text pw-open" href="#pw-advertise">{% trans 'Заказать услугу' %}</a>
+						<a class="ob-text pw-open advert-modal" href="#pw-advertise" data-type-title="{% trans 'Персональная визитка Вашей компании' %}">{% trans 'Заказать услугу' %}</a>
 					</div>
 
 					<div class="tad-prise-descr">{% trans 'за год за 1 тематический раздел' %}</div>
@@ -171,9 +171,9 @@
 		</li>
 
 	</ul>
-						</div>
+</div>
 
-						<div class="m-article">
+<div class="m-article">
 
 	<div class="targets t-layout">
 
@@ -207,8 +207,17 @@
 
 	</div>
 
-						</div>
+</div>
 <div class="popups-wrap">
 {% include 'client/popups/advertise.html' %}
 </div>
+
+{% if request.GET.debug == '1' %}
+<script src="{% static 'client/js/_modules/page.advertising.js' %}"></script>
+{% else %}
+<script src="{% static 'client/js_min/_modules/page.advertising.min.js' %}"></script>
+{% endif %}
+<script>
+	EXPO.advertising.init({});
+</script>
 {% endblock %}

templates/client/static_client/js/_modules/page.advertising.js

@@ -0,0 +1,51 @@
+var EXPO = EXPO || {}; //isolated namespace
+if (EXPO.advertising) {
+	console.warn('WARNING: EXPO.advertising is already defined!');
+} else {
+	EXPO.advertising = (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 = {
+				linkClass:"advert-modal",
+				inputId:"id_type"
+
+			};
+			// settings extending
+			$.extend(this.opt, options);
+			// begin of initialization
+			var self = this,
+				opt = this.opt;
+
+			$('.'+opt.linkClass).on("mousedown", function () {
+				$(document.getElementById(opt.inputId)).val($(this).attr("data-type-title"));
+			});
+
+
+		};
+		return that;
+	}());
+}

templates/client/static_client/js_min/_modules/page.advertising.min.js

@@ -0,0 +1 @@
+var EXPO=EXPO||{};EXPO.advertising?console.warn("WARNING: EXPO.advertising is already defined!"):EXPO.advertising=function(){var t={};t.opt={};EXPO.common;return t.init=function(t){this.opt={linkClass:"advert-modal",inputId:"id_type"},$.extend(this.opt,t);var n=this.opt;$("."+n.linkClass).on("mousedown",function(){$(document.getElementById(n.inputId)).val($(this).attr("data-type-title"))})},t}();