The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-12 19:49:59 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/button-settings-text-overflow' into staging

Browse Source
This commit is contained in:
yflory 2026-05-06 13:17:51 +02:00
commit e39a1099d9
5 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
customize.dist/src/less2/include/sidebar-layout.less
View File

@ -46,6 +46,14 @@
.cp-sidebarlayout-category {
display: flex;
align-items: center;
white-space: nowrap;
svg {
flex: 0 0 auto;
}
.cp-sidebarlayout-category-name {
overflow: hidden;
text-overflow: ellipsis;
}
.leftside-menu-category_main();
box-shadow: @cryptpad_ui_shadow;
&:focus-visible {

6
www/common/inner/sidebar-layout.js
View File

@ -370,15 +370,17 @@ define([
Object.keys(categories).forEach(function (key, i) {
if (!active && !i) { active = key; }
var category = categories[key];
var name = category.name || Messages[`${app}_cat_${key}`] || key;
var icon;
if (category.icon) { icon = Icons.get(category.icon); }
var item = h('li.cp-sidebarlayout-category', {
'role': 'menuitem',
'tabindex': 0,
'data-category': key
'data-category': key,
'aria-label': name
}, [
icon,
category.name || Messages[`${app}_cat_${key}`] || key,
h('span.cp-sidebarlayout-category-name', name),
]);
var $item = $(item).appendTo(container);
Util.onClickEnter($item, function () {

5
www/notifications/inner.js
View File

@ -218,7 +218,8 @@ define([
var active = privateData.category || 'all';
common.setHash(active);
Object.keys(categories).forEach(function (key) {
var $category = $('<div>', {'class': 'cp-sidebarlayout-category', 'tabindex': 0, 'role': 'menuitem'}).appendTo($categories);
var name = Messages['notifications_cat_'+key] || key;
var $category = $('<div>', {'class': 'cp-sidebarlayout-category', 'tabindex': 0, 'role': 'menuitem', 'aria-label': name}).appendTo($categories);
if (key === 'all') { $category.append($(Icons.get('all'))); }
if (key === 'friends') { $category.append($(Icons.get('contacts-book'))); }
if (key === 'pads') { $category.append($(Icons.get('file-pad'))); }
@ -245,7 +246,7 @@ define([
showCategories(categories[key]);
});
$category.append(Messages['notifications_cat_'+key] || key);
$category.append(h('span.cp-sidebarlayout-category-name', name));
});
showCategories(categories[active]);
};

8
www/settings/inner.js
View File

@ -2053,7 +2053,7 @@ define([
Messages.settings_cat_notifications = Messages.notificationsPage;
Messages.settings_cat_profile = Messages.profileButton;
var createLeftside = function() {
var $categories = $('<div>', { 'class': 'cp-sidebarlayout-categories' })
var $categories = $('<div>', { 'class': 'cp-sidebarlayout-categories', 'role': 'menu'})
.appendTo(APP.$leftside);
APP.$usage = $('<div>', { 'class': 'usage' }).appendTo(APP.$leftside);
var active = privateData.category || 'account';
@ -2068,11 +2068,13 @@ define([
let name = SIDEBAR_NAMES[key] ||
Messages['settings_cat_' + key] || key;
var $category = $(h('div.cp-sidebarlayout-category', {
'role': 'menuitem',
'tabindex': 0,
'data-category': key
'data-category': key,
'aria-label': name
}, [
icon,
name,
h('span.cp-sidebarlayout-category-name', name),
])).appendTo($categories);

9
www/support/inner.js
View File

@ -296,7 +296,7 @@ define([
};
var createLeftside = function () {
var $categories = $('<div>', {'class': 'cp-sidebarlayout-categories'})
var $categories = $('<div>', {'class': 'cp-sidebarlayout-categories', 'role': 'menu'})
.appendTo(APP.$leftside);
var metadataMgr = common.getMetadataMgr();
var privateData = metadataMgr.getPrivateData();
@ -304,10 +304,13 @@ define([
if (!categories[active]) { active = 'tickets'; }
common.setHash(active);
Object.keys(categories).forEach(function (key) {
var name = Messages['support_cat_'+key] || key;
var $category = $('<div>', {
'class': 'cp-sidebarlayout-category',
'data-category': key,
'tabindex': 0
'tabindex': 0,
'role': 'menuitem',
'aria-label': name
}).appendTo($categories);
var iconClass = icons[key];
if (iconClass) {
@ -329,7 +332,7 @@ define([
showCategories(categories[key]);
});
$category.append(Messages['support_cat_'+key] || key);
$category.append(h('span.cp-sidebarlayout-category-name', name));
});
showCategories(categories[active]);
};