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

no links to media if page not saved

Browse Source
This commit is contained in:
Massimo
2013-04-09 16:42:41 -05:00
parent 94c79820b9
commit 2421a31b25
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.6-stable+timestamp.2013.04.09.16.33.11 Version 2.4.6-stable+timestamp.2013.04.09.16.42.10
gluon/tools.py
+11 -9
View File
@@ -5263,19 +5263,21 @@ class Wiki(object):
pagecontent.css('font-family', pagecontent.css('font-family',
'Monaco,Menlo,Consolas,"Courier New",monospace'); 'Monaco,Menlo,Consolas,"Courier New",monospace');
var prevbutton = jQuery('<button class="btn nopreview">Preview</button>'); 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 preview = jQuery('<div id="preview"></div>').hide();
var previewmedia = jQuery('<div id="previewmedia"></div>'); var previewmedia = jQuery('<div id="previewmedia"></div>');
var form = pagecontent.closest('form'); var form = pagecontent.closest('form');
preview.insertBefore(form); preview.insertBefore(form);
prevbutton.insertBefore(form); prevbutton.insertBefore(form);
mediabutton.insertBefore(form); if(%(link_media)s) {
previewmedia.insertBefore(form); var mediabutton = jQuery('<button class="btn nopreview">Media</button>');
mediabutton.toggle(function() { mediabutton.insertBefore(form);
web2py_component('%(urlmedia)s', 'previewmedia'); previewmedia.insertBefore(form);
}, function() { mediabutton.toggle(function() {
previewmedia.empty(); web2py_component('%(urlmedia)s', 'previewmedia');
}); }, function() {
previewmedia.empty();
});
}
prevbutton.click(function(e) { prevbutton.click(function(e) {
e.preventDefault(); e.preventDefault();
if (prevbutton.hasClass('nopreview')) { if (prevbutton.hasClass('nopreview')) {
@@ -5290,7 +5292,7 @@ class Wiki(object):
} }
}) })
}) })
""" % dict(url=URL(args=('_preview', slug)), """ % dict(url=URL(args=('_preview', slug)),link_media=('true' if page else 'false'),
urlmedia=URL(extension='load', urlmedia=URL(extension='load',
args=('_editmedia',slug), args=('_editmedia',slug),
vars=dict(embedded=1))) vars=dict(embedded=1)))