Initial Commit : User Search, Fixes Typos

diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index b770aaaf3116bbff06d034f6d087cdfc6f3c5bd4..0a79527c219f70131e97dfaa8654165338c322a0 100644 (file)
--- 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 d0a64dd6bda8e71d322edcc63c5e521bf9c75ceb..696fe01a91e2a075ac8ab2e845b15632bce96128 100644 (file)
--- 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 8107a98df0b8494abebfc0d8b3a2ac328a734dc3..c1a52ef9bee3284998731ec619a93f93527f33c0 100644 (file)
--- 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 daf0ee49e4a06bc894a029624f3a44ddcb8db3c2..89c83c3bd415ae8dd124a35d9975b337b1c7d7f0 100644 (file)
--- 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>