Moving badges to theme, fixing bug with links not being clickable, adding disclaimer to apps for distribution icons.

This commit is contained in:
Adsooi 2021-08-03 14:59:16 +02:00
parent 1171b352c5
commit 29770627da
No known key found for this signature in database
GPG key ID: 9C87C7D3A69E6BBE
40 changed files with 3375 additions and 43 deletions

View file

@ -3,6 +3,9 @@
{{ $appindex := .Params.SectionHeader.AppIndex }}
{{ $data := index .Site.Data $lang }}
{{ $appdata := index $data.apps $appindex }}
{{ $disclaimers := newScratch }}
{{ $disclaimers.Set "snapcraft" false }}
{{ $disclaimers.Set "firefox" false }}
<html lang="{{ $lang }}">
{{- partial "head.html" . -}}
@ -116,24 +119,26 @@
<div>
<h3>{{ .Title }}</h3>
{{ if hasPrefix .Title "Flatpak" }}
<a href="https://flathub.org/apps/details/{{ .Index }}" class="padding-container-1">
<img src="/img/badges/{{ $lang }}/flathub.svg" alt="{{ i18n "storeFlathub" }}"></img>
</a>
<br><br>{{ i18n "warnExternalWebsite" "flathub.org" }}
<a href="https://flathub.org/apps/details/{{ .Index }}">
{{ partial "badge.html" (dict "Icon" "flathub" "Lang" $lang "Alt" "storeFlathub" ) }}
</a>
<br><br>{{ i18n "warnExternalWebsite" "flathub.org" }}
{{ else if hasPrefix .Title "Snap" }}
<a href="https://snapcraft.io/{{ .Index }}" class="padding-container-1">
<img src="/img/badges/{{ $lang }}/snapcraft.svg" alt="{{ i18n "storeSnapcraft" }}"></img>
</a>
<br><br>{{ i18n "warnExternalWebsite" "snapcraft.io" }}
{{ $disclaimers.Set "snapcraft" true }}
<a href="https://snapcraft.io/{{ .Index }}">
{{ partial "badge.html" (dict "Icon" "snapcraft" "Lang" $lang "Alt" "storeSnapcraft" ) }}
</a>
<br><br>{{ i18n "warnExternalWebsite" "snapcraft.io" }}
{{ else if hasPrefix .Title "Firefox" }}
<a href="https://addons.mozilla.org/en-US/firefox/addon/{{ .Index }}/" class="padding-container-1">
<img src="/img/badges/{{ $lang }}/amo.svg" alt="{{ i18n "storeFirefoxAddons" }}"></img>
</a>
<br><br>{{ i18n "warnExternalWebsite" "addons.mozilla.org" }}
{{ $disclaimers.Set "firefox" true }}
<a href="https://addons.mozilla.org/en-US/firefox/addon/{{ .Index }}/">
{{ partial "badge.html" (dict "Icon" "amo" "Lang" $lang "Alt" "storeFirefoxAddons" ) }}
</a>
<br><br>{{ i18n "warnExternalWebsite" "addons.mozilla.org" }}
{{ else }}
{{ i18n "file" }} {{ replace .Name "<version>" $appdata.version }}<br>
<div class="primary center fit-content" role="button">
<a href="https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/{{ $appindex }}/v{{ $appdata.version }}/{{ replace .File "<version>" $appdata.version }}" role="button">
<a href="https://artifacts.accountfree.org/repository/apps.ad5001.eu-apps/{{ $appindex }}/v{{ $appdata.version }}/{{ replace .File "<version>" $appdata.version }}">
<i class="icon-download icon-as-text" alt=""></i>{{ i18n "download" }}
</a>
</div>
@ -146,6 +151,13 @@
{{ end }}
</div>
<p>{{ .Params.Download.Footnote | markdownify }} </p>
<!-- Disclaimers -->
{{ if ($disclaimers.Get "snapcraft") }}
<p>{{ i18n "disclaimerSnapcraft" | markdownify }}</p>
{{ end }}
{{ if ($disclaimers.Get "firefox") }}
<p>{{ i18n "disclaimerFirefox" | markdownify }}</p>
{{ end }}
</section>
{{ end }}
</div>

View file

@ -25,6 +25,7 @@
</div>
</section>
<section class="section-skewed">
<br>
<h1 class="text-center">Software commitments</h1>
<div class="columns-container padding-container-3" >
<div class="column col3 vertical-center padding-container">

View file

@ -0,0 +1,2 @@
<img src="/img/badges/{{ .Lang }}/{{ .Icon }}.svg" alt="{{ i18n .Alt }}" class="badge center" loading=lazy/>

View file

@ -2,12 +2,13 @@
<title>{{ .Site.Title }} - {{ .Title }}</title>
<link rel="preload" as="font" crossOrigin="anonymous" href="/fonts/metropolis/Metropolis-Regular.otf">
<link rel="preload" as="font" crossOrigin="anonymous" href="/fonts/metropolis/Metropolis-Light.otf">
<link rel="preload" as="font" crossOrigin="anonymous" href="/fonts/metropolis/Metropolis-Bold.otf">
<link rel="preload" as="font" crossOrigin="anonymous" href="/fonts/omegicons/omegicons.woff2?54316140">
<link rel="preload" as="font" crossOrigin="anonymous" href="/fonts/omegicons/omegicons.ttf?54316140">
{{ $mainstyle := resources.Get "/scss/main.scss" | toCSS | minify | fingerprint }}
{{ $mainstyle := resources.Get "/scss/main.scss" | toCSS | minify }}
<link rel="preload" href="{{ $mainstyle.Permalink }}" as="style" onload="this.rel='stylesheet'">
{{ if .Site.Params.includeAppsStyle }}
{{ $appsstyle := resources.Get "/scss/apps.scss" | toCSS | minify | fingerprint }}
{{ $appsstyle := resources.Get "/scss/apps.scss" | toCSS | minify }}
<link rel="preload" href="{{ $appsstyle.Permalink }}" as="style" onload="this.rel='stylesheet'">
{{ end }}
<link rel="icon" href="/img/icon.png">
@ -19,6 +20,6 @@
<link rel="alternate" hreflang="{{ .Language.Lang }}" href="{{ .Permalink }}" title="{{ .Language.LanguageName }}">
{{ end }}
{{ end }}
{{ $mainjs := resources.Get "/js/main.js" | minify | fingerprint }}
{{ $mainjs := resources.Get "/js/main.js" | minify }}
<script src="{{ $mainjs.Permalink }}"></script>
</head>

View file

@ -54,8 +54,7 @@
{{ range .Translations }}
<li class="background">
<a href="{{ .Permalink }}" role="button">
<img src="/icons/flag/{{ .Language.Lang }}.svg" class="icon-as-text"/>
{{ .Language.LanguageName }}
<img src="/icons/flag/{{ .Language.Lang }}.svg" class="icon-as-text"/>{{ .Language.LanguageName }}
</a>
</li>
{{ end }}

View file

@ -0,0 +1 @@
{{ partial "badge.html" (dict "Icon" (.Get 0) "Lang" (.Get 1) "Alt" (.Get 2) ) }}

View file

@ -0,0 +1,19 @@
<div class="columns-container fill-width">
<div class="col2 column text-center">
<h3>{{ i18n "en" }}</h3>
{{ partial "badge.html" (dict "Icon" (.Get 0) "Lang" "en" "Alt" (.Get 1) ) }}
<br>
<div class="center fit-content">
<div class="code">&lt;img source="https://ad5001.eu/img/badges/en/{{ .Get 0 }}.svg" class="badge"/&gt;</div>
</div>
</div>
<div class="col2 column text-center">
<h3>{{ i18n "fr" }}</h3>
{{ partial "badge.html" (dict "Icon" (.Get 0) "Lang" "fr" "Alt" (.Get 1) ) }}
<br>
<div class="center fit-content">
<div class="code">&lt;img source="https://ad5001.eu/img/badges/fr/{{ .Get 0 }}.svg" class="badge"/&gt;</div>
</div>
</div>
</div>

View file

@ -0,0 +1 @@
{{ partial "section1.html" (dict "Image" (.Get 0) "Content" (.Inner | markdownify) ) }}

View file

@ -0,0 +1,4 @@
<section class="section-skewed padding-container-3" style="background: {{ .Get 1 | safeCSS }}; background: linear-gradient(170deg, {{ .Get 1 | safeCSS }} 0%, {{ .Get 0 | safeCSS }} 49%, {{ .Get 1 | safeCSS }} 100%);">
{{ .Inner | markdownify }}
</section>