Skip to content

Commit

Permalink
Merge pull request #4443 from crydotsnake/feature/improve-user-sort-b…
Browse files Browse the repository at this point in the history
…ehavior

FEATURE: Improve User sorting behavior in user management backend module
  • Loading branch information
mhsdesign committed Feb 3, 2024
2 parents 0607855 + 53da818 commit d182715
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 9 deletions.
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
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
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
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

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Neos.Neos/Resources/Public/Styles/Lite.css.map

Large diffs are not rendered by default.

0 comments on commit d182715

Please sign in to comment.