Skip to content

Commit d4aa94f

Browse files
authored
Tweak selectors layout (Volume/Node) and loading indicator sizing (#1067)
NethServer/dev#7757
1 parent d87b43b commit d4aa94f

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

core/ui/public/i18n/en/translation.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,8 @@
10111011
"authors": "Author | Authors",
10121012
"source_package": "Application image",
10131013
"app_installation": "Install {app}",
1014-
"choose_node_for_installation": "Select installation node for {app} {version}:",
1014+
"choose_node_for_installation": "Select installation node for {app} {version}",
1015+
"installation_node_for_app": "Installation node for {app} {version}",
10151016
"select_node_volume_for_installation": "Select the volume on {node} to store application data",
10161017
"installing_on_node": "Installing on {node}",
10171018
"instance_installed_on_node": "{module_id} installed on {node}",
@@ -1122,7 +1123,7 @@
11221123
"migrating_app_title": "This application instance is undergoing migration",
11231124
"migrating_app_description": "You'll be able to use {name} again once the migration from NethServer 7 is complete.",
11241125
"additional_storage_available": "Additional volumes available",
1125-
"volume_usage": "{used} used of {total} ({percentage}% used)",
1126+
"volume_usage": "{available} free of {total} ({percentage}% used)",
11261127
"default_storage": "Default volume",
11271128
"no_volumes_to_restore": "No volumes to restore"
11281129
},

core/ui/src/components/nodes/NodeSelector.vue

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
<template>
66
<div class="node-selector">
77
<!-- card grid -->
8-
<div
9-
class="card-grid grid-cols-1 sm:grid-cols-2 xl:grid-cols-3 3xl:grid-cols-4"
10-
>
8+
<div class="card-grid grid-cols-1 sm:grid-cols-2 3xl:grid-cols-3">
119
<NsTile
1210
v-for="node in internalNodes"
1311
:key="node.id"
@@ -128,12 +126,13 @@ export default {
128126
129127
.icon-text-container {
130128
display: flex;
131-
align-items: center;
132-
gap: 0.5rem;
133-
line-height: 1;
129+
align-items: flex-start;
130+
gap: 0.2rem;
131+
line-height: 1.5;
134132
}
135133
136134
.icon-spacing {
137135
flex-shrink: 0;
136+
margin-bottom: 0.25rem;
138137
}
139138
</style>

core/ui/src/components/software-center/AdditionalVolumesSelector.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
:loading="loading"
5555
:warningThreshold="70"
5656
:dangerThreshold="90"
57-
:height="'10px'"
57+
:height="'5px'"
5858
:useHealthyColor="false"
5959
class="mg-bottom-lg"
6060
/>
@@ -108,6 +108,7 @@ export default {
108108
methods: {
109109
getVolumeInfo(volume) {
110110
return {
111+
available: this.$options.filters.byteFormat(volume.available),
111112
used: this.$options.filters.byteFormat(volume.used),
112113
total: this.$options.filters.byteFormat(volume.size),
113114
percentage: Math.round((volume.used / volume.size) * 100),

core/ui/src/components/software-center/InstallAppModal.vue

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,22 @@
4343
:showCloseButton="false"
4444
/>
4545
<!-- node selection -->
46-
<div>
46+
<div v-if="clusterNodesCount > 1">
4747
{{
4848
$t("software_center.choose_node_for_installation", {
4949
app: app.name,
5050
version: appVersion,
5151
})
5252
}}
5353
</div>
54+
<div v-else>
55+
{{
56+
$t("software_center.installation_node_for_app", {
57+
app: app.name,
58+
version: appVersion,
59+
})
60+
}}
61+
</div>
5462
<NsInlineNotification
5563
v-if="error.getClusterStatus"
5664
kind="error"

0 commit comments

Comments
 (0)