From 4d5ebe61c4f88f001fef1a6b1185a7856c086c7e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 17 Jul 2014 13:13:03 +0200
Subject: [PATCH] Fixed JS and CSS issues in users page

- Renamed "delete" to "deleteEntry" to make IE8 happy.
- Added missing "svg" class for the "+" button
- Added height to "+" button but was unable to properly align it
---
 settings/css/settings.css                   | 5 +++++
 settings/js/users/deleteHandler.js          | 4 ++--
 settings/js/users/groups.js                 | 2 +-
 settings/js/users/users.js                  | 2 +-
 settings/templates/users/part.grouplist.php | 4 ++--
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 7dbaf830096..b9ce79bc3b8 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -54,6 +54,11 @@ table.nostyle td { padding: 0.2em 0; }
 	position: absolute;	left: 12px; top:-2px;
 	content: '+'; font-weight: bold; font-size: 150%;
 }
+
+.ie8 #newgroup-form .icon-add {
+	height: 30px;
+}
+
 .usercount { float: left; margin: 5px; }
 li.active span.utils .delete {
 	float: left; position: relative; opacity: 0.5;
diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index 56355317f8d..d4736d88701 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -116,7 +116,7 @@ DeleteHandler.prototype.hideNotification = function() {
  */
 DeleteHandler.prototype.mark = function(oid) {
 	if(this.oidToDelete !== false) {
-		this.delete();
+		this.deleteEntry();
 	}
 	this.oidToDelete = oid;
 	this.canceled = false;
@@ -138,7 +138,7 @@ DeleteHandler.prototype.cancel = function() {
  * OC.dialogs.alert. On success, a callback is fired so that the client can
  * update the web interface accordingly.
  */
-DeleteHandler.prototype.delete = function() {
+DeleteHandler.prototype.deleteEntry = function() {
 	if(this.canceled || this.oidToDelete === false) {
 		return false;
 	}
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index b4cf73c59f2..58f77705121 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -237,7 +237,7 @@ GroupList = {
 
 		//delete a marked user when leaving the page
 		$(window).on('beforeunload', function () {
-			GroupDeleteHandler.delete();
+			GroupDeleteHandler.deleteEntry();
 		});
 	},
 
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index ba228905a8a..9eb8f91ac7c 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -306,7 +306,7 @@ var UserList = {
 
 		//delete a marked user when leaving the page
 		$(window).on('beforeunload', function () {
-			UserDeleteHandler.delete();
+			UserDeleteHandler.deleteEntry();
 		});
 	},
 	update: function (gid) {
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index c5e85fa3534..255f2a6cf45 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -5,10 +5,10 @@
 			<span><?php p($l->t('Add Group'))?></span>
 		</a>
 	</li>
-	<li id="newgroup-form">
+	<li id="newgroup-form" style="display: none">
 		<form>
 			<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
-			<input type="submit" class="button icon-add" value="" />
+			<input type="submit" class="button icon-add svg" value="" />
 		</form>
 	</li>
 	<!-- Everyone -->