From cdbf58fc9916c66114db5b945a359565b2991134 Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Wed, 19 Nov 2014 00:47:46 +0100 Subject: Remove osdbox when showing menu in play recordings mode --- javascript/main.js | 12 +++++++----- javascript/settings2.js | 4 ++-- languages/lang_dut.js | 2 +- languages/lang_eng.js | 2 +- languages/lang_ger.js | 2 +- skins/blue.css | 22 +++++++++++++++------- 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] = "
" + x[i].getElementsByTagName("search")[0].childNodes[0].nodeValue + "\n 
";
+		SearchTimer[i] = "
" + x[i].getElementsByTagName("search")[0].childNodes[0].nodeValue + "\n 
";
 		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 = "
" + Lang[44] +"\n" + Lang[45] + "\n\n " + recTitl[currMed] + "
"; // Recording Name
+	switchtimer.innerHTML = "
" + Lang[44] + "," + Lang[45] + "\n\n" + recTitl[currMed] + "
"; // 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 = "";
 	var x = 0;
 	  for (var i=0; i" + color_progress2) { fontc = "" + color_progress1; } else { fontc = "" + color_progress2;}
+		if (fontc == "") { fontc = ""; } else { fontc = "";}
 		x = pos3;
 		pos6 = Right(pos5,140 - pos3);
 		}
-	pos4 += "" + color_progress1 + pos6 + "";
+	pos4 += "" + pos6 + "";
 	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 = "";
-var color_progress2 = "";
+//var color_progress1 = "";
+//var color_progress2 = "";
 
 
 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 {
-- 
cgit v1.2.3