wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix profile picture fed sharing scope menu

Browse source 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2016-10-31 11:53:37 +01:00 committed by Roeland Jago Douma
parent 51b5f2754d
commit 9c7533ff6b
No known key found for this signature in database
GPG key ID: F941078878347C0C
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
settings/css/settings.css
View file

@ -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;

12
settings/js/federationsettingsview.js
View file

@ -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;
})();
})(_, $, OC);

2
settings/templates/personal.php
View file

@ -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>