From d5120c98d0db50e48ed0c6338a9f3c509bbb259a Mon Sep 17 00:00:00 2001 From: johnyma22 Date: Thu, 5 Apr 2012 18:22:53 +0100 Subject: [PATCH 01/36] very quick admin interface styling and sensibility --- src/static/css/admin.css | 90 ++++++++++++++++++++++ src/templates/admin/plugins.html | 128 +++++++++++++++---------------- 2 files changed, 153 insertions(+), 65 deletions(-) diff --git a/src/static/css/admin.css b/src/static/css/admin.css index 80089c4c..20946531 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -1,3 +1,93 @@ +body { + margin: 0; + height: 100%; + color: #333; + font: 14px helvetica, sans-serif; + background: #ddd; + background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed; + background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed; + background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed; + background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed; + border-top: 8px solid rgba(51,51,51,.8); +} +#wrapper { + border-top: 1px solid #999; + margin-top: 160px; + padding: 15px; + background: #eee; + background: -webkit-linear-gradient(#fff,#ccc); + background: -moz-linear-gradient(#fff,#ccc); + background: -ms-linear-gradient(#fff,#ccc); + background: -o-linear-gradient(#fff,#ccc); + opacity: .9; + box-shadow: 0px 1px 8px rgba(0,0,0,0.3); + max-width: 1200px; + margin: auto; +} +#inner { + width: 300px; + margin: 0 auto; +} +#button:hover { + cursor: pointer; + background: #666; + background: -webkit-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747); + background: -moz-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747); + background: -ms-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747); + background: -o-linear-gradient(#707070,#666666 50%,#5B5B5B 51%,#474747); +} +#button:active { + box-shadow: inset 0 1px 12px rgba(0,0,0,0.9); + background: #444; +} +#label { + text-align: left; + text-shadow: 0 1px 1px #fff; + margin: 16px auto 0; +} +form { + border: 1px solid #bbb; + border-radius: 3px; + position: relative; +} +button, input { + font-weight: bold; + font-size: 15px; +} +input[type="button"] { + height:30px; +} +input[type="text"] { + border-radius: 3px; + box-sizing: border-box; + -moz-box-sizing: border-box; + padding: 10px 45px 10px 10px; + *padding: 0; /* IE7 hack */ + width: 100%; + outline: none; + border: none; +} +button{ + display:block; +} +@media only screen and (min-device-width: 320px) and (max-device-width: 720px) { + body { + background: #bbb; + background: -webkit-linear-gradient(#aaa,#eee 60%) center fixed; + background: -moz-linear-gradient(#aaa,#eee 60%) center fixed; + background: -ms-linear-gradient(#aaa,#eee 60%) center fixed; + } + #wrapper { + margin-top: 0; + } + #inner { + width: 95%; + } + #label { + text-align: center; + } +} + table { border-collapse: collapse; } diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 5e5a1b03..6f38d048 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -19,7 +19,7 @@ if ($("#search-query")[0].value != "") socket.emit("search", $("#search-query")[0].value); }); - + $(".do-install").unbind('click').click(function (e) { var row = $(e.target).closest("tr"); doUpdate = true; @@ -95,74 +95,72 @@ - <% if (errors.length) { %> -
- <% errors.forEach(function (item) { %> -
<%= item.toString() %>
- <% }) %> -
- <% } %> +
+ + <% if (errors.length) { %> +
+ <% errors.forEach(function (item) { %> +
<%= item.toString() %>
+ <% }) %> +
+ <% } %> -

Installed plugins

- - - - - - - - - - - - - - - - - -
NameDescription
- -
+

Installed plugins

+ + + + + + + + + + + + + + + + + +
NameDescription
+ +
+ +

Search for plugins to install

+
+ + +
+ + + + + + + + + + + + + + + + + +
NameDescription
+ +
- - -

Search for plugins to install

-
- - -
- - - - - - - - - - - - - - - - - -
NameDescription
- -
- - -
-

- Please wait: +
+

+ Please wait: -

- -
+

+
+
- From 05fcf4ba4a9a63c2007eef31405c2a3712776241 Mon Sep 17 00:00:00 2001 From: 0ip Date: Wed, 11 Apr 2012 22:22:28 +0300 Subject: [PATCH 02/36] Having "maxAge" twice doesn't double the fun --- settings.json.template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/settings.json.template b/settings.json.template index 7aaa5d7e..d75d53a8 100644 --- a/settings.json.template +++ b/settings.json.template @@ -40,8 +40,8 @@ "minify" : true, /* How long may clients use served javascript code (in seconds)? Without versioning this - is may cause problems during deployment. Set to 0 to disable caching */ - "maxAge" : 21600, // 6 hours + may cause problems during deployment. Set to 0 to disable caching */ + "maxAge" : 21600, // 60 * 60 * 6 = 6 hours /* This is the path to the Abiword executable. Setting it to null, disables abiword. Abiword is needed to enable the import/export of pads*/ @@ -55,7 +55,4 @@ /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */ "loglevel": "INFO", - - /* cache 6 hours = 1000*60*60*6 */ - "maxAge": 21600000 } From 3dd24bdf6f8ef330928c66bde9ed4ddd4dc58f6d Mon Sep 17 00:00:00 2001 From: 0ip Date: Wed, 11 Apr 2012 22:25:04 +0300 Subject: [PATCH 03/36] forgot to remove a ',' ^.^ --- settings.json.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.json.template b/settings.json.template index d75d53a8..a664ea8e 100644 --- a/settings.json.template +++ b/settings.json.template @@ -54,5 +54,5 @@ // "adminHttpAuth" : "user:pass", /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */ - "loglevel": "INFO", + "loglevel": "INFO" } From 362ef454b811802a5e170835756ba158a393aa06 Mon Sep 17 00:00:00 2001 From: Jordan Hollinger Date: Fri, 13 Apr 2012 05:17:48 -0400 Subject: [PATCH 04/36] Don't block static paths with http auth --- src/node/hooks/express/webaccess.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/node/hooks/express/webaccess.js b/src/node/hooks/express/webaccess.js index d0e28737..48b5edae 100644 --- a/src/node/hooks/express/webaccess.js +++ b/src/node/hooks/express/webaccess.js @@ -28,6 +28,11 @@ exports.basicAuth = function (req, res, next) { return next(); } } + // Do not require auth for static paths...this could be a bit brittle + else if (req.path.match(/^\/(static|javascripts|pluginfw)/)) { + return next(); + } + // Otherwise return Auth required Headers, delayed for 1 second, if auth failed. res.header('WWW-Authenticate', 'Basic realm="Protected Area"'); From 06f36664b85340ec87aab09a5bfbeab0f65f489f Mon Sep 17 00:00:00 2001 From: Jordan Hollinger Date: Fri, 13 Apr 2012 17:21:07 -0400 Subject: [PATCH 05/36] Fix re-enabling line numbers. issue #618 --- src/static/js/ace2_inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index d2d14503..b61c50e3 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -4635,7 +4635,7 @@ function Ace2Inner(){ function setClassPresence(elem, className, present) { if (present) $(elem).addClass(className); - else $(elem).removeClass(elem, className); + else $(elem).removeClass(className); } function setup() From d834c42ffc728ee7f21a27e4a975b99395276026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sun, 15 Apr 2012 19:18:29 +0200 Subject: [PATCH 06/36] avoid missing anon. timeslider authors --- src/static/js/broadcast_slider.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js index a2a15773..6dffc0ef 100644 --- a/src/static/js/broadcast_slider.js +++ b/src/static/js/broadcast_slider.js @@ -216,7 +216,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) authorsList.append(' ('); _.each(colorsAnonymous, function(color, i){ if( i > 0 ) authorsList.append(' '); - $(' ') + $(' ') .css('background-color', color) .addClass('author author-anonymous') .appendTo(authorsList); From e664320b8ceb734a333c1877a3f358975e55cf33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Sun, 15 Apr 2012 19:25:23 +0200 Subject: [PATCH 07/36] removed sliderEnabled, supportsSlider clientVars, as they were not used anywhere --- src/node/handler/TimesliderMessageHandler.js | 2 - src/static/js/broadcast_slider.js | 131 ++++++++----------- 2 files changed, 52 insertions(+), 81 deletions(-) diff --git a/src/node/handler/TimesliderMessageHandler.js b/src/node/handler/TimesliderMessageHandler.js index a6cf8f4d..5556efa1 100644 --- a/src/node/handler/TimesliderMessageHandler.js +++ b/src/node/handler/TimesliderMessageHandler.js @@ -155,8 +155,6 @@ function createTimesliderClientVars (padId, callback) var clientVars = { viewId: padId, colorPalette: ["#ffc7c7", "#fff1c7", "#e3ffc7", "#c7ffd5", "#c7ffff", "#c7d5ff", "#e3c7ff", "#ffc7f1", "#ff8f8f", "#ffe38f", "#c7ff8f", "#8fffab", "#8fffff", "#8fabff", "#c78fff", "#ff8fe3", "#d97979", "#d9c179", "#a9d979", "#79d991", "#79d9d9", "#7991d9", "#a979d9", "#d979c1", "#d9a9a9", "#d9cda9", "#c1d9a9", "#a9d9b5", "#a9d9d9", "#a9b5d9", "#c1a9d9", "#d9a9cd"], - sliderEnabled : true, - supportsSlider: true, savedRevisions: [], padIdForUrl: padId, fullWidth: false, diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js index a2a15773..1d1f279c 100644 --- a/src/static/js/broadcast_slider.js +++ b/src/static/js/broadcast_slider.js @@ -162,11 +162,8 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) function showReconnectUI() { - if (!clientVars.sliderEnabled || !clientVars.supportsSlider) - { - $("#padmain, #rightbars").css('top', "130px"); - $("#timeslider").show(); - } + $("#padmain, #rightbars").css('top', "130px"); + $("#timeslider").show(); $('#error').show(); } @@ -287,55 +284,52 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) { disableSelection($("#playpause_button")[0]); disableSelection($("#timeslider")[0]); - - if (clientVars.sliderEnabled && clientVars.supportsSlider) + + $(document).keyup(function(e) { - $(document).keyup(function(e) - { - var code = -1; - if (!e) var e = window.event; - if (e.keyCode) code = e.keyCode; - else if (e.which) code = e.which; + var code = -1; + if (!e) var e = window.event; + if (e.keyCode) code = e.keyCode; + else if (e.which) code = e.which; - if (code == 37) - { // left - if (!e.shiftKey) - { - setSliderPosition(getSliderPosition() - 1); - } - else - { - var nextStar = 0; // default to first revision in document - for (var i = 0; i < savedRevisions.length; i++) - { - var pos = parseInt(savedRevisions[i].attr('pos')); - if (pos < getSliderPosition() && nextStar < pos) nextStar = pos; - } - setSliderPosition(nextStar); - } - } - else if (code == 39) + if (code == 37) + { // left + if (!e.shiftKey) { - if (!e.shiftKey) - { - setSliderPosition(getSliderPosition() + 1); - } - else - { - var nextStar = sliderLength; // default to last revision in document - for (var i = 0; i < savedRevisions.length; i++) - { - var pos = parseInt(savedRevisions[i].attr('pos')); - if (pos > getSliderPosition() && nextStar > pos) nextStar = pos; - } - setSliderPosition(nextStar); - } + setSliderPosition(getSliderPosition() - 1); } - else if (code == 32) playpause(); - - }); - } + else + { + var nextStar = 0; // default to first revision in document + for (var i = 0; i < savedRevisions.length; i++) + { + var pos = parseInt(savedRevisions[i].attr('pos')); + if (pos < getSliderPosition() && nextStar < pos) nextStar = pos; + } + setSliderPosition(nextStar); + } + } + else if (code == 39) + { + if (!e.shiftKey) + { + setSliderPosition(getSliderPosition() + 1); + } + else + { + var nextStar = sliderLength; // default to last revision in document + for (var i = 0; i < savedRevisions.length; i++) + { + var pos = parseInt(savedRevisions[i].attr('pos')); + if (pos > getSliderPosition() && nextStar > pos) nextStar = pos; + } + setSliderPosition(nextStar); + } + } + else if (code == 32) playpause(); + }); + $(window).resize(function() { updateSliderElements(); @@ -485,37 +479,16 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded) $("#revision").css('right', "20px"); $("#revision").css('top', "20px"); } - - - if (clientVars.sliderEnabled) + + $("#timeslider").show(); + setSliderLength(clientVars.totalRevs); + setSliderPosition(clientVars.revNum); + + _.each(clientVars.savedRevisions, function(revision) { - if (clientVars.supportsSlider) - { - $("#timeslider").show(); - setSliderLength(clientVars.totalRevs); - setSliderPosition(clientVars.revNum); - _.each(clientVars.savedRevisions, function(revision) - { - addSavedRevision(revision.revNum, revision); - }) - } - else - { - // slider is not supported - $("#padmain, #rightbars").css('top', "130px"); - $("#timeslider").show(); - $("#error").html("The timeslider feature is not supported on this pad. Why not?"); - $("#error").show(); - } - } - else - { - if (clientVars.supportsSlider) - { - setSliderLength(clientVars.totalRevs); - setSliderPosition(clientVars.revNum); - } - } + addSavedRevision(revision.revNum, revision); + }) + } }); })(); From 9cbb897c45ced7c8affce33a72057ea6bcbab80e Mon Sep 17 00:00:00 2001 From: 0ip Date: Mon, 16 Apr 2012 15:13:07 +0200 Subject: [PATCH 08/36] template/pad.html removed some whitespace --- src/templates/pad.html | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index 91583b36..08e34fa2 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -58,7 +58,7 @@ <% e.end_block(); %> - +
    <% e.begin_block("editbarMenuRight"); %>
  • @@ -95,17 +95,17 @@ - +
    -
    +
    -
    +
    @@ -150,20 +150,20 @@

    Import from text file, HTML, PDF, Word, ODT or RTF


    -
    - -
    -
    +
    + +
    +
    -
    Successful!
    -
    - - - - - - -
    +
    Successful!
    +
    + + + + + + +
    @@ -223,7 +223,7 @@
    - +
    <% e.begin_block("modals"); %>
    @@ -271,7 +271,7 @@
    <% e.end_block(); %>
    - + <% e.begin_block("scripts"); %> From 3e4730058785209e0ca863b37dddcbbf9f2ce103 Mon Sep 17 00:00:00 2001 From: 0ip Date: Mon, 16 Apr 2012 15:19:53 +0200 Subject: [PATCH 09/36] template/pad.html removed id duplicates, moved revision button, converted TABS to spaces --- src/templates/pad.html | 252 ++++++++++++++++++++--------------------- 1 file changed, 125 insertions(+), 127 deletions(-) diff --git a/src/templates/pad.html b/src/templates/pad.html index 08e34fa2..6181b062 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -11,79 +11,77 @@ <% e.begin_block("styles"); %> - - - + + + <% e.end_block(); %>
      - <% e.begin_block("editbarMenuLeft"); %> -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    • -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    • - -
      • -
    • -
    • - -
      • -
    • - -
      • -
    • -
    • - -
      • - <% e.end_block(); %> + <% e.begin_block("editbarMenuLeft"); %> +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • +
    • + +
      • +
    • + +
      • +
    • +
    • + +
      • + <% e.end_block(); %>
      - <% e.begin_block("editbarMenuRight"); %> -
    • - -
      -       -
      • - - - -
    • - -
    • - - 1 -
      • - <% e.end_block(); %> + <% e.begin_block("editbarMenuRight"); %> + + + + +
    • + +
    • + + 1 +
      • + <% e.end_block(); %>
    @@ -226,76 +224,76 @@
    <% e.begin_block("modals"); %> -
    -
    -
    Connecting...
    -
    Reestablishing connection...
    -
    -

    Disconnected.

    -

    Opened in another window.

    -

    No Authorization.

    -
    -

    We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

    -
    -
    -

    We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

    -
    -
    -

    You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

    -
    -
    -

    Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

    -
    -
    -

    Server not responding. This may be due to network connectivity issues or high load on the server.

    -
    -
    -

    Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

    -
    -
    -

    This pad was deleted.

    -
    -
    -

    If this continues to happen, please let us know

    -
    -
    - -
    +
    +
    +
    Connecting...
    +
    Reestablishing connection...
    +
    +

    Disconnected.

    +

    Opened in another window.

    +

    No Authorization.

    +
    +

    We're having trouble talking to the EtherPad lite synchronization server. You may be connecting through an incompatible firewall or proxy server.

    +
    +
    +

    We were unable to connect to the EtherPad lite synchronization server. This may be due to an incompatibility with your web browser or internet connection.

    +
    +
    +

    You seem to have opened this pad in another browser window. If you'd like to use this window instead, you can reconnect.

    +
    +
    +

    Lost connection with the EtherPad lite synchronization server. This may be due to a loss of network connectivity.

    +
    +
    +

    Server not responding. This may be due to network connectivity issues or high load on the server.

    +
    +
    +

    Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.

    +
    +
    +

    This pad was deleted.

    +
    +
    +

    If this continues to happen, please let us know

    +
    +
    +
    -
    + +
    <% e.end_block(); %>
    <% e.begin_block("scripts"); %> - - - - - + + + + + /* TODO: These globals shouldn't exist. */ + pad = require('ep_etherpad-lite/static/js/pad').pad; + chat = require('ep_etherpad-lite/static/js/chat').chat; + padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar; + padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp; + }()); + <% e.end_block(); %> From d75aeeaf8f6d66a8d539956e0ecfe52fc36cb205 Mon Sep 17 00:00:00 2001 From: 0ip Date: Mon, 16 Apr 2012 15:23:19 +0200 Subject: [PATCH 10/36] pad_editbar adapated hacky highlighting of currently opened module to recent changes --- src/static/js/pad_editbar.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 95d19505..dec32b46 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -182,7 +182,7 @@ var padeditbar = (function() //hide all modules if(moduleName == "none") { - $("#editbar ul#menu_right > li").removeClass("selected"); + $(".toolbar ul.menu_right li").removeClass("selected"); for(var i=0;i 0 && nth_child <= (modules.length-1)) { - $("#editbar ul#menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected"); - $("#editbar ul#menu_right li:nth-child(" + nth_child + ")").toggleClass("selected"); - } - if(modules[modules.length-1] === moduleName) $("#editbar ul#menu_right li").removeClass("selected"); + if (nth_child > 0 && nth_child <= (modules.length-1)) { + $(".toolbar ul.menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected"); + $(".toolbar ul.menu_right li:nth-child(" + nth_child + ")").toggleClass("selected"); + } + if(modules[modules.length-1] === moduleName) $(".toolbar ul.menu_right li").removeClass("selected"); //hide all modules that are not selected and show the selected one for(var i=0;i Date: Mon, 9 Apr 2012 16:22:09 +0200 Subject: [PATCH 11/36] Bugfix for this being wrong in editorInfo.ace_performDocumentApplyAttributesToRange --- src/static/js/ace2_inner.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index b61c50e3..6e5f07bc 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -5401,7 +5401,9 @@ function Ace2Inner(){ // Init documentAttributeManager documentAttributeManager = new AttributeManager(rep, performDocumentApplyChangeset); - editorInfo.ace_performDocumentApplyAttributesToRange = documentAttributeManager.setAttributesOnRange; + editorInfo.ace_performDocumentApplyAttributesToRange = function () { + return documentAttributeManager.setAttributesOnRange.apply(documentAttributeManager, arguments); + }; $(document).ready(function(){ doc = document; // defined as a var in scope outside From 6f774bc6a567211a8a7157458c249d89a145c3ab Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 11 Apr 2012 18:07:19 +0200 Subject: [PATCH 12/36] Separated out the code for the plugin manager --- src/static/js/admin/plugins.js | 87 ++++++++++++++++++++++++++++++ src/templates/admin/plugins.html | 90 +------------------------------- 2 files changed, 88 insertions(+), 89 deletions(-) create mode 100644 src/static/js/admin/plugins.js diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js new file mode 100644 index 00000000..4ed8a6c6 --- /dev/null +++ b/src/static/js/admin/plugins.js @@ -0,0 +1,87 @@ +$(document).ready(function () { + var socket = io.connect().of("/pluginfw/installer"); + + var doUpdate = false; + + function updateHandlers() { + $("#progress.dialog .close").unbind('click').click(function () { + $("#progress.dialog").hide(); + }); + + $("#do-search").unbind('click').click(function () { + if ($("#search-query")[0].value != "") + socket.emit("search", $("#search-query")[0].value); + }); + + $(".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()); + }); + } + + updateHandlers(); + + socket.on('progress', function (data) { + $("#progress.dialog .close").hide(); + $("#progress.dialog").show(); + var message = "Unknown status"; + if (data.message) { + message = "" + data.message.toString() + ""; + } + if (data.error) { + message = "" + data.error.toString() + ""; + } + $("#progress.dialog .message").html(message); + $("#progress.dialog .history").append("
    " + message + "
    "); + + 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) { + $("#search-results *").remove(); + for (plugin_name in data.results) { + var plugin = data.results[plugin_name]; + var row = $("#search-result-template").clone(); + + for (attr in plugin) { + row.find("." + attr).html(plugin[attr]); + } + $("#search-results").append(row); + } + updateHandlers(); + }); + + socket.on('installed-results', function (data) { + $("#installed-plugins *").remove(); + for (plugin_name in data.results) { + 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"); + +}); diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 6f38d048..82bad555 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -4,95 +4,7 @@ - +
    From 7ab7ee9f5ee1caedbf1ca5ac10934a269ecde8f6 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Tue, 17 Apr 2012 22:18:43 +0200 Subject: [PATCH 13/36] Plugin admin fixes --- src/static/js/admin/plugins.js | 27 +++++++++++--- src/static/js/pluginfw/installer.js | 15 +++++--- src/templates/admin/plugins.html | 56 ++++++++++++++++------------- 3 files changed, 64 insertions(+), 34 deletions(-) diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index 4ed8a6c6..7f6c17b0 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -9,8 +9,10 @@ $(document).ready(function () { }); $("#do-search").unbind('click').click(function () { - if ($("#search-query")[0].value != "") - socket.emit("search", $("#search-query")[0].value); + socket.emit("search", { + pattern: $("#search-query")[0].value, + offset: $('#search-results').data('offset') || 0, + limit: 4}); }); $(".do-install").unbind('click').click(function (e) { @@ -29,8 +31,13 @@ $(document).ready(function () { updateHandlers(); socket.on('progress', function (data) { + if ($('#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 = "" + data.message.toString() + ""; @@ -55,16 +62,26 @@ $(document).ready(function () { }); socket.on('search-result', function (data) { - $("#search-results *").remove(); + var widget=$(".search-results"); + + widget.data('query', data.query); + widget.data('total', data.total); + + widget.find('.offset').html(data.qyery.offset); + widget.find('.limit').html(data.qyery.offset + data.qyery.offset.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 = $("#search-result-template").clone(); + var row = widget.find(".template tr").clone(); for (attr in plugin) { row.find("." + attr).html(plugin[attr]); } - $("#search-results").append(row); + widget.find(".results").append(row); } + updateHandlers(); }); diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js index 127a95aa..09bde920 100644 --- a/src/static/js/pluginfw/installer.js +++ b/src/static/js/pluginfw/installer.js @@ -55,7 +55,7 @@ exports.install = function(plugin_name, cb) { ); }; -exports.search = function(pattern, cb) { +exports.search = function(query, cb) { withNpm( function (cb) { registry.get( @@ -63,11 +63,18 @@ exports.search = function(pattern, cb) { function (er, data) { if (er) return cb(er); var res = {}; + var i = 0; for (key in data) { - if (key.indexOf(plugins.prefix) == 0 && key.indexOf(pattern) != -1) - res[key] = data[key]; + if (/* && key.indexOf(plugins.prefix) == 0 */ + key.indexOf(query.pattern) != -1) { + i++; + if (i > query.offset + && i <= query.offset + query.limit) { + res[key] = data[key]; + } + } } - cb(null, {results:res}); + cb(null, {results:res, query: query, total:i}); } ); }, diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 82bad555..c1cc645a 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -40,31 +40,37 @@ -

    Search for plugins to install

    -
    - - -
    - - - - - - - - - - - - - - - - - -
    NameDescription
    - -
    +
    +

    Search for plugins to install

    +
    + + +
    + + + + + + + + + + + + + + + + + +
    NameDescription
    + +
    + + .. of . + +
    +

    From d6f476312d7380e29d9995756c32a2b33134ab46 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 18 Apr 2012 10:16:41 +0200 Subject: [PATCH 14/36] Spelling bugfixes --- src/static/js/admin/plugins.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index 7f6c17b0..54454c2b 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -67,8 +67,8 @@ $(document).ready(function () { widget.data('query', data.query); widget.data('total', data.total); - widget.find('.offset').html(data.qyery.offset); - widget.find('.limit').html(data.qyery.offset + data.qyery.offset.limit); + 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(); From 4c1d94343fe1b1a8ff02d7cfaef9f9506676d072 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Wed, 18 Apr 2012 13:43:34 +0200 Subject: [PATCH 15/36] Better plugin admin interface --- src/node/hooks/express/adminplugins.js | 2 +- src/static/js/admin/plugins.js | 38 ++++++++++++++++++++++---- src/static/js/pluginfw/installer.js | 25 +++++++++++++---- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index fa7e7077..1d1320ab 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -27,7 +27,7 @@ exports.socketio = function (hook_name, args, cb) { socket.on("search", function (query) { socket.emit("progress", {progress:0, message:'Fetching results...'}); - installer.search(query, function (progress) { + installer.search(query, true, function (progress) { if (progress.results) socket.emit("search-result", progress); socket.emit("progress", progress); diff --git a/src/static/js/admin/plugins.js b/src/static/js/admin/plugins.js index 54454c2b..6ae085c2 100644 --- a/src/static/js/admin/plugins.js +++ b/src/static/js/admin/plugins.js @@ -1,18 +1,28 @@ $(document).ready(function () { var socket = io.connect().of("/pluginfw/installer"); + $('.search-results').data('query', { + pattern: '', + offset: 0, + limit: 4, + }); + 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 () { - socket.emit("search", { - pattern: $("#search-query")[0].value, - offset: $('#search-results').data('offset') || 0, - limit: 4}); + var query = $('.search-results').data('query'); + query.pattern = $("#search-query")[0].value; + query.offset = 0; + search(); }); $(".do-install").unbind('click').click(function (e) { @@ -26,12 +36,29 @@ $(document).ready(function () { 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 ($('#progress.dialog').data('progress') > data.progress) return; + if (data.progress > 0 && $('#progress.dialog').data('progress') > data.progress) return; $("#progress.dialog .close").hide(); $("#progress.dialog").show(); @@ -100,5 +127,6 @@ $(document).ready(function () { }); socket.emit("load"); + search(); }); diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js index 09bde920..1bb8db9e 100644 --- a/src/static/js/pluginfw/installer.js +++ b/src/static/js/pluginfw/installer.js @@ -55,18 +55,33 @@ exports.install = function(plugin_name, cb) { ); }; -exports.search = function(query, cb) { +exports.searchCache = null; + +exports.search = function(query, cache, cb) { withNpm( function (cb) { - registry.get( - "/-/all", null, 600, false, true, + var getData = function (cb) { + if (cache && exports.searchCache) { + cb(null, exports.searchCache); + } else { + registry.get( + "/-/all", null, 600, false, true, + function (er, data) { + if (er) return cb(er); + exports.searchCache = data; + cb(er, data); + } + ); + } + } + getData( function (er, data) { if (er) return cb(er); var res = {}; var i = 0; for (key in data) { - if (/* && key.indexOf(plugins.prefix) == 0 */ - key.indexOf(query.pattern) != -1) { + if ( key.indexOf(plugins.prefix) == 0 + && key.indexOf(query.pattern) != -1) { i++; if (i > query.offset && i <= query.offset + query.limit) { From da75b87d3c90ecd27dfe9d1f8b583e9db38de7a7 Mon Sep 17 00:00:00 2001 From: Martyn York Date: Wed, 18 Apr 2012 14:44:25 -0700 Subject: [PATCH 16/36] added new hook 'acePostWriteDomLineHTML' which gets called after a domline is created and has been added to the page. Also fixed problems with ReferenceExceptions due to require-kernel not being sent to the iframe. --- src/static/js/ace.js | 8 +++++++- src/static/js/domline.js | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/static/js/ace.js b/src/static/js/ace.js index 6ea2938b..85801d33 100644 --- a/src/static/js/ace.js +++ b/src/static/js/ace.js @@ -167,7 +167,13 @@ require.setGlobalKeyPath("require");\n\ buffer.push(Ace2Editor.EMBEDED[KERNEL_SOURCE]); buffer.push(KERNEL_BOOT); buffer.push('<\/script>'); - } + } else { + file = KERNEL_SOURCE; + buffer.push(' - - - - -
    - - <% if (errors.length) { %> -
    - <% errors.forEach(function (item) { %> -
    <%= item.toString() %>
    - <% }) %> -
    - <% } %> - - -

    Installed plugins

    - - - - - - - - - - - - - - - - - -
    NameDescription
    - -
    - -
    -

    Search for plugins to install

    -
    - - -
    - - - - - - - - - - - - - - - - - -
    NameDescription
    - -
    - - .. of . - -
    - - -
    -

    - Please wait: - -

    -
    -
    -
    - - + + + Plugin manager + + + + + + +
    + + <% if (errors.length) { %> +
    + <% errors.forEach(function (item) { %> +
    <%= item.toString() %>
    + <% }) %> +
    + <% } %> + + +

    Etherpad Lite

    +
    +

    Installed plugins

    + + + + + + + + + + + + + + + + + +
    NameDescription
    + +
    + +
    +
    +

    Search for plugins to install

    +
    + + +
    + + + + + + + + + + + + + + + + + +
    NameDescription
    + +
    + + .. of . + +
    + +
    +

    + Please wait: + +

    +
    +
    +
    + + From 31909f6e60b699710f6a08c0ef593b1b3982b22e Mon Sep 17 00:00:00 2001 From: 0ip Date: Thu, 19 Apr 2012 17:04:44 +0200 Subject: [PATCH 22/36] Added viewport --- src/templates/admin/plugins.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 2f98e019..6e9b4d2e 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -1,6 +1,7 @@ Plugin manager + From a743112170615a14f4e4e27822a54dc3ec491a6b Mon Sep 17 00:00:00 2001 From: 0ip Date: Thu, 19 Apr 2012 19:44:44 +0300 Subject: [PATCH 23/36] Fix #626, Plugins don't work if pad is on a subdir --- src/static/js/pluginfw/plugins.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index e6cb5190..b66af58a 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -90,7 +90,7 @@ if (exports.isClient) { // which appears to fix the issue. var callback = function () {setTimeout(cb, 0);}; - jQuery.getJSON('/pluginfw/plugin-definitions.json', function(data) { + jQuery.getJSON('../pluginfw/plugin-definitions.json', function(data) { exports.plugins = data.plugins; exports.parts = data.parts; exports.hooks = exports.extractHooks(exports.parts, "client_hooks"); From 72c972b256098eac0a0fdcf04afc32da40988207 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 20 Apr 2012 14:37:53 +0200 Subject: [PATCH 24/36] Bugfix for recursive dependency-installation and paths --- src/node/eejs/index.js | 27 ++++++++++++++++++++++----- src/static/js/pluginfw/plugins.js | 27 ++++++++++++++++++++------- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/src/node/eejs/index.js b/src/node/eejs/index.js index 90c69e59..2fc44168 100644 --- a/src/node/eejs/index.js +++ b/src/node/eejs/index.js @@ -23,6 +23,7 @@ var ejs = require("ejs"); var fs = require("fs"); var path = require("path"); var hooks = require("ep_etherpad-lite/static/js/pluginfw/hooks.js"); +var resolve = require("resolve"); exports.info = { buf_stack: [], @@ -91,13 +92,29 @@ exports.inherit = function (name, args) { exports.info.file_stack[exports.info.file_stack.length-1].inherit.push({name:name, args:args}); } -exports.require = function (name, args) { +exports.require = function (name, args, mod) { if (args == undefined) args = {}; - - if ((name.indexOf("./") == 0 || name.indexOf("../") == 0) && exports.info.file_stack.length) { - name = path.join(path.dirname(exports.info.file_stack[exports.info.file_stack.length-1].path), name); + + var basedir = __dirname; + var paths = []; + + if (exports.info.file_stack.length) { + basedir = path.dirname(exports.info.file_stack[exports.info.file_stack.length-1].path); } - var ejspath = require.resolve(name) + if (mod) { + basedir = path.dirname(mod.filename); + paths = mod.paths; + } + + console.log(["looking up", name, "in", basedir, paths, mod]); + var ejspath = resolve.sync( + name, + { + paths : paths, + basedir : basedir, + extensions : [ '.html', '.ejs' ], + } + ) args.e = exports; args.require = require; diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index e6cb5190..f33b9a12 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -61,7 +61,7 @@ exports.loadFn = function (path, hookName) { return fn; }; -exports.extractHooks = function (parts, hook_set_name) { +exports.extractHooks = function (parts, hook_set_name, plugins) { var hooks = {}; _.each(parts,function (part) { _.chain(part[hook_set_name] || {}) @@ -69,14 +69,27 @@ exports.extractHooks = function (parts, hook_set_name) { .each(function (hook_name) { if (hooks[hook_name] === undefined) hooks[hook_name] = []; - var hook_fn_name = part[hook_set_name][hook_name]; - var hook_fn = exports.loadFn(hook_fn_name, hook_name); + + /* On the server side, you can't just + * require("pluginname/whatever") if the plugin is installed as + * a dependency of another plugin! Bah, pesky little details of + * npm... */ + if (!exports.isClient) { + hook_fn_name = path.normalize(path.join(path.dirname(exports.plugins[part.plugin].package.path), hook_fn_name)); + } + + try { + var hook_fn = exports.loadFn(hook_fn_name, hook_name); + if (!hook_fn) { + throw "Not a function"; + } + } catch (exc) { + console.error("Failed to load '" + hook_fn_name + "' for '" + part.full_name + "/" + hook_set_name + "/" + hook_name + "': " + exc.toString()) + } if (hook_fn) { hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part}); - } else { - console.error("Unable to load hook function for " + part.full_name + " for hook " + hook_name + ": " + part.hooks[hook_name]); - } + } }); }); return hooks; @@ -139,7 +152,7 @@ exports.update = function (cb) { if (err) cb(err); exports.plugins = plugins; exports.parts = exports.sortParts(parts); - exports.hooks = exports.extractHooks(exports.parts, "hooks"); + exports.hooks = exports.extractHooks(exports.parts, "hooks"); exports.loaded = true; exports.callInit(cb); } From 9a67a3a1db07efec03638477aef24daf969b6752 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Fri, 20 Apr 2012 15:08:50 +0200 Subject: [PATCH 25/36] Removed debug print --- src/node/eejs/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/node/eejs/index.js b/src/node/eejs/index.js index 2fc44168..2d02a45a 100644 --- a/src/node/eejs/index.js +++ b/src/node/eejs/index.js @@ -106,7 +106,6 @@ exports.require = function (name, args, mod) { paths = mod.paths; } - console.log(["looking up", name, "in", basedir, paths, mod]); var ejspath = resolve.sync( name, { From 16edda7d46ffbe277d505e71f54cda1da2f00452 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 21 Apr 2012 00:16:10 +0200 Subject: [PATCH 26/36] luke warm fix. --- src/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index eda385b2..16076e1d 100644 --- a/src/package.json +++ b/src/package.json @@ -29,7 +29,8 @@ "graceful-fs" : "1.1.5", "slide" : "1.1.3", "semver" : "1.0.13", - "underscore" : "1.3.1" + "underscore" : "1.3.1", + "resolve" : "0.2.1" }, "devDependencies": { "jshint" : "*" From d08f3ff5ee5bf688131d1b40694eedb718e3d2c8 Mon Sep 17 00:00:00 2001 From: Egil Moeller Date: Sat, 21 Apr 2012 01:17:27 +0200 Subject: [PATCH 27/36] Bugfix dependencies --- src/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/package.json b/src/package.json index eda385b2..ac56bc35 100644 --- a/src/package.json +++ b/src/package.json @@ -13,6 +13,7 @@ "yajsml" : "1.1.2", "request" : "2.9.100", "require-kernel" : "1.0.5", + "resolve" : "0.2.1", "socket.io" : "0.8.7", "ueberDB" : "0.1.7", "async" : "0.1.18", From d554420f573af28d91f036f56950fe031d330bb9 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 21 Apr 2012 01:23:13 +0200 Subject: [PATCH 28/36] Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing) --- src/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/package.json b/src/package.json index 19725e7d..ac56bc35 100644 --- a/src/package.json +++ b/src/package.json @@ -30,8 +30,7 @@ "graceful-fs" : "1.1.5", "slide" : "1.1.3", "semver" : "1.0.13", - "underscore" : "1.3.1", - "resolve" : "0.2.1" + "underscore" : "1.3.1" }, "devDependencies": { "jshint" : "*" From 513deef76880e3b59ad9bcbaf9cdd7c5dfb036c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Bartelme=C3=9F?= Date: Wed, 25 Apr 2012 10:23:58 +0200 Subject: [PATCH 29/36] added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670 --- src/static/js/pad.js | 5 +++-- src/static/js/pluginfw/plugins.js | 3 ++- src/static/js/timeslider.js | 5 +++-- src/templates/pad.html | 12 +++++++++--- src/templates/timeslider.html | 24 ++++++++++++++++-------- 5 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/static/js/pad.js b/src/static/js/pad.js index 3a1c1633..9db1c5b9 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -203,7 +203,8 @@ function handshake() //create the url var url = loc.protocol + "//" + loc.hostname + ":" + port + "/"; //find out in which subfolder we are - var resource = loc.pathname.substr(1, loc.pathname.indexOf("/p/")) + "socket.io"; + var resource = exports.baseURL + "socket.io"; + //connect socket = pad.socket = io.connect(url, { resource: resource, @@ -1029,7 +1030,7 @@ var settings = { }; pad.settings = settings; - +exports.baseURL = ''; exports.settings = settings; exports.createCookie = createCookie; exports.readCookie = readCookie; diff --git a/src/static/js/pluginfw/plugins.js b/src/static/js/pluginfw/plugins.js index a3a8a8df..1f66da41 100644 --- a/src/static/js/pluginfw/plugins.js +++ b/src/static/js/pluginfw/plugins.js @@ -24,6 +24,7 @@ exports.loaded = false; exports.plugins = {}; exports.parts = []; exports.hooks = {}; +exports.baseURL = ''; exports.ensure = function (cb) { if (!exports.loaded) @@ -103,7 +104,7 @@ if (exports.isClient) { // which appears to fix the issue. var callback = function () {setTimeout(cb, 0);}; - jQuery.getJSON('../pluginfw/plugin-definitions.json', function(data) { + jQuery.getJSON(exports.baseURL + 'pluginfw/plugin-definitions.json', function(data) { exports.plugins = data.plugins; exports.parts = data.parts; exports.hooks = exports.extractHooks(exports.parts, "client_hooks"); diff --git a/src/static/js/timeslider.js b/src/static/js/timeslider.js index 438b1695..6c91423b 100644 --- a/src/static/js/timeslider.js +++ b/src/static/js/timeslider.js @@ -60,8 +60,8 @@ function init() { //create the url var url = loc.protocol + "//" + loc.hostname + ":" + port + "/"; //find out in which subfolder we are - var resource = loc.pathname.substr(1,loc.pathname.indexOf("/p/")) + "socket.io"; - + var resource = exports.baseURL + 'socket.io'; + //build up the socket io connection socket = io.connect(url, {resource: resource}); @@ -153,4 +153,5 @@ function handleClientVars(message) } } +exports.baseURL = ''; exports.init = init; diff --git a/src/templates/pad.html b/src/templates/pad.html index 6181b062..3eced909 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -279,13 +279,19 @@ document.domain = document.domain; var clientVars = {}; (function () { - require.setRootURI("../javascripts/src"); - require.setLibraryURI("../javascripts/lib"); + + var baseURL = '../'; + + require.setRootURI(baseURL + "javascripts/src"); + require.setLibraryURI(baseURL + "javascripts/lib"); require.setGlobalKeyPath("require"); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); + plugins.baseURL = baseURL; plugins.update(function () { - require('ep_etherpad-lite/static/js/pad').init(); + var pad = require('ep_etherpad-lite/static/js/pad'); + pad.baseURL = baseURL; + pad.init(); }); /* TODO: These globals shouldn't exist. */ diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index ca4bc6e9..5db11b8f 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -123,22 +123,30 @@

    - - - - - + + + + + + - - + + + +
    @@ -20,7 +20,7 @@

    Etherpad Lite

    -
    +

    Installed plugins

    @@ -44,7 +44,7 @@
    -
    +

    Search for plugins to install

    From 4b272fe2e1824665d4772db2b28e75995c3bb0ec Mon Sep 17 00:00:00 2001 From: 0ip Date: Sun, 29 Apr 2012 01:00:31 +0200 Subject: [PATCH 31/36] Tidied up highlighting for currently opened module --- src/static/css/pad.css | 2 +- src/static/js/pad_editbar.js | 19 ++++++++----------- src/templates/pad.html | 2 +- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/static/css/pad.css b/src/static/css/pad.css index 2ce8dbb6..31d74c87 100644 --- a/src/static/css/pad.css +++ b/src/static/css/pad.css @@ -1402,7 +1402,7 @@ input[type=checkbox] { float: left; width: 50%; } -#settingsmenu, +#settings, #importexport, #embed { position: absolute; diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index dec32b46..cede9f37 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -119,7 +119,7 @@ var padeditbar = (function() } else if (cmd == 'settings') { - self.toogleDropDown("settingsmenu"); + self.toogleDropDown("settings"); } else if (cmd == 'embed') { @@ -177,12 +177,11 @@ var padeditbar = (function() }, toogleDropDown: function(moduleName) { - var modules = ["settingsmenu", "importexport", "embed", "users"]; + var modules = ["settings", "importexport", "embed", "users"]; - //hide all modules + // hide all modules and remove highlighting of all buttons if(moduleName == "none") { - $(".toolbar ul.menu_right li").removeClass("selected"); for(var i=0;i 0 && nth_child <= (modules.length-1)) { - $(".toolbar ul.menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected"); - $(".toolbar ul.menu_right li:nth-child(" + nth_child + ")").toggleClass("selected"); - } - if(modules[modules.length-1] === moduleName) $(".toolbar ul.menu_right li").removeClass("selected"); - //hide all modules that are not selected and show the selected one + // hide all modules that are not selected and remove highlighting + // respectively add highlighting to the corresponding button for(var i=0;iLoading...
    -