From 3311fe481352e30206c5d9c593f158814be9ca0b Mon Sep 17 00:00:00 2001 From: marijus Date: Thu, 14 Nov 2013 18:03:16 +0100 Subject: make autocomplete better themable by adding an id --- include/nav.php | 1 + library/jquery_ac/friendica.complete.js | 3 ++- view/js/mod_connections.js | 3 ++- view/js/mod_message.js | 5 +++-- view/js/mod_network.js | 1 + view/js/mod_poke.js | 3 ++- view/js/mod_sources.js | 3 ++- view/theme/redbasic/css/style.css | 28 +++++++++++++++++++++++----- 8 files changed, 36 insertions(+), 11 deletions(-) diff --git a/include/nav.php b/include/nav.php index a16d8d078..51c1cc583 100644 --- a/include/nav.php +++ b/include/nav.php @@ -22,6 +22,7 @@ function nav(&$a) { serviceUrl: '$base/acl', minChars: 2, width: 250, + id: 'nav-search-text-ac', }); a.setOptions({ autoSubmit: true, params: { type: 'x' }}); diff --git a/library/jquery_ac/friendica.complete.js b/library/jquery_ac/friendica.complete.js index b73598575..190625e87 100644 --- a/library/jquery_ac/friendica.complete.js +++ b/library/jquery_ac/friendica.complete.js @@ -35,6 +35,7 @@ this.ignoreValueChange = false; this.serviceUrl = options.serviceUrl; this.isLocal = false; + this.id = options.id; this.options = { autoSubmit: false, minChars: 1, @@ -77,7 +78,7 @@ if (!this.options.width) { this.options.width = this.el.width(); } this.mainContainerId = 'AutocompleteContainter_' + uid; - $('
').appendTo('body'); + $('
').appendTo('body'); this.container = $('#' + autocompleteElId); this.fixPosition(); diff --git a/view/js/mod_connections.js b/view/js/mod_connections.js index ed1577792..404010636 100644 --- a/view/js/mod_connections.js +++ b/view/js/mod_connections.js @@ -3,7 +3,8 @@ $(document).ready(function() { a = $("#contacts-search").autocomplete({ serviceUrl: baseurl + '/acl', minChars: 2, - width: 350, + width: 250, + id: 'contact-search-ac', }); a.setOptions({ autoSubmit: true, params: { type: 'a' }}); diff --git a/view/js/mod_message.js b/view/js/mod_message.js index e3318ce6b..82f60f46f 100644 --- a/view/js/mod_message.js +++ b/view/js/mod_message.js @@ -3,10 +3,11 @@ $(document).ready(function() { a = $("#recip").autocomplete({ serviceUrl: baseurl + '/acl', minChars: 2, - width: 350, + width: 250, + id: 'recip-ac', onSelect: function(value,data) { $("#recip-complete").val(data); - } + }, }); }); diff --git a/view/js/mod_network.js b/view/js/mod_network.js index ca910ae52..f63a57653 100644 --- a/view/js/mod_network.js +++ b/view/js/mod_network.js @@ -4,6 +4,7 @@ $(document).ready(function() { serviceUrl: baseurl + '/search_ac', minChars: 2, width: 250, + id: 'search-text-ac', }); }); diff --git a/view/js/mod_poke.js b/view/js/mod_poke.js index fa00ac2d5..edd53bb6a 100644 --- a/view/js/mod_poke.js +++ b/view/js/mod_poke.js @@ -3,7 +3,8 @@ $(document).ready(function() { a = $("#poke-recip").autocomplete({ serviceUrl: baseurl + '/acl', minChars: 2, - width: 350, + width: 250, + id: 'poke-recip-ac'; onSelect: function(value,data) { $("#poke-recip-complete").val(data); } diff --git a/view/js/mod_sources.js b/view/js/mod_sources.js index 140f13843..fda952cae 100644 --- a/view/js/mod_sources.js +++ b/view/js/mod_sources.js @@ -3,7 +3,8 @@ $(document).ready(function() { a = $("#id_name").autocomplete({ serviceUrl: baseurl + '/acl', minChars: 2, - width: 350, + width: 250, + id: 'id-name-ac', onSelect: function(value,data) { $("#id_xchan").val(data); } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e6fa952d5..300ae881b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -781,6 +781,12 @@ footer { height: 120px; padding: 10px; } + +#contacts-search { + font-size: 1em; + width: 300px; +} + #contacts-search-end { margin-bottom: 10px; } @@ -2894,14 +2900,26 @@ div.jGrowl div.info { width:100px; } -#recip { - +#nav-search-text-ac .autocomplete { + position: fixed; + top: 24px; + border: 1px solid $nav_bg_2; + border-top: none; } -.autocomplete { - color: $font_colour; - border: 1px solid $nav_bg_1; +#search-text-ac .autocomplete, +#recip-ac .autocomplete, +#poke-recip-ac .autocomplete, +#id-name-ac .autocomplete, +#contact-search-ac .autocomplete { + margin-top: 2px; + margin-left: $radiuspx; + border: 1px solid #666; border-top: none; +} + +.autocomplete { + color: $font_colour; background: #FFF; cursor: pointer; text-align: left; -- cgit v1.2.3