diff options
| author | git-marijus <mario@mariovavti.com> | 2017-09-15 16:30:14 +0200 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-09-15 16:30:14 +0200 |
| commit | 663802e6992858c026a4e9b325575bc064cc687d (patch) | |
| tree | 1889ae84e99fa9c7c39a504a25aca3d492a7ecc7 /view | |
| parent | 4c5722c766643af368f600abb93a44fc72d27c11 (diff) | |
| parent | 67348547765876faa847fa53f92d37a6b4bc4aa5 (diff) | |
| download | volse-hubzilla-663802e6992858c026a4e9b325575bc064cc687d.tar.gz volse-hubzilla-663802e6992858c026a4e9b325575bc064cc687d.tar.bz2 volse-hubzilla-663802e6992858c026a4e9b325575bc064cc687d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/wiki.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/wiki_page_list.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/wikilist.tpl | 13 |
3 files changed, 13 insertions, 5 deletions
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 7995b7bb1..70a13806d 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -1,6 +1,7 @@ <div class="generic-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}> <div class="section-title-wrapper"> <div class="pull-right"> + <span class="wiki-typename">[{{$typename}}] </span> {{if $showPageControls}} <div id="page-tools" class="btn-group" style="display: none;"> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index 2e7fb8b9e..3d38a0b81 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -21,7 +21,11 @@ <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}}"> + {{if $typelock}} + <input type="hidden" name="mimetype" value="{{$lockedtype}}"> + {{else}} {{$mimetype}} + {{/if}} {{include file="field_input.tpl" field=$pageName}} <button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button> </form> diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index a9196afd3..51d24c195 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -10,6 +10,7 @@ <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> {{include file="field_input.tpl" field=$wikiName}} {{include file="field_select.tpl" field=$mimeType}} + {{include file="field_checkbox.tpl" field=$typelock}} {{include file="field_checkbox.tpl" field=$notify}} <div> <div class="btn-group pull-right"> @@ -29,7 +30,8 @@ <th width="96%">{{$name}}</th> <th width="1%">{{$type}}</th> <th width="1%" class="wikis-index-tool"></th> - <!-- th width="1%" class="wikis-index-tool"></th --> + <th width="1%" class="wikis-index-tool"></th> + <th width="1%" class="wikis-index-tool"></th> {{if $owner}} <th width="1%"></th> {{/if}} @@ -37,16 +39,17 @@ {{foreach $wikis as $wiki}} <tr class="wikis-index-row"> <td><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a></td> - <td>{{$wiki.mimeType}}</td> + <td>{{if $wiki.typelock}}{{$wiki.mimeType}}{{else}}{{$unlocked}}{{/if}}</td> <td class="wiki-index-tool dropdown"> {{if $wiki.lock}} - <i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('item',{{$wiki.id}});"></i></button> + <button class="btn btn-default btn-sm" onclick="lockview('item',{{$wiki.id}});"><i class="fa fa-lock lockview" data-toggle="dropdown" ></i></button> <ul id="panel-{{$wiki.id}}" class="lockview-panel dropdown-menu dropdown-menu-right"></ul> {{/if}} </td> - <!-- td class="wiki-index-tool"><i class="fa fa-download fakelink" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"></i></td --> + <td class="wiki-index-tool"><button class="btn btn-default btn-sm" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;"><i class="fa fa-download fakelink" ></i></button></td> {{if $owner}} - <td><i class="fa fa-trash-o drop-icons" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"></i></td> + <td> </td> + <td><button class="btn btn-default btn-sm" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"><i class="fa fa-trash-o drop-icons" ></i></button></td> {{/if}} </tr> <tr> |