rework templates view

rngadam · rngadam · commit 74fe8bedec04 · 2016-09-07T19:48:02.000+08:00
diff --git a/app/client/templates/admin.html b/app/client/templates/admin.html
@@ -1,33 +1,30 @@
 <template name="admin">
-    <div class="top ui container">
-        <div class="ui secondary pointing menu">
-            <a class="usersButton item" href="#">
-                Users
-            </a>
-            <a class="controlsButton item" href="#">
-                Controls
-            </a>
-            <a class="organisationsButton item" href="#">
-                Organisations
-            </a>
-        </div>
+    <div class="ui secondary pointing menu">
+        <a class="usersButton item" href="#">
+            Users
+        </a>
+        <a class="organisationsButton item" href="#">
+            Organizations
+        </a>
     </div>
     {{> Template.dynamic template=tab}}
 </template>
+
 <template name="userPhoto">
     <img class="ui small image" src="{{profilePictureUrl size=300}}">
 </template>
+
 <template name="admin_users">
-    {{> collectionTable collection=users class="table table-bordered table-hover" settings=settings }}
-</template>
-<template name="admin_controls">
-    <div class="ui item">
-        <a class="ui button" id="flushdb" href="#">FlushDB</a>
+    <div>
+        <div class="ui item">
+            <a class="ui button" id="flushdb" href="#">FlushDB</a>
+        </div>
+        {{> collectionTable collection=users class="table table-bordered table-hover" settings=settings }}
     </div>
 </template>
 
 <template name="admin_error_button">
-    <button id="errorButton" class="button item" value={{_id}}>Show Error</button>
+    <button id="errorButton" class="button item" value={{_id}}>Full log</button>
 </template>
 
 <template name="admin_success_status">
diff --git a/app/client/templates/admin.js b/app/client/templates/admin.js
@@ -13,20 +13,17 @@ Template.admin_organisations.events({
     }
 })
 
-Template.admin_controls.events({
-    'click #flushdb': function() {
-        console.log('flushing db');
-        Meteor.call('admin/flushdb');
-    }
-});
-
 Template.admin.helpers({
     tab: function() {
         return Template.instance().currentTab.get();
     }
 });
 
 Template.admin_users.helpers({
+    'click #flushdb': function() {
+        console.log('flushing users db');
+        Meteor.call('admin/flushdb');
+    },
     settings: function() {
         return {
             onCreate: function() {
@@ -71,8 +68,8 @@ Template.admin_organisations.helpers({
             rowsPerPage: 10,
             showFilter: true,
             fields: [
+                { key: 'timestamp', label: 'Timestamp', sortOrder: 0, sortDirection: 'descending' },
                 { key: 'statusCode', label: 'Success', tmpl: Template.admin_success_status },
-                { key: 'lastSuccess', label: 'Last success' },
                 { key: 'url', label: 'URL' },
                 { key: 'error', label: 'Error', tmpl: Template.admin_error_button },
             ]
@@ -87,9 +84,6 @@ Template.admin.events({
     'click .usersButton': function(event, template) {
         template.currentTab.set('admin_users');
     },
-    'click .controlsButton': function(event, template) {
-        template.currentTab.set('admin_controls');
-    },
     'click .organisationsButton': function(event, template) {
         template.currentTab.set('admin_organisations');
     }
diff --git a/app/client/templates/error_view.js b/app/client/templates/error_view.js
@@ -4,7 +4,6 @@ Template.error_view.onCreated(function() {
 
 Template.error_view.helpers({
 	'getError' : function() {
-    console.log(App.Collections.OrgLogs.findOne(FlowRouter.getParam('_id')));
 		return JSON.stringify(App.Collections.OrgLogs.findOne(FlowRouter.getParam('_id')), null, '\t');
 	}
 })

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ Template.error_view.onCreated(function() {`
`4`	`4`
`5`	`5`	`Template.error_view.helpers({`
`6`	`6`	`'getError' : function() {`
`7`		`- console.log(App.Collections.OrgLogs.findOne(FlowRouter.getParam('_id')));`
`8`	`7`	`return JSON.stringify(App.Collections.OrgLogs.findOne(FlowRouter.getParam('_id')), null, '\t');`
`9`	`8`	`}`
`10`	`9`	`})`