diff --git a/.kdev4/Omegamma.kdev4 b/.kdev4/Omegamma.kdev4 deleted file mode 100644 index 2ffd5cd..0000000 --- a/.kdev4/Omegamma.kdev4 +++ /dev/null @@ -1,2 +0,0 @@ -[Project] -VersionControlSupport=kdevgit diff --git a/i18n/en.json b/i18n/en.json index 00a3412..74768b5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5,6 +5,15 @@ "availableOn": { "other": "Available on " }, + "download": { + "other": "Download" + }, + "technicalSheet": { + "other": "Technical sheet" + }, + "downloadApp": { + "other": "{{ .Name }} is available on the following platforms: {{ .Platforms }}." + }, "status": { "other": "Status: " }, @@ -14,14 +23,32 @@ "language": { "other": "Language" }, - "translated": { - "other": "Translated in: " - }, "en": { "other": "English" }, "fr": { "other": "French" + }, + "supportedPlatforms": { + "other": "Supported platforms: " + }, + "translated": { + "other": "Translated in: " + }, + "programingLanguages": { + "other": "Made in: " + }, + "latestVersion": { + "other": "Latest version: " + }, + "frameworks": { + "other": "Frameworks: " + }, + "touchFriendly": { + "other": "Touch friendly" + }, + "keyboardOriented": { + "other": "Keyboard oriented" } } diff --git a/i18n/fr.json b/i18n/fr.json index 4c741a1..3ae86df 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -5,6 +5,15 @@ "availableOn": { "other": "Disponible sur " }, + "download": { + "other": "Télécharger" + }, + "technicalSheet": { + "other": "Fiche technique" + }, + "downloadApp": { + "other": "{{ .Name }} est disponible sur plusieurs platformes : {{ .Platforms }}." + }, "status": { "other": "Status : " }, @@ -14,14 +23,32 @@ "language": { "other": "Langue" }, - "translated": { - "other": "Traduit en : " - }, "en": { "other": "English" }, "fr": { "other": "French" + }, + "supportedPlatforms": { + "other": "Platformes supportées : " + }, + "translated": { + "other": "Traduit en : " + }, + "programingLanguages": { + "other": "Fait en : " + }, + "latestVersion": { + "other": "Dernière version : " + }, + "frameworks": { + "other": "Frameworks : " + }, + "touchFriendly": { + "other": "Accessible au toucher" + }, + "keyboardOriented": { + "other": "Orienté clavier" } } diff --git a/layouts/404.html b/layouts/404.html index 6125a15..5b77d87 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -1,3 +1,3 @@ {{ define "main"}} - 404. Page not found. + {{ partial "section1.html" (dict "Image" "/img/app0.png" "Content" ("

404. Page not found


Return to main page" | safeHTML)) }} {{ end }} diff --git a/layouts/_default/app.html b/layouts/_default/app.html index 0094f0f..e29209f 100644 --- a/layouts/_default/app.html +++ b/layouts/_default/app.html @@ -1,4 +1,7 @@ +{{ $data := index .Site.Data .Site.Language.Lang }} +{{ $appdata := index $data.apps .Params.SectionHeader.AppIndex }} + {{- partial "head.html" . -}} @@ -7,7 +10,7 @@ {{ partial "section-app-header.html" (dict "Data" .Params.SectionHeader "Site" .Site) }}
-
+

{{ .Params.About.Title }}

{{ .Params.About.Content | markdownify }}

@@ -16,7 +19,7 @@ {{ range .Params.Sections }}
{{ if eq .Type "text|image" }} -
+
{{ .Content | markdownify }}
@@ -29,15 +32,91 @@
{{ .Content | markdownify }}
- {{ else if eq .Type "text-image" }} + {{ else if eq .Type "text/image" }}
{{ .Content | markdownify }}
+ {{ else if eq .Type "text" }} +
+ {{ .Content | markdownify }} +
{{ end }}

{{ end }} +
+
+

{{ i18n "technicalSheet" }}

+
+

+ + {{ i18n "supportedPlatforms" }} {{ partial "platforms.html" $appdata.platforms }} +

+

+ + {{ i18n "translated" }} {{ partial "translations.html" $appdata.translated }} +

+

+ + {{ i18n "latestVersion" }}v{{ $appdata.version }} +

+

+ + {{ i18n "status" }}{{ $appdata.status }} +

+

+ + {{ i18n "programingLanguages" }}{{ delimit $appdata.languages ", " }} +

+

+ + {{ i18n "frameworks" }} {{ delimit $appdata.frameworks ", " | markdownify }} +

+ {{ if $appdata.touchfriendly }} +

+ + {{ i18n "touchFriendly" }} +

+ {{ end }} + {{ if $appdata.keyboardoriented }} +

+ + {{ i18n "keyboardOriented" }} +

+ {{ end }} +
+
+ {{ if .Params.Download.Show }} + +
+
+

{{ i18n "download" }}

+ {{ i18n "downloadApp" (dict "Name" .Name "Platforms" (delimit $appdata.platforms ", ")) }} +

+ +
+ {{ $download := .Params.Download }} + {{ range $download.Categories }} +
+
+ {{ .Title }} +
+
+ {{ $links := index $download.Links .Name }} + {{ range $links }} +
+

{{ .Title }}

+ " $appdata.version }}">{{ i18n "download"}} {{ replace .Name "" $appdata.version }} +
+ {{ end }} +
+
+ {{ end }} +
+

{{ .Params.Download.Footnote | markdownify }}

+
+ {{ end }} {{- partial "footer.html" . -}} diff --git a/layouts/apps-list.html b/layouts/apps-list.html index 9cd0099..89001c1 100644 --- a/layouts/apps-list.html +++ b/layouts/apps-list.html @@ -13,10 +13,10 @@

{{ .description }}

{{ i18n "status" }} {{ .status }}

{{ i18n "worksOn" }}  - {{ range .platforms }}{{ . }}{{ end }} + {{ partial "platforms.html" .platforms }}

{{ i18n "translated" }}  - {{ range .translated }}{{ i18n . }}{{ end }} + {{ partial "translations.html" .translated }}

{{ i18n "learnMore" }}  diff --git a/layouts/partials/platforms.html b/layouts/partials/platforms.html new file mode 100644 index 0000000..d094638 --- /dev/null +++ b/layouts/partials/platforms.html @@ -0,0 +1 @@ +{{ range . }}{{ . }}{{ end }} diff --git a/layouts/partials/section-app-header.html b/layouts/partials/section-app-header.html index 5218368..7e293a4 100644 --- a/layouts/partials/section-app-header.html +++ b/layouts/partials/section-app-header.html @@ -10,9 +10,18 @@

{{ $appdata.description | safeHTML }}

{{ if .ShowPlatforms }}

{{ i18n "availableOn" }}  - {{ range $appdata.platforms }}{{ . }}{{ end }} + {{ partial "platforms.html" $appdata.platforms }}

{{ end }} +
  + {{ range .Links }} +
+ + {{ .Icon }}{{ .Title }} +   +
+ {{ end }} +

@@ -20,8 +29,8 @@
-
{{ .BottomLeft | safeHTML }}
-
{{ .BottomRight | safeHTML }}
+
{{ .BottomLeft | safeHTML }}
+
{{ .BottomRight | safeHTML }}
{{ end }} diff --git a/layouts/partials/translations.html b/layouts/partials/translations.html new file mode 100644 index 0000000..1ecac37 --- /dev/null +++ b/layouts/partials/translations.html @@ -0,0 +1 @@ +{{ range . }}{{ i18n . }}{{ end }} diff --git a/static/css/blocks.css b/static/css/blocks.css index df182d4..c9c79bc 100644 --- a/static/css/blocks.css +++ b/static/css/blocks.css @@ -40,3 +40,4 @@ opacity: 1; max-height: 100%; } + diff --git a/static/css/common.css b/static/css/common.css index 8e16a22..bc2c4db 100644 --- a/static/css/common.css +++ b/static/css/common.css @@ -25,11 +25,11 @@ a[role=button] { cursor: pointer; } -a[role=button].primary { +.primary { background-color: var(--primary-color); } -a[role=button].secondary { +.secondary { background-color: var(--secondary-color); } @@ -75,6 +75,7 @@ img.center { /* workaround for sometimes images don't position correctly vertically */ .vertical-center-img { margin: auto; + max-height: 100%; } .text-left { @@ -101,6 +102,7 @@ img.center { width: 1em; height: 1em; margin-right: 0.4em; + vertical-align: middle; } .icon-larger-text { @@ -108,6 +110,7 @@ img.center { height: 1.4em; margin-right: 0.4em; margin-top: -0.2em; + vertical-align: middle; } h1 { @@ -120,6 +123,10 @@ h2 { font-family: var(--light-font); } +h3 { + font-family: var(--light-font); +} + p { line-height: 1.5em; } @@ -134,17 +141,35 @@ p { display: flex !important; } +.inline { + display: inline !important; +} + .flex-right { justify-content: flex-end; } +.flex-center { + justify-content: center; +} + /* Columns */ .columns-container { display: flex; } -.column { - flex: auto; +.col1:not(.col1-fill) { + width: 33%; + margin-right: auto !important; + margin-left: auto !important; +} + +.col1.col1-fill { + width: 100%; +} + +.col2 { + width: 50%; } .col3 { @@ -155,8 +180,16 @@ p { width: 66%; } -.col2 { - width: 50%; +.col4 { + width: 25%; +} + +.col3-4 { + width: 75%; +} + +.col5 { + width: 20%; } @media screen and (max-width: 700px) { @@ -168,7 +201,7 @@ p { width: 100%; } - .column > img { + .section-header .column > img { width: 100%; } @@ -176,11 +209,11 @@ p { text-align: center; } - { - text-align: center; - } - .column .flex-right { justify-content: center; } + + .col1:not(.col1-fill) { + width: 100%; + } } diff --git a/static/css/header.css b/static/css/header.css index daae453..bc050ad 100644 --- a/static/css/header.css +++ b/static/css/header.css @@ -3,13 +3,12 @@ nav { font-size: 1.3em; height: 3em; background: var(--nav-background); - width: 100%; + width: 100vw; font-family: var(--light-font); } nav .nav-flex { display: flex; - flex-direction: row; } nav .navbar-brand { diff --git a/static/css/sections.css b/static/css/sections.css index ba5f9e1..0026f1e 100644 --- a/static/css/sections.css +++ b/static/css/sections.css @@ -9,7 +9,7 @@ section.section1 { } section.section-header { - height: calc(100vh - 4em); + min-height: calc(100vh - 4em); } section.section-header > div { diff --git a/static/icons/code.svg b/static/icons/code.svg new file mode 100644 index 0000000..bfea6db --- /dev/null +++ b/static/icons/code.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/download.svg b/static/icons/download.svg new file mode 100644 index 0000000..fe25731 --- /dev/null +++ b/static/icons/download.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/frameworks.svg b/static/icons/frameworks.svg new file mode 100644 index 0000000..90c67d3 --- /dev/null +++ b/static/icons/frameworks.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/keyboard.svg b/static/icons/keyboard.svg new file mode 100644 index 0000000..d171680 --- /dev/null +++ b/static/icons/keyboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/platform/Universal.svg b/static/icons/platform/Universal.svg new file mode 100644 index 0000000..c6040d7 --- /dev/null +++ b/static/icons/platform/Universal.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/touch.svg b/static/icons/touch.svg new file mode 100644 index 0000000..72b43b6 --- /dev/null +++ b/static/icons/touch.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/icons/wrench.svg b/static/icons/wrench.svg new file mode 100644 index 0000000..cde2ebc --- /dev/null +++ b/static/icons/wrench.svg @@ -0,0 +1 @@ + \ No newline at end of file