some changes to use friendicas new autocomplete function
This commit is contained in:
parent
f9c9019d90
commit
30317e3af0
|
@ -1280,29 +1280,34 @@ blockquote.shared_content {
|
||||||
padding-bottom: 5px !important;
|
padding-bottom: 5px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* acpopup */
|
/* acpopup + textcompletion*/
|
||||||
.acpopup {
|
.acpopup {
|
||||||
max-height: 150px;
|
/* max-height: 150px; */
|
||||||
background-color: #ffffff;
|
background-color: #ffffff;
|
||||||
color: #555;
|
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
z-index: 100000;
|
z-index: 100000;
|
||||||
box-shadow: 0 6px 12px rgba(0,0,0,.175);
|
box-shadow: 0 6px 12px rgba(0,0,0,.175);
|
||||||
}
|
}
|
||||||
.acpopupitem {
|
nav .acpopup {
|
||||||
color: #555;
|
/*top: 35px !important;*/
|
||||||
padding: 4px;
|
margin-left: -23px;
|
||||||
clear: left;
|
|
||||||
}
|
}
|
||||||
.acpopupitem.selected {
|
/** @todo: we schould consider the possebility to overwrite bootstrap dropdowns
|
||||||
background-color: $nav_bg;
|
at the beginning of this file */
|
||||||
color: $nav_icon_color;
|
.textcomplete-item a {
|
||||||
|
color: #555 !important;
|
||||||
}
|
}
|
||||||
.acpopupitem img {
|
.textcomplete-item.active > a {
|
||||||
float: left;
|
background-color: rgb(247, 247, 247) !important;
|
||||||
margin-right: 4px;
|
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 */
|
/* The wall-item thread levels */
|
||||||
/*.wall-item-container.thread_level_3 {
|
/*.wall-item-container.thread_level_3 {
|
||||||
|
|
|
@ -15,7 +15,8 @@ function initEditor(cb){
|
||||||
$("#jot-category").show();
|
$("#jot-category").show();
|
||||||
$("#jot-category").addClass("jot-category-ex");
|
$("#jot-category").addClass("jot-category-ex");
|
||||||
$("#jot-profile-jot-wrapper").show();
|
$("#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;
|
editor = true;
|
||||||
$("a#jot-perms-icon").colorbox({
|
$("a#jot-perms-icon").colorbox({
|
||||||
'inline' : true,
|
'inline' : true,
|
||||||
|
|
|
@ -99,7 +99,7 @@
|
||||||
<form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
|
<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;"> -->
|
<!-- <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">
|
<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>
|
<button class="btn btn-default btn-sm form-button-search" type="submit">Search</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
6
templates/nav_head.tpl
Normal file
6
templates/nav_head.tpl
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$(document).ready(function() {
|
||||||
|
$("#nav-search-input-field").search_autocomplete(baseurl + '/acl');
|
||||||
|
});
|
||||||
|
</script>
|
Loading…
Reference in a new issue