From 7a05462eb3ff312b57b1955478f9170c66c6c366 Mon Sep 17 00:00:00 2001 From: Pierre Bondoerffer Date: Fri, 14 Apr 2017 19:34:58 +0200 Subject: [PATCH] Some more poll changes <3 --- customize.dist/translations/messages.es.js | 5 +++++ customize.dist/translations/messages.js | 5 +++++ www/poll/main.js | 6 +++--- www/poll/poll.css | 17 ++++++++++++----- www/poll/poll.less | 13 +++++++++---- www/poll/render.js | 18 ++++++++---------- 6 files changed, 42 insertions(+), 22 deletions(-) diff --git a/customize.dist/translations/messages.es.js b/customize.dist/translations/messages.es.js index cfe682c48..9e6c8ceb7 100644 --- a/customize.dist/translations/messages.es.js +++ b/customize.dist/translations/messages.es.js @@ -356,5 +356,10 @@ define(function () { out.register_warning = "Zero Knowledge significa que no podemos recuperar tus datos si pierdes tu contraseña."; out.register_alreadyRegistered = "Este usuario ya existe, ¿iniciar sesión?"; + out.poll_remove = "Quitar"; + out.poll_edit = "Editar"; + out.poll_locked = "Cerrado"; + out.poll_unlocked = "Abierto"; + return out; }); diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 66f771033..7055a2b86 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -151,6 +151,11 @@ define(function () { out.poll_titleHint = "Title"; out.poll_descriptionHint = "Describe your poll, and use the 'publish' button when you're done. Anyone with the link can change the description, but this is discouraged."; + out.poll_remove = "Remove"; + out.poll_edit = "Edit"; + out.poll_locked = "Locked"; + out.poll_unlocked = "Unlocked"; + // Canvas out.canvas_clear = "Clear"; out.canvas_delete = "Delete selection"; diff --git a/www/poll/main.js b/www/poll/main.js index 8170f7e9d..d6522660f 100644 --- a/www/poll/main.js +++ b/www/poll/main.js @@ -114,7 +114,7 @@ define([ $('input[disabled="disabled"][data-rt-id^="' + id + '"]').removeAttr('disabled'); $('input[type="checkbox"][data-rt-id^="' + id + '"]').addClass('enabled'); $('[data-rt-id="' + id + '"] ~ .edit').css('visibility', 'hidden'); - $('.lock[data-rt-id="' + id + '"]').html(unlockHTML); + $('.lock[data-rt-id="' + id + '"]').html(unlockHTML).attr('title', Messages.poll_unlocked); if (isOwnColumnCommitted()) { return; } $('[data-rt-id^="' + id + '"]').closest('td').addClass("uncommitted"); @@ -132,7 +132,7 @@ define([ $('input[disabled="disabled"][data-rt-id^="' + id + '"]').removeAttr('disabled'); $('input[type="checkbox"][data-rt-id^="' + id + '"]').addClass('enabled'); $('span.edit[data-rt-id="' + id + '"]').css('visibility', 'hidden'); - $('.lock[data-rt-id="' + id + '"]').html(unlockHTML); + $('.lock[data-rt-id="' + id + '"]').html(unlockHTML).attr('title', Messages.poll_unlocked); }); }; @@ -369,7 +369,7 @@ define([ if (!isKeyup && $(e.target).is('[type="text"]')) { return; } - $('.lock[data-rt-id!="' + APP.userid + '"]').html(lockHTML); + $('.lock[data-rt-id!="' + APP.userid + '"]').html(lockHTML).attr('title', Messages.poll_lock); var $cells = APP.$table.find('thead td:not(.uncommitted), tbody td'); $cells.find('[type="text"][data-rt-id!="' + APP.userid + '"]').attr('disabled', true); $('.edit[data-rt-id!="' + APP.userid + '"]').css('visibility', 'visible'); diff --git a/www/poll/poll.css b/www/poll/poll.css index 030b8898e..8016a10c4 100644 --- a/www/poll/poll.css +++ b/www/poll/poll.css @@ -33,7 +33,7 @@ textarea[disabled] { border: 0px; } input[type="text"]::placeholder { - color: #333; + color: #666; } table#table { margin: 0px; @@ -69,7 +69,7 @@ table#table { #tableScroll { overflow-y: hidden; overflow-x: auto; - margin-left: calc(30% - 50px + 29px); + margin-left: calc(30% - 50px + 31px); max-width: 70%; width: auto; display: inline-block; @@ -107,6 +107,9 @@ table { tbody { border: 1px solid #555; } +tbody * { + box-sizing: border-box; +} tbody tr { text-align: center; } @@ -299,9 +302,13 @@ div.realtime table tbody .text-cell .remove { float: left; margin: 0 0 0 10px; } -form.realtime table tbody td label, -div.realtime table tbody td label { - border: 0.5px solid #555; +form.realtime table tbody tr td:nth-child(2), +div.realtime table tbody tr td:nth-child(2) { + border-left: 1px solid #555; +} +form.realtime table tbody tr:not(:first-child) td:not(:first-child) label, +div.realtime table tbody tr:not(:first-child) td:not(:first-child) label { + border-top: 1px solid #555; } form.realtime table .edit, div.realtime table .edit { diff --git a/www/poll/poll.less b/www/poll/poll.less index 369c44f0f..1ddcaa2f0 100644 --- a/www/poll/poll.less +++ b/www/poll/poll.less @@ -83,7 +83,7 @@ table#table { #tableScroll { overflow-y: hidden; overflow-x: auto; - margin-left: calc(~"30% - 50px + 29px"); + margin-left: calc(~"30% - 50px + 31px"); max-width: 70%; width: auto; display: inline-block; @@ -126,6 +126,9 @@ table { } tbody { border: 1px solid @poll-border-color; + * { + box-sizing: border-box; + } tr { text-align: center; &:first-of-type th{ @@ -326,9 +329,11 @@ form.realtime, div.realtime { margin: 0 0 0 10px; } } - td { - label { - border: .5px solid @poll-border-color; + tr:not(:first-child) { + td:not(:first-child) { + label { + border-top: 1px solid @poll-border-color; + } } } } diff --git a/www/poll/render.js b/www/poll/render.js index dcf62079f..c0ca599a0 100644 --- a/www/poll/render.js +++ b/www/poll/render.js @@ -252,6 +252,7 @@ var Renderer = function (Cryptpad) { var makeRemoveElement = Render.makeRemoveElement = function (id) { return ['SPAN', { 'data-rt-id': id, + 'title': Cryptpad.Messages.poll_remove, class: 'remove', }, ['✖']]; }; @@ -259,6 +260,7 @@ var Renderer = function (Cryptpad) { var makeEditElement = Render.makeEditElement = function (id) { return ['SPAN', { 'data-rt-id': id, + 'title': Cryptpad.Messages.poll_edit, class: 'edit', }, ['✐']]; }; @@ -266,6 +268,7 @@ var Renderer = function (Cryptpad) { var makeLockElement = Render.makeLockElement = function (id) { return ['SPAN', { 'data-rt-id': id, + 'title': Cryptpad.Messages.poll_locked, class: 'lock', }, [['i', { class: 'fa fa-lock', @@ -277,14 +280,11 @@ var Renderer = function (Cryptpad) { var makeHeadingCell = Render.makeHeadingCell = function (cell, readOnly) { if (!cell) { return ['TD', {}, []]; } if (cell.type === 'text') { - var removeElement = makeRemoveElement(cell['data-rt-id']); - var editElement = makeEditElement(cell['data-rt-id']); - var lockElement = makeLockElement(cell['data-rt-id']); var elements = [['INPUT', cell, []]]; if (!readOnly) { - elements.unshift(removeElement); - elements.unshift(lockElement); - elements.unshift(editElement); + elements.unshift(makeRemoveElement(cell['data-rt-id'])); + elements.unshift(makeLockElement(cell['data-rt-id'])); + elements.unshift(makeEditElement(cell['data-rt-id'])); } return ['TD', {}, elements]; } @@ -321,12 +321,10 @@ var Renderer = function (Cryptpad) { var makeBodyCell = Render.makeBodyCell = function (cell, readOnly) { if (cell && cell.type === 'text') { - var removeElement = makeRemoveElement(cell['data-rt-id']); - var editElement = makeEditElement(cell['data-rt-id']); var elements = [['INPUT', cell, []]]; if (!readOnly) { - elements.push(removeElement); - elements.push(editElement); + elements.push(makeRemoveElement(cell['data-rt-id'])); + elements.push(makeEditElement(cell['data-rt-id'])); } return ['TD', {}, [ ['DIV', {class: 'text-cell'}, elements]