diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/pdl/mod_wiki.pdl | 2 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 73 | ||||
| -rw-r--r-- | view/tpl/wiki_page_list.tpl | 2 |
3 files changed, 44 insertions, 33 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..2c2f05867 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -40,21 +40,13 @@ <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> {{$wikiheaderName}}</span>  :   + <span id="wiki-header-page"><i class="fa fa-file-text-o"></i> {{$wikiheaderPage}}</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,17 +60,35 @@ </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>  Pages</a></li> </ul> - + <div class="tab-content" id="wiki-page-tabs"> <div id="edit-pane" class="tab-pane fade"> <div id="ace-editor"></div> + {{if $showCommitMsg}} + {{if $showPageControls}} + <div class="section-content-wrapper"> + <div id="id_{{$commitMsg.0}}_wrapper" class='form-group field input'> + <label for='id_{{$commitMsg.0}}' id='label_{{$commitMsg.0}}'>{{$commitMsg.1}}{{if $commitMsg.4}}<span class="required"> {{$commitMsg.4}}</span>{{/if}}</label> + <span> + <input class="" style="width: 80%;" name='{{$commitMsg.0}}' id='id_{{$commitMsg.0}}' type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> + <a id="save-page" href="#" class="btn btn-primary btn-md">Save</a> + </span> + <span id='help_{{$commitMsg.0}}' class='help-block'>{{$commitMsg.3}}</span> + + <div class="clear"></div> + </div> + </div> + {{/if}} + {{/if}} </div> <div id="preview-pane" class="tab-pane fade in active"> <div id="wiki-preview" class="section-content-wrapper"> @@ -88,27 +98,28 @@ <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> </div> - {{if $showCommitMsg}} - {{if $showPageControls}} - <div class="section-content-wrapper"> - <div id="id_{{$commitMsg.0}}_wrapper" class='form-group field input'> - <label for='id_{{$commitMsg.0}}' id='label_{{$commitMsg.0}}'>{{$commitMsg.1}}{{if $commitMsg.4}}<span class="required"> {{$commitMsg.4}}</span>{{/if}}</label> - <span> - <input class="" style="width: 80%;" name='{{$commitMsg.0}}' id='id_{{$commitMsg.0}}' type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}> - <a id="save-page" href="#" class="btn btn-primary btn-md">Save</a> - </span> - <span id='help_{{$commitMsg.0}}' class='help-block'>{{$commitMsg.3}}</span> - - <div class="clear"></div> - </div> - </div> - {{/if}} - {{/if}} </div> {{$wikiModal}} diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index c020f2520..afb14c6a9 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -1,6 +1,6 @@ {{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}} <div id="wiki_page_list" class="widget" > - <h3>{{$header}}</h3> + <!--<h3>{{$header}}</h3>--> <ul class="nav nav-pills nav-stacked"> {{if $pages}} |