maxim fixes

remotes/origin/hasaccess
Sanasol 8 years ago
parent dbaa52bef1
commit 132e1e556c
  1. 2
      apps/school/templates/blocks/schedule.html
  2. 5
      web/src/components/blocks/BlockImage.vue
  3. 5
      web/src/components/blocks/BlockImageText.vue
  4. 5
      web/src/components/blocks/BlockImages.vue
  5. 5
      web/src/components/blocks/BlockVideo.vue
  6. 14
      web/src/js/modules/popup.js
  7. 3
      web/src/js/modules/toggle.js

@ -68,7 +68,7 @@
</div> </div>
</div> </div>
<div class="timing__cell"> <div class="timing__cell">
<button class="timing__toggle js-timing-toggle"> <button class="timing__toggle">
<svg class="icon icon-arrow-down"> <svg class="icon icon-arrow-down">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use> <use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use>
</svg> </svg>

@ -1,6 +1,11 @@
<template> <template>
<div class="kit__section kit__section--block"> <div class="kit__section kit__section--block">
<div class="kit__section-remove"> <div class="kit__section-remove">
<button class="sortable__handle" type="button">
<svg class="icon icon-hamburger">
<use xlink:href="/static/img/sprite.svg#icon-hamburger"></use>
</svg>
</button>
<button type="button" @click="onRemove"> <button type="button" @click="onRemove">
<svg class="icon icon-delete"> <svg class="icon icon-delete">
<use xlink:href="/static/img/sprite.svg#icon-delete"></use> <use xlink:href="/static/img/sprite.svg#icon-delete"></use>

@ -1,6 +1,11 @@
<template> <template>
<div class="kit__section kit__section--block"> <div class="kit__section kit__section--block">
<div class="kit__section-remove"> <div class="kit__section-remove">
<button class="sortable__handle" type="button">
<svg class="icon icon-hamburger">
<use xlink:href="/static/img/sprite.svg#icon-hamburger"></use>
</svg>
</button>
<button type="button" @click="onRemove"> <button type="button" @click="onRemove">
<svg class="icon icon-delete"> <svg class="icon icon-delete">
<use xlink:href="/static/img/sprite.svg#icon-delete"></use> <use xlink:href="/static/img/sprite.svg#icon-delete"></use>

@ -1,6 +1,11 @@
<template> <template>
<div class="kit__section kit__section--block"> <div class="kit__section kit__section--block">
<div v-if="!readOnly" class="kit__section-remove"> <div v-if="!readOnly" class="kit__section-remove">
<button class="sortable__handle" type="button">
<svg class="icon icon-hamburger">
<use xlink:href="/static/img/sprite.svg#icon-hamburger"></use>
</svg>
</button>
<button type="button" @click="onRemove"> <button type="button" @click="onRemove">
<svg class="icon icon-delete"> <svg class="icon icon-delete">
<use xlink:href="/static/img/sprite.svg#icon-delete"></use> <use xlink:href="/static/img/sprite.svg#icon-delete"></use>

@ -1,6 +1,11 @@
<template> <template>
<div class="kit__section kit__section--block"> <div class="kit__section kit__section--block">
<div class="kit__section-remove"> <div class="kit__section-remove">
<button class="sortable__handle" type="button">
<svg class="icon icon-hamburger">
<use xlink:href="/static/img/sprite.svg#icon-hamburger"></use>
</svg>
</button>
<button type="button" @click="onRemove"> <button type="button" @click="onRemove">
<svg class="icon icon-delete"> <svg class="icon icon-delete">
<use xlink:href="/static/img/sprite.svg#icon-delete"></use> <use xlink:href="/static/img/sprite.svg#icon-delete"></use>

@ -13,6 +13,8 @@ $(document).ready(function () {
popup = $(data); popup = $(data);
showPopup(); showPopup();
let is_extend = false;
if(data === '.js-popup-buy') { if(data === '.js-popup-buy') {
console.log('reset selected'); console.log('reset selected');
$('[data-day]').prop('checked', false); $('[data-day]').prop('checked', false);
@ -24,6 +26,7 @@ $(document).ready(function () {
$('[data-purchased]').each(function(){ $('[data-purchased]').each(function(){
$('[data-day='+$(this).data('purchased')+']').prop('checked', true); $('[data-day='+$(this).data('purchased')+']').prop('checked', true);
}); });
is_extend = true;
} }
} }
@ -32,6 +35,13 @@ $(document).ready(function () {
$('[data-day='+day+']').prop('checked', true); $('[data-day='+day+']').prop('checked', true);
} }
if(!is_extend && !$(this).data('day')) {
console.log('check all');
$('[data-day]').each(function(){
$(this).prop('checked', true);
});
}
$('[data-day]').trigger('change'); $('[data-day]').trigger('change');
}); });
@ -79,10 +89,10 @@ $(document).ready(function () {
var weekday = $(this).data('day'); var weekday = $(this).data('day');
var price = $(this).data('price'); var price = $(this).data('price');
if($(this).is(':checked')) { if($(this).is(':checked')) {
console.log('checked'); // console.log('checked');
selectedWeekdays[weekday] = {price:price}; selectedWeekdays[weekday] = {price:price};
} else { } else {
console.log('not checked'); // console.log('not checked');
delete selectedWeekdays[weekday]; delete selectedWeekdays[weekday];
} }

@ -11,7 +11,8 @@ $(document).ready(function () {
e.preventDefault(); e.preventDefault();
let _this = $(this); let _this = $(this);
if(!$(e.target).data('popup')) { if(!$(e.target).data('popup')) {
let _parent = _this.closest('.timing__item') let _parent = _this.closest('.timing__item');
$(document).find('.timing__item').not(_parent).removeClass('open');
_parent.toggleClass('open'); _parent.toggleClass('open');
// _parent.next().slideToggle(); // _parent.next().slideToggle();
} }

Loading…
Cancel
Save