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

Moved delete wiki button into new edit wiki form, opened by edit wiki icon in wiki list

Browse Source
This commit is contained in:
Andrew Manning 2016-11-14 20:45:04 -05:00
parent f5ad1dfbc5
commit c3e3c32bdc
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Module/Wiki.php
View File

@ -212,7 +212,6 @@ class Wiki extends \Zotlabs\Web\Controller {
'$hideEditor' => $hide_editor, '$hideEditor' => $hide_editor,
'$showPageControls' => $showPageControls, '$showPageControls' => $showPageControls,
'$tools_label' => 'Wiki Tools', '$tools_label' => 'Wiki Tools',
'$showTools' => $showNewWikiButton || $showNewPageButton,
'$showNewWikiButton'=> $showNewWikiButton, '$showNewWikiButton'=> $showNewWikiButton,
'$showNewPageButton'=> $showNewPageButton, '$showNewPageButton'=> $showNewPageButton,
'$hidePageHistory' => $hidePageHistory, '$hidePageHistory' => $hidePageHistory,

55
view/tpl/wiki.tpl
View File

@ -76,11 +76,12 @@
</div> </div>
<div id="edit-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;"> <div id="edit-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
<form id="edit-wiki-form" action="wiki/create/page" method="post" > <form id="edit-wiki-form" action="wiki/edit/wiki" method="post" >
<div class="clear"></div> <div class="clear"></div>
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<button id="edit-wiki-submit" class="btn btn-success" type="submit" name="submit" >Edit Wiki</button> <!--<button id="edit-wiki-submit" class="btn btn-success" type="submit" name="submit" >Edit Wiki</button>-->
<button class="btn btn-md btn-danger" onclick="wiki_delete_wiki(window.wiki_title, window.wiki_resource_id); return false;"><i class="fa fa-trash-o"></i>&nbsp;Delete Wiki</button>
</div> </div>
</form> <div class="clear"></div> </form> <div class="clear"></div>
<hr> <hr>
@ -218,13 +219,6 @@
event.preventDefault(); event.preventDefault();
}); });
$(document).ready(function () {
wiki_refresh_page_list();
$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
// Show Edit tab first. Otherwise the Ace editor does not load.
$("#wiki-nav-tabs li:eq(1) a").tab('show');
});
var editor = ace.edit("ace-editor"); var editor = ace.edit("ace-editor");
editor.setTheme("ace/theme/github"); editor.setTheme("ace/theme/github");
editor.getSession().setMode("ace/mode/markdown"); editor.getSession().setMode("ace/mode/markdown");
@ -301,8 +295,13 @@
} }
$.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) { $.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
if (data.success) { if (data.success) {
$('#wiki_page_list_container').html(data.pages); $('#wiki_page_list_container').html(data.pages);
$('#wiki_page_list_container').show(); $('#wiki_page_list_container').show();
{{if $showNewPageButton}}
$('#new-page-button').show();
{{else}}
$('#new-page-button').hide();
{{/if}}
} else { } else {
alert('Error fetching page list!'); alert('Error fetching page list!');
window.console.log('Error fetching page list!'); window.console.log('Error fetching page list!');
@ -512,41 +511,43 @@
'json'); 'json');
}; };
function wiki_hide_forms() { function wiki_show_new_wiki_form() {
$('#new-page-form-wrapper').hide(); $('#new-page-form-wrapper').hide();
$('#edit-wiki-form-wrapper').hide(); $('#edit-wiki-form-wrapper').hide();
$('#new-wiki-form-wrapper').hide(); $('#new-wiki-form-wrapper').toggle();
}
function wiki_show_new_wiki_form() {
wiki_hide_forms();
openClose('new-wiki-form-wrapper');
return false; return false;
} }
function wiki_show_new_page_form() { function wiki_show_new_page_form() {
wiki_hide_forms(); $('#edit-wiki-form-wrapper').hide();
openClose('new-page-form-wrapper'); $('#new-wiki-form-wrapper').hide();
$('#new-page-form-wrapper').toggle();
return false; return false;
} }
function wiki_show_edit_wiki_form() { function wiki_show_edit_wiki_form(wiki_title, wiki_resource_id) {
wiki_hide_forms(); window.wiki_resource_id = wiki_resource_id;
openClose('edit-wiki-form-wrapper'); window.wiki_title = wiki_title;
$('#new-page-form-wrapper').hide();
$('#new-wiki-form-wrapper').hide();
$('#edit-wiki-form-wrapper').toggle();
return false; return false;
} }
$(document).ready(function () { $(document).ready(function () {
wiki_refresh_page_list();
$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
// Show Edit tab first. Otherwise the Ace editor does not load.
$("#wiki-nav-tabs li:eq(1) a").tab('show');
{{if $showNewWikiButton}} {{if $showNewWikiButton}}
$('#new-wiki-button').show(); $('#new-wiki-button').show();
{{else}} {{else}}
$('#new-wiki-button').hide(); $('#new-wiki-button').hide();
{{/if}} {{/if}}
{{if $showNewPageButton}} {{if $showPageControls}}
$('#new-page-button').show(); $('#edit-wiki-button').show();
{{else}} {{else}}
$('#new-page-button').hide(); $('#edit-wiki-button').hide();
{{/if}} {{/if}}
}); });
</script> </script>

2
view/tpl/wikilist.tpl
View File

@ -8,7 +8,7 @@
{{foreach $wikis as $wiki}} {{foreach $wikis as $wiki}}
<div class="form-group" id="wiki-{{$wiki.resource_id}}"> <div class="form-group" id="wiki-{{$wiki.resource_id}}">
<a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View {{$wiki.title}}"><b>{{$wiki.title}}</b></a> <a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View {{$wiki.title}}"><b>{{$wiki.title}}</b></a>
<i class="pull-right generic-icons fakelink fa fa-trash-o" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}"></i> <i id="edit-wiki-button" class="pull-right generic-icons fakelink fa fa-edit" onclick="wiki_show_edit_wiki_form('{{$wiki.title}}', '{{$wiki.resource_id}}');" title="Edit {{$wiki.title}}"></i>
<i class="pull-right generic-icons fakelink fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download {{$wiki.title}}"></i> <i class="pull-right generic-icons fakelink fa fa-download" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download {{$wiki.title}}"></i>
</div> </div>
{{/foreach}} {{/foreach}}