Skip to content

Improve layout for Domain Configuration and Users/Groups components #1032

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

Merged
stephdl merged 6 commits into from
Jan 27, 2026
Merged

Improve layout for Domain Configuration and Users/Groups components #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c74181
fix(layout): restructure markup for domain users and groups component
stephdl Jan 22, 2026
50a3484
fix(DomainConfiguration): add no-padding class to cv-grid for improve…
stephdl Jan 22, 2026
cbe5e5d
fix(DomainUsersAndGroups): add no-padding class to cv-tile for improv…
stephdl Jan 22, 2026
256e3a3
fix(DomainUsersAndGroups): remove unnecessary cv-tile wrapper and cle…
stephdl Jan 23, 2026
9fd3787
fix(translation): update tooltip for user admin page to clarify funct…
stephdl Jan 23, 2026
ce3078c
fix(DomainConfiguration): update button icon to Launch20 for user adm…
stephdl Jan 23, 2026
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
2 changes: 1 addition & 1 deletion core/ui/public/i18n/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,7 @@
"specify_times": "specify the number of times",
"users_admin_page_title": "User portal",
"open_users_admin_portal": "Open user portal",
"users_admin_page_tooltips": "User portal permits domain users to change their own password. The portal is accessible to users also on any node running the domain provider replica. The generic URL is https://{node_fqdn_or_ip}/users-admin/{domain}/",
"users_admin_page_tooltips": "User portal allows domain users to manage their own account, such as changing their password. The portal is accessible to users without admin privileges",
"users_admin_page_description": "User administration self service portal",
"host_format": "Must be a valid domain name or IP address",
"provider_already_installed": "Provider already installed",
Expand Down
130 changes: 66 additions & 64 deletions core/ui/src/components/domains/DomainUsersAndGroups.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,37 @@
</cv-breadcrumb>
</cv-column>
</cv-row>
<div class="flex flex-wrap items-center justify-between">
<div class="subpage-title">
<h3>
{{ domainName }}
</h3>
</div>
<div class="page-toolbar flex gap-4">
<NsButton
v-if="domain && domain.location == 'internal'"
kind="secondary"
size="field"
:icon="Export20"
@click="exportUsersData()"
class="subpage-toolbar-item"
>{{ $t("domain_users.export_data") }}
</NsButton>
<NsButton
v-if="domain && domain.location == 'internal'"
kind="secondary"
size="field"
:icon="Upload20"
@click="showImportUsersModal()"
class="subpage-toolbar-item"
>{{ $t("domain_users.import_data") }}
</NsButton>
</div>
</div>
<cv-row>
<cv-column>
<div class="flex flex-wrap items-center justify-between">
<div class="subpage-title">
<h3>
{{ domainName }}
</h3>
</div>
<div class="page-toolbar flex gap-4">
<NsButton
v-if="domain && domain.location == 'internal'"
kind="secondary"
size="field"
:icon="Export20"
@click="exportUsersData()"
class="subpage-toolbar-item"
>{{ $t("domain_users.export_data") }}
</NsButton>
<NsButton
v-if="domain && domain.location == 'internal'"
kind="secondary"
size="field"
:icon="Upload20"
@click="showImportUsersModal()"
class="subpage-toolbar-item"
>{{ $t("domain_users.import_data") }}
</NsButton>
</div>
</div>
</cv-column>
</cv-row>
<cv-row v-if="error.listUserDomains">
<cv-column>
<NsInlineNotification
Expand All @@ -70,44 +74,42 @@
</cv-row>
<cv-row>
<cv-column>
<cv-tile>
<NsTabs
:container="false"
:aria-label="$t('common.tab_navigation')"
:noDefaultToFirst="true"
@tab-selected="tabSelected"
<NsTabs
:container="false"
:aria-label="$t('common.tab_navigation')"
:noDefaultToFirst="true"
@tab-selected="tabSelected"
>
<cv-tab
id="tab-1"
:label="$t('domain_users.users')"
:selected="q.view === 'users'"
>
<DomainUsers
:domain="domain"
:groups="groups"
@usersLoaded="onUsersLoaded"
/>
</cv-tab>
<cv-tab
id="tab-2"
:label="$t('domain_users.groups')"
:selected="q.view === 'groups'"
>
<DomainGroups
:domain="domain"
:users="users"
@groupsLoaded="onGroupsLoaded"
/>
</cv-tab>
<cv-tab
id="tab-3"
:label="$t('domain_configuration.configuration')"
:selected="q.view === 'configuration'"
>
<cv-tab
id="tab-1"
:label="$t('domain_users.users')"
:selected="q.view === 'users'"
>
<DomainUsers
:domain="domain"
:groups="groups"
@usersLoaded="onUsersLoaded"
/>
</cv-tab>
<cv-tab
id="tab-2"
:label="$t('domain_users.groups')"
:selected="q.view === 'groups'"
>
<DomainGroups
:domain="domain"
:users="users"
@groupsLoaded="onGroupsLoaded"
/>
</cv-tab>
<cv-tab
id="tab-3"
:label="$t('domain_configuration.configuration')"
:selected="q.view === 'configuration'"
>
<DomainConfiguration :domainName="domainName" />
</cv-tab>
</NsTabs>
</cv-tile>
<DomainConfiguration :domainName="domainName" />
</cv-tab>
</NsTabs>
</cv-column>
</cv-row>
</cv-grid>
Expand Down
4 changes: 2 additions & 2 deletions core/ui/src/views/DomainConfiguration.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
-->
<template>
<div>
<cv-grid fullWidth>
<cv-grid fullWidth class="no-padding">
<cv-row>
<!-- domain settings -->
<cv-column>
Expand Down Expand Up @@ -230,7 +230,7 @@
<NsButton
v-show="!loading.getFqdn"
kind="ghost"
:icon="Password20"
:icon="Launch20"
@click="goToUserAdminPage()"
>
{{ $t("domains.open_users_admin_portal") }}
Expand Down