From b8cfc9630fd9fc0f71ef24899300208bb9cd4a6e Mon Sep 17 00:00:00 2001
From: Massimo <massimo@mdipierro.local>
Date: Thu, 10 Jan 2013 15:13:29 -0600
Subject: [PATCH] fixed preview of auth.wiki pages

---
 VERSION        |  2 +-
 gluon/tools.py | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/VERSION b/VERSION
index b2aa09b2..9041eeab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.1-alpha.2+timestamp.2013.01.10.14.53.47
+Version 2.4.1-alpha.2+timestamp.2013.01.10.15.12.56
diff --git a/gluon/tools.py b/gluon/tools.py
index 2be50b3b..b2f146f3 100644
--- a/gluon/tools.py
+++ b/gluon/tools.py
@@ -4993,20 +4993,19 @@ class Wiki(object):
             redirect(URL(args=slug))
         script = """
         $(function() {
-            if (!$('#wiki_page_body').length) return;
-            var pagecontent = $('#wiki_page_body');
+            if (!jQuery('#wiki_page_body').length) return;
+            var pagecontent = jQuery('#wiki_page_body');
             pagecontent.css('font-family',
                             'Monaco,Menlo,Consolas,"Courier New",monospace');
-            var prevbutton = $('<button class="btn nopreview">Preview</button>');
-            var mediabutton = $('<button class="btn nopreview">Media</button>');
-            var preview = $('<div id="preview"></div>').hide();
-            var previewmedia = $('<div id="previewmedia"></div>');
-            var table = $('form');
-            var bodylabel = $('#wiki_page_body__label');
-            preview.insertBefore(pagecontent);
-            prevbutton.insertAfter(bodylabel);
-            mediabutton.insertBefore(table);
-            previewmedia.insertBefore(table);
+            var prevbutton = jQuery('<button class="btn nopreview">Preview</button>');
+            var mediabutton = jQuery('<button class="btn nopreview">Media</button>');
+            var preview = jQuery('<div id="preview"></div>').hide();
+            var previewmedia = jQuery('<div id="previewmedia"></div>');
+            var form = pagecontent.closest('form');
+            preview.insertBefore(form);
+            prevbutton.insertBefore(form);
+            mediabutton.insertBefore(form);
+            previewmedia.insertBefore(form);
             mediabutton.toggle(function() {
                 web2py_component('%(urlmedia)s', 'previewmedia');
             }, function() {
@@ -5017,12 +5016,12 @@ class Wiki(object):
                 if (prevbutton.hasClass('nopreview')) {
                     prevbutton.addClass('preview').removeClass(
                         'nopreview').html('Edit Source');
-                    web2py_ajax_page('post', '%(url)s', {body : $('#wiki_page_body').val()}, 'preview');
-                    pagecontent.fadeOut('fast', function() {preview.fadeIn()});
+                    web2py_ajax_page('post', '%(url)s', {body : jQuery('#wiki_page_body').val()}, 'preview');
+                    form.fadeOut('fast', function() {preview.fadeIn()});
                 } else {
                     prevbutton.addClass(
                         'nopreview').removeClass('preview').html('Preview');
-                    preview.fadeOut('fast', function() {pagecontent.fadeIn()});
+                    preview.fadeOut('fast', function() {form.fadeIn()});
                 }
             })
         })
@@ -5046,7 +5045,7 @@ class Wiki(object):
         csv = True
         create = True
         if current.request.vars.embedded:
-            script = "var c = $('#wiki_page_body'); c.val(c.val() + $('%s').text()); return false;"
+            script = "var c = jQuery('#wiki_page_body'); c.val(c.val() + jQuery('%s').text()); return false;"
             fragment = self.auth.db.wiki_media.id.represent
             csv = False
             create = False