# HG changeset patch
# User Brian Neal <bgneal@gmail.com>
# Date 1259282390 0
# Node ID b8474ffe76d907da57dd6b030edb19927c8906d5
# Parent  c515b7401078e315d09245602d13a4ca072c818e
Cutting comments over to the new common way of using markItUp and getting the extra smiley and markdown help dialogs.

diff -r c515b7401078 -r b8474ffe76d9 gpp/comments/forms.py
--- a/gpp/comments/forms.py	Fri Nov 27 00:21:47 2009 +0000
+++ b/gpp/comments/forms.py	Fri Nov 27 00:39:50 2009 +0000
@@ -14,7 +14,7 @@
     comment = forms.CharField(label='',
             min_length=1, 
             max_length=COMMENT_MAX_LENGTH,
-            widget=forms.Textarea)
+            widget=forms.Textarea(attrs={'class': 'markItUp smileyTarget'}))
     content_type = forms.CharField(widget=forms.HiddenInput)
     object_pk = forms.CharField(widget=forms.HiddenInput)
 
diff -r c515b7401078 -r b8474ffe76d9 gpp/templates/comments/comment_form.html
--- a/gpp/templates/comments/comment_form.html	Fri Nov 27 00:21:47 2009 +0000
+++ b/gpp/templates/comments/comment_form.html	Fri Nov 27 00:39:50 2009 +0000
@@ -1,18 +1,10 @@
+{% load core_tags %}
 {% if user.is_authenticated %}
 <form action="{% url comments-post %}" method="post" id="comment-form">
 {{ form.as_p }}
-<a href="#" id="more_smileys">
-<img src="{{ MEDIA_URL }}icons/emoticon_smile.png" alt="More smileys" title="More smileys" /></a>
-<a href="#" id="markdown_help">
-<img src="{{ MEDIA_URL }}icons/help.png" alt="Help" title="Help" /></a>
+{% comment_dialogs %}
 <input type="submit" name="post" value="Post Comment" id="comment-form-post"/>
 </form>
-<div id="smileys_dialog" title="More Smileys">
-<img src="{{ MEDIA_URL }}icons/ajax_busy.gif" alt="Loading" id="smiley_busy" />
-</div>
-<div id="markdown_help_dialog" title="Markdown Help">
-<img src="{{ MEDIA_URL }}icons/ajax_busy.gif" alt="Loading" id="markdown_busy" />
-</div>
 {% else %}
 <p>
 Please <a href="{% url accounts-login %}">login</a> or
diff -r c515b7401078 -r b8474ffe76d9 media/js/comments.js
--- a/media/js/comments.js	Fri Nov 27 00:21:47 2009 +0000
+++ b/media/js/comments.js	Fri Nov 27 00:39:50 2009 +0000
@@ -61,55 +61,4 @@
         }
         return false;
     });
-    postText.markItUp(mySettings);
-
-   $('#smileys_dialog').dialog({autoOpen:false});
-   var firstTime = true;
-   $('#more_smileys').click(function () {
-         $('#smileys_dialog').dialog('open');
-         var postBox = $('#id_comment')[0];
-         if (firstTime) {
-            $.ajax({
-               url: '/smiley/farm/extra/',
-               type: 'GET',
-               dataType: 'html',
-               success: function(data, textStatus) {
-                  var img = $('#smiley_busy');
-                  img.hide();
-                  img.after(data);
-                  $('#smileys_dialog .smiley_farm img').click(function() {
-                     postBox.value += ' ' + this.alt + ' ';
-                     postBox.focus();
-                  });
-                  firstTime = false;
-               },
-               error: function (xhr, textStatus, ex) {
-                  alert('Oops, an error occurred: ' + xhr.statusText + ' - ' + xhr.responseText);
-               }
-            });
-         }
-         return false;
-      });
-   $('#markdown_help_dialog').dialog({autoOpen: false, width: 720, height: 600});
-   var firstTimeMd = true;
-   $('#markdown_help').click(function () {
-         $('#markdown_help_dialog').dialog('open');
-         if (firstTimeMd) {
-            $.ajax({
-               url: '/core/markdown_help/',
-               type: 'GET',
-               dataType: 'html',
-               success: function(data, textStatus) {
-                  var img = $('#markdown_busy');
-                  img.hide();
-                  img.after(data);
-                  firstTimeMd = false;
-               },
-               error: function (xhr, textStatus, ex) {
-                  alert('Oops, an error occurred: ' + xhr.statusText + ' - ' + xhr.responseText);
-               }
-            });
-         }
-         return false;
-      });
 });