From eff97073fb9e6636be7ad3cfc1d76a872e540eb3 Mon Sep 17 00:00:00 2001
From: Ross Poulton <ross@rossp.org>
Date: Wed, 16 Jan 2008 03:23:43 +0000
Subject: [PATCH] * Remove dependency on markdown * Use nicEditor in 'create
 ticket' screens to allow HTML entry.

---
 README                                     | 5 +----
 templates/helpdesk/create_ticket.html      | 8 ++++++++
 templates/helpdesk/public_homepage.html    | 9 +++++++++
 templates/helpdesk/public_view_ticket.html | 2 +-
 templates/helpdesk/ticket.html             | 4 ++--
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 029fa9ee..4a0bd5a4 100644
--- a/README
+++ b/README
@@ -47,9 +47,7 @@ See the file 'LICENSE' for licensing terms and conditions.
 
 2. Django (post-0.96, eg SVN checkout)
 
-3. Markdown / pymarkdown
-
-4. An existing WORKING Django project with database etc. If you
+3. An existing WORKING Django project with database etc. If you
    cannot log into the Admin, you won't get this product working.
 
 
@@ -63,7 +61,6 @@ See the file 'LICENSE' for licensing terms and conditions.
    setting:
    'helpdesk',
    'django.contrib.admin',
-   'django.contrib.markup'
 
 3. In your projects' urls.py file, add this line:
     (r'helpdesk/', include('helpdesk.urls')),
diff --git a/templates/helpdesk/create_ticket.html b/templates/helpdesk/create_ticket.html
index 0484e328..52b66478 100644
--- a/templates/helpdesk/create_ticket.html
+++ b/templates/helpdesk/create_ticket.html
@@ -1,5 +1,13 @@
 {% extends "helpdesk/base.html" %}
 {% block helpdesk_title %}Helpdesk{% endblock %}
+{% block helpdesk_head %}
+<script src="http://media.jutda.com.au/helpdesk/nicEdit.js" type="text/javascript"></script>
+<script type="text/javascript">
+    $(document).ready(function() {
+        nic = new nicEditor({buttonList: ['bold','italic','underline','strikeThrough','undo','redo','subscript','superscript','html']}).panelInstance('id_body');
+    });
+    </script>
+{% endblock %}
 
 {% block helpdesk_body %}
 <h2>Submit a Ticket</h2>
diff --git a/templates/helpdesk/public_homepage.html b/templates/helpdesk/public_homepage.html
index 224ec78a..82d807ec 100644
--- a/templates/helpdesk/public_homepage.html
+++ b/templates/helpdesk/public_homepage.html
@@ -1,6 +1,15 @@
 {% extends "helpdesk/public_base.html" %}
 {% block helpdesk_title %}Helpdesk{% endblock %}
 
+{% block helpdesk_head %}
+<script src="http://media.jutda.com.au/helpdesk/nicEdit.js" type="text/javascript"></script>
+<script type="text/javascript">
+    $(document).ready(function() {
+        nic = new nicEditor({buttonList: ['bold','italic','underline','strikeThrough','undo','redo','subscript','superscript','html']}).panelInstance('id_body');
+    });
+    </script>
+{% endblock %}
+
 {% block helpdesk_body %}
 <h2>View a Ticket</h2>
 
diff --git a/templates/helpdesk/public_view_ticket.html b/templates/helpdesk/public_view_ticket.html
index 2c08cbe9..0e40d3b3 100644
--- a/templates/helpdesk/public_view_ticket.html
+++ b/templates/helpdesk/public_view_ticket.html
@@ -1,6 +1,6 @@
 {% extends "helpdesk/public_base.html" %}
 {% block helpdesk_title %}Helpdesk{% endblock %}
-{% block helpdesk_head %}{% load markup %}
+{% block helpdesk_head %}
 <script src="http://media.jutda.com.au/helpdesk/nicEdit.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(document).ready(function() {
diff --git a/templates/helpdesk/ticket.html b/templates/helpdesk/ticket.html
index 826d4362..2fceefaa 100644
--- a/templates/helpdesk/ticket.html
+++ b/templates/helpdesk/ticket.html
@@ -1,6 +1,6 @@
 {% extends "helpdesk/base.html" %}
 {% block helpdesk_title %}Helpdesk{% endblock %}
-{% block helpdesk_head %}{% load markup %}
+{% block helpdesk_head %}
 <script src="http://media.jutda.com.au/helpdesk/nicEdit.js" type="text/javascript"></script>
 <script type="text/javascript">
     $(document).ready(function() {
@@ -70,7 +70,7 @@
 {% for followup in ticket.followup_set.all %}
 <div class='followup'>
 <div class='title'>{{ followup.title }} <span class='byline'>by {{ followup.user }} <span title='{{ followup.date|date:"r" }}'>{{ followup.date|timesince }} ago</span>{% if not followup.public %} <span class='private'>(Private)</span>{% endif %}</span></div>
-{{ followup.comment|markdown|num_to_link }}
+{{ followup.comment|num_to_link }}
 {% if followup.ticketchange_set.all %}<div class='changes'>
 {% for change in followup.ticketchange_set.all %}
 Changed {{ change.field }} from {{ change.old_value }} to {{ change.new_value }}.<br />