summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ep.json7
-rw-r--r--src/node/hooks/express/adminsettings.js63
-rw-r--r--src/static/css/admin.css9
-rw-r--r--src/static/js/admin/settings.js228
-rw-r--r--src/templates/admin/settings.html26
5 files changed, 331 insertions, 2 deletions
diff --git a/src/ep.json b/src/ep.json
index ce6d3a00..2acf0761 100644
--- a/src/ep.json
+++ b/src/ep.json
@@ -15,6 +15,11 @@
{ "name": "socketio", "hooks": { "expressCreateServer": "ep_etherpad-lite/node/hooks/express/socketio:expressCreateServer" } },
{ "name": "adminplugins", "hooks": {
"expressCreateServer": "ep_etherpad-lite/node/hooks/express/adminplugins:expressCreateServer",
- "socketio": "ep_etherpad-lite/node/hooks/express/adminplugins:socketio" } }
+ "socketio": "ep_etherpad-lite/node/hooks/express/adminplugins:socketio" }
+ },
+ { "name": "adminsettings", "hooks": {
+ "expressCreateServer": "ep_etherpad-lite/node/hooks/express/adminsettings:expressCreateServer",
+ "socketio": "ep_etherpad-lite/node/hooks/express/adminsettings:socketio" }
+ }
]
}
diff --git a/src/node/hooks/express/adminsettings.js b/src/node/hooks/express/adminsettings.js
new file mode 100644
index 00000000..4290a27f
--- /dev/null
+++ b/src/node/hooks/express/adminsettings.js
@@ -0,0 +1,63 @@
+var path = require('path');
+var eejs = require('ep_etherpad-lite/node/eejs');
+var installer = require('ep_etherpad-lite/static/js/pluginfw/installer');
+var fs = require('fs');
+
+exports.expressCreateServer = function (hook_name, args, cb) {
+ args.app.get('/admin/settings', function(req, res) {
+
+ var render_args = {
+ settings: "",
+ search_results: {},
+ errors: []
+ };
+
+ res.send( eejs.require("ep_etherpad-lite/templates/admin/settings.html", render_args) );
+
+ });
+}
+
+exports.socketio = function (hook_name, args, cb) {
+ var io = args.io.of("/settings");
+ io.on('connection', function (socket) {
+ if (!socket.handshake.session.user || !socket.handshake.session.user.is_admin) return;
+
+ socket.on("load", function (query) {
+// socket.emit("installed-results", {results: plugins.plugins});
+ fs.readFile('settings.json', 'utf8', function (err,data) {
+ if (err) {
+ return console.log(err);
+ }
+ else
+ {
+ socket.emit("settings", {results: data});
+ }
+ });
+ });
+
+/*
+ socket.on("search", function (query) {
+ socket.emit("progress", {progress:0, message:'Fetching results...'});
+ installer.search(query, true, function (progress) {
+ if (progress.results)
+ socket.emit("search-result", progress);
+ socket.emit("progress", progress);
+ });
+ });
+
+ socket.on("install", function (plugin_name) {
+ socket.emit("progress", {progress:0, message:'Downloading and installing ' + plugin_name + "..."});
+ installer.install(plugin_name, function (progress) {
+ socket.emit("progress", progress);
+ });
+ });
+
+ socket.on("uninstall", function (plugin_name) {
+ socket.emit("progress", {progress:0, message:'Uninstalling ' + plugin_name + "..."});
+ installer.uninstall(plugin_name, function (progress) {
+ socket.emit("progress", progress);
+ });
+ });
+*/
+ });
+}
diff --git a/src/static/css/admin.css b/src/static/css/admin.css
index 5eb008fa..45dae727 100644
--- a/src/static/css/admin.css
+++ b/src/static/css/admin.css
@@ -119,4 +119,11 @@ td, th {
right: 10px;
padding: 2px;
overflow: auto;
-} \ No newline at end of file
+}
+.settings pre{
+ white-space: pre-wrap;
+ white-space: -moz-pre-wrap;
+ white-space: -pre-wrap;
+ white-space: -o-pre-wrap;
+ word-wrap: break-word;
+}
diff --git a/src/static/js/admin/settings.js b/src/static/js/admin/settings.js
new file mode 100644
index 00000000..136b3a08
--- /dev/null
+++ b/src/static/js/admin/settings.js
@@ -0,0 +1,228 @@
+$(document).ready(function () {
+ var socket,
+ loc = document.location,
+ port = loc.port == "" ? (loc.protocol == "https:" ? 443 : 80) : loc.port,
+ url = loc.protocol + "//" + loc.hostname + ":" + port + "/",
+ pathComponents = location.pathname.split('/'),
+ // Strip admin/plugins
+ baseURL = pathComponents.slice(0,pathComponents.length-2).join('/') + '/',
+ resource = baseURL.substring(1) + "socket.io";
+
+ //connect
+ socket = io.connect(url, {resource : resource}).of("/settings");
+
+ $('.search-results').data('query', {
+ pattern: '',
+ offset: 0,
+ limit: 12,
+ });
+
+ var doUpdate = false;
+
+ var search = function () {
+ socket.emit("search", $('.search-results').data('query'));
+ }
+
+ function updateHandlers() {
+ $("#progress.dialog .close").unbind('click').click(function () {
+ $("#progress.dialog").hide();
+ });
+
+ $("#do-search").unbind('click').click(function () {
+ var query = $('.search-results').data('query');
+ query.pattern = $("#search-query")[0].value;
+ query.offset = 0;
+ search();
+ });
+
+ $(".do-install").unbind('click').click(function (e) {
+ var row = $(e.target).closest("tr");
+ doUpdate = true;
+ socket.emit("install", row.find(".name").html());
+ });
+
+ $(".do-uninstall").unbind('click').click(function (e) {
+ var row = $(e.target).closest("tr");
+ doUpdate = true;
+ socket.emit("uninstall", row.find(".name").html());
+ });
+
+ $(".do-prev-page").unbind('click').click(function (e) {
+ var query = $('.search-results').data('query');
+ query.offset -= query.limit;
+ if (query.offset < 0) {
+ query.offset = 0;
+ }
+ search();
+ });
+ $(".do-next-page").unbind('click').click(function (e) {
+ var query = $('.search-results').data('query');
+ var total = $('.search-results').data('total');
+ if (query.offset + query.limit < total) {
+ query.offset += query.limit;
+ }
+ search();
+ });
+ }
+
+ updateHandlers();
+/*
+ socket.on('progress', function (data) {
+ if (data.progress > 0 && $('#progress.dialog').data('progress') > data.progress) return;
+
+ $("#progress.dialog .close").hide();
+ $("#progress.dialog").show();
+
+ $('#progress.dialog').data('progress', data.progress);
+
+ var message = "Unknown status";
+ if (data.message) {
+ message = "<span class='status'>" + data.message.toString() + "</span>";
+ }
+ if (data.error) {
+ message = "<span class='error'>" + data.error.toString() + "<span>";
+ }
+ $("#progress.dialog .message").html(message);
+ $("#progress.dialog .history").append("<div>" + message + "</div>");
+
+ if (data.progress >= 1) {
+ if (data.error) {
+ $("#progress.dialog .close").show();
+ } else {
+ if (doUpdate) {
+ doUpdate = false;
+ socket.emit("load");
+ }
+ $("#progress.dialog").hide();
+ }
+ }
+ });
+
+ socket.on('search-result', function (data) {
+ var widget=$(".search-results");
+
+ widget.data('query', data.query);
+ widget.data('total', data.total);
+
+ widget.find('.offset').html(data.query.offset);
+ widget.find('.limit').html(data.query.offset + data.query.limit);
+ widget.find('.total').html(data.total);
+
+ widget.find(".results *").remove();
+ for (plugin_name in data.results) {
+ var plugin = data.results[plugin_name];
+ var row = widget.find(".template tr").clone();
+
+ for (attr in plugin) {
+ row.find("." + attr).html(plugin[attr]);
+ }
+ widget.find(".results").append(row);
+ }
+
+ updateHandlers();
+ });
+*/
+
+ socket.on('settings', function (data) {
+ $('.settings').append(data.results);
+ $('.settings').sloppyForm(); // Turn JSON into Form
+
+/* $("#installed-plugins *").remove();
+ for (plugin_name in data.results) {
+ if (plugin_name == "ep_etherpad-lite") continue; // Hack...
+ var plugin = data.results[plugin_name];
+ var row = $("#installed-plugin-template").clone();
+
+ for (attr in plugin.package) {
+ row.find("." + attr).html(plugin.package[attr]);
+ }
+ $("#installed-plugins").append(row);
+ }
+ updateHandlers();
+*/
+ });
+
+ socket.emit("load");
+ search();
+});
+
+
+/* A jQuery plugin to turn JSON strings into forms */
+(function($){
+ $.fn.sloppyForm = function() {
+ return this.each(function() {
+ // Firstly get a clean object with comments stripped out
+ var settings = ($.parseJSON(JSON.minify($(this).text())));
+
+ // For each create form bla bla
+
+ });
+ };
+})(jQuery);
+
+
+
+
+/* Strip crap out of JSON */
+/*! JSON.minify()
+ v0.1 (c) Kyle Simpson
+ MIT License
+ https://github.com/getify/JSON.minify
+*/
+
+(function(global){
+ if (typeof global.JSON == "undefined" || !global.JSON) {
+ global.JSON = {};
+ }
+
+ global.JSON.minify = function(json) {
+
+ var tokenizer = /"|(\/\*)|(\*\/)|(\/\/)|\n|\r/g,
+ in_string = false,
+ in_multiline_comment = false,
+ in_singleline_comment = false,
+ tmp, tmp2, new_str = [], ns = 0, from = 0, lc, rc
+ ;
+
+ tokenizer.lastIndex = 0;
+
+ while (tmp = tokenizer.exec(json)) {
+ lc = RegExp.leftContext;
+ rc = RegExp.rightContext;
+ if (!in_multiline_comment && !in_singleline_comment) {
+ tmp2 = lc.substring(from);
+ if (!in_string) {
+ tmp2 = tmp2.replace(/(\n|\r|\s)*/g,"");
+ }
+ new_str[ns++] = tmp2;
+ }
+ from = tokenizer.lastIndex;
+
+ if (tmp[0] == "\"" && !in_multiline_comment && !in_singleline_comment) {
+ tmp2 = lc.match(/(\\)*$/);
+ if (!in_string || !tmp2 || (tmp2[0].length % 2) == 0) { // start of string with ", or unescaped " character found to end string
+ in_string = !in_string;
+ }
+ from--; // include " character in next catch
+ rc = json.substring(from);
+ }
+ else if (tmp[0] == "/*" && !in_string && !in_multiline_comment && !in_singleline_comment) {
+ in_multiline_comment = true;
+ }
+ else if (tmp[0] == "*/" && !in_string && in_multiline_comment && !in_singleline_comment) {
+ in_multiline_comment = false;
+ }
+ else if (tmp[0] == "//" && !in_string && !in_multiline_comment && !in_singleline_comment) {
+ in_singleline_comment = true;
+ }
+ else if ((tmp[0] == "\n" || tmp[0] == "\r") && !in_string && !in_multiline_comment && in_singleline_comment) {
+ in_singleline_comment = false;
+ }
+ else if (!in_multiline_comment && !in_singleline_comment && !(/\n|\r|\s/.test(tmp[0]))) {
+ new_str[ns++] = tmp[0];
+ }
+ }
+ new_str[ns++] = rc;
+ return new_str.join("");
+ };
+})(this);
diff --git a/src/templates/admin/settings.html b/src/templates/admin/settings.html
new file mode 100644
index 00000000..b3d6b32a
--- /dev/null
+++ b/src/templates/admin/settings.html
@@ -0,0 +1,26 @@
+<html>
+ <head>
+ <title>Settings manager</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
+ <link rel="stylesheet" href="../static/css/admin.css">
+ <script src="../static/js/jquery.js"></script>
+ <script src="../socket.io/socket.io.js"></script>
+ <script src="../static/js/admin/settings.js"></script>
+ </head>
+ <body>
+ <div id="wrapper">
+
+ <% if (errors.length) { %>
+ <div class="errors">
+ <% errors.forEach(function (item) { %>
+ <div class="error"><%= item.toString() %></div>
+ <% }) %>
+ </div>
+ <% } %>
+
+
+ <h1>Etherpad Lite Settings</h1>
+ <div class="settings"></div>
+ </div>
+ </body>
+</html>