From: dibs <dibs@samsung.com>
Date: Tue, 18 Dec 2012 12:05:27 +0000 (+0900)
Subject: [Title] dibs web add data dir and bug fix
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9298ad5c0bc43ed585ebd14e743b2ee202838a6c;p=sdk%2Ftools%2Fsdk-build.git

[Title] dibs web add data dir and bug fix
---

diff --git a/dibs-web/public/javascripts/jobs.js b/dibs-web/public/javascripts/jobs.js
index 16d248d..6bc2efb 100644
--- a/dibs-web/public/javascripts/jobs.js
+++ b/dibs-web/public/javascripts/jobs.js
@@ -336,18 +336,34 @@ console.log(url);
 						+ '<p>TYPE : <strong>' +jobType+ '</strong></p>'
 						+ '<p>OS : <strong>' + os + '</strong></p>'
 						+ '<p>USER : <strong>' +userName+ '</strong></p>'
-						+ '<p>TIME: <strong>' +startTime+ ' ~ '+endTime+ '</strong></p>'
-						+ '<p class="ui-li-aside"><strong>' +jobStatus+ '</strong></p>'
-						+ '</a></li>';
+						+ '<p>TIME: <strong>' +startTime+ ' ~ '+endTime+ '</strong></p>';
+						if(jobStatus == "ERROR" || jobStatus == "CANCELED") {
+						 li = li + '<p class="ui-li-aside"><strong><font color="red">' +jobStatus+ '</strong></p>'
+						} else if(jobStatus == "JUST_CREATED" || jobStatus == "WAITING" 
+								|| jobStatus == "WORKING" || jobStatus == "REMOTE_WORKING"
+								|| jobStatus == "PENDING") {
+						 li = li + '<p class="ui-li-aside"><strong><font color="blue">' +jobStatus+ '</strong></p>'
+						} else if(jobStatus == "FINISHED") {
+						 li = li + '<p class="ui-li-aside"><strong>' +jobStatus+ '</strong></p>'
+						} else {
+						 li = li + '<p class="ui-li-aside"><strong>' +jobStatus+ '</strong></p>'
+						}
+
+						li = li + '</a></li>';
 				}
 				else if(jobAttribute == "MULTI")
 				{
 					li = '<li data-role="list-divider">' +id+ ' ' +jobType+ '</li>'
 						+ '<li><a href=log.html?jobid='+id+' class="logWindow" data-ajax="false">'
 						+ '<p>USER : <strong>' +userName+ '</strong></p>'
-						+ '<p>TIME: <strong>' +startTime+ ' ~ '+endTime+ '</strong></p>'
-						+ '<p class="ui-li-aside"><strong>' +jobStatus+ '</strong></p>'
-						+ '</a></li>';
+						+ '<p>TIME: <strong>' +startTime+ ' ~ '+endTime+ '</strong></p>';
+						if(jobStatus.toUpperCase() == "ERROR" || jobStatus.toUpperCase() == "CANCELED") {
+						 li = li + '<p class="ui-li-aside"><strong><font color="red">' +jobStatus+ '</strong></p>'
+						} else {
+						 li = li + '<p class="ui-li-aside"><strong>' +jobStatus+ '</strong></p>'
+						}
+
+						li = li + '</a></li>';
 				}
 				else if(jobAttribute == "CHILD")
 				{
@@ -356,9 +372,14 @@ console.log(url);
 						+ '<p>ID : <strong>' +id+ '</strong></p>'
 						+ '<p>TYPE : <strong>' +jobType+ '</strong></p>'
 						+ '<p>OS : <strong>' +os+ '</strong></p>'
-						+ '<p>TIME: <strong>' +startTime+ ' ~ '+endTime+ '</strong></p>'
-						+ '<p class="ui-li-aside"><strong>' +jobStatus+ '</strong></p>'
-						+ '</a></li>';
+						+ '<p>TIME: <strong>' +startTime+ ' ~ '+endTime+ '</strong></p>';
+						if(jobStatus.toUpperCase() == "ERROR" || jobStatus.toUpperCase() == "CANCELED") {
+						 li = li + '<p class="ui-li-aside"><strong><font color="red">' +jobStatus+ '</strong></p>'
+						} else {
+						 li = li + '<p class="ui-li-aside"><strong>' +jobStatus+ '</strong></p>'
+						}
+
+						li = li + '</a></li>';
 				}
 
 				lastJobId = id;
diff --git a/dibs-web/public/javascripts/popup-window.js b/dibs-web/public/javascripts/popup-window.js
index 31a41ef..10e0081 100644
--- a/dibs-web/public/javascripts/popup-window.js
+++ b/dibs-web/public/javascripts/popup-window.js
@@ -41,7 +41,7 @@ Contributors:
 			location:0, // determines whether the address bar is displayed {1 (YES) or 0 (NO)}.
 			menubar:0, // determines whether the menu bar is displayed {1 (YES) or 0 (NO)}.
 			resizable:0, // whether the window can be resized {1 (YES) or 0 (NO)}. Can also be overloaded using resizable.
-			scrollbars:0, // determines whether scrollbars appear on the window {1 (YES) or 0 (NO)}.
+			scrollbars:1, // determines whether scrollbars appear on the window {1 (YES) or 0 (NO)}.
 			status:0, // whether a status line appears at the bottom of the window {1 (YES) or 0 (NO)}.
 			width:500, // sets the width in pixels of the window.
 			windowName:null, // name of window set from the name attribute of the element that invokes the click
diff --git a/dibs-web/public/log.html b/dibs-web/public/log.html
index 4b34fec..1bbd498 100644
--- a/dibs-web/public/log.html
+++ b/dibs-web/public/log.html
@@ -2,6 +2,13 @@
 <html>
 <head>
 	<script type="text/javascript" src="javascripts/jquery-1.7.1.js"></script>
+	<style>
+		body
+		{
+		overflow:scroll;
+		overflow:auto;
+		}
+	</style>
 </head>
 
 <body>