Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 4bd37d828870929f2f3754fd25bfe2f6e2675ca6 (commit)
from 23f4f98f11bcce0475c1b8bcd2d80cf3739f3367 (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 4bd37d828870929f2f3754fd25bfe2f6e2675ca6
Author: svenhoefer <[email protected]>
Date: Thu Mar 12 17:10:33 2015 +0100
yweb: add using styles
Signed-off-by: GetAway <[email protected]>
diff --git a/tuxbox/neutrino/configure.ac b/tuxbox/neutrino/configure.ac
index 8add3cc..d75ac2f 100644
--- a/tuxbox/neutrino/configure.ac
+++ b/tuxbox/neutrino/configure.ac
@@ -272,6 +272,7 @@ daemons/nhttpd/Makefile
daemons/nhttpd/web/Makefile
daemons/nhttpd/web/images/Makefile
daemons/nhttpd/web/scripts/Makefile
+daemons/nhttpd/web/styles/Makefile
daemons/nhttpd/tuxboxapi/Makefile
daemons/nhttpd/yhttpd_core/Makefile
daemons/nhttpd/yhttpd_mods/Makefile
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Makefile.am
b/tuxbox/neutrino/daemons/nhttpd/web/Makefile.am
index 6e4e738..b38a201 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Makefile.am
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = images scripts
+SUBDIRS = images scripts styles
install-data-local:
for f in ./*.js; do gzip $$f -c >$$f.gz; done
@@ -12,4 +12,4 @@ install-data-local:
install -m 0644 *.ico $(DATADIR)/neutrino/httpd-y
uninstall-local:
- -rm -rf $(DATADIR)/neutrino/httpd-y
\ No newline at end of file
+ -rm -rf $(DATADIR)/neutrino/httpd-y
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
index c220447..1e67ab6 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt
@@ -30,6 +30,7 @@ start-block~yWeb_save_settings
{=ini-set:/var/tuxbox/config/Y-Web.conf;wol_desc_2;{=wol_desc_2=}~cache=}
{=ini-set:/var/tuxbox/config/Y-Web.conf;wol_desc_3;{=wol_desc_3=}~cache=}
{=ini-set:/var/tuxbox/config/Y-Web.conf;fb;{=fb=}~cache=}
+{=ini-set:/var/tuxbox/config/Y-Web.conf;style;{=style=}~cache=}
{=ini-set:/var/tuxbox/config/Y-Web.conf;yweb_box_name;{=yweb_box_name=}~cache=}
{=ini-set:/var/tuxbox/config/Y-Web.conf;yweb_box_color;{=yweb_box_color=}~save=}
end-block~yWeb_save_settings
@@ -276,6 +277,8 @@ start-block~head
<meta http-equiv="expires" content="0" />
<title>yWeb</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
+<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
+<link rel="stylesheet" type="text/css" href="/Y_User.css" />
end-block~head
# ------- Lay-HEAD
@@ -287,6 +290,8 @@ start-block~headCache
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>yWeb</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
+<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
+<link rel="stylesheet" type="text/css" href="/Y_User.css" />
end-block~headCache
# ------- Lay-HEAD without charset
@@ -297,6 +302,8 @@ start-block~head_no_charset
<head>
<title>yWeb</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
+<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
+<link rel="stylesheet" type="text/css" href="/Y_User.css" />
end-block~head_no_charset
# ------- Lay-Frame HEAD
@@ -307,6 +314,8 @@ start-block~frame_head
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
+<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
+<link rel="stylesheet" type="text/css" href="/Y_User.css" />
<title>yWeb</title>
end-block~frame_head
@@ -318,6 +327,8 @@ start-block~frame_iso_head
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
+<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
+<link rel="stylesheet" type="text/css" href="/Y_User.css" />
<title>yWeb</title>
end-block~frame_iso_head
@@ -342,7 +353,7 @@ end-block~frame_main
start-block~page_frame_rest
{=include-block:Y_Blocks.txt;head=}
</head>
-<body style="background : white;">
+<body>
</body>
</html>
end-block~page_frame_rest
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm
index e8b695b..cf4d429 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm
@@ -1,7 +1,7 @@
{=include-block:Y_Blocks.txt;head_no_charset=}
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
</head>
-<body>
+<body class="iframe">
<table class="bouquetlist" width="100%">
<tr class="blist"><td><a href="Y_Boxcontrol_Channellist.yhtm#akt"
target="content">Alle Kanäle</a></td></tr>
<tr><td><hr/></td></tr>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Channellist.yhtm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Channellist.yhtm
index 7baed8e..195ca2f 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Channellist.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Channellist.yhtm
@@ -20,9 +20,9 @@ function do_streaminfo()
//]]>
</script>
</head>
-<body>
+<body class="iframe">
<table class="bouquetitemlist">
{=func:get_bouquets_with_epg {=bouquet=}=}
</table>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
index 7bd5bdc..a3e1a80 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm
@@ -1,4 +1,3 @@
-{=var-set:cancache=yPInstall=}
{=include-block:Y_Blocks.txt;head=}
<script type="text/javascript" src="/prototype.js"></script>
<script type="text/javascript" src="/Y_Baselib.js"></script>
@@ -117,7 +116,7 @@ function init(){
<table class="y_text_boxcontrol_table" cellspacing="0"
cellpadding="0" title="volumen display">
<tr>
<td id="audiobar_left" width="100%"><img
src="/images/blank.gif" height="1" width="0" alt="."/></td>
- <td id="audiobar_right" width="0%" bgcolor="white"><img
src="/images/blank.gif" height="1" width="0" alt="."/></td>
+ <td id="audiobar_right" width="0%"><img
src="/images/blank.gif" height="1" width="0" alt="."/></td>
</tr>
</table>
<br/>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_LiveViewFull.yhtm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_LiveViewFull.yhtm
index a545417..336b00a 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_LiveViewFull.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_LiveViewFull.yhtm
@@ -22,12 +22,12 @@ function setTranscode()
<div class="work_box_body">
<table cellpadding="0" cellspacing="0" border="0">
<tr><td valign="top">
- <iframe name="live"
src="Y_Live.yhtm?mode={=mode=}&typ={=typ=}" height="400" width="390"
scrolling="no" align="left" marginheight="0" marginwidth="0" frameborder="0">
+ <iframe name="live"
src="Y_Live.yhtm?mode={=mode=}&typ={=typ=}" height="400" width="400"
scrolling="no" align="left" marginheight="0" marginwidth="0" frameborder="0">
Ihr Browser unterstützt Inlineframes nicht oder zeigt sie
in der derzeitigen Konfiguration nicht an.
</iframe>
</td>
<td>
- <iframe name="col2" src="Y_blank.htm" height="400" width="350"
scrolling="auto" marginheight="0" marginwidth="0" frameborder="0">
+ <iframe name="col2" src="Y_blank.htm" height="400" width="450"
scrolling="auto" marginheight="0" marginwidth="0" frameborder="0">
Ihr Browser unterstützt Inlineframes nicht oder zeigt sie
in der derzeitigen Konfiguration nicht an.
</iframe>
</td>
@@ -42,4 +42,4 @@ function setTranscode()
</script>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm
index 0f9f232..02a944d 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm
@@ -104,7 +104,7 @@ function _show_epg()
</script>
</head>
{=var-set:wait_text=EPG wird
geladen.=}{=include-block:Y_Blocks.txt;snip_show_wait=}
-<body onload="show_epg()">
+<body onload="show_epg()" class="iframe">
<table id="epglist" class="y_invisible_table" cellpadding="4"
cellspacing="0" width="100%">
<thead align="left">
<tr>
@@ -117,4 +117,4 @@ function _show_epg()
</table>
<br />
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG_Info.yhtm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG_Info.yhtm
index cb02136..516c598 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG_Info.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG_Info.yhtm
@@ -12,11 +12,11 @@ function show_info(_desc, _info1, _info2)
</script>
</head>
<a href="javascript:window.history.back()"><u>Zurück</u></a>
-<body>
+<body class="iframe">
<div class="y_epg_info">
<div id="description"> </div>
<div id="info1"> </div>
<div id="info2">Für Details: Maus über die
entsprechende Sendung bewegen.</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_Menue.yhtm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_Menue.yhtm
index 35a7d75..4608091 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_Menue.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_Menue.yhtm
@@ -62,7 +62,6 @@ function init(){
<li><a title="backup or restore settings"
target="work" href="Y_Settings_Backup.yhtm">Backup & Restore</a></li>
<li><a title="SyncTimer Settings" target="work"
href="Y_Settings_Timer.yhtm">Timer Settings</a></li>
=}
- <!--<li><a title="change layout skin"
target="work" href="Y_Settings_Skin.yhtm">Skins</a></li>-->
</ul>
</div>
<div class="y_menu_sec_section">Neutrino</div>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_yWeb.yhtm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_yWeb.yhtm
index c746421..697310e 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_yWeb.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Settings_yWeb.yhtm
@@ -5,8 +5,25 @@
//<![CDATA[
function do_submit(){
show_waitbox(true);
+ do_reload = false;
+ style_new = document.f.style.value;
+ if (style_old != style_new)
+ {
+ do_reload = true;
+ loadSyncURL("/control/exec?Y_Tools&style_set&" + style_new);
+ }
yhttpd_cache_clear("");
document.f.submit();
+ if (do_reload == true)
+ {
+ alert("Style changed. Maybe you'll have to reload this site.");
+ /* ugly mess */
+ top.top_main.prim_menu.location.reload();
+ top.top_main.base.sec_menu.location.reload();
+ //FIXME top.top_main.base.work.location.reload();
+ top.top_left.location.reload();
+ top.top_right.location.reload();
+ }
}
function do_init(){
val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;default~open=}";
@@ -16,9 +33,16 @@ function do_init(){
case "Nokia": sel=1; break;
}
document.f.fb.selectedIndex = sel;
+ style_old = "{=ini-get:/var/tuxbox/config/Y-Web.conf;style~cache=}";
}
//]]>
</script>
+<style type="text/css">
+input[type="text"],
+select {
+ width: 220px;
+}
+</style>
</head>
<body onload="do_init()">
{=var-set:wait_text=Werte werden übernommen
(Save).=}{=include-block:Y_Blocks.txt;snip_wait=}
@@ -75,6 +99,14 @@ function do_init(){
<option value="Nokia">Nokia</option>
<option
value="Sagem">Sagem/Philips</option>
</tr>
+ <tr>
+ <td>Styles</td>
+ <td>
+ <select name="style" title="Style">
+ {=script:Y_Tools style_get=}
+ </select>
+ </td>
+ </tr>
</table>
<br/>
<input type="hidden" name="tmpl" value="Y_Settings_yWeb.yhtm"/>
@@ -83,7 +115,6 @@ function do_init(){
</form>
</div>
</div>
-
</body>
</html>
{=include-block:Y_Blocks.txt;management_check_bottom=}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Info_Menue.yhtm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Info_Menue.yhtm
index 2970e9a..5f4c433 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Info_Menue.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Tools_Info_Menue.yhtm
@@ -46,4 +46,4 @@ function goUrl(_url)
<div id="out"></div>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_User.css
b/tuxbox/neutrino/daemons/nhttpd/web/Y_User.css
new file mode 100644
index 0000000..aea4ab4
--- /dev/null
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_User.css
@@ -0,0 +1,10 @@
+/* Y_User.css - User style sheet for yWeb */
+
+/*
+body {
+ background-color: #eee;
+}
+body.iframe {
+ background-color: #fff;
+}
+*/
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index df1da7b..d116d59 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.8.0.4
-date=08.03.2015
+version=2.8.0.5
+date=12.03.2015
type=Release
info=Tuxbox
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_blank.htm
b/tuxbox/neutrino/daemons/nhttpd/web/Y_blank.htm
index fc906f3..8eac065 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_blank.htm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_blank.htm
@@ -4,8 +4,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>yWeb</title>
+<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
+<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
+<link rel="stylesheet" type="text/css" href="/Y_User.css" />
</head>
<body>
-
</body>
</html>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
index f1c9b77..1a3412e 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
+++ b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
@@ -7,48 +7,60 @@
. ./_Y_Globals.sh
. ./_Y_Library.sh
# ===========================================================
-# Settings : Skins
+# Settings : Style
# ===========================================================
# -----------------------------------------------------------
-# Skin Liste
+# Style List
# -----------------------------------------------------------
-skin_get()
+style_get()
{
check_Y_Web_conf
- active_skin=`config_get_value_direct $y_config_Y_Web 'skin'`
+ active_style=$(config_get_value_direct $y_config_Y_Web 'style')
+
+ y_path_directory=$(config_get_value_direct $y_config_nhttpd
'WebsiteMain.directory')
+ y_path_override_directory=$(config_get_value_direct $y_config_nhttpd
'WebsiteMain.override_directory')
+
+ style_list=""
+ style_list="$style_list $(find $y_path_override_directory/styles -name
'Y_Dist-*')"
+ style_list="$style_list $(find $y_path_directory/styles -name
'Y_Dist-*')"
+
+ f_list=""
html_option_list=""
- skin_list=`find $y_path_httpd -name 'Y_Main-*'`
- for f in $skin_list
+ for f in $style_list
do
- skin=`echo "$f"|sed -e s/^.*Y_Main-//g|sed -e s/.css//g`
- if [ "$skin" = "$active_skin" ]
+ echo $f_list | grep ${f##*/}
+ if [ $? == 0 ]; then
+ continue
+ fi
+ f_list="$f_list ${f##*/}"
+
+ style=$(echo "$f" | sed -e s/^.*Y_Dist-//g | sed -e s/.css//g)
+ if [ "$style" = "$active_style" ]
then
- selec="selected"
+ sel="selected='selected'"
else
- selec=""
+ sel=""
fi
- opt="<option $selec value='$skin'>$skin</option>"
+ opt="<option value=\"${style}\" ${sel}>${style}</option>"
html_option_list="$html_option_list $opt"
done
echo "$html_option_list"
}
# -----------------------------------------------------------
-# Skin setzen : css ueberschreiben $1=Skin-Name
+# Set Style: override Y_Main.css $1=Style-Name
# -----------------------------------------------------------
-skin_set()
+style_set()
{
- cd $y_path_httpd
- cp Y_Main-$1.css Y_Main.css
- if [ -e global-$1.css ]
- then
- cp global-$1.css global.css
+ y_path_directory=$(config_get_value_direct $y_config_nhttpd
'WebsiteMain.directory')
+ y_path_override_directory=$(config_get_value_direct $y_config_nhttpd
'WebsiteMain.override_directory')
+
+ cd $y_path_directory
+ if [ -e $y_path_override_directory/styles/Y_Dist-$1.css ]; then
+ cp $y_path_override_directory/styles/Y_Dist-$1.css Y_Dist.css
else
- cp global-Standard.css global.css
+ cp $y_path_directory/styles/Y_Dist-$1.css Y_Dist.css
fi
- config_set_value_direct $y_config_Y_Web 'skin' $1
-
- msg="Skin geaendert - Jetzt Browser Refresh/Aktualisierung ausfuehren"
- y_format_message_html
+ #config_set_value_direct $y_config_Y_Web 'style' $1
}
# -----------------------------------------------------------
# Image Backup - build form
@@ -368,23 +380,31 @@ do_installer()
rm -f $y_install # clean up
if [ -s "$y_out_html" ] #html - output?
then
- echo '<html><head><link rel="stylesheet"
type="text/css" href="/Y_Main.css">'
- echo "<meta http-equiv='refresh' content='0;
$y_out_html'></head>"
- echo "<body><a href='$y_out_html'>Falls
automatische Weiterleitung nicht geht.</a>"
+ echo '<html><head>'
+ echo '<link rel="stylesheet" type="text/css"
href="/Y_Main.css">'
+ echo '<link rel="stylesheet" type="text/css"
href="/Y_Dist.css">'
+ echo '<link rel="stylesheet" type="text/css"
href="/Y_User.css">'
+ echo "<meta http-equiv='refresh' content='0;
$y_out_html'>"
+ echo '</head>'
+ echo "<body><a href='$y_out_html'>If automatic
forwarding does not go.</a>"
echo '</body></html>'
# cat $y_out_html
else
- echo '<html><head><link rel="stylesheet"
type="text/css" href="/Y_Main.css"></head>'
+ echo '<html><head>'
+ echo '<link rel="stylesheet" type="text/css"
href="/Y_Main.css">'
+ echo '<link rel="stylesheet" type="text/css"
href="/Y_Dist.css">'
+ echo '<link rel="stylesheet" type="text/css"
href="/Y_User.css">'
+ echo '</head>'
echo '<body>'
echo "$o"
echo '</body></html>'
fi
else
- msg="$y_install nicht gefunden"
+ msg="$y_install not found"
y_format_message_html
fi
else
- msg="Upload-Problem.<br>Bitte nochmal hochladen."
+ msg="Upload-Problem.<br>Try again, please."
y_format_message_html
fi
}
@@ -534,8 +554,8 @@ restart_neutrino()
#debug
echo "call:$*" >> "/tmp/debug.txt"
case "$1" in
- skin_set) skin_set $2 ;;
- skin_get) skin_get ;;
+ style_set) style_set $2 ;;
+ style_get) style_get ;;
image_upload) image_upload ;;
image_backup) image_backup_mtd $2; echo
"/tmp/flash_mtd$2.img" ;;
image_flash) shift 1; flash_mtd $* ;;
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/scripts/_Y_Library.sh
b/tuxbox/neutrino/daemons/nhttpd/web/scripts/_Y_Library.sh
index 6cd00b9..e128f6c 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/scripts/_Y_Library.sh
+++ b/tuxbox/neutrino/daemons/nhttpd/web/scripts/_Y_Library.sh
@@ -73,7 +73,9 @@ buildStreamingAudioRawURL()
y_format_message_html()
{
tmp="<html><head><meta http-equiv='Content-Type' content='text/html;
charset=windows-1252'>"
- tmp="$tmp <link rel='stylesheet' type='text/css'
href='/Y_Main.css'></head>"
+ tmp="$tmp <link rel='stylesheet' type='text/css' href='/Y_Main.css'>"
+ tmp="$tmp <link rel='stylesheet' type='text/css' href='/Y_Dist.css'>"
+ tmp="$tmp <link rel='stylesheet' type='text/css'
href='/Y_User.css'></head>"
tmp="$tmp <body><div class='work_box'><div class='work_box_head'><div
class='work_box_head_h2'>Results</div></div><div class='work_box_body'
style='overflow:auto'>"
tmp="$tmp <pre>\n$msg\n</pre></div></div></body></html>"
@@ -83,7 +85,9 @@ y_format_message_html()
y_format_message_html2()
{
tmp="<html><head><meta http-equiv='Content-Type' content='text/html;
charset=windows-1252'>"
- tmp="$tmp <link rel='stylesheet' type='text/css'
href='/Y_Main.css'></head>"
+ tmp="$tmp <link rel='stylesheet' type='text/css' href='/Y_Main.css'>"
+ tmp="$tmp <link rel='stylesheet' type='text/css' href='/Y_Dist.css'>"
+ tmp="$tmp <link rel='stylesheet' type='text/css'
href='/Y_User.css'></head>"
tmp="$tmp <body><div class='work_box'><div class='work_box_head'><div
class='work_box_head_h2'>Results</div></div><div class='work_box_body'>"
tmp="$tmp $msg</div></div></body></html>"
echo "$tmp"
@@ -91,7 +95,9 @@ y_format_message_html2()
y_format_message_html_plain()
{
tmp="<html><head><meta http-equiv='Content-Type' content='text/html;
charset=windows-1252'>"
- tmp="$tmp <link rel='stylesheet' type='text/css'
href='/Y_Main.css'></head>"
+ tmp="$tmp <link rel='stylesheet' type='text/css' href='/Y_Main.css'>"
+ tmp="$tmp <link rel='stylesheet' type='text/css' href='/Y_Dist.css'>"
+ tmp="$tmp <link rel='stylesheet' type='text/css'
href='/Y_User.css'></head>"
tmp="$tmp <body>$msg</body></html>"
echo "$tmp"
}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/styles/.gitignore
b/tuxbox/neutrino/daemons/nhttpd/web/styles/.gitignore
new file mode 100644
index 0000000..c038ed7
--- /dev/null
+++ b/tuxbox/neutrino/daemons/nhttpd/web/styles/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
\ No newline at end of file
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/styles/Makefile.am
b/tuxbox/neutrino/daemons/nhttpd/web/styles/Makefile.am
new file mode 100644
index 0000000..7dc7c03
--- /dev/null
+++ b/tuxbox/neutrino/daemons/nhttpd/web/styles/Makefile.am
@@ -0,0 +1,6 @@
+install-data-local:
+ install -d $(DATADIR)/neutrino/httpd-y/styles
+ install -m 0644 Y_Dist-*.css $(DATADIR)/neutrino/httpd-y/styles
+
+uninstall-local:
+ -rm -rf $(DATADIR)/neutrino/httpd-y/styles
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist-GreyBlue.css
b/tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist-GreyBlue.css
new file mode 100644
index 0000000..d934c56
--- /dev/null
+++ b/tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist-GreyBlue.css
@@ -0,0 +1,425 @@
+/* Grey Blue - yweb style by OneOfNine */
+
+body {
+ background-color: #303030;
+ color: #ffffff;
+}
+body.iframe {
+ background-color: #272525;
+ color: #ffffff;
+}
+
+button[ytype]{
+ color: #ffffff;
+ background-position: 5px;
+ background-attachment: scroll;
+ background-color: #303030;
+ background-repeat: no-repeat;
+ padding-left: 25px;
+ padding-right: 5px;
+ vertical-align: middle;
+ text-align:left;
+}
+button[ytype="save"]{background-image:url(/images/save.png);}
+button[ytype="saveall"]{background-image:url(/images/saveall.png);}
+button[ytype="cancel"]{background-image:url(/images/cross.png);}
+button[ytype="refresh"],button[ytype="reboot"]{background-image:url(/images/reload.png);}
+button[ytype="record"]{background-image:url(/images/record.png);}
+button[ytype="zap"]{background-image:url(/images/zap.png);}
+button[ytype="timeup"]{background-image:url(/images/time_up.png);}
+button[ytype="timedown"]{background-image:url(/images/time_down.png);}
+button[ytype="timeadd"]{background-image:url(/images/time_add.png);}
+button[ytype="snapshot"]{background-image:url(/images/snapshot.png);}
+button[ytype="clearshot"]{background-image:url(/images/remove.png);}
+button[ytype="switchrc"]{background-image:url(/images/fb.png);}
+button[ytype="go"]{background-image:url(/images/accept.png);}
+button[ytype="download"]{background-image:url(/images/wget.png);}
+button[ytype="clear"]{background-image:url(/images/remove.png);}
+button[ytype="add"]{background-image:url(/images/new.png);}
+button[ytype="delete"]{background-image:url(/images/remove.png);}
+button[ytype="edit"]{background-image:url(/images/modify.png);}
+button[ytype="flash"]{background-image:url(/images/flash.png);}
+
+button[ytype="no"] {
+ padding-left: 5px
+}
+
+/*TODO: input file*/
+button[type="button"] {
+ height: 22px;
+ border: 1px solid #444444;
+ background-color: #303030;
+ border-radius: 3px;
+ color: #ffffff;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+}
+button:hover,input[type="button"]:hover,input[type="submit"]:hover,input[type="file"]:hover
{
+ position:relative;
+ left:1px;
+ top:1px;
+ background-color: #303030;
+ color: #ffffff;
+}
+
+input {
+ height: 22px;
+ border: 1px solid #444444;
+ background-color: #303030;
+ border-radius: 3px;
+ color: #ffffff;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+}
+
+input[type="text"]:focus,input[type="password"]:focus{
+ border: 1px solid #444444;
+ background: #343434;
+}
+
+select {
+ height: 22px;
+ border: 1px solid #444444;
+ background-color: #303030;
+ border-radius: 3px;
+ color: #ffffff;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+}
+
+a {
+ color: #ffffff;
+}
+td {
+ color: #ffffff;
+}
+tr {
+ color: #ffffff;
+}
+
+hr {
+ border: none;
+ border-top: solid #ffffff 1px;
+ height: 1px;
+}
+
+.y_menu_prim_box {
+ border-color: #000;
+}
+.y_menu_prim_box_head {
+ background: #272525;
+}
+.y_menu_prim_box_body {
+ background-color: #272525;
+}
+.y_menu_prim_box_body #prim span,
+.y_menu_prim_box_body #box_name,
+.y_menu_prim_box_body #clock {
+ text-shadow: 1px 1px 1px #000;
+}
+.y_menu_prim li a {
+ text-shadow: 1px 1px 1px #000;
+}
+.y_menu_prim li a:hover {
+ color: #518eea;
+}
+.y_menu_prim li.selected a {
+ color: #ffffff;
+}
+
+.y_menu_sec_box {
+ border-color: #000;
+}
+.y_menu_sec_box_head {
+ background: #000000;
+}
+.y_menu_sec_box_head h2 {
+ color: #518eea;
+/*
+ text-shadow: 1px 1px 1px #000;
+*/
+ text-shadow: 0 -1px #000025, 1px 0 #000025, 0 1px #000025, -1px 0
#000025, #000 1px 1px 1px;
+}
+.y_menu_sec_box_body {
+ background-color: #272525;
+}
+.y_menu_sec li {
+ color: #ffffff;
+}
+.y_menu_sec li.plain a {
+ color: #ffffff
+}
+.y_menu_sec li a:hover {
+ color: #518eea;
+}
+.y_menu_sec_section {
+ background-color: #3e8bfe;
+ color: #ffffff;
+ text-shadow: 0 -1px #000025, 1px 0 #000025, 0 1px #000025, -1px 0
#000025, #000 1px 1px 1px;
+}
+
+.work_box {
+ border-color: #000;
+}
+.work_box_head {
+ background-color: #00006e;
+}
+.work_box_head h2,.work_box_head_h2 {
+ background-color: #000000;
+ color: #518eea;
+ text-shadow: 0 -1px #000025, 1px 0 #000025, 0 1px #000025, -1px 0
#000025, #000 1px 1px 1px;
+}
+.work_box_body {
+ background-color: #272525;
+}
+
+.y_wait_box {
+ border: 1px solid #000;
+}
+.y_wait_box_visible {
+ border: 1px solid #000;
+}
+.y_wait_box_head {
+ background: #000000;
+ color: #3e8bfe;
+}
+.y_wait_box_head h2 {
+ text-shadow: 0 -1px #000025, 1px 0 #000025, 0 1px #000025, -1px 0
#000025, #000 1px 1px 1px;
+ color: #3e8bfe;
+}
+.y_wait_box_body {
+ background-color: #272525;
+}
+
+.y_table,.y_form_table,.y_invisible_table,y_form table {
+ color: #ffffff;
+}
+.y_live_button {
+ color: #ffffff;
+}
+
+.y_live_bouquets {
+ color: #ffffff;
+}
+
+.y_live_channels
+{
+ color: #ffffff;
+}
+.y_live_audio_pids
+{
+ color: #ffffff;
+}
+
+.y_form_header_oline {
+ color : #ffffff;
+}
+
+.y_form_header {
+ border-bottom : 1px solid #ffffff;
+ color : #ffffff;
+ padding-top:0.5em;
+}
+
+.y_form_section {
+ color : #ffffff;
+}
+
+.y_text_boxcontrol_table {
+ border-color: #303030;
+}
+
+.y_text_boxcontrol_table_progress {
+ border-color: #303030;
+}
+.y_text_boxcontrol_div_progress {
+ border-color: #303030;
+}
+#audiobar_right,
+#sigbar_right,
+#snrbar_right {
+ background-color: #272525;
+}
+
+.y_epg_info {
+ border: none;
+ background-color: #202020;
+}
+.y_epg_info #description,
+.y_epg_info #info1,
+.y_epg_info #info2 {
+ background-color: #272525;
+}
+
+.bouquetitemlist .logo_cell {
+ background: #303030;
+ border-bottom: 1px solid #272525;
+}
+
+.channel_logo {
+ background: #343434;
+}
+
+.channel_logos
+{
+ background: #343434;
+}
+
+#epg_plus {
+ border-color : #000;
+}
+.ep_bouquet {
+ border-color : #000;
+}
+.ep_bouquet_name {
+ background: #333333;
+ border-color : #333333;
+}
+.ep_bouquet_name a {
+}
+.ep_bouquet_item {
+ border-color : #333333;
+}
+.ep_bouquet_item:hover {
+ background-color: #444444;
+}
+.ep_bouquet_item span:hover {
+}
+.ep_bouquet_rec {
+ border-color : #ff0000;
+}
+.ep_bouquet_zap {
+ border-color : #440044;
+}
+.ep_time_bar {
+ border-color : #000;
+}
+.ep_time_bar_item {
+ border-color : #000;
+}
+.ep_info_desc {
+}
+.ep_info_info1 {
+}
+.ep_info_info2 {
+}
+
+#epg_info {
+ border : #999999 solid 1px;
+ background-color: #000025;
+}
+#epg_time {
+}
+
+#epglist tbody tr:hover {
+ background-color: #00006e;
+}
+.a
+{
+ background-color: #333333;
+}
+.aepg
+{
+ background-color: #333333;
+ border-bottom: 1px solid #272525;
+}
+.b
+{
+ background-color: #444444;
+}
+.bepg
+{
+ background-color: #444444;
+ border-bottom: 1px solid #272525;
+}
+.c
+{
+ background-color: #303030;
+}
+.c a
+{
+}
+.cepg
+{
+ background-color: #303030;
+ border-bottom: 1px solid #272525;
+}
+.cslider_table
+{
+ border: 1px solid #000000;
+}
+.cslider_used
+{
+ background-color: #666666;
+}
+.cslider_free
+{
+ background-color: #303030;
+}
+.cslider_noepg
+{
+ background-color: #272525;
+}
+.epg
+{
+ font-weight: bold;
+ color: #ffffff;
+}
+
+.atimer {
+ background-color: #535353;
+}
+
+.lt_table th {
+ color : #ffffff;
+}
+
+table.screenshot {
+ background: #272525;
+}
+
+img#shot {
+ background-color: #272525;
+ border: 1px solid #000;
+}
+
+/* Filemgr */
+.diag {
+ border-color: #000025;
+ background-color: #272525;
+}
+.toolbar td {
+ border-color: #000025;
+}
+.toolbar img {
+ border:0;
+}
+.toolbar td:hover {
+ background-color: #272525;
+}
+.button {
+ border-color: #000025;
+}
+.button:hover {
+ background-color: #000025;
+}
+.mform {
+}
+
+.filelist a{
+}
+.box {
+ border-color: #000025;
+}
+.epginfo2{
+}
+.detail_title{
+ border-color: #000025;
+ background-color: #272525;
+}
+.detail_title_active{
+ border-color: #000025;
+ background-color: #272525;
+}
+.detail_img {
+}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist-Tuxbox.css
b/tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist-Tuxbox.css
new file mode 100644
index 0000000..35f1301
--- /dev/null
+++ b/tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist-Tuxbox.css
@@ -0,0 +1,6 @@
+/*
+ Tuxbox yWeb Style - Do not modify.
+
+ When you're a distributor, use your own styles/Y_Dist-<name>.css file.
+ When you're a user, use Y_User.css.
+*/
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist.css
b/tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist.css
new file mode 100644
index 0000000..35f1301
--- /dev/null
+++ b/tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist.css
@@ -0,0 +1,6 @@
+/*
+ Tuxbox yWeb Style - Do not modify.
+
+ When you're a distributor, use your own styles/Y_Dist-<name>.css file.
+ When you're a user, use Y_User.css.
+*/
-----------------------------------------------------------------------
Summary of changes:
tuxbox/neutrino/configure.ac | 1 +
tuxbox/neutrino/daemons/nhttpd/web/Makefile.am | 4 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Blocks.txt | 13 +-
.../nhttpd/web/Y_Boxcontrol_Bouquetlist.yhtm | 2 +-
.../nhttpd/web/Y_Boxcontrol_Channellist.yhtm | 4 +-
.../daemons/nhttpd/web/Y_Boxcontrol_Menue.yhtm | 3 +-
.../daemons/nhttpd/web/Y_LiveViewFull.yhtm | 6 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_Live_EPG.yhtm | 4 +-
.../daemons/nhttpd/web/Y_Live_EPG_Info.yhtm | 4 +-
.../daemons/nhttpd/web/Y_Settings_Menue.yhtm | 1 -
.../daemons/nhttpd/web/Y_Settings_yWeb.yhtm | 33 ++-
.../daemons/nhttpd/web/Y_Tools_Info_Menue.yhtm | 2 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_User.css | 10 +
tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt | 4 +-
tuxbox/neutrino/daemons/nhttpd/web/Y_blank.htm | 4 +-
.../neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh | 82 +++--
.../daemons/nhttpd/web/scripts/_Y_Library.sh | 12 +-
.../nhttpd/web/{images => styles}/.gitignore | 0
.../neutrino/daemons/nhttpd/web/styles/Makefile.am | 6 +
.../daemons/nhttpd/web/styles/Y_Dist-GreyBlue.css | 425 ++++++++++++++++++++
.../daemons/nhttpd/web/styles/Y_Dist-Tuxbox.css | 6 +
.../neutrino/daemons/nhttpd/web/styles/Y_Dist.css | 6 +
22 files changed, 577 insertions(+), 55 deletions(-)
create mode 100644 tuxbox/neutrino/daemons/nhttpd/web/Y_User.css
copy tuxbox/neutrino/daemons/nhttpd/web/{images => styles}/.gitignore (100%)
create mode 100644 tuxbox/neutrino/daemons/nhttpd/web/styles/Makefile.am
create mode 100644
tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist-GreyBlue.css
create mode 100644 tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist-Tuxbox.css
create mode 100644 tuxbox/neutrino/daemons/nhttpd/web/styles/Y_Dist.css
--
Tuxbox-GIT: apps
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Tuxbox-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tuxbox-cvs-commits
