fixes, gallery

remotes/origin/hasaccess
Sanasol 8 years ago
parent 7b7ee5230c
commit d10369147e
  1. 12
      apps/course/templates/course/content/gallery.html
  2. 8
      apps/course/templates/course/content/image.html
  3. 6
      apps/course/templates/course/content/imagetext.html
  4. 1
      web/package.json
  5. 2
      web/src/components/CourseRedactor.vue
  6. 6
      web/src/js/modules/common.js
  7. 2
      web/src/sass/_common.sass
  8. 1
      web/src/sass/app.sass

@ -1,18 +1,22 @@
{% if results %} {% if results %}
<div class="title">Галерея итогов обучения</div> <div class="title">Галерея итогов обучения</div>
<div class="examples"> <div class="examples gallery">
{% for image in course.gallery.gallery_images.all %} {% for image in course.gallery.gallery_images.all %}
<div class="examples__item"> <div class="examples__item">
<img class="examples__pic" src="{{ image.img.image.url }}"> <a href="{{ image.img.image.url }}">
<img class="examples__pic" src="{{ image.img.image.url }}">
</a>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
<div class="content-block title">{{ content.title }}</div> <div class="content-block title">{{ content.title }}</div>
<div class="examples"> <div class="examples gallery">
{% for image in content.gallery_images.all %} {% for image in content.gallery_images.all %}
<div class="examples__item"> <div class="examples__item">
<img class="examples__pic" src="{{ image.img.image.url }}"> <a href="{{ image.img.image.url }}">
<img class="examples__pic" src="{{ image.img.image.url }}">
</a>
</div> </div>
{% endfor %} {% endfor %}
</div> </div>

@ -1,6 +1,8 @@
<div class="content-block title"> <div class="content-block title">
{{ content.title }} {{ content.title }}
</div> </div>
<div> <div class="gallery">
<img class="content-block pic" src="{{ content.img.image.url }}" alt=""> <a href="{{ content.img.image.url }}">
</div> <img class="content-block pic" src="{{ content.img.image.url }}" alt="">
</a>
</div>

@ -4,6 +4,8 @@
<div class="content-block text"> <div class="content-block text">
{{ content.txt | safe }} {{ content.txt | safe }}
</div> </div>
<div> <div class="gallery">
<img class="content-block pic" src="{{ content.img.image.url }}" alt=""> <a href="{{ content.img.image.url }}">
<img class="content-block pic" src="{{ content.img.image.url }}" alt="">
</a>
</div> </div>

@ -55,6 +55,7 @@
"dependencies": { "dependencies": {
"axios": "^0.17.1", "axios": "^0.17.1",
"babel-polyfill": "^6.26.0", "babel-polyfill": "^6.26.0",
"baguettebox.js": "^1.10.0",
"history": "^4.7.2", "history": "^4.7.2",
"ilyabirman-likely": "^2.3.0", "ilyabirman-likely": "^2.3.0",
"inputmask": "^3.3.11", "inputmask": "^3.3.11",

@ -551,7 +551,7 @@
clearTimeout(this.savingTimeout); clearTimeout(this.savingTimeout);
document.getElementById('course-redactor__saving-status').innerText = 'СОХРАНЕНИЕ'; document.getElementById('course-redactor__saving-status').innerText = 'СОХРАНЕНИЕ';
const courseObject = this.course; const courseObject = this.course;
courseObject.url = slugify(courseObject.url); courseObject.url = (courseObject.url) ? slugify(courseObject.url):courseObject.url;
api.saveCourse(courseObject, this.accessToken) api.saveCourse(courseObject, this.accessToken)
.then((response) => { .then((response) => {
this.courseSaving = false; this.courseSaving = false;

@ -1,8 +1,14 @@
import $ from 'jquery'; import $ from 'jquery';
import Inputmask from "inputmask"; import Inputmask from "inputmask";
import SmoothScroll from 'smooth-scroll/dist/js/smooth-scroll'; import SmoothScroll from 'smooth-scroll/dist/js/smooth-scroll';
import baguetteBox from 'baguettebox.js'
window.Inputmask = Inputmask; window.Inputmask = Inputmask;
window.baguetteBox = baguetteBox;
$(document).ready(function () { $(document).ready(function () {
baguetteBox.run('.gallery');
// Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery. // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery.
$.ajaxSetup({ $.ajaxSetup({
headers: { headers: {

@ -1857,7 +1857,7 @@ a.grey-link
left: -10px left: -10px
right: -10px right: -10px
height: 2px height: 2px
margin-top: -2px margin-top: 5px
background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%) background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%)
&__title &__title
display: table display: table

@ -2,3 +2,4 @@
@import helpers/all @import helpers/all
@import generated/sprite-svg @import generated/sprite-svg
@import common @import common
@import '../../node_modules/baguettebox.js/src/baguetteBox.scss'

Loading…
Cancel
Save