" + message + "
");
+
+ $("#progress .message").html(message);
if (data.progress >= 1) {
+ tasks--;
+ if (tasks <= 0) {
+ // Hide the activity indicator once all tasks are done
+ $("#progress").hide();
+ tasks = 0;
+ }
+
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");
+ tasks++;
}
- $("#progress.dialog").hide();
}
}
});
@@ -114,21 +117,26 @@ $(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();
for (plugin_name in data.results) {
var plugin = data.results[plugin_name];
var row = widget.find(".template tr").clone();
- 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);
+ row.find(".version").html( data.results[plugin_name]['dist-tags'].latest );
widget.find(".results").append(row);
}
@@ -138,20 +146,42 @@ $(document).ready(function () {
socket.on('installed-results', function (data) {
$("#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]);
+ 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);
}
updateHandlers();
+
+ socket.emit('checkUpdates');
+ tasks++;
});
+
+ socket.on('updatable', function(data) {
+ $('#installed-plugins>tr').each(function(i,tr) {
+ var pluginName = $(tr).find('.name').text()
+
+ if (data.updatable.indexOf(pluginName) >= 0) {
+ var actions = $(tr).find('.actions')
+ actions.append('')
+ actions.css('width', 200)
+ }
+ })
+ updateHandlers();
+ })
socket.emit("load");
+ tasks++;
+
search();
-
});
diff --git a/src/static/js/broadcast_slider.js b/src/static/js/broadcast_slider.js
index d4fbef81..08ac08b5 100644
--- a/src/static/js/broadcast_slider.js
+++ b/src/static/js/broadcast_slider.js
@@ -107,6 +107,7 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
{
newpos = Number(newpos);
if (newpos < 0 || newpos > sliderLength) return;
+ window.location.hash = "#" + newpos;
$("#ui-slider-handle").css('left', newpos * ($("#ui-slider-bar").width() - 2) / (sliderLength * 1.0));
$("a.tlink").map(function()
{
@@ -193,7 +194,12 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
});
if (numAnonymous > 0)
{
- var anonymousAuthorString = numAnonymous + " unnamed author" + (numAnonymous > 1 ? "s" : "")
+ var anonymousAuthorString;
+ if(numAnonymous == 1)
+ anonymousAuthorString = html10n.get("timeslider.unnamedauthor", { num: numAnonymous });
+ else
+ anonymousAuthorString = html10n.get("timeslider.unnamedauthors", { num: numAnonymous });
+
if (numNamed !== 0){
authorsList.append(' + ' + anonymousAuthorString);
} else {
@@ -361,7 +367,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'));
+ }
});
})
@@ -472,6 +482,18 @@ function loadBroadcastSliderJS(fireWhenAllScriptsAreLoaded)
}
$("#timeslider").show();
+
+ var startPos = clientVars.collab_client_vars.rev;
+ if(window.location.hash.length > 1)
+ {
+ var hashRev = Number(window.location.hash.substr(1));
+ if(!isNaN(hashRev))
+ {
+ // this is necessary because of the socket.io-event which loads the changesets
+ setTimeout(function() { setSliderPosition(hashRev); }, 1);
+ }
+ }
+
setSliderLength(clientVars.collab_client_vars.rev);
setSliderPosition(clientVars.collab_client_vars.rev);
diff --git a/src/static/js/chat.js b/src/static/js/chat.js
index 205294a8..2dff2edf 100644
--- a/src/static/js/chat.js
+++ b/src/static/js/chat.js
@@ -1,9 +1,3 @@
-/**
- * This code is mostly from the old Etherpad. Please help us to comment this code.
- * This helps other people to understand this code better and helps them to improve it.
- * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
- */
-
/**
* Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
*
@@ -22,7 +16,6 @@
var padutils = require('./pad_utils').padutils;
var padcookie = require('./pad_cookie').padcookie;
-
var Tinycon = require('tinycon/tinycon');
var chat = (function()
@@ -36,6 +29,7 @@ var chat = (function()
{
$("#chaticon").hide();
$("#chatbox").show();
+ $("#gritter-notice-wrapper").hide();
self.scrollDown();
chatMentions = 0;
Tinycon.setBubble(0);
@@ -62,6 +56,8 @@ var chat = (function()
$("#chatcounter").text("0");
$("#chaticon").show();
$("#chatbox").hide();
+ $.gritter.removeAll();
+ $("#gritter-notice-wrapper").show();
},
scrollDown: function()
{
@@ -122,7 +118,7 @@ var chat = (function()
$("#chattext").append(html);
//should we increment the counter??
- if(increment)
+ if(increment && !isHistoryAdd)
{
var count = Number($("#chatcounter").text());
count++;
@@ -130,17 +126,44 @@ var chat = (function()
// is the users focus already in the chatbox?
var alreadyFocused = $("#chatinput").is(":focus");
+ // does the user already have the chatbox open?
+ var chatOpen = $("#chatbox").is(":visible");
+
$("#chatcounter").text(count);
// chat throb stuff -- Just make it throw for twice as long
- if(wasMentioned && !alreadyFocused && !isHistoryAdd)
+ if(wasMentioned && !alreadyFocused && !isHistoryAdd && !chatOpen)
{ // If the user was mentioned show for twice as long and flash the browser window
- $('#chatthrob').html(""+authorName+"" + ": " + text).show().delay(4000).hide(400);
+ $.gritter.add({
+ // (string | mandatory) the heading of the notification
+ title: authorName,
+ // (string | mandatory) the text inside the notification
+ text: text,
+ // (bool | optional) if you want it to fade out on its own or just sit there
+ sticky: true,
+ // (int | optional) the time you want it to be alive for before fading out
+ time: '2000'
+ });
+
chatMentions++;
Tinycon.setBubble(chatMentions);
}
else
{
- $('#chatthrob').html(""+authorName+"" + ": " + text).show().delay(2000).hide(400);
+ if(!chatOpen){
+ $.gritter.add({
+ // (string | mandatory) the heading of the notification
+ title: authorName,
+ // (string | mandatory) the text inside the notification
+ text: text,
+
+ // (bool | optional) if you want it to fade out on its own or just sit there
+ sticky: false,
+ // (int | optional) the time you want it to be alive for before fading out
+ time: '4000'
+ });
+ Tinycon.setBubble(count);
+
+ }
}
}
// Clear the chat mentions when the user clicks on the chat input box
diff --git a/src/static/js/gritter.js b/src/static/js/gritter.js
new file mode 100644
index 00000000..c32cc758
--- /dev/null
+++ b/src/static/js/gritter.js
@@ -0,0 +1,417 @@
+/*
+ * Gritter for jQuery
+ * http://www.boedesign.com/
+ *
+ * Copyright (c) 2012 Jordan Boesch
+ * Dual licensed under the MIT and GPL licenses.
+ *
+ * Date: February 24, 2012
+ * Version: 1.7.4
+ */
+
+(function($){
+ /**
+ * Set it up as an object under the jQuery namespace
+ */
+ $.gritter = {};
+
+ /**
+ * Set up global options that the user can over-ride
+ */
+ $.gritter.options = {
+ position: '',
+ class_name: '', // could be set to 'gritter-light' to use white notifications
+ fade_in_speed: 'medium', // how fast notifications fade in
+ fade_out_speed: 1000, // how fast the notices fade out
+ time: 6000 // hang on the screen for...
+ }
+
+ /**
+ * Add a gritter notification to the screen
+ * @see Gritter#add();
+ */
+ $.gritter.add = function(params){
+
+ try {
+ return Gritter.add(params || {});
+ } catch(e) {
+
+ var err = 'Gritter Error: ' + e;
+ (typeof(console) != 'undefined' && console.error) ?
+ console.error(err, params) :
+ alert(err);
+
+ }
+
+ }
+
+ /**
+ * Remove a gritter notification from the screen
+ * @see Gritter#removeSpecific();
+ */
+ $.gritter.remove = function(id, params){
+ Gritter.removeSpecific(id, params || {});
+ }
+
+ /**
+ * Remove all notifications
+ * @see Gritter#stop();
+ */
+ $.gritter.removeAll = function(params){
+ Gritter.stop(params || {});
+ }
+
+ /**
+ * Big fat Gritter object
+ * @constructor (not really since its object literal)
+ */
+ var Gritter = {
+
+ // Public - options to over-ride with $.gritter.options in "add"
+ position: '',
+ fade_in_speed: '',
+ fade_out_speed: '',
+ time: '',
+
+ // Private - no touchy the private parts
+ _custom_timer: 0,
+ _item_count: 0,
+ _is_setup: 0,
+ _tpl_close: '',
+ _tpl_title: '[[title]]',
+ _tpl_item: '',
+ _tpl_wrap: '',
+
+ /**
+ * Add a gritter notification to the screen
+ * @param {Object} params The object that contains all the options for drawing the notification
+ * @return {Integer} The specific numeric id to that gritter notification
+ */
+ add: function(params){
+ // Handle straight text
+ if(typeof(params) == 'string'){
+ params = {text:params};
+ }
+
+ // We might have some issues if we don't have a title or text!
+ if(!params.text){
+ throw 'You must supply "text" parameter.';
+ }
+
+ // Check the options and set them once
+ if(!this._is_setup){
+ this._runSetup();
+ }
+
+ // Basics
+ var title = params.title,
+ text = params.text,
+ image = params.image || '',
+ sticky = params.sticky || false,
+ item_class = params.class_name || $.gritter.options.class_name,
+ position = $.gritter.options.position,
+ time_alive = params.time || '';
+
+ this._verifyWrapper();
+
+ this._item_count++;
+ var number = this._item_count,
+ tmp = this._tpl_item;
+
+ // Assign callbacks
+ $(['before_open', 'after_open', 'before_close', 'after_close']).each(function(i, val){
+ Gritter['_' + val + '_' + number] = ($.isFunction(params[val])) ? params[val] : function(){}
+ });
+
+ // Reset
+ this._custom_timer = 0;
+
+ // A custom fade time set
+ if(time_alive){
+ this._custom_timer = time_alive;
+ }
+
+ var image_str = (image != '') ? '
- 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 94f94e2a..605b23d3 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 394cf0e0..a85db557 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") %>
+
+ 