diff --git a/configure.ac b/configure.ac index 7d770ea96..7058c04ca 100644 --- a/configure.ac +++ b/configure.ac @@ -452,7 +452,11 @@ data/weather/Makefile data/webradio/Makefile data/webtv/Makefile data/y-web/Makefile +data/y-web/favicon/Makefile data/y-web/images/Makefile +data/y-web/info/Makefile +data/y-web/jquery/Makefile +data/y-web/lcd4linux/Makefile data/y-web/languages/Makefile data/y-web/scripts/Makefile data/y-web/styles/Makefile diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index eb5958a13..fb469bf7d 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -1,18 +1,21 @@ SUBDIRS = images scripts languages styles +# yWeb +SUBDIRS += favicon info jquery lcd4linux + installdir = $(PRIVATE_HTTPDDIR) install_DATA = channels.js \ - extentions.txt \ + extensions.txt \ favicon.ico \ index.html \ prototype.js \ robots.txt \ - lcd4linux.html \ Y_About.yhtm \ Y_Baselib.js \ - Y_blank.htm \ + Y_Blank.yhtm \ Y_Blocks.txt \ + Y_Blocks_Neutrino.txt \ Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \ Y_Boxcontrol_Bouquet_Editor_Main.yhtm \ Y_Boxcontrol_Bouquetlist.yhtm \ @@ -37,7 +40,6 @@ install_DATA = channels.js \ Y_Live_EPG.yhtm \ Y_Main.css \ Y_Menue.yhtm \ - Y_neutrino_Blocks.txt \ Y_Refresh.yhtm \ Y_Settings_automount_liste.yhtm \ Y_Settings_automount.yhtm \ @@ -63,13 +65,13 @@ install_DATA = channels.js \ Y_Tools_Boxcontrol.yhtm \ Y_Tools_Check_Install.yhtm \ Y_Tools_Cmd.yhtm \ - Y_Tools_Glcd_Screenshot.yhtm \ Y_Tools_Info_Menue.yhtm \ Y_Tools_Installer.yhtm \ Y_Tools_Menue.yhtm \ Y_Tools_Rcsim.yhtm \ Y_Tools_Screenshot.yhtm \ - Y_Tools_tvshot.yhtm \ + Y_Tools_Screenshot_GraphLCD.yhtm \ + Y_Tools_Screenshot_LCD4Linux.yhtm \ Y_User.css \ Y_Version.txt \ Y_Wait.yhtm \ @@ -78,9 +80,23 @@ install_DATA = channels.js \ # file manager install_DATA += accordion.js \ effects.js \ + Y_Blocks_Filemgr.txt \ Y_Filemgr.yhtm \ - Y_Filemgr_Edit.yhtm \ - Y_Filemgr_blocks.txt + Y_Filemgr_Edit.yhtm + +# v3-files +install_DATA += Y_v3lib.js \ + Y_v3.css + +# tools +install_DATA += \ + Y_m3uConInfo.yhtm \ + Y_m3uConvert.yhtm \ + Y_NetFS-control.yhtm \ + Y_NetFS-edit.yhtm \ + Y_NetFS-init.yhtm \ + Y_Plugin-control.yhtm \ + Y_PZapit-control.yhtm install-data-hook: @# Badass hack, I know. If anyone knows a better way -- please send patch! @@ -96,9 +112,12 @@ install-data-hook: -e 's|%(FONTDIR_VAR)|$(FONTDIR_VAR)|g' \ -e 's|%(LIBDIR)|$(LIBDIR)|g' \ -e 's|%(GAMESDIR)|$(GAMESDIR)|g' \ + -e 's|%(ICONSDIR)|$(ICONSDIR)|g' \ -e 's|%(ICONSDIR_VAR)|$(ICONSDIR_VAR)|g' \ -e 's|%(LOCALEDIR)|$(LOCALEDIR)|g' \ -e 's|%(LOCALEDIR_VAR)|$(LOCALEDIR_VAR)|g' \ + -e 's|%(PLUGINDIR)|$(PLUGINDIR)|g' \ + -e 's|%(PLUGINDIR_MNT)|$(PLUGINDIR_MNT)|g' \ -e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \ -e 's|%(LUAPLUGINDIR)|$(LUAPLUGINDIR)|g' \ -e 's|%(LUAPLUGINDIR_VAR)|$(LUAPLUGINDIR_VAR)|g' \ @@ -106,12 +125,14 @@ install-data-hook: -e 's|%(THEMESDIR_VAR)|$(THEMESDIR_VAR)|g' \ -e 's|%(WEBRADIODIR)|$(WEBRADIODIR)|g' \ -e 's|%(WEBRADIODIR_VAR)|$(WEBRADIODIR_VAR)|g' \ + -e 's|%(WEBTVDIR)|$(WEBTVDIR)|g' \ + -e 's|%(WEBTVDIR_VAR)|$(WEBTVDIR_VAR)|g' \ -e 's|%(LOGODIR)|$(LOGODIR)|g' \ -e 's|%(LOGODIR_VAR)|$(LOGODIR_VAR)|g' \ - -e 's|%(LCD4L_ICONSDIR)|$(LCD4L_ICONSDIR)|g' \ - -e 's|%(LCD4L_ICONSDIR_VAR)|$(LCD4L_ICONSDIR_VAR)|g' \ -e 's|%(PRIVATE_HTTPDDIR)|$(PRIVATE_HTTPDDIR)|g' \ -e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \ -e 's|%(HOSTED_HTTPDDIR)|$(HOSTED_HTTPDDIR)|g' \ -e 's|%(FLAGDIR)|$(FLAGDIR)|g' \ ; + @# yWeb +# cp $(DESTDIR)$(PRIVATE_HTTPDDIR)/styles/Y_Dist-v3_dark.css $(DESTDIR)$(PRIVATE_HTTPDDIR)/Y_Dist.css diff --git a/data/y-web/Y.css b/data/y-web/Y.css new file mode 100644 index 000000000..633397085 --- /dev/null +++ b/data/y-web/Y.css @@ -0,0 +1,77 @@ +#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; +} +span.upd_no, +span.upd_yes { + display: none; +} +abbr.version { + cursor: help; +} +.exlink, .inlink, .comment { + text-decoration: none; +} + +.status { + vertical-align: text-bottom; +} +.vinfo { + font-size: 75%; + color: #c0c0c0; +} +.tools select { + border: 1px solid #a0a0a0; + border-left: 3px solid #132cfd !important; +} +.tools option.e { + background: url(images/page_edit.png) no-repeat; + padding-left: 20px; +} + +button, +input[type="button"], +input[type="submit"], +._used_graph, +._used_graph * { + border-radius: 5px; +} +button[ytype] { + background-position: 3px 1px; +} +button[ytype="accept_"], +button[ytype="cancel_"] { + text-align: center; + width: 105px; +} +button[ytype="accept_"] { background-image:url(/images/accept.png); } +button[ytype="cancel_"] { background-image:url(/images/cancel.png); } + +tr.list td { + padding-top: .25em; + padding-bottom: .25em; +} +tr.list:hover td { + background: #F0F0F0; +} +div._used_graph { + width: 150px; + height: 20px; + border: 1px solid #a0a0a0; +} +div._used_graph div._inner_graph { + width: 0; + height: 100%; + background: transparent url(images/colored_bar.png) no-repeat 0 0; + float: left; +} diff --git a/data/y-web/Y_About.yhtm b/data/y-web/Y_About.yhtm index d001e174d..397f11f00 100644 --- a/data/y-web/Y_About.yhtm +++ b/data/y-web/Y_About.yhtm @@ -6,35 +6,36 @@
- {=var-set:help_url=Help-Info-About=}{=var-set:menu={=L:info.About=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:info.about=}=}{=include-block:Y_Blocks.txt;work_menu=}
- + + - - + + - - + +
yWeb by yjogol
  - v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};type=} - {=ini-get:{=var-get:vf=};info=} + v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};info=}

COPYRIGHTS - yWeb (this Web interface) is licensed under the terms of the Open Source GPL 2 license.
- http://www.gnu.org/licenses/old-licenses/gpl-2.0.html -

- yWeb uses Icons from famfamfam (http://www.famfamfam.com) which are - licensed under Creative Common Attribution License 2.5 - 		COPYRIGHTS + yWeb (this Web interface) is licensed under the terms of the Open Source GPL 2 license.
+ http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +

+ yWeb uses Icons from famfamfam (http://www.famfamfam.com) which are + licensed under Creative Common Attribution License 2.5 +
IMPORTANT - Do not make yWeb accessible to untrusted networks!
- Otherwise someone else can access your Box. - 		IMPORTANT + Do not make yWeb accessible to untrusted networks!
+ Otherwise someone else can access your Box. +
diff --git a/data/y-web/Y_Blank.yhtm b/data/y-web/Y_Blank.yhtm new file mode 100644 index 000000000..429f290b8 --- /dev/null +++ b/data/y-web/Y_Blank.yhtm @@ -0,0 +1,13 @@ +{=include-block:Y_Blocks.txt;head_v3=} + + +
+
+ {=var-set:menu={=L:main.v3=}=}{=include-block:Y_Blocks.txt;work_menu=} +
+
+ +
+
+ + diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index c58081d3c..34a85e229 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -4,7 +4,7 @@ start-block~timer
- {=var-set:help_url=Neutrino:yWeb:Live_Timer#Timer=}{=var-set:menu=Timer=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu=Timer=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -146,7 +146,7 @@ end-block~personalize_save_settings # ------- Ext save Settings start-block~ext_save_settings -{=file-action:%(CONFIGDIR)/extentions.txt;add;{=extentions=}=} +{=file-action:%(CONFIGDIR)/extensions.txt;add;{=extensions=}=} end-block~ext_save_settings # ------- No Managemant Error @@ -214,15 +214,9 @@ start-block~snip_show_wait
end-block~snip_show_wait -# ------- Wiki Help display -# -start-block~wiki_help -? -end-block~wiki_help - # ------- work menu start-block~work_menu -
{=include-block:Y_Blocks.txt;wiki_help=}
{=var-get:menu=}
+
{=var-get:menu=}
end-block~work_menu @@ -293,6 +287,40 @@ start-block~frame_iso_head yWeb end-block~frame_iso_head +# ------- Lay-HEAD v3 +start-block~head_v3 + + + + + + + +yWeb + + + + + + + + + + + +end-block~head_v3 + # ------- nhttpd save Settings start-block~start_wizard_save_settings {=ini-set:%(CONFIGDIR)/Y-Web.conf;start_page;{=start_page=}~open=} @@ -321,7 +349,7 @@ function do_submit() {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
- {=var-set:help_url=NeutrinoHD:Inbetriebnahme#Inbetriebnahme=}{=var-set:menu={=L:start.head=}Start Wizard=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:start.head=}Start Wizard=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -415,7 +443,7 @@ start-block~frame_boxcontrol ~ {=if-equal:{=var-get:startpage=}~screenshot~Y_Tools_Screenshot.yhtm?osd=1 ~ - Y_blank.yhtm + Y_Blank.yhtm =} =} =} @@ -427,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_blank.htm=} +{=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_blank.htm=} +{=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_blank.htm=} +{=var-set:work=Y_Blank.yhtm=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_ext @@ -469,6 +497,43 @@ start-block~frame_live_epg end-block~frame_live_epg +# ------- NetFS +start-block~netfs_local_dir +{=var-set:local_dir_{=var-get:nr=}={=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_local_dir_{=var-get:nr=}~open=}=} +end-block~netfs_local_dir + +start-block~netfs_is_mount +{=var-set:is_mount_{=var-get:nr=}={=script:Y_v3_Tools is_mount {=if-equal:{=mount_type=}~1~/mnt/autofs/~=}{=var-get:local_dir_{=var-get:nr=}=}=}=} +end-block~netfs_is_mount + +start-block~netfs_table_row + + + + +end-block~netfs_table_row + # ------- Remote control variables start-block~rc_variables {=var-set:_fb_dbox_philips=2=} @@ -577,7 +642,7 @@ end-block~remote # ------- Remote d-Box Philips/Sagem start-block~rc_dbox_philips -remote +remote @@ -610,7 +675,7 @@ end-block~rc_dbox_philips # ------- Remote d-Box Nokia old start-block~rc_dbox_nokia_old -remote +remote @@ -643,7 +708,7 @@ end-block~rc_dbox_nokia_old # ------ Remote CST V1 (HD1 / BSE) start-block~rc_cst_v1 -remote +remote @@ -696,7 +761,7 @@ end-block~rc_cst_v1 # ------- Remote CST V2 (NEO) start-block~rc_cst_v2 -remote +remote @@ -751,14 +816,14 @@ end-block~rc_cst_v2 # ------ Remote CST V3 (ZEE, NEO2) start-block~rc_cst_v3 {=var-set:rcu=rc_cst_v3=} -remote +remote {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=} end-block~rc_cst_v3 # ------ Remote CST V4 (NEO TWIN) start-block~rc_cst_v4 {=var-set:rcu=rc_cst_v4=} -remote +remote {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=} end-block~rc_cst_v4 @@ -841,7 +906,7 @@ end-block~map_rc_cst_v3_v4 # ------- Remote CST V5 (TANK) start-block~rc_cst_v5 -remote +remote standby @@ -904,7 +969,7 @@ end-block~rc_cst_v5 # ------- Remote CST V6 (TRINITY) start-block~rc_cst_v6 -remote +remote standby mute @@ -970,7 +1035,7 @@ end-block~rc_cst_v6 # ------ Remote AX HD51 start-block~rc_ax_hd51 - + @@ -1026,7 +1091,7 @@ end-block~rc_ax_hd51 # ------ Remote Mutant HD51 start-block~rc_mutant_hd51 - + @@ -1082,7 +1147,7 @@ end-block~rc_mutant_hd51 # ------ Remote WWIO BRE2ZE 4K start-block~rc_wwio_bre2ze4k - + KEY_POWER KEY_MODE @@ -1144,7 +1209,7 @@ end-block~rc_wwio_bre2ze4k # ------ Remote VU+ Solo 4K, Duo 4K, Duo 4K SE, Ultimo 4K, Zero 4K, Uno 4K, Uno 4K SE start-block~rc_vuplus - + Power @@ -1197,7 +1262,7 @@ end-block~rc_vuplus # ------ Remote Air Digital Zgemma H7 start-block~rc_zgemma_h7 - + KEY_POWER KEY_MUTE @@ -1254,7 +1319,7 @@ end-block~rc_zgemma_h7 # ------ Remote Mutant HD60, Maxytec Multibox SE 4K start-block~rc_mutant_hd60 - + @@ -1309,7 +1374,7 @@ end-block~rc_mutant_hd60 # ------ Remote AX HD61 start-block~rc_ax_hd61 - + diff --git a/data/y-web/Y_Filemgr_blocks.txt b/data/y-web/Y_Blocks_Filemgr.txt similarity index 100% rename from data/y-web/Y_Filemgr_blocks.txt rename to data/y-web/Y_Blocks_Filemgr.txt diff --git a/data/y-web/Y_neutrino_Blocks.txt b/data/y-web/Y_Blocks_Neutrino.txt similarity index 94% rename from data/y-web/Y_neutrino_Blocks.txt rename to data/y-web/Y_Blocks_Neutrino.txt index 3f0309fd9..95eceb3e9 100644 --- a/data/y-web/Y_neutrino_Blocks.txt +++ b/data/y-web/Y_Blocks_Neutrino.txt @@ -14,7 +14,7 @@ start-block~neutrino_form {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=} -{=include-block:Y_neutrino_Blocks.txt;{=var-get:neutrino=}=} +{=include-block:Y_Blocks_Neutrino.txt;{=var-get:neutrino=}=} {=include-block:Y_Blocks.txt;management_check_bottom=} @@ -35,15 +35,13 @@ start-block~neutrino_form_submit   -   - {=L:help=} end-block~neutrino_form_submit # ------- Neutrino form-data: record ------------------------------- start-block~neutrino_form-data_record
- {=var-set:help_url=Help-Settings-Aufnahme=}{=var-set:menu={=L:set.menue.recording=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:set.menue.recording=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ + {=var-get:local_dir_{=var-get:nr=}=} + + + + + {=if-equal:{=mount_type=}~0~ + {=if-equal:{=var-get:is_mount_{=var-get:nr=}=}~false~ + + + + + ~ + + + + + =} + ~ + =} +
@@ -146,9 +144,9 @@ start-block~neutrino_form-data_record

- + - {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=} + {=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
@@ -218,7 +216,7 @@ end-block~neutrino_record_save_settings start-block~neutrino_form-data_movieplayer
- {=var-set:help_url=Help-Settings-Movieplayer=}{=var-set:menu={=L:set.menue.movieplayer=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:set.menue.movieplayer=}=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -230,9 +228,9 @@ start-block~neutrino_form-data_movieplayer

- + - {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=} + {=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
@@ -264,7 +262,7 @@ end-block~neutrino_movieplayer_save_settings start-block~neutrino_form-data_parental
- {=var-set:help_url=Help-Settings-Jugendschutz=}{=var-set:menu={=L:set.menue.parental=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:set.menue.parental=}=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -295,9 +293,9 @@ start-block~neutrino_form-data_parental

- + - {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=} + {=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
@@ -340,7 +338,7 @@ end-block~neutrino_parental_save_settings start-block~neutrino_form-data_epg
- {=var-set:help_url=Help-Settings-EPG=}{=var-set:menu={=L:set.menue.epg=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:set.menue.epg=}=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -425,9 +423,9 @@ start-block~neutrino_form-data_epg

- + - {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=} + {=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
@@ -474,7 +472,7 @@ end-block~neutrino_epg_save_settings start-block~neutrino_form-data_diverse
- {=var-set:help_url=Help-Settings-Diverse=}{=var-set:menu=Diverse Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu=Diverse Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -698,9 +696,9 @@ start-block~neutrino_form-data_diverse

- + - {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=} + {=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
@@ -794,7 +792,7 @@ end-block~neutrino_diverse_save_settings start-block~neutrino_form-data_pictureviewer
- {=var-set:help_url=Help-Settings-Bildbetrachter=}{=var-set:menu={=L:set.pv.pictureviewer=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:set.pv.pictureviewer=}=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -819,9 +817,9 @@ start-block~neutrino_form-data_pictureviewer

- + - {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=} + {=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
@@ -856,7 +854,7 @@ end-block~neutrino_pictureviewer_save_settings start-block~neutrino_form-data_audioplayer
- {=var-set:help_url=Help-Settings-Audioplayer=}{=var-set:menu={=L:set.ap.audioplayer=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:set.ap.audioplayer=}=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -922,9 +920,9 @@ start-block~neutrino_form-data_audioplayer

- + - {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=} + {=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
@@ -971,7 +969,7 @@ end-block~neutrino_audioplayer_save_settings start-block~neutrino_form-data_direct_recording
- {=var-set:help_url=Help-Settings-Direktaufnahme=}{=var-set:menu=Direktaufnahme=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu=Direktaufnahme=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -1091,9 +1089,9 @@ start-block~neutrino_form-data_direct_recording

- + - {=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=} + {=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
diff --git a/data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm index 0a4787256..3135e0410 100644 --- a/data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm +++ b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm @@ -56,7 +56,7 @@ function poschannel(box, direction){ {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
- {=var-set:help_url=Help-BoxControl-Bouquet-Editor=}{=var-set:menu={=L:bou.bouquet=} "{=name=}"=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:bou.bouquet=} "{=name=}"=}{=include-block:Y_Blocks.txt;work_menu=}

diff --git a/data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm index 3debbe9eb..54ca10376 100644 --- a/data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm +++ b/data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm @@ -106,7 +106,7 @@ function do_rename(){ position: absolute; left: 100px; top: 100px; - border: 1px solid #2188e0; + border: 1px solid #132cfd; border-collapse: collapse; background-color: white; padding: 1em; @@ -116,7 +116,7 @@ function do_rename(){
- {=var-set:help_url=Help-BoxControl-Bouquet-Editor=}{=var-set:menu={=L:set.menue.bouquet_editor=}=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu={=L:set.menue.bouquet_editor=}=}{=include-block:Y_Blocks.txt;work_menu=}
diff --git a/data/y-web/Y_Boxcontrol_Bouquets.yhtm b/data/y-web/Y_Boxcontrol_Bouquets.yhtm index d2ebb7421..02eadd8d0 100644 --- a/data/y-web/Y_Boxcontrol_Bouquets.yhtm +++ b/data/y-web/Y_Boxcontrol_Bouquets.yhtm @@ -3,7 +3,7 @@
- {=var-set:help_url=Help-BoxControl-Bouquet=}{=var-set:menu=Bouquet=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:menu=Bouquet=}{=include-block:Y_Blocks.txt;work_menu=}