[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 16d248d62ad0f1a2715e39641ce1f17c0ebb2b4f..6bc2efb88326ac7c5b4a4b613ea4ab91a927c73c 100644 (file)
--- 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 31a41ef23b2e1cf1347d1a7e423c1041dab2c2a5..10e0081b46f251513b58e29601e8b37bfc8bd4a3 100644 (file)
--- 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 4b34fecd96e2faf994af0e75cfeeb203b4190e1e..1bbd4980a11260b18edf173b8fac36415b9fbf68 100644 (file)
--- 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>