From 2d86e7713d029c4ca939cd84823d3f3954f018b4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 8 Jan 2016 12:14:01 -0500 Subject: [PATCH 1/2] increase height of logout popup to fit content --- web/skins/classic/js/dark.js | 2 +- web/skins/classic/js/flat.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/js/dark.js b/web/skins/classic/js/dark.js index f8867feda..e99980f61 100644 --- a/web/skins/classic/js/dark.js +++ b/web/skins/classic/js/dark.js @@ -47,7 +47,7 @@ var popupSizes = { 'image': { 'addWidth': 48, 'addHeight': 80 }, 'log': { 'width': 1080, 'height': 720 }, 'login': { 'width': 720, 'height': 480 }, - 'logout': { 'width': 260, 'height': 100 }, + 'logout': { 'width': 260, 'height': 150 }, 'monitor': { 'width': 525, 'height': 700 }, 'monitorpreset':{ 'width': 440, 'height': 200 }, 'monitorprobe': { 'width': 500, 'height': 240 }, diff --git a/web/skins/classic/js/flat.js b/web/skins/classic/js/flat.js index 9b04ca16d..8b821f816 100644 --- a/web/skins/classic/js/flat.js +++ b/web/skins/classic/js/flat.js @@ -47,7 +47,7 @@ var popupSizes = { 'image': { 'addWidth': 48, 'addHeight': 80 }, 'log': { 'width': 1080, 'height': 720 }, 'login': { 'width': 720, 'height': 480 }, - 'logout': { 'width': 260, 'height': 100 }, + 'logout': { 'width': 260, 'height': 150 }, 'monitor': { 'width': 550, 'height': 700 }, 'monitorpreset':{ 'width': 440, 'height': 200 }, 'monitorprobe': { 'width': 500, 'height': 240 }, From 47d4331d62340e9abbd8028d0a9ce9ce1e04f99f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 10 Jan 2016 20:58:45 -0500 Subject: [PATCH 2/2] Add Hostname Column to create script, to match update --- db/zm_create.sql.in | 1 + 1 file changed, 1 insertion(+) diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index 8239566df..044fec234 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -413,6 +413,7 @@ INSERT INTO States (Name,Definition,IsActive) VALUES ('default','','1'); DROP TABLE IF EXISTS `Servers`; CREATE TABLE `Servers` ( `Id` int(10) unsigned NOT NULL auto_increment, + `Hostname` TEXT, `Name` varchar(64) NOT NULL default '', `State_Id` int(10) unsigned, PRIMARY KEY (`Id`)