Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEATURE: Improve User sorting behavior in user management backend module #4443

Merged
merged 7 commits into from
Feb 3, 2024
Merged

FEATURE: Improve User sorting behavior in user management backend module #4443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95b68a5
FEATURE: Improve User sorting behavior
crydotsnake Aug 4, 2023
e5386ce
TASK: use better icons
crydotsnake Dec 2, 2023
a6759df
TASK: add tooltip to headerLabels for hover titles
crydotsnake Dec 2, 2023
84eb02c
TASK: include stylesheet after rebase
crydotsnake Dec 2, 2023
20b0041
TASK: remove german translation keys
crydotsnake Dec 16, 2023
10b4754
TASK: update stylesheet after rebase and remove en translation keys i…
crydotsnake Dec 16, 2023
53da818
TASK: apply code review suggestions
crydotsnake Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Neos.Neos/Resources/Private/Styles/Modules/Administration/_Users.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.users-table thead th a:hover {
color: #{$blue}
}
1 change: 1 addition & 0 deletions Neos.Neos/Resources/Private/Styles/Modules/_Modules.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import "Administration/Configuration";
@import "Administration/Packages";
@import "Administration/Sites";
@import "Administration/Users";
@import "Management/Workspaces";
@include font;

Expand Down
12 changes: 6 additions & 6 deletions Neos.Neos/Resources/Private/Templates/Module/Administration/Users/Index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@

<f:if condition="{users}">
<f:widget.paginate objects="{users}" as="paginatedUsers">
<table class="neos-table">
<table class="neos-table users-table">
<thead>
<tr>
<th>
<th title="{neos:backend.translate(id: 'users.sortBy.fullName', source: 'Modules', package: 'Neos.Neos')}">
<f:render section="headerLabel" arguments="{sortDirection:sortDirection, sortBy:sortBy, sortingField:'name.fullName', labelIdentifier:'users.name'}" />
</th>
<th>
<th title="{neos:backend.translate(id: 'users.sortBy.accountsAndRoles', source: 'Modules', package: 'Neos.Neos')}">
<f:render section="headerLabel" arguments="{sortDirection:sortDirection, sortBy:sortBy, sortingField:'accounts.accountIdentifier', labelIdentifier:'users.accountsAndRoles'}" />
</th>
<th>
<th title="{neos:backend.translate(id: 'users.sortBy.lastLogin', source: 'Modules', package: 'Neos.Neos')}">
<f:render section="headerLabel" arguments="{sortDirection:sortDirection, sortBy:sortBy, sortingField:'accounts.lastSuccessfulAuthenticationDate', labelIdentifier:'users.lastLogin'}" />
</th>
<th>&nbsp;</th>
Expand Down Expand Up @@ -134,14 +134,14 @@
<f:then>
<f:link.action action="index" data="{neos-toggle: 'tooltip'}" arguments="{sortDirection: 'DESC', sortBy: sortingField}" addQueryString="TRUE">
<neos:backend.translate id="{labelIdentifier}" source="Modules" package="Neos.Neos"/>
<i class="fas fa-sort-amount-up"></i>
</f:link.action>
<i class="fas fa-caret-up"></i>
</f:then>
<f:else>
<f:link.action action="index" data="{neos-toggle: 'tooltip'}" arguments="{sortDirection: 'ASC', sortBy: sortingField}" addQueryString="TRUE">
<neos:backend.translate id="{labelIdentifier}" source="Modules" package="Neos.Neos"/>
<i class="fas fa-sort-amount-down"></i>
</f:link.action>
<i class="fas fa-caret-down"></i>
</f:else>
</f:if>
</f:then>
Expand Down
10 changes: 9 additions & 1 deletion Neos.Neos/Resources/Private/Translations/en/Modules.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,15 @@
<trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
<source>Work</source>
</trans-unit>

<trans-unit id="users.sortBy.fullName" xml:space="preserve">
<source>Sort by first and last name</source>
</trans-unit>
<trans-unit id="users.sortBy.accountsAndRoles" xml:space="preserve">
<source>Sort by user accounts and roles</source>
</trans-unit>
<trans-unit id="users.sortBy.lastLogin" xml:space="preserve">
<source>Sort by last login</source>
</trans-unit>
<trans-unit id="packages.label" xml:space="preserve">
<source>Package Management</source>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion Neos.Neos/Resources/Public/Styles/Lite.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Neos.Neos/Resources/Public/Styles/Lite.css.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading