" + message + "
");
+
+ $("#progress .message").html(message);
if (data.progress >= 1) {
+ $("#progress").hide();
+
if (data.error) {
- $("#progress.dialog .close").show();
- } else {
+ alert('An error occurred: '+data.error+' -- the server log might know more...');
+ }else {
if (doUpdate) {
doUpdate = false;
socket.emit("load");
}
- $("#progress.dialog").hide();
}
}
});
@@ -114,7 +110,11 @@ $(document).ready(function () {
widget.data('total', data.total);
widget.find('.offset').html(data.query.offset);
- widget.find('.limit').html(data.query.offset + data.query.limit);
+ if (data.query.offset + data.query.limit > data.total){
+ widget.find('.limit').html(data.total);
+ }else{
+ widget.find('.limit').html(data.query.offset + data.query.limit);
+ }
widget.find('.total').html(data.total);
widget.find(".results *").remove();
@@ -124,9 +124,12 @@ $(document).ready(function () {
var version = '0.0.0';
// hack to access "versions" property of the npm package object
for (version in data.results[plugin_name].versions) break;
-
for (attr in plugin) {
- row.find("." + attr).html(plugin[attr]);
+ if(attr == "name"){ // Hack to rewrite URLS into name
+ row.find(".name").html(""+plugin[attr]+"");
+ }else{
+ row.find("." + attr).html(plugin[attr]);
+ }
}
row.find(".version").html(version);
@@ -144,7 +147,11 @@ $(document).ready(function () {
var row = $("#installed-plugin-template").clone();
for (attr in plugin.package) {
- row.find("." + attr).html(plugin.package[attr]);
+ if(attr == "name"){ // Hack to rewrite URLS into name
+ row.find(".name").html(""+plugin.package[attr]+"");
+ }else{
+ row.find("." + attr).html(plugin.package[attr]);
+ }
}
$("#installed-plugins").append(row);
}
diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js
index d4fbef81c..83483537f 100644
--- a/src/static/js/broadcast_slider.js
+++ b/src/static/js/broadcast_slider.js
@@ -361,7 +361,11 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
$(self).css('left', newloc);
// if(getSliderPosition() != Math.floor(newloc * sliderLength / ($("#ui-slider-bar").width()-2)))
setSliderPosition(Math.floor(newloc * sliderLength / ($("#ui-slider-bar").width() - 2)))
- self.currentLoc = parseInt($(self).css('left'));
+ if(parseInt($(self).css('left')) < 2){
+ $(self).css('left', '2px');
+ }else{
+ self.currentLoc = parseInt($(self).css('left'));
+ }
});
})
diff --git a/src/static/js/html10n.js b/src/static/js/html10n.js
index b2c4e6195..d0d14814b 100644
--- a/src/static/js/html10n.js
+++ b/src/static/js/html10n.js
@@ -21,6 +21,8 @@
* IN THE SOFTWARE.
*/
window.html10n = (function(window, document, undefined) {
+
+ // fix console
var console = window.console
function interceptConsole(method){
if (!console) return function() {}
@@ -44,6 +46,39 @@ window.html10n = (function(window, document, undefined) {
, consoleError = interceptConsole('warn')
+ // fix Array.prototype.instanceOf in, guess what, IE! <3
+ if (!Array.prototype.indexOf) {
+ Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
+ "use strict";
+ if (this == null) {
+ throw new TypeError();
+ }
+ var t = Object(this);
+ var len = t.length >>> 0;
+ if (len === 0) {
+ return -1;
+ }
+ var n = 0;
+ if (arguments.length > 1) {
+ n = Number(arguments[1]);
+ if (n != n) { // shortcut for verifying if it's NaN
+ n = 0;
+ } else if (n != 0 && n != Infinity && n != -Infinity) {
+ n = (n > 0 || -1) * Math.floor(Math.abs(n));
+ }
+ }
+ if (n >= len) {
+ return -1;
+ }
+ var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0);
+ for (; k < len; k++) {
+ if (k in t && t[k] === searchElement) {
+ return k;
+ }
+ }
+ return -1;
+ }
+ }
/**
* MicroEvent - to make any js object an event emitter (server or browser)
diff --git a/src/static/js/pluginfw/installer.js b/src/static/js/pluginfw/installer.js
index e491f0771..eb10f8afd 100644
--- a/src/static/js/pluginfw/installer.js
+++ b/src/static/js/pluginfw/installer.js
@@ -15,7 +15,10 @@ var withNpm = function (npmfn, final, cb) {
cb({progress: 0.5, message:message.msg + ": " + message.pref});
});
npmfn(function (er, data) {
- if (er) return cb({progress:1, error:er.code + ": " + er.path});
+ if (er) {
+ console.error(er);
+ return cb({progress:1, error: er.message});
+ }
if (!data) data = {};
data.progress = 1;
data.message = "Done.";
diff --git a/src/templates/admin/index.html b/src/templates/admin/index.html
index 5f1d0188e..16ea84279 100644
--- a/src/templates/admin/index.html
+++ b/src/templates/admin/index.html
@@ -1,6 +1,6 @@
-
- Plugin information
+ Plugin information - Etherpad lite
Plugin manager
+ Plugin manager - Etherpad lite
@@ -18,12 +18,16 @@
<% } %>
+
- Etherpad Lite Admin Dashboard
- - + diff --git a/src/templates/admin/plugins-info.html b/src/templates/admin/plugins-info.html index 94f94e2ac..605b23d38 100644 --- a/src/templates/admin/plugins-info.html +++ b/src/templates/admin/plugins-info.html @@ -4,27 +4,36 @@ -
-
+
diff --git a/src/templates/admin/plugins.html b/src/templates/admin/plugins.html
index 394cf0e06..a85db557a 100644
--- a/src/templates/admin/plugins.html
+++ b/src/templates/admin/plugins.html
@@ -1,6 +1,6 @@
- Etherpad Lite
- + -Installed plugins
-<%- plugins.formatPlugins().replace(", ","\n") %>
+
-
Installed parts
-<%= plugins.formatParts() %>+
Installed plugins
+<%- plugins.formatPlugins().replace(", ","\n") %>
- Installed hooks
-Server side hooks
-<%- plugins.formatHooks() %>
+ Installed parts
+<%= plugins.formatParts() %>-
Client side hooks
-<%- plugins.formatHooks("client_hooks") %>
+ Installed hooks
+Server side hooks
+<%- plugins.formatHooks() %>
+
+ Client side hooks
+<%- plugins.formatHooks("client_hooks") %>
+
+ 