diff options
Diffstat (limited to 'src/components')
4 files changed, 27 insertions, 7 deletions
diff --git a/src/components/services/content/ServiceDisabled.js b/src/components/services/content/ServiceDisabled.js index 732b6c003..b5af3743d 100644 --- a/src/components/services/content/ServiceDisabled.js +++ b/src/components/services/content/ServiceDisabled.js | |||
@@ -35,7 +35,7 @@ export default class ServiceDisabled extends Component { | |||
35 | const { intl } = this.context; | 35 | const { intl } = this.context; |
36 | 36 | ||
37 | return ( | 37 | return ( |
38 | <div className="services__crash-handler"> | 38 | <div className="services__info-layer"> |
39 | <h1>{intl.formatMessage(messages.headline, { name })}</h1> | 39 | <h1>{intl.formatMessage(messages.headline, { name })}</h1> |
40 | <Button | 40 | <Button |
41 | label={intl.formatMessage(messages.action, { name })} | 41 | label={intl.formatMessage(messages.action, { name })} |
diff --git a/src/components/services/content/WebviewCrashHandler.js b/src/components/services/content/WebviewCrashHandler.js index d48152c18..d3e6951f3 100644 --- a/src/components/services/content/WebviewCrashHandler.js +++ b/src/components/services/content/WebviewCrashHandler.js | |||
@@ -62,7 +62,7 @@ export default class WebviewCrashHandler extends Component { | |||
62 | const { intl } = this.context; | 62 | const { intl } = this.context; |
63 | 63 | ||
64 | return ( | 64 | return ( |
65 | <div className="services__crash-handler"> | 65 | <div className="services__info-layer"> |
66 | <h1>{intl.formatMessage(messages.headline)}</h1> | 66 | <h1>{intl.formatMessage(messages.headline)}</h1> |
67 | <p>{intl.formatMessage(messages.text, { name })}</p> | 67 | <p>{intl.formatMessage(messages.text, { name })}</p> |
68 | <Button | 68 | <Button |
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js index 3b21a7765..fea8d682d 100644 --- a/src/components/settings/navigation/SettingsNavigation.js +++ b/src/components/settings/navigation/SettingsNavigation.js | |||
@@ -74,7 +74,6 @@ export default class SettingsNavigation extends Component { | |||
74 | <Link | 74 | <Link |
75 | to="/auth/logout" | 75 | to="/auth/logout" |
76 | className="settings-navigation__link" | 76 | className="settings-navigation__link" |
77 | activeClassName="is-active" | ||
78 | > | 77 | > |
79 | {intl.formatMessage(messages.logout)} | 78 | {intl.formatMessage(messages.logout)} |
80 | </Link> | 79 | </Link> |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index ba07b1a5b..601d57c81 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -30,6 +30,10 @@ const messages = defineMessages({ | |||
30 | id: 'settings.app.headlineAppearance', | 30 | id: 'settings.app.headlineAppearance', |
31 | defaultMessage: '!!!Appearance', | 31 | defaultMessage: '!!!Appearance', |
32 | }, | 32 | }, |
33 | headlineAdvanced: { | ||
34 | id: 'settings.app.headlineAdvanced', | ||
35 | defaultMessage: '!!!Advanced', | ||
36 | }, | ||
33 | buttonSearchForUpdate: { | 37 | buttonSearchForUpdate: { |
34 | id: 'settings.app.buttonSearchForUpdate', | 38 | id: 'settings.app.buttonSearchForUpdate', |
35 | defaultMessage: '!!!Check for updates', | 39 | defaultMessage: '!!!Check for updates', |
@@ -54,6 +58,10 @@ const messages = defineMessages({ | |||
54 | id: 'settings.app.currentVersion', | 58 | id: 'settings.app.currentVersion', |
55 | defaultMessage: '!!!Current version:', | 59 | defaultMessage: '!!!Current version:', |
56 | }, | 60 | }, |
61 | restartRequired: { | ||
62 | id: 'settings.app.restartRequired', | ||
63 | defaultMessage: '!!!Changes require restart', | ||
64 | }, | ||
57 | }); | 65 | }); |
58 | 66 | ||
59 | @observer | 67 | @observer |
@@ -116,18 +124,31 @@ export default class EditSettingsForm extends Component { | |||
116 | onChange={e => this.submit(e)} | 124 | onChange={e => this.submit(e)} |
117 | id="form" | 125 | id="form" |
118 | > | 126 | > |
119 | <h2>{intl.formatMessage(messages.headlineGeneral)}</h2> | 127 | {/* General */} |
128 | <h2 id="general">{intl.formatMessage(messages.headlineGeneral)}</h2> | ||
120 | <Toggle field={form.$('autoLaunchOnStart')} /> | 129 | <Toggle field={form.$('autoLaunchOnStart')} /> |
121 | <Toggle field={form.$('runInBackground')} /> | 130 | <Toggle field={form.$('runInBackground')} /> |
122 | <Toggle field={form.$('enableSystemTray')} /> | 131 | <Toggle field={form.$('enableSystemTray')} /> |
123 | {process.platform === 'win32' && ( | 132 | {process.platform === 'win32' && ( |
124 | <Toggle field={form.$('minimizeToSystemTray')} /> | 133 | <Toggle field={form.$('minimizeToSystemTray')} /> |
125 | )} | 134 | )} |
126 | <h2>{intl.formatMessage(messages.headlineAppearance)}</h2> | 135 | |
136 | {/* Appearance */} | ||
137 | <h2 id="apperance">{intl.formatMessage(messages.headlineAppearance)}</h2> | ||
127 | <Toggle field={form.$('showDisabledServices')} /> | 138 | <Toggle field={form.$('showDisabledServices')} /> |
128 | <h2>{intl.formatMessage(messages.headlineLanguage)}</h2> | 139 | |
140 | {/* Language */} | ||
141 | <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2> | ||
129 | <Select field={form.$('locale')} showLabel={false} /> | 142 | <Select field={form.$('locale')} showLabel={false} /> |
130 | <h2>{intl.formatMessage(messages.headlineUpdates)}</h2> | 143 | |
144 | {/* Advanced */} | ||
145 | <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2> | ||
146 | <Toggle field={form.$('enableSpellchecking')} /> | ||
147 | <p className="settings__help">{intl.formatMessage(messages.restartRequired)}</p> | ||
148 | {/* <Select field={form.$('spellcheckingLanguage')} /> */} | ||
149 | |||
150 | {/* Updates */} | ||
151 | <h2 id="updates">{intl.formatMessage(messages.headlineUpdates)}</h2> | ||
131 | {updateIsReadyToInstall ? ( | 152 | {updateIsReadyToInstall ? ( |
132 | <Button | 153 | <Button |
133 | label={intl.formatMessage(messages.buttonInstallUpdate)} | 154 | label={intl.formatMessage(messages.buttonInstallUpdate)} |