Merge pull request mozilla#223 from ppapadeas/728273-notify-users-that

[fix bug 728273] Added notification on markdown syntax
ppapadeas · Jul 17, 2012 · 5aa805f · 5aa805f
2 parents 2adf2a0 + 83efae0
commit 5aa805f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/remo/featuredrep/templates/featuredrep_alter.html b/remo/featuredrep/templates/featuredrep_alter.html
@@ -32,11 +32,15 @@ <h5>
       <small class="error">
         {{ form.user.errors }}
       </small>
-      <textarea class="flat big" placeholder="Enter featured text using markup"
+      <textarea class="flat big" placeholder="Enter featured text"
                 name="text">{{ form.text.value() }}</textarea>
       <small class="error">
         {{ form.text.errors }}
       </small>
+      <p class="more-info">In this field you can use
+        <a href="http://en.wikipedia.org/wiki/Markdown"
+           target="_blank"> Markdown</a>
+         syntax.</p>
       <button type="submit" class="featured-button small white button nice radius">
         Add or Edit Rep feature
       </button>

diff --git a/remo/profiles/templates/profiles_edit.html b/remo/profiles/templates/profiles_edit.html
@@ -312,14 +312,17 @@ <h4>
           V
         </div>
         <div class="eleven columns">
-          <br>
-          <textarea class="flat" placeholder="Bio - Write us a bit about yourself"
+          <textarea class="flat top-margined" placeholder="Bio - Write us a bit about yourself"
                     name="bio">{{ profileform.bio.value() }}</textarea>
           {% if profileform.bio.errors %}
             <small class="error">
               {{ profileform.bio.errors }}
             </small>
           {% endif %}
+          <p class="more-info">In this field you can use
+            <a href="http://en.wikipedia.org/wiki/Markdown"
+               target="_blank"> Markdown</a>
+             syntax.</p>
         </div>
       </div>
       <div class="row">