diff --git a/README.md b/README.md index d61fb04..86dc1de 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,15 @@ A live server can be started as usual with hugo: ## Deployment +The build and deploy workflow is provided by the contained shell script `build+deploy.sh`. + +**Tasks:** + +- clean the output folder +- build the project +- upload to the remote SSH target + ```bash -rm -rf public -hugo -rsync --archive --delete --exclude /.htpasswd public/ \ - ecg00-portal@ecg00.hostsharing.net:doms/my.ecogood.world/htdocs-ssl/ -rsync --archive public/.htpasswd \ - ecg00-portal@ecg00.hostsharing.net:doms/my.ecogood.world/ +chmod +x build+deploy.sh +./build+deploy.sh ``` \ No newline at end of file diff --git a/build+deploy.sh b/build+deploy.sh new file mode 100755 index 0000000..a7a6869 --- /dev/null +++ b/build+deploy.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env sh +# Build site and deploy to remote via SSH +set -o nounset ## set -u : exit the script if you try to use an uninitialised variable +set -o errexit ## set -e : exit the script if any statement returns a non-true return value +#set -o xtrace ## set -x : Print command traces before executing command + +rm -rf public +hugo +rsync -v --archive --delete --exclude /.htpasswd public/ \ + ecg00-portal@ecg00.hostsharing.net:doms/my.ecogood.world/htdocs-ssl/ +rsync -v --archive public/.htpasswd \ + ecg00-portal@ecg00.hostsharing.net:doms/my.ecogood.world/ diff --git a/content/index.en.md b/content/index.en.md index e2f9e26..e081f43 100644 --- a/content/index.en.md +++ b/content/index.en.md @@ -1,48 +1,60 @@ --- -languages: ['en', 'de', 'fr'] items: +# - url: https://forum.ecogood.org +# solution: DIscourse +# title: +# en: Forum +# de: Discussion Board +# fr: Forum +# cssClass: forum - url: https://wiki.ecogood.org - title: Wiki (Confluence) - description: - en: Documentation platform - de: Dokumentationsplattform - fr: plate-forme de documentation - icon: confluence.svg + solution: Confluence + title: + en: Wiki + de: Wiki + fr: Wiki + cssClass: wiki - url: https://jira.ecogood.org - title: Tickets (JIRA) - description: + solution: JIRA + title: en: Ticket system - de: Ticketsystem für Aufgaben, Fehlermeldung und Projektplanung + de: Ticketsystem fr: Système de billets - icon: jira.svg + cssClass: projekte - url: https://mail.ecogood.org - title: E-Mail (Zimbra) - description: + solution: Zimbra + title: en: Webmail - de: Mailverwaltung + de: E-Mail fr: Administration du courrier - icon: zimbra.png + cssClass: mail - url: https://list.ecogood.org - title: Mailinglisten (Sympa) - description: + solution: Sympa + title: en: E-Mail lists - de: Gruppenkommunikation per E-Mail + de: Mailinglisten fr: Communication de groupe par e-mail - icon: sympa.png + cssClass: maillist - url: https://datacloud.ecogood.org - title: Nextcloud - description: - description: - en: File based cloud application platform - de: Datenspeicher und Austausch, Kalender, Kontakte, Online-Office - fr: Stockage de données dans le cloud - icon: nextcloud.png + solution: Nextcloud + title: + en: File exchange + de: Datenspeicher + fr: Données dans le cloud + cssClass: cloud - url: https://backoffice.ecogood.org - title: Backoffice (SmartWE) - description: - description: + solution: SmartWE + title: en: Membership managment de: Mitgliederverwaltung fr: gestion des membres - icon: cas.png + cssClass: smartwe +# - url: https://gitea.ecogood.org +# solution: Gitea +# title: +# en: Code repo +# de: Quellcode +# fr: Codé +# cssClass: code + --- diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index a43ce38..0aa8b0d 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -10,8 +10,6 @@ -

Ecogood Portal

- {{ block "main" . }}{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index fa14ee7..fa61a48 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,29 +1,57 @@ {{ define "main" }} -

{{ .Title }}

+
{{ .Content }}
+
{{ range .Params.items }} - -
- -
-
-

{{ .title }}

- {{ $found := false }} - {{ range $key, $value := .description }} + +
+
{{ $found := false }} + {{ range $key, $value := .title }} {{ if eq (string $.Site.Language) $key }} -

{{ $value }}

+ {{ $value }} {{ $found = true }} {{ end }} {{ end }} {{ if eq $found false }} -

{{ .description.en }}

- {{ end }} -
- + {{ .title.en }} + {{ end }}
+ +
{{ .solution }}
+
{{ end }} +
+ + + +
+ + +
+ +
+ + + +
+
+ + +
+
Umgangs
kodex
+ + + +
+
+
+ + +
+ +
{{ end }} diff --git a/public/cas.png b/public/cas.png deleted file mode 100644 index a8f4f92..0000000 Binary files a/public/cas.png and /dev/null differ diff --git a/public/confluence.svg b/public/confluence.svg deleted file mode 100644 index acdcb72..0000000 --- a/public/confluence.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - image/svg+xml - - Confluence-blue - - - - - - - - - - - - - - Confluence-blue - - - - - diff --git a/public/de/index.html b/public/de/index.html index 17e3fd8..10cef34 100644 --- a/public/de/index.html +++ b/public/de/index.html @@ -10,26 +10,21 @@ -

Ecogood Portal

- -

+
+
- -
- -
-
-

Wiki (Confluence)

- + +
+
-

Dokumentationsplattform

+ Wiki @@ -38,20 +33,17 @@ +
-
- +
Confluence
+
- -
- -
-
-

Tickets (JIRA)

- + +
+
-

Ticketsystem für Aufgaben, Fehlermeldung und Projektplanung

+ Ticketsystem @@ -60,20 +52,17 @@ +
-
- +
JIRA
+
- -
- -
-
-

E-Mail (Zimbra)

- + +
+
-

Mailverwaltung

+ E-Mail @@ -82,20 +71,17 @@ +
-
- +
Zimbra
+
- -
- -
-
-

Mailinglisten (Sympa)

- + +
+
-

Gruppenkommunikation per E-Mail

+ Mailinglisten @@ -104,20 +90,17 @@ +
-
- +
Sympa
+
- -
- -
-
-

Nextcloud

- + +
+
-

Datenspeicher und Austausch, Kalender, Kontakte, Online-Office

+ Datenspeicher @@ -126,20 +109,17 @@ +
-
- +
Nextcloud
+
- -
- -
-
-

Backoffice (SmartWE)

- + +
+
-

Mitgliederverwaltung

+ Mitgliederverwaltung @@ -148,10 +128,41 @@ +
-
- +
SmartWE
+
+
+ + + +
+ + +
+ +
+ + + +
+
+ + +
+
Umgangs
kodex
+ + + +
+
+
+ + +
+ +
diff --git a/public/ecg-portal-logo.png b/public/ecg-portal-logo.png new file mode 100644 index 0000000..ad7935e Binary files /dev/null and b/public/ecg-portal-logo.png differ diff --git a/public/ecogood.css b/public/ecogood.css index 4e0ba14..7d10ed4 100644 --- a/public/ecogood.css +++ b/public/ecogood.css @@ -1,6 +1,12 @@ body { color: #333; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 1rem; + + margin:0; + padding:0; + text-align:center; + display:block; } a { @@ -8,8 +14,9 @@ a { color: #333; } +/* .item-box { - border-radius: 15px; + border-radius: 15px; position: relative; float: left; @@ -40,3 +47,137 @@ h2 { font-size: 26px; font-weight: 500; } +*/ + +#epframe { + margin: auto; + max-width: 900px; + display: block; + text-align: center; + padding: 24px; +} + +.epsquare, +.epsquareplus { + width: 23%; + padding-bottom: 23%; + position: relative; + margin: 0.5%; + display: inline-block; + background-size: cover; +} + +.epsquareplus { + padding-bottom: 0 +} + +.epsrect { + width: 23%; + padding-bottom: 32.2%; + background-color: none; + position: relative; + margin: 0.5%; + display: inline-block; + background-size: contain; + background-repeat: no-repeat; + border: 1px solid #ccc; +} + +.eptextfunc { + width: 100%; + font-weight: bold; + position: absolute; + color: white; + bottom: 20%; + font-size: 1.35rem +} + +.eptexttool { + width: 100%; + position: absolute; + color: white; + bottom: 8%; +} + +.epcolwiki { + background-color: #009da5; + background-image: url(epwiki.png); +} + +.epcolprojekte { + background-color: #889e33; + background-image: url(epprojekte.png); +} + +.epcolmail { + background-color: #0099CC; + background-image: url(epmail.png); +} + +.epcolmaillist { + background-color: #99CC00; + background-image: url(epmaillist.png); +} + +.epcolcloud { + background-color: #3B6CA6; + background-image: url(epcloud.png); +} + +.epcolsmartwe { + background-color: #E05656; + background-image: url(epsmartwe.png); +} + +.epcolcode { + background-color: #40B075; + background-image: url(epcode.png); +} + +.epcolforum { + background-color: #FF9900; + background-image: url(epforum.png); +} + +@media only screen and (max-width: 900px) { + .epsquare { + width: 30%; + padding-bottom: 30%; + } + .epsrect { + width: 30%; + padding-bottom: 42%; + } + .epsquareplus { + width: 30%; + } +} +@media only screen and (max-width: 640px) { + .epsquare { + width: 40%; + padding-bottom: 40%; + } + .epsrect { + width: 40%; + padding-bottom: 56%; + } + .epsquareplus { + width: 40%; + } +} +@media only screen and (max-width: 450px) { + .epsquare { + width: 50%; + padding-bottom: 50%; + margin: 1.5%; + } + .epsrect { + width: 50%; + padding-bottom: 70%; + margin: 1.5%; + } + .epsquareplus { + width: 50%; + margin: 1.5%; + } +} diff --git a/public/en/index.html b/public/en/index.html index 51dcb2a..de533ac 100644 --- a/public/en/index.html +++ b/public/en/index.html @@ -10,148 +10,159 @@ -

Ecogood Portal

- -

+
+
- -
- -
-
-

Wiki (Confluence)

- + +
+
-

Documentation platform

+ Wiki +
-
- +
Confluence
+
- -
- -
-
-

Tickets (JIRA)

- + +
+
-

Ticket system

+ Ticket system +
-
- +
JIRA
+
- -
- -
-
-

E-Mail (Zimbra)

- + +
+
-

Webmail

+ Webmail +
-
- +
Zimbra
+
- -
- -
-
-

Mailinglisten (Sympa)

- + +
+
-

E-Mail lists

+ E-Mail lists +
-
- +
Sympa
+
- -
- -
-
-

Nextcloud

- + +
+
-

File based cloud application platform

+ File exchange +
-
- +
Nextcloud
+
- -
- -
-
-

Backoffice (SmartWE)

- + +
+
-

Membership managment

+ Membership managment +
-
- +
SmartWE
+
+
+ + + +
+ + +
+ +
+ + + +
+
+ + +
+
Umgangs
kodex
+ + + +
+
+
+ + +
+ +
diff --git a/public/epcloud.png b/public/epcloud.png new file mode 100644 index 0000000..6860304 Binary files /dev/null and b/public/epcloud.png differ diff --git a/public/epcode.png b/public/epcode.png new file mode 100644 index 0000000..9be8df2 Binary files /dev/null and b/public/epcode.png differ diff --git a/public/epecg.png b/public/epecg.png new file mode 100644 index 0000000..b725c42 Binary files /dev/null and b/public/epecg.png differ diff --git a/public/epforum.png b/public/epforum.png new file mode 100644 index 0000000..af3cf05 Binary files /dev/null and b/public/epforum.png differ diff --git a/public/epmail.png b/public/epmail.png new file mode 100644 index 0000000..d19a53b Binary files /dev/null and b/public/epmail.png differ diff --git a/public/epmaillist.png b/public/epmaillist.png new file mode 100644 index 0000000..bbd6b88 Binary files /dev/null and b/public/epmaillist.png differ diff --git a/public/epprojekte.png b/public/epprojekte.png new file mode 100644 index 0000000..43e14cb Binary files /dev/null and b/public/epprojekte.png differ diff --git a/public/epsmartwe.png b/public/epsmartwe.png new file mode 100644 index 0000000..a709e73 Binary files /dev/null and b/public/epsmartwe.png differ diff --git a/public/epwiki.png b/public/epwiki.png new file mode 100644 index 0000000..1b26b7d Binary files /dev/null and b/public/epwiki.png differ diff --git a/public/fr/index.html b/public/fr/index.html index 7205e2d..c8706a2 100644 --- a/public/fr/index.html +++ b/public/fr/index.html @@ -10,148 +10,159 @@ -

Ecogood Portal

- -

+
+
- -
- -
-
-

Wiki (Confluence)

- + +
+
-

plate-forme de documentation

+ Wiki +
-
- +
Confluence
+
- -
- -
-
-

Tickets (JIRA)

- + +
+
-

Système de billets

+ Système de billets +
-
- +
JIRA
+
- -
- -
-
-

E-Mail (Zimbra)

- + +
+
-

Administration du courrier

+ Administration du courrier +
-
- +
Zimbra
+
- -
- -
-
-

Mailinglisten (Sympa)

- + +
+
-

Communication de groupe par e-mail

+ Communication de groupe par e-mail +
-
- +
Sympa
+
- -
- -
-
-

Nextcloud

- + +
+
-

Stockage de données dans le cloud

+ Données dans le cloud +
-
- +
Nextcloud
+
- -
- -
-
-

Backoffice (SmartWE)

- + +
+
-

gestion des membres

+ gestion des membres +
-
- +
SmartWE
+
+
+ + + +
+ + +
+ +
+ + + +
+
+ + +
+
Umgangs
kodex
+ + + +
+
+
+ + +
+ +
diff --git a/public/gwoe-arbeitsbuch-5k.jpg b/public/gwoe-arbeitsbuch-5k.jpg new file mode 100644 index 0000000..3ef92b6 Binary files /dev/null and b/public/gwoe-arbeitsbuch-5k.jpg differ diff --git a/public/gwoe-arbeitsbuch-5v.jpg b/public/gwoe-arbeitsbuch-5v.jpg new file mode 100644 index 0000000..436e584 Binary files /dev/null and b/public/gwoe-arbeitsbuch-5v.jpg differ diff --git a/public/gwoe-regelwerk.jpg b/public/gwoe-regelwerk.jpg new file mode 100644 index 0000000..2a9b894 Binary files /dev/null and b/public/gwoe-regelwerk.jpg differ diff --git a/public/htaccess b/public/htaccess deleted file mode 100644 index ff0f594..0000000 --- a/public/htaccess +++ /dev/null @@ -1,14 +0,0 @@ -RewriteEngine on - -RewriteCond %{HTTP:Accept-Language} ^en [NC] -RewriteRule ^$ https://%{HTTP_HOST}/en/ [L,R=300] - -RewriteCond %{HTTP:Accept-Language} ^de [NC] -RewriteRule ^$ https://%{HTTP_HOST}/de/ [L,R=300] - -RewriteCond %{HTTP:Accept-Language} ^fr [NC] -RewriteRule ^$ https://%{HTTP_HOST}/fr/ [L,R=300] - -# Fallback for any other language to spanish -RewriteCond %{HTTP_HOST} my.ecogood.world [NC] -RewriteRule ^$ https://%{HTTP_HOST}/en2/ [L,R=300] \ No newline at end of file diff --git a/public/jira.svg b/public/jira.svg deleted file mode 100644 index c1cf0e2..0000000 --- a/public/jira.svg +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - image/svg+xml - - Jira Core-blue - - - - - - - - - - - - Jira Core-blue - - - - - diff --git a/public/nextcloud.png b/public/nextcloud.png deleted file mode 100644 index bfd3aa8..0000000 Binary files a/public/nextcloud.png and /dev/null differ diff --git a/public/osi.png b/public/osi.png deleted file mode 100644 index 75ea0c2..0000000 Binary files a/public/osi.png and /dev/null differ diff --git a/public/sympa.png b/public/sympa.png deleted file mode 100644 index d644c9a..0000000 Binary files a/public/sympa.png and /dev/null differ diff --git a/public/zimbra.png b/public/zimbra.png deleted file mode 100644 index 038d91a..0000000 Binary files a/public/zimbra.png and /dev/null differ diff --git a/static/cas.png b/static/cas.png deleted file mode 100644 index a8f4f92..0000000 Binary files a/static/cas.png and /dev/null differ diff --git a/static/confluence.svg b/static/confluence.svg deleted file mode 100644 index acdcb72..0000000 --- a/static/confluence.svg +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - image/svg+xml - - Confluence-blue - - - - - - - - - - - - - - Confluence-blue - - - - - diff --git a/static/ecg-portal-logo.png b/static/ecg-portal-logo.png new file mode 100644 index 0000000..ad7935e Binary files /dev/null and b/static/ecg-portal-logo.png differ diff --git a/static/ecogood.css b/static/ecogood.css index 4e0ba14..7d10ed4 100644 --- a/static/ecogood.css +++ b/static/ecogood.css @@ -1,6 +1,12 @@ body { color: #333; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 1rem; + + margin:0; + padding:0; + text-align:center; + display:block; } a { @@ -8,8 +14,9 @@ a { color: #333; } +/* .item-box { - border-radius: 15px; + border-radius: 15px; position: relative; float: left; @@ -40,3 +47,137 @@ h2 { font-size: 26px; font-weight: 500; } +*/ + +#epframe { + margin: auto; + max-width: 900px; + display: block; + text-align: center; + padding: 24px; +} + +.epsquare, +.epsquareplus { + width: 23%; + padding-bottom: 23%; + position: relative; + margin: 0.5%; + display: inline-block; + background-size: cover; +} + +.epsquareplus { + padding-bottom: 0 +} + +.epsrect { + width: 23%; + padding-bottom: 32.2%; + background-color: none; + position: relative; + margin: 0.5%; + display: inline-block; + background-size: contain; + background-repeat: no-repeat; + border: 1px solid #ccc; +} + +.eptextfunc { + width: 100%; + font-weight: bold; + position: absolute; + color: white; + bottom: 20%; + font-size: 1.35rem +} + +.eptexttool { + width: 100%; + position: absolute; + color: white; + bottom: 8%; +} + +.epcolwiki { + background-color: #009da5; + background-image: url(epwiki.png); +} + +.epcolprojekte { + background-color: #889e33; + background-image: url(epprojekte.png); +} + +.epcolmail { + background-color: #0099CC; + background-image: url(epmail.png); +} + +.epcolmaillist { + background-color: #99CC00; + background-image: url(epmaillist.png); +} + +.epcolcloud { + background-color: #3B6CA6; + background-image: url(epcloud.png); +} + +.epcolsmartwe { + background-color: #E05656; + background-image: url(epsmartwe.png); +} + +.epcolcode { + background-color: #40B075; + background-image: url(epcode.png); +} + +.epcolforum { + background-color: #FF9900; + background-image: url(epforum.png); +} + +@media only screen and (max-width: 900px) { + .epsquare { + width: 30%; + padding-bottom: 30%; + } + .epsrect { + width: 30%; + padding-bottom: 42%; + } + .epsquareplus { + width: 30%; + } +} +@media only screen and (max-width: 640px) { + .epsquare { + width: 40%; + padding-bottom: 40%; + } + .epsrect { + width: 40%; + padding-bottom: 56%; + } + .epsquareplus { + width: 40%; + } +} +@media only screen and (max-width: 450px) { + .epsquare { + width: 50%; + padding-bottom: 50%; + margin: 1.5%; + } + .epsrect { + width: 50%; + padding-bottom: 70%; + margin: 1.5%; + } + .epsquareplus { + width: 50%; + margin: 1.5%; + } +} diff --git a/static/epcloud.png b/static/epcloud.png new file mode 100644 index 0000000..6860304 Binary files /dev/null and b/static/epcloud.png differ diff --git a/static/epcode.png b/static/epcode.png new file mode 100644 index 0000000..9be8df2 Binary files /dev/null and b/static/epcode.png differ diff --git a/static/epecg.png b/static/epecg.png new file mode 100644 index 0000000..b725c42 Binary files /dev/null and b/static/epecg.png differ diff --git a/static/epforum.png b/static/epforum.png new file mode 100644 index 0000000..af3cf05 Binary files /dev/null and b/static/epforum.png differ diff --git a/static/epmail.png b/static/epmail.png new file mode 100644 index 0000000..d19a53b Binary files /dev/null and b/static/epmail.png differ diff --git a/static/epmaillist.png b/static/epmaillist.png new file mode 100644 index 0000000..bbd6b88 Binary files /dev/null and b/static/epmaillist.png differ diff --git a/static/epprojekte.png b/static/epprojekte.png new file mode 100644 index 0000000..43e14cb Binary files /dev/null and b/static/epprojekte.png differ diff --git a/static/epsmartwe.png b/static/epsmartwe.png new file mode 100644 index 0000000..a709e73 Binary files /dev/null and b/static/epsmartwe.png differ diff --git a/static/epwiki.png b/static/epwiki.png new file mode 100644 index 0000000..1b26b7d Binary files /dev/null and b/static/epwiki.png differ diff --git a/static/gwoe-arbeitsbuch-5k.jpg b/static/gwoe-arbeitsbuch-5k.jpg new file mode 100644 index 0000000..3ef92b6 Binary files /dev/null and b/static/gwoe-arbeitsbuch-5k.jpg differ diff --git a/static/gwoe-arbeitsbuch-5v.jpg b/static/gwoe-arbeitsbuch-5v.jpg new file mode 100644 index 0000000..436e584 Binary files /dev/null and b/static/gwoe-arbeitsbuch-5v.jpg differ diff --git a/static/gwoe-regelwerk.jpg b/static/gwoe-regelwerk.jpg new file mode 100644 index 0000000..2a9b894 Binary files /dev/null and b/static/gwoe-regelwerk.jpg differ diff --git a/static/jira.svg b/static/jira.svg deleted file mode 100644 index c1cf0e2..0000000 --- a/static/jira.svg +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - image/svg+xml - - Jira Core-blue - - - - - - - - - - - - Jira Core-blue - - - - - diff --git a/static/nextcloud.png b/static/nextcloud.png deleted file mode 100644 index bfd3aa8..0000000 Binary files a/static/nextcloud.png and /dev/null differ diff --git a/static/osi.png b/static/osi.png deleted file mode 100644 index 75ea0c2..0000000 Binary files a/static/osi.png and /dev/null differ diff --git a/static/sympa.png b/static/sympa.png deleted file mode 100644 index d644c9a..0000000 Binary files a/static/sympa.png and /dev/null differ diff --git a/static/zimbra.png b/static/zimbra.png deleted file mode 100644 index 038d91a..0000000 Binary files a/static/zimbra.png and /dev/null differ