diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-02-28 20:03:06 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-02-28 20:03:06 +0100 |
| commit | dee16deacd8a66c423d8b51ccfc23730823e4019 (patch) | |
| tree | cc1de2c2ada6291366eb0a4db62fc9510f04cc9c /core | |
| parent | 5f8bd079272c3e568d80bb984a65d9835a6b4393 (diff) | |
| parent | a86761e1e720af148da6cbc3fd641da6b57fab5b (diff) | |
| download | nextcloud-server-dee16deacd8a66c423d8b51ccfc23730823e4019.tar.gz nextcloud-server-dee16deacd8a66c423d8b51ccfc23730823e4019.zip | |
Merge master
Diffstat (limited to 'core')
| -rw-r--r-- | core/ajax/share.php | 6 | ||||
| -rw-r--r-- | core/css/share.css | 6 | ||||
| -rw-r--r-- | core/js/share.js | 2 | ||||
| -rw-r--r-- | core/l10n/ta_LK.php | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index 332b6a0bed8..9201b48cb95 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -185,8 +185,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo $users = array(); $limit = 0; $offset = 0; - while ($count < 4 && count($users) == $limit) { - $limit = 4 - $count; + while ($count < 15 && count($users) == $limit) { + $limit = 15 - $count; if ($sharePolicy == 'groups_only') { $users = OC_Group::DisplayNamesInGroups($groups, $_GET['search'], $limit, $offset); } else { @@ -209,7 +209,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo } $count = 0; foreach ($groups as $group) { - if ($count < 4) { + if ($count < 15) { if (stripos($group, $_GET['search']) !== false && (!isset($_GET['itemShares']) || !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) diff --git a/core/css/share.css b/core/css/share.css index 2480a571ae5..2d6849b4bb1 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -91,3 +91,9 @@ } .reshare { white-space:normal; } /* fix shared by text going out of box */ + +.ui-autocomplete { /* limit dropdown height to 4 1/2 entries */ + max-height:103px; + overflow-y:auto; + overflow-x:hidden; +} diff --git a/core/js/share.js b/core/js/share.js index 328d57928ec..145c31a86c8 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -213,7 +213,7 @@ OC.Share={ } }); } - $('#shareWith').autocomplete({minLength: 2, source: function(search, response) { + $('#shareWith').autocomplete({minLength: 1, source: function(search, response) { // if (cache[search.term]) { // response(cache[search.term]); // } else { diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php index f7ad09fbc7e..9863ca8154e 100644 --- a/core/l10n/ta_LK.php +++ b/core/l10n/ta_LK.php @@ -91,7 +91,7 @@ "Admin" => "நிர்வாகி", "Help" => "உதவி", "Access forbidden" => "அணுக தடை", -"Cloud not found" => "Cloud கண்டுப்பிடிப்படவில்லை", +"Cloud not found" => "Cloud காணப்படவில்லை", "Edit categories" => "வகைகளை தொகுக்க", "Add" => "சேர்க்க", "Security Warning" => "பாதுகாப்பு எச்சரிக்கை", |