From 9c7533ff6b5d8c38f5b1aeb9bc91504a0934df56 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Mon, 31 Oct 2016 11:53:37 +0100
Subject: [PATCH] fix profile picture fed sharing scope menu

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 settings/css/settings.css             |  8 ++++++--
 settings/js/federationsettingsview.js | 12 ++++++------
 settings/templates/personal.php       |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 3183355ac90..887d2beb7b8 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -83,7 +83,11 @@ input#openid, input#webdav { width:20em; }
 	min-width: 200px;
 }
 #avatarform > h2 span,
-#personal-settings-container > div h2 span[class^="icon-"] {
+#personal-settings-container > div h2 {
+	position: relative;
+}
+#personal-settings-container > div h2 span[class^="icon-"],
+#personal-settings-avatar-container h2 span[class^="icon-"] {
 	display: inline-block;
 	margin-left: 5px;
 	background-size: 110%;
@@ -102,7 +106,7 @@ input#openid, input#webdav { width:20em; }
 	pointer-events: none;
 }
 .federationScopeMenu {
-	top: 66px;
+	top: 44px;
 }
 .federationScopeMenu.bubble::after {
 	left: 45px;
diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js
index 9921ff64691..73b9f857558 100644
--- a/settings/js/federationsettingsview.js
+++ b/settings/js/federationsettingsview.js
@@ -1,4 +1,4 @@
-/* global OC, result */
+/* global OC, result, _ */
 
 /**
  * Copyright (c) 2016, Christoph Wurst <christoph@owncloud.com>
@@ -7,7 +7,7 @@
  * See the COPYING-README file.
  */
 
-(function() {
+(function(_, $, OC) {
 	'use strict';
 
 	var FederationSettingsView = OC.Backbone.View.extend({
@@ -46,11 +46,11 @@
 
 				// Set inputs whenever model values change
 				if (!scopeOnly) {
-					self.listenTo(self._config, 'change:' + field, function () {
+					self.listenTo(self._config, 'change:' + field, function() {
 						self.$('#' + field).val(self._config.get(field));
 					});
 				}
-				self.listenTo(self._config, 'change:' + field + 'Scope', function () {
+				self.listenTo(self._config, 'change:' + field + 'Scope', function() {
 					self._setFieldScopeIcon(field, self._config.get(field + 'Scope'));
 				});
 			});
@@ -118,7 +118,7 @@
 			// update displayName on the top right expand button
 			$('#expandDisplayName').text(displayName);
 			// update avatar if avatar is available
-			if(!$('#removeavatar').hasClass('hidden')) {
+			if (!$('#removeavatar').hasClass('hidden')) {
 				updateAvatar();
 			}
 		},
@@ -159,4 +159,4 @@
 
 	OC.Settings = OC.Settings || {};
 	OC.Settings.FederationSettingsView = FederationSettingsView;
-})();
\ No newline at end of file
+})(_, $, OC);
\ No newline at end of file
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index d1eebe1aacd..2db0cfa4882 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -38,7 +38,7 @@
 	<form id="avatarform" class="section" method="post" action="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.postAvatar')); ?>">
 		<h2>
 			<label><?php p($l->t('Profile picture')); ?></label>
-			<span class="icon-loading"/>
+			<span class="icon-password"/>
 		</h2>
 		<div id="displayavatar">
 			<div class="avatardiv"></div>
-- 
2.39.5