diff options
| author | Matthias Bartelmeß <mba@fourplusone.de> | 2012-04-05 21:54:26 +0200 |
|---|---|---|
| committer | Matthias Bartelmeß <mba@fourplusone.de> | 2012-04-05 21:54:26 +0200 |
| commit | 151f1a0d71a618379dcd439ea2ddc0c7efb2e45c (patch) | |
| tree | 8b6bbebd709cad387b2366f4e5861d311555b988 /src | |
| parent | 404ce9e452b278cbc1be8c194c3757f61b3dee9c (diff) | |
| parent | 66fdacf9cf31343721dd8fb38a4584e11ea76e6e (diff) | |
| download | etherpad-lite-151f1a0d71a618379dcd439ea2ddc0c7efb2e45c.zip | |
Merge branch 'develop' into timeslider_authors
Diffstat (limited to 'src')
| -rw-r--r-- | src/node/server.js | 7 | ||||
| -rw-r--r-- | src/static/css/admin.css | 49 | ||||
| -rw-r--r-- | src/templates/admin/plugins.html | 57 |
3 files changed, 59 insertions, 54 deletions
diff --git a/src/node/server.js b/src/node/server.js index bc4333cd..6b443edb 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); } ]); diff --git a/src/static/css/admin.css b/src/static/css/admin.css new file mode 100644 index 00000000..80089c4c --- /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 7dcb6fa3..5e5a1b03 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -1,56 +1,7 @@ <html> <head> <title>Plugin manager</title> - <style> - 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; - } - </style> + <link href="../../static/css/admin.css" rel="stylesheet" type="text/css" /> <script src="../../static/js/jquery.js"></script> <script src="../../socket.io/socket.io.js"></script> <script> @@ -167,7 +118,7 @@ <td class="name"></td> <td class="description"></td> <td class="actions"> - <input type="button" value="I" class="do-uninstall"> + <input type="button" value="Uninstall" class="do-uninstall"> </td> </tr> </tbody> @@ -180,7 +131,7 @@ <h1>Search for plugins to install</h1> <form> <input type="text" name="search" value="" id="search-query"> - <input type="button" value="S" id="do-search"> + <input type="button" value="Search" id="do-search"> </form> <table> <thead> @@ -195,7 +146,7 @@ <td class="name"></td> <td class="description"></td> <td class="actions"> - <input type="button" value="I" class="do-install"> + <input type="button" value="Install" class="do-install"> </td> </tr> </tbody> |