Merge pull request #7151 from owncloud/user-jquery

Continuing the New User management

1 files changed, 40 insertions, 2 deletions

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 10d740c81b7..b67c88a9c8f 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -5,6 +5,13 @@
 select#languageinput, select#timezone { width:15em; }
 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;
+	padding: 0; margin: 0;
+	background: #eee; border-bottom: 1px solid #e7e7e7;
+	z-index: 50;
+}
 
 /* PERSONAL */
 #rootcert_import {
@@ -44,7 +51,37 @@ table.nostyle label { margin-right: 2em; }
 table.nostyle td { padding: 0.2em 0; }
 
 /* USERS */
+#newgroup-init a span { margin-left: 20px; }
+#newgroup-init a span:before {
+	position: absolute;	left: 12px; top:-2px;
+	content: '+'; font-weight: bold; font-size: 150%;
+}
+.usercount { float: left; margin: 5px; }
+li.active span.utils .delete {
+	float: left; position: relative; opacity: 0.5;
+	top: -7px; left: 7px; width: 44px; height: 44px;
+}
+li.active .rename {
+	padding: 8px 14px 20px 14px;
+	top: 0px; position: absolute; width: 16px; height: 16px;
+	opacity: 0.5;
+	display: inline-block !important;
+}
+li.active span.utils .delete img { margin: 14px; }
+li.active .rename { opacity: 0.5; }
+li.active span.utils .delete:hover, li.active .rename:hover { opacity: 1; }
+span.utils .delete, .rename { display: none; }
+#app-navigation ul li.active > span.utils .delete,
+#app-navigation ul li.active > span.utils .rename { display: block; }
+#usersearchform { position: absolute; top: 4px; right: 10px; }
+#usersearchform label { font-weight: 700; }
 form { display:inline; }
+
+/* display table at full width */
+table.grid {
+	width: 100%;
+}
+
 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; }
 td.name, td.password { padding-left:.8em; }
@@ -57,9 +94,8 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point
 tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
 tr:hover>td.remove>a { float:right; }
 
-table.grid { width:100%; }
 div.quota {
-	float: right;
+	margin: 10px;
 	display: block;
 }
 div.quota-select-wrapper { position: relative; }
@@ -78,6 +114,8 @@ div.quota>span {
 }
 select.quota.active { background: #fff; }
 
+input.userFilter {width: 200px;}
+
 /* positioning fixes */
 #newuser .multiselect {
 	min-width: 150px !important;