Skip to content

Commit

Permalink
Merge pull request #12 from elecordapp/settings-credits
Browse files Browse the repository at this point in the history 
Settings credits
  • Loading branch information
@hazzuk
hazzuk authored Dec 18, 2024
2 parents 57cf0e5 + 9649921 commit 865b58c
Show file tree
Hide file tree
Showing 5 changed files with 128 additions and 16 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build
on:
pull_request: {}
# temporarily disable non-pr builds
# push:
# branches: [release, master]
# merge_group:
# types: [checks_requested]
push:
branches: [release, master]
merge_group:
types: [checks_requested]
# develop pushes and repository_dispatch handled in build_develop.yaml
env:
# These must be set for fetchdep.sh to get the right branch
Expand Down
17 changes: 17 additions & 0 deletions LOGO_LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Elecord Logo
Copyright (c) 2024 hazzuk

The Elecord logos contained in this repository are not part of the AGPL-3.0 or GPL-3.0 license.

Third parties may use the Elecord logos under these conditions:

- The Elecord logos can only be used to point to Elecord. When used with a
link on a web page, it should point to the URL https://elecord.app/.
- You will visualize and promote your own branding more prominent than you use
the Elecord logos. The Elecord logos can only be used as a secondary
brand, which means it has to be clear for an average viewer that this is not
an official Elecord website, publication or product.
- The Elecord logos can only be used unaltered, without fancy enhancements,
in original colors, original typography.

Any and all other unauthorized uses are prohibited.
4 changes: 1 addition & 3 deletions src/components/structures/auth/LoginSplashView.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ export function LoginSplashView(props: Props): React.JSX.Element {
<div className="mx_LoginSplashView_splashButtons">

{/* elecord mono icon on loading screen */}
<div>
<img src="vector-icons/128-mono.png" />
</div>
<img src="vector-icons/128-mono.png" />

<AccessibleButton kind="link_inline" onClick={props.onLogoutClick}>
{_t("action|logout")}
Expand Down
107 changes: 101 additions & 6 deletions src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,28 +110,123 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
// Also, &nbsp; is ugly but necessary.
return (
<SettingsSubsection heading={_t("common|credits")}>
<img src="vector-icons/128-mono.png" />
<SettingsSubsectionText>
<span>
{_t(
"credits|elecord_web",
{},
{
elecord: (sub) => (
<ExternalLink
href="https://github.com/elecordapp/elecord-web"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
author1: (sub) => (
<ExternalLink
href="https://github.com/hazzuk"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
element: (sub) => (
<ExternalLink
href="https://github.com/element-hq/element-web"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
author2: (sub) => (
<ExternalLink
href="https://element.io"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
terms1: (sub) => (
<ExternalLink
href="https://github.com/elecordapp/elecord-web/blob/master/LICENSE-AGPL-3.0"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
terms2: (sub) => (
<ExternalLink
href="https://github.com/elecordapp/elecord-web/blob/master/LICENSE-GPL-3.0"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
},
)}
</span>
<ul>
<li>
{_t(
"credits|default_cover_photo",
"credits|elecord_logo",
{},
{
photo: (sub) => (
logo: (sub) => (
<ExternalLink
href="themes/element/img/backgrounds/lake.jpg"
href="https://github.com/elecordapp/elecord-web/blob/master/res/vector-icons/1240x600.png"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
author: (sub) => (
<ExternalLink href="https://www.flickr.com/golan">{sub}</ExternalLink>
<ExternalLink
href="https://github.com/hazzuk"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
terms: (sub) => (
<ExternalLink
href="https://creativecommons.org/licenses/by-sa/4.0/"
href="https://github.com/elecordapp/elecord-web/blob/master/LOGO_LICENSE.txt"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
},
)}
</li>
<li>
{_t(
"credits|default_cover_photo",
{},
{
author: (sub) => (
<ExternalLink
href="https://unsplash.com/@felix_mittermeier"
rel="noreferrer noopener"
target="_blank"
>
{sub}
</ExternalLink>
),
unsplash: (sub) => (
<ExternalLink
href="https://unsplash.com"
rel="noreferrer noopener"
target="_blank"
>
Expand Down Expand Up @@ -258,7 +353,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
<SettingsTab>
<SettingsSection>
{bugReportingSection}
<SettingsSubsection heading={_t("common|faq")} description={faqText} />
{/* <SettingsSubsection heading={_t("common|faq")} description={faqText} /> */}
<SettingsSubsection heading={_t("setting|help_about|versions")}>
<SettingsSubsectionText>
<CopyableText getTextToCopy={this.getVersionTextToCopy}>
Expand Down
8 changes: 5 additions & 3 deletions src/i18n/strings/en_EN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -726,9 +726,11 @@
"subspace_join_rule_restricted_description": "Anyone in <SpaceName/> will be able to find and join."
},
"credits": {
"default_cover_photo": "The <photo>default cover photo</photo> is © <author>Jesús Roncero</author> used under the terms of <terms>CC-BY-SA 4.0</terms>.",
"twemoji": "The <twemoji>Twemoji</twemoji> emoji art is © <author>Twitter, Inc and other contributors</author> used under the terms of <terms>CC-BY 4.0</terms>.",
"twemoji_colr": "The <colr>twemoji-colr</colr> font is © <author>Mozilla Foundation</author> used under the terms of <terms>Apache 2.0</terms>."
"elecord_web": "The <elecord>elecord-web</elecord> app is © <author1>hazzuk</author1> and provided under the terms of the underlying <element>element-web</element> project source code by <author2>Element</author2>. Licensed under <terms1>AGPLv3</terms1> or <terms2>GPLv3</terms2>.",
"elecord_logo": "The <logo>elecord logo</logo> and it's derivatives are © <author>hazzuk</author> used under the terms of the elecord <terms>logo license</terms>.",
"default_cover_photo": "The default cover photo is by <author>Felix Mittermeier</author> on <unsplash>Unsplash</unsplash>.",
"twemoji": "The <twemoji>Twemoji</twemoji> emoji art is © <author>Twitter, Inc and other contributors</author> used under the terms of the <terms>CC-BY 4.0</terms> license.",
"twemoji_colr": "The <colr>twemoji-colr</colr> font is © <author>Mozilla Foundation</author> used under the terms of the <terms>Apache 2.0</terms> license."
},
"desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
"devtools": {
Expand Down

0 comments on commit 865b58c

Please sign in to comment.