From f4df851fd78d211596501b2902569eea68ed4848 Mon Sep 17 00:00:00 2001
From: "M. Voerman" <rekordc@gmail.com>
Date: Mon, 29 Jun 2015 22:20:39 +0200
Subject: Skin update

---
 javascript/main.js     | 20 +++++++++++---------
 javascript/settings.js |  4 ++++
 skins/black.css        |  1 +
 skins/blue.css         |  1 +
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/javascript/main.js b/javascript/main.js
index aa81497..4b9d754 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -4141,7 +4141,7 @@ if (DelisOK) {
 
 function getRecList() {
 	getVDRstatus();
-	MaxInGroup = 14;
+	MaxInGroup = css_maxlines[css_nr];
 	subgroup = 0;
 	subsubgroup = 0;
 try {
@@ -4769,7 +4769,7 @@ function showMediaList() {
 
 		if (subgroup) {
 			htmlstring = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + Group_Header[Number(recGroup[currMed])] + "</h1><pre class=mediamenu" + cssres[css_nr][Set_Res] + ">";
-			if (MaxInGroup < 14){ MaxMed = MaxInGroup; } else {MaxMed = 14; }
+			if (MaxInGroup < css_maxlines[css_nr]){ MaxMed = MaxInGroup; } else {MaxMed = css_maxlines[css_nr]; }
 		}
 		if (!subgroup) { 
 			for(var i=0; i<=nrMedia; i++) {
@@ -4779,11 +4779,11 @@ function showMediaList() {
 
 	} else {
 
-		if (nrMedia < 14) {MaxMed = nrMedia; } else {MaxMed = 14; }
+		if (nrMedia < css_maxlines[css_nr]) {MaxMed = nrMedia; } else {MaxMed = css_maxlines[css_nr]; }
 		var htmlstring = "<h1 class=mainmenu" + cssres[css_nr][Set_Res] + ">" + Lang[11] + channelsnames[currChan] + " </h1><pre class=mediamenu" + cssres[css_nr][Set_Res] + ">";
 	}
 
-	if (MaxMed > 14) { MaxMed = 14; }
+	if (MaxMed > css_maxlines[css_nr]) { MaxMed = css_maxlines[css_nr]; }
 	if (MaxMed < 0 ) { MaxMed = 0; }
 
 	for(var i=currMed; i<=currMed + MaxMed; i++) {
@@ -4901,8 +4901,8 @@ function getSchedule(schchan){
 	    nrMedia = events.infoSequence.length - 1;
 	    for (var i = 0; i < events.infoSequence.length; i++) {
 
-		// Double info or scrollbar twice on the screen if nrMedia < 14
-		while ((i > 0) && (events.infoSequence[i].eventId == events.infoSequence[(i-1)].eventId) && (nrMedia > 14)) {
+		// Double info or scrollbar twice on the screen if nrMedia < css_maxlines[css_nr]
+		while ((i > 0) && (events.infoSequence[i].eventId == events.infoSequence[(i-1)].eventId) && (nrMedia > css_maxlines[css_nr])) {
 			recList[i] = "";
 			i++;
 		}
@@ -4924,7 +4924,7 @@ function getSchedule(schchan){
 		        m = date.getMinutes();
 			h=addzero(h);
 			m=addzero(m);
-			recList[i] = ' ' + days[day] + ' ' + d + ' ' + months[month] + ' ' + year + " " + h + ":" + m + " (" + (recDura[i]/60).toFixed(0) + ") " + Left(recTitl[i],30);
+			recList[i] = ' ' + days[day] + ' ' + d + ' ' + months[month] + ' ' + year + " " + h + ":" + m + " (" + (recDura[i]/60).toFixed(0) + ") " + recTitl[i]; //+ Left(recTitl[i],30);
 		}
 	getRecOK = 2;
 	} else {
@@ -5203,12 +5203,14 @@ if (get_recordings == 1) {
 	date_time();
 	osdmediatime.innerHTML = "<span class=osdtime" + cssres[css_nr][Set_Res] + ">" + result + "</span>";
 	date_time_rec();
-	osdmedia.innerHTML = "<pre class=media" + cssres[css_nr][Set_Res] + "> \n  " + (pos/60).toFixed(0) + " / " + x + "  " + Left(recTitl[currMed],40) + "\n  " + pos4 + "\n " + result + " </pre>";
+	osdmedia.innerHTML = "<pre class=media" + cssres[css_nr][Set_Res] + "> \n  " + (pos/60).toFixed(0) + " / " + x + "  " + recTitl[currMed] + "\n  " + pos4 + "\n " + result + " </pre>";
+// Left(recTitl[currMed],40) + "\n  " + pos4 + "\n " + result + " </pre>";
 } else if ( get_recordings == 2) {
 	var pos = position + (mediaPlayer.getPosition()/1000);
 	date_time();
 	osdmediatime.innerHTML = "<span class=osdtime" + cssres[css_nr][Set_Res] + ">" + result + "</span>";
-	osdmedia.innerHTML = "<pre class=media" + cssres[css_nr][Set_Res] + "> \n  " + (pos/60).toFixed(0) + " \n " + Left(recTitl[currMed],40) + "\n  \n " + recStrt[currMed] + " </pre>";
+	osdmedia.innerHTML = "<pre class=media" + cssres[css_nr][Set_Res] + "> \n  " + (pos/60).toFixed(0) + " \n " + recTitl[currMed] + "\n  \n " + recStrt[currMed] + " </pre>";
+//+ Left(recTitl[currMed],40) + "\n  \n " + recStrt[currMed] + " </pre>";
 }
 }
 
diff --git a/javascript/settings.js b/javascript/settings.js
index 4096b98..c24c7e2 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -40,6 +40,10 @@ cssfile = new Array ("blue","black");
 cssres = new Array();
 cssres[0] = new Array ("576","720","1080"); //blue.css
 cssres[1] = new Array ("","","1080"); //black.css
+css_maxlines = new Array(); //Max number of lines show with epglist/ medialist/ recordingslist etc
+css_maxlines[0] = 14;
+css_maxlines[1] = 20;
+
 
 var css_nr;
 
diff --git a/skins/black.css b/skins/black.css
index 68b6f3b..e5b3252 100644
--- a/skins/black.css
+++ b/skins/black.css
@@ -393,6 +393,7 @@ div#osdmain {
 		z-index		: 520;
 		opacity		: 0;
 		background	: url(../images/black/osd-bg.png) top center repeat-x rgba(0,0,0,0.8);
+		overflow:hidden;
 	}
 
 	div#switchtimer {
diff --git a/skins/blue.css b/skins/blue.css
index 8650964..5083963 100644
--- a/skins/blue.css
+++ b/skins/blue.css
@@ -786,6 +786,7 @@
 	opacity		:0;
 	-webkit-border-radius:50px;
 	background		: #3366ff;
+	overflow:hidden;
 	}
 
 	div#switchtimer {
-- 
cgit v1.2.3