diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-11-18 06:04:00 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-11-18 06:04:00 -0500 |
| commit | 3cb138ea41bda9c64b6295d53e7d65fbb29d203a (patch) | |
| tree | 039ee05741f9ee5c7df4ef284ecea0316cd08a05 | |
| parent | 9016ba0d61f486a0315ed208853b5230f0163c86 (diff) | |
| download | volse-hubzilla-3cb138ea41bda9c64b6295d53e7d65fbb29d203a.tar.gz volse-hubzilla-3cb138ea41bda9c64b6295d53e7d65fbb29d203a.tar.bz2 volse-hubzilla-3cb138ea41bda9c64b6295d53e7d65fbb29d203a.zip | |
move commit message and save button into edit pane. Change page list tab label to Pages and move current page name back to section header.
| -rw-r--r-- | view/tpl/wiki.tpl | 37 | ||||
| -rw-r--r-- | view/tpl/wiki_page_list.tpl | 2 |
2 files changed, 20 insertions, 19 deletions
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 55093aa3d..2c2f05867 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -40,7 +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> + <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> @@ -65,13 +66,29 @@ <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> {{$wikiheaderPage}}</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"> @@ -103,22 +120,6 @@ </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}} |