From 30317e3af0c527d555aa129853fb944ceddcc0b2 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Sat, 16 Apr 2016 23:07:29 +0200 Subject: [PATCH] some changes to use friendicas new autocomplete function --- css/style.css | 31 ++++++++++++++++++------------- templates/jot-header.tpl | 3 ++- templates/nav.tpl | 2 +- templates/nav_head.tpl | 6 ++++++ 4 files changed, 27 insertions(+), 15 deletions(-) create mode 100644 templates/nav_head.tpl diff --git a/css/style.css b/css/style.css index f71f2aca4d..a1f3a2ad4e 100644 --- a/css/style.css +++ b/css/style.css @@ -1280,29 +1280,34 @@ blockquote.shared_content { padding-bottom: 5px !important; } -/* acpopup */ +/* acpopup + textcompletion*/ .acpopup { - max-height: 150px; + /* max-height: 150px; */ background-color: #ffffff; - color: #555; border-radius: 4px; overflow: auto; z-index: 100000; box-shadow: 0 6px 12px rgba(0,0,0,.175); } -.acpopupitem { - color: #555; - padding: 4px; - clear: left; +nav .acpopup { + /*top: 35px !important;*/ + margin-left: -23px; } -.acpopupitem.selected { - background-color: $nav_bg; - color: $nav_icon_color; +/** @todo: we schould consider the possebility to overwrite bootstrap dropdowns + at the beginning of this file */ +.textcomplete-item a { + color: #555 !important; } -.acpopupitem img { - float: left; - margin-right: 4px; +.textcomplete-item.active > a { + background-color: rgb(247, 247, 247) !important; + background-image: none !important; + border-left: 3px solid $link_color; + padding-left: 17px !important; } +.textcomplete-item a .forum { + color: $link_color; +} + /* The wall-item thread levels */ /*.wall-item-container.thread_level_3 { diff --git a/templates/jot-header.tpl b/templates/jot-header.tpl index 36b35e3c86..a09e4db216 100644 --- a/templates/jot-header.tpl +++ b/templates/jot-header.tpl @@ -15,7 +15,8 @@ function initEditor(cb){ $("#jot-category").show(); $("#jot-category").addClass("jot-category-ex"); $("#jot-profile-jot-wrapper").show(); - $("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); + $("#profile-jot-text").editor_autocomplete(baseurl+"/acl"); + $("#profile-jot-text").bbco_autocomplete('bbcode'); editor = true; $("a#jot-perms-icon").colorbox({ 'inline' : true, diff --git a/templates/nav.tpl b/templates/nav.tpl index 96c94e43a7..b66415d0a7 100644 --- a/templates/nav.tpl +++ b/templates/nav.tpl @@ -99,7 +99,7 @@ diff --git a/templates/nav_head.tpl b/templates/nav_head.tpl new file mode 100644 index 0000000000..f00ff0355f --- /dev/null +++ b/templates/nav_head.tpl @@ -0,0 +1,6 @@ + +