diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 7e65801a4..6ed4eaf4e 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -13,6 +13,7 @@ install_DATA = channels.js \ robots.txt \ Y_About.yhtm \ Y_Baselib.js \ + Y_Blank.yhtm \ Y_Blocks.txt \ Y_Blocks_Neutrino.txt \ Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \ @@ -87,7 +88,6 @@ install_DATA += accordion.js \ install_DATA += Y_NIlib.js \ Y_NI.css \ Y_NI_About.yhtm \ - Y_NI_blank.yhtm \ Y_NI_Camd-control.yhtm \ Y_NI_Infoicons-control.yhtm \ Y_NI_m3uConInfo.yhtm \ diff --git a/data/y-web/Y_NI_blank.yhtm b/data/y-web/Y_Blank.yhtm similarity index 88% rename from data/y-web/Y_NI_blank.yhtm rename to data/y-web/Y_Blank.yhtm index 56ff58a76..126972c6d 100644 --- a/data/y-web/Y_NI_blank.yhtm +++ b/data/y-web/Y_Blank.yhtm @@ -1,4 +1,4 @@ -{=include-block:Y_Blocks.txt;head_ni=} +{=include-block:Y_Blocks.txt;head=}
diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index c8c8e2e58..41bae6e77 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -443,7 +443,7 @@ start-block~frame_boxcontrol ~ {=if-equal:{=var-get:startpage=}~screenshot~Y_Tools_Screenshot.yhtm?osd=1 ~ - Y_NI_blank.yhtm + Y_Blank.yhtm =} =} =} @@ -455,21 +455,21 @@ end-block~frame_boxcontrol # ------- Lay-Frame Tools-Menu start-block~frame_tools {=var-set:sec_menu=Y_Tools_Menue.yhtm=} -{=var-set:work=Y_NI_blank.yhtm=} +{=var-set:work=Y_Blank.yhtm=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_tools # ------- Lay-Frame Settings-Menu start-block~frame_settings {=var-set:sec_menu=Y_Settings_Menue.yhtm=} -{=var-set:work=Y_NI_blank.yhtm=} +{=var-set:work=Y_Blank.yhtm=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_settings # ------- Lay-Frame Extentions-Menu start-block~frame_ext {=var-set:sec_menu=Y_Ext_Menue.yhtm=} -{=var-set:work=Y_NI_blank.yhtm=} +{=var-set:work=Y_Blank.yhtm=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_ext diff --git a/data/y-web/Y_Main.css b/data/y-web/Y_Main.css index 8c6a516b7..1bab23856 100644 --- a/data/y-web/Y_Main.css +++ b/data/y-web/Y_Main.css @@ -1050,3 +1050,13 @@ img#shot:hover { max-width: 300px; max-height:300px; } + +#startjpg { + display: block; + text-align: center; + width: 750px; + margin: 1.5em auto; + padding: .5em; + border: 1px solid #a0a0a0; + box-shadow: .5em .5em .5em rgba(0, 0, 0, 0.5); +} diff --git a/data/y-web/Y_NI.css b/data/y-web/Y_NI.css index 016990fe2..817d84dd9 100644 --- a/data/y-web/Y_NI.css +++ b/data/y-web/Y_NI.css @@ -1,13 +1,3 @@ -#startjpg { - display: block; - text-align: center; - width: 750px; - margin: 1.5em auto; - padding: .5em; - border: 1px solid #a0a0a0; - box-shadow: .5em .5em .5em rgba(0, 0, 0, 0.5); -} - hr { border: 0 none; border-top: 1px solid #a0a0a0; diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index 885eceb2e..3c8c135ab 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -74,6 +74,7 @@ main.info=Info main.info_desc=Information über das yWeb, Version main.remote_full_desc=Fernbedienung & OSD Vollbild main.stream_to_vlc_client_desc=Live TV direkt im VLC Client +main.ni=NI-yWeb # ===== Boxcontrol Menue bc.menue.bouquets_desc=Sender auswählen @@ -483,8 +484,6 @@ rc.key_pos=Pos rc.key_recall=Recall # ===== NI -main.ni=NI-yWeb - ni.save=Speichern ni.cancel=Abbrechen ni.edit=Bearbeiten diff --git a/data/y-web/languages/English b/data/y-web/languages/English index feb9fb5e5..09ac29404 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -74,6 +74,7 @@ main.info=Info main.info_desc=Information about yWeb, Updates main.remote_full_desc=Remote & OSD full main.stream_to_vlc_client_desc=Stream to VLC Client +main.ni=NI-yWeb # ===== Boxcontrol Menue bc.menue.bouquets_desc=Switch channels @@ -483,8 +484,6 @@ rc.key_pos=Pos rc.key_recall=Recall # ===== NI -main.ni=NI-yWeb - ni.save=Save ni.cancel=Cancel ni.edit=Edit