dashboard: minor fixes

circle/dashboard/static/dashboard/dashboard.css

@@ -332,8 +332,6 @@ a.hover-black {
 
 
 }
 }
 
 
-
-<<<<<<< HEAD
 .notification-messages {
 .notification-messages {
   padding: 10px 8px;
   padding: 10px 8px;
   width: 350px;
   width: 350px;

circle/dashboard/static/dashboard/vm-details.js

@@ -131,7 +131,11 @@ $(function() {
           location.reload();
           location.reload();
         },
         },
         error: function(xhr, textStatus, error) {
         error: function(xhr, textStatus, error) {
-
+          if (xhr.status == 500) {
+            addMessage("Internal Server Error", "danger");
+          } else {
+            addMessage(xhr.status + " Unknown Error", "danger");
+          }
         }
         }
       });
       });
     } else {
     } else {