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

events not found modal

Browse Source
remotes/origin/HEAD
ya_dim4ik 9 years ago
parent 1150faab9f
commit aa9b2447ba
8 changed files with 319 additions and 260 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      static/client/css/main.css
  2. 2
      static/client/css_min/main.min.css
  3. 12
      static/client/js/scripts.js
  4. 12
      static/client/js/vendor.js
  5. 2
      static/client/js_min/vendor.min.js
  6. 36
      templates/client/includes/conference/conference_list.html
  7. 38
      templates/client/includes/exposition/exposition_list.html
  8. 9
      templates/client/includes/reverseorder_warning.html

20
static/client/css/main.css
Unescape View File

@ -14304,3 +14304,23 @@ h1 .preview_toggle:hover{
background-color: #ef3976; background-color: #ef3976;
color: #fff; color: #fff;
} }
.modal_not_found{
display: none;
}
.modal_not_found_body{
max-width: 620px;
padding: 20px 20px 10px;
font-family: dindisplay_pro, sans-serif;
font-size: 18px;
line-height: 1.5;
}
.modal_not_found_body h3{
font-size: 32px;
line-height: 35px;
color: #f60;
font-weight: 100;
margin: 0 0 15px;
}

2
static/client/css_min/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

12
static/client/js/scripts.js
Unescape View File

@ -216,7 +216,7 @@ $(document).ready(function () {
$.fancybox.close(); $.fancybox.close();
submit_search_form(); submit_search_form();
}) });
$('#filter_form_wraper').on('click', '.filter_block_label', function(event) { $('#filter_form_wraper').on('click', '.filter_block_label', function(event) {
@ -247,11 +247,9 @@ $(document).ready(function () {
}); });
$(window).resize(function () { $(window).resize(function () {
$("div.ht-main_1").each(function () { $("div.ht-main_1").each(function () {
$(this).width($('div.serv-links').width()); $(this).width($('div.serv-links').width());
}); });
}); });
@ -259,6 +257,7 @@ $(document).ready(function () {
$("#large img").hide().attr({"src": $(this).attr("href"), "title": $("> img", this).attr("title")}); $("#large img").hide().attr({"src": $(this).attr("href"), "title": $("> img", this).attr("title")});
return false; return false;
}); });
$("#large>img").load(function(){$("#large>img:hidden").fadeIn("slow")}); $("#large>img").load(function(){$("#large>img:hidden").fadeIn("slow")});
@ -319,6 +318,9 @@ $(document).ready(function () {
$('.new_article').toggleClass('hidden'); $('.new_article').toggleClass('hidden');
}); });
if ($('#message-not-found').length){
$.fancybox.open({
href: '#message-not-found'
})
}
}); });

12
static/client/js/vendor.js
Unescape View File

@ -5076,7 +5076,7 @@ $(document).ready(function () {
$.fancybox.close(); $.fancybox.close();
submit_search_form(); submit_search_form();
}) });
$('#filter_form_wraper').on('click', '.filter_block_label', function(event) { $('#filter_form_wraper').on('click', '.filter_block_label', function(event) {
@ -5107,11 +5107,9 @@ $(document).ready(function () {
}); });
$(window).resize(function () { $(window).resize(function () {
$("div.ht-main_1").each(function () { $("div.ht-main_1").each(function () {
$(this).width($('div.serv-links').width()); $(this).width($('div.serv-links').width());
}); });
}); });
@ -5119,6 +5117,7 @@ $(document).ready(function () {
$("#large img").hide().attr({"src": $(this).attr("href"), "title": $("> img", this).attr("title")}); $("#large img").hide().attr({"src": $(this).attr("href"), "title": $("> img", this).attr("title")});
return false; return false;
}); });
$("#large>img").load(function(){$("#large>img:hidden").fadeIn("slow")}); $("#large>img").load(function(){$("#large>img:hidden").fadeIn("slow")});
@ -5179,8 +5178,11 @@ $(document).ready(function () {
$('.new_article').toggleClass('hidden'); $('.new_article').toggleClass('hidden');
}); });
if ($('#message-not-found').length){
$.fancybox.open({
href: '#message-not-found'
})
}
}); });
var Base64 = { var Base64 = {

2
static/client/js_min/vendor.min.js vendored
View File

File diff suppressed because one or more lines are too long

36
templates/client/includes/conference/conference_list.html
Unescape View File

@ -1,8 +1,9 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% with objects=object_list %} {% with objects=object_list %}
{% if objects %} {% if objects %}
{% include 'client/includes/banners/tops.html' %} {% include 'client/includes/banners/tops.html' %}
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
@ -17,12 +18,14 @@
<div class="hit"></div> <div class="hit"></div>
{% endif %} {% endif %}
{% endif %} {% endif %}
<div class="cli-pict"> <div class="cli-pict">
{% with obj=obj %} {% with obj=obj %}
{% 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">
<div class="cli-top clearfix"> <div class="cli-top clearfix">
{% if obj.quality_label.rsva.is_set %} {% if obj.quality_label.rsva.is_set %}
@ -30,29 +33,35 @@
<img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
{% if obj.quality_label.exporating.is_set %} {% if obj.quality_label.exporating.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/exporating_logo.png' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/exporating_logo.png' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
{% if obj.quality_label.ufi.is_set %} {% if obj.quality_label.ufi.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
<header> <header>
<div class="cli-title"><a target="_blank" href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div> <div class="cli-title"><a target="_blank" href="{{ obj.get_permanent_url }}">{{ obj.name|safe }}</a></div>
</header> </header>
<div class="cli-descr"> <div class="cli-descr">
{{ 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>
@ -67,6 +76,7 @@
<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 %}
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/conference/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a> <a class="button green icon-note {% if note %}active{% endif %} note-button" href="/conference/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
@ -77,6 +87,7 @@
</div> </div>
{% endwith %} {% endwith %}
</div> </div>
{% if request.user.is_admin %} {% if request.user.is_admin %}
<div class="note-wrap"> <div class="note-wrap">
<a class="button green " href="/admin/conference/{{ obj.url }}/">{% trans 'изменить' %}</a> <a class="button green " href="/admin/conference/{{ obj.url }}/">{% trans 'изменить' %}</a>
@ -84,25 +95,30 @@
{% 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 %}
<span class="visitors" title="Посетители">{{ obj.visitors }}</span> <span class="visitors" title="Посетители">{{ obj.visitors }}</span>
{% endif %} {% endif %}
{% if obj.members %} {% if obj.members %}
<span class="participants" title="Участники">{{ obj.members }}</span> <span class="participants" title="Участники">{{ obj.members }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="cli-tags"> <div class="cli-tags">
{% include 'client/includes/exposition/tags.html' with obj=obj %} {% include 'client/includes/exposition/tags.html' with obj=obj %}
</div> </div>
</footer> </footer>
</li> </li>
{% if forloop.counter == 5 or objects|length < 5 %} {% if forloop.counter == 5 or objects|length < 5 %}
{% include 'client/includes/banners/catalog_inner_2.html' %} {% include 'client/includes/banners/catalog_inner_2.html' %}
{% endif %} {% endif %}
@ -111,8 +127,8 @@
{% include 'client/includes/banners/catalog_inner.html' %} {% include 'client/includes/banners/catalog_inner.html' %}
{%endif %} {%endif %}
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}
<p class="message-not-found"> <p class="message-not-found">
<span class="message"> <span class="message">
@ -121,13 +137,15 @@
</p> </p>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
{% block scripts %} {% block scripts %}
{% if request.GET.debug == '1' %} {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script> <script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script>
{% else %} {% else %}
<script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script> <script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
{% endif %} {% endif %}
<script>
<script>
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{ note:{
wrapClass:'note-wrap', wrapClass:'note-wrap',
@ -138,5 +156,5 @@
addCalendarText:"{% trans 'В расписание' %}", addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}" removeCalendarText:"{% trans 'Из расписания' %}"
}); });
</script> </script>
{% endblock %} {% endblock %}

38
templates/client/includes/exposition/exposition_list.html
Unescape View File

@ -1,11 +1,12 @@
{% load static %} {% load static %}
{% load i18n %} {% load i18n %}
{% load template_filters %} {% load template_filters %}
{% with objects=object_list %} {% with objects=object_list %}
{% if objects %} {% if objects %}
{% include 'client/includes/banners/tops.html' %} {% include 'client/includes/banners/tops.html' %}
<ul class="cat-list cl-exhibitions">
<ul class="cat-list cl-exhibitions">
{% for obj in objects %} {% for obj in objects %}
<li class="cl-item {% if obj.canceled %}canceled{% endif %}" data-slug="{{ obj.url }}"> <li class="cl-item {% if obj.canceled %}canceled{% endif %}" data-slug="{{ obj.url }}">
<div class="cl-item-wrap clearfix"> <div class="cl-item-wrap clearfix">
@ -20,7 +21,6 @@
{% endwith %} {% endwith %}
</div> </div>
</a> </a>
{% else %} {% else %}
<div class="cancel"></div> <div class="cancel"></div>
<div class="cli-pict"> <div class="cli-pict">
@ -29,6 +29,7 @@
{% endwith %} {% endwith %}
</div> </div>
{% endif %} {% endif %}
<div class="cli-info"> <div class="cli-info">
<div class="cli-top clearfix"> <div class="cli-top clearfix">
{% if obj.quality_label.rsva.is_set %} {% if obj.quality_label.rsva.is_set %}
@ -36,11 +37,13 @@
<img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/rsva.jpg' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
{% if obj.quality_label.exporating.is_set %} {% if obj.quality_label.exporating.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/exporating_logo.png' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/exporating_logo.png' %}" alt="" title="Approved Event" />
</div> </div>
{% endif %} {% endif %}
{% if obj.quality_label.ufi.is_set %} {% if obj.quality_label.ufi.is_set %}
<div class="cli-approved"> <div class="cli-approved">
<img width="52" height="42" src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" /> <img width="52" height="42" src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
@ -50,26 +53,28 @@
<header> <header>
<div class="cli-title"><a target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">{{ obj.name|safe }}</a></div> <div class="cli-title"><a target="_blank" href="{% if not obj.paid_new_id %}{{ obj.get_permanent_url }}{% else %}{{ obj.get_paid_catalog_url }}{% endif %}">{{ obj.name|safe }}</a></div>
</header> </header>
<div class="cli-descr"> <div class="cli-descr">
{{ 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>{% endif %}
, <a href="/places/{{ obj.place.url }}/">{{ obj.place }}</a>
{% endif %}
</div> </div>
{% 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 %}
@ -84,6 +89,7 @@
</div> </div>
{% endwith %} {% endwith %}
</div> </div>
{% if request.user.is_admin %} {% if request.user.is_admin %}
<div class="note-wrap"> <div class="note-wrap">
<a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a> <a class="button green " href="/admin/exposition/{{ obj.url }}/">{% trans 'изменить' %}</a>
@ -96,15 +102,18 @@
</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 %}
<span class="visitors" title="Посетители">{{ obj.visitors }}</span> <span class="visitors" title="Посетители">{{ obj.visitors }}</span>
{% endif %} {% endif %}
{% if obj.members %} {% if obj.members %}
<span class="participants" title="Участники">{{ obj.members }}</span> <span class="participants" title="Участники">{{ obj.members }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="cli-tags"> <div class="cli-tags">
{% include 'client/includes/exposition/tags.html' with obj=obj %} {% include 'client/includes/exposition/tags.html' with obj=obj %}
</div> </div>
@ -122,7 +131,7 @@
{%endif %} {%endif %}
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}
<p class="message-not-found"> <p class="message-not-found">
<span class="message"> <span class="message">
@ -130,17 +139,16 @@
</span> </span>
</p> </p>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
{% block scripts %} {% block scripts %}
{% if request.GET.debug == '1' %} {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script> <script src="{% static 'client/js/_modules/block.exposition.list.js' %}"></script>
{% else %} {% else %}
<script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script> <script src="{% static 'client/js_min/_modules/block.exposition.list.min.js' %}"></script>
{% endif %}<script> {% endif %}
<script>
EXPO.exposition.list.init({ EXPO.exposition.list.init({
note:{ note:{
wrapClass:'note-wrap', wrapClass:'note-wrap',
@ -151,5 +159,5 @@
addCalendarText:"{% trans 'В расписание' %}", addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}" removeCalendarText:"{% trans 'Из расписания' %}"
}); });
</script> </script>
{% endblock %} {% endblock %}

9
templates/client/includes/reverseorder_warning.html
Unescape View File

@ -1,5 +1,14 @@
{% load i18n %} {% load i18n %}
<div class="reversed" style="border-left: 5px solid #ff9900; padding: 8px 12px; background-color: #fff; font-size:17px; text-align: justify; margin-bottom: 10px">{% trans "События по указанным параметрам не найдены. Попробуйте упростить параметры или расширить временные рамки. Также, вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}</div> <div class="reversed" style="border-left: 5px solid #ff9900; padding: 8px 12px; background-color: #fff; font-size:17px; text-align: justify; margin-bottom: 10px">{% trans "События по указанным параметрам не найдены. Попробуйте упростить параметры или расширить временные рамки. Также, вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}</div>
<div id="message-not-found" class="modal_not_found">
<div class="modal_not_found_body">
<h3>{% trans 'События по указанным параметрам не найдены.' %}</h3>
<p>{% trans "Попробуйте упростить параметры или расширить временные рамки. Также, вы можете посмотреть уже прошедшие события и проверить самостоятельно, будут ли они проходить в будущем." %}</p>
</div>
</div>
<div class="page-title"> <div class="page-title">
<h2 style="font-size:30px;">{% trans "Прошедшие события" %}</h2> <h2 style="font-size:30px;">{% trans "Прошедшие события" %}</h2>
</div> </div>

Write Preview
Loading…
Cancel
Save