From 0a99478d9f12cd4fc1218e0b4e23a1ef4905c7e1 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 28 Sep 2017 11:50:35 +0200 Subject: [PATCH 1/4] catch diffdom errors and plow through --- www/slide/slide.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/slide/slide.js b/www/slide/slide.js index 3477a6a32..4bfcacc4f 100644 --- a/www/slide/slide.js +++ b/www/slide/slide.js @@ -83,7 +83,7 @@ define([ var c = Slide.content; var m = ''+DiffMd.render(c).replace(separatorReg, '')+''; - DiffMd.apply(m, $content); + try { DiffMd.apply(m, $content); } catch (e) { return console.error(e); } var length = getNumberOfSlides(); $modal.find('style.cp-app-slide-style').remove(); From 21f1a48380ee480088e59c1a1d49a391b9bee031 Mon Sep 17 00:00:00 2001 From: CatalinScr Date: Mon, 9 Oct 2017 17:17:33 +0300 Subject: [PATCH 2/4] changed the login in button --- customize.dist/pages.js | 3 +-- customize.dist/src/less2/pages/page-login.less | 16 ++++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 55945ccd2..a50201f2d 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -558,8 +558,7 @@ define([ placeholder: Msg.login_password, }), h('div.extra', [ - h('button.login.first.btn', Msg.login_login), - h('button#register.btn.register.cp-login-register', Msg.login_register) + h('button.login.first.btn', Msg.login_login) ]) ]) ]), diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less index 3e5e4e77f..2b8064486 100644 --- a/customize.dist/src/less2/pages/page-login.less +++ b/customize.dist/src/less2/pages/page-login.less @@ -54,19 +54,11 @@ } .extra { margin-top: 1em; - .cp-login-register { - color: @cryptpad_color_blue; - background: #fff; - border: 2px solid @cryptpad_color_blue; - border-radius: 0; - &:hover { - transform: scale(1.05); - } - } .login { - background: transparent; - color: @cryptpad_color_blue; - padding: 0; + background: @cryptpad_color_blue; + color: #fff; + padding: 10px; + border-radius: 0; &:hover { transform: scale(1.05); } From d50a6929866c448119a0282cd35ee5236470dc51 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 9 Oct 2017 16:51:57 +0200 Subject: [PATCH 3/4] add note about tags to prompt --- customize.dist/translations/messages.js | 1 + www/common/common-interface.js | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 3bf37b51c..42266c1fb 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -162,6 +162,7 @@ define(function () { out.tags_title = "Tags (for you only)"; out.tags_add = "Update this page's tags"; out.tags_searchHint = "Find files by their tags by searching in your CryptDrive"; + out.tags_notShared = "Your tags are not shared with other users"; out.tags_duplicate = "Duplicate tag: {0}"; diff --git a/www/common/common-interface.js b/www/common/common-interface.js index badfa4e57..da50c3c01 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -178,10 +178,14 @@ define([ var tagger = dialog.frame([ dialog.message([ - Messages.tags_add, - h('p', Messages.tags_searchHint) + h('ul', [ + Messages.tags_add, + h('br'), + Messages.tags_searchHint, + ]), ]), input, + h('center', h('small', Messages.tags_notShared)), dialog.nav(), ]); From d046b9ce3314de6bb50a1cbde2fffbd0886be8d5 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 9 Oct 2017 17:16:48 +0200 Subject: [PATCH 4/4] add missing French key --- customize.dist/translations/messages.fr.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index b6f4f93fc..89bc6cdde 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -160,6 +160,7 @@ define(function () { out.tags_title = "Mots-clés du pad (pour vous uniquement)"; out.tags_add = "Modifier les mots-clés du pad"; out.tags_searchHint = "Commencez une recherche par # dans votre CryptDrive pour retrouver vos pads par mot-clé."; + out.tags_notShared = "Vos mots-clés ne sont pas partagés avec les autres utilisateurs"; out.tags_duplicate = "Mot-clé déjà présent : {0}"; out.slideOptionsText = "Options"; @@ -396,6 +397,9 @@ define(function () { out.fc_remove = "Supprimer définitivement"; out.fc_empty = "Vider la corbeille"; out.fc_prop = "Propriétés"; + out.fc_hashtag = "Mots-clés"; + // File - Context menu + out.fc_sizeInKilobytes = "Taille en kilo-octets"; // fileObject.js (logs) out.fo_moveUnsortedError = "La liste des éléments non triés ne peut pas contenir de dossiers.";