From 6f5683034707278983d23ae3174c8d7fbf616016 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 27 Apr 2020 16:45:06 +0200 Subject: [PATCH 01/40] Localisation updates from https://translatewiki.net. --- src/locales/ast.json | 6 ++++-- src/locales/br.json | 8 +++++--- src/locales/diq.json | 6 ++++-- src/locales/el.json | 4 ++-- src/locales/fr.json | 6 ++++-- src/locales/ia.json | 2 +- src/locales/it.json | 2 +- src/locales/mk.json | 6 ++++-- src/locales/sv.json | 2 +- src/locales/tr.json | 6 ++++-- src/locales/uk.json | 6 ++++-- src/locales/zh-hant.json | 6 ++++-- 12 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/locales/ast.json b/src/locales/ast.json index a8beb80f5d4..76164881b60 100644 --- a/src/locales/ast.json +++ b/src/locales/ast.json @@ -50,7 +50,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Sólo se pue importar dende los formatos de testu planu o HTML. Pa carauterístiques d'importación más avanzaes instala Abiword.", + "pad.importExport.abiword.innerHTML": "Sólo se pue importar dende los formatos de testu planu o HTML. Pa carauterístiques d'importación más avanzaes instala Abiword o LibreOffice.", "pad.modals.connected": "Coneutáu.", "pad.modals.reconnecting": "Reconeutando col to bloc...", "pad.modals.forcereconnect": "Forzar la reconexón", @@ -127,5 +127,7 @@ "pad.impexp.uploadFailed": "Falló la carga del ficheru, intentalo otra vuelta", "pad.impexp.importfailed": "Falló la importación", "pad.impexp.copypaste": "Por favor, copia y apega", - "pad.impexp.exportdisabled": "La esportación en formatu {{type}} ta desactivada. Por favor, comunica col alministrador del sistema pa más detalles." + "pad.impexp.exportdisabled": "La esportación en formatu {{type}} ta desactivada. Por favor, comunica col alministrador del sistema pa más detalles.", + "pad.impexp.maxFileSize": "El ficheru ye demasiao grande. Comunícate col alministrador del sitiu p'aumentar el tamañu de ficheru permitíu na importación", + "pad.impexp.permission": "La importación ta desactivada porque nunca contribuisti nesti bloc. Contribuye polo menos una vez antes d'importar" } diff --git a/src/locales/br.json b/src/locales/br.json index f38ce24784b..a9790e3e73f 100644 --- a/src/locales/br.json +++ b/src/locales/br.json @@ -8,7 +8,7 @@ ] }, "index.newPad": "Pad nevez", - "index.createOpenPad": "pe krouiñ/digeriñ ur pad gant an anv :", + "index.createOpenPad": "pe krouiñ/digeriñ ur Pad gant an anv :", "pad.toolbar.bold.title": "Tev (Ctrl-B)", "pad.toolbar.italic.title": "Italek (Ctrl-I)", "pad.toolbar.underline.title": "Islinennañ (Ctrl-U)", @@ -53,7 +53,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Ne c'hallit ket enporzhiañ furmadoù testennoù kriz pe HTML hepken. Evit arc'hwelioù enporzhiañ emdroetoc'h, staliit staliañ Abiword mar plij.", + "pad.importExport.abiword.innerHTML": "Ne c'hallit enporzhiañ nemet furmadoù testennoù plaen pe HTML. Evit arc'hwelioù enporzhiañ emdroetoc'h, staliit Abiword pe LibreOffice.", "pad.modals.connected": "Kevreet.", "pad.modals.reconnecting": "Adkevreañ war-zu ho pad...", "pad.modals.forcereconnect": "Adkevreañ dre heg", @@ -130,5 +130,7 @@ "pad.impexp.uploadFailed": "C'hwitet eo bet an enporzhiañ. Klaskit en-dro.", "pad.impexp.importfailed": "C'hwitet eo an enporzhiadenn", "pad.impexp.copypaste": "Eilit/pegit, mar plij", - "pad.impexp.exportdisabled": "Diweredekaet eo ezporzhiañ d'ar furmad {{type}}. Kit e darempred gant merour ar reizhiad evit gouzout hiroc'h." + "pad.impexp.exportdisabled": "Diweredekaet eo ezporzhiañ d'ar furmad {{type}}. Kit e darempred gant merour ar reizhiad evit gouzout hiroc'h.", + "pad.impexp.maxFileSize": "Re vras eo ar restr. Kit e daremrepd gant merour ho lec'hienn evit kreskiñ ment aoteet ar restroù evit enporzhiañ", + "pad.impexp.permission": "Diweredekaet eo an enporzhiañ peogwir n'hoc'h eus ket kemeret perzh gwech ebet er bloc'had-se. Kemerit perzh ur wech da nebeutañ a-raok enporzhiañ." } diff --git a/src/locales/diq.json b/src/locales/diq.json index cbf2f12fc42..f2552851030 100644 --- a/src/locales/diq.json +++ b/src/locales/diq.json @@ -56,7 +56,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Şıma şenê tenya metınanê zelalan ya zi formatanê HTML-i biyarê. Seba vêşi xısusiyetanê arezekerdışi ra gırey AbiWord-i bar kerên.", + "pad.importExport.abiword.innerHTML": "Şıma şenê tenya metınanê zelalan ya zi formatanê HTML-i biyarê. Seba vêşi xısusiyetanê arezekerdışi ra gırey AbiWordi ya zi LibreOfficeyi bar kerên.", "pad.modals.connected": "Gıre diya.", "pad.modals.reconnecting": "Bloknot da şıma rê fına irtibat kewê no", "pad.modals.forcereconnect": "Mecbur anciya gırê de", @@ -133,5 +133,7 @@ "pad.impexp.uploadFailed": "Barkerdış nêbi, kerem ke anciya bıcerebne", "pad.impexp.importfailed": "Zer kerdış mıwafaq nebı", "pad.impexp.copypaste": "Reca keme kopya pronayış bıkeri", - "pad.impexp.exportdisabled": "Formatta {{type}} ya ateber kerdış dewra vıciya yo. Qandé teferruati idarekarana irtibat kewê" + "pad.impexp.exportdisabled": "Formatta {{type}} ya ateber kerdış dewra vıciya yo. Qandé teferruati idarekarana irtibat kewê", + "pad.impexp.maxFileSize": "Dosya zêde gırsa, azere kerdışi rê mısade deyaye ebatê dosyay zeydınayışi rê idarekarê siteya irtibat kewê", + "pad.impexp.permission": "Şıma ena ped rê qet iştirak nêkerdo coki ra azere kerdış dewre ra veto. Vêre azere kerdışi minimum yû iştirak bıkerê" } diff --git a/src/locales/el.json b/src/locales/el.json index 7b7735b6323..3e37c9dc45e 100644 --- a/src/locales/el.json +++ b/src/locales/el.json @@ -54,7 +54,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Μορφή Open Document)", - "pad.importExport.abiword.innerHTML": "Μπορείτε να εισάγετε απλό κείμενο ή HTML. Για προηγμένες δυνατότητες εισαγωγής παρακαλούμε εγκαταστήστε το AbiWord.", + "pad.importExport.abiword.innerHTML": "Μπορείτε να εισάγετε απλό κείμενο ή HTML. Για προηγμένες δυνατότητες εισαγωγής παρακαλούμε εγκαταστήστε το AbiWord ή το LibreOffice.", "pad.modals.connected": "Συνδεμένοι.", "pad.modals.reconnecting": "Επανασύνδεση στο pad σας...", "pad.modals.forcereconnect": "Επιβολή επανασύνδεσης", @@ -122,7 +122,7 @@ "pad.userlist.guest": "Επισκέπτης", "pad.userlist.deny": "Άρνηση", "pad.userlist.approve": "Έγκριση", - "pad.editbar.clearcolors": "Να γίνει εκκαθάριση χρωμάτων σύνταξης σε ολόκληρο το έγγραφο;", + "pad.editbar.clearcolors": "Να γίνει εκκαθάριση χρωμάτων σύνταξης σε ολόκληρο το έγγραφο; Αυτό δεν μπορεί να αναιρεθεί", "pad.impexp.importbutton": "Εισαγωγή Τώρα", "pad.impexp.importing": "Εισάγεται...", "pad.impexp.confirmimport": "Η εισαγωγή ενός αρχείου θα αντικαταστήσει το κείμενο του pad. Είστε βέβαιοι ότι θέλετε να συνεχίσετε;", diff --git a/src/locales/fr.json b/src/locales/fr.json index e7f3bbf5149..a35e4fdf5c1 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -74,7 +74,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Vous ne pouvez importer que des formats texte brut ou HTML. Pour des fonctionnalités d’importation plus évoluées, veuillez installer AbiWord.", + "pad.importExport.abiword.innerHTML": "Vous ne pouvez importer que des formats texte brut ou HTML. Pour des fonctionnalités d’importation plus évoluées, veuillez installer AbiWord ou LibreOffice.", "pad.modals.connected": "Connecté.", "pad.modals.reconnecting": "Reconnexion à votre bloc-notes...", "pad.modals.forcereconnect": "Forcer la reconnexion", @@ -151,5 +151,7 @@ "pad.impexp.uploadFailed": "Le téléversement a échoué, veuillez réessayer", "pad.impexp.importfailed": "Échec de l’importation", "pad.impexp.copypaste": "Veuillez copier-coller", - "pad.impexp.exportdisabled": "L’exportation au format {{type}} est désactivée. Veuillez contacter votre administrateur système pour plus de détails." + "pad.impexp.exportdisabled": "L’exportation au format {{type}} est désactivée. Veuillez contacter votre administrateur système pour plus de détails.", + "pad.impexp.maxFileSize": "Fichier trop gros. Contactez votre administrateur de site pour augmenter la taille maximale des fichiers importés", + "pad.impexp.permission": "L’importation est désactivée parce que vous n’avez jamais contribué à ce bloc. Veuillez contribuer au moins une fois avant d’importer" } diff --git a/src/locales/ia.json b/src/locales/ia.json index de8d1a16337..4356f0680a9 100644 --- a/src/locales/ia.json +++ b/src/locales/ia.json @@ -50,7 +50,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Tu pote solmente importar files in formato de texto simple o HTML. Pro functionalitate de importation plus extense, installa AbiWord.", + "pad.importExport.abiword.innerHTML": "Tu pote solmente importar files in formato de texto simple o HTML. Pro functionalitate de importation plus extense, installa AbiWord o LibreOffice.", "pad.modals.connected": "Connectite.", "pad.modals.reconnecting": "Reconnecte a tu pad…", "pad.modals.forcereconnect": "Fortiar reconnexion", diff --git a/src/locales/it.json b/src/locales/it.json index 1552cab7a53..7b1e9ad22df 100644 --- a/src/locales/it.json +++ b/src/locales/it.json @@ -55,7 +55,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "È possibile importare solo i formati di testo semplice o HTML. Per metodi più avanzati di importazione installare AbiWord.", + "pad.importExport.abiword.innerHTML": "È possibile importare solo i formati di testo semplice o HTML. Per metodi più avanzati di importazione installare AbiWord o LibreOffice.", "pad.modals.connected": "Connesso.", "pad.modals.reconnecting": "Riconnessione al pad in corso...", "pad.modals.forcereconnect": "Forza la riconnessione", diff --git a/src/locales/mk.json b/src/locales/mk.json index 0ea41bb2a33..6952fd8d941 100644 --- a/src/locales/mk.json +++ b/src/locales/mk.json @@ -52,7 +52,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Можете да увезувате само од прост текст и HTML-формат. Понапредни можности за увоз ќе добиете ако воспоставите AbiWord.", + "pad.importExport.abiword.innerHTML": "Можете да увезувате само од прост текст и HTML-формат. Понапредни можности за увоз ќе добиете ако воспоставите AbiWord или LibreOffice.", "pad.modals.connected": "Поврзано.", "pad.modals.reconnecting": "Ве преповрзувам со тетратката...", "pad.modals.forcereconnect": "Наметни преповрзување", @@ -129,5 +129,7 @@ "pad.impexp.uploadFailed": "Подигањето не успеа. Обидете се повторно.", "pad.impexp.importfailed": "Увозот не успеа", "pad.impexp.copypaste": "Прекопирајте", - "pad.impexp.exportdisabled": "Извозот во форматот {{type}} е оневозможен. Ако сакате да дознаете повеќе за ова, обратете се кај системскиот администратор." + "pad.impexp.exportdisabled": "Извозот во форматот {{type}} е оневозможен. Ако сакате да дознаете повеќе за ова, обратете се кај системскиот администратор.", + "pad.impexp.maxFileSize": "Податотеката е преголема. Обратете се кај администраторот за да ви ја зголеми допуштената големина за увоз на податотеки", + "pad.impexp.permission": "Увозот е оневозможен бидејќи досега немате придонеси во тетраткава. Направете барем еден придонес пред да увезувате" } diff --git a/src/locales/sv.json b/src/locales/sv.json index 69b086a164c..e423e0a4198 100644 --- a/src/locales/sv.json +++ b/src/locales/sv.json @@ -120,7 +120,7 @@ "pad.userlist.guest": "Gäst", "pad.userlist.deny": "Neka", "pad.userlist.approve": "Godkänn", - "pad.editbar.clearcolors": "Rensa författarfärger på hela dokumentet?", + "pad.editbar.clearcolors": "Rensa författarfärger för hela dokumentet? Detta kan inte ångras", "pad.impexp.importbutton": "Importera nu", "pad.impexp.importing": "Importerar...", "pad.impexp.confirmimport": "Att importera en fil kommer att skriva över den aktuella texten i blocket. Är du säker på att du vill fortsätta?", diff --git a/src/locales/tr.json b/src/locales/tr.json index b27aa3d288f..95a5e8a2ce5 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -59,7 +59,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Açık Doküman Biçimi)", - "pad.importExport.abiword.innerHTML": "Yalnızca düz metin ya da HTML biçimlerini içe aktarabilirsiniz. Daha fazla gelişmiş içe aktarım özellikleri için lütfen AbiWord'ü yükleyin.", + "pad.importExport.abiword.innerHTML": "Yalnızca düz metin ya da HTML biçimlerini içe aktarabilirsiniz. Daha fazla gelişmiş içe aktarım özellikleri için lütfen AbiWord veya LibreOffice yükleyin.", "pad.modals.connected": "Bağlandı.", "pad.modals.reconnecting": "Bloknotunuza tekrar bağlanılıyor...", "pad.modals.forcereconnect": "Yeniden bağlanmaya zorla", @@ -136,5 +136,7 @@ "pad.impexp.uploadFailed": "Yükleme başarısız, lütfen tekrar deneyin", "pad.impexp.importfailed": "İçe aktarım başarısız oldu", "pad.impexp.copypaste": "Lütfen kopyala yapıştır yapın", - "pad.impexp.exportdisabled": "{{type}} biçimiyle dışa aktarma devre dışı bırakıldı. Ayrıntılar için sistem yöneticinizle iletişime geçiniz." + "pad.impexp.exportdisabled": "{{type}} biçimiyle dışa aktarma devre dışı bırakıldı. Ayrıntılar için sistem yöneticinizle iletişime geçiniz.", + "pad.impexp.maxFileSize": "Dosya çok büyük. İçe aktarma için izin verilen dosya boyutunu artırmak için site yöneticinize başvurun", + "pad.impexp.permission": "Bu ped'e hiç katkıda bulunmadığınız için içe aktarma devre dışı. Lütfen içe aktarmadan önce en az bir kez katkıda bulunun" } diff --git a/src/locales/uk.json b/src/locales/uk.json index 968920d24f7..19042c96362 100644 --- a/src/locales/uk.json +++ b/src/locales/uk.json @@ -59,7 +59,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (документ OpenOffice)", - "pad.importExport.abiword.innerHTML": "Ви можете імпортувати лище формати простого тексту або HTML. Для більш просунутих способів імпорту встановіть AbiWord.", + "pad.importExport.abiword.innerHTML": "Ви можете імпортувати лише у форматі простого тексту або HTML. Для більш просунутих способів імпорту встановіть AbiWord або LibreOffice.", "pad.modals.connected": "З'єднано.", "pad.modals.reconnecting": "Перепідлючення до Вашого документа..", "pad.modals.forcereconnect": "Примусове перепідключення", @@ -136,5 +136,7 @@ "pad.impexp.uploadFailed": "Завантаження не вдалось, будь ласка, спробуйте знову", "pad.impexp.importfailed": "Помилка при імпортуванні", "pad.impexp.copypaste": "Будь ласка, скопіюйте та вставте", - "pad.impexp.exportdisabled": "Експорт у формат {{type}} вимкнено. Будь ласка, зв'яжіться із Вашим системним адміністратором за деталями." + "pad.impexp.exportdisabled": "Експорт у формат {{type}} вимкнено. Будь ласка, зв'яжіться із Вашим системним адміністратором за деталями.", + "pad.impexp.maxFileSize": "Файл завеликий. Зверніться до адміністратора сайту для збільшення максимально дозволеного розміру файлів для імпорту", + "pad.impexp.permission": "Імпорт є вимкненим, оскільки ви ніколи не працювали із цим документом. Будь ласка, відредагуйте хоча б раз перед тим, як зробити імпорт" } diff --git a/src/locales/zh-hant.json b/src/locales/zh-hant.json index 438e6475aad..cdb77b84dd9 100644 --- a/src/locales/zh-hant.json +++ b/src/locales/zh-hant.json @@ -58,7 +58,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF（開放文件格式）", - "pad.importExport.abiword.innerHTML": "您只可以從純文字或 HTML 格式檔匯入。安裝\n AbiWord 以取得更多進階的匯入功能。", + "pad.importExport.abiword.innerHTML": "您只可以從純文字或 HTML 格式檔匯入。安裝\n AbiWord 或是 LibreOffice 以取得更多進階的匯入功能。", "pad.modals.connected": "已連線。", "pad.modals.reconnecting": "重新連線到您的記事本…", "pad.modals.forcereconnect": "強制重新連線", @@ -135,5 +135,7 @@ "pad.impexp.uploadFailed": "上載失敗，請重試", "pad.impexp.importfailed": "匯入失敗", "pad.impexp.copypaste": "請複製貼上", - "pad.impexp.exportdisabled": "{{type}}格式的匯出被禁用。有關詳情，請與您的系統管理員聯繫。" + "pad.impexp.exportdisabled": "{{type}}格式的匯出被禁用。有關詳情，請與您的系統管理員聯繫。", + "pad.impexp.maxFileSize": "檔案太大。請聯絡您的網站管理員來增加用於匯入的允許檔案大小。", + "pad.impexp.permission": "因為您已沒在此記事本上貢獻，匯入功能已停用。在進行匯入之前，至少要做出一次貢獻" } From fe6828338b357f31204c0ee645e5eb7048b4a28b Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 30 Apr 2020 16:48:33 +0200 Subject: [PATCH 02/40] Localisation updates from https://translatewiki.net. --- src/locales/ar.json | 4 +++- src/locales/de.json | 7 +++++-- src/locales/nb.json | 8 +++++--- src/locales/pt-br.json | 6 ++++-- src/locales/sr-ec.json | 7 ++++--- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/locales/ar.json b/src/locales/ar.json index 9c6d5a435ce..c89b9919ae3 100644 --- a/src/locales/ar.json +++ b/src/locales/ar.json @@ -137,5 +137,7 @@ "pad.impexp.uploadFailed": "فشل التحميل، الرجاء المحاولة مرة أخرى", "pad.impexp.importfailed": "فشل الاستيراد", "pad.impexp.copypaste": "الرجاء نسخ/لصق", - "pad.impexp.exportdisabled": "تصدير التنسيق {{type}} معطل. يرجى الاتصال بمسؤول النظام الخاص بك للحصول على التفاصيل." + "pad.impexp.exportdisabled": "تصدير التنسيق {{type}} معطل. يرجى الاتصال بمسؤول النظام الخاص بك للحصول على التفاصيل.", + "pad.impexp.maxFileSize": "الملف كبير جدا. اتصل بإداري الموقع الخاص بك لزيادة حجم الملف المسموح به للاستيراد", + "pad.impexp.permission": "الاستيراد معطل لأنك لم تساهم مسبقا لهذه الباد. من فضلك ساهم على الأقل مرة واحدة قبل الاستيراد" } diff --git a/src/locales/de.json b/src/locales/de.json index 5015eff9a0d..a0e50cd9702 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -1,6 +1,7 @@ { "@metadata": { "authors": [ + "Bjarncraft", "Metalhead64", "Mklehr", "Nipsky", @@ -56,7 +57,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Sie können nur aus reinen Text- oder HTML-Formaten importieren. Für umfangreichere Importfunktionen installieren Sie bitte AbiWord.", + "pad.importExport.abiword.innerHTML": "Sie können nur aus reinen Text- oder HTML-Formaten importieren. Für umfangreichere Importfunktionen installieren Sie bitte AbiWord oder LibreOffice.", "pad.modals.connected": "Verbunden.", "pad.modals.reconnecting": "Wiederherstellen der Verbindung …", "pad.modals.forcereconnect": "Erneutes Verbinden erzwingen", @@ -133,5 +134,7 @@ "pad.impexp.uploadFailed": "Das Hochladen ist fehlgeschlagen. Bitte versuchen Sie es erneut.", "pad.impexp.importfailed": "Import fehlgeschlagen", "pad.impexp.copypaste": "Bitte kopieren und einfügen", - "pad.impexp.exportdisabled": "Der Export im {{type}}-Format ist deaktiviert. Für Einzelheiten kontaktieren Sie bitte Ihren Systemadministrator." + "pad.impexp.exportdisabled": "Der Export im {{type}}-Format ist deaktiviert. Für Einzelheiten kontaktieren Sie bitte Ihren Systemadministrator.", + "pad.impexp.maxFileSize": "Datei zu groß.Kontaktiere deinen Administrator um das datei Limit für Imports zu erhöhen.", + "pad.impexp.permission": "Importieren ist deaktiviert weil du nichts zu diesem Pad beigeteagen hast.Bitte trage etwas bei bevor du importierst." } diff --git a/src/locales/nb.json b/src/locales/nb.json index 95ce01417ec..a9764fc9565 100644 --- a/src/locales/nb.json +++ b/src/locales/nb.json @@ -54,7 +54,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Du kan bare importere fra ren tekst eller HTML-formater. For mer avanserte importfunksjoner, installer AbiWord.", + "pad.importExport.abiword.innerHTML": "Du kan bare importere fra ren tekst eller HTML-formater. For mer avanserte importfunksjoner, installer AbiWord eller LibreOffice.", "pad.modals.connected": "Tilkoblet.", "pad.modals.reconnecting": "Kobler til din blokk på nytt...", "pad.modals.forcereconnect": "Tving gjenoppkobling", @@ -122,7 +122,7 @@ "pad.userlist.guest": "Gjest", "pad.userlist.deny": "Nekt", "pad.userlist.approve": "Godkjenn", - "pad.editbar.clearcolors": "Fjern forfatterfarger på hele dokumentet?", + "pad.editbar.clearcolors": "Fjern forfatterfarger på hele dokumentet? Dette kan ikke angres", "pad.impexp.importbutton": "Importer nå", "pad.impexp.importing": "Importerer...", "pad.impexp.confirmimport": "Importering av en fil vil overskrive den nåværende teksten på blokken. Er du sikker på at du vil fortsette?", @@ -131,5 +131,7 @@ "pad.impexp.uploadFailed": "Opplastning feilet. Prøv igjen", "pad.impexp.importfailed": "Import feilet", "pad.impexp.copypaste": "Vennligst kopier og lim inn", - "pad.impexp.exportdisabled": "Eksporterer som {{type}} er deaktivert. Vennligst kontakt din systemadministrator for detaljer." + "pad.impexp.exportdisabled": "Eksporterer som {{type}} er deaktivert. Vennligst kontakt din systemadministrator for detaljer.", + "pad.impexp.maxFileSize": "Filen er for stor. Kontakt systemansvarlig for å øke filstørrelse for import", + "pad.impexp.permission": "Import er deaktivert fordi du aldri har bidratt til denne padden. Vennligst bidra minst en gang før du importerer" } diff --git a/src/locales/pt-br.json b/src/locales/pt-br.json index 1394404aab0..4c7f014b770 100644 --- a/src/locales/pt-br.json +++ b/src/locales/pt-br.json @@ -65,7 +65,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Só é possível importar texto sem formatação ou HTML. Para obter funcionalidades de importação mais avançadas, por favor instale o AbiWord.", + "pad.importExport.abiword.innerHTML": "Só é possível importar texto sem formatação ou HTML. Para obter funcionalidades de importação mais avançadas, por favor instale o AbiWordor ou LibreOffice.", "pad.modals.connected": "Conectado.", "pad.modals.reconnecting": "Reconectando à sua nota...", "pad.modals.forcereconnect": "Forçar reconexão", @@ -142,5 +142,7 @@ "pad.impexp.uploadFailed": "O envio falhou. Tente outra vez", "pad.impexp.importfailed": "A importação falhou", "pad.impexp.copypaste": "Copie e cole", - "pad.impexp.exportdisabled": "A exportação em formato {{type}} está desativada. Comunique-se com o administrador do sistema para detalhes." + "pad.impexp.exportdisabled": "A exportação em formato {{type}} está desativada. Comunique-se com o administrador do sistema para detalhes.", + "pad.impexp.maxFileSize": "Arquivo muito grande. Entre em contato com o administrador do site para aumentar o tamanho do arquivo permitido para importação", + "pad.impexp.permission": "A importação está desativada porque você nunca contribuiu para este bloco. Contribua pelo menos uma vez antes de importar" } diff --git a/src/locales/sr-ec.json b/src/locales/sr-ec.json index 109668defae..011139b08b1 100644 --- a/src/locales/sr-ec.json +++ b/src/locales/sr-ec.json @@ -56,7 +56,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Једино можете увести са једноставног текстуалног формата или HTML формата. За компликованије функције о увозу, молимо да инсталирате AbiWord.", + "pad.importExport.abiword.innerHTML": "Једино можете увести са једноставног текстуалног формата или HTML формата. За компликованије функције о увозу, молимо да инсталирате AbiWord или LibreOffice.", "pad.modals.connected": "Повезано.", "pad.modals.reconnecting": "Поново се повезујем на ваш пад..", "pad.modals.forcereconnect": "Присилно се поново повежи", @@ -124,7 +124,7 @@ "pad.userlist.guest": "Гост", "pad.userlist.deny": "Одбиј", "pad.userlist.approve": "Одобри", - "pad.editbar.clearcolors": "Очисти ауторске боје за цели документ?", + "pad.editbar.clearcolors": "Очисти ауторске боје за цели документ? Ово се не може поништити.", "pad.impexp.importbutton": "Увези одмах", "pad.impexp.importing": "Увозим...", "pad.impexp.confirmimport": "Увоз датотеке ће преписати тренутни текст пада. Да ли сте сигурни да желите наставити?", @@ -133,5 +133,6 @@ "pad.impexp.uploadFailed": "Нисам успео да отпремим, молимо покушате поново", "pad.impexp.importfailed": "Нисам успео да увезем", "pad.impexp.copypaste": "Копирајте и залепите", - "pad.impexp.exportdisabled": "Извоз у формату {{type}} није дозвољен. Контактирајте системског администратора за детаље." + "pad.impexp.exportdisabled": "Извоз у формату {{type}} није дозвољен. Контактирајте системског администратора за детаље.", + "pad.impexp.maxFileSize": "Датотека је превелика. Контактирајте администратора сајта да повећа допуштену величину датотеке за увоз." } From 9abc70e389bd6931885fe4e8d13746f0fd573a63 Mon Sep 17 00:00:00 2001 From: muxator Date: Sat, 2 May 2020 00:16:35 +0200 Subject: [PATCH 03/40] package-lock: update version field This was reported in https://github.com/ether/etherpad-lite/commit/5e6af287a5e5755f764a81c8e8e4869457bdf278#r38792267 and should have been part of 5e6af287a5e5. --- src/package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package-lock.json b/src/package-lock.json index 2d3edf937ca..aa721788f7c 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -1,6 +1,6 @@ { "name": "ep_etherpad-lite", - "version": "1.8.0", + "version": "1.8.3", "lockfileVersion": 1, "requires": true, "dependencies": { From c074dfeff2ca5653c79e1b4dca00a0b69d82b354 Mon Sep 17 00:00:00 2001 From: Mikk Andresen Date: Mon, 27 Apr 2020 18:28:27 +0300 Subject: [PATCH 04/40] docs: basic styles for tables This is a cosmetic fix for PR #3921 (109aa2d4896e). Discussion on #3563 --- doc/assets/style.css | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/assets/style.css b/doc/assets/style.css index 09bc9a364e8..95034c90acf 100644 --- a/doc/assets/style.css +++ b/doc/assets/style.css @@ -44,4 +44,19 @@ a:hover { display: block; overflow: auto; padding: 5px; -} \ No newline at end of file +} + +table, th, td { + text-align: left; + border: 1px solid gray; + border-collapse: collapse; +} + +th { + padding: 0.5em; + background: #EEE; +} + +td { + padding: 0.5em; +} From bd443a7f58581ad028f629fa24c1afa3f56e792e Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 27 Apr 2020 15:28:21 +0200 Subject: [PATCH 05/40] colibris: remove old styling for titles inside editor. Leave ep_headings manage it --- src/static/skins/colibris/src/pad-editor.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/static/skins/colibris/src/pad-editor.css b/src/static/skins/colibris/src/pad-editor.css index 1d50ed0f9c9..3c35a440b70 100644 --- a/src/static/skins/colibris/src/pad-editor.css +++ b/src/static/skins/colibris/src/pad-editor.css @@ -19,15 +19,6 @@ option { text-transform: capitalize; } -#innerdocbody h1 { - font-size: 2.5em !important; -} - -#innerdocbody h3 { - font-size: 1.15em; - letter-spacing: 1px; -} - #innerdocbody a { color: #64d29b; color: var(--primary-color); From 3ac816da2bb0400c13e91ad4888906a268fa307f Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 27 Apr 2020 15:59:32 +0200 Subject: [PATCH 06/40] colibris: gritter color always in white --- src/static/skins/colibris/src/components/gritter.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/skins/colibris/src/components/gritter.css b/src/static/skins/colibris/src/components/gritter.css index fa255fe4a22..af83d8260d5 100644 --- a/src/static/skins/colibris/src/components/gritter.css +++ b/src/static/skins/colibris/src/components/gritter.css @@ -2,7 +2,7 @@ background-color: #64d29b; background-color: var(--primary-color); color: #ffffff; - color: var(--bg-color); + color: var(--super-light-color); } .gritter-item .popup-content { padding: 15px; @@ -26,7 +26,7 @@ } .gritter-item:not(.error) .gritter-close .buttonicon { color: #ffffff; - color: var(--bg-color); + color: var(--super-light-color); } /* CHAT GRIITER ITEM */ From 23307d14d57c462b66a4bb15d3acde9e9dcf4c90 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Mon, 27 Apr 2020 16:29:38 +0200 Subject: [PATCH 07/40] share: change default iframe size, and remove border From 600*400 to 100%*600 --- src/static/js/pad_editbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index ba2171b0db8..04660e88afe 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -288,13 +288,13 @@ var padeditbar = (function() { var basePath = document.location.href.substring(0, document.location.href.indexOf("/p/")); var readonlyLink = basePath + "/p/" + clientVars.readOnlyId; - $('#embedinput').val(''); + $('#embedinput').val(''); $('#linkinput').val(readonlyLink); } else { var padurl = window.location.href.split("?")[0]; - $('#embedinput').val(''); + $('#embedinput').val(''); $('#linkinput').val(padurl); } }, From af67f02da2ae5836be05f4f34a14a468ac54e7df Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 28 Apr 2020 15:25:03 +0200 Subject: [PATCH 08/40] select: remove nice-select for safari because of a known bug with fixed position and overflow Make the safari select looks the same than for other browser Only the dropdown will be different --- src/static/css/pad/form.css | 3 --- src/static/js/pad_editbar.js | 11 ++++++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/static/css/pad/form.css b/src/static/css/pad/form.css index d0dcb759680..9b602d6292c 100644 --- a/src/static/css/pad/form.css +++ b/src/static/css/pad/form.css @@ -32,9 +32,6 @@ select, .nice-select { .nice-select:hover { border-color: #dbdbdb; } -.nice-select:active,.nice-select.open,.nice-select:focus { - /*border-color: #999;*/ -} .nice-select:after { border-bottom: 2px solid #999; border-right: 2px solid #999; diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index 04660e88afe..df5833364f1 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -20,6 +20,7 @@ * limitations under the License. */ +var browser = require('./browser'); var hooks = require('./pluginfw/hooks'); var padutils = require('./pad_utils').padutils; var padeditor = require('./pad_editor').padeditor; @@ -170,7 +171,15 @@ var padeditbar = (function() ace: padeditor.ace }); - $('select').niceSelect(); + /* + * On safari, the dropdown in the toolbar gets hidden because of toolbar + * overflow:hidden property. This is a bug from Safari: any children with + * position:fixed (like the dropdown) should be displayed no matter + * overflow:hidden on parent + */ + if (!browser.safari) { + $('select').niceSelect(); + } // When editor is scrolled, we add a class to style the editbar differently $('iframe[name="ace_outer"]').contents().scroll(function() { From d5020f53abad34e26a69aafccd5e83ba78f2a4de Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 28 Apr 2020 15:46:14 +0200 Subject: [PATCH 09/40] colibris: Fix index page font and colors --- src/static/skins/colibris/index.css | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/static/skins/colibris/index.css b/src/static/skins/colibris/index.css index 0452d45f845..5129c43a8d0 100644 --- a/src/static/skins/colibris/index.css +++ b/src/static/skins/colibris/index.css @@ -6,7 +6,7 @@ form { body { background: url(images/fond.jpg) center center no-repeat fixed #fff; - font-family: Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif !important; + font-family: Quicksand, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-size: 16px; line-height: 1.42857143; color: #333; @@ -24,6 +24,10 @@ body { box-shadow: none } +input { + color: #4a5d5c; +} + #inner { background: transparent; padding-top: 0; @@ -65,14 +69,15 @@ button[type=submit] { background: #586a69; border: none; top: 0; + opacity: 1; + transition: .2s background; } #button:hover, button[type=submit]:hover { cursor: pointer; - background: #64d29b; - border: 2px solid #586a69; - color: #586a69; + background: #4a5d5c; + color: #64d29b; } #padname { From 15af63b0f894e49520e2e5ee4a676db98dfd0f40 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 28 Apr 2020 16:14:00 +0200 Subject: [PATCH 10/40] ui: display editor only when it is ready so it avoid strange ui effect when div get positioned --- src/static/css/pad/layout.css | 3 +++ src/static/js/pad.js | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/static/css/pad/layout.css b/src/static/css/pad/layout.css index 0d583f32956..84c12814910 100644 --- a/src/static/css/pad/layout.css +++ b/src/static/css/pad/layout.css @@ -29,6 +29,9 @@ body { height: auto; flex: 1 auto; } +#editorcontainerbox #editorcontainer:not(.initialized) { + visibility: hidden; +} #editorcontainerbox #editorcontainer iframe { width: 100%; height: auto; diff --git a/src/static/js/pad.js b/src/static/js/pad.js index 622b57f3edb..aeeca15c6b5 100644 --- a/src/static/js/pad.js +++ b/src/static/js/pad.js @@ -573,6 +573,8 @@ var pad = { mobileMatch.addListener(checkChatAndUsersVisibility); // check if window resized setTimeout(function() { checkChatAndUsersVisibility(mobileMatch); }, 0); // check now after load + $('#editorcontainer').addClass('initialized'); + hooks.aCallAll("postAceInit", {ace: padeditor.ace, pad: pad}); } }, From 01c59b3b88431baf7d5a1d4b5b6c021992e405de Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 28 Apr 2020 16:31:18 +0200 Subject: [PATCH 11/40] colibris: apply skin variants to set_title_on_pad --- src/static/skins/colibris/pad.css | 1 + src/static/skins/colibris/src/pad-variants.css | 8 ++++---- .../skins/colibris/src/plugins/set_title_on_pad.css | 7 +++++++ 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 src/static/skins/colibris/src/plugins/set_title_on_pad.css diff --git a/src/static/skins/colibris/pad.css b/src/static/skins/colibris/pad.css index c1cec179c7a..68e8db1a87b 100644 --- a/src/static/skins/colibris/pad.css +++ b/src/static/skins/colibris/pad.css @@ -18,6 +18,7 @@ @import url("src/plugins/brightcolorpicker.css"); @import url("src/plugins/font_color.css"); @import url("src/plugins/tables2.css"); +@import url("src/plugins/set_title_on_pad.css"); @import url("src/plugins/author_hover.css"); @import url("src/plugins/comments.css"); diff --git a/src/static/skins/colibris/src/pad-variants.css b/src/static/skins/colibris/src/pad-variants.css index 212acdfcf9d..bd63604c979 100644 --- a/src/static/skins/colibris/src/pad-variants.css +++ b/src/static/skins/colibris/src/pad-variants.css @@ -1,7 +1,7 @@ /* =========================== */ /* === Super Light Toolbar === */ /* =========================== */ -.super-light-toolbar .toolbar, .super-light-toolbar .popup-content { +.super-light-toolbar .toolbar, .super-light-toolbar .popup-content, #pad_title { --text-color: var(--super-dark-color); --text-soft-color: var(--dark-color); --border-color: #e4e6e9; @@ -11,7 +11,7 @@ /* ===================== */ /* === Light Toolbar === */ /* ===================== */ -.light-toolbar .toolbar, .light-toolbar .popup-content { +.light-toolbar .toolbar, .light-toolbar .popup-content, #pad_title { --text-color: var(--super-dark-color); --text-soft-color: var(--dark-color); --border-color: var(--middle-color); @@ -21,7 +21,7 @@ /* ========================== */ /* === Super Dark Toolbar === */ /* ========================== */ -.super-dark-toolbar .toolbar, .super-dark-toolbar .popup-content { +.super-dark-toolbar .toolbar, .super-dark-toolbar .popup-content, #pad_title { --text-color: var(--super-light-color); --text-soft-color: var(--light-color); --border-color: var(--dark-color); @@ -35,7 +35,7 @@ /* ==================== */ /* === Dark Toolbar === */ /* ==================== */ -.dark-toolbar .toolbar, .dark-toolbar .popup-content { +.dark-toolbar .toolbar, .dark-toolbar .popup-content, #pad_title { --text-color: var(--super-light-color); --text-soft-color: var(--light-color); --border-color: var(--super-dark-color); diff --git a/src/static/skins/colibris/src/plugins/set_title_on_pad.css b/src/static/skins/colibris/src/plugins/set_title_on_pad.css new file mode 100644 index 00000000000..9ab1e2a126e --- /dev/null +++ b/src/static/skins/colibris/src/plugins/set_title_on_pad.css @@ -0,0 +1,7 @@ +#pad_title { + border-bottom: 1px solid var(--border-color) !important; + background-color: var(--bg-color) !important; +} +#edit_title { + color: var(--text-soft-color); +} \ No newline at end of file From f768e32373c8cea94cd1f66db75710f9144d7e5c Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Wed, 29 Apr 2020 12:51:48 +0200 Subject: [PATCH 12/40] ui: apply mobile layout if screen width < 800px instead of < 720px Some mobile get large screen now, and also if using a small window on desktop better adapt the visual using mobile layout --- src/static/css/admin.css | 2 +- src/static/css/iframe_editor.css | 2 +- src/static/css/pad/chat.css | 2 +- src/static/css/pad/gritter.css | 2 +- src/static/css/pad/layout.css | 2 +- src/static/css/pad/popup.css | 2 +- src/static/css/pad/popup_users.css | 2 +- src/static/css/pad/toolbar.css | 2 +- src/static/css/timeslider.css | 2 +- src/static/skins/colibris/src/components/chat.css | 2 +- src/static/skins/colibris/src/components/popup.css | 2 +- src/static/skins/colibris/src/components/toolbar.css | 2 +- src/static/skins/colibris/src/layout.css | 2 +- src/static/skins/colibris/timeslider.css | 2 +- src/templates/index.html | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/static/css/admin.css b/src/static/css/admin.css index c44ce398383..fc11c38b087 100644 --- a/src/static/css/admin.css +++ b/src/static/css/admin.css @@ -222,7 +222,7 @@ pre { word-wrap: break-word; } -@media (max-width: 720px) { +@media (max-width: 800px) { div.innerwrapper { padding: 0 15px 15px 15px; } diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index 12f5d1c5c20..d80c5125b10 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -114,7 +114,7 @@ body.doesWrap:not(.noprewrap) > div { font-size: 12px; /* overridden by lineMetricsDiv.style */ font-family: monospace; /* overridden by lineMetricsDiv.style */ } -@media (max-width: 720px) { +@media (max-width: 800px) { #sidediv { /* Do not use display: none to hide the sidediv, otherwise the parent container does not get its height properly calculated by flexboxes */ diff --git a/src/static/css/pad/chat.css b/src/static/css/pad/chat.css index 39df3ce3097..98f96109be6 100644 --- a/src/static/css/pad/chat.css +++ b/src/static/css/pad/chat.css @@ -152,7 +152,7 @@ display: none; } -@media only screen and (max-width: 720px) { +@media only screen and (max-width: 800px) { #chatbox { right: 0; bottom: 0; diff --git a/src/static/css/pad/gritter.css b/src/static/css/pad/gritter.css index 20d70be46b5..0760623394d 100644 --- a/src/static/css/pad/gritter.css +++ b/src/static/css/pad/gritter.css @@ -40,7 +40,7 @@ background-color: #eed3d4; } -@media (max-width: 720px) { +@media (max-width: 800px) { #gritter-container { left: 1rem; right: 1rem; diff --git a/src/static/css/pad/layout.css b/src/static/css/pad/layout.css index 84c12814910..7b64936d74f 100644 --- a/src/static/css/pad/layout.css +++ b/src/static/css/pad/layout.css @@ -47,7 +47,7 @@ body { width: 0; /* hide when the container is empty */ } -@media only screen and (max-width: 720px) { +@media only screen and (max-width: 800px) { #editorcontainerbox { margin-bottom: 39px; /* Leave space for the bottom toolbar on mobile */ } diff --git a/src/static/css/pad/popup.css b/src/static/css/pad/popup.css index fd4312cd23e..00fc8ca5171 100644 --- a/src/static/css/pad/popup.css +++ b/src/static/css/pad/popup.css @@ -62,7 +62,7 @@ } /* Mobile devices */ -@media only screen and (max-width: 720px) { +@media only screen and (max-width: 800px) { .popup { border-radius: 0; top: 1rem; diff --git a/src/static/css/pad/popup_users.css b/src/static/css/pad/popup_users.css index 0832383f2db..8c6c794d227 100644 --- a/src/static/css/pad/popup_users.css +++ b/src/static/css/pad/popup_users.css @@ -98,7 +98,7 @@ input#myusernameedit:not(.editable) { right: calc(100% + 15px); z-index: 101; } -@media (max-width: 720px) { +@media (max-width: 800px) { #mycolorpicker.popup { top: auto; bottom: 0; diff --git a/src/static/css/pad/toolbar.css b/src/static/css/pad/toolbar.css index 414a9e9097f..bc258510a60 100644 --- a/src/static/css/pad/toolbar.css +++ b/src/static/css/pad/toolbar.css @@ -135,7 +135,7 @@ overflow: visible; } -@media only screen and (max-width: 720px) { +@media only screen and (max-width: 800px) { .toolbar ul li.separator { width: 5px; } diff --git a/src/static/css/timeslider.css b/src/static/css/timeslider.css index cf3cbff04f0..ef2ade0340b 100644 --- a/src/static/css/timeslider.css +++ b/src/static/css/timeslider.css @@ -131,7 +131,7 @@ height: 100%; } -@media (max-width: 720px) { +@media (max-width: 800px) { #timeslider-slider #timer { display: none; } .editbarright [data-key="timeslider_returnToPad"] { diff --git a/src/static/skins/colibris/src/components/chat.css b/src/static/skins/colibris/src/components/chat.css index 61d992c5f21..b9853508ba1 100644 --- a/src/static/skins/colibris/src/components/chat.css +++ b/src/static/skins/colibris/src/components/chat.css @@ -75,7 +75,7 @@ background-color: var(--bg-color); } -@media (max-width: 720px) { +@media (max-width: 800px) { #chaticon { right: 0; } diff --git a/src/static/skins/colibris/src/components/popup.css b/src/static/skins/colibris/src/components/popup.css index 0a50c9bbe15..b74a25cb88d 100644 --- a/src/static/skins/colibris/src/components/popup.css +++ b/src/static/skins/colibris/src/components/popup.css @@ -41,7 +41,7 @@ min-width: 180px; } -@media (max-width: 720px) { +@media (max-width: 800px) { .popup-content { padding: 1rem; box-shadow: 0 0 0 1px rgba(99, 114, 130, 0.16), -1px 1px 16px 3px rgba(27, 39, 51, 0.12); diff --git a/src/static/skins/colibris/src/components/toolbar.css b/src/static/skins/colibris/src/components/toolbar.css index 354e1324965..91e9991edd7 100644 --- a/src/static/skins/colibris/src/components/toolbar.css +++ b/src/static/skins/colibris/src/components/toolbar.css @@ -131,7 +131,7 @@ } } -@media (max-width: 720px) { +@media (max-width: 800px) { .toolbar ul li { margin: 5px 2px; diff --git a/src/static/skins/colibris/src/layout.css b/src/static/skins/colibris/src/layout.css index a6dd784d7c5..e4fd0d2d5f8 100644 --- a/src/static/skins/colibris/src/layout.css +++ b/src/static/skins/colibris/src/layout.css @@ -71,7 +71,7 @@ #outerdocbody.plugin-ep_author_neat #sidediv { padding-right: 0 !important; } } -@media only screen and (max-width: 720px) { +@media only screen and (max-width: 800px) { #editorcontainerbox { margin-bottom: 39px; /* margin for bottom toolbar */ } diff --git a/src/static/skins/colibris/timeslider.css b/src/static/skins/colibris/timeslider.css index b7b9f3e1045..263e0e592a7 100644 --- a/src/static/skins/colibris/timeslider.css +++ b/src/static/skins/colibris/timeslider.css @@ -82,7 +82,7 @@ font-size: .9em; } -@media (max-width: 720px) { +@media (max-width: 800px) { #slider-btn-container { margin-top: 0; diff --git a/src/templates/index.html b/src/templates/index.html index 4962560b626..0e36f71cc64 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -138,7 +138,7 @@ width: 45px; height: 38px; } - @media only screen and (min-device-width: 320px) and (max-device-width: 720px) { + @media only screen and (min-device-width: 320px) and (max-device-width: 800px) { body { background: #bbb; background: -webkit-linear-gradient(#aaa,#eee 60%) center fixed; From ff1191d24a34d96a1d05fd9eea2fb06d55473aa8 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Wed, 29 Apr 2020 13:04:05 +0200 Subject: [PATCH 13/40] toolbar: display the "+" icon to show all buttons only on mobile layout Otherwise the "+" button is displayed on top of the menu_right toolbar --- src/static/js/pad_editbar.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index df5833364f1..c832e973217 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -312,7 +312,11 @@ var padeditbar = (function() // reset style $('.toolbar').removeClass('cropped') var menu_left = $('.toolbar .menu_left')[0]; - if (menu_left && menu_left.scrollWidth > $('.toolbar').width()) { + + // on mobile the menu_right get displayed at the bottom of the screen + var isMobileLayout = $('.toolbar .menu_right').css('position') === 'fixed'; + + if (menu_left && menu_left.scrollWidth > $('.toolbar').width() && isMobileLayout) { $('.toolbar').addClass('cropped'); } } From a522db3ef4e9579decba92a203e1f311fe05da9b Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Thu, 30 Apr 2020 14:24:02 +0200 Subject: [PATCH 14/40] colibris: do not color link with primary color when author color are on Change link color to blue Still color the link the authorship have been cleared closes #3960 --- src/static/css/iframe_editor.css | 8 ++++++++ src/static/js/ace2_inner.js | 9 --------- src/static/skins/colibris/src/pad-editor.css | 5 ----- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index d80c5125b10..021c8d1fba5 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -34,6 +34,14 @@ html.inner-editor { padding-bottom: 10px; /* some space when we scroll to the bottom */ } +#innerdocbody a { + color: #2e96f3; +} +#innerdocbody.authorColors [class^='author-'] a { + color: inherit; +} + + /* --------------------- */ /* -- BROWSER SUPPORT -- */ /* --------------------- */ diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index b819ba498c5..b69cc1686e2 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -249,7 +249,6 @@ function Ace2Inner(){ var authorStyle = dynamicCSS.selectorStyle(authorSelector); var parentAuthorStyle = parentDynamicCSS.selectorStyle(authorSelector); - var anchorStyle = dynamicCSS.selectorStyle(authorSelector + ' > a') // author color authorStyle.backgroundColor = bgcolor; @@ -258,14 +257,6 @@ function Ace2Inner(){ var textColor = colorutils.textColorFromBackgroundColor(bgcolor, parent.parent.clientVars.skinName); authorStyle.color = textColor; parentAuthorStyle.color = textColor; - - // anchor text contrast - if(colorutils.luminosity(colorutils.css2triple(bgcolor)) < 0.55) - { - anchorStyle.color = colorutils.triple2css(colorutils.complementary(colorutils.css2triple(bgcolor))); - }else{ - anchorStyle.color = null; - } } } } diff --git a/src/static/skins/colibris/src/pad-editor.css b/src/static/skins/colibris/src/pad-editor.css index 3c35a440b70..f48db3b8f8f 100644 --- a/src/static/skins/colibris/src/pad-editor.css +++ b/src/static/skins/colibris/src/pad-editor.css @@ -17,9 +17,4 @@ option { text-transform: capitalize; -} - -#innerdocbody a { - color: #64d29b; - color: var(--primary-color); } \ No newline at end of file From 9587c1c673526c7b963ccffbb19702f8fa15fd63 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Fri, 1 May 2020 16:43:25 +0200 Subject: [PATCH 15/40] ui: change a bit the architecture of sidediv line number So we can easily customize with plugins, such as ep_author_neat --- src/static/css/iframe_editor.css | 12 ++++++------ src/static/js/ace2_inner.js | 7 +++---- src/static/js/pad_editor.js | 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index 021c8d1fba5..cd1ca00452d 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -106,12 +106,12 @@ body.doesWrap:not(.noprewrap) > div { #sidediv:not(.sidedivdelayed) { /* before sidediv get initialized, hide text */ color: transparent; } -#sidediv.sidedivhidden { - /* Do not use display: none to hide the sidediv, otherwise the parent container does not - get its height properly calculated by flexboxes */ - visibility: hidden; - width: 0; - padding: 0; +.line-numbers-hidden #sidediv .line-number { + display: none; +} +#sidediv:not(.authorColors) #sidedivinner>div:before { + content: none !important; +} } #linemetricsdiv { position: absolute; diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index b69cc1686e2..85193485648 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -956,8 +956,7 @@ function Ace2Inner(){ showsuserselections: setClassPresenceNamed(root, "userSelections"), showslinenumbers : function(value){ hasLineNumbers = !! value; - setClassPresence(sideDiv, "sidedivhidden", !hasLineNumbers); - setClassPresence(sideDiv.parentNode, "sidediv-hidden", !hasLineNumbers); + setClassPresence(sideDiv.parentNode, "line-numbers-hidden", !hasLineNumbers); fixView(); }, grayedout: setClassPresenceNamed(outerWin.document.body, "grayedout"), @@ -5275,7 +5274,7 @@ function Ace2Inner(){ function initLineNumbers() { lineNumbersShown = 1; - sideDiv.innerHTML = '
1
'; + sideDiv.innerHTML = '
1
'; sideDivInner = outerWin.document.getElementById("sidedivinner"); $(sideDiv).addClass("sidediv"); } @@ -5352,7 +5351,7 @@ function Ace2Inner(){ div.style.height = h +"px"; } - div.appendChild(odoc.createTextNode(String(n))); + $(div).append($("" + String(n) + "")); fragment.appendChild(div); if(b){ b = b.nextSibling; diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js index b035bf6fc3d..6c53e4014ac 100644 --- a/src/static/js/pad_editor.js +++ b/src/static/js/pad_editor.js @@ -135,6 +135,7 @@ var padeditor = (function() v = getOption('showAuthorColors', true); self.ace.setProperty("showsauthorcolors", v); $('#chattext').toggleClass('authorColors', v); + $('iframe[name="ace_outer"]').contents().find('#sidedivinner').toggleClass('authorColors', v); padutils.setCheckbox($("#options-colorscheck"), v); // Override from parameters if true From 88dccfe7cefd4a3129445723a0d51ac40396d817 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Fri, 1 May 2020 17:48:43 +0200 Subject: [PATCH 16/40] ui: remove no more needed css code for ep_author_neat This is the last change in PR #3957. Closes #3954. --- src/static/css/iframe_editor.css | 13 ++++------ .../skins/colibris/src/components/sidediv.css | 17 +------------ src/static/skins/colibris/src/layout.css | 25 ------------------- src/static/skins/colibris/src/pad-editor.css | 6 ++--- 4 files changed, 9 insertions(+), 52 deletions(-) diff --git a/src/static/css/iframe_editor.css b/src/static/css/iframe_editor.css index cd1ca00452d..1368e092655 100644 --- a/src/static/css/iframe_editor.css +++ b/src/static/css/iframe_editor.css @@ -92,13 +92,14 @@ body.doesWrap:not(.noprewrap) > div { /* ------------------------------------------ */ #sidediv { - font-size: 11px; - font-family: monospace; - padding-right: 5px; - padding-left: 12px; background-color: transparent; border-right: 1px solid #ccc; } +#sidediv .line-number { + font-size: 9px; + padding: 0 10px; + font-family: monospace; +} #sidedivinner { text-align: right; opacity: .9; @@ -109,10 +110,6 @@ body.doesWrap:not(.noprewrap) > div { .line-numbers-hidden #sidediv .line-number { display: none; } -#sidediv:not(.authorColors) #sidedivinner>div:before { - content: none !important; -} -} #linemetricsdiv { position: absolute; left: -1000px; diff --git a/src/static/skins/colibris/src/components/sidediv.css b/src/static/skins/colibris/src/components/sidediv.css index 63eee2dd526..6f5556df9de 100644 --- a/src/static/skins/colibris/src/components/sidediv.css +++ b/src/static/skins/colibris/src/components/sidediv.css @@ -8,27 +8,12 @@ font-family: var(--main-font-family); /* the parent div have font-family monospace (line number) */ color: #485365; color: var(--text-color); - padding-right: 18px !important; - text-transform: capitalize; - font-size: 12px !important; font-weight: bold; } -#sidedivinner>div, -#sidedivinner.authorColors>div, -#sidedivinner.authorColors>div.primary-none { - padding-right: 5px !important; - border-right: 5px solid transparent; -} - -#sidedivinner>div { +#sidedivinner>div .line-number { line-height: 24px; - font-size: 9px !important; font-family: RobotoMono; color: #576273; color: var(--text-soft-color); -} - -#sidedivinner.authorColors>div, #sidedivinner.authorColors>div.primary-none, #sidedivinner>div { - padding-right: 8px !important; } \ No newline at end of file diff --git a/src/static/skins/colibris/src/layout.css b/src/static/skins/colibris/src/layout.css index e4fd0d2d5f8..512b6b342f5 100644 --- a/src/static/skins/colibris/src/layout.css +++ b/src/static/skins/colibris/src/layout.css @@ -13,10 +13,6 @@ width: 250px; } -#outerdocbody.sidediv-hidden { - padding-left: 0; /* sidediv hidden */ -} - #outerdocbody iframe, #outerdocbody > #innerdocbody { max-width: 900px; padding: 40px 55px; @@ -40,17 +36,6 @@ padding-bottom: var(--editor-vertical-padding); } -/* Fixs author_hover does not take in account the document padding */ -.authortooltip { margin-top: 65px !important; margin-left: 60px; } -.caretindicator { margin-top: 61px!important; margin-left: 52px; } -#outerdocbody.plugin-ep_author_neat .authortooltip{ margin-left: 145px; } -#outerdocbody.plugin-ep_author_neat .caretindicator{ margin-left: 52px; margin-top: 65px!important;} -@media (max-width:1000px) { - #outerdocbody.plugin-ep_author_neat .authortooltip{ margin-left: 115px; } - .caretindicator{ margin-left: 13px; } - #outerdocbody.plugin-ep_author_neat .caretindicator{ margin-left: 17px; } -} - @media (max-width:1000px) { #outerdocbody { padding-top: 0; @@ -59,16 +44,6 @@ max-width: none; border-radius: 0; } - - .authortooltip { margin-top: 20px !important; } - .caretindicator { margin-top: 0px !important; } - #outerdocbody.plugin-ep_author_neat .caretindicator { margin-top: 10px !important; } - - #outerdocbody.plugin-ep_author_neat #sidedivinner>div:before { padding-right: 10px !important; } - #outerdocbody.plugin-ep_author_neat #sidedivinner.authorColors>div, - #outerdocbody.plugin-ep_author_neat #sidedivinner.authorColors>div.primary-none, - #outerdocbody.plugin-ep_author_neat #sidedivinner>div { padding-right: 6px!important; } - #outerdocbody.plugin-ep_author_neat #sidediv { padding-right: 0 !important; } } @media only screen and (max-width: 800px) { diff --git a/src/static/skins/colibris/src/pad-editor.css b/src/static/skins/colibris/src/pad-editor.css index f48db3b8f8f..0c4b0b091d7 100644 --- a/src/static/skins/colibris/src/pad-editor.css +++ b/src/static/skins/colibris/src/pad-editor.css @@ -7,11 +7,11 @@ color: var(--text-color); } -#innerdocbody span, #innerdocbody span { - padding: 4px 0 !important; +#innerdocbody span { + padding: 3px 0 !important; } -#innerdocbody h1 span, #innerdocbody h1 span { +#innerdocbody h1 span { padding: 0; } From c7e86d38ff626ad6798c3aadee65b9439da37614 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 4 May 2020 15:50:46 +0200 Subject: [PATCH 17/40] Localisation updates from https://translatewiki.net. --- src/locales/da.json | 2 +- src/locales/he.json | 8 +++++--- src/locales/pt-br.json | 2 +- src/locales/pt.json | 9 ++++++--- src/locales/sv.json | 6 ++++-- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/locales/da.json b/src/locales/da.json index 9fe4c1020f1..41898f58ef7 100644 --- a/src/locales/da.json +++ b/src/locales/da.json @@ -120,7 +120,7 @@ "pad.userlist.guest": "Gæst", "pad.userlist.deny": "Nægt", "pad.userlist.approve": "Godkend", - "pad.editbar.clearcolors": "Fjern farver for ophavsmand i hele dokumentet?", + "pad.editbar.clearcolors": "Fjern farver for ophavsmand i hele dokumentet? Dette kan ikke fortrydes", "pad.impexp.importbutton": "Importer nu", "pad.impexp.importing": "Importerer...", "pad.impexp.confirmimport": "At importere en fil, vil overskrives den aktuelle pad tekst. Er du sikker på du vil fortsætte?", diff --git a/src/locales/he.json b/src/locales/he.json index c93f762a705..0f70ebf52e4 100644 --- a/src/locales/he.json +++ b/src/locales/he.json @@ -53,7 +53,7 @@ "pad.importExport.exportword": "מיקרוסופט וורד", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "באפשרותך לייבא מטקסט פשוט או מ־HTML. לאפשרויות ייבוא מתקדמות יותר יש להתקין AbiWord.", + "pad.importExport.abiword.innerHTML": "באפשרותך לייבא מטקסט פשוט או מ־HTML. לאפשרויות ייבוא מתקדמות יותר יש להתקין AbiWord או LibreOffice.", "pad.modals.connected": "מחובר.", "pad.modals.reconnecting": "מתבצע חיבור מחדש...", "pad.modals.forcereconnect": "לכפות חיבור מחדש", @@ -121,7 +121,7 @@ "pad.userlist.guest": "אורח", "pad.userlist.deny": "לדחות", "pad.userlist.approve": "לאשר", - "pad.editbar.clearcolors": "לנקות צבעים לסימון כותבים בכל המסמך?", + "pad.editbar.clearcolors": "לנקות צבעים לסימון כותבים בכל המסמך? זו פעולה בלתי הפיכה", "pad.impexp.importbutton": "לייבא כעת", "pad.impexp.importing": "ייבוא...", "pad.impexp.confirmimport": "ייבוא של קובץ יבטל את הטקסט הנוכחי בפנקס. האם ברצונך להמשיך?", @@ -130,5 +130,7 @@ "pad.impexp.uploadFailed": "ההעלאה נכשלה, נא לנסות שוב", "pad.impexp.importfailed": "הייבוא נכשל", "pad.impexp.copypaste": "נא להעתיק ולהדביק", - "pad.impexp.exportdisabled": "ייצוא בתסדיר {{type}} אינו פעיל. מנהל המערכת שלך יוכל לספר לך על זה עוד פרטים." + "pad.impexp.exportdisabled": "ייצוא בתסדיר {{type}} אינו פעיל. מנהל המערכת שלך יוכל לספר לך על זה עוד פרטים.", + "pad.impexp.maxFileSize": "הקובץ גדול מדי. נא ליצור קשר עם הנהלת האתר כדי להגדיל את הגודל המרבי שמותר לייבא.", + "pad.impexp.permission": "הייבוא מושבת כיוון שמעולם לא תרמת לפנקס הזה. נא לתרום לפחות פעם אחת בטרם ביצוע ניסיון ייבוא" } diff --git a/src/locales/pt-br.json b/src/locales/pt-br.json index 4c7f014b770..ffd7498d515 100644 --- a/src/locales/pt-br.json +++ b/src/locales/pt-br.json @@ -133,7 +133,7 @@ "pad.userlist.guest": "Convidado", "pad.userlist.deny": "Negar", "pad.userlist.approve": "Aprovar", - "pad.editbar.clearcolors": "Deseja limpar cores de autoria em todo o documento?", + "pad.editbar.clearcolors": "Limpar as cores de autoria em todo o documento? isto não pode ser anulado", "pad.impexp.importbutton": "Importar agora", "pad.impexp.importing": "Importando...", "pad.impexp.confirmimport": "Importar um arquivo sobrescreverá o texto atual da nota. Tem certeza de que deseja prosseguir?", diff --git a/src/locales/pt.json b/src/locales/pt.json index dea6c1d9a57..ea6e04ac5a0 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -7,6 +7,7 @@ "Imperadeiro98", "Luckas", "Macofe", + "Mansil alfalb", "Ti4goc", "Tuliouel", "Waldir", @@ -59,7 +60,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Só é possível importar texto sem formatação ou HTML. Para obter funcionalidades de importação mais avançadas, por favor instale o AbiWord.", + "pad.importExport.abiword.innerHTML": "Só pode importar texto sem formatação ou formatos HTML. Para funcionalidades de importação mais avançadas, por favor, instale o AbiWord ou LibreOffice.", "pad.modals.connected": "Ligado.", "pad.modals.reconnecting": "A restabelecer ligação ao seu bloco…", "pad.modals.forcereconnect": "Forçar restabelecimento de ligação", @@ -127,7 +128,7 @@ "pad.userlist.guest": "Convidado", "pad.userlist.deny": "Negar", "pad.userlist.approve": "Aprovar", - "pad.editbar.clearcolors": "Deseja limpar as cores de autoria em todo o documento?", + "pad.editbar.clearcolors": "Limpar as cores de autoria em todo o documento? isto não pode ser anulado", "pad.impexp.importbutton": "Importar agora", "pad.impexp.importing": "Importando...", "pad.impexp.confirmimport": "A importação de um ficheiro irá substituir o texto atual da nota. Tem certeza que deseja continuar?", @@ -136,5 +137,7 @@ "pad.impexp.uploadFailed": "O carregamento falhou; tente novamente, por favor", "pad.impexp.importfailed": "A importação falhou", "pad.impexp.copypaste": "Copie e insira, por favor", - "pad.impexp.exportdisabled": "A exportação no formato {{type}} está desativada. Por favor, contacte o administrador do sistema para mais informações." + "pad.impexp.exportdisabled": "A exportação no formato {{type}} está desativada. Por favor, contacte o administrador do sistema para mais informações.", + "pad.impexp.maxFileSize": "Ficheiro muito grande. Contacte o administrador do ''site'' para aumentar o tamanho do ficheiro permitido para importar", + "pad.impexp.permission": "A importação está desativada porque nunca contribuiu para este bloco. Por favor, contribua pelo menos uma vez antes de importar" } diff --git a/src/locales/sv.json b/src/locales/sv.json index e423e0a4198..f6c0c1989cc 100644 --- a/src/locales/sv.json +++ b/src/locales/sv.json @@ -52,7 +52,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Du kan endast importera från oformaterad text eller HTML-format. För mer avancerade importfunktioner, var god installera AbiWord.", + "pad.importExport.abiword.innerHTML": "Du kan endast importera från oformaterad text eller HTML-format. För mer avancerade importfunktioner, var god installera AbiWord eller LibreOffice.", "pad.modals.connected": "Ansluten.", "pad.modals.reconnecting": "Återansluter till ditt block...", "pad.modals.forcereconnect": "Tvinga återanslutning", @@ -129,5 +129,7 @@ "pad.impexp.uploadFailed": "Uppladdningen misslyckades, var god försök igen", "pad.impexp.importfailed": "Importering misslyckades", "pad.impexp.copypaste": "Var god kopiera och klistra in", - "pad.impexp.exportdisabled": "Exportering av formatet {{type}} är inaktiverad. Var god kontakta din systemadministratör för mer information." + "pad.impexp.exportdisabled": "Exportering av formatet {{type}} är inaktiverad. Var god kontakta din systemadministratör för mer information.", + "pad.impexp.maxFileSize": "Filen är för stor. Kontakta din systemadministratör för att öka den tillåtna filstorleken för importering", + "pad.impexp.permission": "Import är inaktiverat eftersom du aldrig har bidragit detta block. var god bidra minst en gång innan du importerar" } From 82d1179f24ae8463d94622eed06f53a55ce11d09 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 5 May 2020 12:36:57 +0200 Subject: [PATCH 18/40] timeslider: important fix pad content was cropped when bigger than screen size --- src/static/css/timeslider.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/static/css/timeslider.css b/src/static/css/timeslider.css index ef2ade0340b..35f7565967d 100644 --- a/src/static/css/timeslider.css +++ b/src/static/css/timeslider.css @@ -2,9 +2,6 @@ padding: 10px; display: block; } -#innerdocbody { - margin: 0 auto; -} .timeslider-bar { display: flex; @@ -128,7 +125,8 @@ white-space: normal; word-break: break-word; width: 100%; - height: 100%; + margin: 0 auto; + height: auto; } @media (max-width: 800px) { From 5f686a8acb04f363b7e192b85896a79792e24f23 Mon Sep 17 00:00:00 2001 From: muxator Date: Thu, 7 May 2020 12:57:42 +0200 Subject: [PATCH 19/40] ueberdb: update 0.4.5 -> 0.4.9 to fix a performance regression (#3975) --- src/package-lock.json | 12 ++++++------ src/package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/package-lock.json b/src/package-lock.json index aa721788f7c..848e0fce2f5 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -413,9 +413,9 @@ "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" }, "@types/node": { - "version": "13.13.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz", - "integrity": "sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==" + "version": "13.13.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.5.tgz", + "integrity": "sha512-3ySmiBYJPqgjiHA7oEaIo2Rzz0HrOZ7yrNO5HWyaE5q0lQ3BppDZ3N53Miz8bw2I7gh1/zir2MGVZBvpb1zq9g==" }, "@types/request": { "version": "2.48.4", @@ -7334,9 +7334,9 @@ } }, "ueberdb2": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-0.4.5.tgz", - "integrity": "sha512-D8TogZ6Dc4Ot909b0D0QQRSanVB3W4EtqA8smKEZS7H5eIbAWFOyBF74XADIB9f+NASSjdu8DU3EJeKe9Xdzjg==", + "version": "0.4.9", + "resolved": "https://registry.npmjs.org/ueberdb2/-/ueberdb2-0.4.9.tgz", + "integrity": "sha512-ZP7jhNtc7N3qogp9EYqBffC55KaxGZH3AgupzMh01DUr/E8QV2BU4THBpUVVJUGgoSBU8XxTkTMY9GOakJUTyA==", "requires": { "async": "^3.2.0", "cassandra-driver": "^4.5.0", diff --git a/src/package.json b/src/package.json index 5632ab61855..4eab0b3b0a8 100644 --- a/src/package.json +++ b/src/package.json @@ -61,7 +61,7 @@ "slide": "1.1.6", "socket.io": "2.1.1", "tinycon": "0.0.1", - "ueberdb2": "0.4.5", + "ueberdb2": "0.4.9", "uglify-js": "3.8.1", "underscore": "1.8.3", "unorm": "1.4.1" From 77b64bc4bc71dc27cc460f172a703d7941eff631 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 7 May 2020 17:08:23 +0200 Subject: [PATCH 20/40] Localisation updates from https://translatewiki.net. --- src/locales/eu.json | 2 +- src/locales/ru.json | 8 +++++--- src/locales/vec.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/locales/eu.json b/src/locales/eu.json index 1b8ae12b7e5..63058957266 100644 --- a/src/locales/eu.json +++ b/src/locales/eu.json @@ -78,7 +78,7 @@ "pad.modals.corruptPad.explanation": "Sartzen saiatzen ari zaren Pad-a hondatuta dago.", "pad.modals.corruptPad.cause": "Baliteke zerbitzari okerreko konfigurazioa edo beste ustekabeko portaera batzuk izatea. Jarri harremanetan zerbitzu-administratzailearekin.", "pad.modals.deleted": "Ezabatua.", - "pad.modals.deleted.explanation": "Pad hau ezabatua izan da.", + "pad.modals.deleted.explanation": "Pad hau ezabatu da.", "pad.modals.disconnected": "Deskonektatua izan zara.", "pad.modals.disconnected.explanation": "Zerbitzariaren konexioa galdu da", "pad.modals.disconnected.cause": "Baliteke zerbitzaria eskuragarri ez egotea. Mesedez, jakinarazi zerbitzuko administrariari honek gertatzen jarraitzen badu.", diff --git a/src/locales/ru.json b/src/locales/ru.json index 49d0bcee98d..5ad071d1945 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -59,7 +59,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (документ OpenOffice)", - "pad.importExport.abiword.innerHTML": "Вы можете импортировать только из обычного текста или HTML. Для более продвинутых функций импорта, пожалуйста,\n установите AbiWord.", + "pad.importExport.abiword.innerHTML": "Вы можете импортировать только из обычного текста или HTML. Для более продвинутых функций импорта установите AbiWord или LibreOffice.", "pad.modals.connected": "Подключен.", "pad.modals.reconnecting": "Повторное подключение к вашему документу", "pad.modals.forcereconnect": "Принудительное переподключение", @@ -127,7 +127,7 @@ "pad.userlist.guest": "Гость", "pad.userlist.deny": "Отклонить", "pad.userlist.approve": "Утвердить", - "pad.editbar.clearcolors": "Очистить авторские цвета во всем документе?", + "pad.editbar.clearcolors": "Очистить авторские цвета во всем документе? Это действие не может быть отменено.", "pad.impexp.importbutton": "Импортировать сейчас", "pad.impexp.importing": "Импортирование…", "pad.impexp.confirmimport": "Импорт файла перезапишет текущий текст. Вы уверены, что вы хотите продолжить?", @@ -136,5 +136,7 @@ "pad.impexp.uploadFailed": "Загрузка не удалась, пожалуйста, попробуйте ещё раз", "pad.impexp.importfailed": "Ошибка при импорте", "pad.impexp.copypaste": "Пожалуйста, скопируйте", - "pad.impexp.exportdisabled": "Экспорт в формате {{type}} отключён. Для подробной информации обратитесь к системному администратору." + "pad.impexp.exportdisabled": "Экспорт в формате {{type}} отключён. Для подробной информации обратитесь к системному администратору.", + "pad.impexp.maxFileSize": "Файл слишком большой. Обратитесь к администратору сайта, чтобы увеличить разрешённый размер файла для импорта", + "pad.impexp.permission": "Импорт отключен, поскольку вы никогда не вносили вклад в этот документ. Пожалуйста, внесите свой вклад хотя бы один раз перед импортом" } diff --git a/src/locales/vec.json b/src/locales/vec.json index 375390d7df0..36ac937867f 100644 --- a/src/locales/vec.json +++ b/src/locales/vec.json @@ -7,7 +7,7 @@ "index.newPad": "Novo Pad", "index.createOpenPad": "O creare o verxare on Pad co'l nome:", "pad.toolbar.bold.title": "Groseto (Ctrl-B)", - "pad.toolbar.italic.title": "Corsivo (Ctrl-I)", + "pad.toolbar.italic.title": "Corivo (Ctrl-I)", "pad.toolbar.underline.title": "Sotolineà (Ctrl-U)", "pad.toolbar.strikethrough.title": "Barà (Ctrl+5)", "pad.toolbar.ol.title": "Ełenco numarà (Ctrl+Shift+N)", From 253545712e320d25196aa6fc53dfe986e2b5f77a Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 11 May 2020 17:36:12 +0200 Subject: [PATCH 21/40] Localisation updates from https://translatewiki.net. --- src/locales/ja.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/locales/ja.json b/src/locales/ja.json index be13d483764..b4abd53c865 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -54,7 +54,7 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "プレーンテキストまたは HTML ファイルからのみインポートできます。より高度なインポート機能を使用するには、AbiWord をインストールしてください。", + "pad.importExport.abiword.innerHTML": "プレーンテキストまたは HTML ファイルからのみインポートできます。より高度なインポート機能を使用するには、AbiWord またはLibreOfficeをインストールしてください。", "pad.modals.connected": "接続されました。", "pad.modals.reconnecting": "パッドに再接続中...", "pad.modals.forcereconnect": "強制的に再接続", @@ -122,7 +122,7 @@ "pad.userlist.guest": "ゲスト", "pad.userlist.deny": "拒否", "pad.userlist.approve": "承認", - "pad.editbar.clearcolors": "文書全体の作者の色分けを消去しますか?", + "pad.editbar.clearcolors": "文書全体の作者の色分けを消去しますか? 取り消しはできません。", "pad.impexp.importbutton": "インポートする", "pad.impexp.importing": "インポート中...", "pad.impexp.confirmimport": "ファイルをインポートすると、パッドの現在のテキストが上書きされます。本当に続行しますか?", @@ -131,5 +131,7 @@ "pad.impexp.uploadFailed": "アップロードに失敗しました。もう一度お試しください", "pad.impexp.importfailed": "インポートに失敗しました", "pad.impexp.copypaste": "コピー & ペーストしてください", - "pad.impexp.exportdisabled": "{{type}}形式でのエクスポートは無効になっています。詳細はシステム管理者にお問い合わせください。" + "pad.impexp.exportdisabled": "{{type}}形式でのエクスポートは無効になっています。詳細はシステム管理者にお問い合わせください。", + "pad.impexp.maxFileSize": "ファイルが重すぎます。サイト管理者に連絡してインポート可能なファイルサイズの上限を引き上げてもらう必要があります", + "pad.impexp.permission": "このパッドに寄稿した実績がないため、インポートを無効にしました。まず寄稿をしてから再度、インポートしてください" } From 35f021705610a91490094c47327e44815d38be12 Mon Sep 17 00:00:00 2001 From: b_b Date: Wed, 13 May 2020 12:25:57 +0200 Subject: [PATCH 22/40] typo on index.html hooks (#3982) just a typo, maybe the smallest commit in this repo :p --- doc/api/hooks_server-side.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/hooks_server-side.md b/doc/api/hooks_server-side.md index edf2051a569..a89ee560bd8 100644 --- a/doc/api/hooks_server-side.md +++ b/doc/api/hooks_server-side.md @@ -91,7 +91,7 @@ Available blocks in `pad.html` are: * `timesliderEditbarRight` * `modals` - `index.html` blocks: +`index.html` blocks: * `indexWrapper` - contains the form for creating new pads From fda0d2884e90e6a648001dba71c7c446cb3f270f Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 5 May 2020 18:12:14 +0300 Subject: [PATCH 23/40] iframe attribute: move quote --- src/static/js/pad_editbar.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js index c832e973217..fc9ba198a47 100644 --- a/src/static/js/pad_editbar.js +++ b/src/static/js/pad_editbar.js @@ -297,13 +297,13 @@ var padeditbar = (function() { var basePath = document.location.href.substring(0, document.location.href.indexOf("/p/")); var readonlyLink = basePath + "/p/" + clientVars.readOnlyId; - $('#embedinput').val(''); + $('#embedinput').val(''); $('#linkinput').val(readonlyLink); } else { var padurl = window.location.href.split("?")[0]; - $('#embedinput').val(''); + $('#embedinput').val(''); $('#linkinput').val(padurl); } }, From 95fd5ce2a45e31980ad8c2562e3fe6f77c52d4ff Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 28 Apr 2020 17:22:26 +0200 Subject: [PATCH 24/40] assets: add random string to query string to bust cache on restart and deploys After each Eterpad restart, the clients will request a new version of the static assets, even if they are not modified. This is the price we pay for knowing that no stale files are going to be served ever again. We could also have used a salted hash of the Etherpad version, but we chose the simpler way. For the rationale behind using a random string at each restart, see #3958. ACHTUNG: this may prevent caching HTTP proxies to work. Closes #3955. --- src/node/utils/Settings.js | 14 ++++++++++++++ src/templates/index.html | 8 ++++---- src/templates/pad.html | 20 ++++++++++---------- src/templates/timeslider.html | 24 ++++++++++++------------ 4 files changed, 40 insertions(+), 26 deletions(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 369a4485f5f..c8f2ec1594c 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -42,6 +42,20 @@ var _ = require("underscore"); exports.root = absolutePaths.findEtherpadRoot(); console.log(`All relative paths will be interpreted relative to the identified Etherpad base dir: ${exports.root}`); +/* + * At each start, Etherpad generates a random string and appends it as query + * parameter to the URLs of the static assets, in order to force their reload. + * Subsequent requests will be cached, as long as the server is not reloaded. + * + * For the rationale behind this choice, see + * https://github.com/ether/etherpad-lite/pull/3958 + * + * ACHTUNG: this may prevent caching HTTP proxies to work + * TODO: remove the "?v=randomstring" parameter, and replace with hashed filenames instead + */ +exports.randomVersionString = randomString(4); +console.log(`Random string used for versioning assets: ${exports.randomVersionString}`); + /** * The app title, visible e.g. in the browser window */ diff --git a/src/templates/index.html b/src/templates/index.html index 0e36f71cc64..4fb8104787f 100644 --- a/src/templates/index.html +++ b/src/templates/index.html @@ -35,8 +35,8 @@ - - + + - +
<% e.begin_block("indexWrapper"); %> @@ -171,7 +171,7 @@ <% e.end_block(); %>
- + - + + @@ -435,10 +435,10 @@

Skin Builder

<% e.begin_block("scripts"); %> - + - + - + - - + + <% e.begin_block("customScripts"); %> - + <% e.end_block(); %> diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html index 2368f0ea1fd..5d826ceebe2 100644 --- a/src/templates/timeslider.html +++ b/src/templates/timeslider.html @@ -35,18 +35,18 @@ <% e.begin_block("timesliderStyles"); %> - - - - - + + + + + <% e.end_block(); %> <% e.begin_block("timesliderScripts"); %> - - + + <% e.end_block(); %> @@ -245,14 +245,14 @@

- - + + - - + + - +