web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix useradmin dropdown position

Browse Source
This commit is contained in:
yflory
2017-07-10 12:38:54 +02:00
parent 97d8d86395
commit e6188bfb63
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
customize.dist/header.js
View File

@@ -34,7 +34,8 @@ define([
// User admin menu // User admin menu
var $userMenu = $('#user-menu'); var $userMenu = $('#user-menu');
var userMenuCfg = { var userMenuCfg = {
$initBlock: $userMenu $initBlock: $userMenu,
'static': true
}; };
var $userAdmin = Cryptpad.createUserAdminMenu(userMenuCfg); var $userAdmin = Cryptpad.createUserAdminMenu(userMenuCfg);
$userAdmin.find('button').addClass('btn').addClass('btn-secondary'); $userAdmin.find('button').addClass('btn').addClass('btn-secondary');

2
customize.dist/src/less/mixins.less
View File

@@ -42,7 +42,7 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 16px; font-size: 16px;
display: inline-flex; display: flex;
align-items: center; align-items: center;
&.clickable { &.clickable {
cursor: pointer; cursor: pointer;

12
www/common/cryptpad-common.js
View File

@@ -1657,7 +1657,7 @@ define([
//var $userbig = $('<span>', {'class': 'big'}).append($displayedName.clone()); //var $userbig = $('<span>', {'class': 'big'}).append($displayedName.clone());
var $userButton = $('<div>').append($icon);//.append($userbig); var $userButton = $('<div>').append($icon);//.append($userbig);
if (account) { if (account) {
$userButton = $('<div>');//.append(accountName.slice(0,1).toUpperCase()); $userButton = $('<div>').append(accountName);
} }
/*if (account && config.displayNameCls) { /*if (account && config.displayNameCls) {
$userbig.append($('<span>', {'class': 'account-name'}).text('(' + accountName + ')')); $userbig.append($('<span>', {'class': 'account-name'}).text('(' + accountName + ')'));
@@ -1674,15 +1674,19 @@ define([
}; };
var $userAdmin = createDropdown(dropdownConfigUser); var $userAdmin = createDropdown(dropdownConfigUser);
if (account) { if (account && !config.static && store) {
var $avatar = $userAdmin.find('.buttonTitle'); var $avatar = $userAdmin.find('.buttonTitle');
var url = store ? store.getProfile().avatar : undefined; var updateButton = function (newName) {
var url = store.getProfile().avatar;
$avatar.html(''); $avatar.html('');
common.displayAvatar($avatar, url, accountName, function ($img) { common.displayAvatar($avatar, url, newName, function ($img) {
if ($img) { if ($img) {
$userAdmin.find('button').addClass('avatar'); $userAdmin.find('button').addClass('avatar');
} }
}); });
};
common.onDisplayNameChanged(updateButton);
updateButton(common.getDisplayName());
} }
$userAdmin.find('a.logout').click(function () { $userAdmin.find('a.logout').click(function () {

3
www/profile/main.js
View File

@@ -500,7 +500,8 @@ define([
// User admin menu // User admin menu
var $userMenu = $('#user-menu'); var $userMenu = $('#user-menu');
var userMenuCfg = { var userMenuCfg = {
$initBlock: $userMenu $initBlock: $userMenu,
'static': true
}; };
var $userAdmin = Cryptpad.createUserAdminMenu(userMenuCfg); var $userAdmin = Cryptpad.createUserAdminMenu(userMenuCfg);
$userAdmin.find('button').addClass('btn').addClass('btn-secondary'); $userAdmin.find('button').addClass('btn').addClass('btn-secondary');

2
www/settings/main.js
View File

@@ -13,8 +13,6 @@ define([
], function ($, Cryptpad, Crypt, Merge) { ], function ($, Cryptpad, Crypt, Merge) {
var saveAs = window.saveAs; var saveAs = window.saveAs;
console.log("wut");
var USERNAME_KEY = 'cryptpad.username'; var USERNAME_KEY = 'cryptpad.username';
var APP = window.APP = { var APP = window.APP = {