You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2013/11/20 03:06:16 UTC

[2/2] git commit: FALCON-208 Improve the icons for instance lists Contributed by Haohui Mai

FALCON-208 Improve the icons for instance lists  Contributed by Haohui Mai


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/07e086a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/07e086a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/07e086a9

Branch: refs/heads/branch-0.4
Commit: 07e086a9a1d132b342b50e26f893d175edb0b917
Parents: a39995d
Author: Venkatesh Seetharam <ve...@apache.org>
Authored: Tue Nov 19 18:05:31 2013 -0800
Committer: Venkatesh Seetharam <ve...@apache.org>
Committed: Tue Nov 19 18:05:31 2013 -0800

----------------------------------------------------------------------
 CHANGES.txt                 |  2 ++
 html5-ui/css/falcon.css     | 15 +++++++++++++++
 html5-ui/js/falcon-index.js |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/07e086a9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c6cb77a..80e946b 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -190,6 +190,8 @@ Release Version: 0.4-incubating
     FALCON-212 OozieClient does not propagate user in request to
     Oozie server (Venkatesh Seetharam)
 
+    FALCON-208 Improve the icons for instance lists. (Haohui Mai)
+
 
 
 Release Version: 0.3-incubating

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/07e086a9/html5-ui/css/falcon.css
----------------------------------------------------------------------
diff --git a/html5-ui/css/falcon.css b/html5-ui/css/falcon.css
index f72b1ad..de98ae7 100644
--- a/html5-ui/css/falcon.css
+++ b/html5-ui/css/falcon.css
@@ -90,7 +90,22 @@
 }
 
 .instance-link-FAILED:before {
+  color: darkred;
+  content: "\e107";
+}
+
+.instance-link-SUSPENDED:before {
+  color: orangered;
+  content: "\e165";
+}
+
+.instance-link-KILLED:before {
   color: red;
+  content: "\e101";
+}
+
+.instance-link-ERROR:before {
+  color: darkred;
   content: "\e014";
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/07e086a9/html5-ui/js/falcon-index.js
----------------------------------------------------------------------
diff --git a/html5-ui/js/falcon-index.js b/html5-ui/js/falcon-index.js
index aa5e7a2..af5a396 100644
--- a/html5-ui/js/falcon-index.js
+++ b/html5-ui/js/falcon-index.js
@@ -82,7 +82,7 @@
    **/
   function refreshEntities(type) {
     falcon.getJson('api/entities/list/' + type + '?fields=status', function (data) {
-      if (data.entity == null)
+      if (data === null || data.entity == null)
         return;
 
       if (!($.isArray(data.entity)))