From cde3fcbec17b64b13d4f54d06b05786c1f070b45 Mon Sep 17 00:00:00 2001 From: miketwc1984 Date: Sat, 20 Apr 2024 12:55:36 -0400 Subject: [PATCH] fix reset/cluster on Win --- bin/manager.bat | 6 ++++-- htdocs/js/pages/Home.class.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/manager.bat b/bin/manager.bat index 0f87258..713a006 100644 --- a/bin/manager.bat +++ b/bin/manager.bat @@ -48,12 +48,13 @@ if /I "%1"=="--port" ( echo Missing cluster value. Specify comma-separatd hostnames exit ) - set CRONICLE_cluster=%~f2 - echo These servers will be added on setup: %~f2 + set CRONICLE_cluster=%2 + echo These servers will be added on setup: %2 shift shift ) else if /I "%1"=="--reset" ( set CRONICLE_RESET=1 + shift ) else if /I "%1"=="--help" ( echo Usage: .\manager [--port port] [ --storage /path/to/storage.json] echo [ --reset ] # make current host the manager @@ -75,6 +76,7 @@ IF EXIST "%~dp0..\nodejs\node.exe" ( REM setup or reset manager if "%CRONICLE_RESET%"=="1" ( node .\storage-cli.js reset + echo Croncile manager was reset to current host ) else ( node .\storage-cli.js setup ) diff --git a/htdocs/js/pages/Home.class.js b/htdocs/js/pages/Home.class.js index 13be5b1..5cd360b 100644 --- a/htdocs/js/pages/Home.class.js +++ b/htdocs/js/pages/Home.class.js @@ -315,7 +315,7 @@ Class.subclass( Page.Base, "Page.Home", { var col_width = Math.floor( ((size.width * 0.9) + 50) / 7 ); var cols = ['Event Name', 'Category', 'Plugin', 'Target', 'Scheduled Time', 'Countdown', 'Actions']; - var limit = Math.round(window.innerWidth/350)*5 // try to fit 5 rows + var limit = Math.round((window.innerWidth-200)/350)*4 // try to fit 4 rows html += this.getPaginatedTable({ resp: {