aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-11-19 17:48:02 +1100
committerGitHub <noreply@github.com>2016-11-19 17:48:02 +1100
commit12b39feba385e56229a5ef5fe8383444f19f29e3 (patch)
tree26d41d8bda53b2ae45c94f7742b59bbb15dff0f7 /Zotlabs
parent3147b7c62bf1541b3c458baa5b5af47c0663ead2 (diff)
parent16281c626b7db96e5af3e05179315b4f0dc33d1c (diff)
downloadvolse-hubzilla-12b39feba385e56229a5ef5fe8383444f19f29e3.tar.gz
volse-hubzilla-12b39feba385e56229a5ef5fe8383444f19f29e3.tar.bz2
volse-hubzilla-12b39feba385e56229a5ef5fe8383444f19f29e3.zip
Merge pull request #591 from anaqreon/wiki-gui
Wiki UI improvements
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Wiki.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index edcd6ec58..c4fa63673 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -128,7 +128,7 @@ class Wiki extends \Zotlabs\Web\Controller {
require_once('library/markdown.php');
$content = t('"# Wiki Sandbox\n\nContent you **edit** and **preview** here *will not be saved*."');
$renderedContent = Markdown(json_decode($content));
- $hide_editor = false;
+ $hide_editor = true;
$showPageControls = false;
$showNewWikiButton = $wiki_owner;
$showNewPageButton = false;
@@ -209,8 +209,10 @@ class Wiki extends \Zotlabs\Web\Controller {
$o .= replace_macros(get_markup_template('wiki.tpl'),array(
'$wikiheaderName' => $wikiheaderName,
'$wikiheaderPage' => $wikiheaderPage,
- '$hideEditor' => $hide_editor,
+ '$hideEditor' => $hide_editor, // True will completely hide the content section and is used for the case of no wiki selected
+ '$chooseWikiMessage' => t('Choose an available wiki from the list on the left.'),
'$showPageControls' => $showPageControls,
+ '$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')),
'$tools_label' => 'Wiki Tools',
'$showNewWikiButton'=> $showNewWikiButton,
'$showNewPageButton'=> $showNewPageButton,