diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/field_select.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 36 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/wiki_page_not_found.tpl | 2 |
4 files changed, 4 insertions, 39 deletions
diff --git a/view/tpl/field_select.tpl b/view/tpl/field_select.tpl index cda9a823a..8c3776841 100755 --- a/view/tpl/field_select.tpl +++ b/view/tpl/field_select.tpl @@ -3,5 +3,5 @@ <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"> {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}} </select> - <small class="form-text text-muted">{{$field.3}}</small> + <small class="form-text text-muted">{{$field.3}}</small > </div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 7980bc696..c0808272d 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -161,42 +161,6 @@ </div> </div> </div> - - <div class="panel"> - <div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings"> - <h3> - <a data-toggle="collapse" data-target="#miscellaneous-settings-collapse" href="#" aria-expanded="true" aria-controls="miscellaneous-settings-collapse"> - {{$lbl_misc}} - </a> - </h3> - </div> - <div id="miscellaneous-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="miscellaneous-settings" data-parent="#settings" > - <div class="section-content-tools-wrapper"> - <div class="form-group"> - {{if $profselect}} - <label for="contact-profile-selector">{{$profseltxt}}</label> - {{$profselect}} - {{/if}} - {{if $menus}} - <div class="form-group channel-menu"> - <label for="channel_menu">{{$menu_desc}}</label> - <select name="channel_menu" class="form-control"> - {{foreach $menus as $menu }} - <option value="{{$menu.name}}" {{$menu.selected}}>{{$menu.name}}</option> - {{/foreach}} - </select> - </div> - {{/if}} - {{if $misc_addon}} - {{$misc_addon}} - {{/if}} - </div> - <div class="settings-submit-wrapper" > - <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> - </div> - </div> - </div> - </div> </div> </form> {{$aclselect}} diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 2aabc7b5f..0f6fad8e3 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -262,7 +262,8 @@ if (data.success) { window.saved = true; window.console.log('Page saved successfully.'); - window.wiki_page_content = currentContent; + //window.wiki_page_content = currentContent; + window.wiki_page_content = data.content; $('#id_commitMsg').val(''); // Clear the commit message box $('#save-page').addClass('disabled'); // Disable the save button {{if !$mimeType || $mimeType == 'text/markdown'}} diff --git a/view/tpl/wiki_page_not_found.tpl b/view/tpl/wiki_page_not_found.tpl index de98efdf8..bc8afeb53 100644 --- a/view/tpl/wiki_page_not_found.tpl +++ b/view/tpl/wiki_page_not_found.tpl @@ -1,7 +1,7 @@ <h3>Page does not exist</h3> <br /><br /><br /> {{if $canadd}} - <form id="new-page-form" action="wiki/{{$channel_address}}/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}} {{if $typelock}} |