Merge branch 'issue-349-fav-icon' into 'master'

Issue 349 fav icon

See merge request !271

circle/dashboard/static/dashboard/dashboard.js

@@ -132,7 +132,7 @@ $(function () {
   $('.js-hidden').hide();
   $('.js-hidden').hide();
 
 
   /* favourite star */
   /* favourite star */
-  $("#dashboard-vm-list").on('click', '.dashboard-vm-favourite', function(e) {
+  $("#dashboard-vm-list, .page-header").on('click', '.dashboard-vm-favourite', function(e) {
     var star = $(this).children("i");
     var star = $(this).children("i");
     var pk = $(this).data("vm");
     var pk = $(this).data("vm");
     if(star.hasClass("fa-star-o")) {
     if(star.hasClass("fa-star-o")) {

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

@@ -70,6 +70,13 @@
         {{ instance.name }}
         {{ instance.name }}
       </div>
       </div>
       <small>{{ instance.primary_host.get_fqdn }}</small>
       <small>{{ instance.primary_host.get_fqdn }}</small>
+      <small class="dashboard-vm-favourite" style="line-height: 39.6px;" data-vm="{{ instance.pk }}">
+        {% if fav %}
+          <i class="fa fa-star text-primary title-favourite" title="{% trans "Unfavourite" %}"></i>
+        {% else %}
+          <i class="fa fa-star-o text-primary title-favourite" title="{% trans "Mark as favorite" %}"></i>
+        {% endif %}
+      </small>
     </h1>
     </h1>
     <div style="clear: both;"></div>
     <div style="clear: both;"></div>
   </div>
   </div>

circle/dashboard/views/vm.py

@@ -115,6 +115,7 @@ class VmDetailView(GraphMixin, CheckedDetailView):
             'op': {i.op: i for i in ops},
             'op': {i.op: i for i in ops},
             'connect_commands': user.profile.get_connect_commands(instance),
             'connect_commands': user.profile.get_connect_commands(instance),
             'hide_tutorial': hide_tutorial,
             'hide_tutorial': hide_tutorial,
+            'fav': instance.favourite_set.filter(user=user).exists(),
         })
         })
 
 
         # activity data
         # activity data