'; + echo '
'; } /** diff --git a/package-lock.json b/package-lock.json index 814f679..bcca55a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -98,7 +98,6 @@ "sass-loader": "^10.1.0", "select2": "4.0.13", "sprintf-js": "^1.0.3", - "sticky-kit": "1.1.3", "stream-browserify": "^3.0.0", "style-loader": "^2.0.0", "stylelint": "^14.9.1", diff --git a/package.json b/package.json index cbd08e5..8eb785f 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,6 @@ "sass-loader": "^10.1.0", "select2": "4.0.13", "sprintf-js": "^1.0.3", - "sticky-kit": "1.1.3", "stream-browserify": "^3.0.0", "style-loader": "^2.0.0", "stylelint": "^14.9.1", diff --git a/public/assets/javascripts/ckeditor/plugins/studip-floatbar/plugin.js b/public/assets/javascripts/ckeditor/plugins/studip-floatbar/plugin.js index b1d5342..8306c37 100644 --- a/public/assets/javascripts/ckeditor/plugins/studip-floatbar/plugin.js +++ b/public/assets/javascripts/ckeditor/plugins/studip-floatbar/plugin.js @@ -57,8 +57,7 @@ } function updateStickyTools(editor) { - var MARGIN = $('#barBottomContainer').length ? - $('#barBottomContainer').height() : 25; + var MARGIN = $('#top-bar').height() ?? 25; var toolbarId = editor.config.sharedSpaces.top; diff --git a/public/index.php b/public/index.php index 4206821..c36681d 100644 --- a/public/index.php +++ b/public/index.php @@ -95,7 +95,6 @@ if (Request::get('logout')) $index_nobody_template->set_attribute('logout', true); } -echo '
'; echo $index_nobody_template->render(); $layout = $GLOBALS['template_factory']->open('shared/index_box'); diff --git a/resources/assets/javascripts/bootstrap/application.js b/resources/assets/javascripts/bootstrap/application.js index 05b2c26..cafd07e 100644 --- a/resources/assets/javascripts/bootstrap/application.js +++ b/resources/assets/javascripts/bootstrap/application.js @@ -282,29 +282,29 @@ STUDIP.domReady(function () { // Fix horizontal scroll issue on domready, window load and window resize. // This also makes the header and footer sticky regarding horizontal scrolling. STUDIP.domReady(function () { - var page_margin = ($('#layout_page').outerWidth(true) - $('#layout_page').width()) / 2, - content_margin = $('#layout_content').outerWidth(true) - $('#layout_content').innerWidth(), - sidebar_width = $('#layout-sidebar').outerWidth(true); + var page_margin = ($('#current-page-structure').outerWidth(true) - $('#current-page-structure').width()) / 2, + content_margin = $('#content').outerWidth(true) - $('#content').innerWidth(), + sidebar_width = $('#sidebar').outerWidth(true); function fixScrolling() { - $('#layout_page').removeClass('oversized').css({ + $('#current-page-structure').removeClass('oversized').css({ minWidth: '', marginRight: '', paddingRight: '' }); var max_width = 0, - fix_required = $('html').is(':not(.responsified)') && $('#layout_content').get(0).scrollWidth > $('#layout_content').width(); + fix_required = $('html').is(':not(.responsified)') && $('#content').get(0).scrollWidth > $('#content').width(); if (fix_required) { - $('#layout_content').children().each(function () { + $('#content').children().each(function () { var width = $(this).get(0).scrollWidth + ($(this).outerWidth(true) - $(this).innerWidth()); if (width > max_width) { max_width = width; } }); - $('#layout_page').addClass('oversized').css({ + $('#current-page-structure').addClass('oversized').css({ minWidth: sidebar_width + content_margin + max_width + page_margin, marginRight: 0, paddingRight: page_margin @@ -314,7 +314,7 @@ STUDIP.domReady(function () { var last_left = null; return function (top, left) { if (last_left !== left) { - $('#flex-header,#tabs,#layout_footer,#barBottomContainer').css({ + $('#navigation-level-1,#tabs,#main-footer,#top-bar').css({ transform: 'translate3d(' + left + 'px,0,0)' }); } @@ -326,7 +326,7 @@ STUDIP.domReady(function () { } } - if ($('.no-touch #layout_content').length > 0) { + if ($('.no-touch #content').length > 0) { window.matchMedia('screen').addListener(function() { // Try to fix now fixScrolling(); diff --git a/resources/assets/javascripts/bootstrap/copyable_links.js b/resources/assets/javascripts/bootstrap/copyable_links.js index e41d064..d3675ed 100644 --- a/resources/assets/javascripts/bootstrap/copyable_links.js +++ b/resources/assets/javascripts/bootstrap/copyable_links.js @@ -21,7 +21,7 @@ $(document).on('click', 'a.copyable-link', function (event) { (new Promise((resolve, reject) => { let confirmation = $('