From e4cf53031b21f885e21301c17e757b3bbe93bf0a Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 11 Dec 2015 14:19:02 +0100
Subject: [PATCH] fix overlap and functionality of cropper

---
 settings/css/settings.css       | 17 +++++++++++++++++
 settings/js/personal.js         |  2 +-
 settings/templates/personal.php |  3 +--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index cf9a61431c9..effabd928f9 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -25,6 +25,15 @@ input#openid, input#webdav { width:20em; }
 	width: 33px;
 	height: 33px;
 }
+.jcrop-holder {
+	z-index: 500;
+}
+#avatar #cropper {
+	float: left;
+	background-color: #fff;
+	z-index: 500;
+	position: relative;
+}
 
 #displaynameform,
 #lostpassword,
@@ -40,6 +49,10 @@ input#openid, input#webdav { width:20em; }
 	margin-bottom: 0;
 	padding-bottom: 0;
 }
+#groups {
+	overflow-wrap: break-word;
+	max-width: 75%;
+}
 
 #sslCertificate tr.expired {
 	background-color: rgba(255, 0, 0, 0.5);
@@ -63,6 +76,10 @@ input#identity {
 	width: 17em;
 }
 
+#showWizard {
+	display: inline-block;
+}
+
 .msg.success {
 	color: #fff;
 	background-color: #47a447;
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 4308bb4cd4d..da74f28d70c 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -98,7 +98,7 @@ function updateAvatar (hidedefault) {
 		$('#header .avatardiv').addClass('avatardiv-shown');
 	}
 	$displaydiv.css({'background-color': ''});
-	$displaydiv.avatar(OC.currentUser, 128, true);
+	$displaydiv.avatar(OC.currentUser, 145, true);
 
 	$('#removeavatar').show();
 }
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 8afa5aa551b..2971121cda0 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -55,7 +55,7 @@
 
 	<div id="cropper" class="hidden">
 		<div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div>
-		<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div>
+		<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile picture')); ?></div>
 	</div>
 </form>
 <?php endif; ?>
@@ -210,7 +210,6 @@ if($_['passwordChangeSupported']) {
 	<?php endif; ?>
 
 	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
-	<br>
 	<a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a>
 	<?php }?>
 </div>
-- 
2.39.5