* Fixed that selected text is black (instead of white)

* Corrections in the ImageViewer module
* Code-Cleanup

7 files changed, 113 insertions, 288 deletions

diff --git a/smarttv-client/Javascript/Buttons.js b/smarttv-client/Javascript/Buttons.js
index 3b946db..7fa30bb 100644
--- a/smarttv-client/Javascript/Buttons.js
+++ b/smarttv-client/Javascript/Buttons.js
@@ -54,7 +54,6 @@ Buttons.ynReturnCallback = function () {
 		break;

 	case Main.eMED:

 		Buttons.ynHide();

-		

 		break;

 	default:

 		break;

@@ -173,6 +172,15 @@ Buttons.ynHide = function () {
 	case Main.eTMR:

 		Timers.focus();

 	break;

+	case Main.eMED:

+		Main.log("Buttons.ynReturnCallback isActive= " + (ImgViewer.isActive == true) ? "true" : "false");

+		if (ImgViewer.isActive == true) {

+			ImgViewer.focus ();

+		}

+		else

+			Main.enableKeys();

+

+		break;

 	default:

 		Main.enableKeys();

 		break;

diff --git a/smarttv-client/Javascript/Display.js b/smarttv-client/Javascript/Display.js
index b1f7d37..3d629f7 100755
--- a/smarttv-client/Javascript/Display.js
+++ b/smarttv-client/Javascript/Display.js
@@ -61,11 +61,11 @@ Display.init = function()
     	var elm = $("#video"+i);

     	$(elm).css({"width" : "100%", "text-align": "left", "padding-top": "4px", "padding-bottom": "5px" });

     	$(elm).append($("<div>").css({ "display": "inline-block", "width":"20%", 

-			"overflow": "hidden", "text-overflow":"ellipsis", "height": "14px"})); 

+			"overflow": "hidden", "text-overflow":"ellipsis", "height": "14px", "color": "inherit"})); 

     	$(elm).append($("<div>").css({ "display": "inline-block", "width":"70%", 

-			"overflow": "hidden", "text-overflow":"ellipsis", "white-space": "nowrap", "height": "14px"})); 

+			"overflow": "hidden", "text-overflow":"ellipsis", "white-space": "nowrap", "height": "14px", "color": "inherit"})); 

     	$(elm).append($("<div>").css({ "display": "inline-block", "width":"5%", 

-    		"overflow": "hidden", "text-overflow":"ellipsis", "white-space": "nowrap", "height": "14px"})); 

+    		"overflow": "hidden", "text-overflow":"ellipsis", "white-space": "nowrap", "height": "14px", "color": "inherit"})); 

     }  

 	

     /*

diff --git a/smarttv-client/Javascript/ImgViewer.js b/smarttv-client/Javascript/ImgViewer.js
index af7495b..9e076fb 100644
--- a/smarttv-client/Javascript/ImgViewer.js
+++ b/smarttv-client/Javascript/ImgViewer.js
@@ -1,5 +1,6 @@
 var ImgViewer = {

-	returnCallback : null

+	returnCallback : null,

+	imgOlHandler : null

 };

 

 ImgViewer.init = function () {

@@ -13,7 +14,9 @@ ImgViewer.init = function () {
 	

 	this.screenMode = this.eFullScreen;

 	

-	

+//	this.imgOlHandler = new OverlayHandler("ImgHndl");

+//    this.imgOlHandler.init(Display.handlerShowImgInfo, Display.handlerHideImgInfo);

+

 	$("#imageViewer").hide();

 };

 

@@ -26,8 +29,8 @@ ImgViewer.show = function () {
 

 	$("#imageViewer").show();

 	

-	$("#iv-anchor").focus();

-

+	ImgViewer.focus ();

+	

 	Main.log ("URL= " + Data.getCurrentItem().childs[Main.selectedVideo].payload.link);

 

 	Spinner.show();

@@ -38,16 +41,16 @@ ImgViewer.show = function () {
 		ImgViewer.hide();

 		return;

 	}

+

+//	ImgViewer.showImageGrid();

+

 	ImgViewer.showImage();

+};

 

-	/*

-	if (ImgViewer.isImage() == true) {

-		ImgViewer.showImage();

-	}

-	else {

-		ImgViewer.showNextImage();

-	}

-	*/

+ImgViewer.focus = function () {

+	Main.log("ImgViewer.focus ");

+	$("#iv-anchor").focus();

+	

 };

 

 ImgViewer.hide = function () {

@@ -63,6 +66,8 @@ ImgViewer.hide = function () {
 };

 

 ImgViewer.createImgArray = function () {

+	this.imgList = [];

+

 	var max = Data.getVideoCount();

 	for (var i = 0; i < Data.getVideoCount() ; i ++) {

 		if (ImgViewer.isImage( (Main.selectedVideo + i) % max) == true) {

@@ -95,35 +100,6 @@ ImgViewer.showNextImage = function () {
 		this.curImg = 0;

 

 	ImgViewer.showImage();

-

-	/*

-	Main.logToServer("ImgViewer.showNextImage curIdx= " +Main.selectedVideo);

-	var start_ts = new Date().getTime();

-

-	var start_idx = Main.selectedVideo;

-	var found_next = false;

-	Main.nextVideo(1) ;

-	while ( start_idx != Main.selectedVideo ) {

-		Main.logToServer ("ImgViewer.showNextImage: Main.selectedVideo increased to " + Main.selectedVideo);

-		if (ImgViewer.isImage() == true) {

-

-			Main.logToServer( "Found idx= " +Main.selectedVideo);

-			found_next = true;

-			break;

-		}

-		Main.nextVideo(1);

-

-	}

-	var now = new Date().getTime();

-	Main.logToServer ("Duration= " + (now-start_ts));

-

-	if (found_next)

-		ImgViewer.showImage();

-	else {

-		Notify.showNotify("No Image Found", true);

-		ImgViewer.hide();

-	}

-	*/

 };

 

 ImgViewer.showPrevImage = function () {

@@ -132,41 +108,16 @@ ImgViewer.showPrevImage = function () {
 		this.curImg = this.imgList.length-1;

 

 	ImgViewer.showImage();

-

-/*

-	Main.log("ImgViewer.showPrevImage curIdx= " +Main.selectedVideo);

-	var start_ts = new Date().getTime();

-	

-	var start_idx = Main.selectedVideo;

-	var found_next = false;

-	Main.previousVideo(1);

-	while ( start_idx != Main.selectedVideo ) {

-		Main.log ("ImgViewer.showPrevImage: Main.selectedVideo increased to " + Main.selectedVideo);

-		if (ImgViewer.isImage() == true) {

-			

-			Main.log( "Found idx= " +Main.selectedVideo);

-			found_next = true;

-			break;

-		}

-		Main.previousVideo(1);

-

-	}

-	var now = new Date().getTime();

-	Main.logToServer ("Duration= " + (now-start_ts));

-	

-	if (found_next)

-		ImgViewer.showImage();

-	else {

-		Notify.showNotify("No Image Found", true);

-		ImgViewer.hide();

-	}

-	*/

 };

 

 ImgViewer.showImage = function () {	

-//	Main.logToServer("showImage: "+ Data.getCurrentItem().childs[Main.selectedVideo].payload.link);

+	Main.log("showImage: "+ Data.getCurrentItem().childs[this.imgList[this.curImg]].payload.link);

 	Main.logToServer("showImage: "+ Data.getCurrentItem().childs[this.imgList[this.curImg]].payload.link);

+	var p_width = $("#imageViewer").width();

+	var p_height = $("#imageViewer").height();

 

+	var img_name = Data.getCurrentItem().childs[this.imgList[this.curImg]].payload.link.split("/");

+	Notify.showNotify( img_name[img_name.length -1], true);

 	$("#ivImage")

 		.error(function() { 

 			Main.log("ERROR"); 

@@ -177,56 +128,63 @@ ImgViewer.showImage = function () {
 		.load(function () { 

 			Main.logToServer("showImage Loaded");

 			Spinner.hide();

+			/*

 			if($(this).height() > $(this).width()) {

 				$(this).css({"height": "100%", "width" : "auto"});

 			}

 			else {

 				$(this).css({"width": "100%", "height" : "auto"});

-			}})

-		.attr('src', Data.getCurrentItem().childs[this.imgList[this.curImg]].payload.link +"?"+Math.random());

-//		.attr('src', Data.getCurrentItem().childs[Main.selectedVideo].payload.link +"?"+Math.random());

+			}*/

+			})

+		.attr('src', Data.getCurrentItem().childs[this.imgList[this.curImg]].payload.link +"?"+Math.random())

+		.css({"max-width": p_width + "px", "max-height" :p_height  + "px" });

 };

 

-function ImgLoader (url, elm) {

-	this.url = url;

-	this.elm = elm;

-

-	this.elm

+ImgViewer.ImgLoader = function(url, w, h) {

+//	this.url = url;

+	var elm = $("<div>", {style : "display: inline-block; width: " + w + "px; height: "+ h + "px;" });

+	var img = $("<img>", {style : "max-width: " + w + "px; max-height: "+ h + "px;" });

+	elm.append(img);

+	

+	img

 		.error(function() { 

-			Main.log("ERROR"); 

-			ImgViewer.hide();

-			Spinner.hide();

-			Notify.showNotify("Error while loading image.", true);

+			Main.log("ERROR while loading"); 

 			})

 		.load(function () { 

-			Main.logToServer("showImage Loaded");

+//			Main.logToServer("showImage Loaded");

 			Spinner.hide();

-			if($(this).height() > $(this).width()) {

+/*			if($(this).height() > $(this).width()) {

 				$(this).css({"height": "100%", "width" : "auto"});

 			}

 			else {

 				$(this).css({"width": "100%", "height" : "auto"});

-			}})

-		.attr('src', this.url +"?"+Math.random());

-	

-	};

+			}

+			*/

+			})

+		.attr('src', url +"?"+Math.random());

+

+	return elm;

+};

 

 

 ImgViewer.showImageGrid = function () {

+	var p_width = $("#imageViewer").width();

+	var p_height = $("#imageViewer").height();

 	

-};

-

-ImgViewer.showGridRow = function (no) {

-	var p_width = $("body").outerWidth();

-	var elms = p_width / no;

+	var no_elms = 5;

+

+	for (var y = 0; y < no_elms; y++) {

+		var row = $("<div>");

+		

+		for (var i = 0; i < no_elms; i ++) {

+			row.append(ImgViewer.ImgLoader("http://192.168.1.122:8000/hd2/mpeg/Bilder/PANA-IMG_130803-110113.jpg" , p_width / no_elms, p_height / no_elms));

+		};

+		$("#imageViewer").append(row);

+	};

 	

-	var row = $("<div>");

-

-	var l_elm = $("<div>", {style : "display: inline-block; ", class : "style_hbOverlayLElm"});

-	var r_elm = $("<div>", {style : "display: inline-block;"});

-

 };

 

+

 ImgViewer.onInput = function () {

     var keyCode = event.keyCode;

 	Main.log(" ImgViewer key= " + keyCode);

@@ -269,6 +227,7 @@ ImgViewer.onInput = function () {
 			break;

 		case tvKey.KEY_YELLOW:

 			Main.log("Delete YE Button");

+			Main.selectedVideo = this.imgList[this.curImg];

 			Buttons.ynShow();

 //			Server.deleteMedFile(Data.getCurrentItem().childs[Main.selectedVideo].payload.guid);

 		break;

diff --git a/smarttv-client/Javascript/Main.js b/smarttv-client/Javascript/Main.js
index 55c2fa2..d65ee70 100755
--- a/smarttv-client/Javascript/Main.js
+++ b/smarttv-client/Javascript/Main.js
@@ -204,7 +204,7 @@ Main.init = function () {
 	Display.popupOlHandler.olDelay = 3*1000;

 

 	Config.verboseStart = false;

-	Display.scrollPopup ();

+//	Display.scrollPopup ();

 	// end

 	

 	if (Config.deviceType == 0){

@@ -1644,12 +1644,10 @@ Main.tvKeys = {
 		KEY_LEFT :37,

 		KEY_RIGHT :39,

 		KEY_ENTER :13,

-		KEY_RED :82,

-

+		KEY_EXIT :27,

 		KEY_RETURN :27,

 		KEY_STOP :27, // ESC

 //		KEY_MUTE :27,

-

 		KEY_1 :49,

 		KEY_2 :50,

 		KEY_3 :51,

@@ -1660,14 +1658,12 @@ Main.tvKeys = {
 		KEY_8 :56,

 		KEY_9 :57,

 		KEY_0 :48,

-

+		KEY_TOOLS: 116, 

+		KEY_RED :82,		

+		KEY_GREEN :103,

+		KEY_YELLOW :121,

+		KEY_BLUE :98,

 		// Un-used keycodes

-		KEY_RETURN :88,

-		KEY_EXIT :45,

-		KEY_RED :108,

-		KEY_GREEN :20,

-		KEY_YELLOW :21,

-		KEY_BLUE :22,

 		KEY_RW :69,

 		KEY_PAUSE :74,

 		KEY_FF :72,

diff --git a/smarttv-client/Javascript/Player.js b/smarttv-client/Javascript/Player.js
index 709d367..8521f92 100755
--- a/smarttv-client/Javascript/Player.js
+++ b/smarttv-client/Javascript/Player.js
@@ -453,7 +453,9 @@ Player.playVideo = function(resume_pos) {
         		resume_pos = 0;

 

         	try {

-        		//				Player.AVPlayerObj.open (this.url, Player.getBuffer());

+				Main.logToServer("Player.play Start playback of url= " + this.url + " resume= " + resume_pos + " sec");

+

+				//				Player.AVPlayerObj.open (this.url, Player.getBuffer());        		

 				Player.AVPlayerObj.open (this.url);

 				Player.AVPlayerObj.play(Player.onPlaySuccess, Player.onError, resume_pos);

 			}

@@ -469,7 +471,9 @@ Player.playVideo = function(resume_pos) {
         		resume_pos = 0;

 			Player.setCurrentPlayTimeOffset(resume_pos * 1000.0);

 			try {

-//				Player.AVPlayerObj.open(this.url+ "?time=" + resume_pos, Player.getBuffer() );

+				Main.logToServer("Player.play Start playback of url= " + this.url + " time= " + resume_pos + " sec");

+

+				//				Player.AVPlayerObj.open(this.url+ "?time=" + resume_pos, Player.getBuffer() );

 				Player.AVPlayerObj.open(this.url+ "?time=" + resume_pos );

 				Player.AVPlayerObj.play(Player.onPlaySuccess , Player.onError);

 			}

@@ -484,7 +488,6 @@ Player.playVideo = function(resume_pos) {
         if ((this.mFormat == this.eHLS) && (this.isLive == false)){

         	Notify.showNotify("No Trickplay", true);

         }

-//        Audio.plugin.SetSystemMute(false); 

 //        pluginObj.setOffScreenSaver();

     }

 };

diff --git a/smarttv-client/Javascript/Server.js b/smarttv-client/Javascript/Server.js
index 4213dcf..2d88fca 100755
--- a/smarttv-client/Javascript/Server.js
+++ b/smarttv-client/Javascript/Server.js
@@ -99,7 +99,6 @@ Server.updateEntry = function(guid) {
 

 			$(data).find("item").each(function () {

 				var title = $(this).find('title').text();

-//				var link = $(this).find('link').text();

 				var link = $(this).find('enclosure').attr('url');

 				var guid = $(this).find('guid').text();

 				var programme = $(this).find('programme').text();

@@ -207,7 +206,7 @@ Server.updateVdrStatus = function (){
 	});

 };

 

-

+/*

 Server.getResume = function (guid) {

 //	Main.log ("***** getResume *****");

 	$.ajax({

@@ -240,7 +239,7 @@ Server.getResume = function (guid) {
 		}

 	});

 };

-

+*/

 /*

 Server.saveResume = function() {

 	var msg = ""; 

@@ -286,10 +285,6 @@ Server.fetchRecCmdsList = function() {
                 RecCmds.addItem( title_list, {cmd : cmd, confirm: confirm });              	

 				}); // each

 

-/*            if (Server.dataReceivedCallback) {

-                Server.dataReceivedCallback();

-            }

-*/			

 //			RecCmds.dumpFolderStruct();

 			RecCmds.completed();

 			RecCmdHandler.createRecCmdOverlay();

@@ -301,32 +296,10 @@ Server.fetchRecCmdsList = function() {
 		parsererror : function () {

 			Main.logToServer("Server.fetchRecCmdsList parserError  " );

 			Display.showPopup("Error in XML File");

-/*            if (Server.errorCallback != null) {

-            	Server.errorCallback("XmlError");

-            }

-*/

 		}

 	});

 };

 

-/*

-Server.execRecCmd = function (cmd, guid) {

-	var url = Config.serverUrl + "/execreccmd?cmd="+cmd+"&guid=" + guid;

-

-	Main.logToServer("Server.execRecCmd cmd="+cmd+" guid=" + guid + " url= " + url);

-	$.ajax({

-		url: url,

-		type : "GET",

-		success : function(data, status, XHR ) {

-			Main.logToServer("Server.execRecCmd OK" ) ;

-			Display.handleDescription(Main.selectedVideo);

-		},

-		error : function (XHR, status, error) {

-			Main.logToServer("Server.execRecCmd failed" ) ;

-		}

-	});	

-};

-*/

 Server.getErrorText = function (status, input) {

 //	var errno_str = input.slice(0, 3);

 //	var errno = parseInt(errno_str, 10);

@@ -437,32 +410,6 @@ Server.getErrorText = function (status, input) {
 Server.deleteRecording = function(guid) {

 	var obj = new execRestCmd(RestCmds.CMD_DelRec, guid);

 

-	/*

-	

-	Main.log("Server.deleteRecording guid=" + guid);

-	Main.logToServer("Server.deleteRecording guid=" + guid);

-	Notify.handlerShowNotify("Deleting...", false);

-

-	$.ajax({

-		url: Config.serverUrl + "/deleteRecording.xml?id=" +guid,

-		type : "POST",

-		success : function(data, status, XHR ) {

-			Notify.showNotify("Deleted", true);

-			Data.deleteElm(Main.selectedVideo);

-			if (Main.selectedVideo >= Data.getVideoCount())

-				Main.selectedVideo = Data.getVideoCount() -1;

-			Server.updateVdrStatus();

-			Display.setVideoList(Main.selectedVideo, (Main.selectedVideo - Display.currentWindow));

-			Main.logToServer("Server.deleteRecording: Success" );

-			},

-		error : function (XHR, status, error) {

-			Main.logToServer("Server.deleteRecording: Error" );

-

-			// show popup

-			Notify.showNotify("Error", true);

-		}

-	});

-	*/

 };

 

 

@@ -470,82 +417,19 @@ Server.deleteUrls = function (guid) {
 

 	var obj = new execRestCmd(RestCmds.CMD_DelYtUrl, guid);

 

-/*	

-	Main.log("Server.deleteUrls");

-	Main.logToServer("Server.deleteUrls guid=" + guid);

-	Notify.handlerShowNotify("Deleting...", false);

-

-	$.ajax({

-		url: Config.serverUrl + "/deleteYtUrl?guid=" +guid,

-		type : "POST",

-		success : function(data, status, XHR ) {

-			Notify.showNotify("Deleted", true);

-			Data.deleteElm(Main.selectedVideo);

-			if (Main.selectedVideo >= Data.getVideoCount())

-				Main.selectedVideo = Data.getVideoCount() -1;

-			Server.updateVdrStatus();

-			Display.setVideoList(Main.selectedVideo, (Main.selectedVideo - Display.currentWindow));

-			Main.logToServer("Server.deleteUrls: Success" );

-			},

-		error : function (XHR, status, error) {

-			Main.logToServer("Server.deleteUrls: Error" );

-			Notify.showNotify(status, true);

-

-			// show popup

-//			Notify.showNotify("Error", true);

-		}

-	});

-*/

 };

 

 

 Server.getResume = function (guid) {

 	Main.log ("***** getResume *****");

 	var obj = new execRestCmd(RestCmds.CMD_GetResume, guid);

-/*

-	$.ajax({

-		url: Config.serverUrl + "/getResume.xml",

-		type : "POST",

-		data : "filename:" + guid +"\n", 

-		success : function(data, status, XHR ) {

-			Main.log("**** Resome Success Response - status= " + status + " mime= " + XHR.responseType + " data= "+ data);

 

-			var resume_str = $(data).find("resume").text();

-			if (resume_str != "") {

-				var resume_val = parseFloat(resume_str);

-				Main.log("resume val= " + resume_val );

-				Main.logToServer("resume val= " + resume_val );

-				Player.resumePos = resume_val;

-				Player.playVideo( resume_val);

-			}

-			else {

-	    		Display.hide();

-	        	Display.showProgress();

-				Player.playVideo(-1);

-			}

-

-		},

-		error : function (jqXHR, status, error) {

-			Main.log("**** Resome Error Response - status= " + status + " error= "+ error);

-    		Display.hide();

-        	Display.showProgress();

-			Player.playVideo(-1);

-		}

-	});

-	*/

 };

 

 Server.saveResume = function() {

+	

 	var obj = new execRestCmd(RestCmds.CMD_SetResume, Data.getCurrentItem().childs[Main.selectedVideo].payload.guid);

-/*

-	var msg = ""; 

-    msg += "filename:" + Data.getCurrentItem().childs[Main.selectedVideo].payload.guid + "\n"; 

-    msg += "resume:"+ (Player.curPlayTime/1000) + "\n" ;

-    	

-	$.post(Config.serverUrl + "/setResume.xml", msg, function(data, textStatus, XHR) {

-		Main.logToServer("SaveResume Status= " + XHR.status );

-	}, "text");

-*/

+

 };

 

 Server.execRecCmd = function (cmd, guid) {

@@ -613,8 +497,24 @@ function execRestCmd(cmd, guid, parms) {
 				Notify.showNotify("Deleted", true);

 				Data.deleteElm(Main.selectedVideo);

 				if (Main.selectedVideo >= Data.getVideoCount())

-				Main.selectedVideo = Data.getVideoCount() -1;

+					Main.selectedVideo = Data.getVideoCount() -1;

+

+				Display.setVideoList(Main.selectedVideo, (Main.selectedVideo - Display.currentWindow));

+				

+

+				if (ImgViewer.isActive == true) {

+					ImgViewer.createImgArray();

+					ImgViewer.showImage();

+					ImgViewer.focus ();

+				}

+

+			};

+			this.errorCallback = function() {

+				if (ImgViewer.isActive == true) {

+					ImgViewer.focus ();

+				}

 			};

+			

 		break;

 		case RestCmds.CMD_DelYtUrl:

 			// delete a YouTube URL

@@ -664,8 +564,8 @@ function execRestCmd(cmd, guid, parms) {
 		case RestCmds.CMD_SetResume :

 			// Send Resume Data

 			

-			Main.log("Server.GetResume guid=" + guid);

-			Main.logToServer("Server.GetResume guid=" + guid);

+			Main.log("Server.SetResume guid=" + guid);

+			Main.logToServer("Server.SetResume guid=" + guid + " resume= " + (Player.curPlayTime/1000) + "sec");

 			this.url =Config.serverUrl + "/setResume.xml?guid=" +guid + "&resume=" + (Player.curPlayTime/1000);

 			this.cmd = cmd;

 			this.method = "POST";

@@ -691,7 +591,7 @@ function execRestCmd(cmd, guid, parms) {
 				if (resume_str != "") {

 					var resume_val = parseFloat(resume_str);

 					Main.log("resume val= " + resume_val );

-					Main.logToServer("resume val= " + resume_val );

+					Main.logToServer("GetResume for" + this.guid + " resume val= " + resume_val + "sec");

 					Player.resumePos = resume_val;

 					Player.playVideo( resume_val);

 				}

@@ -786,48 +686,7 @@ execRestCmd.prototype.request = function () {
 		context : this,

 		timeout : 500,

 		success : this.successCallback,

-/*		function(data, status, XHR ) {

-			if (this.successCallback != null)

-				this.successCallback();

-			switch (this.cmd) {

-				case RestCmds.CMD_AddTimer:

-					Notify.showNotify("Timer added", true);

-					Main.log ("addTimer for Inst= " + this.guid +" status: " + ((status != null) ? status : "null"));  	

-				break;

-

-				case RestCmds.CMD_DelMedFile:

-					Notify.showNotify("Deleted", true);

-					Data.deleteElm(Main.selectedVideo);

-					if (Main.selectedVideo >= Data.getVideoCount())

-						Main.selectedVideo = Data.getVideoCount() -1;

-

-					break;

-				

-				case RestCmds.CMD_DelYtUrl:

-					Notify.showNotify("Deleted", true);

-					Data.deleteElm(Main.selectedVideo);

-					if (Main.selectedVideo >= Data.getVideoCount())

-						Main.selectedVideo = Data.getVideoCount() -1;

-					Server.updateVdrStatus();

-					Display.setVideoList(Main.selectedVideo, (Main.selectedVideo - Display.currentWindow));

-					Main.logToServer("Server.deleteUrls: Success" );

-				break;

-

-				case RestCmds.CMD_DelRec:

-					Notify.showNotify("Deleted", true);

-					Data.deleteElm(Main.selectedVideo);

-					if (Main.selectedVideo >= Data.getVideoCount())

-						Main.selectedVideo = Data.getVideoCount() -1;

-					Server.updateVdrStatus();

-					Display.setVideoList(Main.selectedVideo, (Main.selectedVideo - Display.currentWindow));

-					Main.logToServer("Server.deleteRecording: Success" );

-			

-				break;

 

-				default:

-					Main.logToServer("execRestCmd - Success for cmd= " + this.cmd);

-			};

-		},*/

 		error : function (XHR, status, error) {

 			

 			Main.logToServer("ERROR received for guid= " + this.guid + " status= " + status);

diff --git a/smarttv-client/Javascript/Timers.js b/smarttv-client/Javascript/Timers.js
index c00e9e7..8f38994 100644
--- a/smarttv-client/Javascript/Timers.js
+++ b/smarttv-client/Javascript/Timers.js
@@ -1,6 +1,6 @@
 var Timers = {

 	timerList : [],

-	scrollDur : 300,

+	scrollDur : 100,

 	scrollFlip : 100,

 	btnMode : 0

 	// 0 nothing

@@ -175,16 +175,16 @@ Timers.createEntry= function (i, w) {
 //	row.append($("<div>", {class : ((Timers.timerList[i].isrec ==true) ? "style_timerRec" : ""), style : "display: inline-block;"}));

 	

 	

-	row.append($("<div>", {class : ((Timers.timerList[i].isrec ==true) ? "style_timerRec" : ((Timers.timerList[i].flags & 1) != 0) ? "style_timerAct" : "style_timerNone"), style : "display: inline-block;"})); 

+	row.append($("<div>", {class : ((Timers.timerList[i].isrec ==true) ? "style_timerRec" : ((Timers.timerList[i].flags & 1) != 0) ? "style_timerAct" : "style_timerNone"), style : "display: inline-block; color : inherit;"})); 

 

 	if (	Timers.timerList[i].isSingleEvent == true) {

 	}

 	else {

 	}

-	row.append($("<div>", {text : Timers.timerList[i].channelname, style : "padding-left:5px;width:12%; display: inline-block;", class : "style_overflow"}));

-	row.append($("<div>", {text : Timers.timerList[i].start, style : "padding-left:5px; width:9%; display: inline-block;", class : "style_overflow"}));

-	row.append($("<div>", {text : Timers.timerList[i].stop, style : "padding-left:5px; width:9%; display: inline-block;", class : "style_overflow"}));	

-	row.append($("<div>", {text : Timers.timerList[i].title, style : "padding-left:5px; width:68%;display: inline-block;", class : "style_overflow"}));

+	row.append($("<div>", {text : Timers.timerList[i].channelname, style : "padding-left:5px;width:12%; display: inline-block; color : inherit; ", class : "style_overflow"}));

+	row.append($("<div>", {text : Timers.timerList[i].start, style : "padding-left:5px; width:9%; display: inline-block; color : inherit; ", class : "style_overflow"}));

+	row.append($("<div>", {text : Timers.timerList[i].stop, style : "padding-left:5px; width:9%; display: inline-block; color : inherit; ", class : "style_overflow"}));	

+	row.append($("<div>", {text : Timers.timerList[i].title, style : "padding-left:5px; width:68%;display: inline-block; color : inherit; ", class : "style_overflow"}));

 	return row;

 };