From ec21c3a89a0fcd2eb3256fbed0103ecb30a69d27 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 21 Mar 2023 20:58:01 +0100 Subject: [PATCH] yWeb/Y_Timer: minor changes to languages and colors Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/48c7490e140008b4c9e321860afbee39bb7b04a0 Author: vanhofen Date: 2023-03-21 (Tue, 21 Mar 2023) Origin message was: ------------------ - yWeb/Y_Timer: minor changes to languages and colors ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Y_Main.css | 1 + data/y-web/Y_Timer_Edit.yhtm | 2 +- data/y-web/Y_Timer_List.yhtm | 4 ++-- data/y-web/Y_Version.txt | 4 ++-- data/y-web/languages/Deutsch | 2 +- data/y-web/languages/English | 2 +- data/y-web/styles/Y_Dist-NI_dark.css | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/data/y-web/Y_Main.css b/data/y-web/Y_Main.css index 13d6a8e0e..59c985e4a 100644 --- a/data/y-web/Y_Main.css +++ b/data/y-web/Y_Main.css @@ -1016,6 +1016,7 @@ a.timer { font-weight:bold; text-align: center; border-bottom : 1px solid #aaaaaa; + vertical-align: top; } .timer_footer td { font-weight:bold; diff --git a/data/y-web/Y_Timer_Edit.yhtm b/data/y-web/Y_Timer_Edit.yhtm index e9c54a840..5e175be1f 100644 --- a/data/y-web/Y_Timer_Edit.yhtm +++ b/data/y-web/Y_Timer_Edit.yhtm @@ -124,7 +124,7 @@ function init() - {=L:live.timer_edit.repeat1=} + {=L:live.timer_edit.repeatings=} diff --git a/data/y-web/Y_Timer_List.yhtm b/data/y-web/Y_Timer_List.yhtm index a55384d97..97f29382e 100644 --- a/data/y-web/Y_Timer_List.yhtm +++ b/data/y-web/Y_Timer_List.yhtm @@ -13,7 +13,7 @@ {=L:live.timer_edit.alarm_date=} {=L:live.timer_edit.stop_date=} {=L:live.timer_edit.repeat=} - {=L:live.timer_edit.repeat1=} + {=L:live.timer_edit.repeatings=} {=L:live.timer_edit.type=} {=L:live.timer_edit.description=}   @@ -41,7 +41,7 @@ {=func:get_timer_list {=var-get:row=}=} - + neuer Timer diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index bdccbcc31..20d40dae4 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.1.4 -date=18.03.2023 +version=3.1.5 +date=21.03.2023 info=NI-Neutrino-Webinterface diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index 201d2767e..ed504884f 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -467,7 +467,7 @@ live.timer_edit.alarm_date=Alarm-Datum live.timer_edit.time=Zeit live.timer_edit.stop_date=Stop-Datum live.timer_edit.repeat=Wiederholung -live.timer_edit.repeat1=Wiederholungen (0 = unbegrenzt) +live.timer_edit.repeatings=Wiederholungen
(0 = unbegrenzt) live.timer_edit.weekdays.format=(Mo-So, X=Timer) live.timer_edit.weekdays=Wochentage live.timer_edit.values=Werte diff --git a/data/y-web/languages/English b/data/y-web/languages/English index c82a8213f..d1060205b 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -467,7 +467,7 @@ live.timer_edit.alarm_date=Alarm date live.timer_edit.time=Time live.timer_edit.stop_date=Stop date live.timer_edit.repeat=Repeat -live.timer_edit.repeat1=Repeat (0 = unlimited) +live.timer_edit.repeatings=Repeat
(0 = unlimited) live.timer_edit.weekdays.format=(Mo-Su, X=Timer) live.timer_edit.weekdays=Weekdays live.timer_edit.values=Values diff --git a/data/y-web/styles/Y_Dist-NI_dark.css b/data/y-web/styles/Y_Dist-NI_dark.css index dab055134..3f6d0c130 100644 --- a/data/y-web/styles/Y_Dist-NI_dark.css +++ b/data/y-web/styles/Y_Dist-NI_dark.css @@ -327,7 +327,7 @@ textarea { } .atimer { - background-color: #535353; + background-color: #3b3b3b; } .lt_table th {