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

Merge pull request #585 from anaqreon/wiki

Browse Source 
Wiki
This commit is contained in:
zotlabs 2016-11-15 12:52:48 +11:00 committed by GitHub
commit 537510f081
4 changed files with 390 additions and 349 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,
'$showPageControls' => $showPageControls,
'$tools_label' => 'Wiki Tools',
'$showTools' => $showNewWikiButton || $showNewPageButton,
'$showNewWikiButton'=> $showNewWikiButton,
'$showNewPageButton'=> $showNewPageButton,
'$hidePageHistory' => $hidePageHistory,

80
view/tpl/wiki.tpl
View File

@ -15,24 +15,12 @@
<div class="section-title-wrapper">
<div class="pull-right">
{{if $showNewWikiButton || $showPageControls}}
{{if $showPageControls}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu">
{{if $showNewWikiButton}}
<li class="nav-item">
<a class="nav-link" href="#" onclick="$('#new-page-form-wrapper').hide(); openClose('new-wiki-form-wrapper'); return false;" data-form_id="new-wiki-form"><i class="fa fa-book"></i>&nbsp;New Wiki</a>
</li>
{{/if}}
{{if $showNewPageButton}}
<li class="nav-item">
<a class="nav-link" href="#" onclick="$('#new-wiki-form-wrapper').hide(); openClose('new-page-form-wrapper'); return false;" data-form_id="new-page-form"><i class="fa fa-file-text-o"></i>&nbsp;New Page</a>
</li>
{{/if}}
{{if $showPageControls}}
<li class="divider"></li>
<li class="nav-item">
<a id="rename-page" class="nav-link" href="#"><i class="fa fa-edit"></i>&nbsp;Rename Page</a>
@ -43,7 +31,7 @@
<li class="nav-item">
<a id="embed-image" class="nav-link" href="#"><i class="fa fa-picture-o"></i>&nbsp;Embed Image</a>
</li>
{{/if}}
</ul>
</div>
@ -87,6 +75,18 @@
<hr>
</div>
<div id="edit-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
<form id="edit-wiki-form" action="wiki/edit/wiki" method="post" >
<div class="clear"></div>
<div class="btn-group pull-right">
<!--<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>
</form> <div class="clear"></div>
<hr>
</div>
<div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
<form id="new-page-form" action="wiki/create/page" method="post" >
<div class="clear"></div>
@ -178,6 +178,7 @@
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<script>
window.wiki_resource_id = '{{$resource_id}}';
window.wiki_page_name = '{{$page}}';
@ -218,13 +219,6 @@
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");
editor.setTheme("ace/theme/github");
editor.getSession().setMode("ace/mode/markdown");
@ -303,6 +297,11 @@ function wiki_download_wiki(resource_id) {
if (data.success) {
$('#wiki_page_list_container').html(data.pages);
$('#wiki_page_list_container').show();
{{if $showNewPageButton}}
$('#new-page-button').show();
{{else}}
$('#new-page-button').hide();
{{/if}}
} else {
alert('Error fetching page list!');
window.console.log('Error fetching page list!');
@ -512,4 +511,43 @@ function wiki_download_wiki(resource_id) {
'json');
};
function wiki_show_new_wiki_form() {
$('#new-page-form-wrapper').hide();
$('#edit-wiki-form-wrapper').hide();
$('#new-wiki-form-wrapper').toggle();
return false;
}
function wiki_show_new_page_form() {
$('#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) {
window.wiki_resource_id = wiki_resource_id;
window.wiki_title = wiki_title;
$('#new-page-form-wrapper').hide();
$('#new-wiki-form-wrapper').hide();
$('#edit-wiki-form-wrapper').toggle();
return false;
}
$(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}}
$('#new-wiki-button').show();
{{else}}
$('#new-wiki-button').hide();
{{/if}}
{{if $showPageControls}}
$('#edit-wiki-button').show();
{{else}}
$('#edit-wiki-button').hide();
{{/if}}
});
</script>

4
view/tpl/wiki_page_list.tpl
View File

@ -1,6 +1,8 @@
{{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}}
<div id="wiki_page_list" class="widget" >
<h3>{{$header}}</h3>
<h3>{{$header}}
<i id="new-page-button" class="pull-right generic-icons fakelink fa fa-plus" title="New page" onclick="wiki_show_new_page_form();"></i>
</h3>
<ul class="nav nav-pills nav-stacked">
{{foreach $pages as $page}}
<li><a href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a></li>

10
view/tpl/wikilist.tpl
View File

@ -1,13 +1,15 @@
<div id="wiki_list" class="widget">
<h3>{{$header}}</h3>
<h3>{{$header}}
<i id="new-wiki-button" class="pull-right generic-icons fakelink fa fa-plus" title="New wiki" onclick="wiki_show_new_wiki_form();"></i>
</h3>
<div>
{{foreach $wikis as $wiki}}
<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>
{{if $owner}}
<i class="pull-right drop-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>
{{/if}}
</div>
{{/foreach}}
</div>