csmith1865/obscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

slide wip

Browse Source
This commit is contained in:
jr-k 2024-07-16 01:54:31 +02:00
parent c833aa854c
commit 8deaad5042
15 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/www/css/compiled/main.css
View File

File diff suppressed because one or more lines are too long

13
data/www/js/global.js
View File

@ -89,11 +89,20 @@ jQuery(document).ready(function ($) {
hidePicker();
});
$(document).on('focus', 'input.disabled', function () {
$(this).blur();
});
$(document).keyup(function (e) {
if (e.key === "Escape") {
hideModal();
hidePicker();
hideDropdowns();
if ($('.pickers .modal:visible').length) {
hidePicker();
return;
}
hideModal();
}
});

4
data/www/scss/components/_explorer.scss
View File

@ -183,4 +183,8 @@ ul.explr-dirview {
border-radius: 4px;
margin-top: 15px;
}
}
.content-explr-picker {
cursor: pointer;
}

2
data/www/scss/forms/_forms.scss
View File

@ -127,6 +127,7 @@ form {
font-size: 14px;
&.input-naked,
&.disabled,
&[disabled] {
color: #555;
background: none;
@ -136,6 +137,7 @@ form {
border-radius: 0;
}
&.disabled,
&[disabled] {
border: none;
background: $black;

2
views/auth/list.jinja.html
View File

@ -19,7 +19,7 @@
<div class="toolbar-actions">
{{ HOOK(H_AUTH_TOOLBAR_ACTIONS_START) }}
<button class="purple user-add item-add"><i class="fa fa-plus icon-left"></i>{{ l.auth_user_button_add }}</button>
<button type="button" class="purple user-add item-add"><i class="fa fa-plus icon-left"></i>{{ l.auth_user_button_add }}</button>
{{ HOOK(H_AUTH_TOOLBAR_ACTIONS_END) }}
</div>
</div>

2
views/configuration/sysinfo/list.jinja.html
View File

@ -20,7 +20,7 @@
<div class="top-actions">
{{ HOOK(H_SYSINFO_TOOLBAR_ACTIONS_START) }}
<button class="btn btn-info sysinfo-restart">
<button type="button" class="btn btn-info sysinfo-restart">
<i class="fa fa-refresh icon-left"></i>{{ l.sysinfo_panel_button_restart }}
</button>
{{ HOOK(H_SYSINFO_TOOLBAR_ACTIONS_END) }}

10
views/fleet/node-players/list.jinja.html
View File

@ -29,22 +29,22 @@
{{ HOOK(H_FLEET_NODE_PLAYER_TOOLBAR_ACTIONS_START) }}
<div class="explr-selection-actions">
<button class="explr-item-edit explr-selection-entity btn-info" data-entity-route="{{ url_for('fleet_node_player_edit', node_player_id='!c!') }}">
<button type="button" class="explr-item-edit explr-selection-entity btn-info" data-entity-route="{{ url_for('fleet_node_player_edit', node_player_id='!c!') }}">
<i class="fa fa-eye"></i>
</button>
<button class="explr-item-rename explr-selection-entity explr-selection-folder btn-info">
<button type="button" class="explr-item-rename explr-selection-entity explr-selection-folder btn-info">
<i class="fa fa-pencil"></i>
</button>
<button class="explr-item-delete explr-selection-entity explr-selection-folder btn-danger-alt" data-folder-route="{{ url_for('fleet_node_player_folder_delete') }}" data-entity-route="{{ url_for('fleet_node_player_delete') }}">
<button type="button" class="explr-item-delete explr-selection-entity explr-selection-folder btn-danger-alt" data-folder-route="{{ url_for('fleet_node_player_folder_delete') }}" data-entity-route="{{ url_for('fleet_node_player_delete') }}">
<i class="fa fa-trash-alt"></i>
</button>
</div>
<button class="btn btn-info node-player-add item-add">
<button type="button" class="btn btn-info node-player-add item-add">
<i class="fa fa-file-circle-plus icon-left"></i>
{{ l.fleet_node_player_button_add }}
</button>
<button class="folder-add btn-neutral">
<button type="button" class="folder-add btn-neutral">
<i class="fa fa-folder-plus icon-left"></i>
{{ l.common_new_folder }}
</button>

2
views/fleet/player-group/list.jinja.html
View File

@ -19,7 +19,7 @@
<div class="toolbar-actions">
{{ HOOK(H_FLEET_NODE_PLAYER_GROUP_TOOLBAR_ACTIONS_START) }}
<button class="purple node-player-group-add item-add"><i class="fa fa-plus icon-left"></i>{{ l.fleet_node_player_group_button_add }}</button>
<button type="button" class="purple node-player-group-add item-add"><i class="fa fa-plus icon-left"></i>{{ l.fleet_node_player_group_button_add }}</button>
{{ HOOK(H_FLEET_NODE_PLAYER_GROUP_TOOLBAR_ACTIONS_END) }}
</div>
</div>

6
views/playlist/component/edit.jinja.html
View File

@ -56,7 +56,7 @@
{% endwith %}
<div class="actions actions-right">
<button class="btn btn-info slide-add">
<button type="button" class="btn btn-info slide-add">
<i class="fa fa-image"></i> {{ l.slideshow_slide_form_add_title }}
</button>
</div>
@ -74,7 +74,7 @@
<div class="widget">
<input type="text" name="name" id="playlist-preview-url" required="required" value="{{ preview_url }}"
class="disabled" disabled="disabled"/>
<button class="btn btn-naked copy-link" data-target-id="playlist-preview-url">
<button type="button" class="btn btn-naked copy-link" data-target-id="playlist-preview-url">
<i class="fa fa-copy"></i>
</button>
<a href="{{ preview_url }}" class="btn btn-neutral" target="_blank">
@ -99,7 +99,7 @@
</p>
<div class="preview">
<button class="btn btn-info btn-naked"
<button type="button" class="btn btn-info btn-naked"
onclick="$(this).parent().find('iframe').removeClass('hidden');$(this).addClass('hidden');">
<i class="fa fa-eye icon-left"></i> {{ l.playlist_panel_preview_action }}
</button>

2
views/playlist/list.jinja.html
View File

@ -47,7 +47,7 @@
<div class="top-actions">
{{ HOOK(H_PLAYLIST_TOOLBAR_ACTIONS_START) }}
<button class="btn btn-info playlist-add item-add">
<button type="button" class="btn btn-info playlist-add item-add">
<i class="fa fa-play icon-left"></i>
{{ l.playlist_button_add }}
</button>

10
views/slideshow/contents/list.jinja.html
View File

@ -30,25 +30,25 @@
{{ HOOK(H_SLIDESHOW_CONTENT_TOOLBAR_ACTIONS_START) }}
<div class="explr-selection-actions">
<button class="explr-item-edit explr-selection-entity btn-info"
<button type="button" class="explr-item-edit explr-selection-entity btn-info"
data-entity-route="{{ url_for('slideshow_content_edit', content_id='!c!') }}">
<i class="fa fa-eye"></i>
</button>
<button class="explr-item-rename explr-selection-entity explr-selection-folder btn-info">
<button type="button" class="explr-item-rename explr-selection-entity explr-selection-folder btn-info">
<i class="fa fa-pencil"></i>
</button>
<button class="explr-item-delete explr-selection-entity explr-selection-folder btn-danger-alt"
<button type="button" class="explr-item-delete explr-selection-entity explr-selection-folder btn-danger-alt"
data-folder-route="{{ url_for('slideshow_content_folder_delete') }}"
data-entity-route="{{ url_for('slideshow_content_delete') }}">
<i class="fa fa-trash-alt"></i>
</button>
</div>
<button class="btn btn-info content-add item-add">
<button type="button" class="btn btn-info content-add item-add">
<i class="fa fa-file-circle-plus icon-left"></i>
{{ l.slideshow_content_button_add }}
</button>
<button class="folder-add btn-neutral">
<button type="button" class="folder-add btn-neutral">
<i class="fa fa-folder-plus icon-left"></i>
{{ l.common_new_folder }}
</button>

7
views/slideshow/contents/modal/explr-picker.jinja.html
View File

@ -5,4 +5,11 @@
{% with use_href=False %}
{% include 'slideshow/contents/component/explr-sidebar.jinja.html' %}
{% endwith %}
<div class="actions">
<button type="button" class="btn btn-naked picker-close">
<i class="fa fa-close icon-left"></i>{{ l.common_close }}
</button>
</div>
</div>

2
views/slideshow/slides/list.jinja.html
View File

@ -5,7 +5,7 @@
<i class="fa fa-refresh"></i>
</a>
<button class="purple slide-add item-add"><i class="fa fa-plus icon-left"></i>{{ l.slideshow_slide_button_add }}</button>
<button type="button" class="purple slide-add item-add"><i class="fa fa-plus icon-left"></i>{{ l.slideshow_slide_button_add }}</button>
</div>
</div>

6
views/slideshow/slides/modal/add.jinja.html
View File

@ -27,12 +27,12 @@
<div class="form-group slide-content-id-group">
<label for="slide-add-content-id">{{ l.slideshow_slide_form_label_content_id }}</label>
<div class="widget">
<input type="text" disabled="disabled" value="" class="target-label" />
<input type="text" value="" class="disabled target-label content-explr-picker" />
<input type="text" name="content_id" id="slide-add-content-id" required="required" class="target hidden" />
<button class="btn btn-naked content-explr-picker">
<button type="button" class="btn btn-naked content-explr-picker">
<i class="fa fa-crosshairs"></i>
</button>
<button class="btn btn-neutral hidden slide-content-show" data-route="{{ url_for('slideshow_content_show', content_id='__id__') }}">
<button type="button" class="btn btn-neutral hidden slide-content-show" data-route="{{ url_for('slideshow_content_show', content_id='__id__') }}">
<i class="fa-solid fa-up-right-from-square"></i>
</button>
</div>

6
views/slideshow/slides/modal/edit.jinja.html
View File

@ -29,12 +29,12 @@
<div class="form-group slide-content-id-group">
<label for="slide-edit-content-id">{{ l.slideshow_slide_form_label_content_id }}</label>
<div class="widget">
<input type="text" disabled="disabled" value="" class="target-label" />
<input type="text" value="" class="disabled target-label content-explr-picker" />
<input type="hidden" name="content_id" id="slide-edit-content-id" required="required" class="target"></input>
<button class="btn btn-naked content-explr-picker">
<button type="button" class="btn btn-naked content-explr-picker">
<i class="fa fa-crosshairs"></i>
</button>
<button class="btn btn-neutral hidden slide-content-show" data-route="{{ url_for('slideshow_content_show', content_id='__id__') }}">
<button type="button" class="btn btn-neutral hidden slide-content-show" data-route="{{ url_for('slideshow_content_show', content_id='__id__') }}">
<i class="fa-solid fa-up-right-from-square"></i>
</button>
</div>