diff --git a/.gitmodules b/.gitmodules
index 1a5cc87..a100308 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "themes/hugo-PaperMod"]
path = themes/hugo-PaperMod
- url = https://github.com/monal-im/hugo-PaperMod.git
+ url = https://github.com/adityatelange/hugo-PaperMod.git
diff --git a/static/favicons/ms-icon-310x310.png b/assets/favicons/logo.png
similarity index 100%
rename from static/favicons/ms-icon-310x310.png
rename to assets/favicons/logo.png
diff --git a/config.yml b/config.yml
index 120869c..1641231 100644
--- a/config.yml
+++ b/config.yml
@@ -1,14 +1,41 @@
-baseURL: "" # We will enter the FULL_URL after the site is published. So it's empty now
+baseURL: ""
title: Monal
paginate: 5
theme: hugo-PaperMod
-enableInlineShortcodes: true
-enableRobotsTXT: true
-buildDrafts: false
-buildFuture: false
-buildExpired: false
-enableEmoji: true
+params:
+ env: production
+ description: "Monal IM - https://github.com/monal-im/monal"
+ author: "Monal IM"
+ # author: ["Me", "You"] # multiple authors
+
+ ShowFullTextinRSS: true
+ ShowRssButtonInSectionTermList: true
+ tocopen: false
+ ShowToc: false
+ comments: false
+ hidemeta: false
+ searchHidden: false
+
+ defaultTheme: auto
+ DateFormat: "02.01.2006"
+ disableThemeToggle: false
+ ShowShareButtons: false
+ ShowReadingTime: true
+ disableSpecial1stPost: true
+ displayFullLangName: true
+ ShowPostNavLinks: false
+ ShowBreadCrumbs: false
+ ShowCodeCopyButtons: true
+ disableScrollToTop: false
+ rss: true
+ hideSummary: false
+ enableInlineShortcodes: true
+ enableRobotsTXT: true
+ buildDrafts: false
+ buildFuture: false
+ buildExpired: false
+ enableEmoji: true
minify:
disableXML: false
@@ -21,13 +48,13 @@ languages:
showInHeader: true
weight: 0
profileMode:
- enabled: true # needs to be explicitly set
+ enabled: true
title: "Monal IM"
subtitle: "iOS and macOS XMPP Chat-Client"
- imageUrl: "favicons/ms-icon-310x310.png" # optional
- imageTitle: "Monal App Icon" # optional
- imageWidth: 120 # custom size
- imageHeight: 120 # custom size
+ imageUrl: "favicons/logo.png"
+ imageTitle: "Monal App Icon"
+ imageWidth: 120
+ imageHeight: 120
buttons:
- name: "Get Monal iOS"
url: "https://apps.apple.com/app/id317711500"
@@ -71,13 +98,13 @@ languages:
showInHeader: false
weight: 1
profileMode:
- enabled: true # needs to be explicitly set
+ enabled: true
title: "Monal IM"
subtitle: "IOS und MacOS Chatten"
- imageUrl: "favicons/ms-icon-310x310.png" # optional
- imageTitle: "Monal App Icon" # optional
- imageWidth: 120 # custom size
- imageHeight: 120 # custom size
+ imageUrl: "favicons/logo.png"
+ imageTitle: "Monal App Icon"
+ imageWidth: 120
+ imageHeight: 120
buttons:
- name: "Monal für iOS Herunterladen"
url: "https://apps.apple.com/app/id317711500"
@@ -114,88 +141,12 @@ languages:
url: ../search/
weight: 8
- tr:
- languageName: ":tr:"
- languageAltTitle: Turkish
- weight: 3
- profileMode:
- enabled: true # needs to be explicitly set
- title: "Monal IM"
- subtitle: "IOS ve MacOS'da Chat"
- imageUrl: "favicons/ms-icon-310x310.png" # optional
- imageTitle: "" # optional
- imageWidth: 120 # custom size
- imageHeight: 120 # custom size
- buttons:
- - name: Monal iOS
- url: "https://apps.apple.com/app/id317711500"
- - name: Monal macOS
- url: "https://apps.apple.com/app/id1637078500"
- menu:
- main:
- - identifier: İndirmeler
- name: İndirmeler
- url: ../install
- weight: 1
- - identifier: Destek
- name: "Destek"
- url: ../support
- weight: 2
- - identifier: Blog
- name: Blog
- url: ../post/
- weight: 3
- - identifier: Gizlilik
- name: "Gizlilik"
- url: ../privacy
- weight: 5
- #- identifier: Arşiv
- # name: "Arşiv"
- # url: ../archives/
- # weight: 7
- - identifier: Ara
- name: "Ara \U0001f50d"
- url: ../search/
- weight: 8
-
outputs:
home:
- HTML
- RSS
- JSON
-params:
- env: production # to enable google analytics, opengraph, twitter-cards and schema.
- description: "Monal IM - https://github.com/monal-im/monal"
- author: "Monal IM"
- # author: ["Me", "You"] # multiple authors
-
- ShowFullTextinRSS: true
- ShowRssButtonInSectionTermList: true
- tocopen: false
- ShowToc: false
- comments: false
- hidemeta: false
- searchHidden: false
-
- defaultTheme: auto
- DateFormat: "02.01.2006"
- disableThemeToggle: false
- ShowShareButtons: false
- ShowReadingTime: true
- disableSpecial1stPost: true
- displayFullLangName: true
- ShowPostNavLinks: false
- ShowBreadCrumbs: false
- ShowCodeCopyButtons: true
-
- images: ["papermod-cover.png"]
- disableScrollToTop: false
- rss: true
- hidemeta: false
- hideSummary: false
- tocopen: false
-
socialIcons:
- name: github
url: "https://github.com/monal-im/monal"
@@ -206,42 +157,23 @@ params:
- name: mastodon
url: "https://fosstodon.org/@Monal"
- name: rss
- url: "index.xml" # When site published
+ url: "index.xml"
#- name: other
# url: ""
editPost:
URL: "https://github.com/monal-im/monal-im.org/tree/master/content"
- Text: "Suggest Changes" # edit text
- appendFilePath: true # to append file path to Edit link
+ Text: "Suggest Changes"
+ appendFilePath: true
assets:
- disableHLJS: true # to disable highlight.js
- disableFingerprinting: true
- favicon: "favicons/favicon.ico"
- favicon16x16: "favicons/favicon-16x16.png"
- favicon32x32: "favicons/favicon-32x32.png"
- favicon96x96: "favicons/favicon-96x96.png"
- manifest: "favicons/manifest.json"
- browserconfig: "favicons/browserconfig.xml"
- android_icon: "favicons/android-icon-144x144.png"
- ms_icon: "favicons/ms-icon-310x310.png"
- apple_touch_icon: "favicons/apple-icon-144x144.png"
- safari_pinned_tab: "favicons/apple-icon-precomposed.png"
+ disableHLJS: true
+ disableFingerprinting: false
cover:
- hidden: false # hide everywhere but not in structured data
- hiddenInList: false # hide on list pages and home
- hiddenInSingle: true # hide on single page
-
- #fuseOpts:
- # isCaseSensitive: false
- # shouldSort: true
- # location: 0
- # distance: 1000
- # threshold: 0.4
- # minMatchCharLength: 0
- # keys: ["title", "permalink", "summary", "content"]
+ hidden: false
+ hiddenInList: false
+ hiddenInSingle: true
taxonomies:
category: categories
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
new file mode 100644
index 0000000..0f98e59
--- /dev/null
+++ b/layouts/partials/head.html
@@ -0,0 +1,186 @@
+
+
+
+{{- if hugo.IsProduction | or (eq site.Params.env "production") | and (ne .Params.robotsNoIndex true) }}
+
+{{- else }}
+
+{{- end }}
+
+{{- /* Title */}}
+
{{ if .IsHome }}{{ else }}{{ if .Title }}{{ .Title }} | {{ end }}{{ end }}{{ site.Title }}
+
+{{- /* Meta */}}
+{{- if .IsHome }}
+{{ with site.Params.keywords -}}{{ end }}
+{{- else }}
+
+{{- end }}
+
+
+
+{{- if site.Params.analytics.google.SiteVerificationTag }}
+
+{{- end }}
+{{- if site.Params.analytics.yandex.SiteVerificationTag }}
+
+{{- end }}
+{{- if site.Params.analytics.bing.SiteVerificationTag }}
+
+{{- end }}
+{{- if site.Params.analytics.naver.SiteVerificationTag }}
+
+{{- end }}
+
+{{- /* Styles */}}
+
+{{- /* includes */}}
+{{- $includes := slice }}
+{{- $includes = $includes | append (" " | resources.FromString "assets/css/includes-blank.css")}}
+
+{{- if not (eq site.Params.assets.disableScrollBarStyle true) }}
+ {{- $ScrollStyle := (resources.Get "css/includes/scroll-bar.css") }}
+ {{- $includes = (append $ScrollStyle $includes) }}
+{{- end }}
+
+{{- $includes_all := $includes | resources.Concat "assets/css/includes.css" }}
+
+{{- $theme_vars := (resources.Get "css/core/theme-vars.css") }}
+{{- $reset := (resources.Get "css/core/reset.css") }}
+{{- $media := (resources.Get "css/core/zmedia.css") }}
+{{- $license_css := (resources.Get "css/core/license.css") }}
+{{- $common := (resources.Match "css/common/*.css") | resources.Concat "assets/css/common.css" }}
+
+{{- /* include `an-old-hope` if hljs is on */}}
+{{- $isHLJSdisabled := (site.Params.assets.disableHLJS | default false) }}
+{{- $hljs := (cond ($isHLJSdisabled) (".chroma { background-color: unset !important;}" | resources.FromString "assets/css/hljs-blank.css") (resources.Get "css/hljs/an-old-hope.min.css")) }}
+
+{{- /* order is important */}}
+{{- $core := (slice $theme_vars $reset $common $hljs $includes_all $media) | resources.Concat "assets/css/core.css" | resources.Minify }}
+{{- $extended := (resources.Match "css/extended/*.css") | resources.Concat "assets/css/extended.css" | resources.Minify }}
+
+{{- /* bundle all required css */}}
+{{- /* Add extended css after theme style */ -}}
+{{- $stylesheet := (slice $license_css $core $extended) | resources.Concat "assets/css/stylesheet.css" }}
+
+{{- if not site.Params.assets.disableFingerprinting }}
+{{- $stylesheet := $stylesheet | fingerprint }}
+
+{{- else }}
+
+{{- end }}
+
+{{- /* Search */}}
+{{- if (eq .Layout `search`) -}}
+
+{{- $fastsearch := resources.Get "js/fastsearch.js" | js.Build (dict "params" (dict "fuseOpts" site.Params.fuseOpts)) | resources.Minify }}
+{{- $fusejs := resources.Get "js/fuse.basic.min.js" }}
+{{- $license_js := resources.Get "js/license.js" }}
+{{- if not site.Params.assets.disableFingerprinting }}
+{{- $search := (slice $fusejs $license_js $fastsearch ) | resources.Concat "assets/js/search.js" | fingerprint }}
+
+{{- else }}
+{{- $search := (slice $fusejs $fastsearch ) | resources.Concat "assets/js/search.js" }}
+
+{{- end }}
+{{- end -}}
+
+{{- /* Highlight.js */}}
+{{- $isHLJSdisabled := (site.Params.assets.disableHLJS | default .Params.disableHLJS ) }}
+{{- if (and (eq .Kind "page") (ne .Layout "archives") (ne .Layout "search") (not $isHLJSdisabled)) }}
+{{- if not site.Params.assets.disableFingerprinting }}
+{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" | fingerprint }}
+
+{{- else }}
+{{- $highlight := slice (resources.Get "js/highlight.min.js") | resources.Concat "assets/js/highlight.js" }}
+
+{{- end }}
+{{- end }}
+
+{{- /* Favicons */}}
+{{- $favicon := resources.GetMatch "/favicons/logo.png" -}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{- /* RSS */}}
+{{ range .AlternativeOutputFormats -}}
+
+{{ end -}}
+{{- range .AllTranslations -}}
+
+{{ end -}}
+
+
+
+{{- partial "extend_head.html" . -}}
+
+{{- /* Misc */}}
+{{- if hugo.IsProduction | or (eq site.Params.env "production") }}
+{{- template "_internal/google_analytics.html" . }}
+{{- template "partials/templates/opengraph.html" . }}
+{{- template "partials/templates/twitter_cards.html" . }}
+{{- template "partials/templates/schema_json.html" . }}
+{{- end -}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
new file mode 100644
index 0000000..da7185a
--- /dev/null
+++ b/layouts/partials/header.html
@@ -0,0 +1,151 @@
+{{- /* theme-toggle is enabled */}}
+{{- if (not site.Params.disableThemeToggle) }}
+{{- /* theme is light */}}
+{{- if (eq site.Params.defaultTheme "light") }}
+
+{{- /* theme is dark */}}
+{{- else if (eq site.Params.defaultTheme "dark") }}
+
+{{- else }}
+{{- /* theme is auto */}}
+
+{{- end }}
+{{- /* theme-toggle is disabled and theme is auto */}}
+{{- else if (and (ne site.Params.defaultTheme "light") (ne site.Params.defaultTheme "dark"))}}
+
+{{- end }}
+
+
diff --git a/layouts/partials/index_profile.html b/layouts/partials/index_profile.html
new file mode 100644
index 0000000..137081e
--- /dev/null
+++ b/layouts/partials/index_profile.html
@@ -0,0 +1,71 @@
+
+ {{- with site.Params.profileMode }}
+
+ {{- if .imageUrl -}}
+ {{- $img := "" }}
+ {{- if not (urls.Parse .imageUrl).IsAbs }}
+ {{- $img = resources.Get .imageUrl }}
+ {{- end }}
+ {{- if $img }}
+ {{- $processableFormats := (slice "jpg" "jpeg" "png" "tif" "bmp" "gif") -}}
+ {{- if hugo.IsExtended -}}
+ {{- $processableFormats = $processableFormats | append "webp" -}}
+ {{- end -}}
+ {{- $prod := (hugo.IsProduction | or (eq site.Params.env "production")) }}
+ {{- if and (in $processableFormats $img.MediaType.SubType) (eq $prod true)}}
+ {{- if (not (and (not .imageHeight) (not .imageWidth))) }}
+ {{- $img = $img.Resize (printf "%dx%d" .imageWidth .imageHeight) }}
+ {{- else if .imageHeight }}
+ {{- $img = $img.Resize (printf "x%d" .imageHeight) }}
+ {{ else if .imageWidth }}
+ {{- $img = $img.Resize (printf "%dx" .imageWidth) }}
+ {{ else }}
+ {{- $img = $img.Resize "150x150" }}
+ {{- end }}
+ {{- end }}
+
+ {{- else }}
+
+ {{- end }}
+ {{- end }}
+
{{ .title | default site.Title | markdownify }}
+
{{ .subtitle | markdownify }}
+ {{- partial "social_icons.html" site.Params.socialIcons -}}
+
+ {{- with .buttons }}
+
+ {{- end }}
+
+ {{- end}}
+
+{{- if .Site.Params.profileMode }}
+
+ {{ $indexPage:= $.Site.GetPage (printf "%s" .Site.Params.profileMode.indexPostContentFile) }}
+
+ {{ $indexPage.Title }}
+
+ {{- if $indexPage.Content }}
+
+ {{ $indexPage.Content }}
+
+ {{- end }}
+
+{{ end }}
diff --git a/layouts/partials/post_meta.html b/layouts/partials/post_meta.html
new file mode 100644
index 0000000..78619d1
--- /dev/null
+++ b/layouts/partials/post_meta.html
@@ -0,0 +1,25 @@
+{{- $scratch := newScratch }}
+
+{{- if not .Date.IsZero -}}
+{{- $scratch.Add "meta" (slice (printf "%s" (.Date) (.Date | time.Format (default "January 2, 2006" site.Params.DateFormat)))) }}
+{{- end }}
+
+{{- if (.Param "ShowReadingTime") -}}
+{{- $scratch.Add "meta" (slice (i18n "read_time" .ReadingTime | default (printf "%d min" .ReadingTime))) }}
+{{- end }}
+
+{{- if (.Param "ShowWordCount") -}}
+{{- $scratch.Add "meta" (slice (i18n "words" .WordCount | default (printf "%d words" .WordCount))) }}
+{{- end }}
+
+{{- with (partial "author.html" .) }}
+{{- $scratch.Add "meta" (slice .) }}
+{{- end }}
+
+{{- with ($scratch.Get "meta") }}
+{{- delimit . " · " -}}
+{{- end }}
+
+{{- if (.Param "ShowRssButtonInSectionTermList") -}}
+ RSS
+{{- end -}}
diff --git a/static/favicons/android-icon-144x144.png b/static/favicons/android-icon-144x144.png
deleted file mode 100644
index 0938430..0000000
Binary files a/static/favicons/android-icon-144x144.png and /dev/null differ
diff --git a/static/favicons/android-icon-192x192.png b/static/favicons/android-icon-192x192.png
deleted file mode 100644
index ac3f48c..0000000
Binary files a/static/favicons/android-icon-192x192.png and /dev/null differ
diff --git a/static/favicons/android-icon-36x36.png b/static/favicons/android-icon-36x36.png
deleted file mode 100644
index 8a5e647..0000000
Binary files a/static/favicons/android-icon-36x36.png and /dev/null differ
diff --git a/static/favicons/android-icon-48x48.png b/static/favicons/android-icon-48x48.png
deleted file mode 100644
index 561f2c9..0000000
Binary files a/static/favicons/android-icon-48x48.png and /dev/null differ
diff --git a/static/favicons/android-icon-72x72.png b/static/favicons/android-icon-72x72.png
deleted file mode 100644
index 37f9dca..0000000
Binary files a/static/favicons/android-icon-72x72.png and /dev/null differ
diff --git a/static/favicons/android-icon-96x96.png b/static/favicons/android-icon-96x96.png
deleted file mode 100644
index 8269449..0000000
Binary files a/static/favicons/android-icon-96x96.png and /dev/null differ
diff --git a/static/favicons/apple-icon-114x114.png b/static/favicons/apple-icon-114x114.png
deleted file mode 100644
index 52b7b93..0000000
Binary files a/static/favicons/apple-icon-114x114.png and /dev/null differ
diff --git a/static/favicons/apple-icon-120x120.png b/static/favicons/apple-icon-120x120.png
deleted file mode 100644
index b4753ee..0000000
Binary files a/static/favicons/apple-icon-120x120.png and /dev/null differ
diff --git a/static/favicons/apple-icon-144x144.png b/static/favicons/apple-icon-144x144.png
deleted file mode 100644
index 0938430..0000000
Binary files a/static/favicons/apple-icon-144x144.png and /dev/null differ
diff --git a/static/favicons/apple-icon-152x152.png b/static/favicons/apple-icon-152x152.png
deleted file mode 100644
index d203f97..0000000
Binary files a/static/favicons/apple-icon-152x152.png and /dev/null differ
diff --git a/static/favicons/apple-icon-180x180.png b/static/favicons/apple-icon-180x180.png
deleted file mode 100644
index 0834a4e..0000000
Binary files a/static/favicons/apple-icon-180x180.png and /dev/null differ
diff --git a/static/favicons/apple-icon-57x57.png b/static/favicons/apple-icon-57x57.png
deleted file mode 100644
index b062b6b..0000000
Binary files a/static/favicons/apple-icon-57x57.png and /dev/null differ
diff --git a/static/favicons/apple-icon-60x60.png b/static/favicons/apple-icon-60x60.png
deleted file mode 100644
index f8ac6da..0000000
Binary files a/static/favicons/apple-icon-60x60.png and /dev/null differ
diff --git a/static/favicons/apple-icon-72x72.png b/static/favicons/apple-icon-72x72.png
deleted file mode 100644
index 37f9dca..0000000
Binary files a/static/favicons/apple-icon-72x72.png and /dev/null differ
diff --git a/static/favicons/apple-icon-76x76.png b/static/favicons/apple-icon-76x76.png
deleted file mode 100644
index a44caa1..0000000
Binary files a/static/favicons/apple-icon-76x76.png and /dev/null differ
diff --git a/static/favicons/apple-icon-precomposed.png b/static/favicons/apple-icon-precomposed.png
deleted file mode 100644
index 5cb1fe2..0000000
Binary files a/static/favicons/apple-icon-precomposed.png and /dev/null differ
diff --git a/static/favicons/apple-icon.png b/static/favicons/apple-icon.png
deleted file mode 100644
index 5cb1fe2..0000000
Binary files a/static/favicons/apple-icon.png and /dev/null differ
diff --git a/static/favicons/browserconfig.xml b/static/favicons/browserconfig.xml
deleted file mode 100644
index c554148..0000000
--- a/static/favicons/browserconfig.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#ffffff
\ No newline at end of file
diff --git a/static/favicons/favicon-16x16.png b/static/favicons/favicon-16x16.png
deleted file mode 100644
index c82a642..0000000
Binary files a/static/favicons/favicon-16x16.png and /dev/null differ
diff --git a/static/favicons/favicon-32x32.png b/static/favicons/favicon-32x32.png
deleted file mode 100644
index 1394002..0000000
Binary files a/static/favicons/favicon-32x32.png and /dev/null differ
diff --git a/static/favicons/favicon-96x96.png b/static/favicons/favicon-96x96.png
deleted file mode 100644
index 8269449..0000000
Binary files a/static/favicons/favicon-96x96.png and /dev/null differ
diff --git a/static/favicons/manifest.json b/static/favicons/manifest.json
deleted file mode 100644
index 013d4a6..0000000
--- a/static/favicons/manifest.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "name": "App",
- "icons": [
- {
- "src": "\/android-icon-36x36.png",
- "sizes": "36x36",
- "type": "image\/png",
- "density": "0.75"
- },
- {
- "src": "\/android-icon-48x48.png",
- "sizes": "48x48",
- "type": "image\/png",
- "density": "1.0"
- },
- {
- "src": "\/android-icon-72x72.png",
- "sizes": "72x72",
- "type": "image\/png",
- "density": "1.5"
- },
- {
- "src": "\/android-icon-96x96.png",
- "sizes": "96x96",
- "type": "image\/png",
- "density": "2.0"
- },
- {
- "src": "\/android-icon-144x144.png",
- "sizes": "144x144",
- "type": "image\/png",
- "density": "3.0"
- },
- {
- "src": "\/android-icon-192x192.png",
- "sizes": "192x192",
- "type": "image\/png",
- "density": "4.0"
- }
- ]
-}
\ No newline at end of file
diff --git a/static/favicons/ms-icon-144x144.png b/static/favicons/ms-icon-144x144.png
deleted file mode 100644
index 0938430..0000000
Binary files a/static/favicons/ms-icon-144x144.png and /dev/null differ
diff --git a/static/favicons/ms-icon-150x150.png b/static/favicons/ms-icon-150x150.png
deleted file mode 100644
index 01b526e..0000000
Binary files a/static/favicons/ms-icon-150x150.png and /dev/null differ
diff --git a/static/favicons/ms-icon-70x70.png b/static/favicons/ms-icon-70x70.png
deleted file mode 100644
index 9e34c6f..0000000
Binary files a/static/favicons/ms-icon-70x70.png and /dev/null differ
diff --git a/static/favicons/safari-pinned-tab.svg b/static/favicons/safari-pinned-tab.svg
new file mode 100644
index 0000000..d0b4a18
--- /dev/null
+++ b/static/favicons/safari-pinned-tab.svg
@@ -0,0 +1,40 @@
+
+
+
diff --git a/themes/hugo-PaperMod b/themes/hugo-PaperMod
index 5381e57..3a0a481 160000
--- a/themes/hugo-PaperMod
+++ b/themes/hugo-PaperMod
@@ -1 +1 @@
-Subproject commit 5381e5715de856351adabbf0850be85ff28145c5
+Subproject commit 3a0a4811cbc07c0bea09ef55b3c1bfb39b48cddd