summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--javascript/main.js8
-rw-r--r--javascript/settings.js6
-rw-r--r--skins/black.css9
3 files changed, 17 insertions, 6 deletions
diff --git a/javascript/main.js b/javascript/main.js
index ca49f28..4d0fcff 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -2977,7 +2977,7 @@ if(menu == 2) { // Timers menu
var x = timerID - 2;
var y = ss.getBookingIds("*", 0, 0);
if (y.length !== 0) {
- for (var i=0;i<10;i++) {
+ for (var i=0;i<css_maxlines2[css_nr];i++) {
if (timer.length !== 0) { do { x++; } while (!timer[x] && (x < timer.length)) }
if (i == 0) {
@@ -3052,7 +3052,7 @@ if(menu == 5) { // Timers from Server
if (timerOK) {
booking = "<span class=select" + cssres[css_nr][Set_Res] + ">";
var x = timerID - 1;
- for (var i=0;i<10;i++) {
+ for (var i=0;i<css_maxlines2[css_nr];i++) {
if (maxTimers !== 0) { do { x++; } while (!timers[x] && (x < maxTimers)) }
if (maxTimers > x) { booking += timers[x]; } else { booking += "\n"; }
if (i == 0) { booking += "</span>"; }
@@ -3070,7 +3070,7 @@ if(menu == 7) { // SearchTimers from Server
if (timerOK) {
booking = "<span class=select" + cssres[css_nr][Set_Res] + ">";
var x = timerID - 1;
- for (var i=0;i<10;i++) {
+ for (var i=0;i<css_maxlines2[css_nr];i++) {
if (maxTimers !== 0) { do { x++; } while (!searchtimers[x] && (x < maxTimers)) }
if (maxTimers > x) { booking += searchtimers[x]; } else { booking += "\n"; }
if (i == 0) { booking += "</span>"; }
@@ -3146,7 +3146,7 @@ if(menu == 10) { // Favorite edit Menu
htmltext += "</h1><pre class=mainmenu" + cssres[css_nr][Set_Res] + ">\n";
htmltext += "<span class=select" + cssres[css_nr][Set_Res] + ">";
var x = timerID;
- for (var i=0;i<10;i++) {
+ for (var i=0;i<css_maxlines2[css_nr];i++) {
if (maxTimers !== 0) { x++;}
if (maxTimers >= x && x !== 0) { htmltext += " \u0003\u0003 " + x + " \u0003\u0003 " + channelsnames[(x + Fav_base)] + " \u0003\u0003\u0003 \n"; } else { htmltext += "\n"; }
if (i == 0) { htmltext += "</span>"; }
diff --git a/javascript/settings.js b/javascript/settings.js
index c24c7e2..be4a6bd 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -2,7 +2,7 @@
// Default settings
//
-var Version = "0.27.7";
+var Version = "0.27.72";
//weather
var city = "Almelo";
@@ -41,9 +41,11 @@ 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_maxlines2 = new Array(); //Max number of lines show with timers, epg etc from server
css_maxlines[0] = 14;
+css_maxlines2[0] = 10; // timers, epg etc from server
css_maxlines[1] = 20;
-
+css_maxlines2[1] = 20;
var css_nr;
diff --git a/skins/black.css b/skins/black.css
index 0069efd..0b2b866 100644
--- a/skins/black.css
+++ b/skins/black.css
@@ -232,6 +232,13 @@ div#osdmain {
text-align: center;
}
+ pre.deletefile1080 {
+ text-align : center;
+ color :white;
+ font-size :36px;
+ background :red;
+ }
+
p.list1080 {
font-size:34px;
color:black;
@@ -368,6 +375,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;
}
h1.mainmenu1080 {
@@ -407,6 +415,7 @@ div#osdmain {
font-size : 36px;
background : green;
text-align : center;
+ overflow :hidden;
}
div#osdepginfo {