some changes to use friendicas new autocomplete function

diff --git a/css/style.css b/css/style.css
index f71f2aca4d54bbf646cc7a3c548c393870cd2bf2..a1f3a2ad4e2240ac43a39fc54a5d62088ab23b17 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -1280,30 +1280,35 @@ 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 {
   margin-left: 80px;

diff --git a/templates/jot-header.tpl b/templates/jot-header.tpl
index 36b35e3c8635a05eb2471973919deac250809886..a09e4db216aa35fac5964569fc73166111468704 100644 (file)
--- 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 96c94e43a7cc9aba53a2ebc4e384c84cfccb5b32..b66415d0a72a98c3db6a761af48a55e71431ebc0 100644 (file)
--- a/templates/nav.tpl
+++ b/templates/nav.tpl
@@ -99,7 +99,7 @@
                                                        <form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
                                                                <!-- <img class="hidden-xs" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
                                                                <div class="form-group form-group-search">
-                                                                       <input id="search-input-field" class="form-control form-search" type="text" name="search" placeholder="Search">
+                                                                       <input id="nav-search-input-field" class="form-control form-search" type="text" name="search" placeholder="Search">
                                                                        <button class="btn btn-default btn-sm form-button-search" type="submit">Search</button>
                                                                </div>
                                                        </form>

diff --git a/templates/nav_head.tpl b/templates/nav_head.tpl
new file mode 100644 (file)
index 0000000..f00ff03
--- /dev/null
+++ b/templates/nav_head.tpl
@@ -0,0 +1,6 @@
+
+<script>
+$(document).ready(function() {
+       $("#nav-search-input-field").search_autocomplete(baseurl + '/acl');
+});
+</script>