Merge branch 'fix-group-detail' into 'master'

Fix group detail

Closes #323

See merge request !253

circle/dashboard/static/dashboard/dashboard.css

@@ -216,7 +216,7 @@ html {
 }
 }
 
 
 #vm-list-rename-name, #node-list-rename-name, #group-list-rename-name {
 #vm-list-rename-name, #node-list-rename-name, #group-list-rename-name {
-  max-width: 100px;
+  max-width: 150px;
 }
 }
 
 
 .label-tag {
 .label-tag {
@@ -1042,3 +1042,12 @@ textarea[name="new_members"] {
 #vm-migrate-node-list li {
 #vm-migrate-node-list li {
   cursor: pointer;
   cursor: pointer;
 }
 }
+
+.group-list-table .actions,
+.group-list-table .admin,
+.group-list-table .number_of_users,
+.group-list-table .pk {
+  width: 1px;
+  white-space: nowrap;
+  text-align: center;
+}

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

@@ -14,7 +14,7 @@
       data: {'new_name': name},
       data: {'new_name': name},
       headers: {"X-CSRFToken": getCookie('csrftoken')},
       headers: {"X-CSRFToken": getCookie('csrftoken')},
       success: function(data, textStatus, xhr) {
       success: function(data, textStatus, xhr) {
-        $("#group-details-h1-name").html(data['new_name']).show();
+        $("#group-details-h1-name").text(data['new_name']).show();
         $('#group-details-rename').hide();
         $('#group-details-rename').hide();
         // addMessage(data['message'], "success");
         // addMessage(data['message'], "success");
       },
       },

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

@@ -3,6 +3,7 @@ $(function() {
   $("#group-list-rename-button, .group-details-rename-button").click(function() {
   $("#group-list-rename-button, .group-details-rename-button").click(function() {
     $("#group-list-column-name", $(this).closest("tr")).hide();
     $("#group-list-column-name", $(this).closest("tr")).hide();
     $("#group-list-rename", $(this).closest("tr")).css('display', 'inline');
     $("#group-list-rename", $(this).closest("tr")).css('display', 'inline');
+    $("#group-list-rename").find("input").select();
   });
   });
 
 
   /* rename ajax */
   /* rename ajax */

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

@@ -15,7 +15,7 @@ $(function() {
       data: {'new_name': name},
       data: {'new_name': name},
       headers: {"X-CSRFToken": getCookie('csrftoken')},
       headers: {"X-CSRFToken": getCookie('csrftoken')},
       success: function(data, textStatus, xhr) {
       success: function(data, textStatus, xhr) {
- 	$("#node-details-h1-name").html(data['new_name']).show();
+        $("#node-details-h1-name").text(data['new_name']).show();
         $('#node-details-rename').hide();
         $('#node-details-rename').hide();
         // addMessage(data['message'], "success");
         // addMessage(data['message'], "success");
       },
       },

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

@@ -12,40 +12,6 @@ $(function() {
 	tr.removeClass('danger');
 	tr.removeClass('danger');
   }
   }
 
 
-  /* rename */
-  $("#node-list-rename-button, .node-details-rename-button").click(function() {
-    $("#node-list-column-name", $(this).closest("tr")).hide();
-    $("#node-list-rename", $(this).closest("tr")).css('display', 'inline');
-  });
-
-  /* rename ajax */
-  $('.node-list-rename-submit').click(function() {
-    var row = $(this).closest("tr")
-    var name = $('#node-list-rename-name', row).val();
-    var url = '/dashboard/node/' + row.children("td:first-child").text().replace(" ", "") + '/';
-    $.ajax({
-      method: 'POST',
-      url: url,
-      data: {'new_name': name},
-      headers: {"X-CSRFToken": getCookie('csrftoken')},
-      success: function(data, textStatus, xhr) {
-        
-        $("#node-list-column-name", row).html(
-          $("<a/>", {
-            'class': "real-link",
-            href: "/dashboard/node/" + data['node_pk'] + "/",
-            text: data['new_name']
-          })
-        ).show();
-        $('#node-list-rename', row).hide();
-        // addMessage(data['message'], "success");
-      },
-      error: function(xhr, textStatus, error) {
-	 addMessage("Error during renaming!", "danger");
-      }
-    });
-    return false;
-  });
 
 
   function statuschangeSuccess(tr){
   function statuschangeSuccess(tr){
    var tspan=tr.children('.enabled').children();
    var tspan=tr.children('.enabled').children();

circle/dashboard/tables.py

@@ -88,18 +88,21 @@ class GroupListTable(Table):
 
 
     number_of_users = TemplateColumn(
     number_of_users = TemplateColumn(
         orderable=False,
         orderable=False,
+        verbose_name=_("Number of users"),
         template_name='dashboard/group-list/column-users.html',
         template_name='dashboard/group-list/column-users.html',
         attrs={'th': {'class': 'group-list-table-admin'}},
         attrs={'th': {'class': 'group-list-table-admin'}},
     )
     )
 
 
     admin = TemplateColumn(
     admin = TemplateColumn(
         orderable=False,
         orderable=False,
+        verbose_name=_("Admin"),
         template_name='dashboard/group-list/column-admin.html',
         template_name='dashboard/group-list/column-admin.html',
         attrs={'th': {'class': 'group-list-table-admin'}},
         attrs={'th': {'class': 'group-list-table-admin'}},
     )
     )
 
 
     actions = TemplateColumn(
     actions = TemplateColumn(
         orderable=False,
         orderable=False,
+        verbose_name=_("Actions"),
         attrs={'th': {'class': 'group-list-table-thin'}},
         attrs={'th': {'class': 'group-list-table-thin'}},
         template_code=('{% include "dashboard/group-list/column-'
         template_code=('{% include "dashboard/group-list/column-'
                        'actions.html" with btn_size="btn-xs" %}'),
                        'actions.html" with btn_size="btn-xs" %}'),

circle/dashboard/templates/dashboard/group-list.html

@@ -10,7 +10,7 @@
   <div class="col-md-12">
   <div class="col-md-12">
     <div class="panel panel-default">
     <div class="panel panel-default">
       <div class="panel-heading">
       <div class="panel-heading">
-        <h3 class="no-margin"><i class="fa fa-group"></i> Your groups</h3>
+        <h3 class="no-margin"><i class="fa fa-group"></i> {% trans "Groups" %}</h3>
       </div>
       </div>
       <div class="panel-body">
       <div class="panel-body">
 	<div id="table_container">
 	<div id="table_container">