Skip to content

Commit

Permalink
Merge pull request #152 from jr-k/develop
Browse files Browse the repository at this point in the history 
Release v2.5.2
  • Loading branch information
@jr-k
jr-k committed Aug 29, 2024
2 parents cf499f5 + 62fc62a commit 815419e
Show file tree
Hide file tree
Showing 79 changed files with 3,032 additions and 290 deletions.
2 changes: 1 addition & 1 deletion data/www/css/compiled/main-dark-mode.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/www/css/compiled/main-light-mode.css
View file

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions data/www/js/explorer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,21 @@ jQuery(function ($) {

const initExplr = function () {
$('.explr').each(function () {
$(this).explr({
const expanded = $(this).attr('data-expanded') === '1';
const opts = {
classesPlus: 'fa fa-chevron-right',
classesMinus: 'fa fa-chevron-down',
onLoadFinish: function ($tree) {
$tree.removeClass('hidden');
}
});
};

if (expanded) {
opts['rememberState'] = false;
opts['startCollapsed'] = false;
}

$(this).explr(opts);

// Open complete path in explorer sidebar
explrSidebarOpenFromFolder($(this).attr('data-working-folder-id'));
Expand Down
21 changes: 0 additions & 21 deletions data/www/js/fleet/node-player-groups.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,6 @@ jQuery(document).ready(function ($) {
$('.modal-node-player-group-add input:eq(0)').focus().select();
});

$(document).on('click', '.node-player-group-preview', function () {
const $icon = $(this).find('i');
const isPlay = $icon.hasClass('fa-play');
const $holder = $(this).parents('.preview:eq(0)');

if (isPlay) {
const $iframe = $('<iframe>', {
src: $(this).attr('data-url'),
frameborder: 0
});

$holder.append($iframe);
$(this).addClass('hover-only');
$icon.removeClass('fa-play').addClass('fa-pause');
} else {
$holder.find('iframe').remove();
$(this).removeClass('hover-only');
$icon.removeClass('fa-pause').addClass('fa-play');
}
});

$(document).on('click', '.node-player-group-player-assign', function () {
const route = $(this).attr('data-route');
showPickers('modal-node-player-explr-picker', function (nodePlayer) {
Expand Down
61 changes: 61 additions & 0 deletions data/www/js/fleet/node-studios.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
jQuery(document).ready(function ($) {

const main = function () {
inputOperatingSystemUpdate();
};

window.explrNodeStudioEdit = function ($this) {
const nodeStudio = JSON.parse($this.parents('li:eq(0)').attr('data-entity-json'));
showModal('modal-node-studio-edit');
$('.modal-node-studio-edit input:visible:eq(0)').focus().select();
$('#node-studio-edit-name').val(nodeStudio.name);
$('#node-studio-edit-host').val(nodeStudio.host);
$('#node-studio-edit-id').val(nodeStudio.id);
$('#node-studio-edit-operating-system').val(nodeStudio.operating_system);
$('#node-studio-edit-group-label').val(nodeStudio.group_label);
$('.group-edit-link').attr('href', 'javascript:void(0);');
$('.form-group-for-group-id').addClass('hidden');

if (nodeStudio.group_id) {
$('.form-group-for-group-id').removeClass('hidden');
$('.group-edit-link').attr('href', $('.group-edit-link').attr('data-route').replace('__id__', nodeStudio.group_id));
}

inputOperatingSystemUpdate();
};

const inputOperatingSystemUpdate = function () {
const $el = $('form:visible .operating-system-select');
if ($el.length === 0) return;
const $form = $el.parents('form:eq(0)');
const value = $el.val();
const $selectedOption = $el.find('option[value='+value+']');
const optionAttributes = $selectedOption.get(0).attributes;
const color = optionAttributes['data-color'].value;
$('.operating-system-icon').attr('class', 'operating-system-icon fa ' + optionAttributes['data-icon'].value);
$('.tab-select .widget').attr('class', 'widget ' + ('border-' + color) + ' ' + color);
$form.find('button[type=submit]').attr('class', 'btn ' + ('btn-' + color));
};

$(document).on('change', '.operating-system-select', inputOperatingSystemUpdate);

$(document).on('click', '.folder-add', function () {
$('.dirview .new-folder').removeClass('hidden');
$('.page-content').animate({scrollTop: 0}, 0);
$('.dirview input').focus();
});

$(document).on('click', '.node-studio-add', function () {
showModal('modal-node-studio-add');
inputOperatingSystemUpdate();
$('.modal-node-studio-add input:eq(0)').focus().select();
});

$(document).on('submit', '.modal-node-studio-add form', function () {
const $modal = $(this).parents('.modal:eq(0)');
$modal.find('button[type=submit]').addClass('hidden');
$modal.find('.btn-loading').removeClass('hidden');
});

main();
});
19 changes: 19 additions & 0 deletions data/www/js/fleet/studio-fleet-view.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
jQuery(document).ready(function ($) {
$('.active').removeClass('active');

$(document).on('click', '.explr-pick-element', function() {
$('.active').removeClass('active');
const $item = $(this).parents('.explr-item:eq(0)');
const payload = $item.data('entity-json');

const $iframe = $('<iframe>', {
src: payload.host,
frameborder: 0
});

const $holder = $('.iframe-holder');
$holder.html($iframe);

$(this).addClass('active');
});
});
22 changes: 22 additions & 0 deletions data/www/js/global.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,27 @@ jQuery(document).ready(function ($) {
$(this).find('.btn-loading').addClass('hidden');
});
});


$(document).on('click', '.iframe-preview', function () {
const $icon = $(this).find('i');
const isPlay = $icon.hasClass('fa-play');
const $holder = $(this).parents('.iframe-preview-holder:eq(0)');

if (isPlay) {
const $iframe = $('<iframe>', {
src: $(this).attr('data-url'),
frameborder: 0
});

$holder.append($iframe);
$holder.addClass('playing');
$icon.removeClass('fa-play').addClass('fa-pause');
} else {
$holder.find('iframe').remove();
$holder.removeClass('playing');
$icon.removeClass('fa-pause').addClass('fa-play');
}
});
});

20 changes: 0 additions & 20 deletions data/www/js/playlist/playlists.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,6 @@ jQuery(document).ready(function ($) {
$('.modal-playlist-add input:eq(0)').focus().select();
});

$(document).on('click', '.playlist-preview', function () {
const $icon = $(this).find('i');
const isPlay = $icon.hasClass('fa-play');
const $holder = $(this).parents('.preview:eq(0)');

if (isPlay) {
const $iframe = $('<iframe>', {
src: $(this).attr('data-url'),
frameborder: 0
});

$holder.append($iframe);
$(this).addClass('hover-only');
$icon.removeClass('fa-play').addClass('fa-pause');
} else {
$holder.find('iframe').remove();
$(this).removeClass('hover-only');
$icon.removeClass('fa-pause').addClass('fa-play');
}
});
//
// $(document).on('click', '.cast-scan', function () {
// showModal('modal-playlist-cast-scan');
Expand Down
2 changes: 1 addition & 1 deletion data/www/js/slideshow/slides.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jQuery(document).ready(function ($) {
const $isNotification = $modal.find('.slide-is-notification');

const isNotification = $isNotification.val() === '1';
const isVideo = $contentGroup.find('.target').attr('data-type') === 'video';
const isVideo = $contentGroup.find('.target').attr('data-type') === 'video' || $contentGroup.find('.target').attr('data-type') === 'playlist_embed';
let isLoopStart = $triggerStart.val() === 'loop';
let isCronStart = $triggerStart.val() === 'cron';

Expand Down
8 changes: 8 additions & 0 deletions data/www/scss/base/_html.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ main {
button {
margin-left: 10px;
}

.right-actions {
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: center;
flex: 1;
}
}
}

Expand Down
124 changes: 92 additions & 32 deletions data/www/scss/base/_menu.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,30 @@ menu {
display: flex;

a {
@include pixel-text(0);
flex: 1;
font-family: 'Sixtyfour', 'Work Sans', 'Arial', 'sans-serif';
align-self: stretch;
padding-right: 3px;
font-size: 20px;
text-transform: uppercase;
transition: all 550ms cubic-bezier(0.19, 1, 0.22, 1);
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
position: relative;
color: $white;

span {
@include pixel-text(0);
transition: all 550ms cubic-bezier(0.19, 1, 0.22, 1);
padding-right: 3px;
font-size: 20px;
text-transform: uppercase;
color: $white;
font-family: 'Sixtyfour', 'Work Sans', 'Arial', 'sans-serif';
flex: 1;
align-self: stretch;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
position: relative;
}

img {
flex-shrink: 0;
Expand All @@ -48,10 +58,12 @@ menu {
}
}

&:hover {
&.uncollapsed:hover {
h1.logo {
a {
@include pixel-text(3);
span {
@include pixel-text(3);
}

img {
&.before {
Expand Down Expand Up @@ -90,8 +102,6 @@ menu {
border-radius: $baseRadius;

a {
color: rgba($gscaleF, 0.9);
font-size: 16px;
display: flex;
flex-direction: row;
justify-content: flex-start;
Expand All @@ -102,6 +112,12 @@ menu {
padding-bottom: 5px;
padding-left: 10px;

span {
color: rgba($gscaleF, 0.9);
font-size: 16px;
flex: 1;
}

i {
color: $gscaleF;
opacity: .2;
Expand All @@ -118,21 +134,6 @@ menu {
}
}

&:after {
background: $gscaleF;
content: "";
height: 195px;
left: -200px;
opacity: .2;
position: absolute;
top: -50px;
transform: rotate(35deg);
transition: all 550ms cubic-bezier(0.19, 1, 0.22, 1);
width: 50px;
z-index: -2;
cursor: pointer;
}

&.active {
a {
color: $primary;
Expand All @@ -150,12 +151,6 @@ menu {
&:hover {
background: $primary;

&:after {
z-index: 2;
left: 120%;
transition: all 550ms cubic-bezier(0.19, 1, 0.22, 1);
}

a {
color: $white;
font-weight: bold;
Expand Down Expand Up @@ -186,6 +181,71 @@ menu {
a {
color: $gscale7;
font-weight: bold;

span {
color: $gscale7;
font-weight: bold;
}
}
}
}
}

&.collapsed {
width: 60px;
min-width: initial;
padding-left: 10px;
padding-right: 10px;

h1.logo {
margin: 40px 0 0 0;

img.before {
margin: 0;
}
img.after,
span {
display: none;
}
}

nav {
ul {
li {
a {
padding-left: 0;

span {
display: none;
}
i {
margin: 0;
}
}
}
}
}

footer {
padding: 5px 0;
background: rgba($gscaleF, 0.03);
border-radius: $baseRadius;

p.version {
> span {
display: none;
}

a {
display: flex;
flex-direction: column-reverse;
justify-content: flex-start;
align-items: center;

span {
font-size: 10px;
margin-top: 5px;
}
}
}
}
Expand Down
Loading

0 comments on commit 815419e

Please sign in to comment.