diff --git a/apps/course/templates/course/content/gallery.html b/apps/course/templates/course/content/gallery.html index 771df8b6..32a4bf91 100644 --- a/apps/course/templates/course/content/gallery.html +++ b/apps/course/templates/course/content/gallery.html @@ -1,18 +1,22 @@ {% if results %}
Галерея итогов обучения
-
+ {% else %}
{{ content.title }}
-
+ diff --git a/apps/course/templates/course/content/image.html b/apps/course/templates/course/content/image.html index 5daeba4e..1117d434 100644 --- a/apps/course/templates/course/content/image.html +++ b/apps/course/templates/course/content/image.html @@ -1,6 +1,8 @@
{{ content.title }}
-
- -
\ No newline at end of file + diff --git a/apps/course/templates/course/content/imagetext.html b/apps/course/templates/course/content/imagetext.html index 9849e357..0b3301cc 100644 --- a/apps/course/templates/course/content/imagetext.html +++ b/apps/course/templates/course/content/imagetext.html @@ -4,6 +4,8 @@
{{ content.txt | safe }}
-
- + \ No newline at end of file diff --git a/web/package.json b/web/package.json index 96794b84..ba9de0b4 100755 --- a/web/package.json +++ b/web/package.json @@ -55,6 +55,7 @@ "dependencies": { "axios": "^0.17.1", "babel-polyfill": "^6.26.0", + "baguettebox.js": "^1.10.0", "history": "^4.7.2", "ilyabirman-likely": "^2.3.0", "inputmask": "^3.3.11", diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue index 0f94eb3e..d173f8cf 100644 --- a/web/src/components/CourseRedactor.vue +++ b/web/src/components/CourseRedactor.vue @@ -551,7 +551,7 @@ clearTimeout(this.savingTimeout); document.getElementById('course-redactor__saving-status').innerText = 'СОХРАНЕНИЕ'; const courseObject = this.course; - courseObject.url = slugify(courseObject.url); + courseObject.url = (courseObject.url) ? slugify(courseObject.url):courseObject.url; api.saveCourse(courseObject, this.accessToken) .then((response) => { this.courseSaving = false; diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js index ecbd4dee..dea36989 100644 --- a/web/src/js/modules/common.js +++ b/web/src/js/modules/common.js @@ -1,8 +1,14 @@ import $ from 'jquery'; import Inputmask from "inputmask"; import SmoothScroll from 'smooth-scroll/dist/js/smooth-scroll'; +import baguetteBox from 'baguettebox.js' + window.Inputmask = Inputmask; +window.baguetteBox = baguetteBox; + $(document).ready(function () { + + baguetteBox.run('.gallery'); // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery. $.ajaxSetup({ headers: { diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index de962138..4d66e5d8 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -1857,7 +1857,7 @@ a.grey-link left: -10px right: -10px height: 2px - margin-top: -2px + margin-top: 5px background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%) &__title display: table diff --git a/web/src/sass/app.sass b/web/src/sass/app.sass index 9272f307..020d748e 100755 --- a/web/src/sass/app.sass +++ b/web/src/sass/app.sass @@ -2,3 +2,4 @@ @import helpers/all @import generated/sprite-svg @import common +@import '../../node_modules/baguettebox.js/src/baguetteBox.scss'