From 9147bc5f03479aa22f18262c487b1a5e0a1e25c7 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 30 Mar 2015 22:00:57 +0200 Subject: [PATCH] - yWeb: remove dead links to yjogol website --- src/nhttpd/web/Y_Tools_Check_Install.yhtm | 20 ++++++++------------ src/nhttpd/web/Y_Version.txt | 4 ++-- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/nhttpd/web/Y_Tools_Check_Install.yhtm b/src/nhttpd/web/Y_Tools_Check_Install.yhtm index 768f771e3..3a0c29c40 100644 --- a/src/nhttpd/web/Y_Tools_Check_Install.yhtm +++ b/src/nhttpd/web/Y_Tools_Check_Install.yhtm @@ -42,9 +42,6 @@ function sLog_addRow(_body, state, action_text, state_text){ function wiki_url(_page){ return "[Help]<\/b><\/a>" } -function y_url(_page){ - return "[Help]<\/b><\/a>" -} function do_check(){ sLog_init(); sLog_clear(); @@ -56,13 +53,12 @@ function do_check(){ if(nhttpd_version.search(/error/)!=-1) nhttpd_version = "0.0.0-unknown"; if(nhttpd_version < needed_nhttpd_version) - sLog_addRow(sLog_body, "red", "WebServer: version: "+nhttpd_version+" version needed: "+needed_nhttpd_version+ - " [Help]<\/b><\/a>", "fail"); + sLog_addRow(sLog_body, "red", "WebServer: version: "+nhttpd_version+" version needed: "+needed_nhttpd_version+" ", "fail"); else sLog_addRow(sLog_body, "green", "WebServer: version is "+nhttpd_version, "ok"); {=if-equal:{=ini-get:/var/tuxbox/config/nhttpd.conf;mod_auth.authenticate;false=}~false~~ - sLog_addRow(sLog_body, "yellow", "WebServer: Authentication is on. "+y_url("Help-Settings-Webserver"), "notice"); + sLog_addRow(sLog_body, "yellow", "WebServer: Authentication is on. ", "notice"); =} {=if-equal:{=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.port;80=}~80~~ sLog_addRow(sLog_body, "yellow", @@ -83,13 +79,13 @@ function do_check(){ /*programs*/ {=var-set:fbshot={=if-file-exists:/bin/fbshot~/bin/fbshot~{=if-file-exists:/var/bin/fbshot~/var/bin/fbshot~false=}=}=} {=if-equal:{=var-get:fbshot=}~false~ - sLog_addRow(sLog_body, "red", "Programs: fbshot is not installed. OSD Screenshot is disabled. "+y_url("Help-BoxControl-OSD_Screenshot"), "failed"); + sLog_addRow(sLog_body, "red", "Programs: fbshot is not installed. OSD Screenshot is disabled. ", "failed"); ~ sLog_addRow(sLog_body, "green", "Programs: fbshot is installed at: {=var-get:fbshot=}. OSD Screenshot is enabled.", "ok"); =} {=var-set:dboxshot={=if-file-exists:/bin/dboxshot~/bin/dboxshot~{=if-file-exists:/var/bin/dboxshot~/var/bin/dboxshot~false=}=}=} {=if-equal:{=var-get:dboxshot=}~false~ - sLog_addRow(sLog_body, "red", "Programs: dboxshot is not installed. Remote & OSD is disabled. [Download]<\/b><\/a>", "failed"); + sLog_addRow(sLog_body, "red", "Programs: dboxshot is not installed. Remote & OSD is disabled.", "failed"); ~ sLog_addRow(sLog_body, "green", "Programs: dboxshot is installed at: {=var-get:dboxshot=}. Remote & OSD is enabled.", "ok"); =} @@ -97,7 +93,7 @@ function do_check(){ {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ {=var-set:fcp={=if-file-exists:/sbin/fcp~/sbin/fcp~{=if-file-exists:/var/bin/fcp~/var/bin/fcp~{=if-file-exists:/bin/fcp~/bin/fcp~false=}=}=}=} {=if-equal:{=var-get:fcp=}~false~ - sLog_addRow(sLog_body, "red", "Programs: fcp is not installed. Image flashing is disabled. "+y_url("Help-Tools-Image"), "failed"); + sLog_addRow(sLog_body, "red", "Programs: fcp is not installed. Image flashing is disabled. ", "failed"); ~ sLog_addRow(sLog_body, "green", "Programs: fcp is installed at: {=var-get:fcp=}. Image flashing is enabled.", "ok"); =} @@ -105,7 +101,7 @@ function do_check(){ {=var-set:ether-wake={=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~false=}=}=} {=if-equal:{=var-get:ether-wake=}~false~ - sLog_addRow(sLog_body, "red", "Programs: ether-wake is not installed. Wake on LAN is disabled. "+y_url("Help-Tools-Wake_on_LAN"), "failed"); + sLog_addRow(sLog_body, "red", "Programs: ether-wake is not installed. Wake on LAN is disabled. ", "failed"); ~ sLog_addRow(sLog_body, "green", "Programs: ether-wake is installed at: {=var-get:ether-wake=}. Wake on LAN is enabled.", "ok"); =} @@ -113,14 +109,14 @@ function do_check(){ /*automount*/ {=var-set:automount={=if-file-exists:/sbin/automount~/sbin/automount~{=if-file-exists:/var/bin/automount~/var/bin/automount~false=}=}=} {=if-equal:{=var-get:automount=}~false~ - sLog_addRow(sLog_body, "red", "Programs: automount is not installed. AutoMount is disabled. "+y_url("Help-Tools-AutoMount"), "failed"); + sLog_addRow(sLog_body, "red", "Programs: automount is not installed. AutoMount is disabled. ", "failed"); ~ sLog_addRow(sLog_body, "green", "Programs: automount is installed at: {=var-get:automount=}. AutoMount is enabled.", "ok"); =} /* udp */ {=var-set:udpstreamts={=if-file-exists:/sbin/udpstreamts~/sbin/udpstreamts~{=if-file-exists:/var/bin/udpstreamts~/var/bin/udpstreamts~false=}=}=} {=if-equal:{=var-get:udpstreamts=}~false~ - sLog_addRow(sLog_body, "red", "Programs: udpstreamts is not installed. udp-streaming is disabled. "+y_url("Help-Live_Timer-UDP_Streaming"), "failed"); + sLog_addRow(sLog_body, "red", "Programs: udpstreamts is not installed. udp-streaming is disabled. ", "failed"); ~ sLog_addRow(sLog_body, "green", "Programs: udpstreamts is installed at: {=var-get:udpstreamts=}. udp-streaming is enabled.", "ok"); =} diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 64131253f..4e13d9e8c 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.9.0.13 -date=16.03.2015 +version=2.9.0.14 +date=30.03.2015 type=Release info=Port CST