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

change main page slider + remove date filter on events + add youtube video on participation landing

Browse Source
remotes/origin/HEAD
ya_dim4ik 9 years ago
parent 63ee76a703
commit 1150faab9f
13 changed files with 67 additions and 154 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      static/client/css/main.css
  2. 2
      static/client/css_min/main.min.css
  3. BIN
      static/client/img/search-bg.jpg
  4. BIN
      static/client/img/sprites.png
  5. 57
      static/client/js/main.js
  6. 57
      static/client/js/vendor.js
  7. 4
      static/client/js_min/vendor.min.js
  8. 5
      static/participation_landing/css/main.css
  9. 8
      templates/client/blank.html
  10. 4
      templates/client/includes/exposition/catalog_filter_period.html
  11. 36
      templates/client/includes/index/main_events.html
  12. 38
      templates/client/index.html
  13. 2
      templates/client/simple_pages/participation_landing.html

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

@ -968,10 +968,16 @@ aside nav+hr {
list-style: none
}
.mp-top .recent-expo ul li {
float: left;
/*float: left;*/
width: 100%;
background-color: #f8f8f6;
display: none
}
.mp-top .recent-expo ul li:after{
content: '';
display: block;
clear: both;
}
.mp-top .recent-expo ul li:first-child {
display: block
}

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

File diff suppressed because one or more lines are too long

BIN
static/client/img/search-bg.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
static/client/img/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 39 KiB

57
static/client/js/main.js
Unescape View File

@ -352,67 +352,10 @@ function placeInput(width){
var $reSwipeWrap = $reContainer.children('ul');
var $reSwipeItems = $reSwipeWrap.children('li');
var $reControls = $reContainer.children('div.re-controls');
var $recPrev = $reControls.children('a.prev');
var $recNext = $reControls.children('a.next');
if ($reSwipeItems.length > 1) {
$reControls.addClass('enabled');
$reSwipeItems.css({
display: 'block'
});
$reContainer.height($reSwipeItems.eq(0).height());
var $reSwiper = $reContainer.swiper({
speed: 500,
mode:'horizontal',
loop: false,
simulateTouch: false,
autoplay:4200,
onInit: function () {
$recPrev.addClass('disabled');
},
onSlideChangeStart: function (swiper) {
$reContainer.animate({
height: $reSwipeItems.eq(swiper.activeIndex).children('div.re-body').height()
}, 300);
if (swiper.activeIndex == 0) {
if (!$recPrev.hasClass('disabled')) {
$recPrev.addClass('disabled');
}
if ($recNext.hasClass('disabled')) {
$recNext.removeClass('disabled');
}
} else if (swiper.activeIndex == swiper.slides.length-1) {
if (!$recNext.hasClass('disabled')) {
$recNext.addClass('disabled');
}
if ($recPrev.hasClass('disabled')) {
$recPrev.removeClass('disabled');
}
} else {
if ($recPrev.hasClass('disabled')) {
$recPrev.removeClass('disabled');
}
if ($recNext.hasClass('disabled')) {
$recNext.removeClass('disabled');
}
}
}
});
$recPrev.on('click', function () {
if (!$(this).hasClass('disabled')) {
$reSwiper.swipePrev();
}
return false;
});
$recNext.on('click', function () {
if (!$(this).hasClass('disabled')) {
$reSwiper.swipeNext();
}
return false;
});
}
});
$('#mp-photo-gallery').each(function () {

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

@ -4031,67 +4031,10 @@ function placeInput(width){
var $reSwipeWrap = $reContainer.children('ul');
var $reSwipeItems = $reSwipeWrap.children('li');
var $reControls = $reContainer.children('div.re-controls');
var $recPrev = $reControls.children('a.prev');
var $recNext = $reControls.children('a.next');
if ($reSwipeItems.length > 1) {
$reControls.addClass('enabled');
$reSwipeItems.css({
display: 'block'
});
$reContainer.height($reSwipeItems.eq(0).height());
var $reSwiper = $reContainer.swiper({
speed: 500,
mode:'horizontal',
loop: false,
simulateTouch: false,
autoplay:4200,
onInit: function () {
$recPrev.addClass('disabled');
},
onSlideChangeStart: function (swiper) {
$reContainer.animate({
height: $reSwipeItems.eq(swiper.activeIndex).children('div.re-body').height()
}, 300);
if (swiper.activeIndex == 0) {
if (!$recPrev.hasClass('disabled')) {
$recPrev.addClass('disabled');
}
if ($recNext.hasClass('disabled')) {
$recNext.removeClass('disabled');
}
} else if (swiper.activeIndex == swiper.slides.length-1) {
if (!$recNext.hasClass('disabled')) {
$recNext.addClass('disabled');
}
if ($recPrev.hasClass('disabled')) {
$recPrev.removeClass('disabled');
}
} else {
if ($recPrev.hasClass('disabled')) {
$recPrev.removeClass('disabled');
}
if ($recNext.hasClass('disabled')) {
$recNext.removeClass('disabled');
}
}
}
});
$recPrev.on('click', function () {
if (!$(this).hasClass('disabled')) {
$reSwiper.swipePrev();
}
return false;
});
$recNext.on('click', function () {
if (!$(this).hasClass('disabled')) {
$reSwiper.swipeNext();
}
return false;
});
}
});
$('#mp-photo-gallery').each(function () {

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

File diff suppressed because one or more lines are too long

5
static/participation_landing/css/main.css
Unescape View File

@ -253,6 +253,11 @@ h1 .orange{
background: #f5f5f5;
}
.what_to_do iframe{
display: block;
margin: 50px auto 0;
}
.variants{
padding-top: 50px;
}

8
templates/client/blank.html
Unescape View File

@ -42,10 +42,12 @@ This template include basic anf main styles and js files,
{% 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' %}">
{% block styles %}
{% endblock %}
<script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script>
{% block styles %}{% endblock %}
<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/jquery-ui-1.10.4.custom.min.js' %}" type="text/javascript"></script>

4
templates/client/includes/exposition/catalog_filter_period.html
Unescape View File

@ -15,9 +15,5 @@
{% endfor %}
{% endwith %}
</div>
<div class="ch-dates-range">
<a class="pw-open" href="#pwPeriod">{% trans 'Указать диапазон дат' %}</a>
</div>
</div>
{% endif %}

36
templates/client/includes/index/main_events.html
Unescape View File

@ -6,18 +6,26 @@
<div class="mcl">
<div id="mp-recent-expo" class="recent-expo swiper-container">
<ul class="swiper-wrapper">
<div id="mp-recent-expo" class="recent-expo">
<ul class="cycle-slideshow"
data-cycle-fx="scrollHorz"
data-cycle-timeout="4000"
data-cycle-prev=".swiper-button-prev"
data-cycle-next=".swiper-button-next"
data-cycle-pause-on-hover="true"
data-cycle-slides="> li"
data-cycle-log="false">
{% for event in events %}
<li class="swiper-slide">
<li>
<div class="re-pict pict-over" >
{% if event.logo %}
<a href="{{ event.get_main_link }}">
<!--<img src="{{ event.logo.url }}">-->
{# <img src="{{ event.logo.url }}"> #}
{% thumbnail event.get_preview "220x220" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
{% endthumbnail %}
{% thumbnail event.get_preview "220x220" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
{% endthumbnail %}
</a>
{% endif %}
@ -25,11 +33,11 @@
<div class="re-body">
<div class="re-info">
<a href="{{ event.get_main_link }}">
<div class="re-title">{{ event.name|safe }}</div>
<div class="re-date">
{% include 'client/includes/index/main_date_block.html' with obj=event %}
</div>
<div class="re-descr" title="{{ event.main_title|safe }}">{{ event.main_title|safe }}</div>
<div class="re-title">{{ event.name|safe }}</div>
<div class="re-date">
{% include 'client/includes/index/main_date_block.html' with obj=event %}
</div>
<div class="re-descr" title="{{ event.main_title|safe }}">{{ event.main_title|safe }}</div>
</a>
</div>
<footer>
@ -57,8 +65,8 @@
{% endfor %}
</ul>
<div class="re-controls">
<a class="prev" href="#">&lt;</a>
<a class="next" href="#">&gt;</a>
<a class="prev swiper-button-prev" href="javascript:void(0)">&lt;</a>
<a class="next swiper-button-next" href="javascript:void(0)">&gt;</a>
</div>
</div>
</div>

38
templates/client/index.html
Unescape View File

@ -9,6 +9,7 @@
</style>
{% endblock %}
{% block body_class %} class="main-page" {% endblock %}
{% block top %}
<section class="layout mp-top">
<div class="layout-wrap">
@ -22,9 +23,11 @@
</div>
</section>
{% endblock %}
{% block search %}
{% include 'client/includes/catalog_search_main.html' with search_form=search_form %}
{% endblock %}
{% block catalog %}
<section class="layout mp-catalog">
<div class="layout-wrap">
@ -112,6 +115,7 @@
</div>
</section>
{% endblock %}
{% block partners %}
<section class="layout mp-partners">
<div class="mpp-wrap">
@ -129,6 +133,7 @@
</div>
</section>
{% endblock %}
{% block services %}
<section class="layout mp-services">
<div class="layout-wrap">
@ -142,19 +147,22 @@
</div>
</div>
</section>
{% 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>
EXPO.index.init({
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
}
});
</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>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.cycle2/2.1.6/jquery.cycle2.min.js" defer></script>
{% endif %}
<script>
EXPO.index.init({
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
}
});
</script>
{% endblock %}

2
templates/client/simple_pages/participation_landing.html
Unescape View File

@ -128,6 +128,8 @@
</a>
</div>
</div>
<iframe width="853" height="480" src="https://www.youtube.com/embed/kgkKyQFKPPM?rel=0&amp;showinfo=0" frameborder="0" allowfullscreen></iframe>
</div>
</div>

Write Preview
Loading…
Cancel
Save