diff options
| author | friendica <info@friendica.com> | 2015-01-29 15:19:16 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 15:19:16 -0800 |
| commit | d7dae3c72a5d22cd29d4ba8cfd18e7139ede09ff (patch) | |
| tree | bad34a3b7174a81f5b479c6653da39344f8df0fe /view | |
| parent | e2edc2c96841588ade355890c49ff7a3c900078d (diff) | |
| parent | 1ec6e62ed34ed8665da188f8a8427bf470bcc02e (diff) | |
| download | volse-hubzilla-d7dae3c72a5d22cd29d4ba8cfd18e7139ede09ff.tar.gz volse-hubzilla-d7dae3c72a5d22cd29d4ba8cfd18e7139ede09ff.tar.bz2 volse-hubzilla-d7dae3c72a5d22cd29d4ba8cfd18e7139ede09ff.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/autocomplete.js | 2 | ||||
| -rwxr-xr-x | view/tpl/event_form.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 86847cb35..b93cc16b3 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -77,7 +77,7 @@ function editor_replace(item) { // 16 chars is also the minimum length in the backend (otherwise it's interpreted as a local id). if(id.length > 16) id = item.id.substring(0,16); - return '$1$2'+item.nick.replace(' ','') + '+' + id; + return '$1$2'+item.nick.replace(' ','') + '+' + id + ' '; } function basic_replace(item) { diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index a4717415e..2479068f3 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -41,7 +41,7 @@ {{if $catsenabled}} <div id="event-category-wrap"> - <input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" /> + <input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" data-role="tagsinput" /> </div> {{/if}} |