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

Show page content by default. Hide page controls where appropriate. Fix sandbox text format.

Browse Source
This commit is contained in:
Andrew Manning 2016-05-28 14:11:36 -04:00
parent 7393dccde8
commit 819683a073
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Zotlabs/Module/Wiki.php
View File

@ -63,12 +63,14 @@ class Wiki extends \Zotlabs\Web\Controller {
} }
if(argc()<3) { if(argc()<3) {
$wikiheader = t('Wiki Sandbox'); $wikiheader = t('Wiki Sandbox');
$content = '# Wiki Sandbox\nContent you **edit** and **preview** here *will not be saved*.'; $content = '"# Wiki Sandbox\n\nContent you **edit** and **preview** here *will not be saved*."';
$hide_editor = false; $hide_editor = false;
$showPageControls = false;
} elseif (argc()<4) { } elseif (argc()<4) {
$wikiheader = rawurldecode(argv(2)); // show wiki name $wikiheader = rawurldecode(argv(2)); // show wiki name
$content = ''; $content = '';
$hide_editor = true; $hide_editor = true;
$showPageControls = true;
} elseif (argc()<5) { } elseif (argc()<5) {
$wikiheader = rawurldecode(argv(2)) . ': ' . rawurldecode(argv(3)); // show wiki name and page $wikiheader = rawurldecode(argv(2)) . ': ' . rawurldecode(argv(3)); // show wiki name and page
$p = wiki_get_page_content(array('wiki_resource_id' => $resource_id, 'page' => argv(3))); $p = wiki_get_page_content(array('wiki_resource_id' => $resource_id, 'page' => argv(3)));
@ -78,17 +80,23 @@ class Wiki extends \Zotlabs\Web\Controller {
} }
$content = $p['content']; $content = $p['content'];
$hide_editor = false; $hide_editor = false;
$showPageControls = true;
} }
$parsedown = new Parsedown();
$renderedContent = $parsedown->text(json_decode($content));
$o .= replace_macros(get_markup_template('wiki.tpl'),array( $o .= replace_macros(get_markup_template('wiki.tpl'),array(
'$wikiheader' => $wikiheader, '$wikiheader' => $wikiheader,
'$hideEditor' => $hide_editor, '$hideEditor' => $hide_editor,
'$showPageControls' => $showPageControls,
'$channel' => $channel['channel_address'], '$channel' => $channel['channel_address'],
'$resource_id' => $resource_id, '$resource_id' => $resource_id,
'$lockstate' => $x['lockstate'], '$lockstate' => $x['lockstate'],
'$acl' => $x['acl'], '$acl' => $x['acl'],
'$bang' => $x['bang'], '$bang' => $x['bang'],
'$content' => $content, '$content' => $content,
'$renderedContent' => $renderedContent,
'$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''), '$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''),
'$pageName' => array('pageName', t('Enter the name of the new page:'), '', '') '$pageName' => array('pageName', t('Enter the name of the new page:'), '', '')
)); ));

14
view/tpl/wiki.tpl
View File

@ -49,8 +49,9 @@
<div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}> <div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
<ul class="nav nav-tabs" id="wiki-nav-tabs"> <ul class="nav nav-tabs" id="wiki-nav-tabs">
<li class="active"><a data-toggle="tab" href="#edit-pane">Edit</a></li> <li><a data-toggle="tab" href="#edit-pane">Edit</a></li>
<li><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">Preview</a></li> <li class="active"><a data-toggle="tab" href="#preview-pane" id="wiki-get-preview">Preview</a></li>
{{if $showPageControls}}
<li class="dropdown"> <li class="dropdown">
<a data-toggle="dropdown" class="dropdown-toggle" href="#">Page <b class="caret"></b></a> <a data-toggle="dropdown" class="dropdown-toggle" href="#">Page <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
@ -58,15 +59,16 @@
<li><a data-toggle="tab" href="#delete">Delete</a></li> <li><a data-toggle="tab" href="#delete">Delete</a></li>
</ul> </ul>
</li> </li>
{{/if}}
</ul> </ul>
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
<div id="edit-pane" class="tab-pane fade in active"> <div id="edit-pane" class="tab-pane fade">
<div id="ace-editor"></div> <div id="ace-editor"></div>
</div> </div>
<div id="preview-pane" class="tab-pane fade"> <div id="preview-pane" class="tab-pane fade in active">
<div id="wiki-preview" class="section-content-wrapper"> <div id="wiki-preview" class="section-content-wrapper">
{{$renderedContent}}
</div> </div>
</div> </div>
@ -80,7 +82,7 @@
$(document).ready(function () { $(document).ready(function () {
wiki_refresh_page_list(); wiki_refresh_page_list();
// Show Edit tab first. Otherwise the Ace editor does not load. // Show Edit tab first. Otherwise the Ace editor does not load.
$("#wiki-nav-tabs li:eq(0) a").tab('show'); $("#wiki-nav-tabs li:eq(1) a").tab('show');
}); });
var editor = ace.edit("ace-editor"); var editor = ace.edit("ace-editor");