dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wiki patches, thanks Niphlod

Browse Source
This commit is contained in:
mdipierro
2012-12-19 16:07:50 -06:00
parent e342e68737
commit 3f8bf01b20
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.3.2 (2012-12-19 11:52:16) dev Version 2.3.2 (2012-12-19 16:06:57) dev
gluon/tools.py
+10 -5
View File
@@ -4986,8 +4986,9 @@ class Wiki(object):
var preview = $('<div id="preview"></div>').hide(); var preview = $('<div id="preview"></div>').hide();
var previewmedia = $('<div id="previewmedia"></div>'); var previewmedia = $('<div id="previewmedia"></div>');
var table = $('form'); var table = $('form');
preview.insertBefore(table); var bodylabel = $('#wiki_page_body__label');
prevbutton.insertBefore(table); preview.insertBefore(pagecontent);
prevbutton.insertAfter(bodylabel);
mediabutton.insertBefore(table); mediabutton.insertBefore(table);
previewmedia.insertBefore(table); previewmedia.insertBefore(table);
mediabutton.toggle(function() { mediabutton.toggle(function() {
@@ -4995,16 +4996,17 @@ class Wiki(object):
}, function() { }, function() {
previewmedia.empty(); previewmedia.empty();
}); });
prevbutton.click(function() { prevbutton.click(function(e) {
e.preventDefault();
if (prevbutton.hasClass('nopreview')) { if (prevbutton.hasClass('nopreview')) {
prevbutton.addClass('preview').removeClass( prevbutton.addClass('preview').removeClass(
'nopreview').html('Edit Source'); 'nopreview').html('Edit Source');
web2py_ajax_page('post', '%(url)s', {body : $('#wiki_page_body').val()}, 'preview'); web2py_ajax_page('post', '%(url)s', {body : $('#wiki_page_body').val()}, 'preview');
table.fadeOut('medium', function() {preview.fadeIn()}); pagecontent.fadeOut('fast', function() {preview.fadeIn()});
} else { } else {
prevbutton.addClass( prevbutton.addClass(
'nopreview').removeClass('preview').html('Preview'); 'nopreview').removeClass('preview').html('Preview');
preview.fadeOut('medium', function() {table.fadeIn()}); preview.fadeOut('fast', function() {pagecontent.fadeIn()});
} }
}) })
}) })
@@ -5026,10 +5028,12 @@ class Wiki(object):
self.auth.db.wiki_media.wiki_page.writable = False self.auth.db.wiki_media.wiki_page.writable = False
links = [] links = []
csv = True csv = True
create = True
if current.request.vars.embedded: if current.request.vars.embedded:
script = "var c = $('#wiki_page_body'); c.val(c.val() + $('%s').text()); return false;" script = "var c = $('#wiki_page_body'); c.val(c.val() + $('%s').text()); return false;"
fragment = self.auth.db.wiki_media.id.represent fragment = self.auth.db.wiki_media.id.represent
csv = False csv = False
create = False
links=[ links=[
lambda row: lambda row:
A('copy into source', _href='#', _onclick=script % (fragment(row.id, row))) A('copy into source', _href='#', _onclick=script % (fragment(row.id, row)))
@@ -5039,6 +5043,7 @@ class Wiki(object):
orderby=self.auth.db.wiki_media.title, orderby=self.auth.db.wiki_media.title,
links = links, links = links,
csv = csv, csv = csv,
create = create,
args=['_editmedia', slug], args=['_editmedia', slug],
user_signature=False) user_signature=False)
return dict(content=content) return dict(content=content)