diff options
| author | raghunayyar <me@iraghu.com> | 2014-02-12 11:00:10 +0530 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-02 12:52:53 +0200 |
| commit | c7af9cd6dd81072cf686ec123322c4241322bf73 (patch) | |
| tree | 5038f6dc3df76949610f2bdb31c2ca9b3ee3a1e3 | |
| parent | 223e342664d5436f25d49fe4c754d4d5f5a4c832 (diff) | |
| download | nextcloud-server-c7af9cd6dd81072cf686ec123322c4241322bf73.tar.gz nextcloud-server-c7af9cd6dd81072cf686ec123322c4241322bf73.zip | |
Initial Commit : User Search, Fixes Typos
| -rw-r--r-- | settings/ajax/creategroup.php | 2 | ||||
| -rw-r--r-- | settings/css/settings.css | 4 | ||||
| -rw-r--r-- | settings/js/users.js | 11 | ||||
| -rw-r--r-- | settings/templates/users.php | 6 |
4 files changed, 20 insertions, 3 deletions
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php index b770aaaf311..0a79527c219 100644 --- a/settings/ajax/creategroup.php +++ b/settings/ajax/creategroup.php @@ -7,7 +7,7 @@ $groupname = $_POST["groupname"]; // Does the group exist? if( in_array( $groupname, OC_Group::getGroups())) { - OC_JSON::error(array("data" => array( "message" => $l->t("Unable to add group") ))); + OC_JSON::error(array("data" => array( "message" => $l->t("Group already exists") ))); exit(); } diff --git a/settings/css/settings.css b/settings/css/settings.css index d0a64dd6bda..696fe01a91e 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -7,7 +7,7 @@ input#openid, input#webdav { width:20em; } #user-controls { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; - position: fixed; right: 0; left:380px; height: 44px; width: 100%; + position: fixed; right: 0; left:380px; height: 44px; padding: 0; margin: 0; background: #eee; border-bottom: 1px solid #e7e7e7; z-index: 50; @@ -57,6 +57,8 @@ span.utils .delete { margin: 3px; top: 4px; } #app-navigation ul li:hover > span.utils .delete { display: block; } +#usersearchform { position: absolute; top: 4px; right: 10px; } +#usersearchform label { font-weight: 700; } form { display:inline; } table.grid th { height:2em; color:#999; } table.grid th, table.grid td { border-bottom:1px solid #ddd; padding:0 .5em; padding-left:.8em; text-align:left; font-weight:normal; } diff --git a/settings/js/users.js b/settings/js/users.js index 8107a98df0b..c1a52ef9bee 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -620,6 +620,17 @@ $(document).ready(function () { } ) }); + // Implements User Search + $('#usersearchform input').keyup(function() { + var inputVal = $(this).val(); + $('table tbody tr td.name').each(function() { + if ($('table tbody tr').text().search(new RegExp(inputVal, "i")) < 0) { + $('table tbody tr').fadeOut(); + } else { + $('table tbody tr').show(); + } + }); + }); // Handle undo notifications OC.Notification.hide(); diff --git a/settings/templates/users.php b/settings/templates/users.php index daf0ee49e4a..89c83c3bd41 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -44,7 +44,7 @@ $_['subadmingroups'] = array_flip($items); <!-- Default storage --> <div class="app-settings"> <div class="quota"> - <span><?php p($l->t('Default Storage'));?></span> + <span><?php p($l->t('Default Quota'));?></span> <?php if((bool) $_['isadmin']): ?> <select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>"> <option @@ -106,6 +106,10 @@ $_['subadmingroups'] = array_flip($items); alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/> </div> <?php endif; ?> + <form autocomplete="off" id="usersearchform"> + <label><?php p($l->t( 'Search' )); ?></label> + <input type="text" class="input" /> + </form> </div> <table class="hascontrols grid" data-groups="<?php p(json_encode($allGroups));?>"> <thead> |