summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--images/black/background.png (renamed from images/background.png)bin33702 -> 33702 bytes
-rw-r--r--images/black/mute.png (renamed from images/mute.png)bin9001 -> 9001 bytes
-rw-r--r--images/black/osd-bg.png (renamed from images/osd-bg.png)bin993 -> 993 bytes
-rw-r--r--images/black/unmute.png (renamed from images/unmute.png)bin7472 -> 7472 bytes
-rw-r--r--images/blue/mute.pngbin0 -> 9001 bytes
-rw-r--r--images/blue/unmute.pngbin0 -> 7472 bytes
-rw-r--r--index.html4
-rw-r--r--javascript/main.js92
-rw-r--r--javascript/settings.js4
-rw-r--r--javascript/settings2.js5
-rw-r--r--skins/blue.css94
11 files changed, 114 insertions, 85 deletions
diff --git a/images/background.png b/images/black/background.png
index 8b1d392..8b1d392 100644
--- a/images/background.png
+++ b/images/black/background.png
Binary files differ
diff --git a/images/mute.png b/images/black/mute.png
index 44e9547..44e9547 100644
--- a/images/mute.png
+++ b/images/black/mute.png
Binary files differ
diff --git a/images/osd-bg.png b/images/black/osd-bg.png
index a116650..a116650 100644
--- a/images/osd-bg.png
+++ b/images/black/osd-bg.png
Binary files differ
diff --git a/images/unmute.png b/images/black/unmute.png
index 70000a8..70000a8 100644
--- a/images/unmute.png
+++ b/images/black/unmute.png
Binary files differ
diff --git a/images/blue/mute.png b/images/blue/mute.png
new file mode 100644
index 0000000..44e9547
--- /dev/null
+++ b/images/blue/mute.png
Binary files differ
diff --git a/images/blue/unmute.png b/images/blue/unmute.png
new file mode 100644
index 0000000..70000a8
--- /dev/null
+++ b/images/blue/unmute.png
Binary files differ
diff --git a/index.html b/index.html
index c68eb78..5d1e3c9 100644
--- a/index.html
+++ b/index.html
@@ -28,7 +28,7 @@
<div id="colorkeys"></div>
<div id="chanlistepg"></div>
- <div id="osdvolume">Volume : </div>
+ <div id="osdvolume"></div>
<div id="osdmedia"> </div>
<div id="osdmediatime"></div>
@@ -44,7 +44,7 @@
<div id="schedule"></div>
- <div id="osdmute"><img src="mute.png"></div>
+ <div id="osdmute"></div>
<div id="osdlang"></div>
<div id="mainmenu"></div>
diff --git a/javascript/main.js b/javascript/main.js
index 292aad3..c2f8ef1 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -65,7 +65,7 @@ function onLoad() {
setOSDtimer();
showOSD();
videoplane.subtitles = Boolean(ShowSubs);
- colorkeys.innerHTML = "<span class=redkey> " + NN[4] + " </span><span class=greenkey > " + NN[1] + " </span><span class=yellowkey> " + NN[2] + " </span><span class=bluekey> " + NN[5] + " </span>";
+ colorkeys.innerHTML = "<pre class=colorkeys" + cssres[css_nr][Set_Res] + ">" + "<span class=redkey> " + NN[4] + " </span><span class=greenkey > " + NN[1] + " </span><span class=yellowkey> " + NN[2] + " </span><span class=bluekey> " + NN[5] + " </span></pre>";
medialist.innerHTML = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + Lang[0] + "</h1>";
}
@@ -237,7 +237,7 @@ function loadcss(filename){
var oScript= document.createElement("link");
oScript.type = "text/css";
oScript.rel = "stylesheet";
- oScript.href = "skins/" + filename;
+ oScript.href = "skins/" + filename + ".css";
oHead.appendChild( oScript);
}
@@ -357,6 +357,7 @@ function VolumeMute() {
state = aos.getMuteState(AudioOut);
aos.setMuteState(AudioOut, !state);
mute = 1 - state;
+ osdmute.innerHTML = "<img src='images/" + cssfile[css_nr] + "/mute.png'>";
osdmute.style.opacity = mute;
}
@@ -785,12 +786,12 @@ function onKeyDown(event) {
if (lang_prio_dyn.length > 1) {
is.setObject("cfg.media.audio.languagepriority",lang_prio_dyn[audio_dyn] + "," + lang_prio[audio],is.STORAGE_PERMANENT);
osdlang.style.opacity = 1;
- osdlang.innerHTML = "<pre class=osdvolume" + cssres[css_nr][Set_Res] + ">" + "<img src='unmute.png'> " + lang_prio_dyn[audio_dyn] + " </pre>";
+ osdlang.innerHTML = "<pre class=osdlang" + cssres[css_nr][Set_Res] + ">" + "<img src='images/" + cssfile[css_nr] + "/unmute.png'>\n" + lang_prio_dyn[audio_dyn] + " </pre>";
setTimeout("osdlang.style.opacity = 0; ", 3000);
}
}
} else if(isSchedule == 0 && !epgactive){
- colorkeys.innerHTML = "<span class=redkey> " + NN[3 + NowNext] + " </span><span class=greenkey > " + NN[NowNext] + " </span><span class=yellowkey> " + NN[2] + " </span><span class=bluekey> " + NN[5] + " </span>";
+ colorkeys.innerHTML = "<pre class=colorkeys" + cssres[css_nr][Set_Res] + ">" + "<span class=redkey> " + NN[3 + NowNext] + " </span><span class=greenkey > " + NN[NowNext] + " </span><span class=yellowkey> " + NN[2] + " </span><span class=bluekey> " + NN[5] + " </span></pre>";
NowNext = 1 - NowNext;
showChannelList();
}
@@ -818,9 +819,9 @@ function onKeyDown(event) {
schedule.style.opacity = 1 - schedule.style.opacity;
isSchedule = schedule.style.opacity;
if(isSchedule == 1){
- colorkeys.innerHTML = "<span class=redkey> " + NN[4] + " </span><span class=greenkey > " + NN[4] + " </span><span class=yellowkey> " + NN[6] + " </span><span class=bluekey> " + NN[4] + " </span>";
+ colorkeys.innerHTML = "<pre class=colorkeys" + cssres[css_nr][Set_Res] + ">" + "<span class=redkey> " + NN[4] + " </span><span class=greenkey > " + NN[4] + " </span><span class=yellowkey> " + NN[6] + " </span><span class=bluekey> " + NN[4] + " </span></pre>";
} else {
- colorkeys.innerHTML = "<span class=redkey> " + NN[3 + (1 - NowNext)] + " </span><span class=greenkey > " + NN[1 - NowNext] + " </span><span class=yellowkey> " + NN[2] + " </span><span class=bluekey> " + NN[5] + " </span>";
+ colorkeys.innerHTML = "<pre class=colorkeys" + cssres[css_nr][Set_Res] + ">" + "<span class=redkey> " + NN[3 + (1 - NowNext)] + " </span><span class=greenkey > " + NN[1 - NowNext] + " </span><span class=yellowkey> " + NN[2] + " </span><span class=bluekey> " + NN[5] + " </span></pre>";
}
}
break;
@@ -864,9 +865,10 @@ function onKeyDown(event) {
if(isSchedule) {
isSchedule = 0;
schedule.style.opacity = 0;
- colorkeys.innerHTML = "<span class=redkey> " + NN[3 + (1 - NowNext)] + " </span><span class=greenkey > "
+ colorkeys.innerHTML = "<pre class=colorkeys" + cssres[css_nr][Set_Res] + ">" + "<span class=redkey> "
+ + NN[3 + (1 - NowNext)] + " </span><span class=greenkey > "
+ NN[1 - NowNext] + " </span><span class=yellowkey> " + NN[2] + " </span><span class=bluekey> "
- + NN[5] + " </span>";
+ + NN[5] + " </span></pre>";
break;
}
@@ -915,7 +917,7 @@ function onKeyDown(event) {
showOSD();
GetEPG(currChan);
updateOSDtime(currChan);
- osdepg.innerHTML = "<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[0][7][currChan] + "\n" + EPG[1][7][currChan] + "</pre>";
+ osdepg.innerHTML = "<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[0][7][currChan] + "</pre>\n<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[1][7][currChan] + "</pre>";
// showOSD();
} else {
CheckChannel(Change);
@@ -1382,13 +1384,13 @@ function OSDchannr(channr) {
function OSDhtml(){
osdtime.innerHTML = "<span class=osdtime" + cssres[css_nr][Set_Res] + ">" + result + "</span>";
if (ShowSource == 1) {
- osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + channels[currChan].split("-")[0] + "\uE003" + Left(channelsnames[currChan],30) + "</span>";
+ osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + channels[currChan].split("-")[0] + "\uE003" + channelsnames[currChan] + "</span>";
} else {
- osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + Left(channelsnames[currChan],30) + "</span>";
+ osdname.innerHTML = "<span class=osdname" + cssres[css_nr][Set_Res] + ">" + channelsnames[currChan] + "</span>";
}
- osdepg.innerHTML = "<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[0][7][currChan] + "\n" + EPG[1][7][currChan] + "</pre>";
- osdepginfo.innerHTML = "<p class=epg_head>" + currChan + "\uE003" + channelsnames[currChan] + "</p><p class=epg_avinfo>" + AvInfo[currChan] + "</p><p class=epg_title>" + EPG[0][7][currChan] + EPG[0][9][currChan] + EPG[0][8][currChan] + "</p>\n<p class=epg_info>" + EPG[0][4][currChan] + "</p>\n<p class=epg_info_long>" + Left(EPG[0][5][currChan],750) + "</p>";
- osdepginfonext.innerHTML = "<p class=epg_head>" + currChan + "\uE003" + channelsnames[currChan] + "</p><p class=epg_title>" + EPG[1][7][currChan] + EPG[1][9][currChan] + EPG[1][8][currChan] + "</p>\n<p class=epg_info>" + EPG[1][4][currChan] + "</p>\n<p class=epg_info_long>" + Left(EPG[1][5][currChan],750) + "</p>";
+ osdepg.innerHTML = "<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[0][7][currChan] + "</pre>\n<pre class=osdepg" + cssres[css_nr][Set_Res] + ">" + EPG[1][7][currChan] + "</pre>";
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>" + currChan + "\uE003" + channelsnames[currChan] + "</p><p class=epg_avinfo>" + AvInfo[currChan] + "</p><p class=epg_title>" + EPG[0][7][currChan] + EPG[0][9][currChan] + EPG[0][8][currChan] + "</p>\n<p class=epg_info>" + EPG[0][4][currChan] + "</p>\n<p class=epg_info_long>" + Left(EPG[0][5][currChan],750) + "</p></span>";
+ osdepginfonext.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>" + currChan + "\uE003" + channelsnames[currChan] + "</p><p class=epg_title>" + EPG[1][7][currChan] + EPG[1][9][currChan] + EPG[1][8][currChan] + "</p>\n<p class=epg_info>" + EPG[1][4][currChan] + "</p>\n<p class=epg_info_long>" + Left(EPG[1][5][currChan],750) + "</p></span>";
}
function updateOSDtime(timchan) {
@@ -1481,7 +1483,7 @@ if (!BackGroundColor) { BackGroundColor = color_default;}
}
// switchtimer.style.background = BackGroundColor;
- switchtimer.innerHTML = "<pre class=" + BackGroundColor + cssres[css_nr][Set_Res] + ">" + Lang[2] + Left(ProgName,30) + "\n" + Lang[3] + channelsnames[currChan] + "\n" + x + "</pre>";
+ switchtimer.innerHTML = "<pre class=" + BackGroundColor + cssres[css_nr][Set_Res] + ">" + Lang[2] + ProgName + "\n" + Lang[3] + channelsnames[currChan] + "\n" + x + "</pre>";
setOSDtimer();
switchtimer.style.opacity = 1;
@@ -1736,7 +1738,8 @@ function GetEPG(epgchan)
var th = tijd.getHours();
th=addzero(th);
tm=addzero(tm);
- EPG[1][7][epgchan] = th + ":" + tm + " (" + (event.duration/60).toFixed(0) + ")" + " " + event.name + " ";
+// EPG[1][7][epgchan] = th + ":" + tm + " (" + (event.duration/60).toFixed(0) + ")" + " " + event.name + " ";
+ EPG[1][7][epgchan] = th + ":" + tm + " (" + (event.duration/60).toFixed(0) + ") " + event.name + " ";
if (!event.time)
{
@@ -2211,13 +2214,13 @@ function onKeyMenu(keyCode) {
if (menu == 5) {
// Show EPG info Timer
osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
- osdepginfo.innerHTML = "<pre class=epgtimerinfo>\n\n\n" + Lang[0] + "\n\n\n </pre>" ;
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>\n\n\n" + Lang[0] + "\n\n\n </p></span>" ;
setTimeout("ShowTimerInfo();",100);
}
if (menu == 7) {
// Show more info Current SearchTimer
osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
- osdepginfo.innerHTML = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + searchtimersSearch[timerID] + "\n\n\n\n" + Lang[0] + "</h1>" ;
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>" + searchtimersSearch[timerID] + "\n\n\n\n" + Lang[0] + "</p></span>" ;
setTimeout("ShowSearchTimerInfo();",100);
}
@@ -2359,8 +2362,6 @@ function onKeyMenu(keyCode) {
css_nr += 1;
if (css_nr > (cssfile.length - 1)) { css_nr = 0;}
loadcss(cssfile[css_nr]);
- alert(css_nr);
- alert(cssfile[css_nr]);
is.setObject("vip.css_nr",css_nr.toString(),is.STORAGE_PERMANENT)
setTimeout("InitMenu(menu);",100);
} else if (menu == 2) {
@@ -2368,15 +2369,20 @@ function onKeyMenu(keyCode) {
var x = ss.getBookingIds("*", 0, 0);
var y = Number(ss.getParameter(x[timerID-1], "Channel"));
osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
- osdepginfo.innerHTML = "<pre class=epgtimerinfo>" + ss.getParameter(x[timerID-1], "Title") + "\n " + "\n" + y + " - " + channelsnames[y] + "(" + ss.getParameter(x[timerID-1], "Eventid") + ")" + "\n </pre><p class=epg_info>" + ss.getParameter(x[timerID-1], "Info") + "</p>" ;
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>"
+ + ss.getParameter(x[timerID-1], "Title") + "\n " + "\n" + y + " - "
+ + channelsnames[y] + "(" + ss.getParameter(x[timerID-1], "Eventid") + ")"
+ + "\n </p><p class=epg_info>" + ss.getParameter(x[timerID-1], "Info") + "</p></span>" ;
} else if (menu == 5) {
// Show EPG info Timer
osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
- osdepginfo.innerHTML = "<pre class=epgtimerinfo>\n\n\n" + Lang[0] + "\n\n\n </pre>" ;
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>\n\n\n"
+ + Lang[0] + "\n\n\n </p></span>" ;
setTimeout("ShowTimerInfo();",100);
} else if (menu == 7) {
// Show info SearchTimers
- osdepginfo.innerHTML = "<pre class=epgtimerinfo>" + SearchTimer[timerID] + "</pre>";
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>"
+ + SearchTimer[timerID] + "</p></span>";
osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
} else if (menu == 10) {
if (protChn[ChanGroup] !== 1 && ChanGroup !== Fav_group) {
@@ -2727,7 +2733,7 @@ if(menu == 1) { // settings menu
htmltext += "\n\n <span class=redkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -" + Lang[20];
htmltext += "</span><span class=greenkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> - " + VideoOutputModes_txt[VideoOutputModes[Set_Res]] + " ";
htmltext += "</span><span class=yellowkey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> -" + Lang[35];
- htmltext += "</span><span class=bluekey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> - " + Left(cssfile[css_nr].split(".")[0],8) +"</pre>";
+ htmltext += "</span><span class=bluekey>\u25CF</span><span class=mainfont" + cssres[css_nr][Set_Res] + "> - " + Left(cssfile[css_nr],8) +"</pre>";
// htmltext += "\n 0 -" + Lang[9] +"</pre>";
mainmenu.innerHTML = htmltext;
}
@@ -3108,8 +3114,10 @@ function ShowTimerInfo() {
} else {
info3 = Lang[37];
}
- osdepginfo.innerHTML = "<pre class=epgtimerinfo>" + Left(info1,60) + "\n " + timersDays[timerID] + " " +
- timersStrt[timerID] + " - " + timersStop[timerID] + "\n" + info2 + "\n </pre><p class=epgtimerinfo>" + info3 + Left(info4,750) + "</p>" ;
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">" + "<p class=epg_head>"
+ + Left(info1,60) + "\n " + timersDays[timerID] + " " +
+ timersStrt[timerID] + " - " + timersStop[timerID] + "\n"
+ + info2 + "\n " + info3 + Left(info4,750) + "</p></span>" ;
}
}
@@ -3245,7 +3253,8 @@ function ShowSearchTimerInfo() {
}
- osdepginfo.innerHTML = "<pre class=mainhead" + cssres[css_nr][Set_Res] + ">" + searchtimersSearch[timerID] + "\n " + info1 + "</pre>" ;
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">"
+ + "<p class=epg_head>" + searchtimersSearch[timerID] + "\n " + info1 + "</p></span>" ;
}
@@ -3608,7 +3617,7 @@ if (DelisOK) {
if (lang_prio_dyn.length > 1) {
is.setObject("cfg.media.audio.languagepriority",lang_prio_dyn[audio_dyn] + "," + lang_prio[audio],is.STORAGE_PERMANENT);
osdlang.style.opacity = 1;
- osdlang.innerHTML = "<pre class=osdvolume" + cssres[css_nr][Set_Res] + ">" + "<img src='unmute.png'> " + lang_prio_dyn[audio_dyn] + " </pre>";
+ osdlang.innerHTML = "<pre class=osdlang" + cssres[css_nr][Set_Res] + ">" + "<img src='images/" + cssfile[css_nr] + "/unmute.png'>\n" + lang_prio_dyn[audio_dyn] + " </pre>";
setTimeout("osdlang.style.opacity = 0; ", 3000);
}
break;
@@ -4187,7 +4196,7 @@ try {
//popup for confirm
switchtimer.style.background = "red";
switchtimer.style.opacity = 1;
- switchtimer.innerHTML = "<pre class=deletefile" + cssres[css_nr][Set_Res] + ">" + Lang[44] +"\n" + Lang[45] + "\n\n " + Left(recTitl[currMed],30) + "</pre>"; // Recording Name
+ switchtimer.innerHTML = "<pre class=deletefile" + cssres[css_nr][Set_Res] + ">" + Lang[44] +"\n" + Lang[45] + "\n\n " + recTitl[currMed] + "</pre>"; // Recording Name
DelisOK = 1
} catch(e) {
alert("Delete Recordings problem: " + e);
@@ -4497,7 +4506,7 @@ function showMediaList() {
if (recList[listMed]) { //Solves empty string at the end.
if ( listMed == currMed) { htmlstring += "<span class=mediaselect" + cssres[css_nr][Set_Res] + ">"; }
- htmlstring += "\uE003" + Left(recList[listMed],60) + "\uE003\uE003\n";
+ htmlstring += "\uE003" + recList[listMed] + "\uE003\uE003\n";
if ( listMed == currMed) { htmlstring += "</span>";}
}
@@ -4897,11 +4906,12 @@ function ShowInfo() {
if ( medialist.style.opacity == 0 ) { updateStreamInfo(currMed);} else { AvInfo[currMed] = "";}
if (get_recordings == 2) {
result = recStrt[currMed]
- osdepginfo.innerHTML = "<p class=epg_head>" + Left(recTitl[currMed],60)
- + "\n </p><p class=epg_avinfo>" + AvInfo[currMed]
- + "</p><p class=epg_title> " + result + "\n "
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">"
+ + "<p class=epg_head>" + Left(recTitl[currMed],60)
+ + "</p><p class=epg_avinfo>" + AvInfo[currMed]
+ + "</p><p class=epg_title> " + result + "<br>"
+ "???" + Lang[54]
- + "</p><p class=epg_info> Sorry STREAMDEV-plugin : " + Lang[37] + "</p>";
+ + "</p><p class=epg_info> Sorry STREAMDEV-plugin : " + Lang[37] + "</p></span>";
} else {
date = new Date(Number(recStrt[currMed])*1000);
year = date.getFullYear();
@@ -4915,15 +4925,17 @@ function ShowInfo() {
result = '' + days[day] + ' ' + d + ' ' + months[month] + ' ' + year + ' ' + h + ':' + m;
if (year!==1970) {
- osdepginfo.innerHTML = "<p class=epg_head>" + Left(recTitl[currMed],60)
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">"
+ + "<p class=epg_head>" + Left(recTitl[currMed],60)
+ "</p><p class=epg_avinfo>" + AvInfo[currMed]
- + "</p><p class=epg_title> " + result + "\n "
- + (recDura[currMed] / 60).toFixed(0) + Lang[54] + "\n " + recChan[currMed] + " "
- + "\n </p><p class=epg_info_long>" + Left(recDesc[currMed],750) + "</p>";
+ + "</p><p class=epg_title> " + result + "<br>"
+ + (recDura[currMed] / 60).toFixed(0) + Lang[54] + "<br>" + recChan[currMed]
+ + "</p><p class=epg_info_long>" + Left(recDesc[currMed],750) + "</p></span>";
} else {
//info for non-vdr recordings
- osdepginfo.innerHTML = "<p class=epg_head>" + Left(recTitl[currMed],60)
- + "\n </p><p class=epg_avinfo>" + AvInfo[currMed] + " " + "\n \n </p>";
+ osdepginfo.innerHTML = "<span class=osdepginfo" + cssres[css_nr][Set_Res] + ">"
+ + "<p class=epg_head>" + Left(recTitl[currMed],60)
+ + "</p><p class=epg_avinfo>" + AvInfo[currMed] + " " + "<br><br></p></span>";
}
}
}
diff --git a/javascript/settings.js b/javascript/settings.js
index eece108..db06608 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -2,7 +2,7 @@
// Default settings
//
-var Version = "0.26.5";
+var Version = "0.26.6";
server_ip_array = new Array("http://192.168.1.15","http://192.168.3.15","http://192.168.178.56","http://192.168.3.100","http://192.168.178.19","http://192.168.1.21","http://192.168.2.100","http://192.168.178.52");
@@ -14,7 +14,7 @@ OSDLang = new Array ("English", "Nederlands", "Deutsch");
langfile = new Array ("languages/lang_eng.js", "languages/lang_dut.js","languages/lang_ger.js");
lang_prio = new Array("dut,eng,und","ger,deu,eng","eng,und","fre,fra,eng");
-cssfile = new Array ("blue.css","black.css");
+cssfile = new Array ("blue","black");
cssres = new Array();
cssres[0] = new Array ("576","720","1080"); //blue.css
cssres[1] = new Array ("","",""); //black.css
diff --git a/javascript/settings2.js b/javascript/settings2.js
index 3aa5a91..e24ade7 100644
--- a/javascript/settings2.js
+++ b/javascript/settings2.js
@@ -25,9 +25,10 @@ function GuideView_start() {
isFullscreen = 0;
ClearScreen();
channellist.style.opacity = 1;
- colorkeys.innerHTML = "<span class=redkey> " + NN[3 + (1 - NowNext)] + " </span><span class=greenkey > "
+ colorkeys.innerHTML = "<pre class=colorkeys" + cssres[css_nr][Set_Res] + ">" + "<span class=redkey> "
+ + NN[3 + (1 - NowNext)] + " </span><span class=greenkey > "
+ NN[1 - NowNext] + " </span><span class=yellowkey> " + NN[2] + " </span><span class=bluekey> "
- + NN[5] + " </span>";
+ + NN[5] + " </span></pre>";
colorkeys.style.opacity = 1;
showChannelList();
if(!SwitchGuide) {
diff --git a/skins/blue.css b/skins/blue.css
index 8521206..8700d5a 100644
--- a/skins/blue.css
+++ b/skins/blue.css
@@ -26,8 +26,20 @@
color :green;
}
+ pre.colorkeys576 {
+ font-size:19px;
+ }
+
+ pre.colorkeys720 {
+ font-size:24px;
+ }
+
+ pre.colorkeys1080 {
+ font-size:36px;
+ }
+
.mainfont576 {
- font-size:26px;
+ font-size:18px;
color:black;
}
@@ -42,7 +54,7 @@
}
.osdnr576 {
- font-size:43px;
+ font-size:36px;
}
.osdnr720 {
@@ -71,7 +83,7 @@
.osdtime576 {
color : white;
- font-size:17px;
+ font-size:12px;
text-align: right;
}
@@ -104,7 +116,7 @@
.osdca576 {
color : black;
- font-size:32px;
+ font-size:20px;
}
.osdca720 {
@@ -119,7 +131,7 @@
pre.osdvolume576 {
color : green;
- font-size:35px;
+ font-size:26px;
}
pre.osdvolume720 {
@@ -139,11 +151,11 @@
pre.osdepg720 {
color : white;
- font-size:23px;
+ font-size:25px;
}
pre.osdepg1080 {
color : white;
- font-size:36px;
+ font-size:40px;
}
.notset {
@@ -176,6 +188,7 @@
-webkit-border-radius:25px;
color:black;
font-size:21px;
+ overflow:hidden;
}
.mediaselect720 {
@@ -183,6 +196,7 @@
-webkit-border-radius:25px;
color:black;
font-size:26px;
+ overflow:hidden;
}
.mediaselect1080 {
@@ -190,21 +204,25 @@
-webkit-border-radius:25px;
color:black;
font-size:38px;
+ overflow:hidden;
}
pre.mediamenu576 {
font-size:21px;
color:black;
+ overflow:hidden;
}
pre.mediamenu720 {
font-size:26px;
color:black;
+ overflow:hidden;
}
pre.mediamenu1080 {
font-size:38px;
color:black;
+ overflow:hidden;
}
pre.deletefile576 {
@@ -249,34 +267,40 @@
background :red;
}
- p.epg_head {
- color:white;
+ .osdepginfo576 {
+ font-size:19px;
+ text-align: center;
+ }
+
+ .osdepginfo720 {
+ font-size:26px;
text-align: center;
+ }
+
+ .osdepginfo1080 {
font-size:39px;
+ text-align: center;
+ }
+
+
+ p.epg_head {
+ color:white;
}
p.epg_avinfo {
color:black;
- text-align: center;
- font-size:39px;
}
p.epg_title {
color:white;
- text-align: center;
- font-size:39px;
}
p.epg_info {
color:yellow;
- text-align: center;
- font-size:39px;
}
p.epg_info_long {
color:yellow;
- text-align: center;
- font-size:39px;
}
pre.color_switchtimer576 {
@@ -335,7 +359,7 @@
h1.mainmenu576 {
- font-size:35px;
+ font-size:28px;
color:white;
text-align: center;
}
@@ -353,7 +377,7 @@
}
pre.mainmenu576 {
- font-size:26px;
+ font-size:25px;
color:black;
}
@@ -387,7 +411,7 @@
pre.media576 {
color:white;
- font-size:26px;
+ font-size:18px;
}
pre.media720 {
@@ -400,15 +424,6 @@
font-size:49px;
}
- pre.epgtimerinfo {
- color:white;
- text-align: center;
- }
-
- p.epgtimerinfo {
- text-align: center;
- }
-
p.epg576 {
font-size:19px;
color:black;
@@ -488,9 +503,10 @@
z-index : 505;
position : absolute;
width : 69%;
- height : 4%;
+ height : 20%;
left : 3%;
top : 20%;
+ overflow:hidden;
}
@@ -506,16 +522,17 @@
z-index : 505;
position : absolute;
width : 42%;
- right : 5%;
+ right : 3%;
top : 7%;
}
div#osdepg {
z-index : 505;
position : absolute;
- width : 63%;
+ width : 78%;
left : 17%;
top : 30%;
+ overflow:hidden;
}
div#osdca {
@@ -536,24 +553,19 @@
background : #bbb;
}
-/* */
-
div#colorkeys {
z-index : 401;
position : absolute;
width : 100%;
left : 10%;
top : 84%;
- font-size:36px;
}
-/* */
-
div#osdmediatime {
z-index : 506;
position : absolute;
width : 42%;
- right : 15%;
+ right : 5%;
top : 63%;
color : white;
}
@@ -580,7 +592,7 @@
position : absolute;
width : 63%;
left : 10%;
- top : 80%;
+ top : 75%;
opacity : 0;
}
@@ -593,6 +605,7 @@
opacity :0;
-webkit-border-radius:50px;
background : #3366ff;
+ overflow:hidden;
}
div#schedule {
@@ -626,6 +639,7 @@
opacity :0;
-webkit-border-radius:50px;
background : #3366ff;
+ overflow:hidden;
}
div#medialist {
@@ -645,10 +659,12 @@
position :absolute;
left :21%;
top :26%;
+ height :18%;
z-index :530;
opacity :0;
-webkit-border-radius:25px;
background :lightblue;
+ overflow:hidden;
}
div#osdepginfo {