diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 19 | ||||
| -rw-r--r-- | view/tpl/wiki_page_list.tpl | 16 |
3 files changed, 19 insertions, 18 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 39fe686a9..4719e1b17 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -233,7 +233,7 @@ {{if $localuser}} <div class="dropdown-divider"></div> <a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a> - <a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a> + <a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a> {{/if}} </div> </div> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 564db3324..7cd3708b8 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -115,7 +115,7 @@ }); $( "#rename-page-form" ).submit(function( event ) { - $.post("wiki/{{$channel}}/rename/page", + $.post("wiki/{{$channel_address}}/rename/page", { oldName: window.wiki_page_name, newName: $('#id_pageRename').val(), @@ -177,7 +177,7 @@ }); $('#wiki-get-preview').click(function (ev) { - $.post("wiki/{{$channel}}/preview", { + $.post("wiki/{{$channel_address}}/preview", { {{if !$mimeType || $mimeType == 'text/markdown'}} content: editor.getValue(), {{else}} @@ -200,7 +200,7 @@ }); $('#wiki-get-history').click(function (ev) { - $.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) { + $.post("wiki/{{$channel_address}}/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(); @@ -215,10 +215,9 @@ if (window.wiki_resource_id === '') { return false; } - $.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) { + $.post("wiki/{{$channel_address}}/get/page/list/", {channel_id: '{{$channel_id}}', resource_id: window.wiki_resource_id}, function (data) { if (data.success) { - $('#wiki_page_list_container').html(data.pages); - $('#wiki_page_list_container').show(); + $('#wiki_page_list').html(data.pages); } else { alert('Error fetching page list!'); window.console.log('Error fetching page list!'); @@ -245,7 +244,7 @@ ev.preventDefault(); return false; } - $.post("wiki/{{$channel}}/save/page", { + $.post("wiki/{{$channel_address}}/save/page", { content: currentContent, commitMsg: $('#id_commitMsg').val(), name: window.wiki_page_name, @@ -276,7 +275,7 @@ window.console.log('You must have a wiki page open in order to revert pages.'); return false; } - $.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, + $.post("wiki/{{$channel_address}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) { if (data.success) { $('button[id^=revert-]').removeClass('btn-success'); @@ -299,7 +298,7 @@ window.console.log('You must have a wiki page open in order to revert pages.'); return false; } - $.post("wiki/{{$channel}}/compare/page", { + $.post("wiki/{{$channel_address}}/compare/page", { compareCommit: compareCommit, currentCommit: window.wiki_page_commit, name: window.wiki_page_name, @@ -442,8 +441,6 @@ }; $(document).ready(function () { - wiki_refresh_page_list(); - {{if !$mimeType || $mimeType == 'text/markdown'}} $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"}); window.editor.on("input", function() { diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index 44fba15cc..6d09fcd5d 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -1,5 +1,6 @@ -{{if $not_refresh}}<div id="wiki_page_list_container" {{if $hide}} style="display: none;" {{/if}}>{{/if}} +{{if ! $refresh}} <div id="wiki_page_list" class="widget" > +{{/if}} <h3>{{$header}}</h3> <ul class="nav nav-pills flex-column"> {{if $pages}} @@ -8,7 +9,7 @@ {{if $page.resource_id && $candel}} <i class="nav-link widget-nav-pills-icons fa fa-trash-o drop-icons" onclick="wiki_delete_page('{{$page.title}}', '{{$page.url}}', '{{$page.resource_id}}', '{{$page.link_id}}')"></i> {{/if}} - <a class="nav-link" href="/wiki/{{$channel}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a> + <a class="nav-link" href="/wiki/{{$channel_address}}/{{$wikiname}}/{{$page.url}}">{{$page.title}}</a> </li> {{/foreach}} {{/if}} @@ -18,19 +19,21 @@ </ul> {{if $canadd}} <div id="new-page-form-wrapper" class="sub-menu" style="display:none;"> - <form id="new-page-form" action="wiki/{{$channel}}/create/page" method="post" > + <form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" > <input type="hidden" name="resource_id" value="{{$resource_id}}"> {{include file="field_input.tpl" field=$pageName}} <button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button> </form> </div> {{/if}} +{{if ! $refresh}} </div> -{{if $not_refresh}}</div>{{/if}} +{{/if}} +{{if $canadd}} <script> $('#new-page-submit').click(function (ev) { - $.post("wiki/{{$channel}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, + $.post("wiki/{{$channel_address}}/create/page", {pageName: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, function(data) { if(data.success) { window.location = data.url; @@ -45,7 +48,7 @@ if(!confirm('Are you sure you want to delete the page: ' + wiki_page_name)) { return; } - $.post("wiki/{{$channel}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id}, + $.post("wiki/{{$channel_address}}/delete/page", {name: wiki_page_url, resource_id: wiki_resource_id}, function (data) { if (data.success) { window.console.log('Page deleted successfully.'); @@ -74,3 +77,4 @@ return false; } </script> +{{/if}} |