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

more wiki cleanup

Browse Source
This commit is contained in:
Mario Vavti 2016-12-01 11:38:49 +01:00
parent d7f655dfc5
commit adb9f31803
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Wiki.php
View File

@ -249,7 +249,7 @@ class Wiki extends \Zotlabs\Web\Controller {
'$chooseWikiMessage' => t('Choose an available wiki from the list on the left.'), '$chooseWikiMessage' => t('Choose an available wiki from the list on the left.'),
'$showPageControls' => $showPageControls, '$showPageControls' => $showPageControls,
'$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')), '$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')),
'$tools_label' => 'Wiki Tools', '$tools_label' => 'Page Tools',
'$showNewWikiButton'=> $showNewWikiButton, '$showNewWikiButton'=> $showNewWikiButton,
'$showNewPageButton'=> $showNewPageButton, '$showNewPageButton'=> $showNewPageButton,
'$channel' => $owner['channel_address'], '$channel' => $owner['channel_address'],
@ -265,8 +265,6 @@ class Wiki extends \Zotlabs\Web\Controller {
'$mimeType' => $mimeType, '$mimeType' => $mimeType,
'$content' => $content, '$content' => $content,
'$renderedContent' => $renderedContent, '$renderedContent' => $renderedContent,
'$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''),
'$pageName' => array('pageName', t('Enter the name of the new page:'), '', ''),
'$pageRename' => array('pageRename', t('New page name'), '', ''), '$pageRename' => array('pageRename', t('New page name'), '', ''),
'$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="Short description of your changes (optional)"'), '$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="Short description of your changes (optional)"'),
'$pageHistory' => $pageHistory['history'], '$pageHistory' => $pageHistory['history'],

9
view/tpl/wiki.tpl
View File

@ -2,7 +2,7 @@
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<div class="pull-right"> <div class="pull-right">
{{if $showPageControls}} {{if $showPageControls}}
<div class="btn-group"> <div id="page-tools" class="btn-group" style="display: none;">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}} <i class="fa fa-caret-down"></i>&nbsp;{{$tools_label}}
</button> </button>
@ -45,7 +45,7 @@
<ul class="nav nav-tabs" id="wiki-nav-tabs"> <ul class="nav nav-tabs" id="wiki-nav-tabs">
<li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li> <li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
<li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li> <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
<li {{if $hidePageHistory}}style="display: none;"{{/if}}><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li> <li><a data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
</ul> </ul>
<div class="tab-content" id="wiki-page-tabs"> <div class="tab-content" id="wiki-page-tabs">
<div id="edit-pane" class="tab-pane fade"> <div id="edit-pane" class="tab-pane fade">
@ -171,7 +171,7 @@
$('#edit-pane-tab').click(function (ev) { $('#edit-pane-tab').click(function (ev) {
setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry
$('#embed-image').show(); $('#page-tools').show();
}); });
$('#wiki-get-preview').click(function (ev) { $('#wiki-get-preview').click(function (ev) {
@ -187,7 +187,7 @@
if (data.success) { if (data.success) {
$('#wiki-preview').html(data.html); $('#wiki-preview').html(data.html);
$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"}); $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
$('#embed-image').hide(); $('#page-tools').hide();
} else { } else {
window.console.log('Error previewing page.'); window.console.log('Error previewing page.');
} }
@ -199,6 +199,7 @@
$.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) { $.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
if (data.success) { if (data.success) {
$('#page-history-list').html(data.historyHTML); $('#page-history-list').html(data.historyHTML);
$('#page-tools').hide();
} else { } else {
window.console.log('Error getting page history.'); window.console.log('Error getting page history.');
} }