aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-14 14:22:05 -0800
committerfriendica <info@friendica.com>2013-11-14 14:22:05 -0800
commit33f570a18784a2ff9069954cda2a0c531a415a24 (patch)
treedcf4fcf6fddcfe6271da7551dcb02a63052a9086
parent49a392942cbea18432c44f227804e3cc8f5d79b0 (diff)
parente651ca8b07a1dd7083fd565c7b2403484390c3fe (diff)
downloadvolse-hubzilla-33f570a18784a2ff9069954cda2a0c531a415a24.tar.gz
volse-hubzilla-33f570a18784a2ff9069954cda2a0c531a415a24.tar.bz2
volse-hubzilla-33f570a18784a2ff9069954cda2a0c531a415a24.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--include/nav.php1
-rw-r--r--library/jquery_ac/friendica.complete.js3
-rw-r--r--view/js/mod_connections.js3
-rw-r--r--view/js/mod_message.js5
-rw-r--r--view/js/mod_network.js1
-rw-r--r--view/js/mod_poke.js3
-rw-r--r--view/js/mod_sources.js3
-rw-r--r--view/theme/redbasic/css/style.css28
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;
- $('<div id="' + this.mainContainerId + '" style="position:absolute;z-index:9999;"><div class="autocomplete-w1"><div class="autocomplete" id="' + autocompleteElId + '" style="display:none; width:300px;"></div></div></div>').appendTo('body');
+ $('<div id="' + this.mainContainerId + '" style="position:absolute;z-index:9999;"><div class="autocomplete-w1" id="'+this.id+'"><div class="autocomplete" id="' + autocompleteElId + '" style="display:none; width:300px;"></div></div></div>').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;