aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-11-17 20:38:07 -0500
committerAndrew Manning <tamanning@zoho.com>2016-11-17 20:38:07 -0500
commit9016ba0d61f486a0315ed208853b5230f0163c86 (patch)
treeca898b03cc0453693282eabcc9361cb607670da9
parent3b6248cb64bb79b6bf5652bdbe145e76dd755c05 (diff)
downloadvolse-hubzilla-9016ba0d61f486a0315ed208853b5230f0163c86.tar.gz
volse-hubzilla-9016ba0d61f486a0315ed208853b5230f0163c86.tar.bz2
volse-hubzilla-9016ba0d61f486a0315ed208853b5230f0163c86.zip
Remove page widget completely. Render the page list in a tab alongside History Edit and renamed View tabs. Move new page form below new page button within this page list tab.
-rw-r--r--view/pdl/mod_wiki.pdl2
-rw-r--r--view/tpl/wiki.tpl40
2 files changed, 26 insertions, 16 deletions
diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl
index 76ed1c70c..9d2160935 100644
--- a/view/pdl/mod_wiki.pdl
+++ b/view/pdl/mod_wiki.pdl
@@ -1,4 +1,4 @@
[region=aside]
[widget=wiki_list][/widget]
-[widget=wiki_pages][/widget]
+[comment][widget=wiki_pages][/widget][/comment]
[/region]
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 4eefb3189..55093aa3d 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -40,21 +40,12 @@
<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">{{$wikiheaderName}}</span>: <span id="wiki-header-page">{{$wikiheaderPage}}</span></h2>
+ <h2><span id="wiki-header-name"><i class="fa fa-book"></i>&nbsp{{$wikiheaderName}}</span>
+ </h2>
<div class="clear"></div>
</div>
- <div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
- <form id="new-page-form" action="wiki/create/page" method="post" >
- <div class="clear"></div>
- {{include file="field_input.tpl" field=$pageName}}
- <div class="btn-group pull-right">
- <button id="new-page-submit" class="btn btn-success" type="submit" name="submit" >Create Page</button>
- </div>
- </form> <div class="clear"></div>
- <hr>
- </div>
<div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
<form id="rename-page-form" action="wiki/rename/page" method="post" >
@@ -68,13 +59,15 @@
</div>
<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="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">Preview</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>&nbsp{{$wikiheaderPage}}</a></li>
</ul>
-
+
<div class="tab-content" id="wiki-page-tabs">
<div id="edit-pane" class="tab-pane fade">
@@ -88,7 +81,24 @@
<div id="page-history-pane" class="tab-pane fade" {{if $hidePageHistory}}style="display: none;"{{/if}}>
<div id="page-history-list" class="section-content-wrapper">
</div>
- </div>
+ </div>
+ <div id="pages-pane" class="tab-pane">
+ <div id="wiki_page_list_container" style="display: none;">
+ <div id="wiki_page_list" class="section-content-wrapper">
+
+ </div>
+ </div>
+ <div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+ <form id="new-page-form" action="wiki/create/page" method="post" >
+ <div class="clear"></div>
+ {{include file="field_input.tpl" field=$pageName}}
+ <div class="btn-group pull-right">
+ <button id="new-page-submit" class="btn btn-success" type="submit" name="submit" >Create Page</button>
+ </div>
+ </form> <div class="clear"></div>
+ <hr>
+ </div>
+ </div>
</div>