diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-09-13 10:30:08 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-09-13 10:30:08 +0200 |
| commit | 29b0ed87d61ae7c5fae5a43ad667cefce3938e25 (patch) | |
| tree | d94df5802569f08b4b640a5763a2ea27b2d49743 /view/tpl | |
| parent | 87ca60b0b128bf12b611146264159377baca71a3 (diff) | |
| parent | 0e6d84e20731f173e489fe0d54b43c01266c0391 (diff) | |
| download | volse-hubzilla-29b0ed87d61ae7c5fae5a43ad667cefce3938e25.tar.gz volse-hubzilla-29b0ed87d61ae7c5fae5a43ad667cefce3938e25.tar.bz2 volse-hubzilla-29b0ed87d61ae7c5fae5a43ad667cefce3938e25.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/wiki.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/wiki_page_list.tpl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 7cd3708b8..681269002 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -183,7 +183,8 @@ {{else}} content: editor.val(), {{/if}} - resource_id: window.wiki_resource_id + resource_id: window.wiki_resource_id, + mimetype: '{{$mimeType}}' }, function (data) { if (data.success) { diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index 6d09fcd5d..2e7fb8b9e 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -21,6 +21,7 @@ <div id="new-page-form-wrapper" class="sub-menu" style="display:none;"> <form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" > <input type="hidden" name="resource_id" value="{{$resource_id}}"> + {{$mimetype}} {{include file="field_input.tpl" field=$pageName}} <button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button> </form> @@ -33,7 +34,7 @@ {{if $canadd}} <script> $('#new-page-submit').click(function (ev) { - $.post("wiki/{{$channel_address}}/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, mimetype: $('#id_mimetype').val() }, function(data) { if(data.success) { window.location = data.url; |