dashboard: minor fixes

5198bd4f · Kálmán Viktor · f6687581 · 5198bd4f · 5198bd4f
Commit 5198bd4f authored Mar 03, 2014 by Kálmán Viktor
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

circle/dashboard/static/dashboard/dashboard.css
+0 -2

circle/dashboard/static/dashboard/vm-details.js
+5 -1

No files found.
--- a/circle/dashboard/static/dashboard/dashboard.css
+++ b/circle/dashboard/static/dashboard/dashboard.css
@@ -332,8 +332,6 @@ a.hover-black {

 }

-
-<<<<<<< HEAD
 .notification-messages {
  padding: 10px 8px;
  width: 350px;

--- a/circle/dashboard/static/dashboard/vm-details.js
+++ b/circle/dashboard/static/dashboard/vm-details.js
@@ -131,7 +131,11 @@ $(function() {
          location.reload();
        },
        error: function(xhr, textStatus, error) {
-
+          if (xhr.status == 500) {
+            addMessage("Internal Server Error", "danger");
+          } else {
+            addMessage(xhr.status + " Unknown Error", "danger");
+          }
        }
      });
    } else {