mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-03 10:51:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

yweb: some more corrections in languagefiles and design

Browse Source 
* replace background-images with plain css


Origin commit data
------------------
Branch: ni/coolstream
Commit: 957d9c6555
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-07-25 (Wed, 25 Jul 2012)

Origin message was:
------------------
- yweb: some more corrections in languagefiles and design

 * replace background-images with plain css


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2012-07-25 01:06:47 +02:00
parent e7b24059b2
commit 2860545b7b
16 changed files with 75 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nhttpd/web/Y_Blocks.txt
View File

@@ -384,7 +384,7 @@ start-block~frame_main
{=include-block:Y_Blocks.txt;frame_head=} {=include-block:Y_Blocks.txt;frame_head=}
<title>yWeb</title> <title>yWeb</title>
</head> </head>
<frameset rows="60,*" frameborder="0" framespacing="0"> <frameset rows="70,*" frameborder="0" framespacing="0">
<frame name="prim_menu" src="Y_Menue.yhtm" scrolling="no" marginwidth="0" marginheight="0" frameborder="0" noresize="noresize" /> <frame name="prim_menu" src="Y_Menue.yhtm" scrolling="no" marginwidth="0" marginheight="0" frameborder="0" noresize="noresize" />
<frame name="base" src="Y_Dyn_Pages.yhtm?page=frame_boxcontrol" marginwidth="0" marginheight="0" frameborder="0" style="height:100%"; /> <frame name="base" src="Y_Dyn_Pages.yhtm?page=frame_boxcontrol" marginwidth="0" marginheight="0" frameborder="0" style="height:100%"; />
</frameset> </frameset>

121
src/nhttpd/web/Y_Main.css
View File

@@ -1,6 +1,6 @@
body { body {
font-family: Verdana, Geneva, Arial, 'Lucida Grande',Tahoma, Helvetica, sans-serif; font-family: Verdana, Geneva, Arial, 'Lucida Grande',Tahoma, Helvetica, sans-serif;
background-color: White; background-color: #ffffff;
margin: 0; margin: 0;
padding:0; padding:0;
font-size:10pt; font-size:10pt;
@@ -13,18 +13,17 @@ button,input,select,form,td {
color:#555555; color:#555555;
} }
/* buttons */ /* buttons */
/*button{margin:1px}*/
a img:hover { a img:hover {
position:relative; position:relative;
left:1px; left:1px;
top:1px; top:1px;
} }
button[ytype]{ button[ytype]{
background-position:1px; background-position: 5px;
background-attachment: scroll; background-attachment: scroll;
background-color: transparent; background-color: transparent;
background-repeat: no-repeat; background-repeat: no-repeat;
padding-left: 20px; padding-left: 25px;
padding-right: 5px; padding-right: 5px;
vertical-align: middle; vertical-align: middle;
text-align:left; text-align:left;
@@ -48,7 +47,10 @@ button[ytype="delete"]{background-image:url(/images/remove.png);}
button[ytype="edit"]{background-image:url(/images/modify.png);} button[ytype="edit"]{background-image:url(/images/modify.png);}
button[ytype="flash"]{background-image:url(/images/flash.png);} button[ytype="flash"]{background-image:url(/images/flash.png);}
button[ytype="no"]{height:21px;padding-left:1px} button[ytype="no"] {
height: 21px;
padding-left: 5px
}
/*TODO: input file*/ /*TODO: input file*/
button,input[type="button"],input[type="submit"]/*,input[type="file"],input[type="file"] > input[type="button"],input[type="file"] > input[type="text"]*/ { button,input[type="button"],input[type="submit"]/*,input[type="file"],input[type="file"] > input[type="button"],input[type="file"] > input[type="text"]*/ {
@@ -108,56 +110,42 @@ tr {
} }
/* primary Navigation */ /* primary Navigation */
.y_menu_prim_box { .y_menu_prim_box {
margin: 0; margin: 5px;
/* padding:0;*/ font-size: 100.01%;
width: 100%; border: 1px solid #a0a0a0;
background: url(/images/body-trans-r.gif) no-repeat bottom right; border-radius: 5px;
font-size: 100%;
} }
.y_menu_prim_box_head { .y_menu_prim_box_head {
background: url(/images/head-trans-r.gif) no-repeat top right;
margin: 0; margin: 0;
padding: 0; padding: 0;
text-align: center; text-align: center;
background: #ffffff;
border-radius: 4px 4px 0 0;
} }
.y_menu_prim_box_head_h2 { .y_menu_prim_box_head_h2 {
background: url(/images/head-trans-l.gif) no-repeat top left;
margin: 0; margin: 0;
padding: 5px 0px 5px; padding: 5px 0px 5px;
color: white; color: white;
/* font-size: 0;*/
/* line-height: 0.5em;*/
} }
.y_menu_prim_box_body { .y_menu_prim_box_body {
background: url(/images/body-trans-l.gif) no-repeat bottom left; padding: 0 20px 5px;
/* margin: 0;*/ background-color: #ffffff;
padding-bottom: 8px; border-radius: 0 0 4px 4px;
padding-left: 20px;
padding-right: 20px;
} }
.y_menu_item { .y_menu_item {
margin: 0; margin: 0;
/* display: block;
background-repeat: no-repeat;*/
} }
.y_menu_prim { .y_menu_prim {
margin: 0; margin: 0;
padding: 0; padding: 0;
/* background-color: transparent;
white-space: nowrap;*/
list-style: none; list-style: none;
height: auto; height: auto;
/* line-height: normal;*/
} }
.y_menu_prim li { .y_menu_prim li {
display: inline; display: inline;
margin: 0; margin: 0;
/* font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif; text-align:center;
background-repeat: no-repeat;
background-position: 0 1px;
*/ text-align:center;
font-weight: normal; font-weight: normal;
/* height: auto;*/
padding: 0em 0.3em; padding: 0em 0.3em;
} }
.y_menu_prim_item { .y_menu_prim_item {
@@ -180,38 +168,36 @@ tr {
} }
/* secondary Navigation */ /* secondary Navigation */
.y_menu_sec_box { .y_menu_sec_box {
margin: 0; margin: 0 5px 5px;
padding: 0; padding: 0;
width: 100%; font-size: 100.01%;
background: url(/images/body-trans-r.gif) no-repeat bottom right; border: 1px solid #a0a0a0;
font-size: 100%; border-radius: 5px;
} }
.y_menu_sec_box_head { .y_menu_sec_box_head {
background: url(/images/head-orange-r.gif) no-repeat top right;
margin: 0; margin: 0;
padding: 0; padding: 0;
background: #ff6600;
border-radius: 4px 4px 0 0;
} }
.y_menu_sec_box_head h2 { .y_menu_sec_box_head h2 {
margin: 0; margin: 0;
padding: 10px 30px 3px 25px; padding: 5px 5px 5px 10px;
background: url(/images/head-orange-l.gif) no-repeat top left;
font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif; font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif;
color: white; color: white;
font-weight: bold; font-weight: bold;
font-size: 12pt; font-size: 1.2em;
/* line-height: 1.5em;*/
text-align: left; text-align: left;
} }
.y_menu_sec_box_body { .y_menu_sec_box_body {
background: url(/images/body-trans-l.gif) no-repeat bottom left;
margin: 0; margin: 0;
/* padding:0;*/ padding: 5px 0 10px;
padding: 5px 5px 20px 5px; background-color: #ffffff;
border-radius: 0 0 4px 4px;
} }
.y_menu_sec { .y_menu_sec {
display: block; display: block;
background-repeat: no-repeat; background-repeat: no-repeat;
margin: 0px; margin: 0px;
} }
@@ -263,31 +249,33 @@ tr {
/*work*/ /*work*/
.work_box { .work_box {
margin: 0; margin: 0 5px 5px 0;
background: url(/images/body-trans-r.gif) no-repeat bottom right; padding: 0;
font-size: 100.01%; font-size: 100.01%;
border: 1px solid #a0a0a0;
border-radius: 5px;
} }
.work_box_head { .work_box_head {
background: url(/images/head-blue-r.gif) no-repeat top right;
margin: 0; margin: 0;
padding: 0; padding: 0;
text-align: center; text-align: center;
background-color: #2188e0;
border-radius: 4px 4px 0 0;
} }
.work_box_head h2,.work_box_head_h2 { .work_box_head h2,.work_box_head_h2 {
background: url(/images/head-blue-l.gif) no-repeat top left;
margin: 0; margin: 0;
padding: 10px 30px 3px 30px; padding: 5px 20px;
font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif; font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif;
color: white; color: white;
font-weight: bold; font-weight: bold;
font-size: 12pt; font-size: 1.2em;
/* line-height: 1.5em;*/
text-align: left; text-align: left;
} }
.work_box_body { .work_box_body {
background: url(/images/body-trans-l.gif) no-repeat bottom left;
margin: 0; margin: 0;
padding: 5px 30px 10px 30px; padding: 5px 30px 10px 30px;
background-color: #ffffff;
border-radius: 0 0 4px 4px;
} }
.work_box_help { .work_box_help {
float:right; float:right;
@@ -340,47 +328,45 @@ tr {
/*wait box*/ /*wait box*/
.y_wait_box { .y_wait_box {
margin: 0; margin: 0;
background: url(/images/body-trans-r.gif) no-repeat bottom right;
font-size: 100%; font-size: 100%;
position : absolute; position : absolute;
left : 100px; left : 100px;
top : 100px; top : 100px;
visibility : hidden; visibility : hidden;
z-index : 500; z-index : 500;
border: 1px solid #a0a0a0;
border-radius: 5px;
} }
.y_wait_box_visible { .y_wait_box_visible {
margin: 0; margin: 0;
background: url(/images/body-trans-r.gif) no-repeat bottom right;
font-size: 100%; font-size: 100%;
position : absolute; position : absolute;
left : 100px; left : 100px;
top : 100px; top : 100px;
visibility : visible; visibility : visible;
z-index : 500; z-index : 500;
border: 1px solid #a0a0a0;
border-radius: 5px;
} }
.y_wait_box_head { .y_wait_box_head {
background: url(/images/head-orange-r.gif) no-repeat top right;
margin: 0; margin: 0;
padding: 0; padding: 0;
background: #ff6600;
border-radius: 4px 4px 0 0;
} }
.y_wait_box_head h2 { .y_wait_box_head h2 {
background: url(/images/head-orange-l.gif) no-repeat top left;
margin: 0; margin: 0;
padding: 12px 30px 3px 30px; padding: 5px 20px;
color: white; color: white;
font-weight: bold; font-weight: bold;
font-size: 1.2em; font-size: 1.2em;
line-height: 1.5em;
text-align: center; text-align: center;
} }
.y_wait_box_body { .y_wait_box_body {
background: url(/images/body-trans-l.gif) no-repeat bottom left;
margin: 0; margin: 0;
padding-top: 5px; padding: 5px 15px 20px;
padding-left: 16px; background-color: #ffffff;
padding-bottom: 20px; border-radius: 0 0 4px 4px;
padding-right: 16px;
} }
.y_wait_box_main { .y_wait_box_main {
color: #666666; color: #666666;
@@ -491,9 +477,10 @@ tr {
.y_text_boxcontrol_table { .y_text_boxcontrol_table {
width:114px; width:114px;
height: 22px; height: 22px;
background : url('/images/audiobar.gif') no-repeat 1px 0px; background: url('/images/audiobar.gif') no-repeat 1px 0px;
padding : 1px; padding: 1px;
border : #FF8e42 solid 1px; margin-top: 10px;
border: #FF8e42 solid 1px;
} }
.y_epg_info { .y_epg_info {
border: 1px solid #CCCCCC; border: 1px solid #CCCCCC;

8
src/nhttpd/web/Y_Settings_Timer.yhtm
View File

@@ -29,19 +29,19 @@ function do_submit() {
</tr> </tr>
<tr> <tr>
<td>{=L:set.timer.password=}</td> <td>{=L:set.timer.password=}</td>
<td><input type="password" name="tvinfo_password" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_password=}"/><br/><br/></td> <td><input type="password" name="tvinfo_password" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_password=}"/></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" class="y_form_header">klack.de (V2)</td> <td colspan="2" class="y_form_header">klack.de (V2)</td>
</tr> </tr>
<tr> <tr>
<td>{=L:set.timer.klack.url=}</td> <td>{=L:set.timer.klack.url=}</td>
<td><input type="text" name="klack_url" size="60" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_url=}"/><br/> <td><input type="text" name="klack_url" size="60" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_url=}"/>
{=L:set.timer.klack.url_desc=}</br></td> <br/>{=L:set.timer.klack.url_desc=}</td>
</tr> </tr>
<tr> <tr>
<td>{=L:set.timer.klack.security_code=}</td> <td>{=L:set.timer.klack.security_code=}</td>
<td><input type="password" name="klack_securitycode" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_securitycode=}" title="{=L:set.timer.klack.security_code_desc=}"/><br/><br/></td> <td><input type="password" name="klack_securitycode" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_securitycode=}" title="{=L:set.timer.klack.security_code_desc=}"/></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" class="y_form_header">{=L:set.timer.channel_name_replacelist=}</td> <td colspan="2" class="y_form_header">{=L:set.timer.channel_name_replacelist=}</td>

1
src/nhttpd/web/Y_Settings_automount_liste.yhtm
View File

@@ -41,6 +41,7 @@ function do_delete()
<div class="work_box_body"> <div class="work_box_body">
<form action="/y/cgi" name="f" id="f"> <form action="/y/cgi" name="f" id="f">
{=script:Y_Tools automount_list {=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}=} {=script:Y_Tools automount_list {=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}=}
<br/>
<input type="hidden" name="tmpl" value="Y_Settings_automount.yhtm"/> <input type="hidden" name="tmpl" value="Y_Settings_automount.yhtm"/>
<input type="hidden" name="execute" value=""/> <input type="hidden" name="execute" value=""/>
<input type="hidden" name="cmd" value=""/> <input type="hidden" name="cmd" value=""/>

4
src/nhttpd/web/Y_Version.txt
View File

@@ -1,4 +1,4 @@
version=2.8.0.21 version=2.8.0.22
date=24.07.2012 date=25.07.2012
type=Release type=Release
info=Port Coolstream info=Port Coolstream

4
src/nhttpd/web/images/LICENSE
View File

@@ -9,10 +9,6 @@ Published under GPL v2
- y.png - y.png
- audiobar.gif - audiobar.gif
- blank.gif - blank.gif
- body-trans*
- head-blue*
- head-orange*
- head-trans*
- help_white.gif - help_white.gif
From old (before yWeb): From old (before yWeb):

BIN
src/nhttpd/web/images/body-trans-l.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
src/nhttpd/web/images/body-trans-r.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.7 KiB

BIN
src/nhttpd/web/images/head-blue-l.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 649 B

BIN
src/nhttpd/web/images/head-blue-r.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/nhttpd/web/images/head-orange-l.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 656 B

BIN
src/nhttpd/web/images/head-orange-r.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
src/nhttpd/web/images/head-trans-l.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 433 B

BIN
src/nhttpd/web/images/head-trans-r.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

20
src/nhttpd/web/languages/Deutsch
View File

@@ -16,19 +16,19 @@ url=URL
server=Server server=Server
refreshing=aktualisieren ... refreshing=aktualisieren ...
refresh=Aktualisieren refresh=Aktualisieren
record=aufnehmen record=Aufnehmen
zap=umschalten zap=Umschalten
lookup=nachschlagen lookup=Nachschlagen
save_values_desc=senden und speichern der Werte save_values_desc=Senden und Speichern der Werte
save_values=Werte werden übernommen ... save_values=Werte werden übernommen ...
administration=Administration administration=Administration
normal=Normal normal=Normal
management=Management management=Management
uninstaller=Deinstallation uninstaller=Deinstallation
send=senden send=Senden
save=speichern save=Speichern
save_all=Alle &Auml;nderungen speichern save_all=Alle &Auml;nderungen speichern
cancel=abbrechen cancel=Abbrechen
answer=Antwort answer=Antwort
reboot=Neustart reboot=Neustart
shutdown=Ausschalten shutdown=Ausschalten
@@ -47,7 +47,7 @@ description=Beschreibung
color=Farbe color=Farbe
tag=Bezeichnung tag=Bezeichnung
empty=leer empty=leer
check=prüfen check=Prüfen
help=Hilfe help=Hilfe
attention=Achtung! attention=Achtung!
directory=Verzeichnis directory=Verzeichnis
@@ -366,10 +366,10 @@ set.ap.start_dir=Start-Verzeichnis
set.ap.parse_shoutcast=Shoutcast Meta-Daten set.ap.parse_shoutcast=Shoutcast Meta-Daten
========Settings Timer ========Settings Timer
set.timer.header=Timer Settings set.timer.header=Timer Einstellungen
set.timer.username=Benutzername set.timer.username=Benutzername
set.timer.password=Passwort set.timer.password=Passwort
set.timer.klack.url_desc=("&" wir beim Speichern zu ";" konvertiert) set.timer.klack.url_desc=("&" wird beim Speichern zu ";" konvertiert)
set.timer.klack.url=Persönliche RSS TV-Planer URL set.timer.klack.url=Persönliche RSS TV-Planer URL
set.timer.klack.security_code_desc=Klack Sicherheits Code set.timer.klack.security_code_desc=Klack Sicherheits Code
set.timer.klack.security_code=Sicherheits Code set.timer.klack.security_code=Sicherheits Code