Merge branch 'nicer-connection-msg' into 'master'

dashboard: nicer connection msg



See merge request !373

circle/dashboard/static/dashboard/activity.js

@@ -222,7 +222,7 @@ function addConnectText() {
   if(activities.length > 1) {
   if(activities.length > 1) {
     if(activities.eq(0).data("activity-code") == "vm.Instance.wake_up" ||
     if(activities.eq(0).data("activity-code") == "vm.Instance.wake_up" ||
        activities.eq(0).data("activity-code") == "vm.Instance.agent") {
        activities.eq(0).data("activity-code") == "vm.Instance.agent") {
-      $("#vm-detail-successfull-boot").slideDown(500);
+      $("#vm-detail-successful-boot").slideDown(500);
     }
     }
   }
   }
 }
 }

circle/dashboard/static/dashboard/dashboard.less

@@ -1285,9 +1285,16 @@ textarea[name="new_members"] {
   }
   }
 }
 }
 
 
-#vm-detail-successfull-boot {
+#vm-detail-successful-boot {
   margin-bottom: 20px;
   margin-bottom: 20px;
   display: none;
   display: none;
+
+  .label {
+    width: 100%;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
 }
 }
 
 
 #vm-detail-access-help {
 #vm-detail-access-help {

circle/dashboard/templates/dashboard/vm-detail.html

@@ -192,11 +192,11 @@
       {% endif %}
       {% endif %}
     </div>
     </div>
     <div class="col-md-8" id="vm-detail-pane">
     <div class="col-md-8" id="vm-detail-pane">
-      <div class="big" id="vm-detail-successfull-boot">
-        <span class="label label-info" data-status="{{ instance.status }}">
+      <div class="big" id="vm-detail-successful-boot">
+        <div class="label label-info" data-status="{{ instance.status }}">
           <i class="fa fa-check"></i>
           <i class="fa fa-check"></i>
           {% trans "The virtual machine successfully started, you can connect now." %}
           {% trans "The virtual machine successfully started, you can connect now." %}
-        </span>
+        </div>
       </div>
       </div>
       <div class="panel panel-default" id="vm-detail-panel">
       <div class="panel panel-default" id="vm-detail-panel">
         <ul class="nav nav-pills panel-heading">
         <ul class="nav nav-pills panel-heading">