diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-12-01 11:38:49 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-12-01 11:38:49 +0100 |
| commit | adb9f318038f4e0f54c8b3aacb2ed821b251500a (patch) | |
| tree | 26d06cb60c2a2a951d4c1b5b94e8406f3bf67a85 | |
| parent | d7f655dfc5b56601a79999cf8ae8bbc05d0f0259 (diff) | |
| download | volse-hubzilla-adb9f318038f4e0f54c8b3aacb2ed821b251500a.tar.gz volse-hubzilla-adb9f318038f4e0f54c8b3aacb2ed821b251500a.tar.bz2 volse-hubzilla-adb9f318038f4e0f54c8b3aacb2ed821b251500a.zip | |
more wiki cleanup
| -rw-r--r-- | Zotlabs/Module/Wiki.php | 4 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index 82f4ab5ce..5b3c4c1d8 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -249,7 +249,7 @@ class Wiki extends \Zotlabs\Web\Controller { '$chooseWikiMessage' => t('Choose an available wiki from the list on the left.'), '$showPageControls' => $showPageControls, '$editOrSourceLabel' => (($showPageControls) ? t('Edit') : t('Source')), - '$tools_label' => 'Wiki Tools', + '$tools_label' => 'Page Tools', '$showNewWikiButton'=> $showNewWikiButton, '$showNewPageButton'=> $showNewPageButton, '$channel' => $owner['channel_address'], @@ -265,8 +265,6 @@ class Wiki extends \Zotlabs\Web\Controller { '$mimeType' => $mimeType, '$content' => $content, '$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'), '', ''), '$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="Short description of your changes (optional)"'), '$pageHistory' => $pageHistory['history'], diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 76b63dd80..33bb3c449 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> <div class="pull-right"> {{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"> <i class="fa fa-caret-down"></i> {{$tools_label}} </button> @@ -45,7 +45,7 @@ <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 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> <div class="tab-content" id="wiki-page-tabs"> <div id="edit-pane" class="tab-pane fade"> @@ -171,7 +171,7 @@ $('#edit-pane-tab').click(function (ev) { 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) { @@ -187,7 +187,7 @@ if (data.success) { $('#wiki-preview').html(data.html); $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"}); - $('#embed-image').hide(); + $('#page-tools').hide(); } else { 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) { if (data.success) { $('#page-history-list').html(data.historyHTML); + $('#page-tools').hide(); } else { window.console.log('Error getting page history.'); } |