diff --git a/app/assets/css/bootstrap-override.css b/app/assets/css/bootstrap-override.css index 98858edbf..b2ea5c00f 100644 --- a/app/assets/css/bootstrap-override.css +++ b/app/assets/css/bootstrap-override.css @@ -326,3 +326,21 @@ input:checked + .slider:before { .control-label { @apply inline-flex items-center; } + +.progress { + height: 8px; + border-radius: 4px; + width: 50%; + display: inline-block; + margin-bottom: 0; +} + +.progress .progress-bar { + background-color: var(--ui-blue-8); +} + +.progress + span { + display: inline-block; + font-size: 85%; + margin-left: 10px; +} diff --git a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html index c2a2e74dc..3116cafb1 100644 --- a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html +++ b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html @@ -2,10 +2,28 @@
-
{{ $ctrl.titleText }}
+
+
+ +
+ + {{ $ctrl.titleText }} + +
+
+ + +
- Table settings +
Table settings
@@ -25,7 +43,7 @@ - +
@@ -38,76 +56,81 @@
-
- - -
@@ -140,11 +163,13 @@ ui-sref="kubernetes.applications.application.stats({ pod: item.PodName, container: item.Name })" style="margin-right: 10px" > - Stats + Stats + + + Logs - Logs - Console + Console diff --git a/app/kubernetes/components/datatables/events-datatable/eventsDatatable.html b/app/kubernetes/components/datatables/events-datatable/eventsDatatable.html index 939bc9e88..90ef0ecf8 100644 --- a/app/kubernetes/components/datatables/events-datatable/eventsDatatable.html +++ b/app/kubernetes/components/datatables/events-datatable/eventsDatatable.html @@ -1,134 +1,140 @@
- - -
-
{{ $ctrl.titleText }}
-
- - Table settings -
-
-
Table settings
-
-
-
- - -
-
- - - - - -
-
+
+
+
+ +
+ + {{ $ctrl.titleText }} + +
+
+ + +
+
+ + +
+
+
Table settings
+
+
+
+ +
-
- Close +
+ + + + +
- +
+ Close +
+
-
-
- - -
-
-
- - Pod - - - + - - Name - - - + - - Image - - - + - - Image Pull Policy - - - + - - Status - - - + - - Node - - - + - - Pod IP - - - + - - Creation date - - - + Actions
- - - - - - - - - - - - - - - - - - - - - - -
- - Date - - - - - - Kind - - - - - - Type - - - - - - Message - - - -
{{ item.Date | getisodate }}{{ item.Involved.kind }}{{ item.Type }}{{ item.Message }}
Loading...
No event available.
-
-
-
{{ $ctrl.state.selectedItemCount }} item(s) selected
-
-
- - Items per page - - - -
-
-
- - + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + +
{{ item.Date | getisodate }}{{ item.Involved.kind }}{{ item.Type }}{{ item.Message }}
Loading...
No event available.
+
+
+
{{ $ctrl.state.selectedItemCount }} item(s) selected
+
+
+ + Items per page + + + +
+
+
diff --git a/app/kubernetes/components/resource-reservation/resourceReservation.html b/app/kubernetes/components/resource-reservation/resourceReservation.html index 3ca7cb3ac..7f2bae79c 100644 --- a/app/kubernetes/components/resource-reservation/resourceReservation.html +++ b/app/kubernetes/components/resource-reservation/resourceReservation.html @@ -15,33 +15,29 @@ value="$ctrl.memoryReservationPercent" type="{{ $ctrl.memoryReservationPercent | kubernetesUsageLevelInfo }}" data-cy="k8sNamespaceDetail-memoryUsage" - > - {{ $ctrl.memoryReservation }} / {{ $ctrl.memoryLimit }} MB - {{ $ctrl.memoryReservationPercent }}% - + > + {{ $ctrl.memoryReservation }} / {{ $ctrl.memoryLimit }} MB - {{ $ctrl.memoryReservationPercent }}%
- - {{ $ctrl.memoryUsage }} / {{ $ctrl.memoryLimit }} MB - {{ $ctrl.memoryUsagePercent }}% - + + {{ $ctrl.memoryUsage }} / {{ $ctrl.memoryLimit }} MB - {{ $ctrl.memoryUsagePercent }}%
- - {{ $ctrl.cpuReservation | kubernetesApplicationCPUValue }} / {{ $ctrl.cpuLimit }} - {{ $ctrl.cpuReservationPercent }}% - + + {{ $ctrl.cpuReservation | kubernetesApplicationCPUValue }} / {{ $ctrl.cpuLimit }} - {{ $ctrl.cpuReservationPercent }}%
- - {{ $ctrl.cpuUsage | kubernetesApplicationCPUValue }} / {{ $ctrl.cpuLimit }} - {{ $ctrl.cpuUsagePercent }}% - + + {{ $ctrl.cpuUsage | kubernetesApplicationCPUValue }} / {{ $ctrl.cpuLimit }} - {{ $ctrl.cpuUsagePercent }}%
diff --git a/app/kubernetes/components/yaml-inspector/yamlInspector.html b/app/kubernetes/components/yaml-inspector/yamlInspector.html index b0c524950..f02907fdb 100644 --- a/app/kubernetes/components/yaml-inspector/yamlInspector.html +++ b/app/kubernetes/components/yaml-inspector/yamlInspector.html @@ -1,10 +1,17 @@
- Copy to clipboard - - {{ $ctrl.expanded ? 'Collapse' : 'Expand' }} - + + + Copy to clipboard + + + + + {{ $ctrl.expanded ? 'Collapse' : 'Expand' }} + +
diff --git a/app/kubernetes/views/applications/console/console.html b/app/kubernetes/views/applications/console/console.html index a45d70b86..3515f2bbd 100644 --- a/app/kubernetes/views/applications/console/console.html +++ b/app/kubernetes/views/applications/console/console.html @@ -35,10 +35,10 @@
Console
- -
+ +
- +
-
+
- Application + Application
@@ -79,25 +79,29 @@ @@ -400,7 +403,7 @@ - + @@ -422,10 +428,13 @@ -
Data persistence
+
+ + Data persistence +
- + This application has no persisted folders.
@@ -448,7 +457,7 @@ @@ -470,7 +479,7 @@ @@ -501,7 +510,7 @@
- - -
-
{{ $ctrl.titleText }}
-
- - Table settings -
-
-
Table settings
-
-
-
- - -
-
- - - - - -
-
+
+
+
+ +
+ + {{ $ctrl.titleText }} + +
+
+ + +
+
+ + +
+
+
Table settings
+
+
+
+ +
-
- Close +
+ + + + +
- +
+ Close +
+
-
-
- - -
-
-
Creation - - {{ ctrl.application.ApplicationOwner }} + + {{ ctrl.application.ApplicationOwner }} + + {{ ctrl.application.CreationDate | getisodate }} + + Deployed from {{ ctrl.state.appType }} - {{ ctrl.application.CreationDate | getisodate }} - - Deployed from {{ ctrl.state.appType }}
-
- Note - + + +
@@ -152,14 +156,14 @@ - Placement -
- + Placement +
+ warning
-
- +
+ The placement component helps you understand whether or not this application can be deployed on a specific node.
- Events -
- + Events +
+ {{ ctrl.state.eventWarningCount }} warning(s)
@@ -195,7 +199,7 @@ - YAML + YAML
@@ -214,70 +218,66 @@ - Create template from application + Create template from application
-
Accessing the application
+
Accessing the application
- - This application is not exposing any port. + This application is not exposing any port.
-

- - This application is exposed through service(s) as below: -

+

This application is exposed through service(s) as below:

@@ -295,10 +295,10 @@
-
Auto-scaling
+
Auto-scaling
- + This application does not have an autoscaling policy defined.
@@ -327,10 +327,13 @@ -
Configuration
+
+ + Configuration +
- + This application is not using any environment variable or configuration.
@@ -346,7 +349,7 @@
{{ container.Name }} {{ envvar.valueFrom.fieldRef.fieldPath }} ( {{ envvar.valueFrom.fieldRef.fieldPath }} (init container {{ envvar.value }} {{ envvar.valueFrom.configMapKeyRef.key }}{{ envvar.valueFrom.configMapKeyRef.key }} {{ envvar.valueFrom.secretKeyRef.key }}{{ envvar.valueFrom.secretKeyRef.key }} {{ envvar.valueFrom.fieldRef.fieldPath }} ( {{ envvar.valueFrom.fieldRef.fieldPath }} (downward API- {{ envvar.valueFrom.configMapKeyRef.name }}{{ envvar.valueFrom.configMapKeyRef.name }} {{ envvar.valueFrom.secretKeyRef.name }}{{ envvar.valueFrom.secretKeyRef.name }} {{ container.Name }} {{ envvar.valueFrom.fieldRef.fieldPath }} ( {{ envvar.valueFrom.fieldRef.fieldPath }} (init container {{ volume.fileMountPath }} {{ volume.configurationKey ? volume.configurationKey : '-' }} + + {{ volume.configurationKey ? volume.configurationKey : '-' }} + {{ volume.configurationName }}{{ volume.configurationName }}
{{ volume.PersistentVolumeClaimName }}{{ volume.PersistentVolumeClaimName }} {{ volume.HostPath }} on host filesystem {{ container.Name }} {{ envvar.valueFrom.fieldRef.fieldPath }} ( {{ envvar.valueFrom.fieldRef.fieldPath }} (init container - {{ volume.PersistentVolumeClaimName + '-' + container.PodName }}{{ volume.PersistentVolumeClaimName + '-' + container.PodName }} {{ volume.HostPath }} on host filesystem
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - Node - - - -
- - - - - - - {{ item.Name }} -
- This application is missing a toleration for the taint {{ taint.Key }}{{ taint.Value ? '=' + taint.Value : '' }}:{{ taint.Effect }} -
Placement constraint not respected for that node.
- This application can only be scheduled on a node where the label {{ label.key }} is set to {{ label.value }} -
Placement label not respected for that node.
This application can only be scheduled on nodes respecting one of the following labels combination:
- - {{ term.key }} {{ term.operator }} {{ term.values | kubernetesApplicationConstraintNodeAffinityValue: term.operator }} - - {{ $last ? '' : ' + ' }} -
Loading...
No node available.
-
-
-
{{ $ctrl.state.selectedItemCount }} item(s) selected
-
- - - Items per page - - - - -
-
- - + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + + + {{ item.Name }} +
+ This application is missing a toleration for the taint {{ taint.Key }}{{ taint.Value ? '=' + taint.Value : '' }}:{{ taint.Effect }} +
Placement constraint not respected for that node.
+ This application can only be scheduled on a node where the label {{ label.key }} is set to {{ label.value }} +
Placement label not respected for that node.
This application can only be scheduled on nodes respecting one of the following labels combination:
+ + {{ term.key }} {{ term.operator }} {{ term.values | kubernetesApplicationConstraintNodeAffinityValue: term.operator }} + + {{ $last ? '' : ' + ' }} +
Loading...
No node available.
+
+
+
{{ $ctrl.state.selectedItemCount }} item(s) selected
+
+
+ + Items per page + + + +
+
+
diff --git a/app/kubernetes/views/applications/logs/logs.html b/app/kubernetes/views/applications/logs/logs.html index c1bc9a203..be7921653 100644 --- a/app/kubernetes/views/applications/logs/logs.html +++ b/app/kubernetes/views/applications/logs/logs.html @@ -31,23 +31,21 @@
-
+
Actions
-
- - -
+ +
- -
+ +
- +
diff --git a/app/kubernetes/views/kubernetes.css b/app/kubernetes/views/kubernetes.css index 4ac609dcd..de5aefd17 100644 --- a/app/kubernetes/views/kubernetes.css +++ b/app/kubernetes/views/kubernetes.css @@ -9,3 +9,15 @@ .service-form .clear-both { clear: both; } + +.service-form .form-group { + vertical-align: top; +} + +.service-form .form-group .input-group { + width: 100%; +} + +.service-form .clear-both { + clear: both; +} diff --git a/app/portainer/services/modal.service/confirm.ts b/app/portainer/services/modal.service/confirm.ts index 4f80c859a..a1aba183d 100644 --- a/app/portainer/services/modal.service/confirm.ts +++ b/app/portainer/services/modal.service/confirm.ts @@ -161,7 +161,7 @@ export function confirmUpdate(message: string, callback: ConfirmCallback) { buttons: { confirm: { label: 'Update', - className: 'btn-warning', + className: 'btn-primary', }, }, callback, diff --git a/app/portainer/services/modal.service/utils.ts b/app/portainer/services/modal.service/utils.ts index 2f6e72357..7fb92bfd4 100644 --- a/app/portainer/services/modal.service/utils.ts +++ b/app/portainer/services/modal.service/utils.ts @@ -22,6 +22,7 @@ export function confirmButtons(options: ButtonsOptions) { options.cancel && options.cancel.label ? sanitize(options.cancel.label) : 'Cancel', + className: 'btn-default', }, }; }