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

fixes for 1.16

Browse Source
This commit is contained in:
jr-k 2024-05-25 23:39:35 +02:00
parent dc2534478a
commit 16df722b75
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/en.json
View File

@ -193,7 +193,7 @@
"enum_application_language_english": "English",
"enum_application_language_french": "French",
"enum_slide_type_url": "URL",
"enum_slide_type_video": "Video",
"enum_slide_type_video": "Video (MP4 only)",
"enum_slide_type_picture": "Picture",
"enum_slide_type_youtube": "Youtube"
}

2
lang/fr.json
View File

@ -193,7 +193,7 @@
"enum_application_language_english": "Anglais",
"enum_application_language_french": "Français",
"enum_slide_type_url": "URL",
"enum_slide_type_video": "Vidéo",
"enum_slide_type_video": "Vidéo (MP4 seulement)",
"enum_slide_type_picture": "Image",
"enum_slide_type_youtube": "Youtube"
}

1
src/service/TemplateRenderer.py
View File

@ -35,6 +35,7 @@ class TemplateRenderer:
LANG=self._model_store.variable().map().get('lang').as_string(),
HOOK=self._render_hook,
cron_descriptor=self.cron_descriptor,
str=str,
seconds_to_hhmmss=seconds_to_hhmmss,
is_validate_cron_date_time=is_validate_cron_date_time,
l=self._model_store.lang().map(),

6
views/player/player.jinja.html
View File

@ -13,7 +13,7 @@
.slide { display: flex; flex-direction: row; justify-content: center; align-items: center; background: black; }
.slide, iframe { position: absolute; top: 0; left: 0; width: 100%; height: 100%; border: none; padding-top: 0; box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; }
.slide iframe { background: white; }
.slide img { height: 100%; }
.slide img, .slide video { height: 100%; }
</style>
<script type="application/javascript" src="{{ STATIC_PREFIX }}js/lib/is-cron-now.js"></script>
</head>
@ -316,7 +316,7 @@
}
function loadPicture(element, callbackReady, item) {
element.innerHTML = `<img src="${item.location}" alt="" />`;
element.innerHTML = `<img src="/${item.location}" alt="" />`;
callbackReady(function () {});
}
@ -341,7 +341,7 @@
}
function loadVideo(element, callbackReady, item) {
element.innerHTML = `<video><source src=${item.location} type="video/mp4" /></video>`;
element.innerHTML = `<video><source src=/${item.location} type="video/mp4" /></video>`;
var video = element.querySelector('video');
callbackReady(function () {});

2
views/slideshow/component/table.jinja.html
View File

@ -86,6 +86,8 @@
{% if var_external_url.as_string().strip()|length > 0 and slide.has_file() %}
{% set location = var_external_url.value ~ '/' ~ slide.location %}
{% elif slide.has_file() %}
{% set location ='/' ~ slide.location %}
{% endif %}
{% if slide.type == enum_slide_type.YOUTUBE %}

5
views/slideshow/list.jinja.html
View File

@ -68,9 +68,10 @@
</a>
</li>
{% for playlist in playlists %}
<li class="{% if current_playlist %}active{% endif %}">
{% set is_active_playlist = str(current_playlist.id) == str(playlist.id) %}
<li class="{% if is_active_playlist %}active{% endif %}">
<a href="{{ url_for('slideshow_slide_list_playlist_use', playlist_id=playlist.id) }}" class="select-playlist">
{% if current_playlist %}
{% if is_active_playlist %}
<i class="fa fa-play icon-left"></i>
{% endif %}
{{ playlist.name }}

2
views/slideshow/modal/add.jinja.html
View File

@ -10,7 +10,7 @@
</h3>
{% if current_playlist %}
<input name="playlist" type="text" id="slide-add-playlist" value="{{ current_playlist.id }}">
<input name="playlist" type="hidden" id="slide-add-playlist" value="{{ current_playlist.id }}">
{% endif %}
<div class="form-group">