From 55b1617baf98bd185078727fff37a7868032e26a Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 22 Oct 2019 14:41:19 -0400 Subject: [PATCH] Updating the Tabulator sections. Adding new columns for Plugins, Servers and Sites. --- views/admin/plugins/plugins.html | 6 +++--- views/admin/plugins/servers.html | 10 +++++++++- views/admin/plugins/sites.html | 15 +++++++++++++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/views/admin/plugins/plugins.html b/views/admin/plugins/plugins.html index ee96d52..9a72c44 100644 --- a/views/admin/plugins/plugins.html +++ b/views/admin/plugins/plugins.html @@ -71,9 +71,9 @@ addRowPos: "top", initialSort: [ {column: "name", dir: "asc"} ], columns:[ - {title:"Plugin Name", field:"name", width:"350"}, - {title:"Latest Version", field:"latestVersion", align:"left"}, - {title:"GLM Assoc", field:"glmAssociate", align:"left", formatter:"tickCross"}, + {title:"Plugin Name", field:"name"}, + {title:"Latest Version", field:"latestVersion", align:"left", width: "200"}, + {title:"GLM Assoc", field:"glmAssociate", align:"left", width: "120", formatter:"tickCross"}, ], rowClick:function(e, row){ console.log('Row ' + row.getData().id + ' Clicked!!!'); diff --git a/views/admin/plugins/servers.html b/views/admin/plugins/servers.html index a3b12ed..0013e5d 100644 --- a/views/admin/plugins/servers.html +++ b/views/admin/plugins/servers.html @@ -36,7 +36,14 @@ jQuery(document).ready(function($){ var tabledata = [ {foreach $servers as $server} - { id:"{$server.id}", name:"{$server.name|escape:'quotes'}", location: "{$server.location}", phpVersion: "{$server.php_version}", mysqlVersion:"{$server.mysql_version}" }, + { + id:"{$server.id}", + name:"{$server.name|escape:'quotes'}", + location: "{$server.location}", + phpVersion: "{$server.php_version}", + mysqlVersion:"{$server.mysql_version}", + production: {$server.production.value|default:false}, + }, {/foreach} ]; @@ -53,6 +60,7 @@ {title:"Location", field:"location", align:"left"}, {title:"PHP Version", field:"phpVersion", align:"left"}, {title:"MySQL Version", field:"mysqlVersion", align:"left"}, + {title:"Production", field:"production", align:"left", width:"120", formatter:"tickCross"}, ], rowClick:function(e, row){ console.log('Row ' + row.getData().id + ' Clicked!!!'); diff --git a/views/admin/plugins/sites.html b/views/admin/plugins/sites.html index a92cb58..729e296 100644 --- a/views/admin/plugins/sites.html +++ b/views/admin/plugins/sites.html @@ -43,7 +43,15 @@ jQuery(document).ready(function($){ var tabledata = [ {foreach $sites as $site} - { id:"{$site.id}", name:"{$site.name|escape:'quotes'}", prodUrl: "{$site.prod_url}", devUrl: "{$site.dev_url}" }, + { + id:"{$site.id}", + name:"{$site.name|escape:'quotes'}", + prodUrl: "{$site.prod_url}", + devUrl: "{$site.dev_url}", + active: {$site.active.value|default:false}, + hasContacts: {$site.has_contacts.value|default:false}, + hasMembers: {$site.has_members.value|default:false}, + }, {/foreach} ]; @@ -69,9 +77,12 @@ addRowPos: "top", initialSort: [ {column: "name", dir: "asc"} ], columns:[ - {title:"Site Name", field:"name", width:"350"}, + {title:"Site Name", field:"name", width:"250"}, {title:"Prod Url", field:"prodUrl", align:"left"}, {title:"Dev Url", field:"devUrl", align:"left"}, + {title:"Active", field:"active", align:"left", width:"80", formatter:"tickCross"}, + {title:"Contacts", field:"hasContacts", align:"left", width:"100", formatter:"tickCross"}, + {title:"Members", field:"hasMembers", align:"left", width:"100", formatter:"tickCross"}, ], rowClick:function(e, row){ console.log('Row ' + row.getData().id + ' Clicked!!!'); -- 2.17.1