From 5198bd4f807af82466df5328e02c1d54733ca198 Mon Sep 17 00:00:00 2001
From: Kálmán Viktor <kviktor@cloud.bme.hu>
Date: Mon, 3 Mar 2014 10:35:12 +0100
Subject: [PATCH] dashboard: minor fixes
---
circle/dashboard/static/dashboard/dashboard.css | 2 --
circle/dashboard/static/dashboard/vm-details.js | 6 +++++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/circle/dashboard/static/dashboard/dashboard.css b/circle/dashboard/static/dashboard/dashboard.css
index 5638eda..1fd864a 100644
--- 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;
diff --git a/circle/dashboard/static/dashboard/vm-details.js b/circle/dashboard/static/dashboard/vm-details.js
index 9a500fd..2760856 100644
--- 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 {
--
libgit2 0.26.0