From d3cc8e33741489e34e9d7b6a90f4550910d4e951 Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Thu, 5 Apr 2012 17:49:03 +0100 Subject: [PATCH 1/3] Make the console show the url that admin/plugins is available at --- src/node/server.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/node/server.js b/src/node/server.js index bc4333cdc..6b443edb7 100644 --- a/src/node/server.js +++ b/src/node/server.js @@ -88,7 +88,12 @@ async.waterfall([ //let the server listen app.listen(settings.port, settings.ip); console.log("Server is listening at " + settings.ip + ":" + settings.port); - + if(settings.adminHttpAuth){ + console.log("Plugin admin page listening at " + settings.ip + ":" + settings.port + "/admin/plugins"); + } + else{ + console.log("Admin username and password not set in settings.json. To access admin please uncomment and edit adminHttpAuth in settings.json"); + } callback(null); } ]); From 28aeb24f86724040281d8a636b1211c7dc5724b4 Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Thu, 5 Apr 2012 18:00:38 +0100 Subject: [PATCH 2/3] add some sense to the buttons on the plugin page --- src/templates/admin/plugins.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 7dcb6fa3e..2d419bc2a 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -167,7 +167,7 @@ - + @@ -195,7 +195,7 @@ - + From 66fdacf9cf31343721dd8fb38a4584e11ea76e6e Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Thu, 5 Apr 2012 18:04:17 +0100 Subject: [PATCH 3/3] move css out of html --- src/static/css/admin.css | 49 +++++++++++++++++++++++++++++ src/templates/admin/plugins.html | 53 ++------------------------------ 2 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 src/static/css/admin.css diff --git a/src/static/css/admin.css b/src/static/css/admin.css new file mode 100644 index 000000000..80089c4ca --- /dev/null +++ b/src/static/css/admin.css @@ -0,0 +1,49 @@ +table { + border-collapse: collapse; +} +td, th { + border: 1px solid black; + padding-left: 10px; + padding-right: 10px; + padding-top: 2px; + padding-bottom: 2px; +} +.template { + display: none; +} +.dialog { + display: none; + position: absolute; + left: 50%; + top: 50%; + width: 700px; + height: 500px; + margin-left: -350px; + margin-top: -250px; + border: 3px solid #999999; + background: #eeeeee; +} +.dialog .title { + margin: 0; + padding: 2px; + border-bottom: 3px solid #999999; + font-size: 24px; + line-height: 24px; + height: 24px; + overflow: hidden; +} +.dialog .title .close { + float: right; +} +.dialog .history { + background: #222222; + color: #eeeeee; + position: absolute; + top: 41px; + bottom: 10px; + left: 10px; + right: 10px; + padding: 2px; + overflow: auto; +} + diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 2d419bc2a..5e5a1b035 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -1,56 +1,7 @@ Plugin manager - +