From 25b50323fa2a35466600ab0875fdd5eda3b0a95e Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Fri, 17 Jan 2014 17:07:09 -0500
Subject: [PATCH] markdown text in composer

---
 public/src/modules/composer.js | 4 +++-
 public/templates/composer.tpl  | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index e29a141ebc..1fb2c53850 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -402,7 +402,9 @@ define(['taskbar'], function(taskbar) {
 		}
 
 		if(config.imgurClientIDSet) {
-			postContainer.find('.upload-instructions').removeClass('hide');
+			if(env === 'md' || env === 'lg') {
+				postContainer.find('.upload-instructions').removeClass('hide');
+			}
 			postContainer.find('.img-upload-btn').removeClass('hide');
 		}
 
diff --git a/public/templates/composer.tpl b/public/templates/composer.tpl
index c90ca4caf8..ea6e574df8 100644
--- a/public/templates/composer.tpl
+++ b/public/templates/composer.tpl
@@ -38,8 +38,13 @@
 		</div>
 
 		<div class="imagedrop"><div>Drag and Drop Images Here</div></div>
-		<div class="text-center upload-instructions hide visible-lg visible-md">
-			<small>Upload images by dragging & dropping them</small>
+
+		<div class="text-center">
+			<span>
+				<small>Content is parsed with <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a>. </small>
+				<span class="upload-instructions hide"><small>Upload images by dragging & dropping them.</small></span>
+			</span>
+
 		</div>
 
 		<div class="resizer"><div class="trigger text-center"><i class="fa fa-chevron-up"></i></div></div>