From c11df112e813a28387f6021aaf453fefda05d994 Mon Sep 17 00:00:00 2001 From: 0ip Date: Sat, 28 Apr 2012 22:00:15 +0200 Subject: [PATCH 1/3] templates/plugins.html Fixed relative paths --- src/templates/admin/plugins.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html index 6e9b4d2e8..0f3a5feb6 100644 --- a/src/templates/admin/plugins.html +++ b/src/templates/admin/plugins.html @@ -2,10 +2,10 @@ Plugin manager - - - - + + + +
@@ -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 2/3] 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 2ce8dbb66..31d74c872 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 dec32b466..cede9f37c 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...
-