mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Expo-115 bug with advertisment ajax

Browse Source
remotes/origin/1203
pavel 11 years ago
parent 55d9ec5f64
commit 34b9f46168
3 changed files with 64 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      templates/client/includes/exposition/exposition_object.html
  2. 21
      templates/client/popups/advertise_member.html
  3. 22
      templates/client/static_client/js/_modules/page.exposition.object.js

59
templates/client/includes/exposition/exposition_object.html
Unescape View File

@ -243,7 +243,7 @@
<div class="im-title">{% trans 'Участники' %}</div>
<p>{% trans 'Привлекайте целевых посетителей на стенд' %}</p>
<!--//todo: обработчик-->
<p><a href="#" class="button icon-up ">Рекламировать участника</a></p>
<p><a href="#pw-advertise" class="button icon-up pw-open" >Рекламировать участника</a></p>
</header>
{% endif %}
{% endwith %}
@ -283,37 +283,42 @@
<hr/>
{% if exposition.area %}
{% else %}
<p class="title"> <i class="fa fa-bar-chart">&nbsp;</i>Статистика</p>
{% if exposition.members or exposition.visitors or exposition.foundation_year %}
<p class="title"> <i class="fa fa-bar-chart">&nbsp;</i>Статистика</p>
{% endif %}
{% endif %}
<div class="e-num-info">
{% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %}
<div class="e-num-info">
{% if exposition.area %}
<div class="eni-area-wrap">
<div class="eni-title">{% trans 'Общая выставочная площадь' %}</div>
<div class="eni-area">
{{ exposition.area }} {% trans 'м²' %}
{% if exposition.area %}
<div class="eni-area-wrap">
<div class="eni-title">{% trans 'Общая выставочная площадь' %}</div>
<div class="eni-area">
{{ exposition.area }} {% trans 'м²' %}
</div>
</div>
</div>
</div>
{% endif %}
{% endif %}
<div class="eni-stats">
<div class="eni-stats">
{% if exposition.members %}
<div class="enis-item"><b>{{ exposition.members }}</b> {% trans 'участников' %}</div>
{% endif %}
{% if exposition.visitors %}
<div class="enis-item"><b>{{ exposition.visitors }}</b> {% trans 'посетителей' %}</div>
{% endif %}
{% if exposition.foundation_year %}
<div class="eni-founded">{% trans 'Основано в' %} <b>{{ exposition.foundation_year }}</b> {% trans 'году' %}</div>
{% endif %}
</div>
</div>
{% if exposition.members %}
<div class="enis-item"><b>{{ exposition.members }}</b> {% trans 'участников' %}</div>
{% endif %}
{% if exposition.visitors %}
<div class="enis-item"><b>{{ exposition.visitors }}</b> {% trans 'посетителей' %}</div>
{% endif %}
{% if exposition.foundation_year %}
<div class="eni-founded">{% trans 'Основано в' %} <b>{{ exposition.foundation_year }}</b> {% trans 'году' %}</div>
{% endif %}
</div>
</div>
{% endif %}
</div>
</div>
{% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place %}
@ -368,7 +373,6 @@
{% endfor %}
</ul>
</div>
{% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% endif %}
<!--
<div class="abn"><a href="#"><img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" /></a></div>
@ -386,7 +390,7 @@
{% endblock %}
{% block popup %}
{% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% endblock %}
{% block scripts %}
<!-- todo: вернуть .min-->
@ -408,6 +412,9 @@
buttonClass:'note-button',
inputClass:'note-text'
},
advertise:{
id:"advert-member-form"
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});

21
templates/client/popups/advertise_member.html
Unescape View File

@ -1,43 +1,46 @@
{% load static %}
{% load i18n %}
<div id="pw-advertise" class="popup-window">
<div id="pw-advertise" class="popup-window" style="display: none;">
<header class="clearfix">
<div class="pw-title">{% trans 'Рекламировать участника' %}</div>
</header>
<div class="pw-body clearfix">
<form id="advertise_form" method="post" class="pw-form" action="{{ form.action }}">{% csrf_token %}
<form id="advert-member-form" method="post" class="pw-form" action="{{ form.action }}">{% csrf_token %}
<div class="pwf-line">
<div class="pwf-field required">
{{ form.person_inf }}
</div>
</div>
<div class="pwf-msg"></div>
</div>
<div class="pwf-line">
<div class="pwf-field required">
{{ form.person }}
</div>
</div>
<div class="pwf-msg"></div>
</div>
<div class="pwf-line">
<div class="pwf-field required">
{{ form.phone }}
</div>
</div>
<div class="pwf-msg"></div>
</div>
<div class="pwf-line">
<div class="pwf-field select-input required">
{{ form.country }}
</div>
</div>
<div class="pwf-msg"></div>
</div>
<div class="pwf-line">
<div class="pwf-field select-input required">
{{ form.city }}
</div>
</div>
<div class="pwf-msg"></div>
</div>
<div class="pwf-buttons-line">
<button type="submit" class="icon-check">{% trans 'Рекламировать' %}</button>
</div>

22
templates/client/static_client/js/_modules/page.exposition.object.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save