dashboard: rename datastore page to storage

circle/dashboard/tables.py

@@ -314,4 +314,4 @@ class DiskListTable(Table):
         fields = ("pk", "name", "filename", "size", "is_ready")
         fields = ("pk", "name", "filename", "size", "is_ready")
         prefix = "disk-"
         prefix = "disk-"
         order_by = ("-pk", )
         order_by = ("-pk", )
-        per_page = 99999999999
+        per_page = 65536

circle/dashboard/templates/dashboard/datastore/list.html

-{% extends "dashboard/base.html" %}
-{% load staticfiles %}
-{% load i18n %}
-{% load render_table from django_tables2 %}
-
-{% block title-page %}{% trans "Datastores" %}{% endblock %}
-
-{% block content %}
-
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="no-margin"><i class="fa fa-desktop"></i> {% trans "Datastores" %}</h3>
-      </div>
-      <div class="panel-body">
-        <div class="table-responsive">
-          {% render_table table %}
-        </div>
-      </div><!-- .panel-body -->
-    </div>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col-md-12">
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="no-margin"><i class="fa fa-desktop"></i> {% trans "Disks" %}</h3>
-      </div>
-      <div class="panel-body">
-        <div class="table-responsive">
-        </div>
-      </div><!-- .panel-body -->
-    </div>
-  </div>
-</div>
-
-
-{% endblock %}

circle/dashboard/templates/dashboard/datastore/detail.html → circle/dashboard/templates/dashboard/storage/detail.html

@@ -4,7 +4,7 @@
 {% load render_table from django_tables2 %}
 {% load render_table from django_tables2 %}
 {% load crispy_forms_tags %}
 {% load crispy_forms_tags %}
 
 
-{% block title-page %}{% trans "Datastores" %}{% endblock %}
+{% block title-page %}{% trans "Storage" %}{% endblock %}
 
 
 {% block content %}
 {% block content %}
 
 

circle/dashboard/urls.py

@@ -52,7 +52,7 @@ from .views import (
     TransferTemplateOwnershipView, TransferTemplateOwnershipConfirmView,
     TransferTemplateOwnershipView, TransferTemplateOwnershipConfirmView,
     OpenSearchDescriptionView,
     OpenSearchDescriptionView,
     NodeActivityView,
     NodeActivityView,
-    DataStoreDetail,
+    StorageDetail,
 )
 )
 from .views.vm import vm_ops, vm_mass_ops
 from .views.vm import vm_ops, vm_mass_ops
 from .views.node import node_ops
 from .views.node import node_ops
@@ -226,8 +226,8 @@ urlpatterns = patterns(
         name="dashboard.views.vm-opensearch"),
         name="dashboard.views.vm-opensearch"),
 
 
 
 
-    url(r'^datastore/$', DataStoreDetail.as_view(),
-        name="dashboard.views.datastore"),
+    url(r'^storage/$', StorageDetail.as_view(),
+        name="dashboard.views.storage"),
 )
 )
 
 
 urlpatterns += patterns(
 urlpatterns += patterns(

circle/dashboard/views/__init__.py

@@ -12,4 +12,4 @@ from user import *
 from util import *
 from util import *
 from vm import *
 from vm import *
 from graph import *
 from graph import *
-from disk import *
+from storage import *

circle/dashboard/views/disk.py → circle/dashboard/views/storage.py

@@ -29,16 +29,16 @@ from ..tables import DiskListTable
 from ..forms import DataStoreForm
 from ..forms import DataStoreForm
 
 
 
 
-class DataStoreDetail(UpdateView):
+class StorageDetail(UpdateView):
     model = DataStore
     model = DataStore
     form_class = DataStoreForm
     form_class = DataStoreForm
-    template_name = "dashboard/datastore/detail.html"
+    template_name = "dashboard/storage/detail.html"
 
 
     def get_object(self):
     def get_object(self):
         return DataStore.objects.get()
         return DataStore.objects.get()
 
 
     def get_context_data(self, **kwargs):
     def get_context_data(self, **kwargs):
-        context = super(DataStoreDetail, self).get_context_data(**kwargs)
+        context = super(StorageDetail, self).get_context_data(**kwargs)
 
 
         ds = self.get_object()
         ds = self.get_object()
         context['stats'] = self._get_stats()
         context['stats'] = self._get_stats()
@@ -66,4 +66,4 @@ class DataStoreDetail(UpdateView):
         }
         }
 
 
     def get_success_url(self):
     def get_success_url(self):
-        return reverse("dashboard.views.datastore")
+        return reverse("dashboard.views.storage")