From 35a49ac19535bd874c68fbe4c9e447af073e1fe3 Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 2 Feb 2017 11:33:05 +0100 Subject: [PATCH 1/3] Improve the connection lost message with read-only --- customize.dist/translations/messages.fr.js | 2 +- customize.dist/translations/messages.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index ed3c2c787..cb88b4987 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -20,7 +20,7 @@ define(function () { 'ou vous pouvez revoir votre travail en fermant cette boîte de dialogue.', ].join(''); - out.common_connectionLost = 'Connexion au serveur perdue'; + out.common_connectionLost = "Connexion au serveur perdue
Vous êtes désormais en mode lecture seule jusqu'au retour de la connexion."; out.websocketError = 'Impossible de se connecter au serveur WebSocket...'; out.loading = "Chargement..."; diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 2ee530e52..95257b256 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -3,6 +3,7 @@ define(function () { // translations must set this key for their language to be available in // the language dropdowns that are shown throughout Cryptpad's interface + // NOTE: translate that name in your language ("Français" and not "French") out._languageName = 'English'; out.main_title = "Cryptpad: Zero Knowledge, Collaborative Real Time Editing"; @@ -20,7 +21,11 @@ define(function () { 'by clicking outside of this box.' ].join(''); - out.common_connectionLost = 'Server Connection Lost'; + // NOTE: We want to update the 'common_connectionLost' key. + // Please do not add a new 'updated_common_connectionLostAndInfo' but change directly the value of 'common_connectionLost' + out.updated_common_connectionLostAndInfo = "Server Connection Lost
You're now in read-only mode until the connection is back."; + out.common_connectionLost = out.updated_common_connectionLostAndInfo; + out.websocketError = 'Unable to connect to the websocket server...'; out.loading = "Loading..."; From 9cea8d82c2aaf2df9fc21c3c9f863790e8d690fd Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 2 Feb 2017 11:33:37 +0100 Subject: [PATCH 2/3] Fix left-click disabled in Edge after renaming a file --- www/drive/file.css | 2 +- www/drive/file.less | 2 +- www/drive/main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/drive/file.css b/www/drive/file.css index 4ac44552f..662ac6616 100644 --- a/www/drive/file.css +++ b/www/drive/file.css @@ -202,7 +202,7 @@ span.fa-folder-open { float: right; } #content li:not(.header) *:not(input) { - pointer-events: none; + /*pointer-events: none;*/ } #content li:not(.header):hover .name { text-decoration: underline; diff --git a/www/drive/file.less b/www/drive/file.less index fd18f54f3..7b6828fa8 100644 --- a/www/drive/file.less +++ b/www/drive/file.less @@ -244,7 +244,7 @@ span { li { &:not(.header) { *:not(input) { - pointer-events: none; + /*pointer-events: none;*/ } &:hover { .name { diff --git a/www/drive/main.js b/www/drive/main.js index 49f1a32fe..ad8852028 100644 --- a/www/drive/main.js +++ b/www/drive/main.js @@ -300,10 +300,10 @@ define([ }); $input.on('keyup', function (e) { if (e.which === 13) { + removeInput(); filesOp.renameElement(path, $input.val(), function () { refresh(); }); - removeInput(); } }); //$element.parent().append($input); From bed49d0b2635afc998c6f281653ca8b5ad996830 Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 2 Feb 2017 11:46:52 +0100 Subject: [PATCH 3/3] Adjust space between buttons in the home page --- customize.dist/index.html | 9 +-------- customize.dist/main.css | 6 +++++- customize.dist/src/fragments/index.html | 9 +-------- customize.dist/src/less/cryptpad.less | 5 ++++- 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/customize.dist/index.html b/customize.dist/index.html index 013e9b68c..cc7be8877 100644 --- a/customize.dist/index.html +++ b/customize.dist/index.html @@ -73,14 +73,7 @@

-
- - - - - - -
+
diff --git a/customize.dist/main.css b/customize.dist/main.css index 176eeebe7..4c4ac11c7 100644 --- a/customize.dist/main.css +++ b/customize.dist/main.css @@ -836,7 +836,7 @@ html.cp, } .cp #main #userForm button.half, .cp #main_other #userForm button.half { - width: calc(50% - 4px); + width: calc(50% - 2px); } .cp #main #userForm button.half:not(.first), .cp #main_other #userForm button.half:not(.first) { @@ -894,6 +894,10 @@ html.cp, cursor: pointer; margin-top: 10px; } +.cp p.buttons .dropdown-bar, +.cp div.buttons .dropdown-bar { + margin-left: 4px; +} .cp #fileManagerIframe { width: 100%; height: 500px; diff --git a/customize.dist/src/fragments/index.html b/customize.dist/src/fragments/index.html index 293fef6f1..66f474156 100644 --- a/customize.dist/src/fragments/index.html +++ b/customize.dist/src/fragments/index.html @@ -6,14 +6,7 @@

-
- - - - - - -
+
diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index 3559f2d99..6a9e52190 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -396,7 +396,7 @@ body.html { margin: 2px 0px; cursor: pointer; &.half { - width: ~"calc(50% - 4px)"; + width: ~"calc(50% - 2px)"; &:not(.first) { float: right; } @@ -445,6 +445,9 @@ p.buttons, div.buttons { cursor: pointer; margin-top: 10px; } + .dropdown-bar { + margin-left: 4px; + } } #fileManagerIframe {