diff options
author | 2017-11-21 11:44:28 +0100 | |
---|---|---|
committer | 2017-11-21 11:44:28 +0100 | |
commit | 758df6593077ca063318a6dbe606db54eed9a1d5 (patch) | |
tree | bfe6d875588440c74942029b7ec1cfc089562a9b /src | |
parent | add external links to config (diff) | |
parent | Merge pull request #312 from meetfranz/feature/update-notification-add-changelog (diff) | |
download | ferdium-app-758df6593077ca063318a6dbe606db54eed9a1d5.tar.gz ferdium-app-758df6593077ca063318a6dbe606db54eed9a1d5.tar.zst ferdium-app-758df6593077ca063318a6dbe606db54eed9a1d5.zip |
Merge branch 'develop' into feature/add-service-request
Diffstat (limited to 'src')
-rw-r--r-- | src/components/layout/AppLayout.js | 8 | ||||
-rw-r--r-- | src/components/ui/InfoBar.js | 7 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 1 | ||||
-rw-r--r-- | src/styles/info-bar.scss | 4 |
4 files changed, 17 insertions, 3 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index f60c170a8..20dc2f764 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -23,6 +23,10 @@ const messages = defineMessages({ | |||
23 | id: 'infobar.buttonReloadServices', | 23 | id: 'infobar.buttonReloadServices', |
24 | defaultMessage: '!!!Reload services', | 24 | defaultMessage: '!!!Reload services', |
25 | }, | 25 | }, |
26 | changelog: { | ||
27 | id: 'infobar.buttonChangelog', | ||
28 | defaultMessage: '!!!Changelog', | ||
29 | }, | ||
26 | buttonInstallUpdate: { | 30 | buttonInstallUpdate: { |
27 | id: 'infobar.buttonInstallUpdate', | 31 | id: 'infobar.buttonInstallUpdate', |
28 | defaultMessage: '!!!Restart & install update', | 32 | defaultMessage: '!!!Restart & install update', |
@@ -135,7 +139,9 @@ export default class AppLayout extends Component { | |||
135 | sticky | 139 | sticky |
136 | > | 140 | > |
137 | <span className="mdi mdi-information" /> | 141 | <span className="mdi mdi-information" /> |
138 | {intl.formatMessage(messages.updateAvailable)} | 142 | {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank"> |
143 | <u>{intl.formatMessage(messages.changelog)}</u> | ||
144 | </a> | ||
139 | </InfoBar> | 145 | </InfoBar> |
140 | )} | 146 | )} |
141 | {services} | 147 | {services} |
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js index aea2bd888..84a5f1446 100644 --- a/src/components/ui/InfoBar.js +++ b/src/components/ui/InfoBar.js | |||
@@ -61,10 +61,13 @@ export default class InfoBar extends Component { | |||
61 | [`${className}`]: true, | 61 | [`${className}`]: true, |
62 | })} | 62 | })} |
63 | > | 63 | > |
64 | <div onClick={onClick} className="info-bar__content"> | 64 | <div className="info-bar__content"> |
65 | {children} | 65 | {children} |
66 | {ctaLabel && ( | 66 | {ctaLabel && ( |
67 | <button className="info-bar__cta"> | 67 | <button |
68 | className="info-bar__cta" | ||
69 | onClick={onClick} | ||
70 | > | ||
68 | <Loader | 71 | <Loader |
69 | loaded={!ctaLoading} | 72 | loaded={!ctaLoading} |
70 | lines={10} | 73 | lines={10} |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index c2ff295b2..67ea2034a 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -58,6 +58,7 @@ | |||
58 | "infobar.updateAvailable": "A new update for Franz is available.", | 58 | "infobar.updateAvailable": "A new update for Franz is available.", |
59 | "infobar.buttonReloadServices": "Reload services", | 59 | "infobar.buttonReloadServices": "Reload services", |
60 | "infobar.buttonInstallUpdate": "Restart & install update", | 60 | "infobar.buttonInstallUpdate": "Restart & install update", |
61 | "infobar.buttonChangelog": "What is new?", | ||
61 | "infobar.requiredRequestsFailed": "Could not load services and user information", | 62 | "infobar.requiredRequestsFailed": "Could not load services and user information", |
62 | "sidebar.settings": "Settings", | 63 | "sidebar.settings": "Settings", |
63 | "sidebar.addNewService": "Add new service", | 64 | "sidebar.addNewService": "Add new service", |
diff --git a/src/styles/info-bar.scss b/src/styles/info-bar.scss index c30c951ee..b6d1e84e2 100644 --- a/src/styles/info-bar.scss +++ b/src/styles/info-bar.scss | |||
@@ -46,6 +46,10 @@ | |||
46 | } | 46 | } |
47 | } | 47 | } |
48 | 48 | ||
49 | a { | ||
50 | // text-decoration: underline; | ||
51 | } | ||
52 | |||
49 | &.info-bar--bottom { | 53 | &.info-bar--bottom { |
50 | order: 10; | 54 | order: 10; |
51 | } | 55 | } |