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 #5159

Open
wants to merge 4 commits into
base: 8.4
Choose a base branch
from
Open

FEATURE: Improve user sorting behavior #5159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d4592a
Merge pull request #4443 from crydotsnake/feature/improve-user-sort-b…
mhsdesign Feb 3, 2024
b779626
TASK: build stylesheets
crydotsnake Jun 22, 2024
1cfddd5
TASK: compile assets for production
crydotsnake Jul 2, 2024
453ac47
TASK: compile Lite.css.map again after rebase
crydotsnake Oct 5, 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 @@ -3,6 +3,7 @@
@import "Administration/Packages";
@import "Administration/Sites";
@import "Management/History";
@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 @@ -470,7 +470,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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wait a sec, this doesnt look particular light anymore ;) it seems it was not minified?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, interesting

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I compiled everything again after the rebase 🤔.

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