diff --git a/backend/src/config/emails.ts b/backend/src/config/emails.ts index 34daaecb0..7d03d01ab 100644 --- a/backend/src/config/emails.ts +++ b/backend/src/config/emails.ts @@ -1,8 +1,8 @@ // this file is duplicated in `backend/src/config/` and `webapp/constants/` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/ export default { - SUPPORT_EMAIL: 'devops@ocelot.social', - MODERATION_EMAIL: 'devops@ocelot.social', + SUPPORT_EMAIL: 'support@changemedia.at', + MODERATION_EMAIL: 'support@changemedia.at', // ATTENTION: the following links have to be defined even for internal pages with full URLs as example like 'https://staging.ocelot.social/support', because they are used in e-mails! - ORGANIZATION_LINK: 'https://ocelot.social', - SUPPORT_LINK: 'https://ocelot.social', + ORGANIZATION_LINK: 'https://changemedia.club', + SUPPORT_LINK: 'https://changemedia.club/impressum', } diff --git a/backend/src/constants/groups.ts b/backend/src/constants/groups.ts index 6300afa35..14089f4d4 100644 --- a/backend/src/constants/groups.ts +++ b/backend/src/constants/groups.ts @@ -1,3 +1,6 @@ -// this file is duplicated in `backend/src/constants/group` and `webapp/constants/group.js` +// this file is duplicated in `backend/src/constants/group.js` and `webapp/constants/group.js` +export const NAME_LENGTH_MIN = 3 +export const NAME_LENGTH_MAX = 50 export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 3 // with removed HTML tags export const DESCRIPTION_EXCERPT_HTML_LENGTH = 250 // with removed HTML tags +export const SHOW_GROUP_BUTTON_IN_HEADER = true diff --git a/webapp/constants/emails.js b/webapp/constants/emails.js index 34daaecb0..7d03d01ab 100644 --- a/webapp/constants/emails.js +++ b/webapp/constants/emails.js @@ -1,8 +1,8 @@ // this file is duplicated in `backend/src/config/` and `webapp/constants/` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/ export default { - SUPPORT_EMAIL: 'devops@ocelot.social', - MODERATION_EMAIL: 'devops@ocelot.social', + SUPPORT_EMAIL: 'support@changemedia.at', + MODERATION_EMAIL: 'support@changemedia.at', // ATTENTION: the following links have to be defined even for internal pages with full URLs as example like 'https://staging.ocelot.social/support', because they are used in e-mails! - ORGANIZATION_LINK: 'https://ocelot.social', - SUPPORT_LINK: 'https://ocelot.social', + ORGANIZATION_LINK: 'https://changemedia.club', + SUPPORT_LINK: 'https://changemedia.club/impressum', } diff --git a/webapp/constants/groups.js b/webapp/constants/groups.js index 029f492e0..14089f4d4 100644 --- a/webapp/constants/groups.js +++ b/webapp/constants/groups.js @@ -2,4 +2,5 @@ export const NAME_LENGTH_MIN = 3 export const NAME_LENGTH_MAX = 50 export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 3 // with removed HTML tags +export const DESCRIPTION_EXCERPT_HTML_LENGTH = 250 // with removed HTML tags export const SHOW_GROUP_BUTTON_IN_HEADER = true diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js index aa87a598c..8ff29ea9b 100644 --- a/webapp/constants/headerMenu.js +++ b/webapp/constants/headerMenu.js @@ -1,13 +1,13 @@ export default { MENU: [ - // { - // nameIdent: 'nameIdent', - // path: '/', - // }, - // { - // nameIdent: 'nameIdent', - // url: 'https://ocelot.social', - // target: '_blank', - // }, + { + nameIdent: 'changemediaRebranding.header.newsFeed', + path: '/', + }, + { + nameIdent: 'changemediaRebranding.header.about', + url: 'https://changemedia.club', + // target: '_blank', + }, ], } diff --git a/webapp/constants/links.js b/webapp/constants/links.js index a252b98cd..893ad37b8 100644 --- a/webapp/constants/links.js +++ b/webapp/constants/links.js @@ -3,26 +3,26 @@ import { defaultPageParamsPages } from '~/components/utils/InternalPages.js' const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({ - // if defined it's dominating + // externalLink: null, // if string is defined and not empty it's dominating externalLink: { - url: 'https://ocelot.social', - target: '_blank', + url: 'https://changemedia.club', + target: '', }, internalPage: { // footerIdent: 'site.made', // localized string identifier, if undefined default is used // headTitleIdent: 'site.made', // localized string identifier, if undefined default is used - // headlineIdent: 'site.made', // localized string identifier, on null it's hidden, if undefined default is used + headlineIdent: null, // localized string identifier, on null it's hidden, if undefined default is used hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const DONATE = defaultPageParamsPages.DONATE.overwrite({ - // if defined it's dominating + // externalLink: null, // if string is defined and not empty it's dominating externalLink: { - url: 'https://busfaktor.org/en/spenden', + url: 'https://ko-fi.com/changemedia', target: '_blank', }, @@ -33,13 +33,14 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ + // externalLink: null, // if string is defined and not empty it's dominating externalLink: { - url: 'http://ocelot.social/en/impressum', - target: '_blank', + url: 'https://changemedia.club/impressum', + target: '', }, internalPage: { @@ -49,11 +50,11 @@ const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({ - // externalLink: null, // if defined it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used @@ -62,11 +63,11 @@ const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwri hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ - // externalLink: null, // if defined it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used @@ -75,11 +76,11 @@ const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ - // externalLink: null, // if defined it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used @@ -88,11 +89,11 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const FAQ = defaultPageParamsPages.FAQ.overwrite({ - // externalLink: null, // if defined it's dominating + // externalLink: null, // if string is defined and not empty it's dominating internalPage: { // footerIdent: 'site.faq', // localized string identifier, if undefined default is used @@ -101,14 +102,14 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({ - // if defined it's dominating + // externalLink: null, // if string is defined and not empty it's dominating externalLink: { - url: 'https://ocelot.social', - target: '_blank', + url: 'https://changemedia.club/impressum', + target: '', }, internalPage: { @@ -118,7 +119,7 @@ const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({ hasContainer: true, hasBaseCard: true, hasLoginInHeader: true, - // in case internal page content is here 'webapp/locales/html/' + // in case internal page content is here 'branding/locales/html/' }, }) @@ -138,12 +139,12 @@ export default { FOOTER_LINK_LIST: [ ORGANIZATION, - TERMS_AND_CONDITIONS, - CODE_OF_CONDUCT, - DATA_PRIVACY, + // TERMS_AND_CONDITIONS, + // CODE_OF_CONDUCT, + // DATA_PRIVACY, FAQ, DONATE, - SUPPORT, IMPRINT, + SUPPORT, ], } diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 4e5d42ac4..37b7fd5f6 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -78,6 +78,12 @@ } } }, + "changemediaRebranding": { + "header": { + "about": "Club", + "newsFeed": "Beiträge" + } + }, "chat": { "addRoomHeadline": "Suche Nutzer für neuen Chat", "cancelSelectMessage": "Abbrechen", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 534a376cf..a4751353d 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -78,6 +78,12 @@ } } }, + "changemediaRebranding": { + "header": { + "about": "Club", + "newsFeed": "News Feed" + } + }, "chat": { "addRoomHeadline": "Search User for new Chat", "cancelSelectMessage": "Cancel", diff --git a/webapp/locales/html/de/faq.html b/webapp/locales/html/de/faq.html index aab0205a1..ef8a70a10 100644 --- a/webapp/locales/html/de/faq.html +++ b/webapp/locales/html/de/faq.html @@ -3,24 +3,29 @@

- Für das soziale Netzwerk Ocelot.Social für Entwickler + Wie bediene ich unser Netzwerk?

-

+

Hier findest Du die - Bedienungsanleitung.
+ Bedienungsanleitung.

-

+

+ \ No newline at end of file diff --git a/webapp/locales/html/en/faq.html b/webapp/locales/html/en/faq.html index 1356622aa..b0e848192 100644 --- a/webapp/locales/html/en/faq.html +++ b/webapp/locales/html/en/faq.html @@ -3,24 +3,29 @@

- For the social network Ocelot.Social for Developers + How do I operate our network?

-

+

Here you can find the - user manual.
+ user manual.

-

+

+ \ No newline at end of file diff --git a/webapp/static/favicon.ico b/webapp/static/favicon.ico index b535a3db8..ca86154c0 100644 Binary files a/webapp/static/favicon.ico and b/webapp/static/favicon.ico differ diff --git a/webapp/static/icon.png b/webapp/static/icon.png index eca541332..9128d4326 100644 Binary files a/webapp/static/icon.png and b/webapp/static/icon.png differ diff --git a/webapp/static/img/custom/logo-horizontal.svg b/webapp/static/img/custom/logo-horizontal.svg index 4121fa08e..a38cede4c 100644 --- a/webapp/static/img/custom/logo-horizontal.svg +++ b/webapp/static/img/custom/logo-horizontal.svg @@ -1,63 +1,60 @@ - - - - - - + + + - - - - - - - + + - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + diff --git a/webapp/static/img/custom/logo-squared.svg b/webapp/static/img/custom/logo-squared.svg index 2a926f0a9..f6caf67d4 100644 --- a/webapp/static/img/custom/logo-squared.svg +++ b/webapp/static/img/custom/logo-squared.svg @@ -1,65 +1,60 @@ - - - - - - - - - - - - - - - - + + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + +