diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-31 13:41:29 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-31 13:41:29 -0400 |
| commit | 6decffb00c00fabcb4ef581084eaca038e340686 (patch) | |
| tree | 34471f015e0b33007ad40059dfdd09c83a768fbb /view | |
| parent | 1dc795722a8e748ebb98e8fab778cd4686a0654f (diff) | |
| parent | 6433ce70a19be8c57edbc72f8df3a4c7ef52f389 (diff) | |
| download | volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.gz volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.bz2 volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/autocomplete.js | 3 | ||||
| -rw-r--r-- | view/pdl/mod_display.pdl | 3 | ||||
| -rw-r--r-- | view/tpl/wiki.tpl | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 2d017db18..7a1a7673d 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -210,8 +210,9 @@ function string2bb(element) { tags = { match: /(^|\s)(\#)([^ \n]{2,})$/, index: 3, - search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, + search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null; })); }); }, replace: function(item) { return "$1$2" + item.text + ' '; }, + context: function(text) { return text.toLowerCase(); }, template: tag_format }; diff --git a/view/pdl/mod_display.pdl b/view/pdl/mod_display.pdl index 95f069031..a5461df50 100644 --- a/view/pdl/mod_display.pdl +++ b/view/pdl/mod_display.pdl @@ -1,3 +1,6 @@ +[region=aside] +[widget=vcard][/widget] +[/region] [region=right_aside] [widget=notifications][/widget] [widget=newmember][/widget] diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 2be323deb..6ca4b0c77 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -15,6 +15,7 @@ </div> </div> {{/if}} + <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$sharePage}}" onclick="window.location.href='rpost?f=&body={{$shareLink}}';"><i class="fa fa-fw fa-share"></i></button> <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button> <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button> </div> |