diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-11-18 21:25:40 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-11-18 21:25:40 -0500 |
| commit | d5c14a513d435aade7d16d792a7e7a22ff9b01ff (patch) | |
| tree | 523af1dad8ee5980e90f71d1e1f63de4c66d3330 | |
| parent | f9b836027d4d06d218e0926c539845b641353cfb (diff) | |
| download | volse-hubzilla-d5c14a513d435aade7d16d792a7e7a22ff9b01ff.tar.gz volse-hubzilla-d5c14a513d435aade7d16d792a7e7a22ff9b01ff.tar.bz2 volse-hubzilla-d5c14a513d435aade7d16d792a7e7a22ff9b01ff.zip | |
Wiki pages display in tab to the left of the edit pane tab. Home is always first in the list.
| -rw-r--r-- | include/wiki.php | 5 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/include/wiki.php b/include/wiki.php index bcdf9d7d8..d2cb51bd3 100644 --- a/include/wiki.php +++ b/include/wiki.php @@ -32,13 +32,16 @@ function wiki_page_list($resource_id) { return array('pages' => null, 'wiki' => null); } $pages = array(); + $pages[] = array('title' => 'Home', 'url' => 'Home'); if (is_dir($w['path']) === true) { $files = array_diff(scandir($w['path']), array('.', '..', '.git')); // TODO: Check that the files are all text files foreach($files as $file) { // strip the .md file extension and unwrap URL encoding to leave HTML encoded name - $pages[] = array('title' => urldecode(substr($file, 0, -3)), 'url' => urlencode(substr($file, 0, -3))); + if( urldecode(substr($file, 0, -3)) !== 'Home') { + $pages[] = array('title' => urldecode(substr($file, 0, -3)), 'url' => urlencode(substr($file, 0, -3))); + } } } diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 2c2f05867..fd983ebdf 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -40,8 +40,8 @@ <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> </div> - <h2><span id="wiki-header-name"><i class="fa fa-book"></i> {{$wikiheaderName}}</span>  :   - <span id="wiki-header-page"><i class="fa fa-file-text-o"></i> {{$wikiheaderPage}}</span> + <h2><span id="wiki-header-name"><i class="fa fa-book"></i> <b>{{$wikiheaderName}}</b></span> :  + <span id="wiki-header-page">{{$wikiheaderPage}}</span> </h2> <div class="clear"></div> </div> @@ -62,11 +62,11 @@ <div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}> <ul class="nav nav-tabs" id="wiki-nav-tabs"> - + <li id="wiki-header-page"><a data-toggle="tab" href="#pages-pane" id="wiki-show-page-list"><i class="fa fa-file-text-o" style="margin-right: 10px"></i>  Pages</a></li> <li id="edit-pane-tab"><a data-toggle="tab" href="#edit-pane">Edit</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 id="wiki-header-page"><a data-toggle="tab" href="#pages-pane" id="wiki-show-page-list"><i class="fa fa-file-text-o" style="margin-right: 10px"></i>  Pages</a></li> + </ul> <div class="tab-content" id="wiki-page-tabs"> @@ -519,7 +519,7 @@ 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'); + $("#wiki-nav-tabs li:eq(2) a").tab('show'); {{if $showNewWikiButton}} $('#new-wiki-button').show(); {{else}} |