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

fix xplr

Browse Source
This commit is contained in:
jr-k 2024-07-16 23:45:50 +02:00
parent 127eb6dce9
commit 20a3f101a3
13 changed files with 34 additions and 19 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

1
data/www/scss/components/_buttons.scss
View File

@ -16,6 +16,7 @@ button,
margin-top: -$shadowOffset;
min-width: 38px;
text-align: center;
justify-content: center;
i.icon-left {
margin-right: 5px;

1
lang/en.json
View File

@ -16,6 +16,7 @@
"slideshow_slide_panel_th_activity": "Options",
"slideshow_slide_panel_td_cron_scheduled_loop": "Loop",
"slideshow_slide_panel_td_cron_scheduled_notify": "Notify",
"slideshow_slide_panel_td_cron_scheduled_date": "Date",
"slideshow_slide_panel_td_cron_scheduled_bad_cron": "Bad cron value",
"slideshow_slide_form_add_title": "Add Slide",
"slideshow_slide_form_add_submit": "Add",

1
lang/es.json
View File

@ -16,6 +16,7 @@
"slideshow_slide_panel_th_activity": "Opciones",
"slideshow_slide_panel_td_cron_scheduled_loop": "Bucle",
"slideshow_slide_panel_td_cron_scheduled_notify": "Notificar",
"slideshow_slide_panel_td_cron_scheduled_date": "Fecha",
"slideshow_slide_panel_td_cron_scheduled_bad_cron": "Valor de cron incorrecto",
"slideshow_slide_form_add_title": "Agregar Diapositiva",
"slideshow_slide_form_add_submit": "Agregar",

1
lang/fr.json
View File

@ -16,6 +16,7 @@
"slideshow_slide_panel_th_activity": "Options",
"slideshow_slide_panel_td_cron_scheduled_loop": "En boucle",
"slideshow_slide_panel_td_cron_scheduled_notify": "Notifie",
"slideshow_slide_panel_td_cron_scheduled_date": "Date",
"slideshow_slide_panel_td_cron_scheduled_bad_cron": "Mauvaise valeur cron",
"slideshow_slide_form_add_title": "Ajout d'une slide",
"slideshow_slide_form_add_submit": "Ajouter",

1
lang/it.json
View File

@ -16,6 +16,7 @@
"slideshow_slide_panel_th_activity": "Opzioni",
"slideshow_slide_panel_td_cron_scheduled_loop": "Loop",
"slideshow_slide_panel_td_cron_scheduled_notify": "Notificare",
"slideshow_slide_panel_td_cron_scheduled_date": "Data",
"slideshow_slide_panel_td_cron_scheduled_bad_cron": "Valore cron errato",
"slideshow_slide_form_add_title": "Aggiungi Slide",
"slideshow_slide_form_add_submit": "Aggiungi",

1
src/controller/ContentController.py
View File

@ -143,6 +143,7 @@ class ContentController(ObController):
self._model_store.folder().add_folder(
entity=FolderEntity.CONTENT,
name=request.form['name'],
working_folder_path=request.form['working_folder_path'],
)
return redirect(url_for('slideshow_content_list'))

1
src/controller/FleetNodePlayerController.py
View File

@ -143,6 +143,7 @@ class FleetNodePlayerController(ObController):
self._model_store.folder().add_folder(
entity=FolderEntity.NODE_PLAYER,
name=request.form['name'],
working_folder_path=request.form['working_folder_path'],
)
return redirect(url_for('fleet_node_player_list'))

6
src/manager/FolderManager.py
View File

@ -188,8 +188,10 @@ class FolderManager(ModelManager):
self.update_form(folder_id, name)
def add_folder(self, entity: FolderEntity, name: str) -> Folder:
working_folder_path = self.get_working_folder(entity)
def add_folder(self, entity: FolderEntity, name: str, working_folder_path: Optional[str] = None) -> Folder:
if not working_folder_path:
working_folder_path = self.get_working_folder(entity)
working_folder = self.get_one_by_path(path=working_folder_path, entity=entity)
folder_path = "{}/{}".format(working_folder_path, name)
parts = folder_path[1:].split('/')

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

@ -33,15 +33,15 @@
</button>
<div class="explr-selection-actions">
<button type="button" class="explr-item-edit explr-selection-entity btn-info"
<button type="button" class="btn 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 type="button" class="explr-item-rename explr-selection-entity explr-selection-folder btn-info">
<button type="button" class="btn explr-item-rename explr-selection-entity explr-selection-folder btn-info">
<i class="fa fa-pencil"></i>
</button>
<button type="button"
class="explr-item-delete explr-selection-entity explr-selection-folder btn-danger-alt"
class="btn 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>
@ -113,6 +113,7 @@
<a href="javascript:void(0);">
<i class="fa fa-folder"></i>
<form action="{{ url_for('fleet_node_player_folder_add') }}" method="POST">
<input type="hidden" name="working_folder_path" value="{{ working_folder_path }}" />
<input type="text" name="name" autocomplete="off"/>
</form>
</a>

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

@ -91,13 +91,7 @@
</div>
</div>
<h4 class="divide">
QR Code
</h4>
<p>
{{ l.playlist_form_preview_qrcode_desc }}
</p>
<div id="qrcode" class="qrcode-pic" data-qrcode-payload="{{ preview_url }}"></div>
<h4 class="divide">
Iframe
</h4>
@ -112,6 +106,15 @@
<i class="fa fa-play"></i>
</button>
</div>
<h4 class="divide">
QR Code
</h4>
<p>
{{ l.playlist_form_preview_qrcode_desc }}
</p>
<div id="qrcode" class="qrcode-pic" data-qrcode-payload="{{ preview_url }}"></div>
</div>

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

@ -35,15 +35,15 @@
</button>
<div class="explr-selection-actions">
<button type="button" class="explr-item-edit explr-selection-entity btn-info"
<button type="button" class="btn 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 type="button" class="explr-item-rename explr-selection-entity explr-selection-folder btn-info">
<button type="button" class="btn explr-item-rename explr-selection-entity explr-selection-folder btn-info">
<i class="fa fa-pencil"></i>
</button>
<button type="button"
class="explr-item-delete explr-selection-entity explr-selection-folder btn-danger-alt"
class="btn 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>
@ -115,6 +115,7 @@
<a href="javascript:void(0);">
<i class="fa fa-folder"></i>
<form action="{{ url_for('slideshow_content_folder_add') }}" method="POST">
<input type="hidden" name="working_folder_path" value="{{ working_folder_path }}" />
<input type="text" name="name" autocomplete="off"/>
</form>
</a>

7
views/slideshow/slides/component/table.jinja.html
View File

@ -36,7 +36,7 @@
⏳ <span class="cron-description">{{ cron_desc }}</span>
{% endif %}
{% else %}
<span class="error">⚠️ {{ l.slideshow_slide_panel_td_cron_scheduled_bad_cron }}</span>
<span class="error"><i class="fa fa-warning danger"></i> {{ l.slideshow_slide_panel_td_cron_scheduled_bad_cron }}</span>
{% endif %}
{% else %}
🔄 <span class="prefix">{{ l.slideshow_slide_panel_td_cron_scheduled_loop }}</span>
@ -48,7 +48,8 @@
{% if cron_desc_end %}
{% if is_valid_cron_date_time(slide.cron_schedule_end) %}
{% if slide.is_notification %}
📆<span class="cron-description">{{ cron_desc_end }}</span>
📆 <span class="prefix">{{ l.slideshow_slide_panel_td_cron_scheduled_date }}</span>
<span class="cron-description">{{ cron_desc_end }}</span>
{% else %}
⏱️ <span class="prefix">{{ slide.duration }} {{ l.slideshow_slide_panel_th_duration_unit }}</span>
<span class="cron-description">{{ cron_desc_end }}</span>
@ -57,7 +58,7 @@
⏳ <span class="cron-description">{{ cron_desc_end }}</span>
{% endif %}
{% else %}
<span class="error">⚠️ {{ l.slideshow_slide_panel_td_cron_scheduled_bad_cron }}</span>
<span class="error"><i class="fa fa-warning danger"></i>️ {{ l.slideshow_slide_panel_td_cron_scheduled_bad_cron }}</span>
{% endif %}
{% else %}
⏱️ <span class="prefix">{{ slide.duration }} {{ l.slideshow_slide_panel_th_duration_unit }}</span>