From 5ce8b9e237ca3dcabf6ebbcefa91b6fe88c9a89e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 19 Jul 2021 15:22:55 +0200 Subject: [PATCH 1/7] Refine HTML of internal pages and their templates --- branding/locales/html/de/code-of-conduct.html | 3 ++- branding/locales/html/de/data-privacy.html | 3 ++- branding/locales/html/de/faq.html | 3 ++- branding/locales/html/de/imprint.html | 3 ++- branding/locales/html/de/terms-and-conditions.html | 3 ++- branding/locales/html/en/code-of-conduct.html | 3 ++- branding/locales/html/en/data-privacy.html | 3 ++- branding/locales/html/en/faq.html | 3 ++- branding/locales/html/en/imprint.html | 3 ++- branding/locales/html/en/terms-and-conditions.html | 3 ++- branding/templates/locales/html/de/code-of-conduct.html | 2 +- 11 files changed, 21 insertions(+), 11 deletions(-) diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html index 5e096fe1e..fd0b0118a 100644 --- a/branding/locales/html/de/code-of-conduct.html +++ b/branding/locales/html/de/code-of-conduct.html @@ -1,6 +1,7 @@ - + +

Ich bin der Inhalt vom Verhaltenskodex


Neu gebrandet …

diff --git a/branding/locales/html/de/data-privacy.html b/branding/locales/html/de/data-privacy.html index 0472a6877..2de7663e3 100644 --- a/branding/locales/html/de/data-privacy.html +++ b/branding/locales/html/de/data-privacy.html @@ -1,6 +1,7 @@ - + +

Das hier wäre der Inhalt der Datenschutzbestimmungen


Neu gebrandet …

diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html index e2f6fcbbd..8380fc335 100644 --- a/branding/locales/html/de/faq.html +++ b/branding/locales/html/de/faq.html @@ -1,6 +1,7 @@ - + +

Hier stehen die FAQs


Neu gebrandet …

diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html index 4c64c8c6a..110868f60 100644 --- a/branding/locales/html/de/imprint.html +++ b/branding/locales/html/de/imprint.html @@ -1,6 +1,7 @@ - + +

Ich bin das Impressum


Neu gebrandet …

diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html index 75892442a..988c10430 100644 --- a/branding/locales/html/de/terms-and-conditions.html +++ b/branding/locales/html/de/terms-and-conditions.html @@ -1,6 +1,7 @@ - + +

Ich bin der Inhalt der Seite "Nutzungsbedingungen"


Neu gebrandet …

diff --git a/branding/locales/html/en/code-of-conduct.html b/branding/locales/html/en/code-of-conduct.html index 7a93d97b9..609ffd431 100644 --- a/branding/locales/html/en/code-of-conduct.html +++ b/branding/locales/html/en/code-of-conduct.html @@ -1,6 +1,7 @@ - + +

I am the content of the code of conduct


Rebranded …

diff --git a/branding/locales/html/en/data-privacy.html b/branding/locales/html/en/data-privacy.html index ccbd2c3f1..0905a5038 100644 --- a/branding/locales/html/en/data-privacy.html +++ b/branding/locales/html/en/data-privacy.html @@ -1,6 +1,7 @@ - + +

This would be our data privacy section


Rebranded …

diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html index ada798d3e..905c1c53b 100644 --- a/branding/locales/html/en/faq.html +++ b/branding/locales/html/en/faq.html @@ -1,6 +1,7 @@ - + +

Here are the FAQs


Rebranded …

diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html index 3e021cbad..05a0a9ab3 100644 --- a/branding/locales/html/en/imprint.html +++ b/branding/locales/html/en/imprint.html @@ -1,6 +1,7 @@ - + +

I am the imprint


Rebranded …

diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html index 1da118d36..0109e1ce2 100644 --- a/branding/locales/html/en/terms-and-conditions.html +++ b/branding/locales/html/en/terms-and-conditions.html @@ -1,6 +1,7 @@ - + +

I am the content of the page "terms and conditions"


Rebranded …

diff --git a/branding/templates/locales/html/de/code-of-conduct.html b/branding/templates/locales/html/de/code-of-conduct.html index 65af881fc..0934ad276 100644 --- a/branding/templates/locales/html/de/code-of-conduct.html +++ b/branding/templates/locales/html/de/code-of-conduct.html @@ -1,5 +1,5 @@ - + From e9638147d1ac2bc612026dca315970166ed870c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 19 Jul 2021 15:31:32 +0200 Subject: [PATCH 2/7] Add comment to 'links.js' --- branding/constants/links.js | 1 + 1 file changed, 1 insertion(+) diff --git a/branding/constants/links.js b/branding/constants/links.js index 6b945a5e0..70586f283 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -4,6 +4,7 @@ export default { SUPPORT: 'https://ocelot.social', // on null or empty strings internal imprint is used, see 'webapp/locales/html/' + // you can find and store templates at 'master/branding/templates/' DONATE: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly IMPRINT: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly TERMS_AND_CONDITIONS: null, From 74852aa2d15408677d5ce59ebc34c15e02f867b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Jul 2021 10:43:49 +0200 Subject: [PATCH 3/7] Add dot at line end of HTML internal pages --- branding/locales/html/de/code-of-conduct.html | 2 +- branding/locales/html/de/data-privacy.html | 2 +- branding/locales/html/de/faq.html | 2 +- branding/locales/html/de/imprint.html | 2 +- branding/locales/html/de/terms-and-conditions.html | 2 +- branding/locales/html/en/code-of-conduct.html | 2 +- branding/locales/html/en/data-privacy.html | 2 +- branding/locales/html/en/faq.html | 2 +- branding/locales/html/en/imprint.html | 2 +- branding/locales/html/en/terms-and-conditions.html | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html index fd0b0118a..18f28be43 100644 --- a/branding/locales/html/de/code-of-conduct.html +++ b/branding/locales/html/de/code-of-conduct.html @@ -2,6 +2,6 @@
-

Ich bin der Inhalt vom Verhaltenskodex

+

Ich bin der Inhalt vom Verhaltenskodex.


Neu gebrandet …

diff --git a/branding/locales/html/de/data-privacy.html b/branding/locales/html/de/data-privacy.html index 2de7663e3..e0df6d366 100644 --- a/branding/locales/html/de/data-privacy.html +++ b/branding/locales/html/de/data-privacy.html @@ -2,6 +2,6 @@
-

Das hier wäre der Inhalt der Datenschutzbestimmungen

+

Das hier wäre der Inhalt der Datenschutzbestimmungen.


Neu gebrandet …

diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html index 8380fc335..e7b6ab91b 100644 --- a/branding/locales/html/de/faq.html +++ b/branding/locales/html/de/faq.html @@ -2,6 +2,6 @@
-

Hier stehen die FAQs

+

Hier stehen die FAQs.


Neu gebrandet …

diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html index 110868f60..17a15c5fc 100644 --- a/branding/locales/html/de/imprint.html +++ b/branding/locales/html/de/imprint.html @@ -2,6 +2,6 @@
-

Ich bin das Impressum

+

Ich bin das Impressum.


Neu gebrandet …

diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html index 988c10430..49a09ca6b 100644 --- a/branding/locales/html/de/terms-and-conditions.html +++ b/branding/locales/html/de/terms-and-conditions.html @@ -2,6 +2,6 @@
-

Ich bin der Inhalt der Seite "Nutzungsbedingungen"

+

Ich bin der Inhalt der Seite "Nutzungsbedingungen".


Neu gebrandet …

diff --git a/branding/locales/html/en/code-of-conduct.html b/branding/locales/html/en/code-of-conduct.html index 609ffd431..936ebdea8 100644 --- a/branding/locales/html/en/code-of-conduct.html +++ b/branding/locales/html/en/code-of-conduct.html @@ -2,6 +2,6 @@
-

I am the content of the code of conduct

+

I am the content of the code of conduct.


Rebranded …

diff --git a/branding/locales/html/en/data-privacy.html b/branding/locales/html/en/data-privacy.html index 0905a5038..dec473520 100644 --- a/branding/locales/html/en/data-privacy.html +++ b/branding/locales/html/en/data-privacy.html @@ -2,6 +2,6 @@
-

This would be our data privacy section

+

This would be our data privacy section.


Rebranded …

diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html index 905c1c53b..b5905c64a 100644 --- a/branding/locales/html/en/faq.html +++ b/branding/locales/html/en/faq.html @@ -2,6 +2,6 @@
-

Here are the FAQs

+

Here are the FAQs.


Rebranded …

diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html index 05a0a9ab3..6c496ad31 100644 --- a/branding/locales/html/en/imprint.html +++ b/branding/locales/html/en/imprint.html @@ -2,6 +2,6 @@
-

I am the imprint

+

I am the imprint.


Rebranded …

diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html index 0109e1ce2..a959ee9a6 100644 --- a/branding/locales/html/en/terms-and-conditions.html +++ b/branding/locales/html/en/terms-and-conditions.html @@ -2,6 +2,6 @@
-

I am the content of the page "terms and conditions"

+

I am the content of the page "Terms And Conditions".


Rebranded …

From 2f045553d41799b66b2dfd4f69d49fad619f83a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Jul 2021 11:34:30 +0200 Subject: [PATCH 4/7] Implement HTML internal support and organization pages --- branding/constants/links.js | 11 ++++++----- branding/locales/html/de/code-of-conduct.html | 4 ++-- branding/locales/html/de/data-privacy.html | 4 ++-- branding/locales/html/de/faq.html | 4 ++-- branding/locales/html/de/imprint.html | 4 ++-- branding/locales/html/de/organization.html | 7 +++++++ branding/locales/html/de/support.html | 7 +++++++ branding/locales/html/de/terms-and-conditions.html | 4 ++-- branding/locales/html/en/code-of-conduct.html | 4 ++-- branding/locales/html/en/data-privacy.html | 4 ++-- branding/locales/html/en/faq.html | 4 ++-- branding/locales/html/en/imprint.html | 4 ++-- branding/locales/html/en/organization.html | 7 +++++++ branding/locales/html/en/support.html | 7 +++++++ branding/locales/html/en/terms-and-conditions.html | 4 ++-- 15 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 branding/locales/html/de/organization.html create mode 100644 branding/locales/html/de/support.html create mode 100644 branding/locales/html/en/organization.html create mode 100644 branding/locales/html/en/support.html diff --git a/branding/constants/links.js b/branding/constants/links.js index 70586f283..4a55fc56e 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -1,10 +1,11 @@ -// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding +// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/ export default { + LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization' + SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support' + + // on null or empty strings internal pages are used, see 'webapp/locales/html/' + // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ ORGANIZATION: 'https://ocelot.social', - SUPPORT: 'https://ocelot.social', - - // on null or empty strings internal imprint is used, see 'webapp/locales/html/' - // you can find and store templates at 'master/branding/templates/' DONATE: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly IMPRINT: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly TERMS_AND_CONDITIONS: null, diff --git a/branding/locales/html/de/code-of-conduct.html b/branding/locales/html/de/code-of-conduct.html index 18f28be43..e890fcc01 100644 --- a/branding/locales/html/de/code-of-conduct.html +++ b/branding/locales/html/de/code-of-conduct.html @@ -1,5 +1,5 @@ - - + +

Ich bin der Inhalt vom Verhaltenskodex.

diff --git a/branding/locales/html/de/data-privacy.html b/branding/locales/html/de/data-privacy.html index e0df6d366..094f1e7c0 100644 --- a/branding/locales/html/de/data-privacy.html +++ b/branding/locales/html/de/data-privacy.html @@ -1,5 +1,5 @@ - - + +

Das hier wäre der Inhalt der Datenschutzbestimmungen.

diff --git a/branding/locales/html/de/faq.html b/branding/locales/html/de/faq.html index e7b6ab91b..7a0f5a1a2 100644 --- a/branding/locales/html/de/faq.html +++ b/branding/locales/html/de/faq.html @@ -1,5 +1,5 @@ - - + +

Hier stehen die FAQs.

diff --git a/branding/locales/html/de/imprint.html b/branding/locales/html/de/imprint.html index 17a15c5fc..8a902f6fd 100644 --- a/branding/locales/html/de/imprint.html +++ b/branding/locales/html/de/imprint.html @@ -1,5 +1,5 @@ - - + +

Ich bin das Impressum.

diff --git a/branding/locales/html/de/organization.html b/branding/locales/html/de/organization.html new file mode 100644 index 000000000..7ecd4395e --- /dev/null +++ b/branding/locales/html/de/organization.html @@ -0,0 +1,7 @@ + + + +
+

Hier wird das Netzwerk beschrieben.

+
+

Neu gebrandet …

diff --git a/branding/locales/html/de/support.html b/branding/locales/html/de/support.html new file mode 100644 index 000000000..6dab2b250 --- /dev/null +++ b/branding/locales/html/de/support.html @@ -0,0 +1,7 @@ + + + +
+

Ich bin der Inhalt vom Support.

+
+

Neu gebrandet …

diff --git a/branding/locales/html/de/terms-and-conditions.html b/branding/locales/html/de/terms-and-conditions.html index 49a09ca6b..38cc15a96 100644 --- a/branding/locales/html/de/terms-and-conditions.html +++ b/branding/locales/html/de/terms-and-conditions.html @@ -1,5 +1,5 @@ - - + +

Ich bin der Inhalt der Seite "Nutzungsbedingungen".

diff --git a/branding/locales/html/en/code-of-conduct.html b/branding/locales/html/en/code-of-conduct.html index 936ebdea8..fe10442a6 100644 --- a/branding/locales/html/en/code-of-conduct.html +++ b/branding/locales/html/en/code-of-conduct.html @@ -1,5 +1,5 @@ - - + +

I am the content of the code of conduct.

diff --git a/branding/locales/html/en/data-privacy.html b/branding/locales/html/en/data-privacy.html index dec473520..981c7467e 100644 --- a/branding/locales/html/en/data-privacy.html +++ b/branding/locales/html/en/data-privacy.html @@ -1,5 +1,5 @@ - - + +

This would be our data privacy section.

diff --git a/branding/locales/html/en/faq.html b/branding/locales/html/en/faq.html index b5905c64a..33d6d27ac 100644 --- a/branding/locales/html/en/faq.html +++ b/branding/locales/html/en/faq.html @@ -1,5 +1,5 @@ - - + +

Here are the FAQs.

diff --git a/branding/locales/html/en/imprint.html b/branding/locales/html/en/imprint.html index 6c496ad31..5f42e2efd 100644 --- a/branding/locales/html/en/imprint.html +++ b/branding/locales/html/en/imprint.html @@ -1,5 +1,5 @@ - - + +

I am the imprint.

diff --git a/branding/locales/html/en/organization.html b/branding/locales/html/en/organization.html new file mode 100644 index 000000000..7c972d2bf --- /dev/null +++ b/branding/locales/html/en/organization.html @@ -0,0 +1,7 @@ + + + +
+

Here the network is described.

+
+

Rebranded …

diff --git a/branding/locales/html/en/support.html b/branding/locales/html/en/support.html new file mode 100644 index 000000000..b54197d8a --- /dev/null +++ b/branding/locales/html/en/support.html @@ -0,0 +1,7 @@ + + + +
+

I am the content of the support.

+
+

Rebranded …

diff --git a/branding/locales/html/en/terms-and-conditions.html b/branding/locales/html/en/terms-and-conditions.html index a959ee9a6..030a96c07 100644 --- a/branding/locales/html/en/terms-and-conditions.html +++ b/branding/locales/html/en/terms-and-conditions.html @@ -1,5 +1,5 @@ - - + +

I am the content of the page "Terms And Conditions".

From bfecd09fcdb1ef4997f7be95d148ae6164fd1eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Jul 2021 11:49:59 +0200 Subject: [PATCH 5/7] Refine comments --- branding/constants/links.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/branding/constants/links.js b/branding/constants/links.js index 4a55fc56e..55cc72d4d 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -1,7 +1,7 @@ // this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/ export default { - LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization' - SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support' + LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social' + SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well! // on null or empty strings internal pages are used, see 'webapp/locales/html/' // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ From 551dd5eec72111ab1f94a90c70a49721c31eb52f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 20 Jul 2021 17:33:37 +0200 Subject: [PATCH 6/7] Change comments --- branding/constants/links.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/branding/constants/links.js b/branding/constants/links.js index 55cc72d4d..b111726f3 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -1,10 +1,12 @@ // this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/ export default { LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social' + + // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ + SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well! - + // on null or empty strings internal pages are used, see 'webapp/locales/html/' - // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ ORGANIZATION: 'https://ocelot.social', DONATE: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly IMPRINT: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly From 895150f997d8659c168bfb606e462280a7db056a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Tue, 27 Jul 2021 11:54:03 +0200 Subject: [PATCH 7/7] Change DockerHub build number to compatible one --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8519b2f1a..cb57d4923 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ocelot-social-branded", "version": "1.0.4", - "ocelotDockerVersionTag": "1.0.4-100", + "ocelotDockerVersionTag": "1.0.4-135", "dockerOrganisation": "ocelotsocialnetwork", "description": "ocelot.social Branded", "author": "ocelot.social Community",