[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-472-g48faacc
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-472-g48faacc
|
From: GetAway <tux...@ne...> - 2015-03-08 10:35:56
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 48faacc333254e09e4b951d7b9053a6617ec2cca (commit)
from 98a30539585e9eae1e83cff00e4e63d145a50f08 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 48faacc333254e09e4b951d7b9053a6617ec2cca
Author: GetAway <get...@t-...>
Date: Sun Mar 8 11:32:32 2015 +0100
yweb: delete dead links to yjogol.com
Signed-off-by: GetAway <get...@t-...>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_About.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_About.yhtm
index c378e93..5228365 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_About.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_About.yhtm
@@ -1,6 +1,8 @@
-{=var-set:cancache=yPyes=}
+{=var-set:cancache=yPConf=}
{=include-block:Y_Blocks.txt;headCache=}
</head>
+{=var-set:alt_httpd={=ini-get:/var/tuxbox/config/nhttpd.conf;WebsiteMain.override_directory;/var/httpd=}=}
+{=var-set:vf={=if-file-exists:{=var-get:alt_httpd=}/Y_Version.txt~{=var-get:alt_httpd=}/Y_Version.txt~Y_Version.txt=}=}
<body>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
@@ -8,13 +10,13 @@
<div class="work_box_body">
<table border="0" cellpadding="2" cellspacing="4">
<tr>
- <td width="144" valign="bottom"><a href="http://www.yjogol.com" target="_blank"><img border="0" src="images/yjogol.gif" alt="yjogol"/></a></td>
- <td valign="bottom" style="font-size:18pt;">yWeb</td>
+ <td valign="bottom" width="144"></td>
+ <td valign="bottom"><img border="0" src="images/tux-yweb.png" alt="yWeb by yjogol"/></td>
</tr><tr>
- <td valign="top"><a href="http://www.yjogol.com" class="exlink" target="_blank">www.yjogol.com</a></td>
+ <td valign="top"> </td>
<td valign="top">
- {=ini-get:Y_Version.txt;version=} - {=ini-get:Y_Version.txt;date=} - {=ini-get:Y_Version.txt;type=}<br/><br/>
- {=ini-get:Y_Version.txt;info=}<br/>
+ 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=}
+ <br/><br/>
</td>
</tr>
</table>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
index 9ce554c..0710f73 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
@@ -253,7 +253,9 @@ end-block~snip_show_wait
# ------- Wiki Help display
#<img src="/images/help.gif" align="bottom" />
start-block~wiki_help
+<!--
<a href="http://www.yjogol.com/{=var-get:help_url=}" target="_blank" title="get help from www.yjogol.com">?</a>
+-->
end-block~wiki_help
# ------- work menu
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Info_Help.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Info_Help.yhtm
index d1aa586..c05a171 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Info_Help.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Info_Help.yhtm
@@ -7,10 +7,8 @@
{=var-set:help_url=Help-Info-Hilfe=}{=var-set:menu=Hilfe=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<ul>
- <li><a href="http://www.yjogol.com/faq" class="exlink" title="FAQ at yjogol.com" target="_blank">FAQ zu yWeb</a></li>
<li><a href="http://wiki.dbox2-tuning.net/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki Help</a></li>
<li><a href="http://forum.tuxbox.org" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
- <li><a href="http://www.yjogol.com" class="exlink" title="Homepage of yWeb" target="_blank">Homepage yWeb</a></li>
</ul>
</div>
</div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Info_Updates.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Info_Updates.yhtm
index 6ed16c2..8cf4f9e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Info_Updates.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Info_Updates.yhtm
@@ -17,7 +17,7 @@ function check_updates()
<div class="work_box_body">
<table border="0" cellpadding="2" cellspacing="4">
<tr>
- <td valign="top">
+ <td valign="top" width="30%">
<b>Deine Version</b>
<p>
{=ini-get:Y_Version.txt;version=}<br/>
@@ -26,7 +26,7 @@ function check_updates()
{=ini-get:Y_Version.txt;info=}<br/>
</p>
</td>
- <td valign="top">
+ <td valign="top" width="30%">
<b>Aktuelle Version</b>
<p>
{=ini-get:/tmp/version.txt;version=}<br/>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm
index 2b08a3f..851bec9 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm
@@ -89,7 +89,7 @@ function vlc() {
</script>
<style>
#prim{
- background: url(/images/tux-yweb.gif) no-repeat left top;
+ background: url(/images/tux-yweb.png) no-repeat left top;
height:38px;
}
</style>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 371e4b2..175b3ab 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.7.0.33
+version=2.7.0.34
date=08.03.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/extentions.txt b/tuxbox/neutrino/daemons/nhttpd/web/extentions.txt
index 1e69863..b7f97c3 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/extentions.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/extentions.txt
@@ -1,2 +1 @@
-type:u,site:yjogol,desc:yjogol updates,url:http://www.yjogol.com/download/Y_extensions.txt
-
+type:u,site:MySite,desc:Extensions updates,url:http://
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/images/tux-yweb.gif b/tuxbox/neutrino/daemons/nhttpd/web/images/tux-yweb.gif
deleted file mode 100755
index fa1398f..0000000
Binary files a/tuxbox/neutrino/daemons/nhttpd/web/images/tux-yweb.gif and /dev/null differ
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/images/tux-yweb.png b/tuxbox/neutrino/daemons/nhttpd/web/images/tux-yweb.png
new file mode 100755
index 0000000..8ec4ff5
Binary files /dev/null and b/tuxbox/neutrino/daemons/nhttpd/web/images/tux-yweb.png differ
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/images/yjogol.gif b/tuxbox/neutrino/daemons/nhttpd/web/images/yjogol.gif
deleted file mode 100755
index ec54c96..0000000
Binary files a/tuxbox/neutrino/daemons/nhttpd/web/images/yjogol.gif and /dev/null differ
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
index 17af1ac..7d2e788 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
+++ b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
@@ -1,8 +1,8 @@
#!/bin/sh
# -----------------------------------------------------------
# Tools (yjogol)
-# $Date: 2011/09/22 19:53:53 $
-# $Revision: 1.11 $
+# $Date$
+# $Revision$
# -----------------------------------------------------------
. ./_Y_Globals.sh
. ./_Y_Library.sh
@@ -563,7 +563,7 @@ case "$1" in
lcshot) shift 1; do_lcshot $* ;;
fbshot) shift 1; do_fbshot $* ;;
fbshot_clear) do_fbshot_clear ;;
- get_update_version) wget -O /tmp/version.txt "http://www.yjogol.com/download/Y_Version.txt" ;;
+ get_update_version) wget -O /tmp/version.txt "http://sourceforge.net/p/tuxbox-cvs/apps/ci/master/tree/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt?format=raw" ;;
settings_backup_restore) shift 1; do_settings_backup_restore $* ;;
exec_cmd) shift 1; $* ;;
automount_list) shift 1; do_automount_list $* ;;
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/daemons/nhttpd/web/Y_About.yhtm | 14 ++++++++------
tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt | 2 ++
.../neutrino/daemons/nhttpd/web/Y_Info_Help.yhtm | 2 --
.../daemons/nhttpd/web/Y_Info_Updates.yhtm | 4 ++--
tuxbox/neutrino/daemons/nhttpd/web/Y_Menue.yhtm | 2 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 2 +-
tuxbox/neutrino/daemons/nhttpd/web/extentions.txt | 3 +--
.../daemons/nhttpd/web/images/tux-yweb.gif | Bin 2086 -> 0 bytes
.../daemons/nhttpd/web/images/tux-yweb.png | Bin 0 -> 3722 bytes
.../neutrino/daemons/nhttpd/web/images/yjogol.gif | Bin 2575 -> 0 bytes
.../neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh | 6 +++---
11 files changed, 18 insertions(+), 17 deletions(-)
delete mode 100755 tuxbox/neutrino/daemons/nhttpd/web/images/tux-yweb.gif
create mode 100755 tuxbox/neutrino/daemons/nhttpd/web/images/tux-yweb.png
delete mode 100755 tuxbox/neutrino/daemons/nhttpd/web/images/yjogol.gif
--
Tuxbox-GIT: apps
|
