Moving social menu to data file, using templates for file downloads, removing download folder.

2 years ago · 4630ae0d2b
parent 55ea6b33e6
commit 4630ae0d2b
12 changed files with 54 additions and 83 deletions
--- a/LICENSE.md
+++ b/LICENSE.md
@ -1,11 +1,12 @@
 ## License

- `static/download/\*` binaries are under the respective software licenses. You can learn more about them at [apps.ad5001.eu](https://apps.ad5001.eu).
- static/img/platforms/\* icons are owned by their respective owners:
+- `static/img/badges/\*` icons are owned by their respective owners:
    - `amo.svg`, `amo-text.svg`: Firefox icon used to link to addons.mozilla.org.    
-      Firefox is a trademark of the Mozilla Foundation in the US and other countries.
+      Firefox is a trademark of the Mozilla Foundation in the US and other countries.   
+      This badge is the translated and updated form of [the old badge](https://blog.mozilla.org/addons/2015/11/10/promote-your-add-ons-with-the-get-the-add-on-button/) with the new AMO colors and branding.
    - `snapcraft.svg`, `snapcraft-text.svg`: Snapcraft icon used to link to snapcraft.io.    
-      Snapcraft is a trademark of the Canonical in the UK and other countries
+      The Snapcraft logo is licensed under CC BY-ND 2.0 UK, a registered trademark of Canonical Limited, 2018.    
+      These icons are adapted versions of [the official snapcraft badges](https://github.com/snapcore/snap-store-badges).
    - `flathub.svg`, `flathub-text.svg`: Flathub icon used to link to flathub.org.    
-      These icons are modified versions of [the official flathub badges](https://flathub.org/badges) under [CC0](http://creativecommons.org/publicdomain/zero/1.0/).
+      These icons are modified and translated versions of [the official flathub badges](https://flathub.org/badges) under [CC0](http://creativecommons.org/publicdomain/zero/1.0/).
 - `static/icons/\*`, rest of `static/img/\*`, `data/` & `content/` are under the [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode), with a possible exceptions for app content given in written form for [authorized distributions platforms](https://ad5001.eu/distribution-platforms).
--- a/README.md
+++ b/README.md
@ -9,7 +9,6 @@ You can build the website by running `hugo`.

 ## License

- `static/download/\*` binaries are under the respective software licenses. You can learn more about them at [apps.ad5001.eu](https://apps.ad5001.eu).
 - `static/img/badges/\*` icons are owned by their respective owners:
    - `amo.svg`, `amo-text.svg`: Firefox icon used to link to addons.mozilla.org.    
      Firefox is a trademark of the Mozilla Foundation in the US and other countries.   
--- a/config.yaml
+++ b/config.yaml
@ -33,32 +33,6 @@ languages:
              title: about section
              url: https://ad5001.eu/about
              weight: 0
-            social:
-            - identifier: mastodon
-              name: Mastodon
-              pre: <i class="icon-mastodon" alt="Mastodon icon"></i>
-              title: mastodon social icon
-              url: https://mastodon.technology/@Ad5001
-            - identifier: twitter
-              name: Twitter
-              pre: <i class="icon-twitter" alt="Twitter icon"></i>
-              title: twitter social icon
-              url: https://twitter.com/Ad5001P4F
-            - identifier: gitea
-              name: Gitea
-              pre: <i class="icon-git" alt="Gitea icon"></i>
-              title: gitea social icon
-              url: https://git.ad5001.eu/Ad5001
-            - identifier: github
-              name: Github
-              pre: <i class="icon-github" alt="Github icon"></i>
-              title: github social icon
-              url: https://github.com/Ad5001
-            - identifier: mail
-              name: Mail
-              pre: <i class="icon-mail" alt="Mail icon"></i>
-              title: mail icon
-              url: "" # Filled with JS to avoid spam.
        weight: 0
    fr:
        languageName: Français
@ -82,32 +56,6 @@ languages:
              title: about section
              url: https://ad5001.eu/fr/a-propos
              weight: 0
-            social:
-            - identifier: mastodon
-              name: Mastodon
-              pre: <i class="icon-mastodon" alt="Mastodon icon"></i>
-              title: mastodon social icon
-              url: https://mastodon.technology/@Ad5001
-            - identifier: twitter
-              name: Twitter
-              pre: <i class="icon-twitter" alt="Twitter icon"></i>
-              title: twitter social icon
-              url: https://twitter.com/Ad5001P4F
-            - identifier: gitea
-              name: Gitea
-              pre: <i class="icon-git" alt="Gitea icon"></i>
-              title: gitea social icon
-              url: https://git.ad5001.eu/Ad5001
-            - identifier: github
-              name: Github
-              pre: <i class="icon-github" alt="Github icon"></i>
-              title: github social icon
-              url: https://github.com/Ad5001
-            - identifier: mail
-              name: Mail
-              pre: <i class="icon-mail" alt="Mail icon"></i>
-              title: mail icon
-              url: "" # Filled with JS to avoid spam.
        weight: 0
    
 markup:
--- a/content/logarithmplotter.fr.md
+++ b/content/logarithmplotter.fr.md
@ -83,23 +83,23 @@ Download:
        win:
            - Title: Logiciel d'installation (.exe) (64 bits)
              Name: logarithmplotter-v<version>-setup.exe (100,4Mio)
-              URL: "/download/logarithmplotter/<version>/LogarithmPlotter-v<version>-setup.exe"
+              File: LogarithmPlotter-v<version>-setup.exe
        macos:
            - Title: Archive d'Application (.dmg)
              Name: LogarithmPlotter-<version>-setup.dmg (112,1Mio)
-              URL: "/download/logarithmplotter/<version>/LogarithmPlotter-<version>-setup.dmg"
+              File: LogarithmPlotter-<version>-setup.dmg
        linux:
            - Title: Flatpak
-              URL: "https://flathub.org/apps/details/eu.ad5001.LogarithmPlotter"
+              Index: eu.ad5001.LogarithmPlotter
            - Title: Snap
-              URL: "https://snapcraft.io/logarithmplotter"
+              Index: logarithmplotter
            - Title: Debian / Ubuntu
-              Name: le paquet deb (174Kio)
-              URL: "/download/logarithmplotter/<version>/python3-logarithmplotter_0.0.1~dev0-1_all.deb"
+              Name: paquet debian (174Kio)
+              File: python3-logarithmplotter_<version>-1_all.deb
        all:
            - Title: Code source (.tar.gz)
              Name: LogarithmPlotter-v<version>.tar.gz (174Kio)
-              URL: "/download/logarithmplotter/<version>/LogarithmPlotter-v<version>.tar.gz"
+              File: LogarithmPlotter-v<version>.tar.gz
    Footnote: "*LogarithmPlotter dépend [Python3](https://python.org/) avec [PySide2](https://pypi.org/project/PySide2/), et requiert qu'ils soient installés pour être lancé."
 ---

--- a/content/logarithmplotter.md
+++ b/content/logarithmplotter.md
@ -83,23 +83,23 @@ Download:
        win:
            - Title: Installer software (.exe) (64 bits)
              Name: logarithmplotter-v<version>-setup.exe (100.4MiB)
-              URL: "/download/logarithmplotter/<version>/LogarithmPlotter-v<version>-setup.exe"
+              File: LogarithmPlotter-v<version>-setup.exe
        macos:
            - Title: Application Archive (.dmg)
              Name: LogarithmPlotter-<version>-setup.dmg (112.1MiB)
-              URL: "/download/logarithmplotter/<version>/LogarithmPlotter-<version>-setup.dmg"
+              File: LogarithmPlotter-<version>-setup.dmg
        linux:
            - Title: Flatpak
-              URL: "https://flathub.org/apps/details/eu.ad5001.LogarithmPlotter"
+              Index: eu.ad5001.LogarithmPlotter
            - Title: Snap
-              URL: "https://snapcraft.io/logarithmplotter"
+              Index: logarithmplotter
            - Title: Debian / Ubuntu
              Name: debian package (174KiB)
-              URL: "/download/logarithmplotter/<version>/python3-logarithmplotter_0.0.1~dev0-1_all.deb"
+              File: python3-logarithmplotter_<version>-1_all.deb
        all:
            - Title: Source code (.tar.gz)
              Name: LogarithmPlotter-v<version>.tar.gz (174KiB)
-              URL: "/download/logarithmplotter/<version>/LogarithmPlotter-v<version>.tar.gz"
+              File: LogarithmPlotter-v<version>.tar.gz
    Footnote: "*LogarithmPlotter requires [Python3](https://python.org/) with [PySide2](https://pypi.org/project/PySide2/) to be installed in order to be launched."
 ---

--- a/content/nowox.fr.md
+++ b/content/nowox.fr.md
@ -77,11 +77,11 @@ Download:
    Links:
        all:
            - Title: Executable (.exe) (64 bits)
-              Name: Nowox-v<version>.exe (2,1Mio)
-              URL: "/download/nowox/<version>/Nowox-v<version>.exe"
+              Name: Nowox-v<version>.exe (2.1MiB)
+              File: Nowox-v<version>.exe
            - Title: Code source (.tar.gz)
-              Name: Nowox-v<version>.tar.gz (1,0Mio)
-              URL: "/download/nowox/<version>/Nowox-v<version>.tar.gz"
+              Name: Nowox-v<version>.tar.gz (1.0MiB)
+              File: Nowox-v<version>.tar.gz
        linux: []
    Footnote: "*Nowox dépend de [Mono](https://www.mono-project.com/), et requiert qu'il soit installé pour être lancé."
 ---
--- a/content/nowox.md
+++ b/content/nowox.md
@ -78,10 +78,10 @@ Download:
        all:
            - Title: Executable (.exe) (64 bits)
              Name: Nowox-v<version>.exe (2.1MiB)
-              URL: "/download/nowox/<version>/Nowox-v<version>.exe"
+              File: Nowox-v<version>.exe
            - Title: Source code (.tar.gz)
              Name: Nowox-v<version>.tar.gz (1.0MiB)
-              URL: "/download/nowox/<version>/Nowox-v<version>.tar.gz"
+              File: Nowox-v<version>.tar.gz
        linux: []
    Footnote: "*Nowox requires [Mono](https://www.mono-project.com/) to be installed in order to be launched."
 ---
--- a/content/unchecker.fr.md
+++ b/content/unchecker.fr.md
@ -46,14 +46,14 @@ Download:
    Links:
        firefox:
            - Title: Firefox Addons (AMO)
-              URL: "https://addons.mozilla.org/en-US/firefox/addon/unchecker/"
+              Index: unchecker
            - Title: Mozilla Installer Package (.xpi)
              Name: unchecker-<version>-fx.xpi (16,8Kio)
-              URL: "/download/unchecker/<version>/unchecker-<version>-fx.xpi"
+              File: unchecker-<version>-fx.xpi
        all:
            - Title: Code source (.tar.gz)
              Name: unchecker-v<version>.tar.gz (10,2KiB)
-              URL: "/download/unchecker/<version>/unchecker-v<version>.tar.gz"
+              File: unchecker-v<version>.tar.gz
 ---


--- a/content/unchecker.md
+++ b/content/unchecker.md
@ -46,14 +46,14 @@ Download:
    Links:
        firefox:
            - Title: Firefox Addons (AMO)
-              URL: "https://addons.mozilla.org/en-US/firefox/addon/unchecker/"
+              Index: unchecker
            - Title: Mozilla Installer Package (.xpi)
              Name: unchecker-<version>-fx.xpi (16,8Kio)
-              URL: "/download/unchecker/<version>/unchecker-<version>-fx.xpi"
+              File: unchecker-<version>-fx.xpi
        all:
            - Title: Source code (.tar.gz)
              Name: unchecker-v<version>.tar.gz (10,2KiB)
-              URL: "/download/unchecker/<version>/unchecker-v<version>.tar.gz"
+              File: unchecker-v<version>.tar.gz
 ---


--- a/data/menu.yaml
+++ b/data/menu.yaml
@ -0,0 +1,23 @@
+social:
+- name: Mastodon
+  icon: mastodon
+  URL: https://mastodon.technology/@Ad5001
+- name: Twitter
+  icon: twitter
+  URL: https://twitter.com/Ad5001P4F
+- name: Gitea
+  icon: git
+  URL: https://git.ad5001.eu/Ad5001
+- name: Github
+  icon: github
+  URL: https://github.com/Ad5001
+- name: Stackoverflow
+  icon: stackoverflow
+  URL: https://stackoverflow.com/users/7520341/ad5001
+- name: Firefox Addon Developer 
+  icon: firefox
+  URL: https://addons.mozilla.org/<lang>/firefox/user/12994006/
+- identifier: mail
+  name: Mail
+  icon: mail
+  URL: "" # Filled with JS to avoid spam.
--- a/static/download/unchecker/1.0/unchecker-1.0-fx.xpi
+++ b/static/download/unchecker/1.0/unchecker-1.0-fx.xpi
--- a/static/download/unchecker/1.0/unchecker-v1.0.tar.gz
+++ b/static/download/unchecker/1.0/unchecker-v1.0.tar.gz