Merge branch 'master' into issue_458

circle/dashboard/static/dashboard/dashboard.less

@@ -104,7 +104,6 @@ html {
 .timeline > div {
   margin: 0;
   padding: 0;
-  margin-left: -34px;
   margin-bottom: .5em;
   line-height: 24px;
 }
@@ -113,7 +112,7 @@ html {
 }
 
 .timeline .timeline-icon {
-  margin: 0;
+  margin-left: -34px;
   padding: 0;
   width: 24px;
   height: 24px;
@@ -153,7 +152,7 @@ html {
 }
 
 .sub-activity {
-  margin-left: 30px;
+  margin-left: -4px;
   padding-left: 10px;
   border-left: 3px solid green;
 }

circle/dashboard/tests/test_mockedviews.py

@@ -52,7 +52,8 @@ class ViewUserTestCase(unittest.TestCase):
     def test_not_superuser(self):
         request = FakeRequestFactory(superuser=False)
         with patch.object(InstanceActivityDetail, 'get_object') as go:
-            go.return_value = MagicMock(spec=InstanceActivity)
+            go.return_value = MagicMock(spec=InstanceActivity,
+                                        activity_code='test.test')
             go.return_value._meta.object_name = "InstanceActivity"
             view = InstanceActivityDetail.as_view()
             self.assertEquals(view(request, pk=1234).status_code, 200)
@@ -61,7 +62,8 @@ class ViewUserTestCase(unittest.TestCase):
         request = FakeRequestFactory(superuser=True)
 
         with patch.object(InstanceActivityDetail, 'get_object') as go:
-            act = MagicMock(spec=InstanceActivity)
+            act = MagicMock(spec=InstanceActivity,
+                            activity_code='test.test')
             act._meta.object_name = "InstanceActivity"
             act.user.pk = 1
             go.return_value = act

circle/dashboard/views/vm.py

@@ -46,6 +46,7 @@ from braces.views import SuperuserRequiredMixin, LoginRequiredMixin
 
 from common.models import (
     create_readable, HumanReadableException, fetch_human_exception,
+    split_activity_code,
 )
 from firewall.models import Vlan, Host, Rule
 from manager.scheduler import SchedulerError
@@ -798,6 +799,8 @@ def _get_activity_icon(act):
     op = act.get_operation()
     if op and op.id in vm_ops:
         return vm_ops[op.id].icon
+    elif split_activity_code(act.activity_code)[-1] == u'console-accessed':
+        return "terminal"
     else:
         return "cog"