From 586c64ff7629bd6986d115b9d0a2a5576bd1a67b Mon Sep 17 00:00:00 2001 From: Julien Gomes Dias Date: Sun, 7 Feb 2021 18:51:31 +0100 Subject: [PATCH 01/16] Quelques traductions de doc et WYNH --- pages/00.home/docs.ar.md | 7 +++++-- .../01.selfhosting/01.whatisyunohost/whatsyunohost.ar.md | 8 +++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pages/00.home/docs.ar.md b/pages/00.home/docs.ar.md index 020e7c13..61358300 100644 --- a/pages/00.home/docs.ar.md +++ b/pages/00.home/docs.ar.md @@ -16,13 +16,16 @@ routes: يحتوي على كافة المعلومات التي تخصنا و أسلوب عملنا و مساهمتنا * Project's life: - * [Frequently asked questions](/faq) + * [Frequently asked questions](/help/faq) + * [Project news](/news) * [Project organization](/project_organization) - * [Blog](https://forum.yunohost.org/c/announcement) + * [Project budget](/project_budget) * [Forum](https://forum.yunohost.org) * [Chat rooms](/chat_rooms) * [Communication](/communication) * [Support / Help](/help) + * [Sponsors and partners](/sponsors_partners) * استخدم مثال: * [YunoHost للمنظمات غير الهادفة للربح](/use_case_non-profit_organisations) + * (FR) [YunoHost for CHATONS (A collective of independant, transparent, open, neutral and ethical hosters providing FLOSS-based online services.)](https://wiki.chatons.org/doku.php/yunohost) diff --git a/pages/01.administrate/01.selfhosting/01.whatisyunohost/whatsyunohost.ar.md b/pages/01.administrate/01.selfhosting/01.whatisyunohost/whatsyunohost.ar.md index aa21bd3c..157337f9 100644 --- a/pages/01.administrate/01.selfhosting/01.whatisyunohost/whatsyunohost.ar.md +++ b/pages/01.administrate/01.selfhosting/01.whatisyunohost/whatsyunohost.ar.md @@ -25,10 +25,14 @@ routes: - نظام للنسخ الإحتياطي - نظام لإعادة توليد الإعدادات و الخدمات +--- + ### أصل فكرة المشروع + تعود نشأة فكرة مشروع واي يونوهوست YunoHost إلى شهر فيفري مِن عام 2012 بعد محادثة بدأت على هذا الشكل تقريبًا : -

« تبًا، لقد سئِمتُ مِن إعادة إعداد خادم البريد الإلكتروني ... Beudbeud، كيف قُمتَ بإعداد خادومك الجميل حول LDAP ؟ »

+ +
« تبًا، لقد سئِمتُ مِن إعادة إعداد خادم البريد الإلكتروني ... Beudbeud، كيف قُمتَ بإعداد خادومك الجميل حول LDAP ؟ » Kload، فيفري 2012
Il ne manquait en fait qu’une interface d’administration au serveur de Beudbeud pour en faire quelque chose d’exploitable, alors Kload a décidé de la développer. Finalement, après l’automatisation de quelques configurations et le packaging de quelques applications web, la première version de YunoHost était sortie. @@ -38,6 +42,7 @@ Constatant l’engouement croissant autour de YunoHost et de l’auto-hébergeme --- ### الهدف + يهدف واي يونوهوست YunoHost إلى تسهيل عملية تنصيب و تثبيت و إدارة أي خادمٍ لأكبر عدد ممكن مِن الناس و ذلك دون المساس بجودة و موثوقية البرمجيات. لم يُدَّخر أي جهد لتسهيل عملية التنصيب و الإنبساط وذلك على أكبر عدد ممكن مِن الأجهزة مهما اختلفت مميزات كل جهاز (في المنزل أو على خادوم إستضافة أو على خادوم شخصي إفتراضي) @@ -64,6 +69,7 @@ Le tout est bien entendu **entièrement libre**. La philosophie de l’[الإس ### الأمان لقد بُذِلت كل المجهودات مِن أجل تأمين واي يونوهوست YunoHost و **تعمية و تشفير البروتوكولات** . بإمكانكم الإطلاع على الشرح بتفاصيليه هنا. + --- ### واي يونوهوست YunoHost ليس From 638f094ddb091b3130872953033cead97f798ac6 Mon Sep 17 00:00:00 2001 From: Julien Gomes Dias Date: Sun, 7 Feb 2021 18:51:53 +0100 Subject: [PATCH 02/16] Sidebar 1st try --- themes/yunohost-docs/css/custom.css | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index d6cbd105..85554b13 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -1,5 +1,5 @@ .off-canvas .learn-sidebar:before { - background: dimgrey; + background: none; } .highlightable h5:first-of-type { @@ -128,3 +128,19 @@ img#whitelogo { .simplebar-content h5:first-child { display: none; } + +/* Sidebar */ + +#sidebar-id { + background-color: white; +} + +body .off-canvas .learn-sidebar a { + color: #364149; +} + +body .off-canvas .learn-sidebar .learn-nav ul li.active > a { + color: black; + border-right: black 1px solid; +} + From aa33ceff30c8ae391d069919be63f834d7758387 Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 19:28:29 +0100 Subject: [PATCH 03/16] Essaies sur la sidebar --- themes/yunohost-docs/css/custom.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index 85554b13..e431e036 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -144,3 +144,6 @@ body .off-canvas .learn-sidebar .learn-nav ul li.active > a { border-right: black 1px solid; } +body .off-canvas .learn-sidebar .learn-brand #logo path { + background: black!important; +} From 44fa52746a8dae18715901760a4b7708d37efb08 Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 19:29:24 +0100 Subject: [PATCH 04/16] typo --- themes/yunohost-docs/css/custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index e431e036..55f1efe2 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -145,5 +145,5 @@ body .off-canvas .learn-sidebar .learn-nav ul li.active > a { } body .off-canvas .learn-sidebar .learn-brand #logo path { - background: black!important; + fill: black!important; } From 855f50d0827356e969f2d15b9e38f2232a2fd13a Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 19:35:16 +0100 Subject: [PATCH 05/16] Theme blanc --- themes/yunohost-docs/css/custom.css | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index 55f1efe2..96cbc7bd 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -132,7 +132,7 @@ img#whitelogo { /* Sidebar */ #sidebar-id { - background-color: white; + background-color: #fffefe; } body .off-canvas .learn-sidebar a { @@ -141,9 +141,23 @@ body .off-canvas .learn-sidebar a { body .off-canvas .learn-sidebar .learn-nav ul li.active > a { color: black; - border-right: black 1px solid; + border-left: black 2px solid; + background-color: #AAA; } body .off-canvas .learn-sidebar .learn-brand #logo path { fill: black!important; } + + +body #top-bar #breadcrumbs > span span, #top-bar #breadcrumbs > a span { + font-size: 0.7rem; +} + +body #top-bar a:visited { + color: #3e7694; +} + +body #top-bar a:hover { + text-decoration: underline; +} \ No newline at end of file From b5d4cb78c2da190d516c06d352e27eec68be69fd Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 19:39:33 +0100 Subject: [PATCH 06/16] =?UTF-8?q?Th=C3=A8me=20blanc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- themes/yunohost-docs/css/custom.css | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index 96cbc7bd..49b8c1de 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -150,6 +150,10 @@ body .off-canvas .learn-sidebar .learn-brand #logo path { } +body .off-canvas .learn-sidebar .searchbox ::placeholder { + +} + body #top-bar #breadcrumbs > span span, #top-bar #breadcrumbs > a span { font-size: 0.7rem; } @@ -160,4 +164,14 @@ body #top-bar a:visited { body #top-bar a:hover { text-decoration: underline; -} \ No newline at end of file +} + +body .off-canvas .learn-sidebar .searchbox ::placeholder { + color: rgba(68, 68, 68, 0.8); +} + +body .off-canvas .learn-sidebar a:hover { + color: black; + text-decoration: underline black; +} + From a2f66d2beeb5a3b8eeb44269ccc87967ed52a8d3 Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 19:41:26 +0100 Subject: [PATCH 07/16] idem --- themes/yunohost-docs/css/custom.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index 49b8c1de..dc5a0b8b 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -171,7 +171,6 @@ body .off-canvas .learn-sidebar .searchbox ::placeholder { } body .off-canvas .learn-sidebar a:hover { - color: black; - text-decoration: underline black; + color: #bbb; } From 7db3d4b076697716d2524b61dc0b4c56da9c13bc Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 21:31:25 +0100 Subject: [PATCH 08/16] Language fallback --- config/system.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/system.yaml b/config/system.yaml index 1909112d..0022670c 100644 --- a/config/system.yaml +++ b/config/system.yaml @@ -210,3 +210,6 @@ strict_mode: yaml_compat: true twig_compat: true blueprint_compat: true +translations_fallback: + en: 'fr,de,es' + de: 'en,fr,es' From 265bc6ca0d7a866d6174fd54d6915a6f7a6c106c Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 21:36:38 +0100 Subject: [PATCH 09/16] idem --- config/system.yaml | 2 +- themes/yunohost-docs/css/custom.css | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/system.yaml b/config/system.yaml index 0022670c..37ec0990 100644 --- a/config/system.yaml +++ b/config/system.yaml @@ -30,7 +30,7 @@ languages: http_accept_language: false override_locale: false content_fallback: { } - pages_fallback_only: false + pages_fallback_only: true home: alias: /home hide_in_urls: false diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index dc5a0b8b..d8afd1fa 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -141,8 +141,7 @@ body .off-canvas .learn-sidebar a { body .off-canvas .learn-sidebar .learn-nav ul li.active > a { color: black; - border-left: black 2px solid; - background-color: #AAA; + background-color: transparent; } body .off-canvas .learn-sidebar .learn-brand #logo path { @@ -174,3 +173,8 @@ body .off-canvas .learn-sidebar a:hover { color: #bbb; } +body #header .off-canvas .learn-sidebar a:hover { + color: black; + text-decoration: underline black; +} + From 97c3a5d764595c34aa15505875b0c55c9aed6990 Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 21:43:36 +0100 Subject: [PATCH 10/16] Language fallback --- config/system.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/system.yaml b/config/system.yaml index 37ec0990..04d44e8c 100644 --- a/config/system.yaml +++ b/config/system.yaml @@ -31,6 +31,9 @@ languages: override_locale: false content_fallback: { } pages_fallback_only: true + translations_fallback: + en: 'fr,de,es' + de: 'en,fr,es' home: alias: /home hide_in_urls: false @@ -210,6 +213,3 @@ strict_mode: yaml_compat: true twig_compat: true blueprint_compat: true -translations_fallback: - en: 'fr,de,es' - de: 'en,fr,es' From 25dfcdd3234c10a144cfb65ba3ebab8c5b81e527 Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 22:03:27 +0100 Subject: [PATCH 12/16] Contrasting color (link + sidebar entry) --- themes/yunohost-docs/css/custom.css | 79 ++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index d8afd1fa..e8a98789 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -170,7 +170,7 @@ body .off-canvas .learn-sidebar .searchbox ::placeholder { } body .off-canvas .learn-sidebar a:hover { - color: #bbb; + color: #37419a; } body #header .off-canvas .learn-sidebar a:hover { @@ -178,3 +178,80 @@ body #header .off-canvas .learn-sidebar a:hover { text-decoration: underline black; } +body .off-canvas .learn-sidebar .learn-nav ul li a > span > b { + color: black; +} + +body .off-canvas .learn-sidebar .learn-nav ul li ul li.active > a { + background-color: #2f2f2f52; +} + +body .off-canvas .learn-sidebar .learn-nav .read-icon { + color: rgba(0, 0, 0, 0.6); +} + +/* +############################################################################### + Style sheet for the cards +############################################################################### +*/ +.hardware-image #cards-list:after { + content:''; + display:block; + clear: both; +} + +.hardware-image .card { + margin-bottom:20px; + width:270px; + float:left; + min-height: 1px; + margin-right: 10px; + margin-left: 10px; +} + +.hardware-image .card .panel-body > h3 { + margin-top:0; + margin-bottom:5px; + font-size:1.2em; +} + +.hardware-image .card-desc { + height:135px; + overflow: hidden; +} + +.hardware-image .card .btn-group { + width:100%; + margin-left: 0px; +} +.hardware-image .card > .btn-group > .btn{ + border-bottom:0; +} +.hardware-image .card > .btn-group { + border-left:0; + border-top-left-radius:0; + border-top-right-radius:0; + margin-left: 0px; +} +.hardware-image .card-comment { + font-size: 0.8em; + margin-top:-5px; +} +.hardware-image .card > .annotations { + text-align:center; + font-size:small; +} +.hardware-image .card img { + margin: 1rem auto; +} +.hardware-image .btn-group .btn.btn-info { + color: #ffffff; + background-color: #5bc0de; + border-color: #46b8da; +} +.hardware-image .btn-group .btn.btn-info:hover, .btn.btn-info:focus { + color: #ffffff; + background-color: #39b3d7; + border-color: #269abc; +} From 15cba34352b4b75b48781c33b397d67388a2fb09 Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 22:07:47 +0100 Subject: [PATCH 13/16] [fix] contrast between links --- themes/yunohost-docs/css/custom.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index e8a98789..5c826415 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -186,10 +186,14 @@ body .off-canvas .learn-sidebar .learn-nav ul li ul li.active > a { background-color: #2f2f2f52; } -body .off-canvas .learn-sidebar .learn-nav .read-icon { +body .off-canvas .learn-sidebar .learn-nav .read-icon, body .off-canvas .learn-sidebar .searchbox { color: rgba(0, 0, 0, 0.6); } +body .off-canvas .learn-sidebar .searchbox input { + color: rgb(78, 78, 78); +} + /* ############################################################################### Style sheet for the cards From d1104b44725c0ab0e1c64a67b02a99f0af52ca9b Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 22:14:44 +0100 Subject: [PATCH 14/16] Contrast with border in sidebar --- themes/yunohost-docs/css/custom.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index 5c826415..9c88f4d7 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -183,7 +183,8 @@ body .off-canvas .learn-sidebar .learn-nav ul li a > span > b { } body .off-canvas .learn-sidebar .learn-nav ul li ul li.active > a { - background-color: #2f2f2f52; + background-color: #7f7f7f3d; + border-left: black 2px solid; } body .off-canvas .learn-sidebar .learn-nav .read-icon, body .off-canvas .learn-sidebar .searchbox { From 5211983eeb3795302594697dabbb77fc7bc308a3 Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 22:28:56 +0100 Subject: [PATCH 15/16] [fix] Color for language selection --- themes/yunohost-docs/css/custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index 9c88f4d7..76922be9 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -187,7 +187,7 @@ body .off-canvas .learn-sidebar .learn-nav ul li ul li.active > a { border-left: black 2px solid; } -body .off-canvas .learn-sidebar .learn-nav .read-icon, body .off-canvas .learn-sidebar .searchbox { +body .off-canvas .learn-sidebar .learn-nav .read-icon, body .off-canvas .learn-sidebar .searchbox, body .off-canvas .learn-sidebar .search-options .version-chooser select { color: rgba(0, 0, 0, 0.6); } From 16e1d8e45209a83a4f1e098dd7e247981d2216cf Mon Sep 17 00:00:00 2001 From: frju365 Date: Sun, 7 Feb 2021 22:46:16 +0100 Subject: [PATCH 16/16] [fix] Fix fallback --- config/system.yaml | 10 +++++----- themes/yunohost-docs/css/custom.css | 5 ----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/config/system.yaml b/config/system.yaml index 04d44e8c..b4cc57c8 100644 --- a/config/system.yaml +++ b/config/system.yaml @@ -23,17 +23,17 @@ languages: - ar default_lang: null include_default_lang: true - include_default_lang_file_extension: true + include_default_lang_file_extension: false translations: true translations_fallback: true session_store_active: true - http_accept_language: false + http_accept_language: true override_locale: false - content_fallback: { } - pages_fallback_only: true - translations_fallback: + content_fallback: en: 'fr,de,es' de: 'en,fr,es' + es: 'en,fr,de' + pages_fallback_only: true home: alias: /home hide_in_urls: false diff --git a/themes/yunohost-docs/css/custom.css b/themes/yunohost-docs/css/custom.css index 76922be9..ead0ef98 100644 --- a/themes/yunohost-docs/css/custom.css +++ b/themes/yunohost-docs/css/custom.css @@ -148,11 +148,6 @@ body .off-canvas .learn-sidebar .learn-brand #logo path { fill: black!important; } - -body .off-canvas .learn-sidebar .searchbox ::placeholder { - -} - body #top-bar #breadcrumbs > span span, #top-bar #breadcrumbs > a span { font-size: 0.7rem; }