summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM. Voerman <rekordc@gmail.com>2014-11-19 00:47:46 +0100
committerM. Voerman <rekordc@gmail.com>2014-11-19 00:47:46 +0100
commitcdbf58fc9916c66114db5b945a359565b2991134 (patch)
tree2bd3027a8a91a7cb74f96a8b16da132708f52004
parent5d2806ef7d628c682ec402a814446038605e7123 (diff)
downloadvdr-vipclient-cdbf58fc9916c66114db5b945a359565b2991134.tar.gz
vdr-vipclient-cdbf58fc9916c66114db5b945a359565b2991134.tar.bz2
Remove osdbox when showing menu in play recordings mode
-rw-r--r--javascript/main.js12
-rw-r--r--javascript/settings2.js4
-rw-r--r--languages/lang_dut.js2
-rw-r--r--languages/lang_eng.js2
-rw-r--r--languages/lang_ger.js2
-rw-r--r--skins/blue.css22
6 files changed, 27 insertions, 17 deletions
diff --git a/javascript/main.js b/javascript/main.js
index d1e396e..3df2ea0 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -3148,7 +3148,7 @@ try {
}
// Extended INFO
- SearchTimer[i] = "<pre class=mainhead" + cssres[css_nr][Set_Res] + ">" + x[i].getElementsByTagName("search")[0].childNodes[0].nodeValue + "\n </pre><pre class=searchtimers" + cssres[css_nr][Set_Res] + ">";
+ SearchTimer[i] = "<h1 class=mainhead" + cssres[css_nr][Set_Res] + ">" + x[i].getElementsByTagName("search")[0].childNodes[0].nodeValue + "\n </h1><pre class=searchtimers" + cssres[css_nr][Set_Res] + ">";
if ((x[i].getElementsByTagName("use_as_searchtimer")[0].childNodes[0].nodeValue) == 0) {
SearchTimer[i] += "\uE003\uE016\uE003" + Lang[40] + "\n";
} else {
@@ -3642,6 +3642,8 @@ if (DelisOK) {
case "Menu":
osdepginfo.style.opacity = 0;
osdepginfonext.style.opacity = 0;
+ osdmedia.style.opacity = 0;
+ osdmediatime.style.opacity = 0;
isSetupMenu = 1;
mainmenu.style.opacity = 0.8;
menu = 6;
@@ -4199,7 +4201,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 " + recTitl[currMed] + "</pre>"; // Recording Name
+ switchtimer.innerHTML = "<pre class=deletefile" + cssres[css_nr][Set_Res] + ">" + Lang[44] + "," + Lang[45] + "\n\n" + recTitl[currMed] + "</pre>"; // Recording Name
DelisOK = 1
} catch(e) {
alert("Delete Recordings problem: " + e);
@@ -4879,17 +4881,17 @@ if (get_recordings == 1) {
var pos5 = "\uE007" + new Array(pos2 - 1).join("\uE008") + new Array(140 - pos2).join("\uE009") + "\uE00A"
var pos4 = "";
var pos6 = pos5;
- var fontc = color_progress1;
+ var fontc = "<span class=color_progress1>";
var x = 0;
for (var i=0; i<recMark.length; i++) {
var pos3 = recMark[i] / Number(recDura[currMed]) * 100;
pos3 = ((pos3 * 140) / 100).toFixed(0); // make it 40% bigger
pos4 += fontc + Left(pos6,pos3 - x);
- if (fontc == "</font>" + color_progress2) { fontc = "</font>" + color_progress1; } else { fontc = "</font>" + color_progress2;}
+ if (fontc == "</span><span class=color_progress2>") { fontc = "</span><span class=color_progress1>"; } else { fontc = "</span><span class=color_progress2>";}
x = pos3;
pos6 = Right(pos5,140 - pos3);
}
- pos4 += "</font>" + color_progress1 + pos6 + "</font>";
+ pos4 += "</span><span class=color_progress1>" + pos6 + "</span>";
var x = (Number(recDura[currMed])/60).toFixed(0);
if (pos/60 > x) { x = (pos/60).toFixed(0);}
date_time();
diff --git a/javascript/settings2.js b/javascript/settings2.js
index e24ade7..f20693f 100644
--- a/javascript/settings2.js
+++ b/javascript/settings2.js
@@ -5,8 +5,8 @@ var color_bg = "#fc5";
var color_sched_head = "color:white";
var color_sched_font = "color:black";
-var color_progress1 = "<font color=red>";
-var color_progress2 = "<font color=white>";
+//var color_progress1 = "<font color=red>";
+//var color_progress2 = "<font color=white>";
function setOSDscale() {
diff --git a/languages/lang_dut.js b/languages/lang_dut.js
index 09e1998..09953da 100644
--- a/languages/lang_dut.js
+++ b/languages/lang_dut.js
@@ -81,7 +81,7 @@ Lang[42] = "Channel Mode";
Lang[43] = " Problemen met het opvragen van ZoekTimers ";
Lang[47] = "Gebruik dag van de week";
-Lang[44] = " OK om te wissen ";
+Lang[44] = " OK om te wissen";
Lang[45] = " andere toets om dit niet te doen ";
Lang[46] = "vrij ";
//Lang[47]
diff --git a/languages/lang_eng.js b/languages/lang_eng.js
index 0b41fb2..1f03541 100644
--- a/languages/lang_eng.js
+++ b/languages/lang_eng.js
@@ -81,7 +81,7 @@ Lang[42] = "Channel Mode";
Lang[43] = " ERROR Getting SearchTimers from ";
Lang[47] = "Use day of the week";
-Lang[44] = " OK to delete ";
+Lang[44] = " OK to delete";
Lang[45] = " other to abort ";
Lang[46] = "free ";
//Lang[47]
diff --git a/languages/lang_ger.js b/languages/lang_ger.js
index 085568b..834a008 100644
--- a/languages/lang_ger.js
+++ b/languages/lang_ger.js
@@ -81,7 +81,7 @@ Lang[42] = "Kanal Mode";
Lang[43] = " Fehler beim Suchtimer von ";
Lang[47] = "Verwenden Tag der Woche";
-Lang[44] = " OK, um zu loschen ";
+Lang[44] = " OK, zum loschen";
Lang[45] = " anderen abbrechen ";
Lang[46] = "Frei ";
Lang[48] = " Loschen ";
diff --git a/skins/blue.css b/skins/blue.css
index 5f99722..d3318c3 100644
--- a/skins/blue.css
+++ b/skins/blue.css
@@ -26,6 +26,14 @@
color :green;
}
+ .color_progress1 {
+ color:red;
+ }
+
+ .color_progress2 {
+ color:white;
+ }
+
pre.colorkeys576 {
font-size:19px;
}
@@ -524,7 +532,7 @@
height : 20%;
left : 3%;
top : 20%;
- overflow:hidden;
+ overflow :hidden;
}
@@ -550,7 +558,7 @@
width : 78%;
left : 17%;
top : 30%;
- overflow:hidden;
+ overflow :hidden;
}
div#osdca {
@@ -622,8 +630,8 @@
z-index :506;
opacity :0;
-webkit-border-radius:50px;
- background : #3366ff;
- overflow:hidden;
+ background : #3366ff;
+ overflow :hidden;
}
div#schedule {
@@ -656,8 +664,8 @@
z-index :520;
opacity :0;
-webkit-border-radius:50px;
- background : #3366ff;
- overflow:hidden;
+ background : #3366ff;
+ overflow :hidden;
}
div#medialist {
@@ -682,7 +690,7 @@
opacity :0;
-webkit-border-radius:25px;
background :lightblue;
- overflow:hidden;
+ overflow :hidden;
}
div#osdepginfo {