harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor cleanup and remove more double encoding

Browse Source
This commit is contained in:
Mario Vavti 2016-11-28 11:54:36 +01:00
parent 1ce4eda0b9
commit d8774cda8e
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Wiki.php
View File

@ -390,7 +390,7 @@ class Wiki extends \Zotlabs\Web\Controller {
'files' => array($page['page']['urlName'].'.md') 'files' => array($page['page']['urlName'].'.md')
)); ));
if($commit['success']) { if($commit['success']) {
json_return_and_die(array('url' => '/'.argv(0).'/'.argv(1).'/'.$page['wiki']['urlName'].'/'.urlencode($page['page']['urlName']), 'success' => true)); json_return_and_die(array('url' => '/'.argv(0).'/'.argv(1).'/'.$page['wiki']['urlName'].'/'.$page['page']['urlName'], 'success' => true));
} else { } else {
json_return_and_die(array('message' => 'Error making git commit','url' => '/'.argv(0).'/'.argv(1).'/'.$page['wiki']['urlName'].'/'.urlencode($page['page']['urlName']),'success' => false)); json_return_and_die(array('message' => 'Error making git commit','url' => '/'.argv(0).'/'.argv(1).'/'.$page['wiki']['urlName'].'/'.urlencode($page['page']['urlName']),'success' => false));
} }

8
view/tpl/wiki.tpl
View File

@ -379,14 +379,6 @@
'json'); 'json');
}; };
function wiki_show_new_page_form() {
$('div[id^=\'edit-wiki-form-wrapper\']').hide();
$('#edit-wiki-form-wrapper').hide();
$('#new-wiki-form-wrapper').hide();
$('#new-page-form-wrapper').toggle();
return false;
}
function wiki_show_edit_wiki_form(wiki_title, wiki_resource_id) { function wiki_show_edit_wiki_form(wiki_title, wiki_resource_id) {
window.wiki_resource_id = wiki_resource_id; window.wiki_resource_id = wiki_resource_id;
window.wiki_title = wiki_title; window.wiki_title = wiki_title;

19
view/tpl/wiki_page_list.tpl
View File

@ -29,17 +29,12 @@
<script> <script>
$('#new-page-submit').click(function (ev) { $('#new-page-submit').click(function (ev) {
if (window.wiki_resource_id === '') {
window.console.log('You must have a wiki open in order to create pages.');
ev.preventDefault();
return false;
}
$.post("wiki/{{$channel}}/create/page", {name: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, $.post("wiki/{{$channel}}/create/page", {name: $('#id_pageName').val(), resource_id: window.wiki_resource_id},
function (data) { function(data) {
if (data.success) { if(data.success) {
window.location = data.url; window.location = data.url;
} else { } else {
window.console.log('Error creating page.'); window.console.log('Error creating page.');
} }
}, 'json'); }, 'json');
ev.preventDefault(); ev.preventDefault();
@ -71,4 +66,10 @@
}, 'json'); }, 'json');
return false; return false;
} }
function wiki_show_new_page_form() {
$('#new-page-form-wrapper').toggle();
$('#id_pageName').focus();
return false;
}
</script> </script>