vviora/varvara_kaplenko
1
0
Fork 0
forked from SPC/spc-site
Code Pull Requests Activity

Fix rendering for masters

Browse Source
This commit is contained in:
Alexander Nozik 2024-03-03 18:28:58 +03:00
parent be2a9499c6
commit 183f02f26f
3 changed files with 436 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
data/magprog/assets/js/main.js
View File

@ -20,7 +20,7 @@
}); });
// Hack: Enable IE flexbox workarounds. // Hack: Enable IE flexbox workarounds.
if (browser.name == 'ie') if (browser.name === 'ie')
$body.addClass('is-ie'); $body.addClass('is-ie');
// Play initial animations on page load. // Play initial animations on page load.
@ -48,7 +48,7 @@
if ($sidebar.length > 0) { if ($sidebar.length > 0) {
//adding exclusion for home link //adding exclusion for home link
var $sidebar_a = $sidebar.find('a').not('.spc-home'); let $sidebar_a = $sidebar.find('a').not('.spc-home');
$sidebar_a $sidebar_a
.addClass('scrolly') .addClass('scrolly')
@ -57,7 +57,7 @@
var $this = $(this); var $this = $(this);
// External link? Bail. // External link? Bail.
if ($this.attr('href').charAt(0) != '#') if ($this.attr('href').charAt(0) !== '#')
return; return;
// Deactivate all links. // Deactivate all links.
@ -71,7 +71,7 @@
}) })
.each(function () { .each(function () {
var $this = $(this), let $this = $(this),
id = $this.attr('href'), id = $this.attr('href'),
$section = $(id); $section = $(id);
@ -81,7 +81,7 @@
// Scrollex. // Scrollex.
$section.scrollex({ $section.scrollex({
mode: 'middle', // mode: 'middle',
top: '-20vh', top: '-20vh',
bottom: '-20vh', bottom: '-20vh',
initialize: function () { initialize: function () {
@ -96,7 +96,7 @@
$section.removeClass('inactive'); $section.removeClass('inactive');
// No locked links? Deactivate all links and activate this section's one. // No locked links? Deactivate all links and activate this section's one.
if ($sidebar_a.filter('.active-locked').length == 0) { if ($sidebar_a.filter('.active-locked').length === 0) {
$sidebar_a.removeClass('active'); $sidebar_a.removeClass('active');
$this.addClass('active'); $this.addClass('active');
@ -133,13 +133,13 @@
// Spotlights. // Spotlights.
$('.spotlights > section') $('.spotlights > section')
.scrollex({ .scrollex({
mode: 'middle', // mode: 'middle',
top: '-10vh', top: '-10vh',
bottom: '-10vh', bottom: '-10vh',
initialize: function () { initialize: function () {
// Deactivate section. // Deactivate section.
// $(this).addClass('inactive'); $(this).addClass('inactive');
}, },
enter: function () { enter: function () {
@ -151,7 +151,7 @@
}) })
.each(function () { .each(function () {
var $this = $(this), let $this = $(this),
$image = $this.find('.image'), $image = $this.find('.image'),
$img = $image.find('img'), $img = $image.find('img'),
x; x;
@ -160,7 +160,7 @@
$image.css('background-image', 'url(' + $img.attr('src') + ')'); $image.css('background-image', 'url(' + $img.attr('src') + ')');
// Set background position. // Set background position.
if (x = $img.data('position')) if (x === $img.data('position'))
$image.css('background-position', x); $image.css('background-position', x);
// Hide <img>. // Hide <img>.
@ -171,7 +171,7 @@
// Features. // Features.
$('.features') $('.features')
.scrollex({ .scrollex({
mode: 'middle', // mode: 'middle',
top: '-20vh', top: '-20vh',
bottom: '-20vh', bottom: '-20vh',
initialize: function () { initialize: function () {
@ -189,3 +189,20 @@
}); });
})(jQuery); })(jQuery);
//From https://www.w3schools.com/howto/howto_js_collapsible.asp
let collapsibles = document.getElementsByClassName("collapsible");
Array.from(collapsibles).forEach(item => {
item.addEventListener("click", function () {
this.classList.toggle("collapsible-expanded");
let target = item.attributes.getNamedItem("data-target").value;
let content = document.getElementById(target);
if (content.style.maxHeight) {
content.style.maxHeight = null;
} else {
content.style.maxHeight = content.scrollHeight + "px";
}
});
})

152
data/magprog/assets/js/util.js
View File

@ -1,18 +1,18 @@
(function($) { (function ($) {
/** /**
* Generate an indented list of links from a nav. Meant for use with panel(). * Generate an indented list of links from a nav. Meant for use with panel().
* @return {jQuery} jQuery object. * @return {jQuery} jQuery object.
*/ */
$.fn.navList = function() { $.fn.navList = function () {
var $this = $(this); const $this = $(this);
$a = $this.find('a'), $a = $this.find('a'),
b = []; b = [];
$a.each(function() { $a.each(function () {
var $this = $(this), const $this = $(this),
indent = Math.max(0, $this.parents('li').length - 1), indent = Math.max(0, $this.parents('li').length - 1),
href = $this.attr('href'), href = $this.attr('href'),
target = $this.attr('target'); target = $this.attr('target');
@ -20,8 +20,8 @@
b.push( b.push(
'<a ' + '<a ' +
'class="link depth-' + indent + '"' + 'class="link depth-' + indent + '"' +
( (typeof target !== 'undefined' && target != '') ? ' target="' + target + '"' : '') + ((typeof target !== 'undefined' && target !== '') ? ' target="' + target + '"' : '') +
( (typeof href !== 'undefined' && href != '') ? ' href="' + href + '"' : '') + ((typeof href !== 'undefined' && href !== '') ? ' href="' + href + '"' : '') +
'>' + '>' +
'<span class="indent-' + indent + '"></span>' + '<span class="indent-' + indent + '"></span>' +
$this.text() + $this.text() +
@ -39,16 +39,17 @@
* @param {object} userConfig User config. * @param {object} userConfig User config.
* @return {jQuery} jQuery object. * @return {jQuery} jQuery object.
*/ */
$.fn.panel = function(userConfig) { $.fn.panel = function (userConfig) {
// No elements? let $this = $(this);
if (this.length == 0) // No elements?
if (this.length === 0)
return $this; return $this;
// Multiple elements? // Multiple elements?
if (this.length > 1) { if (this.length > 1) {
for (var i=0; i < this.length; i++) for (let i = 0; i < this.length; i++)
$(this[i]).panel(userConfig); $(this[i]).panel(userConfig);
return $this; return $this;
@ -56,8 +57,7 @@
} }
// Vars. // Vars.
var $this = $(this), let $body = $('body'),
$body = $('body'),
$window = $(window), $window = $(window),
id = $this.attr('id'), id = $this.attr('id'),
config; config;
@ -101,7 +101,7 @@
// Panel. // Panel.
// Methods. // Methods.
$this._hide = function(event) { $this._hide = function (event) {
// Already hidden? Bail. // Already hidden? Bail.
if (!config.target.hasClass(config.visibleClass)) if (!config.target.hasClass(config.visibleClass))
@ -119,7 +119,7 @@
config.target.removeClass(config.visibleClass); config.target.removeClass(config.visibleClass);
// Post-hide stuff. // Post-hide stuff.
window.setTimeout(function() { window.setTimeout(function () {
// Reset scroll position. // Reset scroll position.
if (config.resetScroll) if (config.resetScroll)
@ -127,7 +127,7 @@
// Reset forms. // Reset forms.
if (config.resetForms) if (config.resetForms)
$this.find('form').each(function() { $this.find('form').each(function () {
this.reset(); this.reset();
}); });
@ -147,13 +147,13 @@
.css('-webkit-tap-highlight-color', 'rgba(0,0,0,0)'); .css('-webkit-tap-highlight-color', 'rgba(0,0,0,0)');
$this $this
.on('click', 'a', function(event) { .on('click', 'a', function (event) {
var $a = $(this), const $a = $(this),
href = $a.attr('href'), href = $a.attr('href'),
target = $a.attr('target'); target = $a.attr('target');
if (!href || href == '#' || href == '' || href == '#' + id) if (!href || href === '#' || href === '' || href === '#' + id)
return; return;
// Cancel original event. // Cancel original event.
@ -164,9 +164,9 @@
$this._hide(); $this._hide();
// Redirect to href. // Redirect to href.
window.setTimeout(function() { window.setTimeout(function () {
if (target == '_blank') if (target === '_blank')
window.open(href); window.open(href);
else else
window.location.href = href; window.location.href = href;
@ -178,20 +178,20 @@
} }
// Event: Touch stuff. // Event: Touch stuff.
$this.on('touchstart', function(event) { $this.on('touchstart', function (event) {
$this.touchPosX = event.originalEvent.touches[0].pageX; $this.touchPosX = event.originalEvent.touches[0].pageX;
$this.touchPosY = event.originalEvent.touches[0].pageY; $this.touchPosY = event.originalEvent.touches[0].pageY;
}) })
$this.on('touchmove', function(event) { $this.on('touchmove', function (event) {
if ($this.touchPosX === null if ($this.touchPosX === null
|| $this.touchPosY === null) || $this.touchPosY === null)
return; return;
var diffX = $this.touchPosX - event.originalEvent.touches[0].pageX, const diffX = $this.touchPosX - event.originalEvent.touches[0].pageX,
diffY = $this.touchPosY - event.originalEvent.touches[0].pageY, diffY = $this.touchPosY - event.originalEvent.touches[0].pageY,
th = $this.outerHeight(), th = $this.outerHeight(),
ts = ($this.get(0).scrollHeight - $this.scrollTop()); ts = ($this.get(0).scrollHeight - $this.scrollTop());
@ -199,8 +199,8 @@
// Hide on swipe? // Hide on swipe?
if (config.hideOnSwipe) { if (config.hideOnSwipe) {
var result = false, let result = false;
boundary = 20, const boundary = 20,
delta = 50; delta = 50;
switch (config.side) { switch (config.side) {
@ -250,12 +250,12 @@
}); });
// Event: Prevent certain events inside the panel from bubbling. // Event: Prevent certain events inside the panel from bubbling.
$this.on('click touchend touchstart touchmove', function(event) { $this.on('click touchend touchstart touchmove', function (event) {
event.stopPropagation(); event.stopPropagation();
}); });
// Event: Hide panel if a child anchor tag pointing to its ID is clicked. // Event: Hide panel if a child anchor tag pointing to its ID is clicked.
$this.on('click', 'a[href="#' + id + '"]', function(event) { $this.on('click', 'a[href="#' + id + '"]', function (event) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
@ -267,12 +267,12 @@
// Body. // Body.
// Event: Hide panel on body click/tap. // Event: Hide panel on body click/tap.
$body.on('click touchend', function(event) { $body.on('click touchend', function (event) {
$this._hide(event); $this._hide(event);
}); });
// Event: Toggle. // Event: Toggle.
$body.on('click', 'a[href="#' + id + '"]', function(event) { $body.on('click', 'a[href="#' + id + '"]', function (event) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
@ -285,9 +285,9 @@
// Event: Hide on ESC. // Event: Hide on ESC.
if (config.hideOnEscape) if (config.hideOnEscape)
$window.on('keydown', function(event) { $window.on('keydown', function (event) {
if (event.keyCode == 27) if (event.keyCode === 27)
$this._hide(event); $this._hide(event);
}); });
@ -300,20 +300,20 @@
* Apply "placeholder" attribute polyfill to one or more forms. * Apply "placeholder" attribute polyfill to one or more forms.
* @return {jQuery} jQuery object. * @return {jQuery} jQuery object.
*/ */
$.fn.placeholder = function() { $.fn.placeholder = function () {
// Browser natively supports placeholders? Bail. // Browser natively supports placeholders? Bail.
if (typeof (document.createElement('input')).placeholder != 'undefined') if (typeof (document.createElement('input')).placeholder != 'undefined')
return $(this); return $(this);
// No elements? // No elements?
if (this.length == 0) if (this.length === 0)
return $this; return $this;
// Multiple elements? // Multiple elements?
if (this.length > 1) { if (this.length > 1) {
for (var i=0; i < this.length; i++) for (let i = 0; i < this.length; i++)
$(this[i]).placeholder(); $(this[i]).placeholder();
return $this; return $this;
@ -325,38 +325,38 @@
// Text, TextArea. // Text, TextArea.
$this.find('input[type=text],textarea') $this.find('input[type=text],textarea')
.each(function() { .each(function () {
var i = $(this); const i = $(this);
if (i.val() == '' if (i.val() === ''
|| i.val() == i.attr('placeholder')) || i.val() === i.attr('placeholder'))
i i
.addClass('polyfill-placeholder') .addClass('polyfill-placeholder')
.val(i.attr('placeholder')); .val(i.attr('placeholder'));
}) })
.on('blur', function() { .on('blur', function () {
var i = $(this); const i = $(this);
if (i.attr('name').match(/-polyfill-field$/)) if (i.attr('name').match(/-polyfill-field$/))
return; return;
if (i.val() == '') if (i.val() === '')
i i
.addClass('polyfill-placeholder') .addClass('polyfill-placeholder')
.val(i.attr('placeholder')); .val(i.attr('placeholder'));
}) })
.on('focus', function() { .on('focus', function () {
var i = $(this); const i = $(this);
if (i.attr('name').match(/-polyfill-field$/)) if (i.attr('name').match(/-polyfill-field$/))
return; return;
if (i.val() == i.attr('placeholder')) if (i.val() === i.attr('placeholder'))
i i
.removeClass('polyfill-placeholder') .removeClass('polyfill-placeholder')
.val(''); .val('');
@ -365,10 +365,10 @@
// Password. // Password.
$this.find('input[type=password]') $this.find('input[type=password]')
.each(function() { .each(function () {
var i = $(this); const i = $(this);
var x = $( const x = $(
$('<div>') $('<div>')
.append(i.clone()) .append(i.clone())
.remove() .remove()
@ -377,28 +377,28 @@
.replace(/type=password/i, 'type=text') .replace(/type=password/i, 'type=text')
); );
if (i.attr('id') != '') if (i.attr('id') !== '')
x.attr('id', i.attr('id') + '-polyfill-field'); x.attr('id', i.attr('id') + '-polyfill-field');
if (i.attr('name') != '') if (i.attr('name') !== '')
x.attr('name', i.attr('name') + '-polyfill-field'); x.attr('name', i.attr('name') + '-polyfill-field');
x.addClass('polyfill-placeholder') x.addClass('polyfill-placeholder')
.val(x.attr('placeholder')).insertAfter(i); .val(x.attr('placeholder')).insertAfter(i);
if (i.val() == '') if (i.val() === '')
i.hide(); i.hide();
else else
x.hide(); x.hide();
i i
.on('blur', function(event) { .on('blur', function (event) {
event.preventDefault(); event.preventDefault();
var x = i.parent().find('input[name=' + i.attr('name') + '-polyfill-field]'); const x = i.parent().find('input[name=' + i.attr('name') + '-polyfill-field]');
if (i.val() == '') { if (i.val() === '') {
i.hide(); i.hide();
x.show(); x.show();
@ -408,11 +408,11 @@
}); });
x x
.on('focus', function(event) { .on('focus', function (event) {
event.preventDefault(); event.preventDefault();
var i = x.parent().find('input[name=' + x.attr('name').replace('-polyfill-field', '') + ']'); const i = x.parent().find('input[name=' + x.attr('name').replace('-polyfill-field', '') + ']');
x.hide(); x.hide();
@ -421,7 +421,7 @@
.focus(); .focus();
}) })
.on('keypress', function(event) { .on('keypress', function (event) {
event.preventDefault(); event.preventDefault();
x.val(''); x.val('');
@ -432,17 +432,17 @@
// Events. // Events.
$this $this
.on('submit', function() { .on('submit', function () {
$this.find('input[type=text],input[type=password],textarea') $this.find('input[type=text],input[type=password],textarea')
.each(function(event) { .each(function (event) {
var i = $(this); const i = $(this);
if (i.attr('name').match(/-polyfill-field$/)) if (i.attr('name').match(/-polyfill-field$/))
i.attr('name', ''); i.attr('name', '');
if (i.val() == i.attr('placeholder')) { if (i.val() === i.attr('placeholder')) {
i.removeClass('polyfill-placeholder'); i.removeClass('polyfill-placeholder');
i.val(''); i.val('');
@ -452,7 +452,7 @@
}); });
}) })
.on('reset', function(event) { .on('reset', function (event) {
event.preventDefault(); event.preventDefault();
@ -460,10 +460,10 @@
.val($('option:first').val()); .val($('option:first').val());
$this.find('input,textarea') $this.find('input,textarea')
.each(function() { .each(function () {
var i = $(this), const i = $(this);
x; let x;
i.removeClass('polyfill-placeholder'); i.removeClass('polyfill-placeholder');
@ -478,11 +478,10 @@
x = i.parent().find('input[name=' + i.attr('name') + '-polyfill-field]'); x = i.parent().find('input[name=' + i.attr('name') + '-polyfill-field]');
if (i.val() == '') { if (i.val() === '') {
i.hide(); i.hide();
x.show(); x.show();
} } else {
else {
i.show(); i.show();
x.hide(); x.hide();
} }
@ -498,7 +497,7 @@
case 'textarea': case 'textarea':
i.val(i.attr('defaultValue')); i.val(i.attr('defaultValue'));
if (i.val() == '') { if (i.val() === '') {
i.addClass('polyfill-placeholder'); i.addClass('polyfill-placeholder');
i.val(i.attr('placeholder')); i.val(i.attr('placeholder'));
} }
@ -523,22 +522,23 @@
* @param {jQuery} $elements Elements (or selector) to move. * @param {jQuery} $elements Elements (or selector) to move.
* @param {bool} condition If true, moves elements to the top. Otherwise, moves elements back to their original locations. * @param {bool} condition If true, moves elements to the top. Otherwise, moves elements back to their original locations.
*/ */
$.prioritize = function($elements, condition) { $.prioritize = function ($elements, condition) {
var key = '__prioritize'; const key = '__prioritize';
// Expand $elements if it's not already a jQuery object. // Expand $elements if it's not already a jQuery object.
if (typeof $elements != 'jQuery') if (typeof $elements != 'jQuery')
$elements = $($elements); $elements = $($elements);
// Step through elements. // Step through elements.
$elements.each(function() { $elements.each(function () {
var $e = $(this), $p, const $e = $(this);
$parent = $e.parent(); let $p;
const $parent = $e.parent();
// No parent? Bail. // No parent? Bail.
if ($parent.length == 0) if ($parent.length === 0)
return; return;
// Not moved? Move it. // Not moved? Move it.
@ -552,7 +552,7 @@
$p = $e.prev(); $p = $e.prev();
// Couldn't find anything? Means this element's already at the top, so bail. // Couldn't find anything? Means this element's already at the top, so bail.
if ($p.length == 0) if ($p.length === 0)
return; return;
// Move element to top of parent. // Move element to top of parent.

11
src/main/kotlin/center/sciprog/spcMasters.kt
View File

@ -322,7 +322,7 @@ internal val spcMasters = HtmlSite {
MagProgSection( MagProgSection(
id = "partners", id = "partners",
title = "Партнеры", title = "Партнеры",
style = "wrapper style3 fullscreen" style = "wrapper style3 fullscreen fade-up"
) { ) {
fragment(partners) fragment(partners)
}, },
@ -330,14 +330,14 @@ internal val spcMasters = HtmlSite {
MagProgSection( MagProgSection(
id = "mentors", id = "mentors",
title = "Научные руководители", title = "Научные руководители",
style = "wrapper style2 spotlights", style = "wrapper style2 spotlights fade-up",
) { ) {
fragment(mentors) fragment(mentors)
}, },
MagProgSection( MagProgSection(
id = "program", id = "program",
title = "Учебная программа", title = "Учебная программа",
style = "wrapper style3 fullscreen" style = "wrapper style3 fullscreen fade-up"
) { ) {
fragment(programSection) fragment(programSection)
}, },
@ -358,7 +358,10 @@ internal val spcMasters = HtmlSite {
li { li {
a( a(
classes = "spc-home", classes = "spc-home",
href = "/" //TODO provide a way to navigate out-of-site href = resolvePageRef(
Name.EMPTY,
site.parent!!
)
) { ) {
i("fa fa-home") { i("fa fa-home") {
attributes["aria-hidden"] = "true" attributes["aria-hidden"] = "true"