diff --git a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js index c57f2bcb..84af6c83 100644 --- a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js +++ b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js @@ -5,18 +5,19 @@ import { browserHistory } from 'react-router'; import i18n from 'lib-app/i18n'; import API from 'lib-app/api-call'; -import SubmitButton from 'core-components/submit-button'; -import Message from 'core-components/message'; +import Header from 'core-components/header'; import Form from 'core-components/form'; import FormField from 'core-components/form-field'; +import SubmitButton from 'core-components/submit-button'; +import Message from 'core-components/message'; class CreateTicketForm extends React.Component { static propTypes = { - userLogged: React.PropTypes.boolean + userLogged: React.PropTypes.bool }; - static defaultProps ={ + static defaultProps = { userLogged: true }; @@ -32,7 +33,7 @@ class CreateTicketForm extends React.Component { render() { return (
-

Create Ticket

+
{(!this.props.userLogged) ? this.renderEmailAndName() : null}
diff --git a/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js b/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js index 184bf375..f033fb93 100644 --- a/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js +++ b/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js @@ -1,6 +1,9 @@ import React from 'react'; import {connect} from 'react-redux'; +import i18n from 'lib-app/i18n'; + +import Header from 'core-components/header'; import Table from 'core-components/table'; import Button from 'core-components/button'; @@ -16,7 +19,7 @@ class DashboardListTicketsPage extends React.Component { render() { return (
-
Tickets
+
); diff --git a/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.scss b/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.scss index 19223237..3c9439e1 100644 --- a/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.scss +++ b/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.scss @@ -2,12 +2,6 @@ .dashboard-ticket-list { - &__header { - text-align: left; - font-variant: small-caps; - font-size: 16px; - } - &__number { text-align: left; } diff --git a/client/src/core-components/header.js b/client/src/core-components/header.js new file mode 100644 index 00000000..31741183 --- /dev/null +++ b/client/src/core-components/header.js @@ -0,0 +1,27 @@ +import React from 'react'; + +class Header extends React.Component { + static propTypes = { + title: React.PropTypes.string.isRequired, + description: React.PropTypes.string + }; + + render() { + return ( +
+

{this.props.title}

+ {(this.props.description) ? this.renderDescription() : null} +
+ ) + } + + renderDescription() { + return ( +
+ {this.props.description} +
+ ) + } +} + +export default Header; \ No newline at end of file diff --git a/client/src/core-components/header.scss b/client/src/core-components/header.scss new file mode 100644 index 00000000..ebb0cc3b --- /dev/null +++ b/client/src/core-components/header.scss @@ -0,0 +1,17 @@ +@import '../scss/vars'; + +.header { + margin-bottom: 30px; + text-align: left; + + &__title { + margin: 5px 0 14px; + font-size: 24px; + } + + &__description { + font-size: 13px; + color: $dark-grey; + font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif; + } +} \ No newline at end of file diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js index f780f49c..3690f9b1 100644 --- a/client/src/data/languages/en.js +++ b/client/src/data/languages/en.js @@ -9,11 +9,13 @@ export default { 'NEW_PASSWORD': 'New password', 'REPEAT_NEW_PASSWORD': 'Repeat new password', 'BACK_LOGIN_FORM': 'Back to login form', - 'TICKET_LIST': 'Ticket List', - 'CREATE_TICKET': 'Create Ticket', 'VIEW_ARTICLES': 'View Articles', 'EDIT_PROFILE': 'Edit Profile', 'CLOSE_SESSION': 'Close session', + 'CREATE_TICKET': 'Create Ticket', + 'CREATE_TICKET_DESCRIPTION': 'This is a form for creating tickets. Fill the form and send us your issues/doubts/suggestions. Our support system will answer it as soon as possible.', + 'TICKET_LIST': 'Ticket List', + 'TICKET_LIST_DESCRIPTION': 'Here you can find a list of all tickets you have sent to our support team. Notice that the highlighted ones have new unread messages.', //ERRORS 'EMAIL_NOT_EXIST': 'Email does not exist',