diff --git a/bower.json b/bower.json index 30d8b5e50..5dc1df3d1 100644 --- a/bower.json +++ b/bower.json @@ -16,8 +16,6 @@ "font-awesome": "~4.5", "ionicons": "~2.0.1", "jquery": "components/jquery#~2.0", - "datatables.net": "~1.10.12", - "datatables.net-dt": "~1.10.12", "admin-lte": "~2.3.11", "html5shiv": "~3.7.3", "respond": "~1.4.2", diff --git a/frontend/admin/vue-components/AccountingView.vue b/frontend/admin/vue-components/AccountingView.vue index 1d40a2661..042b93431 100644 --- a/frontend/admin/vue-components/AccountingView.vue +++ b/frontend/admin/vue-components/AccountingView.vue @@ -1,35 +1,33 @@ @@ -51,7 +49,7 @@ rows: [], globalActions: [{ label: "Create New Entry", - callback: () => { this.newAccountingDialog.visible = true; } + callback: () => {this.newAccountingDialog.visible = true;} }], rowActions: [{ label: "Remove", diff --git a/frontend/admin/vue-components/ApplicationsView.vue b/frontend/admin/vue-components/ApplicationsView.vue index d7682fa7c..0ea68d17f 100644 --- a/frontend/admin/vue-components/ApplicationsView.vue +++ b/frontend/admin/vue-components/ApplicationsView.vue @@ -1,32 +1,31 @@ @@ -46,7 +45,7 @@ rows: [], globalActions: [{ label: "Create New Entry", - callback: () => { this.newApplicationDialog.visible = true; } + callback: () => {this.newApplicationDialog.visible = true;} }], rowActions: [{ label: "Remove", diff --git a/frontend/admin/vue-components/UsersView.vue b/frontend/admin/vue-components/UsersView.vue index f77315866..4661d784c 100644 --- a/frontend/admin/vue-components/UsersView.vue +++ b/frontend/admin/vue-components/UsersView.vue @@ -3,6 +3,7 @@
Error: {{communicationError}}
+ { this.newUserDialog.visible = true; } + callback: () => {this.newUserDialog.visible = true;} }], rowActions: [{ label: "Policies", diff --git a/frontend/vue/toolkit/AdminLTEBox.vue b/frontend/vue/toolkit/AdminLTEBox.vue index 9a190e6be..a0763f37c 100644 --- a/frontend/vue/toolkit/AdminLTEBox.vue +++ b/frontend/vue/toolkit/AdminLTEBox.vue @@ -2,7 +2,10 @@
-
{{title}}
+
+

{{title}}

+
+
diff --git a/frontend/vue/toolkit/DataTable.vue b/frontend/vue/toolkit/DataTable.vue index 4556c1109..c8941d2fe 100644 --- a/frontend/vue/toolkit/DataTable.vue +++ b/frontend/vue/toolkit/DataTable.vue @@ -1,30 +1,32 @@ @@ -45,3 +47,14 @@ } }; + + diff --git a/remoteappmanager/handlers/admin/tests/test_admin_handlers.py b/remoteappmanager/handlers/admin/tests/test_admin_handlers.py index 7b14807d5..b995fab4c 100644 --- a/remoteappmanager/handlers/admin/tests/test_admin_handlers.py +++ b/remoteappmanager/handlers/admin/tests/test_admin_handlers.py @@ -44,22 +44,22 @@ def test_failed_auth(self): class TestApplicationsHandler(TestBaseAccess): url = "/user/johndoe/#/applications/" - body_string = "datatable" + body_string = '
' class TestUsersHandler(TestBaseAccess): url = "/user/johndoe/#/users/" - body_string = "datatable" + body_string = '
' class TestContainersHandler(TestBaseAccess): url = "/user/johndoe/#/containers/" - body_string = "datatable" + body_string = '
' class TestAccountingHandler(TestBaseAccess): url = "/user/johndoe/#/users/0/accounting/" - body_string = "datatable" + body_string = '
' def test_unknown_id(self): self._app.db.unexistent_user_id = 123422 diff --git a/remoteappmanager/templates/admin/page.html b/remoteappmanager/templates/admin/page.html index 58e182251..0f6b4bb9b 100644 --- a/remoteappmanager/templates/admin/page.html +++ b/remoteappmanager/templates/admin/page.html @@ -2,10 +2,6 @@ {% set skin = "skin-red" %} -{% block stylesheet %} - -{% endblock %} - {% block sidebar %}