diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/autocomplete.js | 2 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 11 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/wikilist.tpl | 1 |
5 files changed, 7 insertions, 13 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 62a3b6f06..571b5a5b1 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -202,7 +202,7 @@ function string2bb(element) { $.fn.search_autocomplete = function(backend_url) { // Autocomplete contacts contacts = { - match: /(^@)([^\n]{2,})$/, + match: /(^@)([^\n]{3,})$/, index: 2, search: function(term, callback) { contact_search(term, callback, backend_url, 'x', [], spinelement='#nav-search-spinner'); }, replace: basic_replace, diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 0f37d8287..2c1fc762c 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -111,7 +111,7 @@ <div class="btn-group pull-right"> <button id="event-edit-preview-btn" class="btn btn-default" type="button" title="{{$preview}}" onclick="doEventPreview();"><i class="fa fa-eye" ></i></button> {{if ! $eid}} - <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa"></i></button> + <button id="dbtn-acl" class="btn btn-default" type="button" data-toggle="modal" data-target="#aclModal" title="{{$perms_label}}"><i id="jot-perms-icon" class="fa fa-{{$lockstate}}"></i></button> {{/if}} <button id="event-submit" class="btn btn-primary" type="submit" name="submit">{{$submit}}</button> </div> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 646c68564..1d1b6f15b 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -153,17 +153,6 @@ } }); - // ACL - $('#id_distr').change(function() { - - if ($('#id_distr').is(':checked')) { - $('#dbtn-acl').show(); - } - else { - $('#dbtn-acl').hide(); - } - }).trigger('change'); - }); </script> diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index c05b33a61..8fdf56e77 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -239,6 +239,10 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) { }, 'json'); } + +function wiki_download_wiki(resource_id) { + window.location = "wiki/{{$channel}}/download/wiki/" + resource_id; +} $('#new-page-submit').click(function (ev) { if (window.wiki_resource_id === '') { diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index be353ca5e..6b37be4c5 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -8,6 +8,7 @@ </a> <ul class="dropdown-menu pull-right"> <li><a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="View {{$wiki.title}}">View</a></li> + <li><a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="Download {{$wiki.title}}">Download</a></li> {{if $showControls}} <li class="divider"></li> <li><a href="#" onclick="wiki_delete_wiki('{{$wiki.title}}','{{$wiki.resource_id}}'); return false;" title="Delete {{$wiki.title}}">Delete wiki</a></li> |