From d3e914f76a375ecd47a009cb542f824d01241dc2 Mon Sep 17 00:00:00 2001
From: rodrigo <rodrigocorsi@gmail.com>
Date: Sun, 6 Mar 2016 17:36:15 -0300
Subject: Add help text below the input box when a user starts typing

---
 web/react/components/textbox.jsx | 51 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index 23ecfb57b..b84cc9922 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -129,12 +129,12 @@ export default class Textbox extends React.Component {
     }
 
     render() {
+        const hastext = this.props.messageText.length > 0;
+
         let previewLink = null;
         if (Utils.isFeatureEnabled(PreReleaseFeatures.MARKDOWN_PREVIEW)) {
-            const previewLinkVisible = this.props.messageText.length > 0;
             previewLink = (
                 <a
-                    style={{visibility: previewLinkVisible ? 'visible' : 'hidden'}}
                     onClick={this.showPreview}
                     className='textbox-preview-link'
                 >
@@ -153,6 +153,51 @@ export default class Textbox extends React.Component {
             );
         }
 
+        let helptext = (
+            <div
+                style={{visibility: hastext ? 'visible' : 'hidden', opacity: hastext ? '1' : '0'}}
+                className='help_format_text'
+            >
+                <b>
+                    <FormattedMessage
+                        id='textbox.bold'
+                        defaultMessage='**bold**'
+                    />
+                </b>
+                <i>
+                    <FormattedMessage
+                        id='textbox.italic'
+                        defaultMessage='_italic_'
+                    />
+                </i>
+                <span>~~<strike>
+                    <FormattedMessage
+                        id='textbox.strike'
+                        defaultMessage='strike'
+                    />
+                </strike>~~ </span>
+                <code>
+                    <FormattedMessage
+                        id='textbox.inlinecode'
+                        defaultMessage='`inline code`'
+                    />
+                </code>
+                <code>
+                    <FormattedMessage
+                        id='textbox.preformatted'
+                        defaultMessage='```preformatted```'
+                    />
+                </code>
+                <span>
+                    <FormattedMessage
+                        id='textbox.quote'
+                        defaultMessage='>quote'
+                    />
+                </span>
+                {previewLink}
+            </div>
+        );
+
         return (
             <div
                 ref='wrapper'
@@ -184,7 +229,7 @@ export default class Textbox extends React.Component {
                     dangerouslySetInnerHTML={{__html: this.state.preview ? TextFormatting.formatText(this.props.messageText) : ''}}
                 >
                 </div>
-                {previewLink}
+                {helptext}
                 <a
                     target='_blank'
                     href='http://docs.mattermost.com/help/getting-started/messaging-basics.html'
-- 
cgit v1.2.3-1-g7c22


From 5884495a85cf92c338ab003305d1433df059884c Mon Sep 17 00:00:00 2001
From: Rodrigo Corsi <rodrigocorsi@gmail.com>
Date: Mon, 7 Mar 2016 11:11:58 -0300
Subject: Fix camel case

---
 web/react/components/textbox.jsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index b84cc9922..c119abcbc 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -129,7 +129,7 @@ export default class Textbox extends React.Component {
     }
 
     render() {
-        const hastext = this.props.messageText.length > 0;
+        const hasText = this.props.messageText.length > 0;
 
         let previewLink = null;
         if (Utils.isFeatureEnabled(PreReleaseFeatures.MARKDOWN_PREVIEW)) {
@@ -153,9 +153,9 @@ export default class Textbox extends React.Component {
             );
         }
 
-        let helptext = (
+        let helpText = (
             <div
-                style={{visibility: hastext ? 'visible' : 'hidden', opacity: hastext ? '1' : '0'}}
+                style={{visibility: hasText ? 'visible' : 'hidden', opacity: hasText ? '1' : '0'}}
                 className='help_format_text'
             >
                 <b>
@@ -229,7 +229,7 @@ export default class Textbox extends React.Component {
                     dangerouslySetInnerHTML={{__html: this.state.preview ? TextFormatting.formatText(this.props.messageText) : ''}}
                 >
                 </div>
-                {helptext}
+                {helpText}
                 <a
                     target='_blank'
                     href='http://docs.mattermost.com/help/getting-started/messaging-basics.html'
-- 
cgit v1.2.3-1-g7c22