diff --git a/customize.dist/ckeditor-config.js b/customize.dist/ckeditor-config.js index e1b93791d..d51e5d766 100644 --- a/customize.dist/ckeditor-config.js +++ b/customize.dist/ckeditor-config.js @@ -1,4 +1,4 @@ -CKEDITOR.editorConfig = function( config ) { +CKEDITOR.editorConfig = function( config ) { // jshint ignore:line var fixThings = false; // https://dev.ckeditor.com/ticket/10907 config.needsBrFiller= fixThings; diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js index 13ee42615..d9f6a8544 100644 --- a/customize.dist/translations/messages.es.js +++ b/customize.dist/translations/messages.es.js @@ -12,7 +12,7 @@ define(function () { out.type.poll = 'Encuesta'; out.type.slide = 'Presentación'; - out.common_connectionLost = 'Conexión perdida con el servidor'; + out.common_connectionLost = "Connexión perdida
El documento está ahora en modo solo lectura hasta que la conexión vuelva."; out.disconnected = "Desconectado"; out.synchronizing = "Sincronización"; @@ -164,7 +164,6 @@ define(function () { out.header_support = ' OpenPaaS-ng'; out.header_logoTitle = 'Ir a la página principal'; - out.updated_common_connectionLostAndInfo = "Connexión perdida
El documento está ahora en modo solo lectura hasta que la conexión vuelva."; out.websocketError = "Error al conectarse al servidor WebSocket"; out.typeError = "Este documento no es compatible con la applicación seleccionada"; out.onLogout = "Tu sesión está cerrada, haz clic aquí para iniciar sesión
o apreta sobre Escape para acceder al documento en modo solo lectura."; diff --git a/www/poll/old/index.html b/www/poll/old/index.html deleted file mode 100644 index 01b6f6b76..000000000 --- a/www/poll/old/index.html +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - Zero Knowledge Date Picker - - - - - - - - -
- -
-
-

CryptPoll

-

- -

-

- -
-
- -
-
- - -

- - - - - - - - - - - - - - - - - - - -
-
-
-
-
-
- - - diff --git a/www/poll/old/main.js b/www/poll/old/main.js deleted file mode 100644 index 2703530c7..000000000 --- a/www/poll/old/main.js +++ /dev/null @@ -1,942 +0,0 @@ -define([ - '/api/config?cb=' + Math.random().toString(16).substring(2), - '/customize/messages.js?app=poll', - 'table.js', - 'wizard.js', - '/bower_components/textpatcher/TextPatcher.js', - '/bower_components/chainpad-listmap/chainpad-listmap.js', - '/bower_components/chainpad-crypto/crypto.js', - '/common/cryptpad-common.js', - '/common/visible.js', - '/common/notify.js', - '/bower_components/file-saver/FileSaver.min.js', - '/bower_components/jquery/dist/jquery.min.js', -], function (Config, Messages, Table, Wizard, TextPatcher, Listmap, Crypto, Cryptpad, Visible, Notify) { - var $ = window.jQuery; - var saveAs = window.saveAs; - - Cryptpad.styleAlerts(); - console.log("Initializing your realtime session..."); - - /* TODO - * set range of dates/times - * (pair of date pickers) - * hide options within that range - * show hidden options - * add notes to a particular time slot - - * check or uncheck options for a particular user - * mark preference level? (+1, 0, -1) - - * delete/hide columns/rows - - // let users choose what they want the default input to be... - - * date - - http://foxrunsoftware.github.io/DatePicker/ ? - * ??? - */ - - var secret = Cryptpad.getSecrets(); - var readOnly = secret.keys && !secret.keys.editKeyStr; - if (!secret.keys) { - secret.keys = secret.key; - } - if (readOnly) { - $('#mainTitle').html($('#mainTitle').html() + ' - ' + Messages.readonly); - $('#adduser, #addoption, #howToUse').remove(); - } - - var module = window.APP = { - Cryptpad: Cryptpad, - }; - - module.getResults = function () { - if (!module.ready) { return []; } - var table = module.rt.proxy.table; - var cells = table.cells; - var rows = table.rows; - - return Object.keys(rows).map(function (id) { - var text = rows[id]; - var count = Object.keys(cells).filter(function (c) { - return c.indexOf(id) !== -1 && cells[c]; - }).length; - return { - text: text, - count: count, - }; - }).sort(function (a,b) { - return b.count - a.count; - }); - }; - - var getLastName = module.getLastName = function (cb) { - Cryptpad.getAttribute('username', function (err, userName) { - cb(err, userName || ''); - }); - }; - - var setName = module.setName = function (uname, cb) { - if (typeof(uname) !== 'string') { - return void cb(new Error('expected string')); - } - uname = Cryptpad.fixHTML(uname.trim()).slice(0, 32); - Cryptpad.setAttribute('username', uname, function (err, data) { - if (err) { return void cb(err); } - cb(void 0, uname); - }); - }; - - module.Wizard = Wizard; - - // special UI elements - var $title = $('#title').attr('placeholder', Messages.poll_titleHint || 'title'); - var $description = $('#description').attr('placeholder', Messages.poll_descriptionHint || 'description'); - - var items = [$title, $description]; - - var Uid = function (prefix, f) { - f = f || function () { - return Number(Math.random() * Number.MAX_SAFE_INTEGER) - .toString(32).replace(/\./g, ''); - }; - return function () { return prefix + '-' + f(); }; - }; - - var xy = function (x, y) { return x + '_' + y; }; - var parseXY = function (id) { - var p = id.split('_'); - return { - x: p[0], - y: p[1], - }; - }; - - var Input = function (opt) { return $('', opt); }; - var Checkbox = function (id) { - var p = parseXY(id); - - var proxy = module.rt.proxy; - - var $div = $('
', { - 'class': 'checkbox-contain', - }); - - var $cover = $('', { - 'class': 'cover' - }); - - var $label = $('