diff --git a/client/src/app-components/toggle-button.scss b/client/src/app-components/toggle-button.scss index 4711e8fe..6006ae56 100644 --- a/client/src/app-components/toggle-button.scss +++ b/client/src/app-components/toggle-button.scss @@ -6,4 +6,5 @@ padding: 2px; border-radius: 4px; text-align: center; + user-select: none; } \ No newline at end of file diff --git a/client/src/app/admin/panel/settings/admin-panel-system-preferences.js b/client/src/app/admin/panel/settings/admin-panel-system-preferences.js index 03ed99a7..4b17f553 100644 --- a/client/src/app/admin/panel/settings/admin-panel-system-preferences.js +++ b/client/src/app/admin/panel/settings/admin-panel-system-preferences.js @@ -1,5 +1,10 @@ import React from 'react'; import _ from 'lodash'; + +import API from 'lib-app/api-call'; +import i18n from 'lib-app/i18n'; +import LanguageSelector from 'app-components/language-selector'; +import ToggleButton from 'app-components/toggle-button'; import languageList from 'data/language-list'; import Form from 'core-components/form'; @@ -8,11 +13,7 @@ import Header from 'core-components/header'; import SubmitButton from 'core-components/submit-button'; import Button from 'core-components/button'; import Message from 'core-components/message'; - -import API from 'lib-app/api-call'; -import i18n from 'lib-app/i18n'; -import LanguageSelector from 'app-components/language-selector'; -import ToggleButton from 'app-components/toggle-button'; +import InfoTooltip from 'core-components/info-tooltip'; class AdminPanelSystemPreferences extends React.Component { @@ -31,12 +32,12 @@ class AdminPanelSystemPreferences extends React.Component { render() { return (
-
+
this.setState({values, message: null})} onSubmit={this.onSubmit.bind(this)} loading={this.state.loading}>
- Maintenance Mode + {i18n('MAINTENANCE_MODE')}
@@ -85,16 +86,17 @@ class AdminPanelSystemPreferences extends React.Component {
-
{i18n('ALLOWED_LANGUAGES')}
+
{i18n('ALLOWED_LANGUAGES')}
-
{i18n('SUPPORTED_LANGUAGES')}
+
{i18n('SUPPORTED_LANGUAGES')}
+
@@ -105,7 +107,6 @@ class AdminPanelSystemPreferences extends React.Component { {i18n('MAX_SIZE_KB')}
-
@@ -214,7 +215,7 @@ class AdminPanelSystemPreferences extends React.Component { }); } - onRecoverSettingsFail(result) { + onRecoverSettingsFail() { this.setState({ message: 'error' }); diff --git a/client/src/data/fixtures/system-fixtures.js b/client/src/data/fixtures/system-fixtures.js index 5d410a10..b5b55b37 100644 --- a/client/src/data/fixtures/system-fixtures.js +++ b/client/src/data/fixtures/system-fixtures.js @@ -10,7 +10,7 @@ module.exports = [ 'language': 'en', 'reCaptchaKey': '6LfM5CYTAAAAAGLz6ctpf-hchX2_l0Ge-Bn-n8wS', 'reCaptchaPrivate': 'LALA', - 'url': 'hola@lala.com', + 'url': 'http://www.opensupports.com/support', 'title': 'Very Cool', 'layout': 'Boxed', 'time-zone': 3, diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js index d23a08c1..77c777a8 100644 --- a/client/src/data/languages/en.js +++ b/client/src/data/languages/en.js @@ -121,11 +121,12 @@ export default { 'COMMENTS': 'Comments', 'DELETE_STAFF_MEMBER': 'Delete staff member', 'MAINTENANCE_MODE': 'Maintenance mode', + 'MAINTENANCE_MODE_INFO': 'It will temporary disable the system for regular users.', 'RECOVER_DEFAULT': 'Recover default', 'SUPPORT_CENTER_URL': 'Support Center URL', 'SUPPORT_CENTER_TITLE': 'Support Center Title', 'SUPPORT_CENTER_LAYOUT': 'Support Center Layout', - 'DEFAULT_TIMEZONE': 'Default Timezone', + 'DEFAULT_TIMEZONE': 'Default Timezone (GMT)', 'NOREPLY_EMAIL': 'Noreply Email', 'SMTP_USER': 'SMTP User', 'SMTP_SERVER': 'SMTP Server', @@ -138,7 +139,9 @@ export default { 'UPDATE_SETTINGS': 'Update settings', 'DEFAULT_LANGUAGE': 'Default Language', 'SUPPORTED_LANGUAGES': 'Supported Languages', + 'SUPPORTED_LANGUAGES_INFO': 'Supported languages are the languages that tickets can be written in.', 'ALLOWED_LANGUAGES': 'Allowed Languages', + 'ALLOWED_LANGUAGES_INFO': 'Allowed languages are the languages that can be used by an user.', 'SETTINGS_UPDATED': 'Settings have been updated', 'ON': 'On', 'OFF': 'Off', @@ -174,6 +177,7 @@ export default { 'DEPARTMENTS_DESCRIPTION': 'A department is a group where the tickets can go. They are used to categorize the tickets. You can assign them to other staff members.', 'MAINTENANCE_MODE_DESCRIPTION': 'The support system is in maintenance mode, thus unavailable at the moment. We will come back as soon as possible.', 'EMAIL_TEMPLATES_DESCRIPTION': 'Here you can edit the templates of the emails that will be sent to users. Remember that the double brackets curly braces indicate a variable value. For example, \'name\' represents the user\'s name.', + 'SYSTEM_PREFERENCES_DESCRIPTION': 'Here you can edit the preferences of the system.', //ERRORS 'EMAIL_OR_PASSWORD': 'Email or password invalid',