remotes/origin/1203
Назар Котюк 11 years ago
parent a5c19b3549
commit ad54289adb
  1. 20
      templates/client/accounts/feed.html
  2. 202
      templates/client/accounts/fill_company.html
  3. 88
      templates/client/accounts/new_profile.html
  4. 106
      templates/client/accounts/profile.html
  5. 19
      templates/client/article/blog_list.html
  6. 18
      templates/client/article/news_list.html
  7. 52
      templates/client/blank.html
  8. 29
      templates/client/includes/accounts/calendar_table.html
  9. 105
      templates/client/includes/accounts/current_user.html
  10. 18
      templates/client/includes/catalog_search.html
  11. 17
      templates/client/includes/catalog_search_main.html
  12. 106
      templates/client/includes/company/company_edit.html
  13. 24
      templates/client/includes/exposition/exposition_list.html
  14. 58
      templates/client/includes/exposition/exposition_object.html
  15. 19
      templates/client/includes/exposition/search_result.html
  16. 42
      templates/client/includes/place/place_object.html
  17. 54
      templates/client/index.html
  18. 10
      templates/client/main_page.html
  19. 217
      templates/client/organiser/add_event.html
  20. 19
      templates/client/place/place_photo.html
  21. 93
      templates/client/simple_pages/about.html
  22. 26
      templates/client/static_client/css/main.css
  23. 2
      templates/client/static_client/css_min/main.min.css
  24. 2633
      templates/client/static_client/html-cut/paid_exposition.html
  25. BIN
      templates/client/static_client/img/partners/deutsche-messe-2.png
  26. BIN
      templates/client/static_client/img/partners/deutsche-messe.png
  27. BIN
      templates/client/static_client/img/partners/expocentr.png
  28. BIN
      templates/client/static_client/img/partners/expoforum.png
  29. BIN
      templates/client/static_client/img/partners/ite.png
  30. BIN
      templates/client/static_client/img/partners/messe-dusseldorf.png
  31. BIN
      templates/client/static_client/img/partners/messe-frankfurt.png
  32. BIN
      templates/client/static_client/img/partners/nurnberg-messe.png
  33. BIN
      templates/client/static_client/img/partners/reed-exhibitions.png
  34. 2
      templates/client/static_client/js/_modules/page.events.feed.js
  35. 1
      templates/client/static_client/js/_modules/page.profile.js
  36. 2
      templates/client/static_client/js_min/_modules/page.profile.calendar.min.js

@ -7,20 +7,15 @@
<strong>{% trans 'Моя лента событий' %}</strong> <strong>{% trans 'Моя лента событий' %}</strong>
</div> </div>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
<div class="page-title"> <div class="page-title">
<h1>{% trans 'Моя лента событий' %}</h1> <h1>{% trans 'Моя лента событий' %}</h1>
</div> </div>
{% endblock %} {% endblock %}
{% block page_body %} {% block page_body %}
<div class="page-body clearfix events-feed-page"> <div class="page-body clearfix events-feed-page">
<div class="events-filter-wrap" id="events-filter-wrap"> <div class="events-filter-wrap" id="events-filter-wrap">
<a rel="nofollow" id="filter-show-button" class="button icon-eye " href="javascript:void(0);">Фильтрация ленты</a> <a rel="nofollow" id="filter-show-button" class="button icon-eye " href="javascript:void(0);">Фильтрация ленты</a>
<div class="events-filter" id="events-filter"> <div class="events-filter" id="events-filter">
<section class="col"> <section class="col">
<h2><span id="filter-subject-label" data-default="Тематические фильтры не выбраны" data-selected="Тематика">Тематические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwSubj" id="filter-subj-modal-trigger">Изменить</a>):</h2> <h2><span id="filter-subject-label" data-default="Тематические фильтры не выбраны" data-selected="Тематика">Тематические фильтры не выбраны</span>: (<a class="change-filter filter-modal-open" href="#filter-pwSubj" id="filter-subj-modal-trigger">Изменить</a>):</h2>
@ -48,7 +43,6 @@
</div> </div>
</section> </section>
<button class="icon-check apply-filter button" type="submit" id="apply-filter-button">{% trans 'Применить' %}</button> <button class="icon-check apply-filter button" type="submit" id="apply-filter-button">{% trans 'Применить' %}</button>
</div> </div>
<form method="post" action="/profile/feed/" class="search_form" id="filter-block-form">{% csrf_token %} <form method="post" action="/profile/feed/" class="search_form" id="filter-block-form">{% csrf_token %}
<div class="modals"> <div class="modals">
@ -68,9 +62,7 @@
<div class="a modal-close fancybox-close">&nbsp;</div> <div class="a modal-close fancybox-close">&nbsp;</div>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<div class="filter-hint-block" id="filter-hint-block"> <div class="filter-hint-block" id="filter-hint-block">
@ -87,16 +79,13 @@
{% trans "Увы, событий, соответствующих выбранным фильтрам, нет в каталоге.<br> Попробуйте укрупнить параметры поиска" %} {% trans "Увы, событий, соответствующих выбранным фильтрам, нет в каталоге.<br> Попробуйте укрупнить параметры поиска" %}
</span> </span>
</p> </p>
{% endif %} {% endif %}
{% include 'includes/catalog_paginator.html' with page_obj=page_obj %} {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
<!--todo: вернуть минификацию--> {% if request.GET.debug == '1' %}
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.events.feed{% if debug %}{% else %}.min{% endif %}.js"></script>-->
<script src="{% static 'client/js/_modules/page.events.feed.js' %}"></script> <script src="{% static 'client/js/_modules/page.events.feed.js' %}"></script>
<!--<script src="{% static 'client/js/_modules/block.search.js' %}"></script>--> {% else %}
<script src="{% static 'client/js_min/_modules/page.events.feed.min.js' %}"></script>
{% endif %}
<script> <script>
EXPO.events.feed.init({ EXPO.events.feed.init({
bodyId:'events-filter-wrap', bodyId:'events-filter-wrap',
@ -171,7 +160,6 @@
hintId:'filter-hint-block' hintId:'filter-hint-block'
} }
}); });
</script> </script>
</div> </div>

@ -2,18 +2,12 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% block style %} {% block style %}
<link rel="stylesheet" href="{% static 'client/css/select2.css' %}"> <link rel="stylesheet" href="{% static 'client/css/select2.css' %}">
<style> <style>
.add_link_teg .tag-select{ .add_link_teg .tag-select{float: left;margin: 0 13px 0 0;min-height: 36px;}
float: left;
margin: 0 13px 0 0;
min-height: 36px;
}
</style> </style>
{% endblock %} {% endblock %}
{% block bread_scrumbs %} {% block bread_scrumbs %}
<div class="bread-crumbs"> <div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a> <a href="/">{% trans 'Главная страница' %}</a>
@ -21,10 +15,8 @@
<strong>{% trans 'Компания' %}</strong> <strong>{% trans 'Компания' %}</strong>
</div> </div>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
{% endblock %} {% endblock %}
{% block content_list %} {% block content_list %}
<div class="m-article"> <div class="m-article">
<div class="item-wrap clearfix"> <div class="item-wrap clearfix">
@ -33,13 +25,12 @@
<div class="i-pict"> <div class="i-pict">
<a class="add_pic_block" title=""> <a class="add_pic_block" title="">
<span></span> <span></span>
<i>Добавить лого</i> <i>{% trans 'Добавить лого' %}</i>
<b>+20</b> <b>+20</b>
</a> </a>
</div> </div>
<div class="i-rating" title="Рейтинг: 551">551</div> <div class="i-rating" title="Рейтинг: 551">551</div>
</aside> </aside>
<div class="i-info"> <div class="i-info">
<header> <header>
<div class="{% if home_form.instance.country and home_form.instance.city %}i-place p-editable{% else %}i-place p-editable add_link_text add_link_text_medium{% endif %}"> <div class="{% if home_form.instance.country and home_form.instance.city %}i-place p-editable{% else %}i-place p-editable add_link_text add_link_text_medium{% endif %}">
@ -50,7 +41,6 @@
{% endif %} {% endif %}
<a href="#" id="static-home-country">{{ home_form.instance.country }}</a> <a href="#" id="static-home-country">{{ home_form.instance.country }}</a>
</span> </span>
{% if home_form.instance.country and home_form.instance.city %} {% if home_form.instance.country and home_form.instance.city %}
<span> <span>
{% else %} {% else %}
@ -58,86 +48,66 @@
{% endif %} {% endif %}
, <a href="#" id="static-home-city">{{ home_form.instance.city }}</a> , <a href="#" id="static-home-city">{{ home_form.instance.city }}</a>
</span> </span>
<div class="edit-wrap e-left"> <div class="edit-wrap e-left">
{% if home_form.instance.country and home_form.instance.city %} {% if home_form.instance.country and home_form.instance.city %}
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
{% else %} {% else %}
<a class="e-btn" href="#" title="">Указать</a> <a class="e-btn" href="#" title="">{% trans 'Указать' %}</a>
<div class="add_link_text_text">свой город <b>+5</b></div> <div class="add_link_text_text">{% trans 'свой город' %}<b>+5</b></div>
{% endif %} {% endif %}
<form class="clearfix update-profile-form" id="home_form" action="/company/update/home/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="home_form" action="/company/update/home/" method="post">{% csrf_token %}
<div class="e-form"> <div class="e-form">
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>Страна</label> <label>Страна</label>
<div class="epf-field"> <div class="epf-field">
{{ home_form.country }} {{ home_form.country }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label>{% trans 'Город' %}</label> <label>{% trans 'Город' %}</label>
<div class="epf-field"> <div class="epf-field">
{{ home_form.city }} {{ home_form.city }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">Сохранить</button> <button type="submit" class="lnk icon-save">Сохранить</button>
</div> </div>
<a class="ef-close" href="#">закрыть</a> <a class="ef-close" href="#">закрыть</a>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
<div class="site_link"> <div class="site_link">
<a href="{{ request.user.company.get_permanent_url }}" title=""> <a href="{{ request.user.company.get_permanent_url }}" title="">
{{ request.user.company.get_permanent_url }} {{ request.user.company.get_permanent_url }}
</a> </a>
</div> </div>
<div class="i-title p-editable p-editable"> <div class="i-title p-editable p-editable">
<span id="static-name-value">{{ name_form.name.value }}</span> <span id="static-name-value">{{ name_form.name.value }}</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">редактировать</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="name_form" action="/company/update/name/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="name_form" action="/company/update/name/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ name_form.name.label }}</label> <label>{{ name_form.name.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ name_form.name }} {{ name_form.name }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">Сохранить</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="#">закрыть</a>
</div> </div>
</div> </div>
</div> </div>
</header> </header>
<div class="{% if spec_form.specialization.value %}i-position p-editable{% else %}i-descr p-editable add_link_text add_link_text_top{% endif %}"> <div class="{% if spec_form.specialization.value %}i-position p-editable{% else %}i-descr p-editable add_link_text add_link_text_top{% endif %}">
{% if spec_form.specialization.value %} {% if spec_form.specialization.value %}
<span id="static-spec-value">{{ spec_form.specialization.value }}</span> <span id="static-spec-value">{{ spec_form.specialization.value }}</span>
{% endif %} {% endif %}
@ -148,7 +118,6 @@
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">Добавить</a>
<div class="add_link_text_text">краткое описание компании <b>+20</b></div> <div class="add_link_text_text">краткое описание компании <b>+20</b></div>
{% endif %} {% endif %}
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -159,48 +128,35 @@
{{ spec_form.specialization }} {{ spec_form.specialization }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">Сохранить</button> <button type="submit" class="lnk icon-save">Сохранить</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">закрыть</a> <a class="ef-close" href="#">закрыть</a>
</div> </div>
</div> </div>
</div> </div>
<div class="i-area" id="theme-inf" data-theme="{% for th in request.user.company.theme.all %}{{ th.id }},{% endfor %}"> <div class="i-area" id="theme-inf" data-theme="{% for th in request.user.company.theme.all %}{{ th.id }},{% endfor %}">
{% for th in request.user.company.theme.all %} {% for th in request.user.company.theme.all %}
<a href="/members/theme-{{ th.url }}">{{ th.name }}</a>{% ifnotequal forloop.counter request.user.company.theme.all|length %},{% endifnotequal %} <a href="/members/theme-{{ th.url }}">{{ th.name }}</a>{% ifnotequal forloop.counter request.user.company.theme.all|length %},{% endifnotequal %}
{% endfor %} {% endfor %}
</div> </div>
<hr /> <hr />
<div class="{% if address_form.address_inf.value %}ic-tel p-editable{% else %}p-editable add_link_text add_link_text_medium{% endif %}"> <div class="{% if address_form.address_inf.value %}ic-tel p-editable{% else %}p-editable add_link_text add_link_text_medium{% endif %}">
{% if address_form.address_inf.value %} {% if address_form.address_inf.value %}
<span id="static-address-value">{{ address_form.address_inf.value }}</span> <span id="static-address-value">{{ address_form.address_inf.value }}</span>
{% endif %} {% endif %}
<div class="edit-wrap"> <div class="edit-wrap">
{% if address_form.address_inf.value %} {% if address_form.address_inf.value %}
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
{% else %} {% else %}
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">Добавить</a>
<div class="add_link_text_text">адрес компании <b>+15</b></div> <div class="add_link_text_text">адрес компании <b>+15</b></div>
{% endif %} {% endif %}
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="address_form" action="/company/update/address/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="address_form" action="/company/update/address/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epf-field"> <div class="epf-field">
<label>{{ address_form.address_inf.label }}</label> <label>{{ address_form.address_inf.label }}</label>
{{ address_form.address_inf }} {{ address_form.address_inf }}
@ -210,38 +166,25 @@
<button type="submit" class="lnk icon-save">Сохранить</button> <button type="submit" class="lnk icon-save">Сохранить</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">закрыть</a> <a class="ef-close" href="#">закрыть</a>
</div> </div>
</div> </div>
</div> </div>
<hr /> <hr />
<div class="add_link_teg"> <div class="add_link_teg">
<div class="tag-select">{{ tag_form.tag }}</div> <div class="tag-select">{{ tag_form.tag }}</div>
<b>+5</b> <b>+5</b>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<hr /> <hr />
<div class="i-contacts clearfix"> <div class="i-contacts clearfix">
<div class="ic-buttons ic-buttons_pos dd_width_4"> <div class="ic-buttons ic-buttons_pos dd_width_4">
<a class="button icon-edit icb-edit-profile" href="#">редактировать профиль</a> <a class="button icon-edit icb-edit-profile" href="#">{% trans 'редактировать профиль' %}</a>
<a class="button orange icon-edit icb-exit-edit" href="#">завершить редактирование</a> <a class="button orange icon-edit icb-exit-edit" href="#">{% trans 'завершить редактирование' %}</a>
<div class="ic-buttons_text">{% trans 'Добавить профили в соц.сетях' %}:</div>
<div class="ic-buttons_text">Добавить профили в соц.сетях:</div>
<div class="p-editable add_link_text add_link_text_medium soc-media-indent"> <div class="p-editable add_link_text add_link_text_medium soc-media-indent">
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
<ul class="soc-media-buttons soc-media-buttons1"> <ul class="soc-media-buttons soc-media-buttons1">
<li> <li>
{% if social_form.facebook.value %} {% if social_form.facebook.value %}
@ -260,7 +203,6 @@
{% else %} {% else %}
<img id="img-linkedin" src="{% static 'client/img/soc-medias/icon-lin_hover.png' %}" title="LinkedIn" alt="LinkedIn" /> <img id="img-linkedin" src="{% static 'client/img/soc-medias/icon-lin_hover.png' %}" title="LinkedIn" alt="LinkedIn" />
{% endif %} {% endif %}
<li> <li>
{% if social_form.vk.value %} {% if social_form.vk.value %}
<a href="{{ social_form.vk.value }}" target="_blank"> <a href="{{ social_form.vk.value }}" target="_blank">
@ -270,7 +212,6 @@
<img id="img-vk" src="{% static 'client/img/soc-medias/sm-icon-vk_hover.png' %}" title="В контакте" alt="В контакте" /> <img id="img-vk" src="{% static 'client/img/soc-medias/sm-icon-vk_hover.png' %}" title="В контакте" alt="В контакте" />
{% endif %} {% endif %}
</li> </li>
<li> <li>
{% if social_form.twitter.value %} {% if social_form.twitter.value %}
<a href="{{ social_form.twitter.value }}" target="_blank"> <a href="{{ social_form.twitter.value }}" target="_blank">
@ -280,66 +221,50 @@
<img id="img-twitter" src="{% static 'client/img/soc-medias/sm-icon-twit_hover.png' %}" title="Twitter" alt="Twitter" /> <img id="img-twitter" src="{% static 'client/img/soc-medias/sm-icon-twit_hover.png' %}" title="Twitter" alt="Twitter" />
{% endif %} {% endif %}
</li> </li>
</ul> </ul>
<div class="add_link_text_text"><b>+5 {% trans 'за каждый' %}</b></div>
<div class="add_link_text_text"><b>+5 за каждый</b></div>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="social_form" action="/company/update/social/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="social_form" action="/company/update/social/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.facebook }} {{ social_form.facebook }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.linkedin }} {{ social_form.linkedin }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.vk }} {{ social_form.vk }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.twitter }} {{ social_form.twitter }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="ic-links ic-links_indent dd_width_5"> <div class="ic-links ic-links_indent dd_width_5">
<div class="{% if phone_form.phone.value %}ic-tel p-editable{% else %}p-editable add_link_text add_link_text_medium{% endif %}"> <div class="{% if phone_form.phone.value %}ic-tel p-editable{% else %}p-editable add_link_text add_link_text_medium{% endif %}">
{% if phone_form.phone.value %} {% if phone_form.phone.value %}
<span id="static-phone-value">{{ phone_form.phone.value|phone }}</span> <span id="static-phone-value">{{ phone_form.phone.value|phone }}</span>
{% endif %} {% endif %}
<div class="edit-wrap"> <div class="edit-wrap">
{% if phone_form.phone.value %} {% if phone_form.phone.value %}
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
@ -347,7 +272,6 @@
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">Добавить</a>
<div class="add_link_text_text">номер телефона <b>+15</b></div> <div class="add_link_text_text">номер телефона <b>+15</b></div>
{% endif %} {% endif %}
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="phone_form" action="/company/update/phone/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="phone_form" action="/company/update/phone/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -367,15 +291,12 @@
</div> </div>
</div> </div>
</div> </div>
<div class="{% if email_form.email.value %}ic-tel p-editable{% else %}p-editable add_link_text add_link_text_medium{% endif %}"> <div class="{% if email_form.email.value %}ic-tel p-editable{% else %}p-editable add_link_text add_link_text_medium{% endif %}">
{% if email_form.email.value %} {% if email_form.email.value %}
<div class="ic-mail add_indent "> <div class="ic-mail add_indent ">
<a id="static-email-value" class="icon-mail" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a> <a id="static-email-value" class="icon-mail" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a>
</div> </div>
{% endif %} {% endif %}
<div class="edit-wrap"> <div class="edit-wrap">
{% if email_form.email.value %} {% if email_form.email.value %}
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
@ -383,7 +304,6 @@
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">Добавить</a>
<div class="add_link_text_text">email <b>+15</b></div> <div class="add_link_text_text">email <b>+15</b></div>
{% endif %} {% endif %}
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="email_form" action="/company/update/email/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="email_form" action="/company/update/email/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -403,9 +323,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="{% if web_page_form.web_page.value %}ic-site p-editable{% else %}ic-site p-editable add_link_text add_link_text_medium{% endif %}"> <div class="{% if web_page_form.web_page.value %}ic-site p-editable{% else %}ic-site p-editable add_link_text add_link_text_medium{% endif %}">
{% if web_page_form.web_page.value %} {% if web_page_form.web_page.value %}
<a id="static-web-page-value" class="icon-ext-link" href="{% if web_page_form.web_page.value %}{{ web_page_form.web_page.value }}{% else %}#{% endif %}" target="_blank"> <a id="static-web-page-value" class="icon-ext-link" href="{% if web_page_form.web_page.value %}{{ web_page_form.web_page.value }}{% else %}#{% endif %}" target="_blank">
@ -414,19 +331,16 @@
{% endif %} {% endif %}
</a> </a>
{% endif %} {% endif %}
<div class="edit-wrap"> <div class="edit-wrap">
{% if web_page_form.web_page.value %} {% if web_page_form.web_page.value %}
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
{% else %} {% else %}
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
<div class="add_link_text_text">сайт <b>+5</b></div> <div class="add_link_text_text">{% trans сайт' %} <b>+5</b></div>
{% endif %} {% endif %}
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="web_page_form" action="/company/update/web-page/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="web_page_form" action="/company/update/web-page/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ web_page_form.web_page.label }}</label> <label>{{ web_page_form.web_page.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -442,34 +356,22 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<hr /> <hr />
<div class="i-additional"> <div class="i-additional">
<div class="ia-title">Дополнительная информация</div> <div class="ia-title">{% trans 'Дополнительная информация' %}</div>
<div class="p-editable {% if found_form.foundation.value %}ic-tel ic-links {% else %}add_link_text add_link_text_medium{% endif %}"> <div class="p-editable {% if found_form.foundation.value %}ic-tel ic-links {% else %}add_link_text add_link_text_medium{% endif %}">
<p id="static-found-value" style="{% if found_form.foundation.value == '' or found_form.foundation.value == None %}display:none;{% endif %}">{% trans 'Год основания' %}: <span>{{ found_form.foundation.value }}</span></p>
<p id="static-found-value" style="{% if found_form.foundation.value == '' or found_form.foundation.value == None %}display:none;{% endif %}">Год основания: <span>{{ found_form.foundation.value }}</span></p>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#" >{% trans 'редактировать' %}</a> <a class="e-btn" href="#" >{% trans 'редактировать' %}</a>
<div id="static-foundation" style="{% if found_form.foundation.value %} display:none;{% endif %}"> <div id="static-foundation" style="{% if found_form.foundation.value %} display:none;{% endif %}">
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
<div class="add_link_text_text">год основания <b>+15</b></div> <div class="add_link_text_text">{% trans 'год основания' %} <b>+15</b></div>
</div> </div>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="found_form" action="/company/update/foundation/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="found_form" action="/company/update/foundation/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ found_form.foundation.label }}</label> <label>{{ found_form.foundation.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -478,34 +380,24 @@
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">Сохранить</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="#">закрыть</a>
</div> </div>
</div> </div>
</div> </div>
<div class="p-editable {% if staff_form.staff_number.value %}ic-tel ic-links {% else %}add_link_text add_link_text_medium{% endif %}"> <div class="p-editable {% if staff_form.staff_number.value %}ic-tel ic-links {% else %}add_link_text add_link_text_medium{% endif %}">
<p id="static-staff_number-value" style="{% if staff_form.staff_number.value == '' or staff_form.staff_number.value == None %}display:none;{% endif %}">{% trans 'к-во сотрудников' %}: <span id="static-staff-value">{{ staff_form.staff_number.value }}</span></p>
<p id="static-staff_number-value" style="{% if staff_form.staff_number.value == '' or staff_form.staff_number.value == None %}display:none;{% endif %}">к-во сотрудников: <span id="static-staff-value">{{ staff_form.staff_number.value }}</span></p>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div id="static-staff_number" style="{% if staff_form.staff_number.value %} display:none;{% endif %}"> <div id="static-staff_number" style="{% if staff_form.staff_number.value %} display:none;{% endif %}">
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
<div class="add_link_text_text">к-во сотрудников <b>+15</b></div> <div class="add_link_text_text">{% trans 'к-во сотрудников' %} <b>+15</b></div>
</div> </div>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="staff_form" action="/company/update/staff/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="staff_form" action="/company/update/staff/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ staff_form.staff_number.label }}</label> <label>{{ staff_form.staff_number.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -514,30 +406,21 @@
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">Сохранить</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
<a class="ef-close" href="#">закрыть</a>
</div> </div>
</div> </div>
</div> </div>
<div class="p-editable {% if description_form.description.value %}ic-tel {% else %}add_link_text add_link_text_medium{% endif %}"> <div class="p-editable {% if description_form.description.value %}ic-tel {% else %}add_link_text add_link_text_medium{% endif %}">
<span id="static-description-value" style="{% if description_form.description.value == '' or description_form.description.value == None %}display:none;{% endif %}">{{ description_form.description.value }}</span> <span id="static-description-value" style="{% if description_form.description.value == '' or description_form.description.value == None %}display:none;{% endif %}">{{ description_form.description.value }}</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div id="static-description" style="{% if description_form.description.value %} display:none;{% endif %}"> <div id="static-description" style="{% if description_form.description.value %} display:none;{% endif %}">
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
<div class="add_link_text_text">подробное описание компании<b>+15</b></div> <div class="add_link_text_text">{% trans 'подробное описание компании' %}<b>+15</b></div>
</div> </div>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="description_form" action="/company/update/description/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="description_form" action="/company/update/description/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -550,58 +433,47 @@
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">Сохранить</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">закрыть</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block pre_scripts %} {% block pre_scripts %}
<script src="{% static 'client/js/plugins/select2.min.js' %}"></script> <script src="{% static 'client/js/plugins/select2.min.js' %}"></script>
<script src="{% static 'client/js/plugins/select2_locale_ru.js' %}"></script> <script src="{% static 'client/js/plugins/select2_locale_ru.js' %}"></script>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<!-- mask select scripts-->
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
<script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script>
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script>
<!-- page module--> {% if request.GET.debug == '1' %}
<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.company{% if debug %}{% else %}.min{% endif %}.js"></script> <script src="{% static 'client/js/_modules/page.company.js' %}"></script>
<script> {% else %}
//js module initialization <script src="{% static 'client/js_min/_modules/page.company.min.js' %}"></script>
{% endif %}<script>
EXPO.company.init({ EXPO.company.init({
// class selector to identify required forms on page
updateFormClass:'update-profile-form', updateFormClass:'update-profile-form',
// text and paths for dynamically rendered selectboxes
selectBox:[ selectBox:[
{id:'id_country'}, {id:'id_country'},
{id:'id_city', {id:'id_city',
placeHolder:'Search city', placeHolder:"{% trans 'Поиск города' %}",
path:'http://{{ request.get_host }}/city/get-city/' path:'http://{{ request.get_host }}/city/get-city/'
}, },
{id:'id_tag', {id:'id_tag',
placeholder:'Выберите ключевые теги', placeholder:"{% trans 'Выберите ключевые теги' %}",
path:'http://{{ request.get_host }}/theme/get-tag/' path:'http://{{ request.get_host }}/theme/get-tag/'
} }
], ],
// we need this id to enable mapping library
phoneBox: 'id_phone', phoneBox: 'id_phone',
// some helper text in current language
lang:{ lang:{
workIn:'в'// there must be 'at' in English workIn:"{% trans 'в' %}"
} }
}); });

@ -3,10 +3,8 @@
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% load thumbnail %} {% load thumbnail %}
{% block style %} {% block style %}
<link rel="stylesheet" href="{% static 'client/css/select2.css' %}"> <link rel="stylesheet" href="{% static 'client/css/select2.css' %}">
{% if not company_form %} {% if not company_form %}
<style> <style>
.add_company a:before { content:'';background: none; display: inline-block !important;} .add_company a:before { content:'';background: none; display: inline-block !important;}
@ -14,28 +12,20 @@
</style> </style>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block bread_scrumbs %} {% block bread_scrumbs %}
<div class="bread-crumbs"> <div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a> <a href="/">{% trans 'Главная страница' %}</a>
<strong>{% trans 'Личный кабинет' %}</strong> <strong>{% trans 'Личный кабинет' %}</strong>
</div> </div>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
{% endblock %} {% endblock %}
{% block content_list %} {% block content_list %}
<div class="m-article"> <div class="m-article">
<div class="item-wrap clearfix"> <div class="item-wrap clearfix">
<aside> <aside>
<div class="i-pict p-editable"> <div class="i-pict p-editable">
<form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form" action="/profile/update/avatar/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form" action="/profile/update/avatar/" method="post">{% csrf_token %}
{% if request.user.profile.avatar %} {% if request.user.profile.avatar %}
<a class="pic_block" style="padding-top: 0;" title="" id="pick-block"> <a class="pic_block" style="padding-top: 0;" title="" id="pick-block">
{% thumbnail request.user.profile.avatar "100x100" crop="center" as im %} {% thumbnail request.user.profile.avatar "100x100" crop="center" as im %}
@ -60,10 +50,8 @@
<p>Чем выше<br>рейтинг —<br>тем больше<br>преимуществ!</p> <p>Чем выше<br>рейтинг —<br>тем больше<br>преимуществ!</p>
</div> </div>
</aside> </aside>
<div class="i-info"> <div class="i-info">
<header> <header>
<div class="{% if home_form.instance.country and home_form.instance.city %}i-place p-editable{% else %}i-place p-editable add_link_text add_link_text_medium{% endif %}"> <div class="{% if home_form.instance.country and home_form.instance.city %}i-place p-editable{% else %}i-place p-editable add_link_text add_link_text_medium{% endif %}">
{% if home_form.instance.country and home_form.instance.city %} {% if home_form.instance.country and home_form.instance.city %}
<span> <span>
@ -118,27 +106,22 @@
<a class="ef-close" href="#">закрыть</a> <a class="ef-close" href="#">закрыть</a>
</div> </div>
</div> </div>
</div> </div>
<div class="site_link"> <div class="site_link">
<a href="{{ request.user.get_permanent_url }}" title=""> <a href="{{ request.user.get_permanent_url }}" title="">
{{ request.user.get_permanent_url }} {{ request.user.get_permanent_url }}
</a> </a>
</div> </div>
<div class="i-title p-editable p-editable"> <div class="i-title p-editable p-editable">
<span id="static-name-value"> <span id="static-name-value">
{{ name_form.get_full_name }} {{ name_form.get_full_name }}
</span> </span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="name_form" action="/profile/update/name/" <form class="clearfix update-profile-form" id="name_form" action="/profile/update/name/"
method="post" method="post">{% csrf_token %} method="post" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ name_form.first_name.label }}</label> <label>{{ name_form.first_name.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -151,9 +134,7 @@
{{ name_form.last_name }} {{ name_form.last_name }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
@ -181,54 +162,39 @@
<a class="e-btn" href="#" title="">Указать</a> <a class="e-btn" href="#" title="">Указать</a>
<div class="add_link_text_text">свою должность и место работы <b>+10</b></div> <div class="add_link_text_text">свою должность и место работы <b>+10</b></div>
{% endif %} {% endif %}
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="work_form" action="/profile/update/work/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="work_form" action="/profile/update/work/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ work_form.position.label }}</label> <label>{{ work_form.position.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ work_form.position }} {{ work_form.position }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label>{{ work_form.company.label }}</label> <label>{{ work_form.company.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ work_form.company }} {{ work_form.company }}
</div> </div>
</div> </div>
<!-- сделать проверку на создателя компании -->
<div class="add_company"><a id="add-comp-btn" class="pw-open" href="{% if not company_form %}/profile/company/{% else %}#pw-company{% endif %}" title="">{% if not company_form %}Изменить{% else %}Добавить{% endif %} компанию</a></div> <div class="add_company"><a id="add-comp-btn" class="pw-open" href="{% if not company_form %}/profile/company/{% else %}#pw-company{% endif %}" title="">{% if not company_form %}Изменить{% else %}Добавить{% endif %} компанию</a></div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<hr /> <hr />
<div class="i-contacts clearfix"> <div class="i-contacts clearfix">
<div class="ic-buttons ic-buttons_pos dd_width_4"> <div class="ic-buttons ic-buttons_pos dd_width_4">
<a class="button icon-edit icb-edit-profile" href="#">редактировать профиль</a> <a class="button icon-edit icb-edit-profile" href="#">редактировать профиль</a>
<a class="button orange icon-edit icb-exit-edit" href="#">завершить редактирование</a> <a class="button orange icon-edit icb-exit-edit" href="#">завершить редактирование</a>
<div class="ic-buttons_text">Добавить профили в соц.сетях:</div> <div class="ic-buttons_text">Добавить профили в соц.сетях:</div>
<div class="p-editable add_link_text add_link_text_medium soc-media-indent"> <div class="p-editable add_link_text add_link_text_medium soc-media-indent">
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">Добавить</a>
@ -271,63 +237,49 @@
{% endif %} {% endif %}
</li></li> </li></li>
</ul> </ul>
<div class="add_link_text_text"><b>+5 за каждый</b></div> <div class="add_link_text_text"><b>+5 за каждый</b></div>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="social_form" action="/profile/update/social/">{% csrf_token %} <form class="clearfix update-profile-form" id="social_form" action="/profile/update/social/">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.facebook }} {{ social_form.facebook }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.linkedin }} {{ social_form.linkedin }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.vk }} {{ social_form.vk }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.twitter }} {{ social_form.twitter }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="ic-links ic-links_indent dd_width_5"> <div class="ic-links ic-links_indent dd_width_5">
<div class="{% if phone_form.phone.value %}ic-tel p-editable{% else %}p-editable add_link_text add_link_text_medium{% endif %}"> <div class="{% if phone_form.phone.value %}ic-tel p-editable{% else %}p-editable add_link_text add_link_text_medium{% endif %}">
{% if phone_form.phone.value %} {% if phone_form.phone.value %}
<span id="static-phone-value">{{ phone_form.phone.value|phone }}</span> <span id="static-phone-value">{{ phone_form.phone.value|phone }}</span>
{% endif %} {% endif %}
<div class="edit-wrap"> <div class="edit-wrap">
{% if phone_form.phone.value %} {% if phone_form.phone.value %}
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
@ -355,11 +307,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ic-mail add_indent"> <div class="ic-mail add_indent">
<a class="icon-mail" href="mailto:{{ request.user.email }}">{{ request.user.email }}</a> <a class="icon-mail" href="mailto:{{ request.user.email }}">{{ request.user.email }}</a>
</div> </div>
<div class="{% if web_page_form.web_page.value %}ic-site p-editable{% else %}ic-site p-editable add_link_text add_link_text_medium{% endif %}"> <div class="{% if web_page_form.web_page.value %}ic-site p-editable{% else %}ic-site p-editable add_link_text add_link_text_medium{% endif %}">
{% if web_page_form.web_page.value %} {% if web_page_form.web_page.value %}
<a class="icon-ext-link" id="static-web-page-value" href="{% if web_page_form.web_page.value %}{{ web_page_form.web_page.value }}{% else %}#{% endif %}" target="_blank"> <a class="icon-ext-link" id="static-web-page-value" href="{% if web_page_form.web_page.value %}{{ web_page_form.web_page.value }}{% else %}#{% endif %}" target="_blank">
@ -368,7 +318,6 @@
{% endif %} {% endif %}
</a> </a>
{% endif %} {% endif %}
<div class="edit-wrap"> <div class="edit-wrap">
{% if web_page_form.web_page.value %} {% if web_page_form.web_page.value %}
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
@ -376,7 +325,6 @@
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">Добавить</a>
<div class="add_link_text_text">сайт <b>+5</b></div> <div class="add_link_text_text">сайт <b>+5</b></div>
{% endif %} {% endif %}
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="web_page_form" action="/profile/update/web-page/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="web_page_form" action="/profile/update/web-page/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -396,11 +344,8 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<hr /> <hr />
<div class="{% if about_form.about.value %}i-additional{% else %}i-additional i-additional1{% endif %}"> <div class="{% if about_form.about.value %}i-additional{% else %}i-additional i-additional1{% endif %}">
{% if about_form.about.value %} {% if about_form.about.value %}
@ -415,11 +360,9 @@
{% if about_form.about.value %} {% if about_form.about.value %}
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
{% else %} {% else %}
<a class="e-btn" href="#" title="">Добавить</a> <a class="e-btn" href="#" title="">{% trans 'Добавить' %}</a>
<div class="add_link_text_text">информацию о себе <b>+10</b></div> <div class="add_link_text_text">{% trans 'информацию о себе' %} <b>+10</b></div>
{% endif %} {% endif %}
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="about_form" action="/profile/update/about/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="about_form" action="/profile/update/about/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -432,53 +375,46 @@
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">Сохранить</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">закрыть</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% block scripts %} {% block scripts %}
<!-- mask select scripts-->
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
<script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script>
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script>
<!-- page module--> {% if request.GET.debug == '1' %}
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.profile{% if debug %}{% else %}.min{% endif %}.js"></script>-->
<script src="{% static 'client/js/_modules/page.profile.js' %}"></script> <script src="{% static 'client/js/_modules/page.profile.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.profile.min.js' %}"></script>
{% endif %}
<script> <script>
//js module initialization
EXPO.profile.init({ EXPO.profile.init({
// class selector to identify required forms on page
updateFormClass:'update-profile-form', updateFormClass:'update-profile-form',
// text and paths for dynamically rendered selectboxes
selectBox:[ selectBox:[
{id:'id_country'}, {id:'id_country'},
{id:'id_theme', {id:'id_theme',
placeHolder:'Выберите тематику компании' placeHolder:"{% trans 'Выберите тематику компании' %}"
}, },
{id:'id_city', {id:'id_city',
placeholder:'Search city', placeholder:"{% trans 'Искать город' %}",
path:'http://{{ request.get_host }}/city/get-city/' path:'http://{{ request.get_host }}/city/get-city/'
}, },
{id:'id_company', {id:'id_company',
placeholder:'Search company', placeholder:"{% trans 'Искать компанию' %}",
path:'http://{{ request.get_host }}/company/get-company/' path:'http://{{ request.get_host }}/company/get-company/'
} }
], ],
// we need this id to enable mapping library
phoneBox: 'id_phone', phoneBox: 'id_phone',
// some helper text in current language
lang:{ lang:{
workIn:'в'// there must be 'at' in English workIn:"{% trans 'в' %}"
} }
}); });
</script> </script>
{% endblock %} {% endblock %}

@ -2,25 +2,20 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% block bread_scrumbs %} {% block bread_scrumbs %}
<div class="bread-crumbs"> <div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a> <a href="/">{% trans 'Главная страница' %}</a>
<strong>{% trans 'Личный кабинет' %}</strong> <strong>{% trans 'Личный кабинет' %}</strong>
</div> </div>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
<div class="page-title"> <div class="page-title">
<h1>{% trans 'Личный кабинет' %}</h1> <h1>{% trans 'Личный кабинет' %}</h1>
</div> </div>
{% endblock %} {% endblock %}
{% block content_list %} {% block content_list %}
<div class="m-article"> <div class="m-article">
<div class="item-wrap clearfix"> <div class="item-wrap clearfix">
{# avatar #} {# avatar #}
<aside> <aside>
<div class="i-pict p-editable"> <div class="i-pict p-editable">
@ -32,7 +27,6 @@
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form"action="/profile/update/avatar/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form"action="/profile/update/avatar/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ avatar_form.avatar.label }}</label> <label>{{ avatar_form.avatar.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -43,9 +37,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
@ -54,7 +46,6 @@
</div> </div>
</div> </div>
</div> </div>
</aside> </aside>
{# END avatar #} {# END avatar #}
<div class="i-info"> <div class="i-info">
@ -68,7 +59,6 @@
{% endif %} {% endif %}
<a href="#">{{ home_form.instance.country }}</a> <a href="#">{{ home_form.instance.country }}</a>
</span> </span>
{% if home_form.instance.city %} {% if home_form.instance.city %}
<span> <span>
{% else %} {% else %}
@ -76,32 +66,25 @@
{% endif %} {% endif %}
, <a href="#">{{ home_form.instance.city }}</a> , <a href="#">{{ home_form.instance.city }}</a>
</span> </span>
<div class="edit-wrap e-left"> <div class="edit-wrap e-left">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="home_form" action="/profile/update/home/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="home_form" action="/profile/update/home/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ home_form.country.label }}</label> <label>{{ home_form.country.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ home_form.country }} {{ home_form.country }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label>{% trans 'Город' %}</label> <label>{% trans 'Город' %}</label>
<div class="epf-field"> <div class="epf-field">
<select name="city" style="width: 200px;"> <select name="city" style="width: 200px;">
</select> </select>
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
@ -111,7 +94,6 @@
</div> </div>
</div> </div>
{# END country and city #} {# END country and city #}
{# name #} {# name #}
<div class="i-title p-editable"> <div class="i-title p-editable">
<span>{{ name_form.get_full_name }}</span> <span>{{ name_form.get_full_name }}</span>
@ -120,9 +102,7 @@
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="name_form" action="/profile/update/name/" <form class="clearfix update-profile-form" id="name_form" action="/profile/update/name/"
method="post" method="post">{% csrf_token %} method="post" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ name_form.first_name.label }}</label> <label>{{ name_form.first_name.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -135,21 +115,17 @@
{{ name_form.last_name }} {{ name_form.last_name }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
{# END name #} {# END name #}
</header> </header>
{# position #} {# position #}
<div class="i-position p-editable"> <div class="i-position p-editable">
<p> <p>
@ -158,42 +134,33 @@
{% trans 'в' %} {{ work_form.work.value }} {% trans 'в' %} {{ work_form.work.value }}
{% endif %} {% endif %}
</p> </p>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="work_form" action="/profile/update/work/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="work_form" action="/profile/update/work/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ work_form.position.label }}</label> <label>{{ work_form.position.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ work_form.position }} {{ work_form.position }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label>{{ work_form.work.label }}</label> <label>{{ work_form.work.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ work_form.work }} {{ work_form.work }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
{# END position #} {# END position #}
{# description #} {# description #}
<div class="i-descr p-editable"> <div class="i-descr p-editable">
<p>{{ about_company_form.about_company.value }}</p> <p>{{ about_company_form.about_company.value }}</p>
@ -201,30 +168,24 @@
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="about_company_form" action="/profile/update/about-company/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="about_company_form" action="/profile/update/about-company/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ about_company_form.about_company.label }}</label> <label>{{ about_company_form.about_company.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ about_company_form.about_company }} {{ about_company_form.about_company }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
{# END description #} {# END description #}
<hr /> <hr />
<div class="i-contacts clearfix"> <div class="i-contacts clearfix">
<div class="ic-buttons"> <div class="ic-buttons">
<a class="button icon-edit icb-edit-profile" href="#">{% trans 'редактировать профиль' %}</a> <a class="button icon-edit icb-edit-profile" href="#">{% trans 'редактировать профиль' %}</a>
@ -252,44 +213,36 @@
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="social_form" action="/profile/update/social/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="social_form" action="/profile/update/social/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.facebook }} {{ social_form.facebook }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.linkedin }} {{ social_form.linkedin }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.vk }} {{ social_form.vk }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ social_form.twitter }} {{ social_form.twitter }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
@ -305,7 +258,6 @@
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="phone_form" action="/profile/update/phone/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="phone_form" action="/profile/update/phone/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
@ -314,50 +266,15 @@
{{ phone_form.phone }} {{ phone_form.phone }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
<!--
<div class="ic-mail p-editable">
{% if email_form.email.value %}
<a class="icon-mail" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a>
{% endif %}
<div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form">
<form class="clearfix" action="/profile/update/email/" method="post">{% csrf_token %}
<div class="ef-body">
<div class="epfl">
<label>{{ email_form.email.label }}</label>
<div class="epf-field">
{{ email_form.email }}
</div>
</div>
</div>
<div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div>
</form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div>
</div>
</div>
-->
<div class="ic-site p-editable"> <div class="ic-site p-editable">
{% if web_page_form.web_page.value %} {% if web_page_form.web_page.value %}
<a class="icon-ext-link" href="{% if web_page_form.web_page.value %}{{ web_page_form.web_page.value }}{% else %}#{% endif %}" target="_blank"> <a class="icon-ext-link" href="{% if web_page_form.web_page.value %}{{ web_page_form.web_page.value }}{% else %}#{% endif %}" target="_blank">
@ -366,85 +283,70 @@
{% endif %} {% endif %}
</a> </a>
{% endif %} {% endif %}
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="web_page_form" action="/profile/update/web-page/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="web_page_form" action="/profile/update/web-page/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ web_page_form.web_page.label }}</label> <label>{{ web_page_form.web_page.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ web_page_form.web_page }} {{ web_page_form.web_page }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
{# END contacts #} {# END contacts #}
</div> </div>
</div> </div>
<hr/> <hr/>
{# about #} {# about #}
<div class="i-additional"> <div class="i-additional">
<div class="ia-title">{% trans 'О себе:' %}</div> <div class="ia-title">{% trans 'О себе:' %}</div>
<div class="p-editable"> <div class="p-editable">
<p>{{ about_form.about.value }}</p> <p>{{ about_form.about.value }}</p>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn" href="#">{% trans 'редактировать' %}</a> <a class="e-btn" href="#">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="about_form" action="/profile/update/about/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="about_form" action="/profile/update/about/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ about_form.about.label }}</label> <label>{{ about_form.about.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ about_form.about }} {{ about_form.about }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="#">{% trans 'закрыть' %}</a> <a class="ef-close" href="#">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{# END about #} {# END about #}
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
{% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.profile.js' %}"></script> <script src="{% static 'client/js/_modules/page.profile.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.profile.min.js' %}"></script>
{% endif %}
<script> <script>
//js module initialization
EXPO.profile.init({ EXPO.profile.init({
// class seletor to identify required forms on page
updateFormClass:'update-profile-form', updateFormClass:'update-profile-form',
// text and paths for dynamically rendered selectboxes
selectBox:[ selectBox:[
{id:'id_country'}, {id:'id_country'},
{id:'id_theme', {id:'id_theme',

@ -3,23 +3,19 @@
{% load thumbnail %} {% load thumbnail %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% block bread_scrumbs %} {% block bread_scrumbs %}
<div class="bread-crumbs"> <div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a> <a href="/">{% trans 'Главная страница' %}</a>
<strong>{% trans 'Статьи' %}</strong> <strong>{% trans 'Статьи' %}</strong>
</div> </div>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
<div class="page-title"> <div class="page-title">
<h1>{% trans 'Статьи' %}</h1> <h1>{% trans 'Статьи' %}</h1>
</div> </div>
{% endblock %} {% endblock %}
{% block content_list %} {% block content_list %}
<div class="set-sect p-form adm-form news-filter-block"> <div class="set-sect p-form adm-form news-filter-block">
<form action="#"> <form action="#">
<div class="adm-form-body"> <div class="adm-form-body">
<div class="mf-line mf-line1 s-subj-tag"> <div class="mf-line mf-line1 s-subj-tag">
@ -28,16 +24,12 @@
<div class="custom-select theme"> <div class="custom-select theme">
{{ article_filter_form.theme }} {{ article_filter_form.theme }}
</div> </div>
</div> </div>
<div class="mf-field"> <div class="mf-field">
<label>{{ article_filter_form.tag.label }}</label> <label>{{ article_filter_form.tag.label }}</label>
<div class="custom-select tags"> <div class="custom-select tags">
{{ article_filter_form.tag }} {{ article_filter_form.tag }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -50,7 +42,6 @@
<div class="cl-item"> <div class="cl-item">
<div class="acticle_list_big"> <div class="acticle_list_big">
{% include 'includes/article/article_preview.html' with obj=blog %} {% include 'includes/article/article_preview.html' with obj=blog %}
<h3><a href="{{ blog.get_permanent_url }}" title="">{{ blog.main_title }}</a></h3> <h3><a href="{{ blog.get_permanent_url }}" title="">{{ blog.main_title }}</a></h3>
{{ blog.preview|safe }} {{ blog.preview|safe }}
<strong><span>{{ blog.created|date:"d E Y" }}</span>{% if blog.tag.all.exists %}{% include 'includes/article_tags.html' with obj=blog %}{% endif %}</strong> <strong><span>{{ blog.created|date:"d E Y" }}</span>{% if blog.tag.all.exists %}{% include 'includes/article_tags.html' with obj=blog %}{% endif %}</strong>
@ -61,10 +52,12 @@
</div> </div>
</div> </div>
<!--todo: вернуть минифицированную версию--> {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.newsFilter.js' %}"></script> <script src="{% static 'client/js/_modules/block.newsFilter.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/block.newsFilter.min.js' %}"></script>
{% endif %}
<script> <script>
//js module initialization
EXPO.newsFilter.init({ EXPO.newsFilter.init({
theme:{ theme:{
placeholder:"{% trans 'Укажите тематику' %}" placeholder:"{% trans 'Укажите тематику' %}"
@ -73,11 +66,9 @@
placeholder:"{% trans 'Выберите ключевые теги' %}", placeholder:"{% trans 'Выберите ключевые теги' %}",
url:'http://{{ request.get_host }}/theme/get-tag/' url:'http://{{ request.get_host }}/theme/get-tag/'
} }
}); });
</script> </script>
{% endblock %} {% endblock %}
{% block paginator %} {% block paginator %}
{% include 'includes/catalog_paginator.html' with page_obj=page_obj %} {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
{% endblock %} {% endblock %}

@ -2,26 +2,21 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% block bread_scrumbs %} {% block bread_scrumbs %}
<div class="bread-crumbs"> <div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a> <a href="/">{% trans 'Главная страница' %}</a>
<strong>{% trans 'Новости' %}</strong> <strong>{% trans 'Новости' %}</strong>
</div> </div>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
<div class="page-title"> <div class="page-title">
<h1>{% trans 'Новости' %}:</h1> <h1>{% trans 'Новости' %}:</h1>
</div> </div>
{% endblock %} {% endblock %}
{% block content_list %} {% block content_list %}
<div class="set-sect p-form adm-form news-filter-block"> <div class="set-sect p-form adm-form news-filter-block">
<form action="#"> <form action="#">
<div class="adm-form-body"> <div class="adm-form-body">
<div class="mf-line mf-line1 s-subj-tag"> <div class="mf-line mf-line1 s-subj-tag">
<div class="mf-field"> <div class="mf-field">
<label>{{ article_filter_form.theme.label }}</label> <label>{{ article_filter_form.theme.label }}</label>
@ -30,17 +25,13 @@
{{ article_filter_form.theme }} {{ article_filter_form.theme }}
</div> </div>
</div> </div>
<div class="mf-field"> <div class="mf-field">
<label>{{ article_filter_form.tag.label }}</label> <label>{{ article_filter_form.tag.label }}</label>
<div class="custom-select tags"> <div class="custom-select tags">
{{ article_filter_form.tag }} {{ article_filter_form.tag }}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
@ -59,10 +50,12 @@
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
<!--todo: вернуть минифицированную версию--> {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.newsFilter.js' %}"></script> <script src="{% static 'client/js/_modules/block.newsFilter.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/block.newsFilter.min.js' %}"></script>
{% endif %}
<script> <script>
//js module initialization
EXPO.newsFilter.init({ EXPO.newsFilter.init({
theme:{ theme:{
placeholder:"{% trans 'Укажите тематику' %}" placeholder:"{% trans 'Укажите тематику' %}"
@ -74,7 +67,6 @@
}); });
</script> </script>
{% endblock %} {% endblock %}
{% block paginator %} {% block paginator %}
{% include 'includes/catalog_paginator.html' with page_obj=page_obj %} {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
{% endblock %} {% endblock %}

@ -1,7 +1,6 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% comment %} {% comment %}
This template include basic anf main styles and js files, This template include basic anf main styles and js files,
block with header and footer, which same in all pages, block with header and footer, which same in all pages,
@ -13,31 +12,40 @@ This template include basic anf main styles and js files,
head with title block, style block head with title block, style block
{% endcomment %} {% endcomment %}
<!DOCTYPE html> <!DOCTYPE html>
<!--[if lt IE 8]> <html class="no-js lt-ie9 lt-ie8"> <![endif]--> <!--[if lt IE 8]> <html class="no-js lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]--> <!--[if IE 8]> <html class="no-js lt-ie9"> <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js"> <!--<![endif]--> <!--[if gt IE 8]><!-->
<html class="no-js"> <!--<![endif]-->
<!--if IE 8><script src="js/selectivizr-min.js"></script><![endif]-->
<head> <head>
{% include 'includes/meta.html' %} {% include 'includes/meta.html' %}
<link rel="icon" href="{% static 'client/img/favicon.ico' %}" type="image/x-icon" /> <link rel="icon" href="{% static 'client/img/favicon.ico' %}" type="image/x-icon" />
<link rel="shortcut icon" href="{% static 'client/img/favicon.ico' %}" type="image/x-icon" /> <link rel="shortcut icon" href="{% static 'client/img/favicon.ico' %}" type="image/x-icon" />
<link rel="stylesheet" href="{% static 'client/css' %}{% if debug %}/{% else %}_min/{% endif %}vendor{% if debug %}{% else %}.min{% endif %}.css"> {% if request.GET.debug == '1' %}
<!--todo: вернуть минифицированную версию--> <link rel="stylesheet" href="{% static 'client/css/vendor.css' %}">
<!--<link rel="stylesheet" href="{% static 'client/css' %}{% if debug %}/{% else %}_min/{% endif %}main{% if debug %}{% else %}.min{% endif %}.css">--> {% else %}
<link rel="stylesheet" href="{% static 'client/css_min/vendor.min.css' %}">
{% endif %}
{% if request.GET.debug == '1' %}
<link rel="stylesheet" href="{% static 'client/css/main.css' %}"> <link rel="stylesheet" href="{% static 'client/css/main.css' %}">
{% else %}
<link rel="stylesheet" href="{% static 'client/css_min/main.min.css' %}">
{% endif %}
<link rel="stylesheet" href="{% static 'client/lib/font-awesome-4.3.0/css/font-awesome.min.css' %}"> <link rel="stylesheet" href="{% static 'client/lib/font-awesome-4.3.0/css/font-awesome.min.css' %}">
{% block styles %} {% block styles %}
{% endblock %} {% endblock %}
<script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script> <script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script>
<script src="{% static 'client/js/vendor/jquery-1.10.1.min.js' %}"></script> <script src="{% static 'client/js/vendor/jquery-1.10.1.min.js' %}"></script>
<script src="{% static 'client/js/jquery-ui-1.10.4.custom.min.js' %}" type="text/javascript"></script> <script src="{% static 'client/js/jquery-ui-1.10.4.custom.min.js' %}" type="text/javascript"></script>
<!--<script src="{% static ' {% if request.GET.debug == '1' %}
client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.common{% if debug %}{% else %}.min{% endif %}.js"></script>-->
<script src="{% static 'client/js/_modules/block.common.js' %}"></script> <script src="{% static 'client/js/_modules/block.common.js' %}"></script>
{% else %}
<!--if IE 8><script src="js/selectivizr-min.js"></script><![endif]--> <script src="{% static 'client/js_min/_modules/block.common.min.js' %}"></script>
{% endif %}
<script type="text/javascript"> <script type="text/javascript">
EXPO.common.init({ EXPO.common.init({
activeClass:"active", activeClass:"active",
@ -70,9 +78,10 @@ This template include basic anf main styles and js files,
<!--[if lt IE 8]> <!--[if lt IE 8]>
<p class="chromeframe">Вы используете <strong>устаревший</strong> браузер. Пожалуйста, <a href="http://browsehappy.com/">обновите его</a> или <a href="http://www.google.com/chromeframe/?redirect=true">активируйте Google Chrome Frame</a>, чтобы расширить возможности вашего браузера.</p> <p class="chromeframe">Вы используете <strong>устаревший</strong> браузер. Пожалуйста, <a href="http://browsehappy.com/">обновите его</a> или <a href="http://www.google.com/chromeframe/?redirect=true">активируйте Google Chrome Frame</a>, чтобы расширить возможности вашего браузера.</p>
<![endif]--> <![endif]-->
<!-- Английский вариант текста для p.chromeframe {% comment %}
<!-- Английский вариант текста для p.chromeframe -->
<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p> <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
--> {% endcomment %}
<div class="page-wrap"> <div class="page-wrap">
{% block header %} {% block header %}
{% include 'client/includes/header.html' %} {% include 'client/includes/header.html' %}
@ -117,7 +126,11 @@ This template include basic anf main styles and js files,
{% if not request.user.is_anonymous %} {% if not request.user.is_anonymous %}
{% if not request.user.url %} {% if not request.user.url %}
{% include 'client/popups/user_information.html' with form=reg_complete %} {% include 'client/popups/user_information.html' with form=reg_complete %}
<script type="text/javascript" src="{% static 'client/js/_modules/block.registration.completion.js' %}"></script> {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.registration.completion.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/block.registration.completion.min.js' %}"></script>
{% endif %}
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -125,16 +138,15 @@ This template include basic anf main styles and js files,
{% endblock %} {% endblock %}
</div> </div>
{% block photogallery %} {% block photogallery %}
{% endblock %} {% endblock %}
<!-- scripts --> {# js libs #}
<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=places"></script> <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&libraries=places"></script>
<!--vendor scripts concatenated--> {% if request.GET.debug == '1' %}
<script type="text/javascript" src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}vendor{% if debug %}{% else %}.min{% endif %}.js"></script> <script src="{% static 'client/js/vendor.js' %}"></script>
<!--<script type="text/javascript" src="{% static 'client/js/vendor.js' %}"></script>--> {% else %}
<script src="{% static 'client/js_min/vendor.min.js' %}"></script>
{% endif %}
<div id="wait-ajax" class="wait-ajax" style="display:none;"><img src="{% static 'client/img/ajax-loader.gif' %}" alt=""/></div> <div id="wait-ajax" class="wait-ajax" style="display:none;"><img src="{% static 'client/img/ajax-loader.gif' %}" alt=""/></div>
</body> </body>

@ -1,9 +1,6 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
<div class="ep-sect eps-opened"> <div class="ep-sect eps-opened">
<div class="ep-sect-title"><a class="eps-open" href="#">{% trans 'визуализация' %}</a></div> <div class="ep-sect-title"><a class="eps-open" href="#">{% trans 'визуализация' %}</a></div>
<div class="ep-sect-body calenadar-body"> <div class="ep-sect-body calenadar-body">
@ -40,14 +37,12 @@
{# первый ряд с отображениями дней где нет событий #} {# первый ряд с отображениями дней где нет событий #}
<tr> <tr>
{% for day in days %} {% for day in days %}
{% if day_colspan|get_item:day|get_item:'event' %} {% if day_colspan|get_item:day|get_item:'event' %}
{% ifnotequal day current_day %} {% ifnotequal day current_day %}
<td></td> <td></td>
{% else %} {% else %}
<td class="c-cur"></td> <td class="c-cur"></td>
{% endifnotequal %} {% endifnotequal %}
{% else %} {% else %}
{% if day_colspan|get_item:day|get_item:'counter' %} {% if day_colspan|get_item:day|get_item:'counter' %}
{# здесь ячейка с днями без событий #} {# здесь ячейка с днями без событий #}
@ -56,12 +51,8 @@
<div class="ce-wrap"><div class="message">{% trans "Нет отмеченых событий" %}</div></div> <div class="ce-wrap"><div class="message">{% trans "Нет отмеченых событий" %}</div></div>
</div> </div>
</td> </td>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</tr> </tr>
<tr class="c-sep"> <tr class="c-sep">
@ -72,13 +63,10 @@
<td class="c-cur"></td> <td class="c-cur"></td>
{% endifnotequal %} {% endifnotequal %}
{% endfor %} {% endfor %}
</tr> </tr>
{% for event in events %} {% for event in events %}
<tr> <tr>
{% for day in days %} {% for day in days %}
{% if event|in_event:day %} {% if event|in_event:day %}
{% if day.month == event.data_begin.month %} {% if day.month == event.data_begin.month %}
{% if day.day == event.data_begin.day %} {% if day.day == event.data_begin.day %}
@ -87,10 +75,8 @@
<div class="c-event active-event {% if day.month != event.data_end.month %}cont-next{% endif %}"> <div class="c-event active-event {% if day.month != event.data_end.month %}cont-next{% endif %}">
{% endcomment %} {% endcomment %}
<div class="c-event active-event"> <div class="c-event active-event">
<div class="ce-wrap"> <div class="ce-wrap">
<h3><a href="{{ event.get_permanent_url }}">{{ event.name|safe }}</a></h3> <h3><a href="{{ event.get_permanent_url }}">{{ event.name|safe }}</a></h3>
<div class="ce-info"> <div class="ce-info">
<div class="cei-icons"> <div class="cei-icons">
{% if request.user in event.users.all %} {% if request.user in event.users.all %}
@ -148,7 +134,6 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</tr> </tr>
<tr class="c-sep"> <tr class="c-sep">
{% for day in days %} {% for day in days %}
@ -158,16 +143,12 @@
<td class="c-cur"></td> <td class="c-cur"></td>
{% endifnotequal %} {% endifnotequal %}
{% endfor %} {% endfor %}
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -175,9 +156,11 @@
<div class="cal-scroll-button to-right" id="cal-scroll-right"><span class="sprite">&nbsp;</span></div> <div class="cal-scroll-button to-right" id="cal-scroll-right"><span class="sprite">&nbsp;</span></div>
</div> </div>
{% block scripts %} {% block scripts %}
<!--todo: вернуть минифицированную версию--> {% if request.GET.debug == '1' %}
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.profile.calendar{% if debug %}{% else %}.min{% endif %}.js"></script>--> <script src="{% static 'client/js/_modules/page.profile.calendar.js' %}"></script>
<script src="{% static 'client/js/_modules/page.profile.calendar.js' %}"></script> {% else %}
<script src="{% static 'client/js_min/_modules/page.profile.calendar.min.js' %}"></script>
{% endif %}
<script> <script>
EXPO.profile.calendar.init({ EXPO.profile.calendar.init({
calenadrId:'calendar-table', calenadrId:'calendar-table',
@ -196,6 +179,4 @@
}); });
</script> </script>
{% endblock %} {% endblock %}

@ -2,11 +2,8 @@
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% load thumbnail %} {% load thumbnail %}
<div class="m-article edit-profile"> <div class="m-article edit-profile">
<div class="item-wrap clearfix"> <div class="item-wrap clearfix">
{# avatar #} {# avatar #}
<aside> <aside>
<div class="form-item-wrap"> <div class="form-item-wrap">
@ -17,10 +14,8 @@
<b>+20</b> <b>+20</b>
</a> </a>
</div> </div>
<div class="i-pict p-editable editable-wrap {% if request.user.profile.avatar %}{% else %}hidden{% endif %}"> <div class="i-pict p-editable editable-wrap {% if request.user.profile.avatar %}{% else %}hidden{% endif %}">
<div id="pick-block" class="pic_block"> <div id="pick-block" class="pic_block">
{% if request.user.profile.avatar %} {% if request.user.profile.avatar %}
{% thumbnail request.user.profile.avatar "100x100" format="PNG" as im %} {% thumbnail request.user.profile.avatar "100x100" format="PNG" as im %}
<img class="user-avatar" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/> <img class="user-avatar" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
@ -34,7 +29,6 @@
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form"action="/profile/update/avatar/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form"action="/profile/update/avatar/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ avatar_form.avatar.label }}</label> <label>{{ avatar_form.avatar.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -45,9 +39,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
@ -73,36 +65,27 @@
<div class="add_link_text_text">{% trans 'Страну и город' %}<b>+10</b></div> <div class="add_link_text_text">{% trans 'Страну и город' %}<b>+10</b></div>
</div> </div>
<div class="i-place p-editable editable-wrap {% if home_form.instance.country %}{% else %}hidden{% endif %}"> <!-- 2 --> <div class="i-place p-editable editable-wrap {% if home_form.instance.country %}{% else %}hidden{% endif %}"> <!-- 2 -->
<span class="static-value"> <!-- 3 --> <span class="static-value"> <!-- 3 -->
<span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span> <span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span>
</span> </span>
<div class="edit-wrap e-left"> <div class="edit-wrap e-left">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="home_form" action="/profile/update/home/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="home_form" action="/profile/update/home/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ home_form.country.label }}</label> <label>{{ home_form.country.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ home_form.country }} {{ home_form.country }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label>{% trans 'Город' %}</label> <label>{% trans 'Город' %}</label>
<div class="epf-field"> <div class="epf-field">
{{ home_form.city }} {{ home_form.city }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
@ -113,7 +96,6 @@
</div> </div>
</div> </div>
{# END country and city #} {# END country and city #}
{# name #} {# name #}
<div class="form-item-wrap"> <!-- 1 --> <div class="form-item-wrap"> <!-- 1 -->
<div class="i-descr add_link_text {% if name_form.get_full_name %}hidden{% else %}{% endif %}"> <div class="i-descr add_link_text {% if name_form.get_full_name %}hidden{% else %}{% endif %}">
@ -129,9 +111,7 @@
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="name_form" action="/profile/update/name/" <form class="clearfix update-profile-form" id="name_form" action="/profile/update/name/"
method="post" method="post">{% csrf_token %} method="post" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ name_form.first_name.label }}</label> <label>{{ name_form.first_name.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -144,26 +124,20 @@
{{ name_form.last_name }} {{ name_form.last_name }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a> <a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{# END name #} {# END name #}
</header> </header>
{# position #} {# position #}
<div class="form-item-wrap full-width"> <div class="form-item-wrap full-width">
<div class="i-descr add_link_text {% if work_form.position.value or work_form.work.value %}hidden{% else %}{% endif %}"> <div class="i-descr add_link_text {% if work_form.position.value or work_form.work.value %}hidden{% else %}{% endif %}">
<a class="e-btn " href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Указать' %}</a> <a class="e-btn " href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Указать' %}</a>
<div class="add_link_text_text">{% trans 'свою должность и место работы' %}<b>+10</b></div> <div class="add_link_text_text">{% trans 'свою должность и место работы' %}<b>+10</b></div>
@ -175,14 +149,11 @@
{% trans 'в' %} {{ work_form.work.value }} {% trans 'в' %} {{ work_form.work.value }}
{% endif %} {% endif %}
</p> </p>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="work_form" action="/profile/update/work/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="work_form" action="/profile/update/work/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ work_form.position.label }}</label> <label>{{ work_form.position.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -198,12 +169,10 @@
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a> <a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
@ -211,7 +180,6 @@
</div> </div>
{# END position #} {# END position #}
<hr /> <hr />
<div class="i-contacts clearfix"> <div class="i-contacts clearfix">
<div class="ic-buttons dd_width_4"> <div class="ic-buttons dd_width_4">
<div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div> <div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div>
@ -220,7 +188,6 @@
<div class="i-descr add_link_text add_link_text_medium soc-media-indent"> <div class="i-descr add_link_text add_link_text_medium soc-media-indent">
<a class="e-btn social not-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a> <a class="e-btn social not-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn social full-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}{% else %}hidden{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a> <a class="e-btn social full-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}{% else %}hidden{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
<ul class="soc-media-buttons soc-media-buttons1"> <ul class="soc-media-buttons soc-media-buttons1">
<li> <li>
{% if social_form.facebook.value %} {% if social_form.facebook.value %}
@ -239,7 +206,6 @@
{% else %} {% else %}
<img id="img-linkedin" src="{% static 'client/img/soc-medias/sm-icon-lin_hover.png' %}" title="LinkedIn" alt="LinkedIn" /> <img id="img-linkedin" src="{% static 'client/img/soc-medias/sm-icon-lin_hover.png' %}" title="LinkedIn" alt="LinkedIn" />
{% endif %} {% endif %}
<li> <li>
{% if social_form.vk.value %} {% if social_form.vk.value %}
<a href="{{ social_form.vk.value }}" target="_blank"> <a href="{{ social_form.vk.value }}" target="_blank">
@ -249,7 +215,6 @@
<img id="img-vk" src="{% static 'client/img/soc-medias/sm-icon-vk_hover.png' %}" title="В контакте" alt="В контакте" /> <img id="img-vk" src="{% static 'client/img/soc-medias/sm-icon-vk_hover.png' %}" title="В контакте" alt="В контакте" />
{% endif %} {% endif %}
</li> </li>
<li> <li>
{% if social_form.twitter.value %} {% if social_form.twitter.value %}
<a href="{{ social_form.twitter.value }}" target="_blank"> <a href="{{ social_form.twitter.value }}" target="_blank">
@ -260,60 +225,47 @@
{% endif %} {% endif %}
</li></li> </li></li>
</ul> </ul>
<div class="add_link_text_text not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}"><b>{% trans '+5 за каждый' %}</b></div> <div class="add_link_text_text not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}"><b>{% trans '+5 за каждый' %}</b></div>
</div> </div>
<div class="edit-wrap "> <div class="edit-wrap ">
<div class="e-form"> <div class="e-form">
<div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div> <div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div>
<form class="clearfix update-profile-form" id="social_form" action="/profile/update/social/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="social_form" action="/profile/update/social/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label>
<div class="epf-field required"> <div class="epf-field required">
{{ social_form.facebook }} {{ social_form.facebook }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label>
<div class="epf-field required"> <div class="epf-field required">
{{ social_form.linkedin }} {{ social_form.linkedin }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label>
<div class="epf-field required"> <div class="epf-field required">
{{ social_form.vk }} {{ social_form.vk }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label>
<div class="epf-field required"> <div class="epf-field required">
{{ social_form.twitter }} {{ social_form.twitter }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a> <a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{# contacts #} {# contacts #}
<div class="ic-links dd_width_5"> <div class="ic-links dd_width_5">
@ -325,15 +277,12 @@
<div class="ic-tel p-editable editable-wrap {% if phone_form.phone.value %}{% else %}hidden{% endif %}"> <!-- 2 --> <div class="ic-tel p-editable editable-wrap {% if phone_form.phone.value %}{% else %}hidden{% endif %}"> <!-- 2 -->
<span id="static-phone-value" class="static-value "> <!-- 3 --> <span id="static-phone-value" class="static-value "> <!-- 3 -->
{{ phone_form.phone.value|phone }} {{ phone_form.phone.value|phone }}
</span> </span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="phone_form" action="/profile/update/phone/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="phone_form" action="/profile/update/phone/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ phone_form.phone.label }}</label> <label>{{ phone_form.phone.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -345,14 +294,11 @@
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a> <a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
@ -367,18 +313,14 @@
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix" action="/profile/update/email/" method="post">{% csrf_token %} <form class="clearfix" action="/profile/update/email/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ email_form.email.label }}</label> <label>{{ email_form.email.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ email_form.email }} {{ email_form.email }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
@ -400,23 +342,18 @@
{{ web_page_form.web_page.value }} {{ web_page_form.web_page.value }}
{% endif %} {% endif %}
</a> </a>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="web_page_form" action="/profile/update/web-page/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="web_page_form" action="/profile/update/web-page/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ web_page_form.web_page.label }}</label> <label>{{ web_page_form.web_page.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ web_page_form.web_page }} {{ web_page_form.web_page }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
@ -427,11 +364,9 @@
</div> </div>
</div> </div>
</div> </div>
{# END contacts #} {# END contacts #}
</div> </div>
</div> </div>
<hr/> <hr/>
{# about #} {# about #}
<div class="i-additional"> <div class="i-additional">
@ -443,28 +378,22 @@
</div> </div>
<div class="p-editable editable-wrap {% if about_form.about.value %}{% else %}hidden{% endif %}"> <div class="p-editable editable-wrap {% if about_form.about.value %}{% else %}hidden{% endif %}">
<div id="static-about-value" class="static-value">{{ about_form.about.value|linebreaks }}</div> <div id="static-about-value" class="static-value">{{ about_form.about.value|linebreaks }}</div>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="about_form" action="/profile/update/about/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="about_form" action="/profile/update/about/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ about_form.about.label }}</label> <label>{{ about_form.about.label }}</label>
<div class="epf-field"> <div class="epf-field">
{{ about_form.about }} {{ about_form.about }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a> <a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
@ -472,10 +401,8 @@
</div> </div>
</div> </div>
{# END about #} {# END about #}
{# companies #} {# companies #}
<div class="my-companies-block editable"> <div class="my-companies-block editable">
<div class="ia-title ">{% trans 'Мои компании:' %}</div> <div class="ia-title ">{% trans 'Мои компании:' %}</div>
{% if request.user.created_company.all %} {% if request.user.created_company.all %}
{% else %} {% else %}
@ -486,7 +413,6 @@
<span class="message">{% trans 'Пока не добавлено ни одной компании' %}</span> <span class="message">{% trans 'Пока не добавлено ни одной компании' %}</span>
</div> </div>
{% endif %} {% endif %}
{% with companies=request.user.created_company.all %} {% with companies=request.user.created_company.all %}
{% for company in companies %} {% for company in companies %}
<div class="company"> <div class="company">
@ -502,36 +428,26 @@
</div> </div>
{% endfor %} {% endfor %}
{% endwith %} {% endwith %}
</div> </div>
<div class="add-company-block"> <div class="add-company-block">
<a class="button icon-add" href="javascript:void(0);" id="add-new-company">{% trans 'Добавить компанию' %}</a> <a class="button icon-add" href="javascript:void(0);" id="add-new-company">{% trans 'Добавить компанию' %}</a>
</div> </div>
{# END companies #} {# END companies #}
</div> </div>
</div> </div>
</div> </div>
{% block scripts %} {% block scripts %}
<!-- mask select scripts-->
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
<script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script>
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script>
<!-- page module--> {% if request.GET.debug == '1' %}
<!--todo: вернуть минифицированную версию-->
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.profile{% if debug %}{% else %}.min{% endif %}.js"></script>-->
<script src="{% static 'client/js/_modules/page.profile.js' %}"></script> <script src="{% static 'client/js/_modules/page.profile.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.profile.min.js' %}"></script>
{% endif %}
<script> <script>
//js module initialization
EXPO.profile.init({ EXPO.profile.init({
// class selector to identify required forms on page
updateFormClass:'update-profile-form', updateFormClass:'update-profile-form',
// text part that is added to form id to designate its wrapper container
formWrapperClass:'form-item-wrap', formWrapperClass:'form-item-wrap',
formCurrentClass:'pe-current', formCurrentClass:'pe-current',
staticValueClass:'static-value', staticValueClass:'static-value',
@ -542,30 +458,26 @@
avatarButtonClass:'avatar-btn', avatarButtonClass:'avatar-btn',
avatarImageClass:'user-avatar', avatarImageClass:'user-avatar',
noImageSrc:"{% static 'client/img/no-userpic-big.gif' %}", noImageSrc:"{% static 'client/img/no-userpic-big.gif' %}",
// text and paths for dynamically rendered selectboxes
addCompanyButtonId:'add-new-company', addCompanyButtonId:'add-new-company',
companyAddInputMask:'http://expomap.ru/members/', companyAddInputMask:'http://expomap.ru/members/',
avatarInputId:"id_avatar", avatarInputId:"id_avatar",
selectBox:[ selectBox:[
{id:'id_country'}, {id:'id_country'},
{id:'id_theme', {id:'id_theme',
placeholder:'Выберите тематику компании' placeholder:"{% trans 'Выберите тематику компании' %}"
}, },
{id:'id_city', {id:'id_city',
placeholder:'Поиск города', placeholder:"{% trans 'Поиск города' %}",
path:'http://{{ request.get_host }}/city/get-city/' path:'http://{{ request.get_host }}/city/get-city/'
}, },
{id:'id_company', {id:'id_company',
placeholder:'Поиск компании', placeholder:"{% trans 'Поиск компании' %}",
path:'http://{{ request.get_host }}/company/get-company/' path:'http://{{ request.get_host }}/company/get-company/'
} }
], ],
// we need this id to enable mapping library
phoneBox: 'id_phone', phoneBox: 'id_phone',
// some helper text in current language
lang:{ lang:{
workIn:'в'// there must be 'at' in English workIn:"{% trans 'в' %}"
}, },
addCompany:{ addCompany:{
modalId:'pw-company', modalId:'pw-company',
@ -574,7 +486,6 @@
rating:{ rating:{
id:'profile-rating' id:'profile-rating'
} }
}); });
</script> </script>
{% endblock %} {% endblock %}

@ -1,6 +1,5 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
<div class="in-search-form mp-search"> <div class="in-search-form mp-search">
<form action="{{ search_form.search_url }}" class="search_form" id="search-block-form"> <form action="{{ search_form.search_url }}" class="search_form" id="search-block-form">
<div class="s-title">{{ search_form.title }}</div> <div class="s-title">{{ search_form.title }}</div>
@ -13,10 +12,8 @@
</div> </div>
<div class="sf-autocomplete main-field-complete visible"> <div class="sf-autocomplete main-field-complete visible">
<div class="sfa-wrap q-field-complete-wrap" id="q-field-complete-wrap"> <div class="sfa-wrap q-field-complete-wrap" id="q-field-complete-wrap">
</div> </div>
</div> </div>
</div> </div>
<div class="sf-field-wrap"> <div class="sf-field-wrap">
<div class="sf-field"> <div class="sf-field">
@ -25,7 +22,6 @@
</div> </div>
<div class="sf-autocomplete main-field-complete visible"> <div class="sf-autocomplete main-field-complete visible">
<div class="sfa-wrap w-field-complete-wrap" id="w-field-complete-wrap"> <div class="sfa-wrap w-field-complete-wrap" id="w-field-complete-wrap">
</div> </div>
</div> </div>
</div> </div>
@ -96,14 +92,15 @@
<div class="a modal-close fancybox-close">&nbsp;</div> <div class="a modal-close fancybox-close">&nbsp;</div>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
{% block scripts %} {% block scripts %}
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.search{% if debug %}{% else %}.min{% endif %}.js"></script>--> {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.search.js' %}"></script> <script src="{% static 'client/js/_modules/block.search.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/block.search.min.js' %}"></script>
{% endif %}
<script> <script>
var closerTextSingle = "{% trans ' и еще _ позиция' %}", var closerTextSingle = "{% trans ' и еще _ позиция' %}",
closerText = "{% trans ' и еще _ позиции' %}"; closerText = "{% trans ' и еще _ позиции' %}";
@ -111,7 +108,6 @@
closerTextSingle = "{% trans ' и еще _' %}"; closerTextSingle = "{% trans ' и еще _' %}";
closerText = "{% trans ' и еще _' %}"; closerText = "{% trans ' и еще _' %}";
} }
EXPO.searchBlock.init({ EXPO.searchBlock.init({
formId: 'search-block-form', formId: 'search-block-form',
modalTriggerClass:'search-modal-open', modalTriggerClass:'search-modal-open',
@ -143,10 +139,8 @@
getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/', getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
selectedItemsContainer:'csb-subj-selected-items', selectedItemsContainer:'csb-subj-selected-items',
subjectTriggerWrapId:'subj-checks', subjectTriggerWrapId:'subj-checks',
//switched by default
defaultOn:['exhibition-check','conference-check'], defaultOn:['exhibition-check','conference-check'],
clearAllButtonClass:'clear-all-button', clearAllButtonClass:'clear-all-button',
applyBtnClass:'modal-approve' applyBtnClass:'modal-approve'
}, },
period:{ period:{
@ -188,12 +182,8 @@
height:460 height:460
} }
} }
} }
}); });
</script> </script>
{% endblock %} {% endblock %}
</div> </div>

@ -1,13 +1,10 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
<section class="layout mp-search search-form"> <section class="layout mp-search search-form">
<div class="layout-wrap"> <div class="layout-wrap">
<aside> <aside>
<div class="s-title">{{ search_form.title }}</div> <div class="s-title">{{ search_form.title }}</div>
</aside> </aside>
<div class="mcl"> <div class="mcl">
<form id="search-block-form" action="{{ search_form.search_url }}"> <form id="search-block-form" action="{{ search_form.search_url }}">
<div class="search-form-wrap"> <div class="search-form-wrap">
@ -107,11 +104,14 @@
</div> </div>
</form> </form>
</div> </div>
</div> </div>
{% block scripts %} {% block scripts %}
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.search{% if debug %}{% else %}.min{% endif %}.js"></script> {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.search.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/block.search.min.js' %}"></script>
{% endif %}
<script> <script>
var closerTextSingle = "{% trans ' и еще _ позиция' %}", var closerTextSingle = "{% trans ' и еще _ позиция' %}",
closerText = "{% trans ' и еще _ позиции' %}"; closerText = "{% trans ' и еще _ позиции' %}";
@ -119,7 +119,6 @@
closerTextSingle = "{% trans ' и еще _' %}"; closerTextSingle = "{% trans ' и еще _' %}";
closerText = "{% trans ' и еще _' %}"; closerText = "{% trans ' и еще _' %}";
} }
EXPO.searchBlock.init({ EXPO.searchBlock.init({
formId: 'search-block-form', formId: 'search-block-form',
modalTriggerClass:'search-modal-open', modalTriggerClass:'search-modal-open',
@ -138,7 +137,6 @@
selectedItemsContainer:'csb-selected-items', selectedItemsContainer:'csb-selected-items',
clearAllButtonClass:'clear-all-button', clearAllButtonClass:'clear-all-button',
applyBtnClass:'modal-approve' applyBtnClass:'modal-approve'
}, },
subject:{ subject:{
id:'pwSubj', id:'pwSubj',
@ -151,10 +149,8 @@
getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/', getParentUrl:'http://{{ request.get_host }}/search-form/get-parent/',
selectedItemsContainer:'csb-subj-selected-items', selectedItemsContainer:'csb-subj-selected-items',
subjectTriggerWrapId:'subj-checks', subjectTriggerWrapId:'subj-checks',
//switched by default
defaultOn:['exhibition-check','conference-check'], defaultOn:['exhibition-check','conference-check'],
clearAllButtonClass:'clear-all-button', clearAllButtonClass:'clear-all-button',
applyBtnClass:'modal-approve' applyBtnClass:'modal-approve'
}, },
period:{ period:{
@ -163,7 +159,6 @@
dateFrom:'dateFrom', dateFrom:'dateFrom',
modalTrigger:'period-modal-trigger', modalTrigger:'period-modal-trigger',
clearAllButtonClass:'clear-all-button', clearAllButtonClass:'clear-all-button',
applyBtnClass:'modal-approve' applyBtnClass:'modal-approve'
}, },
firstField:{ firstField:{
@ -196,9 +191,7 @@
height:460 height:460
} }
} }
} }
}); });
</script> </script>

@ -2,12 +2,9 @@
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% load thumbnail %} {% load thumbnail %}
<div class="m-article edit-profile company"> <div class="m-article edit-profile company">
<div class="item-wrap clearfix"> <div class="item-wrap clearfix">
<aside> <aside>
<!--!!-->
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class=" avatar-btn i-pict i-descr {% if company.logo %}hidden{% else %}{% endif %}"> <div class=" avatar-btn i-pict i-descr {% if company.logo %}hidden{% else %}{% endif %}">
<a class="add_pic_block" title=""> <a class="add_pic_block" title="">
@ -17,7 +14,6 @@
</a> </a>
</div> </div>
<div class="i-pict p-editable editable-wrap {% if company.logo %}{% else %}hidden{% endif %}"> <div class="i-pict p-editable editable-wrap {% if company.logo %}{% else %}hidden{% endif %}">
<div id="pick-block" class="pic_block"> <div id="pick-block" class="pic_block">
{% if company.logo %} {% if company.logo %}
{% thumbnail company.logo "100x100" format="PNG" as im %} {% thumbnail company.logo "100x100" format="PNG" as im %}
@ -26,14 +22,12 @@
{% else %} {% else %}
<img class="user-avatar" src="{% static 'client/img/no-logo.png' %}" width="100" height="100"/> <img class="user-avatar" src="{% static 'client/img/no-logo.png' %}" width="100" height="100"/>
{% endif %} {% endif %}
</div> </div>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form" action="/company/update/logo/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" enctype="multipart/form-data" id="avatar_form" action="/company/update/logo/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ avatar_form.logo.label }}</label> <label>{{ avatar_form.logo.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -44,9 +38,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
@ -55,11 +47,9 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="i-rating" title="{% trans 'Рейтинг' %}: {{ company.rating }}" id="profile-rating">{{ company.rating }}</div> <div class="i-rating" title="{% trans 'Рейтинг' %}: {{ company.rating }}" id="profile-rating">{{ company.rating }}</div>
</aside> </aside>
<div class="i-info"> <div class="i-info">
<header> <header>
<div class="form-item-wrap "> <div class="form-item-wrap ">
@ -71,43 +61,31 @@
<span class="static-value"> <span class="static-value">
<span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span> <span id="static-home-country">{{ home_form.instance.country }}</span>, <span id="static-home-city">{{ home_form.instance.city }}</span>
</span> </span>
<div class="edit-wrap e-left"> <div class="edit-wrap e-left">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="home_form" action="/company/update/home/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="home_form" action="/company/update/home/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>Страна</label> <label>Страна</label>
<div class="epf-field"> <div class="epf-field">
{{ home_form.country }} {{ home_form.country }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label>{% trans 'Город' %}</label> <label>{% trans 'Город' %}</label>
<div class="epf-field"> <div class="epf-field">
{{ home_form.city }} {{ home_form.city }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">Сохранить</button> <button type="submit" class="lnk icon-save">Сохранить</button>
</div> </div>
<a class="ef-close" href="javascript:void(0);">закрыть</a> <a class="ef-close" href="javascript:void(0);">закрыть</a>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="site_link"> <div class="site_link">
@ -120,10 +98,8 @@
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Указать' %}</a> <a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Указать' %}</a>
<div class="add_link_text_text">{% trans 'название компании' %}<b>+10</b></div> <div class="add_link_text_text">{% trans 'название компании' %}<b>+10</b></div>
</div> </div>
<div class="i-title p-editable editable-wrap {% if name_form.name.value %}{% else %}hidden{% endif %} required"> <div class="i-title p-editable editable-wrap {% if name_form.name.value %}{% else %}hidden{% endif %} required">
<span id="static-name-value" class="static-value">{{ name_form.name.value }}</span> <span id="static-name-value" class="static-value">{{ name_form.name.value }}</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">редактировать</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">редактировать</a>
<div class="e-form"> <div class="e-form">
@ -151,7 +127,6 @@
</div> </div>
</div> </div>
</header> </header>
<div class="form-item-wrap specialization"> <div class="form-item-wrap specialization">
<div class="i-descr add_link_text {% if spec_form.specialization.value %}hidden{% else %}{% endif %}"> <div class="i-descr add_link_text {% if spec_form.specialization.value %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a> <a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
@ -161,11 +136,9 @@
<span id="static-spec-value" class="static-value min-height">{{ spec_form.specialization.value }}&nbsp;</span> <span id="static-spec-value" class="static-value min-height">{{ spec_form.specialization.value }}&nbsp;</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="spec_form" action="/company/update/specialization/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epf-field"> <div class="epf-field">
<label>{{ spec_form.specialization.label }}</label> <label>{{ spec_form.specialization.label }}</label>
<div class="epf-field "> <div class="epf-field ">
@ -201,7 +174,6 @@
</div> </div>
</div> </div>
{% endwith %} {% endwith %}
<hr /> <hr />
<div class="form-item-wrap mb-1em address-wrap" id="address-block"> <div class="form-item-wrap mb-1em address-wrap" id="address-block">
<a class="map-toggle " href="javascript:void(0);" data-show-text="{% trans 'Раскрыть карту' %}" data-hide-text="{% trans 'Скрыть карту' %}"><i class="fa fa-map-marker">&nbsp;</i><span class="label">Раскрыть карту</span></a> <a class="map-toggle " href="javascript:void(0);" data-show-text="{% trans 'Раскрыть карту' %}" data-hide-text="{% trans 'Скрыть карту' %}"><i class="fa fa-map-marker">&nbsp;</i><span class="label">Раскрыть карту</span></a>
@ -239,7 +211,6 @@
</div> </div>
</div> </div>
</div> </div>
<hr /> <hr />
<div class="add_link_teg"> <div class="add_link_teg">
<div class="form-item-wrap"> <div class="form-item-wrap">
@ -267,27 +238,18 @@
</div> </div>
<!----> <!---->
<div class="p-editable editable-wrap hidden"> <div class="p-editable editable-wrap hidden">
</div> </div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<hr /> <hr />
<div class="i-contacts clearfix"> <div class="i-contacts clearfix">
<div class="ic-buttons ic-buttons_pos dd_width_4"> <div class="ic-buttons ic-buttons_pos dd_width_4">
<div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div> <div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="p-editable editable-wrap social"> <div class="p-editable editable-wrap social">
<div class="i-descr add_link_text add_link_text_medium soc-media-indent"> <div class="i-descr add_link_text add_link_text_medium soc-media-indent">
<a class="e-btn social not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %} no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a> <a class="e-btn social not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %} no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn social full-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}{% else %}hidden{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a> <a class="e-btn social full-complete no-refresh {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}{% else %}hidden{% endif %}" href="javascript:void(0);" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
<ul class="soc-media-buttons soc-media-buttons1"> <ul class="soc-media-buttons soc-media-buttons1">
<li> <li>
{% if social_form.facebook.value %} {% if social_form.facebook.value %}
@ -328,61 +290,48 @@
</li> </li>
</ul> </ul>
<div class="add_link_text_text not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}"><b>{% trans '+5 за каждый' %}</b></div> <div class="add_link_text_text not-complete {% if social_form.facebook.value and social_form.linkedin.value and social_form.vk.value and social_form.twitter.value %}hidden{% else %}{% endif %}"><b>{% trans '+5 за каждый' %}</b></div>
</div> </div>
<div class="edit-wrap"> <div class="edit-wrap">
<div class="e-form"> <div class="e-form">
<div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div> <div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div>
<form class="clearfix update-profile-form" id="social_form" action="/company/update/social/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="social_form" action="/company/update/social/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl "> <div class="epfl ">
<label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-fb-w.png' %}" title="Facebook" alt="Facebook" /> {{ social_form.facebook.label }}</label>
<div class="epf-field required"> <div class="epf-field required">
{{ social_form.facebook }} {{ social_form.facebook }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-lin-w.png' %}" title="LinkedIn" alt="LinkedIn" /> {{ social_form.linkedin.label }}</label>
<div class="epf-field required"> <div class="epf-field required">
{{ social_form.linkedin }} {{ social_form.linkedin }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-vk-w.png' %}" title="В контакте" alt="В контакте" /> {{ social_form.vk.label }}</label>
<div class="epf-field required"> <div class="epf-field required">
{{ social_form.vk }} {{ social_form.vk }}
</div> </div>
</div> </div>
<div class="epfl"> <div class="epfl">
<label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label> <label><img src="{% static 'client/img/soc-medias/sm-icon-twit-w.png' %}" title="Twitter" alt="Twitter" /> {{ social_form.twitter.label }}</label>
<div class="epf-field required"> <div class="epf-field required">
{{ social_form.twitter }} {{ social_form.twitter }}
</div> </div>
</div> </div>
</div> </div>
<div class="ef-buttons"> <div class="ef-buttons">
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a> <a class="ef-close" href="javascript:void(0);">{% trans 'закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="ic-links ic-links_indent dd_width_5"> <div class="ic-links ic-links_indent dd_width_5">
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text add_link_text_medium {% if phone_form.phone.value|phone %}hidden{% else %}{% endif %}"> <div class="i-descr add_link_text add_link_text_medium {% if phone_form.phone.value|phone %}hidden{% else %}{% endif %}">
@ -391,7 +340,6 @@
</div> </div>
<div class="ic-tel p-editable editable-wrap {% if phone_form.phone.value|phone %}{% else %}hidden{% endif %}"> <div class="ic-tel p-editable editable-wrap {% if phone_form.phone.value|phone %}{% else %}hidden{% endif %}">
<span id="static-phone-value" class="static-value">{{ phone_form.phone.value|phone }}</span> <span id="static-phone-value" class="static-value">{{ phone_form.phone.value|phone }}</span>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
@ -414,18 +362,15 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text add_link_text_medium {% if email_form.email.value %}hidden{% else %}{% endif %}"> <div class="i-descr add_link_text add_link_text_medium {% if email_form.email.value %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a> <a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<div class="add_link_text_text">{% trans 'email' %} <b>+15</b></div> <div class="add_link_text_text">{% trans 'email' %} <b>+15</b></div>
</div> </div>
<div class=" p-editable editable-wrap {% if email_form.email.value %}{% else %}hidden{% endif %} "> <div class=" p-editable editable-wrap {% if email_form.email.value %}{% else %}hidden{% endif %} ">
<div class="ic-mail add_indent "> <div class="ic-mail add_indent ">
<a id="static-email-value" class="icon-mail static-value" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a> <a id="static-email-value" class="icon-mail static-value" href="mailto:{{ email_form.email.value }}">{{ email_form.email.value }}</a>
</div> </div>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
@ -448,8 +393,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<div class="i-descr add_link_text add_link_text_medium {% if web_page_form.web_page.value %}hidden{% else %}{% endif %}"> <div class="i-descr add_link_text add_link_text_medium {% if web_page_form.web_page.value %}hidden{% else %}{% endif %}">
<a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a> <a class="e-btn" href="javascript:void(0);" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
@ -459,10 +402,8 @@
<a id="static-web-page-value" class="icon-ext-link static-value website" href="{{ web_page_form.web_page.value }}" target="_blank"> <a id="static-web-page-value" class="icon-ext-link static-value website" href="{{ web_page_form.web_page.value }}" target="_blank">
{{ web_page_form.web_page.value }} {{ web_page_form.web_page.value }}
</a> </a>
<div class="edit-wrap"> <div class="edit-wrap">
<a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a> <a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);">{% trans 'редактировать' %}</a>
<div class="e-form"> <div class="e-form">
<form class="clearfix update-profile-form" id="web_page_form" action="/company/update/web-page/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="web_page_form" action="/company/update/web-page/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -483,27 +424,20 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<hr /> <hr />
<div class="i-additional"> <div class="i-additional">
<div class="ia-title">Дополнительная информация</div> <div class="ia-title">Дополнительная информация</div>
<!-- !!! -->
<dl class="add-info"> <dl class="add-info">
<div class="form-item-wrap"> <div class="form-item-wrap">
<dt><a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" title="">{% trans 'Добавить' %}</a>{% trans 'Год основания' %}:</dt> <dt><a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" title="">{% trans 'Добавить' %}</a>{% trans 'Год основания' %}:</dt>
<div class="p-editable ic-tel ic-links editable-wrap hidden"> <div class="p-editable ic-tel ic-links editable-wrap hidden">
<div class="edit-wrap"> <div class="edit-wrap">
<div class="e-form"> <div class="e-form">
<div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div> <div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div>
<form class="clearfix update-profile-form" id="found_form" action="/company/update/foundation/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="found_form" action="/company/update/foundation/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
<div class="epfl"> <div class="epfl">
<label>{{ found_form.foundation.label }}</label> <label>{{ found_form.foundation.label }}</label>
<div class="epf-field"> <div class="epf-field">
@ -515,12 +449,10 @@
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="javascript:void(0);">{% trans 'Закрыть' %}</a> <a class="ef-close" href="javascript:void(0);">{% trans 'Закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
<dd class="static-value"> <dd class="static-value">
<span class="full-complete {% if found_form.foundation.value %}{% else %}hidden{% endif %}"> <span class="full-complete {% if found_form.foundation.value %}{% else %}hidden{% endif %}">
{% if found_form.foundation.value %}{{ found_form.foundation.value }}{% endif %} {% if found_form.foundation.value %}{{ found_form.foundation.value }}{% endif %}
@ -528,20 +460,14 @@
<span class="not-complete {% if found_form.foundation.value %}hidden{% else %}{% endif %}"> <span class="not-complete {% if found_form.foundation.value %}hidden{% else %}{% endif %}">
{% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+5</b></div> {% trans 'Не заполнено' %}<div class="add_link_text_text add_link_text"><b>+5</b></div>
</span> </span>
</dd> </dd>
</div> </div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<dt><a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" title="">{% trans 'Добавить' %}</a>{% trans 'Количество сотрудников' %}:</dt> <dt><a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" title="">{% trans 'Добавить' %}</a>{% trans 'Количество сотрудников' %}:</dt>
<div class="p-editable ic-tel ic-links editable-wrap hidden"> <div class="p-editable ic-tel ic-links editable-wrap hidden">
<div class="edit-wrap"> <div class="edit-wrap">
<div class="e-form"> <div class="e-form">
<div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div> <div class="edit-label"><span class="fa fa-pencil-square-o">&nbsp;</span></div>
<form class="clearfix update-profile-form" id="staff_form" action="/company/update/staff/{{ company.url }}/" method="post">{% csrf_token %} <form class="clearfix update-profile-form" id="staff_form" action="/company/update/staff/{{ company.url }}/" method="post">{% csrf_token %}
<div class="ef-body"> <div class="ef-body">
@ -556,12 +482,10 @@
<button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button> <button type="submit" class="lnk icon-save">{% trans 'Сохранить' %}</button>
</div> </div>
</form> </form>
<a class="ef-close" href="javascript:void(0);">{% trans 'Закрыть' %}</a> <a class="ef-close" href="javascript:void(0);">{% trans 'Закрыть' %}</a>
</div> </div>
</div> </div>
</div> </div>
<dd class="static-value"> <dd class="static-value">
<span class="full-complete {% if staff_form.staff_number.value %}{% else %}hidden{% endif %}"> <span class="full-complete {% if staff_form.staff_number.value %}{% else %}hidden{% endif %}">
{% if staff_form.staff_number.value %}{{ staff_form.staff_number.value }}{% endif %} {% if staff_form.staff_number.value %}{{ staff_form.staff_number.value }}{% endif %}
@ -571,10 +495,8 @@
</span> </span>
</dd> </dd>
</div> </div>
<div class="form-item-wrap"> <div class="form-item-wrap">
<dt><a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" title="">{% trans 'Добавить' %}</a>{% trans 'О компании' %}:</dt> <dt><a class="e-btn fa fa-pencil-square-o" href="javascript:void(0);" title="">{% trans 'Добавить' %}</a>{% trans 'О компании' %}:</dt>
<div class="p-editable ic-tel editable-wrap hidden"> <div class="p-editable ic-tel editable-wrap hidden">
<div class="edit-wrap"> <div class="edit-wrap">
<div class="e-form"> <div class="e-form">
@ -599,7 +521,6 @@
</div> </div>
</div> </div>
</div> </div>
<dd class="static-value"> <dd class="static-value">
<div class="full-complete {% if description_form.description.value %}{% else %}hidden{% endif %} description-text"> <div class="full-complete {% if description_form.description.value %}{% else %}hidden{% endif %} description-text">
{% if description_form.description.value %}{{ description_form.description.value|linebreaks }}{% endif %} {% if description_form.description.value %}{{ description_form.description.value|linebreaks }}{% endif %}
@ -609,15 +530,9 @@
</span> </span>
</dd> </dd>
</div> </div>
</dl> </dl>
<!-- !!! -->
</div> </div>
<a rel="nofollow" id="profile-preview-btn" class="button profile-preview-btn" href="javascript:void(0);" target="_blank">Предварительный просмотр <i class="fa fa-eye"></i></a> <a rel="nofollow" id="profile-preview-btn" class="button profile-preview-btn" href="javascript:void(0);" target="_blank">Предварительный просмотр <i class="fa fa-eye"></i></a>
</div> </div>
</div> </div>
</div> </div>
@ -625,23 +540,18 @@
<script src="{% static 'client/js/plugins/select2.min.js' %}"></script> <script src="{% static 'client/js/plugins/select2.min.js' %}"></script>
<script src="{% static 'client/js/plugins/select2_locale_ru.js' %}"></script> <script src="{% static 'client/js/plugins/select2_locale_ru.js' %}"></script>
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<!-- mask select scripts-->
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask.js' %}"></script>
<script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.bind-first-0.2.3.min.js' %}"></script>
<script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script> <script src="{% static 'client/js/plugins/inputmask/jquery.inputmask-multi.js' %}"></script>
<!-- page module--> {% if request.GET.debug == '1' %}
<!--todo: вернуть минифицированную версию-->
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.company{% if debug %}{% else %}.min{% endif %}.js"></script>-->
<script src="{% static 'client/js/_modules/page.company.js' %}"></script> <script src="{% static 'client/js/_modules/page.company.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.company.min.js' %}"></script>
{% endif %}
<script> <script>
//js module initialization
EXPO.company.init({ EXPO.company.init({
// class selector to identify required forms on page
updateFormClass:'update-profile-form', updateFormClass:'update-profile-form',
// text part that is added to form id to designate its wrapper container
formWrapperClass:'form-item-wrap', formWrapperClass:'form-item-wrap',
formCurrentClass:'pe-current', formCurrentClass:'pe-current',
staticValueClass:'static-value', staticValueClass:'static-value',
@ -654,8 +564,6 @@
avatarInputId:"id_avatar", avatarInputId:"id_avatar",
noImageSrc:"{% static 'client/img/no-logo.png' %}", noImageSrc:"{% static 'client/img/no-logo.png' %}",
previewBtnId:"profile-preview-btn", previewBtnId:"profile-preview-btn",
// text and paths for dynamically rendered selectboxes
selectBox:[ selectBox:[
{ {
id:'id_country', id:'id_country',
@ -674,9 +582,7 @@
} }
], ],
// we need this id to enable mapping library
phoneBox: 'id_phone', phoneBox: 'id_phone',
// some helper text in current language
lang:{ lang:{
workIn:'в'// there must be 'at' in English workIn:'в'// there must be 'at' in English
}, },
@ -684,7 +590,6 @@
id:'profile-rating' id:'profile-rating'
}, },
map:{ map:{
blockId:"address-block", blockId:"address-block",
canvasId:"gmap-canvas", canvasId:"gmap-canvas",
autocompleteId:"id_address_inf", autocompleteId:"id_address_inf",
@ -694,9 +599,6 @@
country:4 country:4
} }
} }
}); });
</script> </script>
{% endblock %} {% endblock %}

@ -1,13 +1,11 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
{% with objects=object_list %} {% with objects=object_list %}
{% for obj in objects %} {% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}"> <li class="cl-item {% if obj.canceled %}canceled{% endif %}">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a href="{{ obj.get_permanent_url }}"> <a href="{{ obj.get_permanent_url }}">
{% if obj.canceled %} {% if obj.canceled %}
<div class="cancel"></div> <div class="cancel"></div>
@ -22,17 +20,13 @@
{% endwith %} {% endwith %}
</div> </div>
</a> </a>
<div class="cli-info"> <div class="cli-info">
<div class="cli-top clearfix"> <div class="cli-top clearfix">
{% if obj.quality_label.ufi.is_set %} {% if obj.quality_label.ufi.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" /> <img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
<header> <header>
<div class="cli-title"><a href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div> <div class="cli-title"><a href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
</header> </header>
@ -40,19 +34,15 @@
{{ obj.main_title|safe }} {{ obj.main_title|safe }}
</div> </div>
</div> </div>
<div class="cli-bot clearfix"> <div class="cli-bot clearfix">
<div class="cli-date"> <div class="cli-date">
{% with obj=obj %} {% with obj=obj %}
{% include 'client/includes/show_date_block.html' %} {% include 'client/includes/show_date_block.html' %}
{% endwith %} {% endwith %}
</div> </div>
{% if obj.country %} {% if obj.country %}
<div class="cli-place"> <div class="cli-place">
<a href="{{ obj.catalog }}country/{{ obj.country.url }}/">{{ obj.country }}</a>, <a href="{{ obj.catalog }}city/{{ obj.city.url }}/">{{ obj.city }}</a> <a href="{{ obj.catalog }}country/{{ obj.country.url }}/">{{ obj.country }}</a>, <a href="{{ obj.catalog }}city/{{ obj.city.url }}/">{{ obj.city }}</a>
{% if obj.place %} {% if obj.place %}
, <a href="/places/{{ obj.place.url }}/">{{ obj.place }}</a> , <a href="/places/{{ obj.place.url }}/">{{ obj.place }}</a>
{% endif %} {% endif %}
@ -60,12 +50,9 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="cli-buttons clearfix"> <div class="cli-buttons clearfix">
<div class="cli-m-buttons"> <div class="cli-m-buttons">
{% include 'client/includes/exposition/services.html' with obj=obj %} {% include 'client/includes/exposition/services.html' with obj=obj %}
{% include 'client/includes/calendar_button.html' with obj=obj%} {% include 'client/includes/calendar_button.html' with obj=obj%}
<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}"> <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
{% with note=obj|note_by_user:request.user %} {% with note=obj|note_by_user:request.user %}
@ -83,15 +70,12 @@
</div> </div>
{% endif %} {% endif %}
<div></div> <div></div>
</div> </div>
<div class="cli-s-buttons"> <div class="cli-s-buttons">
{% include 'client/buttons/booking_button.html' with object=obj %} {% include 'client/buttons/booking_button.html' with object=obj %}
</div> </div>
</div> </div>
</div> </div>
<footer class="clearfix"> <footer class="clearfix">
<div class="cli-stats"> <div class="cli-stats">
{% if obj.visitors %} {% if obj.visitors %}
@ -106,13 +90,15 @@
</div> </div>
</footer> </footer>
</li> </li>
{% endfor %} {% endfor %}
{% endwith %} {% endwith %}
</ul> </ul>
{% block scripts %} {% block scripts %}
<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.exposition.list{% if debug %}{% else %}.min{% endif %}.js"></script> {% if request.GET.debug == '1' %}
<script> <script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
{% endif %}<script>
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{ note:{
wrapClass:'note-wrap', wrapClass:'note-wrap',

@ -2,7 +2,6 @@
{% load i18n %} {% load i18n %}
{% load thumbnail %} {% load thumbnail %}
{% load template_filters %} {% load template_filters %}
{% block page_body %} {% block page_body %}
<div class="m-article event-page"> <div class="m-article event-page">
<div class="item-wrap event clearfix"> <div class="item-wrap event clearfix">
@ -15,9 +14,6 @@
{% include 'client/includes/show_logo.html' %} {% include 'client/includes/show_logo.html' %}
{% endwith %} {% endwith %}
</div> </div>
<!--
<div class="i-rating" title="Рейтинг: 551">551</div>
-->
<div class="i-stats"> <div class="i-stats">
{% if exposition.visitors %} {% if exposition.visitors %}
<span class="visitors" title="Посетители">{{ exposition.visitors }}</span> <span class="visitors" title="Посетители">{{ exposition.visitors }}</span>
@ -26,7 +22,6 @@
<span class="participants" title="Участники">{{ exposition.members }}</span> <span class="participants" title="Участники">{{ exposition.members }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="i-discount"> <div class="i-discount">
{% if exposition.discount %} {% if exposition.discount %}
<a class="discount-button" href="#">{% trans 'Скидка' %} -{{ exposition.discount }}%</a> <a class="discount-button" href="#">{% trans 'Скидка' %} -{{ exposition.discount }}%</a>
@ -34,7 +29,6 @@
{% endif %} {% endif %}
</div> </div>
</aside> </aside>
<div class="i-info"> <div class="i-info">
<header> <header>
<div class="i-title"> <div class="i-title">
@ -45,7 +39,6 @@
{% endif %} {% endif %}
</div> </div>
</header> </header>
<div class="i-date"> <div class="i-date">
{% with obj=exposition %} {% with obj=exposition %}
{% include 'client/includes/show_date_block.html' %} {% include 'client/includes/show_date_block.html' %}
@ -84,15 +77,11 @@
</div> </div>
{% endwith %} {% endwith %}
</div> </div>
{% if request.user.is_admin %} {% if request.user.is_admin %}
<a class="button green " href="/admin/exposition/{{ object.url }}/">{% trans 'изменить' %}</a> <a class="button green " href="/admin/exposition/{{ object.url }}/">{% trans 'изменить' %}</a>
{% endif %} {% endif %}
</div> </div>
<div class="ib-add"><a class="button blue2 icon-find" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ object.city.id }}">{% trans 'Найти отель' %}</a></div> <div class="ib-add"><a class="button blue2 icon-find" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ object.city.id }}">{% trans 'Найти отель' %}</a></div>
</div> </div>
<hr /> <hr />
<div class="i-divs clearfix"> <div class="i-divs clearfix">
@ -103,29 +92,23 @@
<li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.expositions_number }})</a></li> <li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.expositions_number }})</a></li>
{% endfor %} {% endfor %}
{% endwith %} {% endwith %}
</ul> </ul>
</div> </div>
<div class="i-tags"> <div class="i-tags">
{% with tags=exposition.tag.all %} {% with tags=exposition.tag.all %}
{% for tag in tags %} {% for tag in tags %}
<a href="{{ object.catalog }}tag/{{ tag.url }}/">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %} <a href="{{ object.catalog }}tag/{{ tag.url }}/">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %}
{% endfor %} {% endfor %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% include 'client/includes/exposition/exposition_services.html' %} {% include 'client/includes/exposition/exposition_services.html' %}
{% include 'includes/event_steps.html' with event=exposition %} {% include 'includes/event_steps.html' with event=exposition %}
{% if exposition.get_photos %} {% if exposition.get_photos %}
{% with photos=exposition.get_photos|slice:"5" %} {% with photos=exposition.get_photos|slice:"5" %}
<hr /> <hr />
<div class="i-photo-slides"> <div class="i-photo-slides">
<div class="sect-title"><a href="#">{% trans 'Фотографии с прошлой выставки' %}</a></div> <div class="sect-title"><a href="#">{% trans 'Фотографии с прошлой выставки' %}</a></div>
<div id="ps-photo-gallery" class="ps-photo-gallery swiper-container"> <div id="ps-photo-gallery" class="ps-photo-gallery swiper-container">
@ -146,7 +129,6 @@
{% endif %} {% endif %}
{% if exposition.description %} {% if exposition.description %}
<div class="i-event-description"> <div class="i-event-description">
<div class="ied-title">{% trans 'О выставке' %} {{ exposition.name|safe }}</div> <div class="ied-title">{% trans 'О выставке' %} {{ exposition.name|safe }}</div>
<div class="ied-text">{{ exposition.description|safe|linebreaks }}</div> <div class="ied-text">{{ exposition.description|safe|linebreaks }}</div>
</div> </div>
@ -155,7 +137,6 @@
<div class="i-event-additional clearfix"> <div class="i-event-additional clearfix">
<div class="sect-title">{% trans 'Дополнительная информация' %}</div> <div class="sect-title">{% trans 'Дополнительная информация' %}</div>
<ul class="e-docs"> <ul class="e-docs">
{% if exposition.business_program.exists %} {% if exposition.business_program.exists %}
<li><a href="{{ exposition.get_permanent_url }}program/">{% trans 'Деловая программа' %}</a></li> <li><a href="{{ exposition.get_permanent_url }}program/">{% trans 'Деловая программа' %}</a></li>
{% endif %} {% endif %}
@ -182,31 +163,25 @@
<a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ exposition.web_page|base64_encode }}" class="link-encode">{{ exposition.web_page }}</a> <a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ exposition.web_page|base64_encode }}" class="link-encode">{{ exposition.web_page }}</a>
</dd> </dd>
{% endif %} {% endif %}
{% if exposition.get_audience %} {% if exposition.get_audience %}
<dt>{% trans 'Аудитория' %}:</dt> <dt>{% trans 'Аудитория' %}:</dt>
<dd> <dd>
{{ exposition.get_audience }} {{ exposition.get_audience }}
</dd> </dd>
{% endif %} {% endif %}
{% if exposition.get_periodic %} {% if exposition.get_periodic %}
<dt>{% trans 'Периодичность' %}:</dt> <dt>{% trans 'Периодичность' %}:</dt>
<dd>{{ exposition.get_periodic }}</dd> <dd>{{ exposition.get_periodic }}</dd>
{% endif %} {% endif %}
{% if exposition.products %} {% if exposition.products %}
<dt>{% trans 'Экспонируемые продукты' %}:</dt> <dt>{% trans 'Экспонируемые продукты' %}:</dt>
<dd>{{ exposition.products|safe }}</dd> <dd>{{ exposition.products|safe }}</dd>
{% endif %} {% endif %}
{% if exposition.time %} {% if exposition.time %}
<dt>{% trans 'Время работы' %}:</dt> <dt>{% trans 'Время работы' %}:</dt>
<dd>{{ exposition.time|safe }}</dd> <dd>{{ exposition.time|safe }}</dd>
{% endif %} {% endif %}
</dl> </dl>
</div> </div>
<hr /> <hr />
<div class="i-members clearfix"> <div class="i-members clearfix">
@ -221,7 +196,6 @@
</header> </header>
<ul> <ul>
{% for company in companies %} {% for company in companies %}
<li> <li>
<a href="{{ company.get_permanent_url }}"> <a href="{{ company.get_permanent_url }}">
<span class="imp-pict"> <span class="imp-pict">
@ -240,13 +214,11 @@
<header> <header>
<div class="im-title">{% trans 'Участники' %}</div> <div class="im-title">{% trans 'Участники' %}</div>
<p>{% trans 'Привлекайте целевых посетителей на стенд' %}</p> <p>{% trans 'Привлекайте целевых посетителей на стенд' %}</p>
<!--//todo: обработчик-->
<p><a href="#pw-advertise" class="button icon-up pw-open" >Рекламировать участника</a></p> <p><a href="#pw-advertise" class="button icon-up pw-open" >Рекламировать участника</a></p>
</header> </header>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</div> </div>
<div class="im-visitors"> <div class="im-visitors">
{% with visitors=exposition.users.all|slice:":17" %} {% with visitors=exposition.users.all|slice:":17" %}
<header> <header>
@ -263,21 +235,15 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</ul> </ul>
<a id="somebody" class=" more mb-1em {% if visitors|length > 0 %}{%else%}hidden{% endif %}" href="{{ exposition.get_permanent_url }}visitors/">{% trans 'Все посетители' %}</a> <a id="somebody" class=" more mb-1em {% if visitors|length > 0 %}{%else%}hidden{% endif %}" href="{{ exposition.get_permanent_url }}visitors/">{% trans 'Все посетители' %}</a>
{% endwith %} {% endwith %}
<p id="nobody" class=" mb-1em {% if exposition.users.all|length > 0 %}hidden{% else %}{% endif %}">{% trans 'Пока никто не отметился на событии.' %}</p> <p id="nobody" class=" mb-1em {% if exposition.users.all|length > 0 %}hidden{% else %}{% endif %}">{% trans 'Пока никто не отметился на событии.' %}</p>
{% with event=exposition user=user %} {% with event=exposition user=user %}
{% include 'client/includes/visit_button.html' %} {% include 'client/includes/visit_button.html' %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
<hr/> <hr/>
{% if exposition.area %} {% if exposition.area %}
{% else %} {% else %}
@ -287,20 +253,15 @@
{% endif %} {% endif %}
{% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %} {% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %}
<div class="e-num-info"> <div class="e-num-info">
{% if exposition.area %} {% if exposition.area %}
<div class="eni-area-wrap"> <div class="eni-area-wrap">
<div class="eni-title">{% trans 'Общая выставочная площадь' %}</div> <div class="eni-title">{% trans 'Общая выставочная площадь' %}</div>
<div class="eni-area"> <div class="eni-area">
{{ exposition.area }} {% trans 'м²' %} {{ exposition.area }} {% trans 'м²' %}
</div> </div>
</div> </div>
{% endif %} {% endif %}
<div class="eni-stats"> <div class="eni-stats">
{% if exposition.members %} {% if exposition.members %}
<div class="enis-item"><b>{{ exposition.members }}</b> {% trans 'участников' %}</div> <div class="enis-item"><b>{{ exposition.members }}</b> {% trans 'участников' %}</div>
{% endif %} {% endif %}
@ -313,13 +274,8 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place %} {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place %}
<hr /> <hr />
{% if exposition.get_nearest_events|slice:":6" %} {% if exposition.get_nearest_events|slice:":6" %}
<div class="e-cat"> <div class="e-cat">
@ -333,7 +289,6 @@
{% with obj=exp %} {% with obj=exp %}
{% include 'client/includes/show_logo.html' %} {% include 'client/includes/show_logo.html' %}
{% endwith %} {% endwith %}
</div> </div>
</a> </a>
<div class="cli-info"> <div class="cli-info">
@ -346,11 +301,9 @@
<header> <header>
<div class="cli-title"><a href="{{ exp.get_permanent_url }}">{{ exp.name|safe }}</a></div> <div class="cli-title"><a href="{{ exp.get_permanent_url }}">{{ exp.name|safe }}</a></div>
</header> </header>
<div class="cli-descr"> <div class="cli-descr">
{{ exp.main_title|safe|linebreaks }} {{ exp.main_title|safe|linebreaks }}
</div> </div>
<div class="cli-bot clearfix"> <div class="cli-bot clearfix">
<div class="cli-date"> <div class="cli-date">
{% with obj=exp %} {% with obj=exp %}
@ -372,9 +325,6 @@
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
<!--
<div class="abn"><a href="#"><img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" /></a></div>
-->
<div class="e-cat look-also"> <div class="e-cat look-also">
<div class="sect-title">{% trans 'Смотрите также:' %}</div> <div class="sect-title">{% trans 'Смотрите также:' %}</div>
<a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a> <a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
@ -382,18 +332,18 @@
<a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|lower }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a> <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|lower }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
<a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|lower }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a> <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|lower }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
</div> </div>
{% endblock %} {% endblock %}
{% block content_text %} {% block content_text %}
{% endblock %} {% endblock %}
{% block popup %} {% block popup %}
{% include 'client/popups/advertise_member.html' with form=advertising_form %} {% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<!-- todo: вернуть .min--> {% if request.GET.debug == '1' %}
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.exposition.object{% if debug %}{% else %}.min{% endif %}.js"></script>-->
<script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script> <script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.exposition.object.min.js' %}"></script>
{% endif %}
<script> <script>
EXPO.exposition.object.init({ EXPO.exposition.object.init({
visit:{ visit:{

@ -1,12 +1,8 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
{% for result in query %} {% for result in query %}
<li class="cl-item {% if result.object.canceled %}canceled{% endif %}"> <li class="cl-item {% if result.object.canceled %}canceled{% endif %}">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a href="{{ result.object.get_permanent_url }}"> <a href="{{ result.object.get_permanent_url }}">
@ -34,13 +30,10 @@
<div class="cli-title"><a href="{{ result.object.get_permanent_url }}">{{ result.object.name|safe }}</a></div> <div class="cli-title"><a href="{{ result.object.get_permanent_url }}">{{ result.object.name|safe }}</a></div>
</header> </header>
<div class="cli-descr"> <div class="cli-descr">
{{ result.object.main_title|safe }} {{ result.object.main_title|safe }}
</div> </div>
</div> </div>
<div class="cli-bot clearfix"> <div class="cli-bot clearfix">
<div class="cli-date"> <div class="cli-date">
{% with obj=result.object %} {% with obj=result.object %}
{% include 'client/includes/show_date_block.html' %} {% include 'client/includes/show_date_block.html' %}
@ -49,7 +42,6 @@
{% if result.object.country %} {% if result.object.country %}
<div class="cli-place"> <div class="cli-place">
<a href="#">{{ result.object.country }}</a>, <a href="#">{{ result.object.city }}</a>, <a href="#">{{ result.object.country }}</a>, <a href="#">{{ result.object.city }}</a>,
{% if result.object.place %} {% if result.object.place %}
<a href="{{ result.object.place.get_permanent_url }}">{{ result.object.place }}</a> <a href="{{ result.object.place.get_permanent_url }}">{{ result.object.place }}</a>
{% endif %} {% endif %}
@ -57,12 +49,10 @@
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="cli-buttons clearfix"> <div class="cli-buttons clearfix">
<div class="cli-m-buttons"> <div class="cli-m-buttons">
{% include 'client/includes/exposition/services.html' with obj=result.object %} {% include 'client/includes/exposition/services.html' with obj=result.object %}
{% include 'client/includes/calendar_button.html' with obj=result.object %} {% include 'client/includes/calendar_button.html' with obj=result.object %}
<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}"> <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
{% with note=result.object|note_by_user:request.user %} {% with note=result.object|note_by_user:request.user %}
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ result.object.url }}/">{% trans 'заметка' %}</a> <a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ result.object.url }}/">{% trans 'заметка' %}</a>
@ -74,13 +64,11 @@
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
<div class="cli-s-buttons"> <div class="cli-s-buttons">
{% include 'client/buttons/booking_button.html' with object=result.object %} {% include 'client/buttons/booking_button.html' with object=result.object %}
</div> </div>
</div> </div>
</div> </div>
<footer class="clearfix"> <footer class="clearfix">
<div class="cli-stats"> <div class="cli-stats">
{% if result.object.visitors %} {% if result.object.visitors %}
@ -97,9 +85,12 @@
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
{% block scripts %} {% block scripts %}
<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/block.exposition.list{% if debug %}{% else %}.min{% endif %}.js"></script> {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
{% endif %}
<script> <script>
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{ note:{

@ -1,8 +1,6 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% block page_body %} {% block page_body %}
<div class="m-article"> <div class="m-article">
<div class="item-wrap expo-place-page clearfix"> <div class="item-wrap expo-place-page clearfix">
@ -10,9 +8,7 @@
<div class="i-pict"> <div class="i-pict">
{% include 'client/includes/show_logo.html' with obj=place %} {% include 'client/includes/show_logo.html' with obj=place %}
</div> </div>
<!--<div class="i-rating">{{ place.rating }}</div>-->
</aside> </aside>
<div class="i-info"> <div class="i-info">
<div> <div>
<div class="i-title"> <div class="i-title">
@ -33,8 +29,6 @@
</div> </div>
<div class="show-map"><a class="toggle-map" href="#">Раскрыть карту</a></div> <div class="show-map"><a class="toggle-map" href="#">Раскрыть карту</a></div>
</header> </header>
<!--todo: открыть-->
<div class="i-map "> <div class="i-map ">
<div class="close-map"><a class="toggle-map" href="#">Скрыть карту</a></div> <div class="close-map"><a class="toggle-map" href="#">Скрыть карту</a></div>
<!-- позиция для карты задается в атрибуте data-coords --> <!-- позиция для карты задается в атрибуте data-coords -->
@ -47,7 +41,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="i-services"> <div class="i-services">
<div class="sect-title">Услуги</div> <div class="sect-title">Услуги</div>
<div class="is-wrap clearfix"> <div class="is-wrap clearfix">
@ -123,7 +116,6 @@
<div class="eni-area">{{ place.total_area|int_format }} м²</div> <div class="eni-area">{{ place.total_area|int_format }} м²</div>
</div> </div>
{% endif %} {% endif %}
<div class="eni-areas clearfix"> <div class="eni-areas clearfix">
{% if place.closed_area %} {% if place.closed_area %}
<div class="enis-col"> <div class="enis-col">
@ -138,18 +130,15 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="eni-areas clearfix"> <div class="eni-areas clearfix">
<div class="enis-col"> <div class="enis-col">
<ul> <ul>
{% for hall in place.halls.all %} {% for hall in place.halls.all %}
{% if not forloop.counter|divisibleby:"2" %} {% if not forloop.counter|divisibleby:"2" %}
<li>{{ hall.name }} {% if hall.number %} №{{ hall.number }} {% endif %} — {{ hall.capacity }} м<sup>2</sup></sup></li> <li>{{ hall.name }} {% if hall.number %} №{{ hall.number }} {% endif %} — {{ hall.capacity }} м<sup>2</sup></sup></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
<div class="enis-col"> <div class="enis-col">
<ul> <ul>
@ -158,7 +147,6 @@
<li>{{ hall.name }} {% if hall.number %} №{{ hall.number }} {% endif %} — {{ hall.capacity }} м<sup>2</sup></sup></li> <li>{{ hall.name }} {% if hall.number %} №{{ hall.number }} {% endif %} — {{ hall.capacity }} м<sup>2</sup></sup></li>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</div> </div>
@ -166,7 +154,6 @@
<div class="eni-areas stat clearfix"> <div class="eni-areas stat clearfix">
<div class="eni-title"> <div class="eni-title">
{% trans 'Ежегодно проводится' %} {% trans 'Ежегодно проводится' %}
</div> </div>
<div class="enis-col"> <div class="enis-col">
{% if place.total_year_action.isdigit %} {% if place.total_year_action.isdigit %}
@ -183,33 +170,26 @@
<b>{{ place.total_year_action }}</b> <b>{{ place.total_year_action }}</b>
{% endif %} {% endif %}
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if place.foundation_year %} {% if place.foundation_year %}
<div class="eni-areas"> <div class="eni-areas">
<div class="eni-founded">{% trans 'Основано в' %} <b>{{ place.foundation_year }}</b> {% trans 'году' %}</div> <div class="eni-founded">{% trans 'Основано в' %} <b>{{ place.foundation_year }}</b> {% trans 'году' %}</div>
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% if place.get_scheme %} {% if place.get_scheme %}
<hr /> <hr />
<div class="e-pv-container"> <div class="e-pv-container">
<div class="sect-title">{% trans 'Схема павильонов' %}</div> <div class="sect-title">{% trans 'Схема павильонов' %}</div>
{% for scheme in place.get_scheme %} {% for scheme in place.get_scheme %}
{% ifequal scheme.file_path.url|slice:"-3:" 'pdf' %} {% ifequal scheme.file_path.url|slice:"-3:" 'pdf' %}
<a href="{{ scheme.file_path.url }}">{% trans 'Схема в pdf' %}</a> <a href="{{ scheme.file_path.url }}">{% trans 'Схема в pdf' %}</a>
{% else %} {% else %}
<div class="div-img-wrap"><img src="{{ scheme.file_path.url }}" alt="" /></div> <div class="div-img-wrap"><img src="{{ scheme.file_path.url }}" alt="" /></div>
{% endifequal %} {% endifequal %}
<hr/> <hr/>
{% endfor %} {% endfor %}
</div> </div>
{% endif %} {% endif %}
<div class="i-contacts clearfix"> <div class="i-contacts clearfix">
@ -219,7 +199,6 @@
<div class="ic-addr">{{ place.adress }}</div> <div class="ic-addr">{{ place.adress }}</div>
<div class="ic-links"><a target="_blank" href="{{ place.web_page }}">{{ place.web_page }}</a></div> <div class="ic-links"><a target="_blank" href="{{ place.web_page }}">{{ place.web_page }}</a></div>
</div> </div>
<div class="ic-col"> <div class="ic-col">
<ul class="tels"> <ul class="tels">
{% if place.phone %} {% if place.phone %}
@ -230,7 +209,6 @@
{% endif %} {% endif %}
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -251,14 +229,11 @@
{% endwith %} {% endwith %}
</div> </div>
</a> </a>
<div class="cli-info"> <div class="cli-info">
<div class="cli-top clearfix"> <div class="cli-top clearfix">
<header> <header>
<div class="cli-title"><a href="{{ event.get_permanent_url }}">{{ event.name|safe }}</a></div> <div class="cli-title"><a href="{{ event.get_permanent_url }}">{{ event.name|safe }}</a></div>
</header> </header>
<div class="cli-bot clearfix"> <div class="cli-bot clearfix">
<div class="cli-date"> <div class="cli-date">
{% with obj=event %} {% with obj=event %}
@ -271,7 +246,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="cli-buttons clearfix"> <div class="cli-buttons clearfix">
<div class="cli-m-buttons"> <div class="cli-m-buttons">
<div class="cli-services"> <div class="cli-services">
@ -285,32 +259,25 @@
</div> </div>
</div> </div>
<a class="button blue icon-calendar" href="{{ event.get_calendar_url }}">{% trans 'в расписание' %}</a> <a class="button blue icon-calendar" href="{{ event.get_calendar_url }}">{% trans 'в расписание' %}</a>
<a class="button green icon-note" href="#">заметка</a> <a class="button green icon-note" href="#">заметка</a>
</div> </div>
<div class="cli-s-buttons"> <div class="cli-s-buttons">
<a class="button blue2 lc" target="_blank" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ event.city.id }}">{% trans 'Лучшие цены на отели на' %} <i>Booking</i>.com</a> <a class="button blue2 lc" target="_blank" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ event.city.id }}">{% trans 'Лучшие цены на отели на' %} <i>Booking</i>.com</a>
</div> </div>
</div> </div>
</div> </div>
<footer class="clearfix"> <footer class="clearfix">
<div class="cli-stats"> <div class="cli-stats">
{% if event.visitors %}<span class="visitors"> {{ event.visitors }}</span>{% endif %} {% if event.visitors %}<span class="visitors"> {{ event.visitors }}</span>{% endif %}
{% if event.members %}<span class="participants">{{ event.members }}</span>{% endif %} {% if event.members %}<span class="participants">{{ event.members }}</span>{% endif %}
</div> </div>
<div class="cli-tags"> <div class="cli-tags">
{% with obj=event %} {% with obj=event %}
{% include 'client/includes/show_tags.html' %} {% include 'client/includes/show_tags.html' %}
{% endwith %} {% endwith %}
</div> </div>
</footer> </footer>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
@ -318,13 +285,11 @@
<div class="m-article"> <div class="m-article">
{% include 'client/includes/booking_block.html' with city=place.city place=place %} {% include 'client/includes/booking_block.html' with city=place.city place=place %}
</div> </div>
{% if place.get_nearest_places %} {% if place.get_nearest_places %}
<div class="e-cat"> <div class="e-cat">
<div class="sect-title">{% trans 'Ближайшие выставочные центры' %}</div> <div class="sect-title">{% trans 'Ближайшие выставочные центры' %}</div>
<ul class="cat-list cl-places"> <ul class="cat-list cl-places">
{% for pl in place.get_nearest_places %} {% for pl in place.get_nearest_places %}
<li class="cl-item"> <li class="cl-item">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a href="{{ pl.get_permanent_url }}"> <a href="{{ pl.get_permanent_url }}">
@ -332,7 +297,6 @@
{% include 'show_logo.html' with obj=pl %} {% include 'show_logo.html' with obj=pl %}
</div> </div>
</a> </a>
<div class="cli-info"> <div class="cli-info">
<div class="cli-top clearfix"> <div class="cli-top clearfix">
<header> <header>
@ -360,11 +324,13 @@
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
{% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.place.object.js' %}"></script> <script src="{% static 'client/js/_modules/page.place.object.js' %}"></script>
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.place.object{% if debug %}{% else %}.min{% endif %}.js"></script>--> {% else %}
<script src="{% static 'client/js_min/_modules/page.place.object.min.js' %}"></script>
{% endif %}
<script> <script>
EXPO.place.object.init({ EXPO.place.object.init({
article:{ article:{

@ -3,38 +3,13 @@
{% load i18n %} {% load i18n %}
{% load thumbnail %} {% load thumbnail %}
{% load template_filters %} {% load template_filters %}
{% block styles %} {% block styles %}
<style> <style>
.pict-over{width:220px;height:220px;line-height:212px;text-align:center;background:#fff;border-radius:4px;-moz-box-sizing:border-box;box-sizing:border-box;display:block}.pict-over img{max-width:100%;max-height:100%;border-radius:4px;vertical-align:middle}
.pict-over{
width: 220px;
height: 220px;
line-height: 212px;
text-align: center;
background: #ffffff;
border-radius: 4px;
-moz-box-sizing: border-box;
box-sizing: border-box;
display: block;
}
.pict-over img{
max-width: 100%;
max-height: 100%;
border-radius: 4px;
vertical-align: middle;
}
</style> </style>
{% endblock %} {% endblock %}
{% block body_class %} class="main-page" {% endblock %} {% block body_class %} class="main-page" {% endblock %}
{% block top %} {% block top %}
<section class="layout mp-top"> <section class="layout mp-top">
<div class="layout-wrap"> <div class="layout-wrap">
@ -47,11 +22,9 @@
</div> </div>
</section> </section>
{% endblock %} {% endblock %}
{% block search %} {% block search %}
{% include 'includes/catalog_search_main.html' with search_form=search_form %} {% include 'includes/catalog_search_main.html' with search_form=search_form %}
{% endblock %} {% endblock %}
{% block catalog %} {% block catalog %}
<section class="layout mp-catalog"> <section class="layout mp-catalog">
<div class="layout-wrap"> <div class="layout-wrap">
@ -89,7 +62,6 @@
</div> </div>
</section> </section>
{% endblock %} {% endblock %}
{% block announces %} {% block announces %}
<section class="layout mp-announces"> <section class="layout mp-announces">
<div class="layout-wrap"> <div class="layout-wrap">
@ -140,45 +112,41 @@
</div> </div>
</section> </section>
{% endblock %} {% endblock %}
{% block partners %} {% block partners %}
<section class="layout mp-partners"> <section class="layout mp-partners">
<div class="mpp-wrap"> <div class="mpp-wrap">
<header>{% trans 'Наши партнеры:' %}</header> <header>{% trans 'Наши партнеры:' %}</header>
<ul class="mp-partners-list"> <ul class="mp-partners-list">
<li><img src="{% static 'client/img/partners/expocentr.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/deutsche-messe-2.png' %}" /></li>
<li><img src="{% static 'client/img/partners/ite.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/ite.png' %}" /></li>
<li><img src="{% static 'client/img/partners/expoforum.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/nurnberg-messe.png' %}" /></li>
<li><img src="{% static 'client/img/partners/deutsche-messe.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/reed-exhibitions.png' %}" /></li>
<li><img src="{% static 'client/img/partners/messe-frankfurt.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/messe-dusseldorf.png' %}" /></li>
</ul> </ul>
</div> </div>
</section> </section>
{% endblock %} {% endblock %}
{% block services %} {% block services %}
<section class="layout mp-services"> <section class="layout mp-services">
<div class="layout-wrap"> <div class="layout-wrap">
<aside> <aside>
{% include 'client/includes/services.html' %} {% include 'client/includes/services.html' %}
</aside> </aside>
<div class="mcl"> <div class="mcl">
<div class="mp-reviews-wrap clearfix"> <div class="mp-reviews-wrap clearfix">
{% include 'client/includes/index/blogs.html' with blogs=blogs %} {% include 'client/includes/index/blogs.html' with blogs=blogs %}
<div class="sbnr"> <div class="sbnr">
<div class="sbnr-wrap"><a href="#"><img src="{% static 'client/img/_del-temp/bnrs.jpg' %}" alt="" /></a></div> <div class="sbnr-wrap"><a href="#"><img src="{% static 'client/img/_del-temp/bnrs.jpg' %}" alt="" /></a></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.index{% if debug %}{% else %}.min{% endif %}.js"></script> {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.index.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.index.min.js' %}"></script>
{% endif %}
<script> <script>
EXPO.index.init({ EXPO.index.init({
note:{ note:{

@ -212,11 +212,11 @@
<div class="mpp-wrap"> <div class="mpp-wrap">
<header>{% trans 'Наши партнеры:' %}</header> <header>{% trans 'Наши партнеры:' %}</header>
<ul class="mp-partners-list"> <ul class="mp-partners-list">
<li><img src="{% static 'client/img/partners/expocentr.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/deutsche-messe-2.png' %}" /></li>
<li><img src="{% static 'client/img/partners/ite.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/ite.png' %}"/></li>
<li><img src="{% static 'client/img/partners/expoforum.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/nurnberg-messe.png' %}"/></li>
<li><img src="{% static 'client/img/partners/deutsche-messe.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/reed-exhibitions.png' %}"/></li>
<li><img src="{% static 'client/img/partners/messe-frankfurt.png' %}" alt="" /></li> <li><img src="{% static 'client/img/partners/messe-dusseldorf.png' %}"/></li>
</ul> </ul>
</div> </div>
</section> </section>

@ -1,36 +1,28 @@
{% extends 'base_catalog.html' %} {% extends 'base_catalog.html' %}
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% block bread_scrumbs %} {% block bread_scrumbs %}
<div class="bread-crumbs"> <div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a> <a href="/">{% trans 'Главная страница' %}</a>
<strong>{% trans 'Добавить событие' %}</strong> <strong>{% trans 'Добавить событие' %}</strong>
</div> </div>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
<div class="page-title"> <div class="page-title">
<h1>{% trans 'Добавить событие' %}</h1> <h1>{% trans 'Добавить событие' %}</h1>
</div> </div>
{% endblock %} {% endblock %}
{% block page_body %} {% block page_body %}
<div class="page-body clearfix add-event-page"> <div class="page-body clearfix add-event-page">
<div class="set-sect p-form adm-form" id="step-1"> <div class="set-sect p-form adm-form" id="step-1">
<div class="set-sect-title clearfix"> <div class="set-sect-title clearfix">
<h3>{% trans 'Шаг 1. Основная информация' %}</h3> <h3>{% trans 'Шаг 1. Основная информация' %}</h3>
</div> </div>
<div class="form-wrap"> <div class="form-wrap">
<form action="/organiser/add-event/" id="summary-form"> <form action="/organiser/add-event/" id="summary-form">
<hr/> <hr/>
<div class="mf-line afs-type event-type"> <div class="mf-line afs-type event-type">
<label>Тип события:</label> <label>Тип события:</label>
<div class="mf-field"> <div class="mf-field">
<label class="check"><input type="radio" name="nt"/> {% trans 'выставка' %}</label> <label class="check"><input type="radio" name="nt"/> {% trans 'выставка' %}</label>
<label class="check"><input type="radio" name="nt"/> {% trans 'конференция' %}</label> <label class="check"><input type="radio" name="nt"/> {% trans 'конференция' %}</label>
@ -38,15 +30,11 @@
<label class="check"><input type="radio" name="nt"/> {% trans 'вебинар' %}</label> <label class="check"><input type="radio" name="nt"/> {% trans 'вебинар' %}</label>
</div> </div>
</div> </div>
<hr/> <hr/>
<div class="adm-form-body"> <div class="adm-form-body">
<div class="mf-line s-subj-tag"> <div class="mf-line s-subj-tag">
<div class="mf-field"> <div class="mf-field">
<label>{% trans 'Тематика' %}:</label> <label>{% trans 'Тематика' %}:</label>
<div class="c-select-box select" data-placeholder="{% trans 'Выберите тематику' %}"> <div class="c-select-box select" data-placeholder="{% trans 'Выберите тематику' %}">
<div class="csb-selected-items"></div> <div class="csb-selected-items"></div>
<div class="csb-menu-wrap"> <div class="csb-menu-wrap">
@ -61,13 +49,10 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="mf-field"> <div class="mf-field">
<label>{% trans 'Теги' %}:</label> <label>{% trans 'Теги' %}:</label>
<div class="c-select-box select" data-placeholder="{% trans 'Выберете ключевые теги' %}"> <div class="c-select-box select" data-placeholder="{% trans 'Выберете ключевые теги' %}">
<div class="csb-selected-items"></div> <div class="csb-selected-items"></div>
<div class="csb-menu-wrap"> <div class="csb-menu-wrap">
@ -79,39 +64,30 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<hr/> <hr/>
<h2>{% trans 'Описание выставки' %}</h2> <h2>{% trans 'Описание выставки' %}</h2>
<div class="mf-line"> <div class="mf-line">
<div class="mf-field"> <div class="mf-field">
{{ form.name }} {{ form.name }}
</div> </div>
</div> </div>
<div class="mf-line full-width"> <div class="mf-line full-width">
<div class="mf-field"> <div class="mf-field">
{{ form.main_title }} {{ form.main_title }}
</div> </div>
</div> </div>
<div class="mf-line full-width"> <div class="mf-line full-width">
<div class="mf-field"> <div class="mf-field">
<textarea name="description" cols="30" rows="10" <textarea name="description" cols="30" rows="10"
placeholder="{% trans 'Полное описание выставки' %}"></textarea> placeholder="{% trans 'Полное описание выставки' %}"></textarea>
</div> </div>
</div> </div>
<hr/> <hr/>
<div id="dates-range" class="mf-line"> <div id="dates-range" class="mf-line">
<label class="h2">{% trans 'Даты проведения' %}:</label> <label class="h2">{% trans 'Даты проведения' %}:</label>
<div class="mf-field"> <div class="mf-field">
<div class="period date-to-date"> <div class="period date-to-date">
<div class="pwf-field"> <div class="pwf-field">
@ -127,48 +103,35 @@
</div> </div>
</div> </div>
</div> </div>
<hr/> <hr/>
<div class="mfs-location"> <div class="mfs-location">
<h2>{% trans 'Локация' %}</h2> <h2>{% trans 'Локация' %}</h2>
<div class="mf-line"> <div class="mf-line">
<div class="mf-field"> <div class="mf-field">
<input type="text" name="pntitle" placeholder="{% trans 'Место проведения' %}"/> <input type="text" name="pntitle" placeholder="{% trans 'Место проведения' %}"/>
</div> </div>
</div> </div>
<div class="mf-line"> <div class="mf-line">
<div class="mf-field"> <div class="mf-field">
<input type="text" name="pntitle" placeholder="{% trans 'Страна' %}"/> <input type="text" name="pntitle" placeholder="{% trans 'Страна' %}"/>
</div> </div>
<div class="mf-field"> <div class="mf-field">
<input type="text" name="pntitle" placeholder="{% trans 'Город' %}"/> <input type="text" name="pntitle" placeholder="{% trans 'Город' %}"/>
</div> </div>
</div> </div>
</div> </div>
<hr/> <hr/>
<div class="mfs-additional"> <div class="mfs-additional">
<h2>{% trans 'Дополнительная информация' %}</h2> <h2>{% trans 'Дополнительная информация' %}</h2>
<div class="mf-line mf-targets"> <div class="mf-line mf-targets">
<label>{% trans 'Аудитория' %}:</label> <label>{% trans 'Аудитория' %}:</label>
<div class="mf-field"> <div class="mf-field">
<div class="clearfix"> <div class="clearfix">
<div class="mff-col"> <div class="mff-col">
<label class="check"><input type="checkbox" name="c01"/>{% trans 'специалисты'%}</label> <label class="check"><input type="checkbox" name="c01"/>{% trans 'специалисты'%}</label>
<label class="check"><input type="checkbox" name="c02"/>{% trans 'специалисты и потребители' %}</label> <label class="check"><input type="checkbox" name="c02"/>{% trans 'специалисты и потребители' %}</label>
<label class="check"><input type="checkbox" name="c03"/>{% trans 'широкая публика' %}</label> <label class="check"><input type="checkbox" name="c03"/>{% trans 'широкая публика' %}</label>
</div> </div>
<div class="mff-col"> <div class="mff-col">
<select name="period"> <select name="period">
<option value="">{% trans 'Периодичность' %}</option> <option value="">{% trans 'Периодичность' %}</option>
@ -178,41 +141,28 @@
</select> </select>
</div> </div>
</div> </div>
<hr/> <hr/>
</div> </div>
</div> </div>
<div class="mf-line mf-membership"> <div class="mf-line mf-membership">
<label>{% trans 'Членства и знаки качества' %}:</label> <label>{% trans 'Членства и знаки качества' %}:</label>
<div class="mf-field"> <div class="mf-field">
<label class="check"><input type="checkbox" name="c01"/>{% trans 'Российско-Британская торговая палата' %}</label> <label class="check"><input type="checkbox" name="c01"/>{% trans 'Российско-Британская торговая палата' %}</label>
<label class="check"><input type="checkbox" name="c02"/>{% trans 'Ассоциация Европейского Бизнеса' %}</label> <label class="check"><input type="checkbox" name="c02"/>{% trans 'Ассоциация Европейского Бизнеса' %}</label>
<label class="check"><input type="checkbox" name="c03"/>{% trans 'Российский союз выставок и ярмарок' %}</label> <label class="check"><input type="checkbox" name="c03"/>{% trans 'Российский союз выставок и ярмарок' %}</label>
<label class="check"><input type="checkbox" name="c04"/>{% trans 'Американская торговая палата' %}</label> <label class="check"><input type="checkbox" name="c04"/>{% trans 'Американская торговая палата' %}</label>
<label class="check"><input type="checkbox" name="c05"/>{% trans 'UFI' %}</label> <label class="check"><input type="checkbox" name="c05"/>{% trans 'UFI' %}</label>
<hr/> <hr/>
</div> </div>
</div> </div>
<div class="mf-line mf-prod"> <div class="mf-line mf-prod">
<div class="mf-field"> <div class="mf-field">
<input type="text" name="pntitle" placeholder="{% trans 'Веб-сайт (необязательно)' %}"/> <input type="text" name="pntitle" placeholder="{% trans 'Веб-сайт (необязательно)' %}"/>
<textarea name="pnprod" cols="30" rows="10" <textarea name="pnprod" cols="30" rows="10"
placeholder="{% trans 'Экспонируемые продукты' %}"></textarea> placeholder="{% trans 'Экспонируемые продукты' %}"></textarea>
<hr/> <hr/>
</div> </div>
</div> </div>
<div class="mf-line mf-time"> <div class="mf-line mf-time">
<label>{% trans 'Время работы' %}:</label> <label>{% trans 'Время работы' %}:</label>
@ -263,21 +213,15 @@
<option value="13">21:00</option> <option value="13">21:00</option>
</select> </select>
</div> </div>
<label class="check"><input type="checkbox" class="w-time-switcher" name="c05" <label class="check"><input type="checkbox" class="w-time-switcher" name="c05"
checked/>{% trans 'Один график на все дни' %}</label> checked/>{% trans 'Один график на все дни' %}</label>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<hr/> <hr/>
<div class="mf-line mf-logo"> <div class="mf-line mf-logo">
<label class="h2">{% trans 'Логотип' %}:</label> <label class="h2">{% trans 'Логотип' %}:</label>
<div class="mf-field"> <div class="mf-field">
<div class="input-file clearfix"> <div class="input-file clearfix">
<div class="button big icon-clip">{% trans 'выберите файл' %}</div> <div class="button big icon-clip">{% trans 'выберите файл' %}</div>
@ -287,146 +231,74 @@
</div> </div>
</div> </div>
</div> </div>
<hr/> <hr/>
</div> </div>
<div class="a-bot-buttons-line clearfix"> <div class="a-bot-buttons-line clearfix">
<div class="abb-left"> <div class="abb-left">
<a class="button big icon-save" href="#">{% trans 'сохранить как черновик' %}</a> <a class="button big icon-save" href="#">{% trans 'сохранить как черновик' %}</a>
</div> </div>
<div class="abb-right"> <div class="abb-right">
<a class="button big orange a-more" href="#">{% trans 'далее' %}</a> <a class="button big orange a-more" href="#">{% trans 'далее' %}</a>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
<div class="set-sect p-form adm-form " id="step-2"> <div class="set-sect p-form adm-form " id="step-2">
<div class="set-sect-title clearfix"> <div class="set-sect-title clearfix">
<h3>{% trans 'Шаг 2. Добавление фото' %}</h3> <h3>{% trans 'Шаг 2. Добавление фото' %}</h3>
<div class="afh-right"> <div class="afh-right">
<div class="sst-info"><b>+ 1,2 балла</b> к рейтингу</div> <div class="sst-info"><b>+ 1,2 балла</b> к рейтингу</div>
</div> </div>
</div> </div>
<div class="form-wrap"> <div class="form-wrap">
<form action="#" id="add-photo-form"> <form action="#" id="add-photo-form">
<hr> <hr>
<div class="mf-photos-list"> <div class="mf-photos-list">
<div class="mfpl-button-line"> <div class="mfpl-button-line">
<div class="mfpl-button"> <div class="mfpl-button">
<a class="button big icon-camera" href="#">выберите фотографии</a> <a class="button big icon-camera" href="#">выберите фотографии</a>
</div> </div>
<div class="mfpl-text"> <div class="mfpl-text">
<p>более полная информация повышает рейтинг вашего мероприятия и позволяет ранжировать его <p>более полная информация повышает рейтинг вашего мероприятия и позволяет ранжировать его
выше других</p> выше других</p>
</div> </div>
</div> </div>
<!--<div class="i-wait">
<hr />
<img src="img/wait.gif" alt="" /> Подождите, идет загрузка фотографий ...
</div> </div>
<ul>
<li>
<div class="mfpli-pict"><img src="img/_del-temp/phr-1.jpg" alt="" /></div>
<div class="mfpli-body">
<div class="mf-line full-width">
<div class="mf-field">
<textarea name="pdescr" cols="30" rows="10" placeholder="Описание"></textarea>
</div>
</div>
<div class="mf-button-line">
<a class="button red icon-del" href="#">удалить</a>
</div>
</div>
</li>
<li>
<div class="mfpli-pict"><img src="img/_del-temp/phr-2.jpg" alt="" /></div>
<div class="mfpli-body">
<div class="mf-line full-width">
<div class="mf-field">
<textarea name="pdescr" cols="30" rows="10" placeholder="Описание"></textarea>
</div>
</div>
<div class="mf-button-line">
<a class="button red icon-del" href="#">удалить</a>
</div>
</div>
</li>
</ul>-->
</div>
<hr> <hr>
<div class="a-bot-buttons-line clearfix"> <div class="a-bot-buttons-line clearfix">
<div class="abb-left"> <div class="abb-left">
<a class="button big grey a-more" href="#">пропустить этот шаг</a> <a class="button big grey a-more" href="#">пропустить этот шаг</a>
</div> </div>
<div class="abb-right"> <div class="abb-right">
<a class="button big orange a-more" href="#">далее</a> <a class="button big orange a-more" href="#">далее</a>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
<div class="set-sect p-form adm-form "> <div class="set-sect p-form adm-form ">
<div class="set-sect-title clearfix"> <div class="set-sect-title clearfix">
<h3>{% trans 'Шаг 3. Статистика и условия участия тест' %}</h3> <h3>{% trans 'Шаг 3. Статистика и условия участия тест' %}</h3>
<div class="afh-right"> <div class="afh-right">
<div class="sst-info"><b>+ 0,9 баллов</b> к рейтингу</div> <div class="sst-info"><b>+ 0,9 баллов</b> к рейтингу</div>
</div> </div>
</div> </div>
<div class="form-wrap"> <div class="form-wrap">
<form class="af-statistic" id="statistics-form" action="#"> <form class="af-statistic" id="statistics-form" action="#">
<hr> <hr>
<div class="mfs-additional mf-stat"> <div class="mfs-additional mf-stat">
<div class="mf-line mf-prod mf-short-input"> <div class="mf-line mf-prod mf-short-input">
<label>Год основания:</label> <label>Год основания:</label>
<div class="mf-field"> <div class="mf-field">
<input type="text" name="fyear" placeholder=""> <input type="text" name="fyear" placeholder="">
</div> </div>
</div> </div>
<div class="mf-stat-item"> <div class="mf-stat-item">
<hr> <hr>
<div class="mf-line mf-prod"> <div class="mf-line mf-prod">
<label class="h3">Статистика за</label> <label class="h3">Статистика за</label>
<div class="mf-field"> <div class="mf-field">
<div class="mf-year"> <div class="mf-year">
<div class="custom-select"> <div class="custom-select">
<select name="syear01" > <select name="syear01" >
@ -437,13 +309,9 @@
<option value="2013">2013</option> <option value="2013">2013</option>
<option value="2014">2014</option> <option value="2014">2014</option>
</select> </select>
</div> </div>
</div> </div>
<div class="mf-stat-data"> <div class="mf-stat-data">
<div class="sd-visitors"> <div class="sd-visitors">
<input type="text" name="svisitors" placeholder="Колличество посетителей"> <input type="text" name="svisitors" placeholder="Колличество посетителей">
</div> </div>
@ -457,15 +325,11 @@
м² м²
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="mf-line mf-prod mf-stat-countries"> <div class="mf-line mf-prod mf-stat-countries">
<label>Страны:</label> <label>Страны:</label>
<div class="mf-field"> <div class="mf-field">
<div class="c-select-box select"> <div class="c-select-box select">
<div class="csb-selected-items"> <div class="csb-selected-items">
<div class="csb-selected"> <div class="csb-selected">
@ -543,202 +407,137 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="mf-stat-add-button"> <div class="mf-stat-add-button">
<a class="button big icon-add" href="#">добавить данные за другой период</a> <a class="button big icon-add" href="#">добавить данные за другой период</a>
</div> </div>
</div> </div>
<hr> <hr>
<h2>Стоимость посещения и участия</h2> <h2>Стоимость посещения и участия</h2>
<div class="e-price-wrap"> <div class="e-price-wrap">
<div class="epr-layout"> <div class="epr-layout">
<div class="eprl-col"> <div class="eprl-col">
<div class="eprl-col-wrap"> <div class="eprl-col-wrap">
<div class="epr-subtitle">Стоимость билетов</div> <div class="epr-subtitle">Стоимость билетов</div>
<div class="tp-wrap"> <div class="tp-wrap">
<ul class="pr-list"> <ul class="pr-list">
<li> <li>
<input type="text" name="oneDay1" placeholder="на один день"> <input type="text" name="oneDay1" placeholder="на один день">
<div class="custom-select"> <div class="custom-select">
<select name="oneDayCurrency1" > <select name="oneDayCurrency1" >
<option value="1">руб</option> <option value="1">руб</option>
<option value="2">usd</option> <option value="2">usd</option>
<option value="3">eur</option> <option value="3">eur</option>
</select> </select>
</div> </div>
</li> </li>
<li> <li>
<input type="text" name="allDays1" placeholder="на все дни"> <input type="text" name="allDays1" placeholder="на все дни">
<div class="custom-select"> <div class="custom-select">
<select name="allDaysCurrency1" > <select name="allDaysCurrency1" >
<option value="1">руб</option> <option value="1">руб</option>
<option value="2">usd</option> <option value="2">usd</option>
<option value="3">eur</option> <option value="3">eur</option>
</select> </select>
</div> </div>
</li> </li>
</ul> </ul>
<div class="tp-descr">Предварительная регистрация</div> <div class="tp-descr">Предварительная регистрация</div>
</div> </div>
<hr> <hr>
<div class="tp-wrap"> <div class="tp-wrap">
<ul class="pr-list"> <ul class="pr-list">
<li> <li>
<input type="text" name="oneDay2" placeholder="на один день"> <input type="text" name="oneDay2" placeholder="на один день">
<div class="custom-select"> <div class="custom-select">
<select name="oneDayCurrency2"> <select name="oneDayCurrency2">
<option value="1">руб</option> <option value="1">руб</option>
<option value="2">usd</option> <option value="2">usd</option>
<option value="3">eur</option> <option value="3">eur</option>
</select> </select>
</div> </div>
</li> </li>
<li> <li>
<input type="text" name="allDays2" placeholder="на все дни"> <input type="text" name="allDays2" placeholder="на все дни">
<div class="custom-select"> <div class="custom-select">
<select name="allDaysCurrency2" > <select name="allDaysCurrency2" >
<option value="1">руб</option> <option value="1">руб</option>
<option value="2">usd</option> <option value="2">usd</option>
<option value="3">eur</option> <option value="3">eur</option>
</select> </select>
</div> </div>
</li> </li>
</ul> </ul>
<div class="tp-descr grey">Регистрация на&nbsp;стойке</div> <div class="tp-descr grey">Регистрация на&nbsp;стойке</div>
</div> </div>
</div> </div>
</div> </div>
<div class="eprl-col"> <div class="eprl-col">
<div class="eprl-col-wrap"> <div class="eprl-col-wrap">
<div class="epr-subtitle">Стоимость аренды 1м²</div> <div class="epr-subtitle">Стоимость аренды 1м²</div>
<ul class="pr-list"> <ul class="pr-list">
<li> <li>
<input type="text" name="area1" placeholder="оборудованная площадь"> <input type="text" name="area1" placeholder="оборудованная площадь">
<div class="custom-select"> <div class="custom-select">
<select name="areaCurrency1"> <select name="areaCurrency1">
<option value="1">руб</option> <option value="1">руб</option>
<option value="2">usd</option> <option value="2">usd</option>
<option value="3">eur</option> <option value="3">eur</option>
</select> </select>
</div> </div>
</li> </li>
<li> <li>
<input type="text" name="area2" placeholder="необорудованная площадь"> <input type="text" name="area2" placeholder="необорудованная площадь">
<div class="custom-select"> <div class="custom-select">
<select name="areaCurrency2"> <select name="areaCurrency2">
<option value="1">руб</option> <option value="1">руб</option>
<option value="2">usd</option> <option value="2">usd</option>
<option value="3">eur</option> <option value="3">eur</option>
</select> </select>
</div> </div>
</li> </li>
<li> <li>
<input type="text" name="area3" placeholder="открытая площадь"> <input type="text" name="area3" placeholder="открытая площадь">
<div class="custom-select"> <div class="custom-select">
<select name="areaCurrency3"> <select name="areaCurrency3">
<option value="1">руб</option> <option value="1">руб</option>
<option value="2">usd</option> <option value="2">usd</option>
<option value="3">eur</option> <option value="3">eur</option>
</select> </select>
</div> </div>
</li> </li>
</ul> </ul>
<hr> <hr>
<div class="mf-line mf-min-area"> <div class="mf-line mf-min-area">
<label>Минимальная площадь:</label> <label>Минимальная площадь:</label>
<div class="mf-field"> <div class="mf-field">
<input type="text" name="fyear" placeholder=""> <input type="text" name="fyear" placeholder="">
м² м²
</div> </div>
</div> </div>
<hr> <hr>
<div class="mf-line mf-reg-payment"> <div class="mf-line mf-reg-payment">
<label>Регистрационный взнос:</label> <label>Регистрационный взнос:</label>
<div class="mf-field"> <div class="mf-field">
<input type="text" name="area3" placeholder=""> <input type="text" name="area3" placeholder="">
<div class="custom-select"> <div class="custom-select">
<select name="areaCurrency3" > <select name="areaCurrency3" >
<option value="1">руб</option> <option value="1">руб</option>
<option value="2">usd</option> <option value="2">usd</option>
<option value="3">eur</option> <option value="3">eur</option>
</select> </select>
</div> </div>
</div> </div>
</div> </div>
<hr> <hr>
<div class="mf-line mf-deadline"> <div class="mf-line mf-deadline">
<label>Крайний срок подачи заявки:</label> <label>Крайний срок подачи заявки:</label>
<div class="mf-field"> <div class="mf-field">
<div class="period"> <div class="period">
<div class="pwf-field"> <div class="pwf-field">
<!-- todo: поправить верстку чтобы работал календарь-->
<input type="text" class="date dateFromLast hasDatepicker" name="dateFrom" <input type="text" class="date dateFromLast hasDatepicker" name="dateFrom"
placeholder="дд.мм.гггг" id="dp1422281596212"> placeholder="дд.мм.гггг" id="dp1422281596212">
<button type="button" class="ui-datepicker-trigger">...</button> <button type="button" class="ui-datepicker-trigger">...</button>
@ -746,43 +545,35 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<hr> <hr>
<div class="a-bot-buttons-line clearfix"> <div class="a-bot-buttons-line clearfix">
<div class="abb-left"> <div class="abb-left">
<div class="mfpl-button-line"> <div class="mfpl-button-line">
<div class="mfpl-button"> <div class="mfpl-button">
<a class="button big grey a-more" href="#">пропустить этот шаг</a> <a class="button big grey a-more" href="#">пропустить этот шаг</a>
</div> </div>
<div class="mfpl-text"> <div class="mfpl-text">
<p>более полная информация повышает рейтинг вашего мероприятия и позволяет ранжировать <p>более полная информация повышает рейтинг вашего мероприятия и позволяет ранжировать
его выше других</p> его выше других</p>
</div> </div>
</div> </div>
</div> </div>
<div class="abb-right"> <div class="abb-right">
<a class="button big orange a-more" href="#">далее</a> <a class="button big orange a-more" href="#">далее</a>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
{% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.organizer.add.js' %}"></script> <script src="{% static 'client/js/_modules/page.organizer.add.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.organizer.add.min.js' %}"></script>
{% endif %}
<script> <script>
EXPO.organizer.add.init({ EXPO.organizer.add.init({
steps: [ steps: [

@ -2,10 +2,8 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% block page_body %} {% block page_body %}
<div class="m-article cl-photos"> <div class="m-article cl-photos">
<div class="cl-item"> <div class="cl-item">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<div class="cli-pict"> <div class="cli-pict">
@ -36,14 +34,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="cli-photo-text"> <div class="cli-photo-text">
{{ object.description|safe }} {{ object.description|safe }}
</div> </div>
<div id="cli-pg" class="cli-photo-gallery"> <div id="cli-pg" class="cli-photo-gallery">
<ul class="clearfix"> <ul class="clearfix">
{% for photo in object_list %} {% for photo in object_list %}
<li> <li>
<a class="open-photo" href="#" > <a class="open-photo" href="#" >
@ -52,27 +47,25 @@
</a> </a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
</div> </div>
{% block paginator %} {% block paginator %}
{% with page_obj=page_obj queries=queries %} {% with page_obj=page_obj queries=queries %}
{% include 'includes/paginator.html' %} {% include 'includes/paginator.html' %}
{% endwith %} {% endwith %}
{% endblock %} {% endblock %}
{% endblock %} {% endblock %}
{% block photogallery %} {% block photogallery %}
{% include 'client/popups/photo.html' %} {% include 'client/popups/photo.html' %}
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.place.photo{% if debug %}{% else %}.min{% endif %}.js"></script> {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.place.photo.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.place.photo.min.js' %}"></script>
{% endif %}
<script> <script>
//js module initialization
EXPO.placePhoto.init({ EXPO.placePhoto.init({
ajaxUrl:'http://hit.expomap.ru/gallery/show/photo/', ajaxUrl:'http://hit.expomap.ru/gallery/show/photo/',
galleryContainerId:'cli-pg', galleryContainerId:'cli-pg',

@ -3,33 +3,11 @@
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% load thumbnail %} {% load thumbnail %}
{% block styles %} {% block styles %}
<style> <style>
.pict-over{width:100px;height:100px;line-height:96px;text-align:center;background:#fff;border-radius:4px;-moz-box-sizing:border-box;box-sizing:border-box;display:block}.pict-over img{max-width:100%;max-height:100%;border-radius:4px;vertical-align:middle}
.pict-over{
width: 100px;
height: 100px;
line-height: 96px;
text-align: center;
background: #ffffff;
border-radius: 4px;
-moz-box-sizing: border-box;
box-sizing: border-box;
display: block;
}
.pict-over img{
max-width: 100%;
max-height: 100%;
border-radius: 4px;
vertical-align: middle;
}
</style> </style>
{% endblock %} {% endblock %}
{% block bread_scrumbs %} {% block bread_scrumbs %}
<div class="bread-crumbs"> <div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a> <a href="/">{% trans 'Главная страница' %}</a>
@ -41,14 +19,10 @@
<h1>{% trans 'Уважаемые клиенты, партнеры<br>и пользователи Expomap.Ru!' %}</h1> <h1>{% trans 'Уважаемые клиенты, партнеры<br>и пользователи Expomap.Ru!' %}</h1>
</div> </div>
{% endblock %} {% endblock %}
{% block page_body %} {% block page_body %}
<div class="page-body clearfix request-form rq-translator"> <div class="page-body clearfix request-form rq-translator">
<div class="m-article about-page"> <div class="m-article about-page">
<div class="tabs-opening" id="tabs-opening"> <div class="tabs-opening" id="tabs-opening">
<div id="team-opening" class="tab team_about_block_text"> <div id="team-opening" class="tab team_about_block_text">
{% blocktrans %} {% blocktrans %}
Мы сформировали <b>штат консультантов</b>, который с огромным удовольствием делится своим опытом с Вами. Клиент, его настроение и Мы сформировали <b>штат консультантов</b>, который с огромным удовольствием делится своим опытом с Вами. Клиент, его настроение и
@ -56,22 +30,16 @@
совершенствовать свой сервис! совершенствовать свой сервис!
{% endblocktrans %} {% endblocktrans %}
</div> </div>
<div id="partners-opening" class="tab parnters_about_block_text {% if request|is_current_page:'/partners/' %}active{% endif %}"> <div id="partners-opening" class="tab parnters_about_block_text {% if request|is_current_page:'/partners/' %}active{% endif %}">
{% trans 'Мы сотрудничаем <b>с более чем 500 организаторами</b> деловых событий в России и за рубежом. Также в нашу партнерскую сеть входят ведущие тематические порталы Рунета, а также туроператоры, турагентства и рекламные агентства.' %} {% trans 'Мы сотрудничаем <b>с более чем 500 организаторами</b> деловых событий в России и за рубежом. Также в нашу партнерскую сеть входят ведущие тематические порталы Рунета, а также туроператоры, турагентства и рекламные агентства.' %}
</div> </div>
<div id="contacts-opening" class="tab contacts_about_block_text {% if request|is_current_page:'/contacts/' %}active{% endif %}"> <div id="contacts-opening" class="tab contacts_about_block_text {% if request|is_current_page:'/contacts/' %}active{% endif %}">
{% trans 'Мы всегда рады любым Вашим мнениям и пожеланиям - ведь то, что наша работа востребована - лучшая похвала для нас и отличная мотивация для того, чтобы стать еще удобнее, полезнее и эффективнее!' %} {% trans 'Мы всегда рады любым Вашим мнениям и пожеланиям - ведь то, что наша работа востребована - лучшая похвала для нас и отличная мотивация для того, чтобы стать еще удобнее, полезнее и эффективнее!' %}
</div> </div>
<div id="review-opening" class="tab review_about_block_text"> <div id="review-opening" class="tab review_about_block_text">
{% trans 'За почти 5 лет работы мы зарекомендовали себя как надежный партнер и проводник в мире международных деловых событий. В нашей распределенной команде специалисты различной квалификации: аналитики, переводчики, стендисты, хостесс, промоутеры, которые работают по всему миру для наших клиентов.' %} {% trans 'За почти 5 лет работы мы зарекомендовали себя как надежный партнер и проводник в мире международных деловых событий. В нашей распределенной команде специалисты различной квалификации: аналитики, переводчики, стендисты, хостесс, промоутеры, которые работают по всему миру для наших клиентов.' %}
</div> </div>
</div> </div>
<ul class="about_block_menu " id="tabs-list"> <ul class="about_block_menu " id="tabs-list">
<li class="{% if request|is_current_page:'/about/' %}active{% endif %}"><a href="#about" title="">{% trans 'О нас' %}</a></li> <li class="{% if request|is_current_page:'/about/' %}active{% endif %}"><a href="#about" title="">{% trans 'О нас' %}</a></li>
<li><a href="#team" title="">{% trans 'Команда' %}</a></li> <li><a href="#team" title="">{% trans 'Команда' %}</a></li>
@ -81,7 +49,6 @@
</ul> </ul>
<div class="clear"></div> <div class="clear"></div>
<div class="tabs-body" id="tabs" > <div class="tabs-body" id="tabs" >
<div id="about" class="tab {% if request|is_current_page:'/about/' %}active{% endif %} about_block"> <div id="about" class="tab {% if request|is_current_page:'/about/' %}active{% endif %} about_block">
<img src="{% static 'client/img/about_pic.png' %}" class="about_pic" width="200" height="200" alt=""> <img src="{% static 'client/img/about_pic.png' %}" class="about_pic" width="200" height="200" alt="">
<h2>{% trans 'Чем мы можем быть вам полезны?' %}</h2> <h2>{% trans 'Чем мы можем быть вам полезны?' %}</h2>
@ -110,9 +77,7 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>
<div id="team" class="tab team_about_block" > <div id="team" class="tab team_about_block" >
<ul class="team_list"> <ul class="team_list">
<li> <li>
<div class="team_list_bg"> <div class="team_list_bg">
@ -143,14 +108,10 @@
</li> </li>
<li class="delimiter"></li> <li class="delimiter"></li>
</ul> </ul>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="partners" class="tab parnters_about_block {% if request|is_current_page:'/partners/' %}active{% endif %}"> <div id="partners" class="tab parnters_about_block {% if request|is_current_page:'/partners/' %}active{% endif %}">
<table class="parnters_about_block_table"> <table class="parnters_about_block_table">
<tr> <tr>
<td> <td>
@ -248,9 +209,7 @@
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<div id="contacts" class="tab contacts_about_block {% if request|is_current_page:'/contacts/' %}active{% endif %}"> <div id="contacts" class="tab contacts_about_block {% if request|is_current_page:'/contacts/' %}active{% endif %}">
<div class="contacts_top_block"> <div class="contacts_top_block">
<div class="contacts_top_block_left"> <div class="contacts_top_block_left">
@ -285,7 +244,6 @@
</div> </div>
<div class="contacts_bottom"> <div class="contacts_bottom">
<ul class="soc-media-buttons"> <ul class="soc-media-buttons">
<!--<li><a href="#"><img src="{% static 'client/img/soc-medias/sm-icon-rss.png' %}" title="RSS" alt="RSS" /></a></li>-->
<li><a href="https://www.facebook.com/Expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png' %}" title="Facebook" alt="Facebook" /></a></li> <li><a href="https://www.facebook.com/Expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png' %}" title="Facebook" alt="Facebook" /></a></li>
<li><a href="http://www.linkedin.com/company/expomap-ru" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png' %}" title="LinkedIn" alt="LinkedIn" /></a></li> <li><a href="http://www.linkedin.com/company/expomap-ru" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png' %}" title="LinkedIn" alt="LinkedIn" /></a></li>
<li><a href="http://vk.com/expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png' %}" title="В контакте" alt="В контакте" /></a></li> <li><a href="http://vk.com/expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png' %}" title="В контакте" alt="В контакте" /></a></li>
@ -294,15 +252,11 @@
</ul> </ul>
<h3>{% trans 'Бэк-офис: <span>Россия, 394019, Воронеж, ул. Холмистая, 56-Б, бизнес-центр "Корвет", оф. 212 </span>' %}</h3> <h3>{% trans 'Бэк-офис: <span>Россия, 394019, Воронеж, ул. Холмистая, 56-Б, бизнес-центр "Корвет", оф. 212 </span>' %}</h3>
</div> </div>
</div> </div>
<div id="review" class="tab review_about_block"> <div id="review" class="tab review_about_block">
<ul class="review_list"> <ul class="review_list">
<li> <li>
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_1" <a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_1"
class="link-encode" class="link-encode"
data-url="{{ 'http://vezdevoz.ru'|base64_encode }}"> data-url="{{ 'http://vezdevoz.ru'|base64_encode }}">
@ -316,19 +270,15 @@
data-url="{{ 'http://vezdevoz.ru'|base64_encode }}">Vezdevoz</a></div> data-url="{{ 'http://vezdevoz.ru'|base64_encode }}">Vezdevoz</a></div>
</header> </header>
</div> </div>
<div class="sc-name">Волкова Елизавета </div> <div class="sc-name">Волкова Елизавета </div>
<div class="sc-text"> <div class="sc-text">
Хочу поблагодарить команду маркетологов Expomap за организацию нашего участия в выставке ТрансРоссия. Для нас это было чем-то новым, и благодаря опыту ребят мы избежали большого количества проблем и решали все возникающие вопросы очень оперативно. Если говорить о результатах работы на выставке, то мы собрали за 4 дня более 300 рабочих контактов и запросов, часть из которых выглядят очень перспективно. Мы сделали это вместе с Expomap и хотим сказать спасибо за их идеи, глубокое погружение в наши задачи, креативный подход и четкую помощь в реализации! Будем рады работать с вами и в других проектах! Хочу поблагодарить команду маркетологов Expomap за организацию нашего участия в выставке ТрансРоссия. Для нас это было чем-то новым, и благодаря опыту ребят мы избежали большого количества проблем и решали все возникающие вопросы очень оперативно. Если говорить о результатах работы на выставке, то мы собрали за 4 дня более 300 рабочих контактов и запросов, часть из которых выглядят очень перспективно. Мы сделали это вместе с Expomap и хотим сказать спасибо за их идеи, глубокое погружение в наши задачи, креативный подход и четкую помощь в реализации! Будем рады работать с вами и в других проектах!
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_2" <a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_2"
class="link-encode" class="link-encode"
data-url="{{ 'http://profotos.ru'|base64_encode }}"> data-url="{{ 'http://profotos.ru'|base64_encode }}">
@ -342,20 +292,15 @@
data-url="{{ 'http://profotos.ru'|base64_encode }}">PROPHOTOS</a></div> data-url="{{ 'http://profotos.ru'|base64_encode }}">PROPHOTOS</a></div>
</header> </header>
</div> </div>
<div class="sc-name">Акулова Ольга</div> <div class="sc-name">Акулова Ольга</div>
<div class="sc-text"> <div class="sc-text">
Остались очень довольны заочным посещением выставки Photokina — поехать сами не смогли, но получили визитки нужных компаний. Большое cпасибо сотрудникам за оперативность работы! Остались очень довольны заочным посещением выставки Photokina — поехать сами не смогли, но получили визитки нужных компаний. Большое cпасибо сотрудникам за оперативность работы!
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_3" <a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_3"
class="link-encode" class="link-encode"
data-url="{{ 'http://www.vector-auto.ru/'|base64_encode }}"> data-url="{{ 'http://www.vector-auto.ru/'|base64_encode }}">
@ -369,19 +314,15 @@
data-url="{{ 'http://www.vector-auto.ru/'|base64_encode }}">Вектор-Авто</a></div> data-url="{{ 'http://www.vector-auto.ru/'|base64_encode }}">Вектор-Авто</a></div>
</header> </header>
</div> </div>
<div class="sc-name">Денис Хома</div> <div class="sc-name">Денис Хома</div>
<div class="sc-text"> <div class="sc-text">
Мне понравилось работать с вашей компанией и в частности с Евгенией Булавиной. Все быстро и предельно понятно. Большое спасибо!» Мне понравилось работать с вашей компанией и в частности с Евгенией Булавиной. Все быстро и предельно понятно. Большое спасибо!»
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_4" <a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_4"
class="link-encode" class="link-encode"
data-url="{{ 'http://www.unix-medical.ru/'|base64_encode }}"> data-url="{{ 'http://www.unix-medical.ru/'|base64_encode }}">
@ -395,20 +336,16 @@
data-url="{{ 'http://www.unix-medical.ru/'|base64_encode }}">Медицинская компания ЮНИКС</a></div> data-url="{{ 'http://www.unix-medical.ru/'|base64_encode }}">Медицинская компания ЮНИКС</a></div>
</header> </header>
</div> </div>
<div class="sc-name">Марино Шихова</div> <div class="sc-name">Марино Шихова</div>
<div class="sc-text"> <div class="sc-text">
Мы, медицинская компания ЮНИКС, уже несколько лет обращаемся в компанию Expomap за услугами переводчиков и переводчиков-гидов по всему миру. Сотрудники компании всегда оперативно реагируют на запросы, очень доброжелательны и приветливы, готовы идти навстречу. Качество работы предоставляемых переводчиков всегда очень высокое, никаких нареканий по их работе от наших сотрудников и клиентов не поступало, только положительные отзывы. Надеемся на такое же приятное сотрудничество и в будущем! Мы, медицинская компания ЮНИКС, уже несколько лет обращаемся в компанию Expomap за услугами переводчиков и переводчиков-гидов по всему миру. Сотрудники компании всегда оперативно реагируют на запросы, очень доброжелательны и приветливы, готовы идти навстречу. Качество работы предоставляемых переводчиков всегда очень высокое, никаких нареканий по их работе от наших сотрудников и клиентов не поступало, только положительные отзывы. Надеемся на такое же приятное сотрудничество и в будущем!
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<div class="cl-item"> <div class="cl-item">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_5" <a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_5"
class="link-encode" class="link-encode"
data-url="{{ 'http://www.sailfirst.com/ru/'|base64_encode }}"> data-url="{{ 'http://www.sailfirst.com/ru/'|base64_encode }}">
@ -423,22 +360,17 @@
MKM Sailing Center Ltd</a></div> MKM Sailing Center Ltd</a></div>
</header> </header>
</div> </div>
<div class="sc-name">Anatolios Spyrlidis</div> <div class="sc-name">Anatolios Spyrlidis</div>
<div class="sc-text"> <div class="sc-text">
Мы принимали участие со своим стендом в выставке Boot Duesseldorf в Германии в январе 2014. Выражаем благодарность сотрудникам Expomap, а также персональному консультанту Руслану Шапилову за оперативность, мы остались довольны качеством оказанных услуг! Мы принимали участие со своим стендом в выставке Boot Duesseldorf в Германии в январе 2014. Выражаем благодарность сотрудникам Expomap, а также персональному консультанту Руслану Шапилову за оперативность, мы остались довольны качеством оказанных услуг!
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<div class="cl-item"> <div class="cl-item">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_6" <a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_6"
class="link-encode" class="link-encode"
data-url="{{ 'http://www.antolog.com/'|base64_encode }}"> data-url="{{ 'http://www.antolog.com/'|base64_encode }}">
@ -458,17 +390,14 @@
<div class="sc-text"> <div class="sc-text">
Особой оценки достойна оперативность предоставления услуг и их качество. Хочу отметить профессионализм, организованность, добросовестность, вежливость, грамотность сотрудников компании! Особой оценки достойна оперативность предоставления услуг и их качество. Хочу отметить профессионализм, организованность, добросовестность, вежливость, грамотность сотрудников компании!
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<div class="cl-item"> <div class="cl-item">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_7" <a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_7"
class="link-encode" class="link-encode"
data-url="{{ 'http://www.rs-balance.ru/'|base64_encode }}"> data-url="{{ 'http://www.rs-balance.ru/'|base64_encode }}">
@ -483,22 +412,17 @@
RS-Balance</a></div> RS-Balance</a></div>
</header> </header>
</div> </div>
<div class="sc-name">Ангелина Плещеева</div> <div class="sc-name">Ангелина Плещеева</div>
<div class="sc-text"> <div class="sc-text">
Спасибо Вам за Вашу работу. Все быстро и четко. Спасибо Вам за Вашу работу. Все быстро и четко.
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</li> </li>
<li> <li>
<div class="cl-item"> <div class="cl-item">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
<a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_8" <a target="_blank" href="#" data-type="href" data-hash="user_comment_logo_8"
class="link-encode" class="link-encode"
data-url="{{ 'http://www.tek-pack.ru/'|base64_encode }}"> data-url="{{ 'http://www.tek-pack.ru/'|base64_encode }}">
@ -513,30 +437,24 @@
Revival RMC (РИВ-ПАК)</a></div> Revival RMC (РИВ-ПАК)</a></div>
</header> </header>
</div> </div>
<div class="sc-name">Калинина Светлана</div> <div class="sc-name">Калинина Светлана</div>
<div class="sc-text"> <div class="sc-text">
Очень нравится с Вами сотрудничать, так как всегда есть отклик на наши требования. Разочарований не было. Спасибо за отличную работу! Очень нравится с Вами сотрудничать, так как всегда есть отклик на наши требования. Разочарований не было. Спасибо за отличную работу!
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--todo: вернуть min версию--> {% if request.GET.debug == '1' %}
<!--<script src="{% static 'client/js' %}{% if debug %}/{% else %}_min/{% endif %}_modules/page.about{% if debug %}{% else %}.min{% endif %}.js"></script>-->
<script src="{% static 'client/js/_modules/page.about.js' %}"></script> <script src="{% static 'client/js/_modules/page.about.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.about.min.js' %}"></script>
{% endif %}
<script> <script>
EXPO.about.init({ EXPO.about.init({
tabs:{ tabs:{
@ -546,7 +464,6 @@
activeClass:'active', activeClass:'active',
postfix:'-opening', postfix:'-opening',
tabsOpeningId:'tabs-opening' tabsOpeningId:'tabs-opening'
} }
}); });
</script> </script>

@ -11143,7 +11143,7 @@ hr + .rq-note {
} }
.mp-partners .mpp-wrap li { .mp-partners .mpp-wrap li {
margin-left: 40px; margin-left: 60px;
} }
} }
@ -13606,3 +13606,27 @@ hr + .rq-note {
.address-wrap .map-toggle .fa{ .address-wrap .map-toggle .fa{
font-size: 1.3em; font-size: 1.3em;
} }
/******************\
# страница выставки (оплаченная)
\******************/
.paid-partner-link{
text-transform: uppercase;
padding: 15px;
text-align: center;
display: block;
font-weight: 700;
}
.paid-partner-block .desc{
color: #ff6600;
text-align: center;
margin-top: 6px;
}
.paid-partner-block .partner-title{
margin-bottom: 4px;
font-weight: bold;
}
.paid-partner-block{
margin-top: 2em;
}

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

@ -12,8 +12,6 @@ if (EXPO.events.feed) {
//dependence's //dependence's
var com = EXPO.common; var com = EXPO.common;
//private //private
//todo: кнопки Искать в мобальных окнах сделать "ПРименить" и инициировать фильтрацию
//todo: сделать после загрузки восстановление ранее выбранных параметров
var Filter = function (opt) { var Filter = function (opt) {
this.opt = opt; this.opt = opt;
this.DOMbody = document.getElementById(opt.bodyId); this.DOMbody = document.getElementById(opt.bodyId);

@ -609,7 +609,6 @@ if (EXPO.profile){
self.forms[formName].noImageSrc = self.opt.noImageSrc; self.forms[formName].noImageSrc = self.opt.noImageSrc;
} }
// todo:временно отключил
//self.forms[formName].refreshHTML(); //self.forms[formName].refreshHTML();
// submit events handler // submit events handler

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var t=(EXPO.common,{});return t.opt={},$(function(){$("#btn_delete").on("click",function(t){t.preventDefault();var e=$("input[name=expo]:checkbox:checked").map(function(){return $(this).val()}).get(),s=$("input[name=conf]:checkbox:checked").map(function(){return $(this).val()}).get(),o=$("input[name=seminar]:checkbox:checked").map(function(){return $(this).val()}).get(),l=$("input[name=webinar]:checkbox:checked").map(function(){return $(this).val()}).get(),n={expo:JSON.stringify(e),conf:JSON.stringify(s),seminar:JSON.stringify(o),webinar:JSON.stringify(l)};$.get("/profile/calendar/remove/",n,function(t){t.success&&location.reload()})})}),t.init=function(t){$.extend(this.opt,t);var e=this,s=$("#"+this.opt.scrollBoxId),o=$("#"+this.opt.calenadrId),l=(o.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),n=$("#"+this.opt.scrollRightId),c=$("."+this.opt.noEventsClass),i=$("."+this.opt.calendarToggleClass),r=this.opt.cellWidth*this.opt.cellsToScroll,a=function(){var t,s,o=0,l=0,n=e.opt.cellWidth,c=$("#"+e.opt.calenadrId),i=c.find("."+e.opt.daysClass+" td."+e.opt.currentDayClass).index(),r=e.opt.cellsToScroll,a=c.find("."+e.opt.daysClass+" td").length;return i>0?(i++,t=a/r,s=a/i,l=t-Math.floor(s),e.currentDay=i,l?(l--,o=r*l*n):o=0):(e.currentDay=0,o=0),o};this.$leftScroll=l,this.$rightScroll=n,this.currentOffset=a(),this.scrollStep=r,this.$scrollBox=s,this.$messages=[],this.stepWidth=e.opt.cellsToScroll*e.opt.cellWidth,$(function(){c.each(function(){$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>e.stepWidth&&e.$messages.push($(".message",$(this)).width(e.stepWidth).css({marginLeft:e.currentOffset+"px"})):$(this).find("."+e.opt.eventWrapClass).addClass("small")}),$("."+e.opt.eventsClass+":even").addClass("grey")}),$(window).load(function(){e.calendarWidth=e.opt.cellWidth*o.find("."+e.opt.daysClass+" td").length,s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+e.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1},callbacks:{onScroll:function(){e.$leftScroll.off("click").one("click",function(){e.scrollLeft(e)}),e.$rightScroll.off("click").one("click",function(){e.scrollRight(e)})}}}),l.one("click",function(){e.scrollLeft(e)}),n.one("click",function(){e.scrollRight(e)})}),i.on("click",function(){var t=$(this),e=t.closest(".ep-sect"),s=e.children("div.ep-sect-body");return e.hasClass("eps-opened")?(n.hide(),l.hide(),s.stop().animate({opacity:0},300,function(){e.removeClass("eps-opened")})):(n.show(),l.show(),s.stop().animate({opacity:1},300,function(){e.addClass("eps-opened")})),!1})},t.scrollRight=function(t){return t||(t=this),t.currentOffset+t.stepWidth<t.calendarWidth&&(t.currentOffset+=t.scrollStep,console.log("!!! right scroll fired!"),t.$scrollBox.mCustomScrollbar("scrollTo","-="+t.scrollStep),t.offsetMessages()),!1},t.scrollLeft=function(t){return t||(t=this),t.currentOffset>=t.stepWidth&&(t.currentOffset-=t.scrollStep,console.log("!!! left scroll fired!"),t.$scrollBox.mCustomScrollbar("scrollTo","+="+t.scrollStep),t.offsetMessages(t)),!1},t.offsetMessages=function(t){t||(t=this);for(var e=0;e<t.$messages.length;e++){var s=t.$messages[e].parent().width(),o=parseInt(t.$messages[e].parent().offset().left,10);o?o-=312:o+=312,s>t.stepWidth&&0>o&&t.$messages[e].css({marginLeft:Math.abs(o+t.stepWidth)+"px"})}},t}(); var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var t=(EXPO.common,{});return t.opt={},$(function(){$("#btn_delete").on("click",function(t){t.preventDefault();var e=$("input[name=expo]:checkbox:checked").map(function(){return $(this).val()}).get(),s=$("input[name=conf]:checkbox:checked").map(function(){return $(this).val()}).get(),o=$("input[name=seminar]:checkbox:checked").map(function(){return $(this).val()}).get(),l=$("input[name=webinar]:checkbox:checked").map(function(){return $(this).val()}).get(),n={expo:JSON.stringify(e),conf:JSON.stringify(s),seminar:JSON.stringify(o),webinar:JSON.stringify(l)};$.get("/profile/calendar/remove/",n,function(t){t.success&&location.reload()})})}),t.init=function(t){$.extend(this.opt,t);var e=this,s=$("#"+this.opt.scrollBoxId),o=$("#"+this.opt.calenadrId),l=(o.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),n=$("#"+this.opt.scrollRightId),c=$("."+this.opt.noEventsClass),i=$("."+this.opt.calendarToggleClass),r=this.opt.cellWidth*this.opt.cellsToScroll,a=function(){var t,s,o=0,l=0,n=e.opt.cellWidth,c=$("#"+e.opt.calenadrId),i=c.find("."+e.opt.daysClass+" td."+e.opt.currentDayClass).index(),r=e.opt.cellsToScroll,a=c.find("."+e.opt.daysClass+" td").length;return i>0?(i++,t=a/r,s=a/i,l=Math.floor(t)-Math.floor(s),e.currentDay=i,o=l?r*l*n:0):(e.currentDay=0,o=0),o};this.$leftScroll=l,this.$rightScroll=n,this.currentOffset=a(),this.scrollStep=r,this.$scrollBox=s,this.$messages=[],this.stepWidth=e.opt.cellsToScroll*e.opt.cellWidth,$(function(){c.each(function(){var t=parseInt($(this).offset().left,10),s=$(".message",$(this));t?t-=312:t+=312,$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>e.stepWidth&&(s.width(e.stepWidth),0>t&&s.css({marginLeft:Math.abs(t+e.stepWidth)+"px"}),e.$messages.push(s)):$(this).find("."+e.opt.eventWrapClass).addClass("small")}),$("."+e.opt.eventsClass+":even").addClass("grey")}),$(window).load(function(){e.calendarWidth=e.opt.cellWidth*o.find("."+e.opt.daysClass+" td").length,s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+e.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1},callbacks:{onScroll:function(){e.$leftScroll.off("click").one("click",function(){e.scrollLeft(e)}),e.$rightScroll.off("click").one("click",function(){e.scrollRight(e)})}}}),e.$leftScroll.one("click",function(){e.scrollLeft(e)}),e.$rightScroll.one("click",function(){e.scrollRight(e)})}),i.on("click",function(){var t=$(this),e=t.closest(".ep-sect"),s=e.children("div.ep-sect-body");return e.hasClass("eps-opened")?(n.hide(),l.hide(),s.stop().animate({opacity:0},300,function(){e.removeClass("eps-opened")})):(n.show(),l.show(),s.stop().animate({opacity:1},300,function(){e.addClass("eps-opened")})),!1})},t.scrollRight=function(t){return t||(t=this),t.currentOffset+t.stepWidth<t.calendarWidth?(t.currentOffset+=t.scrollStep,console.log("!!! right scroll fired!"),t.$scrollBox.mCustomScrollbar("scrollTo","-="+t.scrollStep),t.offsetMessages()):t.$rightScroll.one("click",function(){t.scrollRight(t)}),!1},t.scrollLeft=function(t){return t||(t=this),t.currentOffset>=t.stepWidth?(t.currentOffset-=t.scrollStep,console.log("!!! left scroll fired!"),t.$scrollBox.mCustomScrollbar("scrollTo","+="+t.scrollStep),t.offsetMessages(t)):t.$leftScroll.one("click",function(){t.scrollLeft(t)}),!1},t.offsetMessages=function(t){t||(t=this);for(var e=0;e<t.$messages.length;e++){var s=t.$messages[e].parent().width(),o=parseInt(t.$messages[e].parent().offset().left,10);o?o-=312:o+=312,s>t.stepWidth&&0>o&&t.$messages[e].css({marginLeft:Math.abs(o+t.stepWidth)+"px"})}},t}();
Loading…
Cancel
Save