Merge pull request #141 from lmorchard/bug-731651-improve-template-ed…

…iting

Bug 731651 template syntax highlighting and ACE editor

apps/wiki/templates/wiki/document.html

@@ -109,7 +109,11 @@ <h2>Table of Contents</h2>
       </div>
       #}
       {% if not fallback_reason %}
-        {{ document_html|safe }}
+        {% if document.is_template %}
+          <pre class="brush: js">{{ document_html }}</pre>
+        {% else %}
+          {{ document_html|safe }}
+        {% endif %}
       {% elif fallback_reason == 'no_translation' %}
         <div id="doc-pending-fallback" class="warning-box">
           {% trans help_link=url('wiki.document', 'localize-firefox-help'),

apps/wiki/templates/wiki/edit_document.html

@@ -9,7 +9,7 @@
                  (document.get_absolute_url(), document.title),
                  (None, _('Edit Article'))] %}
 {% set classes = 'edit' %}
-{% block bodyclass %}edit{% endblock %}
+{% block bodyclass %}edit{% if document.is_template %} is-template{% endif %}{% endblock %}
 
 {% block content %}
 <section id="content">
@@ -120,6 +120,9 @@ <h1>{{ _('Editing <em>{title}</em>')|fe(title=revision.title) }}</h1>
 
         {% if revision_form %}
             {{ revision_form.content | safe }}
+            {% if document.is_template %}
+              <div id="ace_content"></div>
+            {% endif %}
             <input type="hidden" name="form" value="rev" />
           <section>
           <h4>{{_('Review needed?')}}</h4>
@@ -142,4 +145,14 @@ <h4>{{_('Review needed?')}}</h4>
 {% block site_js %}
     {{ super() }}
     {{ js('framebuster') }}
+
+    {% if document.is_template %}
+      <script src="{{ MEDIA_URL }}ace/ace.js" 
+        type="text/javascript" charset="utf-8"></script>
+      <script src="{{ MEDIA_URL }}ace/theme-dreamweaver.js"
+        type="text/javascript" charset="utf-8"></script>
+      <script src="{{ MEDIA_URL }}ace/mode-javascript.js"
+        type="text/javascript" charset="utf-8"></script>
+    {% endif %}
+
 {% endblock %}

apps/wiki/views.py

@@ -228,6 +228,7 @@ def set_common_headers(r):
     # Grab the document HTML as a fallback, then attempt to use kumascript:
     doc_html, ks_errors = doc.html, None
     if (constance.config.KUMASCRIPT_TIMEOUT > 0 and 
+            not doc.is_template and
             (force_macros or (not no_macros and not show_raw))):
         # We'll make a request to kumascript for macro evaluation only if:
         #   * The service isn't disabled with a timeout of 0