Merge branch 'issue-115' into 'master'

Issue 115

Fixes issue #115 + node js cleanup

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

@@ -48,9 +48,7 @@ function changeNodeStatus(data) {
       if(!data['redirect']) {
         selected = [];
         addMessage(re['message'], 'success');
-        $('a[data-'+data['type']+'-pk="' + data['pk'] + '"]').closest('tr').fadeOut(function() {
-          $(this).remove();
-        });
+      
       } else {
         window.location.replace('/dashboard');
       }

circle/dashboard/static/dashboard/node-list.js

@@ -132,8 +132,7 @@ $(function() {
     return false;
   });
 
-  function enabletableSuccess(unit){
-    var tr= $(unit).closest("tr");
+  function statuschangeSuccess(tr){
    var tspan=tr.children('.enabled').children();
     var buttons=tr.children('.actions').children('.btn-group').children('.dropdown-menu').children('li').children('.node-enable');
  
@@ -158,54 +157,25 @@ $(function() {
   	  colortable();
   }
 
-  function enabledetailsSuccess(){
-    
-     // change big status span
-    $('#node-info-pane').load(location.href+" #node-info-data");
-    $('#activity-timeline-wrapper').load(location.href+" #activity-timeline");
-  }
 
   $('#table_container').on('click','.node-enable',function() {
-    enablenode($(this).attr('data-node-pk'), $(this).attr('data-status'),enabletableSuccess,this);
-    return false;
-  });
-
-// on node details, change node status, with calling enable node, refresh status span, resources div
-  $('#node-info-pane').on('click','.node-enable',function(){
-    // post, change node status
-    enablenode($(this).attr('data-node-pk'),$(this).attr('data-status'),enabledetailsSuccess);
-
-    return false;
- });
-
-
-  // enabling / disabling node
-  function enablenode(pk,new_status,onsuccess,params) {
-    var url = '/dashboard/node/' + pk  + '/';
+    var tr= $(this).closest("tr");
+    var pk =$(this).attr('data-node-pk');
+    var url = $(this).attr('href');
     $.ajax({
       method: 'POST',
       url: url,
-      data: {'new_status':new_status},
+      data: {'change_status':''},
       headers: {"X-CSRFToken": getCookie('csrftoken')},
       success: function(data, textStatus, xhr) {
-      onsuccess(params);
+      statuschangeSuccess(tr);
       },
       error: function(xhr, textStatus, error) {
         addMessage("Error!", "danger");
       }
     });
     return false;
-  }
-
-
-
-// refresh the given contents, parameter is the array of contents, in pair
-  function contentrefresh(elements,callbacks){
-  for (var i = 0; i < elements.length; i+=2) {
-      $(elements[i]).load(location.href+" "+elements[i+1],callbacks[i/2]);
-  }
-
-  }
+  });
 
   /* group actions */
 

circle/dashboard/templates/dashboard/confirm/mass-delete.html

+{% load i18n %}
 <div class="modal fade" id="confirmation-modal" tabindex="-1" role="dialog"> 
   <div class="modal-dialog"> 
     <div class="modal-content"> 

circle/dashboard/templates/dashboard/node-list/column-actions.html

@@ -4,8 +4,8 @@
   <ul class="dropdown-menu nojs-dropdown-toogle" role="menu">
  <li><a href="#" class="node-details-rename-button"><i class="icon-pencil"></i> {% trans "Rename" %}</a></li>
  <li><a data-node-pk="{{ record.pk }}" class="real-link node-flush" href="{% url "dashboard.views.flush-node" pk=record.pk %}"><i class="icon-cloud-upload"></i>{% trans "Flush" %}</a>
-    <li><a style={% if record.enabled %}"display:none"{% else %}"display:block"{% endif %} data-status="enable" data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}&status=enable"><i class="icon-check"></i>{% trans "Enable" %}</a>
-  <a style={% if record.enabled %}"display:block"{% else %}"display:none"{% endif %} data-status="disable" data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}&status=disable"><i class="icon-remove"></i>{% trans "Disable" %}</a></li>
+    <li><a style={% if record.enabled %}"display:none"{% else %}"display:block"{% endif %} data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}"><i class="icon-check"></i>{% trans "Enable" %}</a>
+  <a style={% if record.enabled %}"display:block"{% else %}"display:none"{% endif %} data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}"><i class="icon-remove"></i>{% trans "Disable" %}</a></li>
   <li><a data-node-pk="{{ record.pk }}" class="real-link node-delete" href="{% url "dashboard.views.delete-node" pk=record.pk %}?next={{ request.path }}"><i class="icon-trash"></i>{% trans "Delete" %}</a></li>
     </ul>
 </div>

circle/dashboard/templates/dashboard/node-list/column-admin.html

+{% load i18n %}
 <a class="btn btn-default btn-xs" title="{% trans "Flush" %}">
 <i class="icon-cloud-upload"></i>
 </a>