From 9f13d3b79aebbec834c9eb27c1431a476fb318c6 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Wed, 14 Jun 2023 03:35:21 +0300 Subject: [PATCH 1/4] fix: edit links --- layouts/partials/page-meta-links.html | 54 +++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 layouts/partials/page-meta-links.html diff --git a/layouts/partials/page-meta-links.html b/layouts/partials/page-meta-links.html new file mode 100644 index 0000000..16e5a74 --- /dev/null +++ b/layouts/partials/page-meta-links.html @@ -0,0 +1,54 @@ +{{ if .File }} +{{ $pathFormatted := replace .File.Path "\\" "/" -}} +{{ $gh_repo := ($.Param "github_repo") -}} +{{ $gh_url := ($.Param "github_url") -}} +{{ $gh_subdir := ($.Param "github_subdir") -}} +{{ $gh_project_repo := ($.Param "github_project_repo") -}} +{{ $gh_branch := (default "main" ($.Param "github_branch")) -}} +
+{{ if $gh_url -}} + {{ warnf "Warning: use of `github_url` is deprecated. For details see https://www.docsy.dev/docs/adding-content/repository-links/#github_url-optional" -}} + {{ T "post_edit_this" }} +{{ else if $gh_repo -}} + {{ $gh_repo_path := printf "%s/content/%s" $gh_branch $pathFormatted -}} + {{ if and ($gh_subdir) (.Site.Language.Lang) -}} + {{ $gh_repo_path = printf "%s/%s/content/%s/%s" $gh_branch $gh_subdir ($.Site.Language.Lang) $pathFormatted -}} + {{ else if .Site.Language.Lang -}} + {{ $gh_repo_path = printf "%s/content/%s/%s" $gh_branch ($.Site.Language.Lang) $pathFormatted -}} + {{ else if $gh_subdir -}} + {{ $gh_repo_path = printf "%s/%s/content/%s" $gh_branch $gh_subdir $pathFormatted -}} + {{ end -}} + + {{/* Adjust $gh_repo_path based on path_base_for_github_subdir */ -}} + {{ $ghs_base := $.Param "path_base_for_github_subdir" -}} + {{ $ghs_rename := "" -}} + {{ if reflect.IsMap $ghs_base -}} + {{ $ghs_rename = $ghs_base.to -}} + {{ $ghs_base = $ghs_base.from -}} + {{ end -}} + {{ with $ghs_base -}} + {{ $gh_repo_path = replaceRE . $ghs_rename $gh_repo_path -}} + {{ end -}} + + {{ $viewURL := printf "%s/src/branch/%s" $gh_repo $gh_repo_path -}} + {{ $editURL := printf "%s/_edit/%s" $gh_repo $gh_repo_path -}} + {{ $issuesURL := printf "%s/issues/new?title=%s" $gh_repo (safeURL $.Title ) -}} + {{ $newPageStub := resources.Get "stubs/new-page-template.md" -}} + {{ $newPageQS := querify "value" $newPageStub.Content "filename" "change-me.md" | safeURL -}} + {{ $newPageURL := printf "%s/_new/%s?%s" $gh_repo $gh_repo_path $newPageQS -}} + + {{ T "post_view_this" }} + {{ T "post_edit_this" }} + {{ T "post_create_child_page" }} + {{ T "post_create_issue" }} + {{ with $gh_project_repo -}} + {{ $project_issueURL := printf "%s/issues/new" . -}} + {{ T "post_create_project_issue" }} + {{ end -}} + +{{ end -}} +{{ with .CurrentSection.AlternativeOutputFormats.Get "print" -}} + {{ T "print_entire_section" }} +{{ end }} +
+{{ end -}} From fe50e2c39ca835193e0076fd98bfba63344413ab Mon Sep 17 00:00:00 2001 From: Inex Code Date: Thu, 3 Aug 2023 13:44:47 +0300 Subject: [PATCH 2/4] chroe: deprecations in hugo config --- config.toml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/config.toml b/config.toml index 0d72c16..c8b1422 100644 --- a/config.toml +++ b/config.toml @@ -23,13 +23,13 @@ category = "categories" [params.taxonomy] # set taxonomyCloud = [] to hide taxonomy clouds -taxonomyCloud = ["tags", "categories"] +taxonomyCloud = ["tags", "categories"] # If used, must have same length as taxonomyCloud -taxonomyCloudTitle = ["Tag Cloud", "Categories"] +taxonomyCloudTitle = ["Tag Cloud", "Categories"] # set taxonomyPageHeader = [] to hide taxonomies on the page headers -taxonomyPageHeader = ["tags", "categories"] +taxonomyPageHeader = ["tags", "categories"] # Highlighting config @@ -61,15 +61,17 @@ anchor = "smart" [languages] [languages.en] title = "SelfPrivacy" -description = "SelfPrivacy app allows you to set up self-hosted services and manage them." languageName ="English" # Weight used for sorting. weight = 1 +[languages.en.params] +description = "SelfPrivacy app allows you to set up self-hosted services and manage them." [languages.ru] title = "SelfPrivacy" -description = "Приложение SelfPrivacy поможет настроить селфхост-сервисы и управлять ими" languageName ="Русский" contentDir = "content/ru" +[languages.ru.params] +description = "Приложение SelfPrivacy поможет настроить селфхост-сервисы и управлять ими" time_format_default = "02.01.2006" time_format_blog = "02.01.2006" @@ -100,13 +102,13 @@ privacy_policy = "https://selfprivacy.org/privacy-policy/" # This menu appears only if you have at least one [params.versions] set. version_menu = "Releases" -# Flag used in the "version-banner" partial to decide whether to display a +# Flag used in the "version-banner" partial to decide whether to display a # banner on every page indicating that this is an archived version of the docs. # Set this flag to "true" if you want to display the banner. archived_version = false # The version number for the version of the docs represented in this doc set. -# Used in the "version-banner" partial to display a version number for the +# Used in the "version-banner" partial to display a version number for the # current doc set. version = "0.0" @@ -164,7 +166,7 @@ yes = 'Glad to hear it! Please tell us how we can improve.' # Adds a reading time to the top of each doc. -# If you want this feature, but occasionally need to remove the Reading time from a single page, +# If you want this feature, but occasionally need to remove the Reading time from a single page, # add "hide_readingtime: true" to the page's front matter [params.ui.readingtime] enable = true @@ -216,4 +218,4 @@ enable = true disable = false [[module.imports]] path = "github.com/google/docsy/dependencies" - disable = false \ No newline at end of file + disable = false From 336944a1d9bb57db30ba5cd2d45b21495abd83b6 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Thu, 3 Aug 2023 14:41:34 +0300 Subject: [PATCH 3/4] docs: Add "supported by" block --- assets/scss/_styles_project.scss | 22 +++++++++++- content/en/_index.html | 22 ++++++++++-- content/ru/_index.html | 26 ++++++++++++-- .../images/logos/PrivacyAcceleratorLogo.svg | 2 ++ static/images/logos/nlnet.svg | 34 +++++++++++++++++++ 5 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 static/images/logos/PrivacyAcceleratorLogo.svg create mode 100644 static/images/logos/nlnet.svg diff --git a/assets/scss/_styles_project.scss b/assets/scss/_styles_project.scss index 4b324d7..0ab247b 100644 --- a/assets/scss/_styles_project.scss +++ b/assets/scss/_styles_project.scss @@ -83,4 +83,24 @@ .tab-content .tab-pane { max-width: 100% !important; -} \ No newline at end of file +} + +.sp-supperted-by-img { + max-height: 5rem; + margin: 1rem; +} + +.sp-supported-by-list { + display: flex; + align-items: center; + justify-content: space-around; + flex-wrap: wrap; +} + +.sp-supported-by-card { + background: #FFFFFF; + box-shadow: 0 8px 8px rgba(0, 0, 0, 0.25); + border-radius: 10px; + border: none; + margin-top: 1rem; +} diff --git a/content/en/_index.html b/content/en/_index.html index d56f5fa..23aa4ff 100644 --- a/content/en/_index.html +++ b/content/en/_index.html @@ -57,7 +57,7 @@ linkTitle = "SelfPrivacy" {{< /blocks/section >}} -{{< blocks/section color="white" type="section" >}} +{{< blocks/section color="100" type="section" >}}

Your personal services

@@ -131,7 +131,7 @@ linkTitle = "SelfPrivacy" {{< /blocks/section >}} -{{< blocks/section color="white" type="section" >}} +{{< blocks/section color="100" type="section" >}}

Advantages

@@ -178,3 +178,21 @@ linkTitle = "SelfPrivacy" {{< /blocks/section >}} +{{< blocks/section color="100" type="section" >}} + +
+

Supported by

+
+ +
+
+ + NLnet foundation + + + Privacy Accelerator + +
+
+ +{{< /blocks/section >}} diff --git a/content/ru/_index.html b/content/ru/_index.html index c92ebcb..19b3166 100644 --- a/content/ru/_index.html +++ b/content/ru/_index.html @@ -60,7 +60,7 @@ linkTitle = "SelfPrivacy" {{< /blocks/section>}} - {{< blocks/section color="white" type="section">}} + {{< blocks/section color="100" type="section">}}

Ваши личные сервисы

@@ -142,7 +142,7 @@ linkTitle = "SelfPrivacy" {{< /blocks/section>}} -{{< blocks/section color="white" type="section">}} +{{< blocks/section color="100" type="section">}}

Преимущества

@@ -186,4 +186,24 @@ linkTitle = "SelfPrivacy"

Почему корпорациям так нужны ваши данные? Чтобы больше покупали, чтобы Вы голосовали, как им нужно. В SelfPrivacy ваши данные остаются только у вас.

{{< /landing-feature>}} -{{< /blocks/section>}} \ No newline at end of file +{{< /blocks/section>}} + + +{{< blocks/section color="100" type="section" >}} + +
+

Нас поддерживают

+
+ +
+
+ + NLnet foundation + + + Privacy Accelerator + +
+
+ +{{< /blocks/section >}} diff --git a/static/images/logos/PrivacyAcceleratorLogo.svg b/static/images/logos/PrivacyAcceleratorLogo.svg new file mode 100644 index 0000000..9e1b110 --- /dev/null +++ b/static/images/logos/PrivacyAcceleratorLogo.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/static/images/logos/nlnet.svg b/static/images/logos/nlnet.svg new file mode 100644 index 0000000..248e59c --- /dev/null +++ b/static/images/logos/nlnet.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From c23a5b25e8b1594577e5116e191fb89c50538b04 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Fri, 25 Aug 2023 14:13:26 +0300 Subject: [PATCH 4/4] fix: incosistent naming --- content/en/docs/How To Guides/root_ssh/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/How To Guides/root_ssh/_index.md b/content/en/docs/How To Guides/root_ssh/_index.md index 1cf45ec..89e1af5 100644 --- a/content/en/docs/How To Guides/root_ssh/_index.md +++ b/content/en/docs/How To Guides/root_ssh/_index.md @@ -81,7 +81,7 @@ To access your server's root shell you will have to generate your SSH key and ad ## How to access your server's root shell via SSH 1. Open the terminal or Command Prompt. -2. Run the following command, replacing `server_ip` with your server's domain: +2. Run the following command, replacing `server_domain` with your server's domain: ```bash ssh root@server_domain ```