github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(kube): change warning text colour to match figma styling [EE-3045] (#7582) 

* update warning text colour, icon and alignment to match figma
pull/6864/merge
Matt Hook 2022-09-15 11:09:19 +12:00 committed by GitHub
parent d570aee554
commit 7accdf704c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 467 additions and 454 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/css/app.css
View File

@ -169,7 +169,7 @@ input[type='checkbox'] {
} }
.text-warning { .text-warning {
color: #f0ad4e; @apply text-warning-9 th-dark:text-warning-7 th-highcontrast:text-warning-1;
} }
.widget .widget-body table tbody .image-tag { .widget .widget-body table tbody .image-tag {

2
app/assets/css/bootstrap-override.css
View File

@ -352,7 +352,7 @@ input:checked + .slider:before {
} }
.table .label .label-warn { .table .label .label-warn {
background-color: var(--ui-warning-8); background-color: var(--ui-warning-9);
} }
.table .label .label-success { .table .label .label-success {

4
app/assets/css/icon.css
View File

@ -67,11 +67,11 @@ pr-icon {
.icon-warning, .icon-warning,
.icon-orange { .icon-orange {
color: var(--ui-warning-8); @apply text-warning-9 th-dark:text-warning-7 th-highcontrast:text-warning-1;
} }
.icon.icon-warning-alt { .icon.icon-warning-alt {
fill: var(--ui-warning-8); fill: var(--ui-warning-9);
stroke: var(--white-color); stroke: var(--white-color);
} }

2
app/docker/components/imageRegistry/por-image-registry.html
View File

@ -61,7 +61,7 @@
<div class="small"> <div class="small">
<div class="col-sm-3 col-lg-2"></div> <div class="col-sm-3 col-lg-2"></div>
<div class="col-sm-8" ng-messages="$ctrl.form.image_name.$error"> <div class="col-sm-8" ng-messages="$ctrl.form.image_name.$error">
<p class="text-muted vertical-center" ng-message="required"> <p class="text-warning vertical-center" ng-message="required">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true" class="vertical-center"></pr-icon> Image name is required. <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true" class="vertical-center"></pr-icon> Image name is required.
<span ng-if="$ctrl.canPull">Tag must be specified otherwise Portainer will pull all tags associated to the image.</span> <span ng-if="$ctrl.canPull">Tag must be specified otherwise Portainer will pull all tags associated to the image.</span>
</p> </p>

47
app/edge/components/edge-job-form/edgeJobForm.html
View File

@ -15,20 +15,21 @@
required required
auto-focus auto-focus
/> />
</div> <div class="help-block" ng-show="edgeJobForm.edgejob_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="edgeJobForm.edgejob_name.$invalid"> <div ng-messages="edgeJobForm.edgejob_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="edgeJobForm.edgejob_name.$error"> <span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span> This field is required.
<p ng-message="required" class="vertical-center"> </p>
<span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span> This field is required. <p ng-message="pattern" class="vertical-center">
</p> <span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span> Allowed characters are: [a-zA-Z0-9_.-]
<p ng-message="pattern" class="vertical-center"> </p>
<span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span> Allowed characters are: [a-zA-Z0-9_.-] </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- !name-input --> <!-- !name-input -->
<!-- cron-input --> <!-- cron-input -->
<!-- edge-job-method-select --> <!-- edge-job-method-select -->
@ -132,20 +133,20 @@
required required
ng-pattern="$ctrl.cronRegex" ng-pattern="$ctrl.cronRegex"
/> />
</div> <div class="help-block" ng-show="edgeJobForm.edgejob_cron.$invalid && edgeJobForm.edgejob_cron.$dirty">
<div class="col-sm-12 small text-muted mt-2.5"> Time should be set according to the chosen environments' timezone. </div> <div class="small text-warning">
</div> <div ng-messages="edgeJobForm.edgejob_cron.$error">
<div class="form-group" ng-show="edgeJobForm.edgejob_cron.$invalid && edgeJobForm.edgejob_cron.$dirty"> <p ng-message="required" class="vertical-center">
<div class="col-sm-12 small text-warning"> <span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span> This field is required.
<div ng-messages="edgeJobForm.edgejob_cron.$error"> </p>
<p ng-message="required" class="vertical-center"> <p ng-message="pattern" class="vertical-center">
<span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span> This field is required. <span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span> This field format is invalid.
</p> </p>
<p ng-message="pattern" class="vertical-center"> </div>
<span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span> This field format is invalid. </div>
</p>
</div> </div>
</div> </div>
<div class="col-sm-12 small text-muted mt-2.5"> Time should be set according to the chosen environments' timezone. </div>
</div> </div>
</div> </div>
<!-- !advanced-schedule --> <!-- !advanced-schedule -->

16
app/edge/components/group-form/groupForm.html
View File

@ -13,14 +13,14 @@
data-cy="edgeGroupCreate-groupNameInput" data-cy="edgeGroupCreate-groupNameInput"
placeholder="e.g. mygroup" placeholder="e.g. mygroup"
/> />
</div> <div class="help-block" ng-show="EdgeGroupForm.group_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="EdgeGroupForm.group_name.$invalid"> <div ng-messages="EdgeGroupForm.group_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="EdgeGroupForm.group_name.$error"> <pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon> This field is required.
<p ng-message="required" class="vertical-center"> </p>
<pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon> This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

7
app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html
View File

@ -20,6 +20,13 @@
required required
data-cy="edgeStackCreate-nameInput" data-cy="edgeStackCreate-nameInput"
/> />
<div class="help-block" ng-show="$ctrl.form.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.form.$error">
<p ng-message="required" class="vertical-center"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Name is required. </p>
</div>
</div>
</div>
</div> </div>
</div> </div>
<!-- !name-input --> <!-- !name-input -->

4
app/kubernetes/components/helm/helm-templates/helm-add-repository/helm-add-repository.html
View File

@ -31,7 +31,7 @@
<div class="form-group nomargin" ng-show="addUserHelmRepoForm.repo.$invalid"> <div class="form-group nomargin" ng-show="addUserHelmRepoForm.repo.$invalid">
<div class="small"> <div class="small">
<div ng-messages="addUserHelmRepoForm.repo.$error"> <div ng-messages="addUserHelmRepoForm.repo.$error">
<p class="vertical-center text-muted" ng-message="pattern" <p class="vertical-center text-warning" ng-message="pattern"
><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> A valid URL beginning with http(s) is required.</p ><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> A valid URL beginning with http(s) is required.</p
> >
</div> </div>
@ -41,7 +41,7 @@
<div class="form-group nomargin" ng-show="$ctrl.doesRepoExist()"> <div class="form-group nomargin" ng-show="$ctrl.doesRepoExist()">
<div class="small"> <div class="small">
<div ng-messages="addUserHelmRepoForm.repo.$error"> <div ng-messages="addUserHelmRepoForm.repo.$error">
<p class="vertical-center text-muted"><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Helm repository already exists.</p> <p class="vertical-center text-warning"><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Helm repository already exists.</p>
</div> </div>
</div> </div>
</div> </div>

6
app/kubernetes/components/helm/helm-templates/helm-templates.html
View File

@ -61,7 +61,7 @@
</div> </div>
</div> </div>
<div class="form-group" ng-if="!$ctrl.state.resourcePool"> <div class="form-group" ng-if="!$ctrl.state.resourcePool">
<div class="col-sm-12 small text-muted vertical-center"> <div class="col-sm-12 small text-warning vertical-center">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
You do not have access to any namespace. Contact your administrator to get access to a namespace. You do not have access to any namespace. Contact your administrator to get access to a namespace.
</div> </div>
@ -86,11 +86,11 @@
<div class="small"> <div class="small">
<div ng-messages="$ctrl.helmTemplateCreationForm.release_name.$error"> <div ng-messages="$ctrl.helmTemplateCreationForm.release_name.$error">
<div class="col-sm-2"></div> <div class="col-sm-2"></div>
<p class="vertical-center col-sm-10 text-muted" ng-message="required"> <p class="vertical-center col-sm-10 text-warning" ng-message="required">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'" class="vertical-center"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'" class="vertical-center"></pr-icon>
This field is required. This field is required.
</p> </p>
<p class="vertical-center col-sm-10 text-muted" ng-message="pattern"> <p class="vertical-center col-sm-10 text-warning" ng-message="pattern">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'" class="vertical-center"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'" class="vertical-center"></pr-icon>
This field must consist of lower case alphanumeric characters or '-', start with an alphabetic character, and end with an alphanumeric character (e.g. 'my-name', This field must consist of lower case alphanumeric characters or '-', start with an alphabetic character, and end with an alphanumeric character (e.g. 'my-name',
or 'abc-123'). or 'abc-123').

20
app/kubernetes/components/kube-services/kube-services-item/kube-services-item.html
View File

@ -1,12 +1,12 @@
<ng-form name="serviceForm"> <ng-form name="serviceForm">
<div ng-if="$ctrl.isAdmin()" class="small" ng-show="$ctrl.serviceType === $ctrl.KubernetesApplicationPublishingTypes.LOAD_BALANCER && !$ctrl.loadbalancerEnabled"> <div ng-if="$ctrl.isAdmin()" class="small" ng-show="$ctrl.serviceType === $ctrl.KubernetesApplicationPublishingTypes.LOAD_BALANCER && !$ctrl.loadbalancerEnabled">
<p class="text-muted pt-2 vertical-center"> <p class="text-warning pt-2 vertical-center">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> No Load balancer is available in this cluster, click <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> No Load balancer is available in this cluster, click
<a class="hyperlink" ui-sref="kubernetes.cluster.setup">here</a> to configure load balancer. <a class="hyperlink" ui-sref="kubernetes.cluster.setup">here</a> to configure load balancer.
</p> </p>
</div> </div>
<div ng-if="!$ctrl.isAdmin()" class="small" ng-show="$ctrl.serviceType === $ctrl.KubernetesApplicationPublishingTypes.LOAD_BALANCER && !$ctrl.loadbalancerEnabled"> <div ng-if="!$ctrl.isAdmin()" class="small" ng-show="$ctrl.serviceType === $ctrl.KubernetesApplicationPublishingTypes.LOAD_BALANCER && !$ctrl.loadbalancerEnabled">
<p class="text-muted pt-2 vertical-center"> <p class="text-warning pt-2 vertical-center">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> No Load balancer is available in this cluster, contact your administrator. <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> No Load balancer is available in this cluster, contact your administrator.
</p> </p>
</div> </div>
@ -44,10 +44,10 @@
/> />
</div> </div>
<span> <span>
<div class="small mt-1" ng-if="$ctrl.state.duplicates.targetPort.refs[$index] !== undefined"> <div class="small mt-1 text-warning" ng-if="$ctrl.state.duplicates.targetPort.refs[$index] !== undefined">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This container port is already used. <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This container port is already used.
</div> </div>
<div class="small mt-1 text-muted" ng-messages="serviceForm['container_port_'+$index].$error"> <div class="small mt-1 text-warning" ng-messages="serviceForm['container_port_'+$index].$error">
<p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Container port number is required.</p> <p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Container port number is required.</p>
<p class="vertical-center" ng-message="min" <p class="vertical-center" ng-message="min"
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Container port number must be inside the range 1-65535.</p ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Container port number must be inside the range 1-65535.</p
@ -77,10 +77,10 @@
/> />
</div> </div>
<span> <span>
<div class="small mt-1" ng-if="$ctrl.state.duplicates.servicePort.refs[$index] !== undefined"> <div class="small mt-1 text-warning" ng-if="$ctrl.state.duplicates.servicePort.refs[$index] !== undefined">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This service port is already used. <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This service port is already used.
</div> </div>
<div class="small mt-1 text-muted"> <div class="small mt-1 text-warning">
<div ng-messages="serviceForm['service_port_'+$index].$error"> <div ng-messages="serviceForm['service_port_'+$index].$error">
<p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Service port number is required.</p> <p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Service port number is required.</p>
<p class="vertical-center" ng-message="min" <p class="vertical-center" ng-message="min"
@ -112,7 +112,7 @@
</div> </div>
<div class="w-full"> <div class="w-full">
<span> <span>
<div class="small mt-1 text-muted"> <div class="small mt-1 text-warning">
<div ng-messages="serviceForm['node_port_'+$index].$error"> <div ng-messages="serviceForm['node_port_'+$index].$error">
<p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Nodeport is required.</p> <p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Nodeport is required.</p>
<p class="vertical-center" ng-message="min" <p class="vertical-center" ng-message="min"
@ -162,7 +162,7 @@
</select> </select>
</div> </div>
<span> <span>
<div class="small mt-5 text-muted"> <div class="small mt-5 text-warning">
<div ng-messages="serviceForm['ingress_port_'+$index].$error"> <div ng-messages="serviceForm['ingress_port_'+$index].$error">
<p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress selection is required.</p> <p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress selection is required.</p>
</div> </div>
@ -186,7 +186,7 @@
</select> </select>
</div> </div>
<span> <span>
<div class="small mt-1 text-muted"> <div class="small mt-1 text-warning">
<div ng-messages="serviceForm['hostname_port_'+$index].$error"> <div ng-messages="serviceForm['hostname_port_'+$index].$error">
<p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Hostname is required.</p> <p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Hostname is required.</p>
</div> </div>
@ -209,7 +209,7 @@
/> />
</div> </div>
<span> <span>
<div class="small mt-1 text-muted"> <div class="small mt-1 text-warning">
<div ng-messages="serviceForm['ingress_route_'+$index].$error"> <div ng-messages="serviceForm['ingress_route_'+$index].$error">
<p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Route is required.</p> <p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Route is required.</p>
<p class="vertical-center" ng-message="pattern" <p class="vertical-center" ng-message="pattern"

4
app/kubernetes/components/kube-services/kube-services.html
View File

@ -50,13 +50,13 @@
Ingress Ingress
</div> </div>
<div ng-if="$ctrl.isAdmin()" class="small"> <div ng-if="$ctrl.isAdmin()" class="small">
<p class="text-muted pt-2 vertical-center"> <p class="text-warning pt-2 vertical-center">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress is not configured in this namespace, select another namespace or click <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress is not configured in this namespace, select another namespace or click
<a ui-sref="kubernetes.cluster.setup">here</a> to configure ingress. <a ui-sref="kubernetes.cluster.setup">here</a> to configure ingress.
</p> </p>
</div> </div>
<div ng-if="!$ctrl.isAdmin()" class="small"> <div ng-if="!$ctrl.isAdmin()" class="small">
<p class="text-muted pt-2 vertical-center"> <p class="text-warning pt-2 vertical-center">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress is not configured in this namespace, select another namespace or contact your <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress is not configured in this namespace, select another namespace or contact your
administrator. administrator.
</p> </p>

4
app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html
View File

@ -46,7 +46,7 @@
ng-change="$ctrl.onChangeKey(entry)" ng-change="$ctrl.onChangeKey(entry)"
/> />
<div <div
class="small text-muted" class="small text-warning"
style="margin-top: 5px" style="margin-top: 5px"
ng-show=" ng-show="
kubernetesConfigurationDataCreationForm['configuration_data_key_' + index].$invalid || kubernetesConfigurationDataCreationForm['configuration_data_key_' + index].$invalid ||
@ -85,7 +85,7 @@
ng-trim="false" ng-trim="false"
required required
></textarea> ></textarea>
<div class="small text-muted" style="margin-top: 5px" ng-show="kubernetesConfigurationDataCreationForm['configuration_data_value_' + index].$invalid"> <div class="small text-warning" style="margin-top: 5px" ng-show="kubernetesConfigurationDataCreationForm['configuration_data_value_' + index].$invalid">
<ng-messages for="kubernetesConfigurationDataCreationForm['configuration_data_value_' + index].$error"> <ng-messages for="kubernetesConfigurationDataCreationForm['configuration_data_value_' + index].$error">
<p ng-message="required" class="vertical-center" <p ng-message="required" class="vertical-center"
><pr-icon class="vertical-center" icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> This field is required.</p ><pr-icon class="vertical-center" icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> This field is required.</p

59
app/kubernetes/views/applications/create/createApplication.html
View File

@ -71,7 +71,7 @@
</div> </div>
</div> </div>
<div class="form-group" ng-if="!ctrl.formValues.ResourcePool"> <div class="form-group" ng-if="!ctrl.formValues.ResourcePool">
<div class="col-sm-12 small text-muted"> <div class="col-sm-12 small text-warning">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
You do not have access to any namespace. Contact your administrator to get access to a namespace. You do not have access to any namespace. Contact your administrator to get access to a namespace.
</div> </div>
@ -147,17 +147,17 @@
<div class="small"> <div class="small">
<div class="col-sm-3 col-lg-2">&nbsp;</div> <div class="col-sm-3 col-lg-2">&nbsp;</div>
<div class="col-sm-8" ng-messages="kubernetesApplicationCreationForm.application_name.$error"> <div class="col-sm-8" ng-messages="kubernetesApplicationCreationForm.application_name.$error">
<p class="text-muted vertical-center" ng-message="required" <p class="text-warning vertical-center" ng-message="required"
><pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p ><pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p
> >
<p class="text-muted vertical-center" ng-message="pattern"> <p class="text-warning vertical-center" ng-message="pattern">
<pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> <pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
This field must consist of lower case alphanumeric characters or '-', contain at most 63 characters, start with an alphabetic character, and end with an This field must consist of lower case alphanumeric characters or '-', contain at most 63 characters, start with an alphabetic character, and end with an
alphanumeric character (e.g. 'my-name', or 'abc-123'). alphanumeric character (e.g. 'my-name', or 'abc-123').
</p> </p>
</div> </div>
<div class="col-sm-8" ng-if="ctrl.state.alreadyExists"> <div class="col-sm-8" ng-if="ctrl.state.alreadyExists">
<p class="text-muted vertical-center"> <p class="text-warning vertical-center">
<pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> <pr-icon class="vertical-center" icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
An application with the same name already exists inside the selected namespace. An application with the same name already exists inside the selected namespace.
</p> </p>
@ -299,15 +299,15 @@
" "
> >
<ng-messages for="kubernetesApplicationCreationForm['environment_variable_name_' + $index].$error"> <ng-messages for="kubernetesApplicationCreationForm['environment_variable_name_' + $index].$error">
<p ng-message="required" class="text-muted vertical-center" <p ng-message="required" class="text-warning vertical-center"
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true" class-="vertical-center"></pr-icon> Environment variable name is required.</p ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true" class-="vertical-center"></pr-icon> Environment variable name is required.</p
> >
<p ng-message="pattern" class="text-muted vertical-center" <p ng-message="pattern" class="text-warning vertical-center"
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field must consist of alphabetic characters, digits, '_', '-', ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field must consist of alphabetic characters, digits, '_', '-',
or '.', and must not start with a digit (e.g. 'my.env-name', or 'MY_ENV.NAME', or 'MyEnvName1'.</p or '.', and must not start with a digit (e.g. 'my.env-name', or 'MY_ENV.NAME', or 'MyEnvName1'.</p
> >
</ng-messages> </ng-messages>
<p class="text-muted vertical-center" ng-if="ctrl.state.duplicates.environmentVariables.refs[$index] !== undefined" <p class="text-warning vertical-center" ng-if="ctrl.state.duplicates.environmentVariables.refs[$index] !== undefined"
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This environment variable is already defined.</p ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This environment variable is already defined.</p
> >
</div> </div>
@ -430,7 +430,7 @@
ctrl.state.duplicates.configurationPaths.refs[index + '_' + keyIndex] !== undefined ctrl.state.duplicates.configurationPaths.refs[index + '_' + keyIndex] !== undefined
" "
> >
<div class="input-group input-group-sm text-muted" ng-if="overridenKey.Type === ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM"> <div class="input-group input-group-sm text-warning" ng-if="overridenKey.Type === ctrl.ApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM">
<div <div
class="small" class="small"
style="margin-top: 5px" style="margin-top: 5px"
@ -643,7 +643,7 @@
> >
<div class="input-group col-sm-3 input-group-sm"> <div class="input-group col-sm-3 input-group-sm">
<div <div
class="small text-muted" class="small text-warning"
style="margin-top: 5px" style="margin-top: 5px"
ng-show=" ng-show="
kubernetesApplicationCreationForm['persisted_folder_path_' + $index].$invalid || ctrl.state.duplicates.persistedFolders.refs[$index] !== undefined kubernetesApplicationCreationForm['persisted_folder_path_' + $index].$invalid || ctrl.state.duplicates.persistedFolders.refs[$index] !== undefined
@ -660,7 +660,7 @@
<div class="input-group col-sm-offset-2 col-sm-3 input-group-sm"> <div class="input-group col-sm-offset-2 col-sm-3 input-group-sm">
<div <div
class="small text-muted" class="small text-warning"
style="margin-top: 5px" style="margin-top: 5px"
ng-show=" ng-show="
kubernetesApplicationCreationForm['persisted_folder_size_' + $index].$invalid || ctrl.state.exceeded.persistedFolders.refs[$index] !== undefined kubernetesApplicationCreationForm['persisted_folder_size_' + $index].$invalid || ctrl.state.exceeded.persistedFolders.refs[$index] !== undefined
@ -855,7 +855,7 @@
</div> </div>
<div class="form-group" ng-show="kubernetesApplicationCreationForm.memory_limit.$invalid"> <div class="form-group" ng-show="kubernetesApplicationCreationForm.memory_limit.$invalid">
<div class="col-sm-3 col-lg-2"></div> <div class="col-sm-3 col-lg-2"></div>
<div class="col-sm-8 small text-muted"> <div class="col-sm-8 small text-warning">
<div ng-messages="kubernetesApplicationCreationForm.memory_limit.$error"> <div ng-messages="kubernetesApplicationCreationForm.memory_limit.$error">
<p class="vertical-center" <p class="vertical-center"
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Value must be between {{ ctrl.state.sliders.memory.min }} and ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Value must be between {{ ctrl.state.sliders.memory.min }} and
@ -959,9 +959,9 @@
<!-- !deployment options --> <!-- !deployment options -->
<!-- replica count --> <!-- replica count -->
<div class="form-group form-inline" ng-if="ctrl.formValues.DeploymentType === ctrl.ApplicationDeploymentTypes.REPLICATED"> <div class="form-group" ng-if="ctrl.formValues.DeploymentType === ctrl.ApplicationDeploymentTypes.REPLICATED">
<div class="col-sm-12 vertical-center"> <label for="replica_count" class="col-sm-1 control-label text-left">Instance count</label>
<label class="control-label text-left !pt-0"> Instance count </label> <div class="col-sm-2">
<input <input
type="number" type="number"
name="replica_count" name="replica_count"
@ -969,23 +969,24 @@
min="1" min="1"
max="9999" max="9999"
placeholder="1" placeholder="1"
style="margin-left: 20px"
ng-model="ctrl.formValues.ReplicaCount" ng-model="ctrl.formValues.ReplicaCount"
ng-disabled="!ctrl.supportScalableReplicaDeployment()" ng-disabled="!ctrl.supportScalableReplicaDeployment()"
ng-change="ctrl.enforceReplicaCountMinimum()" ng-change="ctrl.enforceReplicaCountMinimum()"
required required
data-cy="k8sAppCreate-replicaCountInput" data-cy="k8sAppCreate-replicaCountInput"
/> />
</div> <div class="help-block" ng-if="kubernetesApplicationCreationForm['replica_count'].$invalid">
</div> <div class="small text-warning whitespace-nowrap">
<div class="form-group" ng-if="kubernetesApplicationCreationForm['replica_count'].$invalid"> <ng-messages for="kubernetesApplicationCreationForm['replica_count'].$error">
<div class="col-sm-12 small text-muted"> <p class="vertical-center" ng-message="required"
<ng-messages for="kubernetesApplicationCreationForm['replica_count'].$error"> ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Instance count is required.</p
<p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Instance count is required.</p> >
<p class="vertical-center" ng-message="min" <p class="vertical-center" ng-message="min"
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Instance count must be greater than 0.</p ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Instance count must be greater than 0.</p
> >
</ng-messages> </ng-messages>
</div>
</div>
</div> </div>
</div> </div>
<!-- !replica count --> <!-- !replica count -->
@ -1077,7 +1078,7 @@
/> />
</div> </div>
<span ng-show="kubernetesApplicationCreationForm['auto_scaler_min'].$invalid"> <span ng-show="kubernetesApplicationCreationForm['auto_scaler_min'].$invalid">
<div class="small text-muted" style="margin-top: 5px"> <div class="small text-warning" style="margin-top: 5px">
<ng-messages for="kubernetesApplicationCreationForm['auto_scaler_min'].$error"> <ng-messages for="kubernetesApplicationCreationForm['auto_scaler_min'].$error">
<p ng-message="required" class="vertical-center"> <p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Minimum instances is required. <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Minimum instances is required.
@ -1104,7 +1105,7 @@
/> />
</div> </div>
<span ng-show="kubernetesApplicationCreationForm['auto_scaler_max'].$invalid || ctrl.autoScalerOverflow()"> <span ng-show="kubernetesApplicationCreationForm['auto_scaler_max'].$invalid || ctrl.autoScalerOverflow()">
<div class="small text-muted" style="margin-top: 5px"> <div class="small text-warning" style="margin-top: 5px">
<ng-messages for="kubernetesApplicationCreationForm['auto_scaler_max'].$error"> <ng-messages for="kubernetesApplicationCreationForm['auto_scaler_max'].$error">
<p ng-message="required" class="vertical-center"> <p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Maximum instances is required. <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Maximum instances is required.
@ -1135,7 +1136,7 @@
/> />
</div> </div>
<span ng-show="kubernetesApplicationCreationForm['auto_scaler_cpu'].$invalid"> <span ng-show="kubernetesApplicationCreationForm['auto_scaler_cpu'].$invalid">
<div class="small text-muted" style="margin-top: 5px"> <div class="small text-warning" style="margin-top: 5px">
<ng-messages for="kubernetesApplicationCreationForm['auto_scaler_cpu'].$error"> <ng-messages for="kubernetesApplicationCreationForm['auto_scaler_cpu'].$error">
<p ng-message="required" class="vertical-center"> <p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target CPU usage is required. <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Target CPU usage is required.
@ -1225,7 +1226,7 @@
</div> </div>
<div ng-repeat-end ng-show="ctrl.state.duplicates.placements.refs[$index] !== undefined"> <div ng-repeat-end ng-show="ctrl.state.duplicates.placements.refs[$index] !== undefined">
<div class="col-sm-5 input-group"> <div class="col-sm-5 input-group">
<div class="small text-muted" style="margin-top: 5px" ng-if="ctrl.state.duplicates.placements.refs[$index] !== undefined"> <div class="small text-warning" style="margin-top: 5px" ng-if="ctrl.state.duplicates.placements.refs[$index] !== undefined">
<p class="vertical-center" ng-if="ctrl.state.duplicates.placements.refs[$index] !== undefined"> <p class="vertical-center" ng-if="ctrl.state.duplicates.placements.refs[$index] !== undefined">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This label is already defined. <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This label is already defined.
</p> </p>

4
app/kubernetes/views/applications/stats/stats.html
View File

@ -28,7 +28,7 @@
<div ng-if="ctrl.state.viewReady"> <div ng-if="ctrl.state.viewReady">
<information-panel ng-if="!ctrl.state.getMetrics" title-text="Unable to retrieve container metrics"> <information-panel ng-if="!ctrl.state.getMetrics" title-text="Unable to retrieve container metrics">
<span class="small text-muted vertical-center"> <span class="small text-warning vertical-center">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
Portainer was unable to retrieve any metrics associated to that container. Please contact your administrator to ensure that the Kubernetes metrics feature is properly Portainer was unable to retrieve any metrics associated to that container. Please contact your administrator to ensure that the Kubernetes metrics feature is properly
configured. configured.
@ -47,7 +47,7 @@
<form class="form-horizontal"> <form class="form-horizontal">
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<span class="small text-muted"> <span class="small text-warning">
This view displays real-time statistics about the container <b>{{ ctrl.state.transition.containerName | trimcontainername }}</b This view displays real-time statistics about the container <b>{{ ctrl.state.transition.containerName | trimcontainername }}</b
>. >.
</span> </span>

8
app/kubernetes/views/cluster/node/node.html
View File

@ -57,11 +57,11 @@
<option>{{ ctrl.availabilities.PAUSE }}</option> <option>{{ ctrl.availabilities.PAUSE }}</option>
<option>{{ ctrl.availabilities.DRAIN }}</option> <option>{{ ctrl.availabilities.DRAIN }}</option>
</select> </select>
<div class="small text-muted vertical-center" ng-if="ctrl.state.isDrainOperation && ctrl.formValues.Availability === ctrl.availabilities.DRAIN"> <div class="small text-warning vertical-center" ng-if="ctrl.state.isDrainOperation && ctrl.formValues.Availability === ctrl.availabilities.DRAIN">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
Cannot use this action while another node is currently being drained. Cannot use this action while another node is currently being drained.
</div> </div>
<div class="small text-muted vertical-center" ng-if="ctrl.state.isContainPortainer && ctrl.formValues.Availability === ctrl.availabilities.DRAIN"> <div class="small text-warning vertical-center" ng-if="ctrl.state.isContainPortainer && ctrl.formValues.Availability === ctrl.availabilities.DRAIN">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
Cannot drain a node where this Portainer instance is running. Cannot drain a node where this Portainer instance is running.
</div> </div>
@ -135,7 +135,7 @@
<span class="label label-info image-tag" ng-if="ctrl.isSystemLabel($index)" style="margin-left: 5px">system</span> <span class="label label-info image-tag" ng-if="ctrl.isSystemLabel($index)" style="margin-left: 5px">system</span>
</div> </div>
</div> </div>
<div class="small mt-2 text-muted" ng-show="kubernetesNodeUpdateForm['label_key_' + $index].$invalid || ctrl.state.duplicateLabelKeys[$index] !== undefined"> <div class="small mt-2 text-warning" ng-show="kubernetesNodeUpdateForm['label_key_' + $index].$invalid || ctrl.state.duplicateLabelKeys[$index] !== undefined">
<ng-messages for="kubernetesNodeUpdateForm['label_key_' + $index].$error"> <ng-messages for="kubernetesNodeUpdateForm['label_key_' + $index].$error">
<p ng-message="required" class="vertical-center"> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Label key is required. </p> <p ng-message="required" class="vertical-center"> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Label key is required. </p>
</ng-messages> </ng-messages>
@ -185,7 +185,7 @@
</div> </div>
</div> </div>
<div <div
class="small text-muted" class="small text-warning"
style="margin-top: 5px" style="margin-top: 5px"
ng-show="kubernetesNodeUpdateForm['taint_key_' + $index].$invalid || ctrl.state.duplicateTaintKeys[$index] !== undefined" ng-show="kubernetesNodeUpdateForm['taint_key_' + $index].$invalid || ctrl.state.duplicateTaintKeys[$index] !== undefined"
> >

6
app/kubernetes/views/configurations/create/createConfiguration.html
View File

@ -33,7 +33,7 @@
</div> </div>
<div class="form-group" ng-show="kubernetesConfigurationCreationForm.configuration_name.$invalid || ctrl.state.alreadyExist"> <div class="form-group" ng-show="kubernetesConfigurationCreationForm.configuration_name.$invalid || ctrl.state.alreadyExist">
<div class="col-sm-3 col-lg-2"></div> <div class="col-sm-3 col-lg-2"></div>
<div class="col-sm-8 col-lg-9 small text-muted"> <div class="col-sm-8 col-lg-9 small text-warning">
<div ng-messages="kubernetesConfigurationCreationForm.configuration_name.$error"> <div ng-messages="kubernetesConfigurationCreationForm.configuration_name.$error">
<p ng-message="required" class="vertical-center"><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> This field is required.</p> <p ng-message="required" class="vertical-center"><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> This field is required.</p>
<p ng-message="pattern" class="vertical-center" <p ng-message="pattern" class="vertical-center"
@ -65,14 +65,14 @@
</div> </div>
</div> </div>
<div class="form-group" ng-if="ctrl.state.resourcePoolHasQuota && ctrl.resourceQuotaCapacityExceeded()"> <div class="form-group" ng-if="ctrl.state.resourcePoolHasQuota && ctrl.resourceQuotaCapacityExceeded()">
<div class="col-sm-12 small text-muted vertical-center"> <div class="col-sm-12 small text-warning vertical-center">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
This namespace has exhausted its resource capacity and you will not be able to deploy the configuration. Contact your administrator to expand the capacity of the This namespace has exhausted its resource capacity and you will not be able to deploy the configuration. Contact your administrator to expand the capacity of the
namespace. namespace.
</div> </div>
</div> </div>
<div class="form-group" ng-if="!ctrl.formValues.ResourcePool"> <div class="form-group" ng-if="!ctrl.formValues.ResourcePool">
<div class="col-sm-12 small text-muted vertical-center"> <div class="col-sm-12 small text-warning vertical-center">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
You do not have access to any namespace. Contact your administrator to get access to a namespace. You do not have access to any namespace. Contact your administrator to get access to a namespace.
</div> </div>

10
app/kubernetes/views/configure/configure.html
View File

@ -118,15 +118,15 @@
ng-if="kubernetesClusterSetupForm['ingress_class_name_' + $index].$invalid || ctrl.state.duplicates.ingressClasses.refs[$index] !== undefined" ng-if="kubernetesClusterSetupForm['ingress_class_name_' + $index].$invalid || ctrl.state.duplicates.ingressClasses.refs[$index] !== undefined"
> >
<div ng-messages="kubernetesClusterSetupForm['ingress_class_name_'+$index].$error"> <div ng-messages="kubernetesClusterSetupForm['ingress_class_name_'+$index].$error">
<p ng-message="required" class="vertical-center text-muted" <p ng-message="required" class="vertical-center text-warning"
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress class name is required.</p ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress class name is required.</p
> >
<p ng-message="pattern" class="vertical-center text-muted" <p ng-message="pattern" class="vertical-center text-warning"
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field must consist of lower case alphanumeric characters or '-', start ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field must consist of lower case alphanumeric characters or '-', start
with an alphabetic character, and end with an alphanumeric character (e.g. 'my-name', or 'abc-123').</p with an alphabetic character, and end with an alphanumeric character (e.g. 'my-name', or 'abc-123').</p
> >
</div> </div>
<p ng-if="ctrl.state.duplicates.ingressClasses.refs[$index] !== undefined" class="vertical-center text-muted"> <p ng-if="ctrl.state.duplicates.ingressClasses.refs[$index] !== undefined" class="vertical-center text-warning">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This ingress class is already defined. <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This ingress class is already defined.
</p> </p>
</div> </div>
@ -134,7 +134,7 @@
<div class="col-sm-3 input-group"> <div class="col-sm-3 input-group">
<div class="small" style="margin-top: 5px" ng-if="kubernetesClusterSetupForm['ingress_class_type_' + $index].$invalid"> <div class="small" style="margin-top: 5px" ng-if="kubernetesClusterSetupForm['ingress_class_type_' + $index].$invalid">
<div ng-messages="kubernetesClusterSetupForm['ingress_class_type_'+$index].$error"> <div ng-messages="kubernetesClusterSetupForm['ingress_class_type_'+$index].$error">
<p ng-message="required" class="vertical-center text-muted" <p ng-message="required" class="vertical-center text-warning"
><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress class type is required.</p ><pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Ingress class type is required.</p
> >
</div> </div>
@ -166,7 +166,7 @@
tooltip="'Specify a timeframe during which automatic updates can occur in this environment.'" tooltip="'Specify a timeframe during which automatic updates can occur in this environment.'"
on-change="(ctrl.onToggleAutoUpdate)" on-change="(ctrl.onToggleAutoUpdate)"
label-class="'col-sm-5 col-lg-4 px-0 !m-0'" label-class="'col-sm-5 col-lg-4 px-0 !m-0'"
switch-class="'col-sm-8'" switch-class="'col-sm-8 text-muted'"
> >
</por-switch-field> </por-switch-field>
</div> </div>

2
app/kubernetes/views/deploy/deploy.html
View File

@ -41,7 +41,7 @@
</div> </div>
</div> </div>
<div class="form-group" ng-if="!ctrl.formValues.Namespace"> <div class="form-group" ng-if="!ctrl.formValues.Namespace">
<div class="col-sm-12 small text-muted"> <div class="col-sm-12 small text-warning">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
You do not have access to any namespace. Contact your administrator to get access to a namespace. You do not have access to any namespace. Contact your administrator to get access to a namespace.
</div> </div>

2
app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
View File

@ -44,7 +44,7 @@
<rd-widget-body> <rd-widget-body>
<form class="form-horizontal"> <form class="form-horizontal">
<div class="form-group"> <div class="form-group">
<span class="col-sm-12 small text-muted"> <span class="col-sm-12 small text-warning">
<p class="vertical-center"> <p class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
Adding user access will require the affected user(s) to logout and login for the changes to be taken into account. Adding user access will require the affected user(s) to logout and login for the changes to be taken into account.

8
app/kubernetes/views/resource-pools/create/createResourcePool.html
View File

@ -31,7 +31,7 @@
/> />
<span class="help-block"> <span class="help-block">
<div class="form-group" ng-show="resourcePoolCreationForm.pool_name.$invalid || $ctrl.state.isAlreadyExist || $ctrl.state.hasPrefixKube"> <div class="form-group" ng-show="resourcePoolCreationForm.pool_name.$invalid || $ctrl.state.isAlreadyExist || $ctrl.state.hasPrefixKube">
<div class="col-sm-12 small text-muted"> <div class="col-sm-12 small text-warning">
<div ng-messages="resourcePoolCreationForm.pool_name.$error"> <div ng-messages="resourcePoolCreationForm.pool_name.$error">
<p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>This field is required.</p> <p class="vertical-center" ng-message="required"><pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>This field is required.</p>
<p class="vertical-center" ng-message="pattern" <p class="vertical-center" ng-message="pattern"
@ -80,7 +80,7 @@
<div class="col-sm-12 form-section-title"> Resource limits </div> <div class="col-sm-12 form-section-title"> Resource limits </div>
<div> <div>
<div class="form-group"> <div class="form-group">
<span class="col-sm-12 small text-muted" ng-switch on="$ctrl.formValues.HasQuota && !$ctrl.isQuotaValid()"> <span class="col-sm-12 small text-warning" ng-switch on="$ctrl.formValues.HasQuota && !$ctrl.isQuotaValid()">
<p class="vertical-center mb-0" ng-switch-when="true" <p class="vertical-center mb-0" ng-switch-when="true"
><pr-icon class="vertical-center" icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> At least a single limit must be set for the quota to be ><pr-icon class="vertical-center" icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> At least a single limit must be set for the quota to be
valid. valid.
@ -121,7 +121,7 @@
<span class="col-sm-3 col-lg-2"></span> <span class="col-sm-3 col-lg-2"></span>
<span class="help-block col-sm-9 col-lg-10"> <span class="help-block col-sm-9 col-lg-10">
<div ng-show="resourcePoolCreationForm.memory_limit.$invalid"> <div ng-show="resourcePoolCreationForm.memory_limit.$invalid">
<div class="small text-muted"> <div class="small text-warning">
<div ng-messages="resourcePoolCreationForm.pool_name.$error"> <div ng-messages="resourcePoolCreationForm.pool_name.$error">
<p class="vertical-center" <p class="vertical-center"
><pr-icon class="vertical-center" icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Value must be between ><pr-icon class="vertical-center" icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Value must be between
@ -276,7 +276,7 @@
</div> </div>
</div> </div>
<div <div
class="small text-muted pt-1" class="small text-warning pt-1"
ng-show=" ng-show="
resourcePoolCreationForm['hostname_' + ic.IngressClass.Name + '_' + $index].$invalid || resourcePoolCreationForm['hostname_' + ic.IngressClass.Name + '_' + $index].$invalid ||
$ctrl.state.duplicates.ingressHosts.refs[ic.IngressClass.Name][$index] !== undefined $ctrl.state.duplicates.ingressHosts.refs[ic.IngressClass.Name][$index] !== undefined

6
app/kubernetes/views/resource-pools/edit/resourcePool.html
View File

@ -51,7 +51,7 @@
</div> </div>
</div> </div>
<div class="form-group" ng-if="ctrl.formValues.HasQuota && ctrl.isAdmin && ctrl.isEditable && !ctrl.isQuotaValid()"> <div class="form-group" ng-if="ctrl.formValues.HasQuota && ctrl.isAdmin && ctrl.isEditable && !ctrl.isQuotaValid()">
<div class="col-sm-12 small text-muted"> <div class="col-sm-12 small text-warning">
<p class="vertical-center"> <p class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
Not enough resources available in the cluster to apply a resource reservation. Not enough resources available in the cluster to apply a resource reservation.
@ -103,7 +103,7 @@
</div> </div>
<div class="form-group" ng-show="resourcePoolEditForm.memory_limit.$invalid"> <div class="form-group" ng-show="resourcePoolEditForm.memory_limit.$invalid">
<div class="col-sm-3 col-lg-2"></div> <div class="col-sm-3 col-lg-2"></div>
<div class="col-sm-8 small text-muted"> <div class="col-sm-8 small text-warning">
<div ng-messages="resourcePoolEditForm.pool_name.$error"> <div ng-messages="resourcePoolEditForm.pool_name.$error">
<p class="vertical-center"> <p class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Value must be between {{ ctrl.ResourceQuotaDefaults.MemoryLimit }} and <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Value must be between {{ ctrl.ResourceQuotaDefaults.MemoryLimit }} and
@ -237,7 +237,7 @@
</div> </div>
</div> </div>
<div <div
class="small text-muted" class="small text-warning"
style="margin-top: 5px" style="margin-top: 5px"
ng-show="resourcePoolEditForm['hostname_' + ic.IngressClass.Name + '_' + $index].$invalid || item.Duplicate" ng-show="resourcePoolEditForm['hostname_' + ic.IngressClass.Name + '_' + $index].$invalid || item.Duplicate"
> >

4
app/portainer/components/custom-template-common-fields/customTemplateCommonFields.html
View File

@ -16,7 +16,7 @@
/> />
<span class="help-block"> <span class="help-block">
<div ng-show="commonCustomTemplateForm.template_title.$invalid"> <div ng-show="commonCustomTemplateForm.template_title.$invalid">
<div class="mt-2 small text-muted"> <div class="mt-2 small text-warning">
<div ng-messages="commonCustomTemplateForm.template_title.$error"> <div ng-messages="commonCustomTemplateForm.template_title.$error">
<p class="vertical-center" ng-message="required"> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Title is required. </p> <p class="vertical-center" ng-message="required"> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Title is required. </p>
<p class="vertical-center" ng-message="pattern"> <p class="vertical-center" ng-message="pattern">
@ -37,7 +37,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<input type="text" class="form-control" id="description" ng-model="$ctrl.formValues.Description" name="description" required /> <input type="text" class="form-control" id="description" ng-model="$ctrl.formValues.Description" name="description" required />
<span class="help-block"> <span class="help-block">
<div class="mt-2 small text-muted"> <div class="mt-2 small text-warning">
<div ng-show="commonCustomTemplateForm.description.$invalid"> <div ng-show="commonCustomTemplateForm.description.$invalid">
<div ng-messages="commonCustomTemplateForm.description.$error"> <div ng-messages="commonCustomTemplateForm.description.$error">
<p class="vertical-center" ng-message="required"> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Description is required.</p> <p class="vertical-center" ng-message="required"> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> Description is required.</p>

2
app/portainer/components/forms/git-form/git-form-additional-files-panel/git-form-additional-file-item/git-form-additional-file-item.html
View File

@ -10,7 +10,7 @@
</button> </button>
</div> </div>
<div ng-show="$ctrl[$ctrl.formName].name.$invalid"> <div ng-show="$ctrl[$ctrl.formName].name.$invalid">
<div class="small text-muted"> <div class="small text-warning">
<div ng-messages="$ctrl[$ctrl.formName].name.$error" class="mt-1"> <div ng-messages="$ctrl[$ctrl.formName].name.$error" class="mt-1">
<p class="vertical-center" ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Path is required. </p> <p class="vertical-center" ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Path is required. </p>
</div> </div>

4
app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html
View File

@ -13,7 +13,7 @@
</div> </div>
<div class="small vertical-center" ng-if="$ctrl.model.RepositoryAutomaticUpdates"> <div class="small vertical-center" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
<span class="text-muted" <span class="text-warning"
>Any changes to this stack or application made locally in Portainer will be overridden, which may cause service interruption. Do you wish to continue?</span >Any changes to this stack or application made locally in Portainer will be overridden, which may cause service interruption. Do you wish to continue?</span
> >
</div> </div>
@ -60,7 +60,7 @@
/> />
<div class="help-group"> <div class="help-group">
<div class="form-group col-md-12 pt-1" ng-show="autoUpdateForm.repository_fetch_interval.$touched && autoUpdateForm.repository_fetch_interval.$invalid"> <div class="form-group col-md-12 pt-1" ng-show="autoUpdateForm.repository_fetch_interval.$touched && autoUpdateForm.repository_fetch_interval.$invalid">
<div class="small text-muted"> <div class="small text-warning">
<div ng-messages="autoUpdateForm.repository_fetch_interval.$error"> <div ng-messages="autoUpdateForm.repository_fetch_interval.$error">
<p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p> <p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> This field is required.</p>
<p ng-message="invalidIntervalFormat"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Please enter a valid time interval.</p> <p ng-message="invalidIntervalFormat"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Please enter a valid time interval.</p>

18
app/portainer/components/forms/group-form/groupForm.html
View File

@ -4,15 +4,15 @@
<label for="group_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label> <label for="group_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" name="group_name" ng-model="$ctrl.model.Name" placeholder="e.g. my-group" required auto-focus /> <input type="text" class="form-control" name="group_name" ng-model="$ctrl.model.Name" placeholder="e.g. my-group" required auto-focus />
</div> <div class="help-block" ng-show="endpointGroupForm.group_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="endpointGroupForm.group_name.$invalid"> <div ng-messages="endpointGroupForm.group_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="endpointGroupForm.group_name.$error"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

106
app/portainer/components/forms/registry-form-aws-ecr/registry-form-ecr.html
View File

@ -14,19 +14,19 @@
<label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label> <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="my-ecr-registry" required auto-focus /> <input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="my-ecr-registry" required auto-focus />
</div> <div class="help-block" ng-show="$ctrl.registryFormEcr.registry_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_name.$invalid"> <div ng-messages="$ctrl.registryFormEcr.registry_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormEcr.registry_name.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. <p ng-message="used" class="vertical-center">
</p> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="used" class="vertical-center"> A registry with the same name already exists.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
A registry with the same name already exists. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -48,15 +48,15 @@
placeholder="aws-account-id.dkr.ecr.us-east-1.amazonaws.com/" placeholder="aws-account-id.dkr.ecr.us-east-1.amazonaws.com/"
required required
/> />
</div> <div class="help-block" ng-show="$ctrl.registryFormEcr.registry_url.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_url.$invalid"> <div ng-messages="$ctrl.registryFormEcr.registry_url.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormEcr.registry_url.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -84,15 +84,15 @@
<label for="registry_access_key" class="col-sm-3 col-lg-2 control-label text-left required">AWS Access Key</label> <label for="registry_access_key" class="col-sm-3 col-lg-2 control-label text-left required">AWS Access Key</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_access_key" name="registry_access_key" ng-model="$ctrl.model.Username" required /> <input type="text" class="form-control" id="registry_access_key" name="registry_access_key" ng-model="$ctrl.model.Username" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormEcr.registry_access_key.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_access_key.$invalid"> <div ng-messages="$ctrl.registryFormEcr.registry_access_key.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormEcr.registry_access_key.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -103,15 +103,15 @@
<label for="registry_secret_access_key" class="col-sm-3 col-lg-2 control-label text-left required">AWS Secret Access Key</label> <label for="registry_secret_access_key" class="col-sm-3 col-lg-2 control-label text-left required">AWS Secret Access Key</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="password" class="form-control" id="registry_secret_access_key" name="registry_secret_access_key" ng-model="$ctrl.model.Password" required /> <input type="password" class="form-control" id="registry_secret_access_key" name="registry_secret_access_key" ng-model="$ctrl.model.Password" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormEcr.registry_secret_access_key.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_secret_access_key.$invalid"> <div ng-messages="$ctrl.registryFormEcr.registry_secret_access_key.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormEcr.registry_secret_access_key.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -122,19 +122,19 @@
<label for="registry_region" class="col-sm-3 col-lg-2 control-label text-left required">Region</label> <label for="registry_region" class="col-sm-3 col-lg-2 control-label text-left required">Region</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_region" name="registry_region" placeholder="us-west-1" ng-model="$ctrl.model.Ecr.Region" required /> <input type="text" class="form-control" id="registry_region" name="registry_region" placeholder="us-west-1" ng-model="$ctrl.model.Ecr.Region" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormEcr.registry_region.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_region.$invalid"> <div ng-messages="$ctrl.registryFormEcr.registry_region.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormEcr.registry_region.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. <p ng-message="used" class="vertical-center">
</p> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="used" class="vertical-center"> A registry with the same name already exists.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
A registry with the same name already exists. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

80
app/portainer/components/forms/registry-form-azure/registry-form-azure.html
View File

@ -5,19 +5,19 @@
<label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label> <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="my-azure-registry" required auto-focus /> <input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="my-azure-registry" required auto-focus />
</div> <div class="help-block" ng-show="$ctrl.registryFormAzure.registry_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormAzure.registry_name.$invalid"> <div ng-messages="$ctrl.registryFormAzure.registry_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormAzure.registry_name.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. <p ng-message="used" class="vertical-center">
</p> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="used" class="vertical-center"> A registry with the same name already exists.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
A registry with the same name already exists. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -30,15 +30,15 @@
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_url" name="registry_url" ng-model="$ctrl.model.URL" placeholder="myproject.azurecr.io" required /> <input type="text" class="form-control" id="registry_url" name="registry_url" ng-model="$ctrl.model.URL" placeholder="myproject.azurecr.io" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormAzure.registry_url.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormAzure.registry_url.$invalid"> <div ng-messages="$ctrl.registryFormAzure.registry_url.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormAzure.registry_url.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -48,15 +48,15 @@
<label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label> <label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required /> <input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormAzure.registry_username.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormAzure.registry_username.$invalid"> <div ng-messages="$ctrl.registryFormAzure.registry_username.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormAzure.registry_username.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -66,15 +66,15 @@
<label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">Password</label> <label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">Password</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required /> <input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormAzure.registry_password.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormAzure.registry_password.$invalid"> <div ng-messages="$ctrl.registryFormAzure.registry_password.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormAzure.registry_password.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

80
app/portainer/components/forms/registry-form-custom/registry-form-custom.html
View File

@ -12,19 +12,19 @@
<label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label> <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="my-custom-registry" required auto-focus /> <input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="my-custom-registry" required auto-focus />
</div> <div class="help-block" ng-show="$ctrl.registryFormCustom.registry_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormCustom.registry_name.$invalid"> <div ng-messages="$ctrl.registryFormCustom.registry_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormCustom.registry_name.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. <p ng-message="used" class="vertical-center">
</p> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="used" class="vertical-center"> A registry with the same name already exists.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
A registry with the same name already exists. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -37,15 +37,15 @@
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_url" name="registry_url" ng-model="$ctrl.model.URL" placeholder="10.0.0.10:5000 or myregistry.domain.tld" required /> <input type="text" class="form-control" id="registry_url" name="registry_url" ng-model="$ctrl.model.URL" placeholder="10.0.0.10:5000 or myregistry.domain.tld" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormCustom.registry_url.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormCustom.registry_url.$invalid"> <div ng-messages="$ctrl.registryFormCustom.registry_url.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormCustom.registry_url.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -71,15 +71,15 @@
<label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label> <label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required /> <input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormCustom.registry_username.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormCustom.registry_username.$invalid"> <div ng-messages="$ctrl.registryFormCustom.registry_username.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormCustom.registry_username.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -89,15 +89,15 @@
<label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">Password</label> <label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">Password</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required /> <input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormCustom.registry_password.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormCustom.registry_password.$invalid"> <div ng-messages="$ctrl.registryFormCustom.registry_password.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormCustom.registry_password.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

62
app/portainer/components/forms/registry-form-dockerhub/registry-form-dockerhub.html
View File

@ -14,19 +14,19 @@
<label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label> <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="dockerhub-prod-us" required /> <input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="dockerhub-prod-us" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormDockerhub.registry_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormDockerhub.registry_name.$invalid"> <div ng-messages="$ctrl.registryFormDockerhub.registry_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormDockerhub.registry_name.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. <p ng-message="used" class="vertical-center">
</p> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="used" class="vertical-center"> A registry with the same name already exists.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
A registry with the same name already exists. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -36,15 +36,15 @@
<label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">DockerHub username</label> <label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">DockerHub username</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required /> <input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormDockerhub.registry_username.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormDockerhub.registry_username.$invalid"> <div ng-messages="$ctrl.registryFormDockerhub.registry_username.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormDockerhub.registry_username.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -54,15 +54,15 @@
<label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">DockerHub access token</label> <label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">DockerHub access token</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required /> <input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormDockerhub.registry_password.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormDockerhub.registry_password.$invalid"> <div ng-messages="$ctrl.registryFormDockerhub.registry_password.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormDockerhub.registry_password.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

72
app/portainer/components/forms/registry-form-gitlab/registry-form-gitlab.html
View File

@ -14,15 +14,15 @@
<label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label> <label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required /> <input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required />
</div> <div class="help-block" ng-show="registryFormGitlab.registry_username.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="registryFormGitlab.registry_username.$invalid"> <div ng-messages="registryFormGitlab.registry_username.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="registryFormGitlab.registry_username.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -32,15 +32,15 @@
<label for="registry_perso_acc_token" class="col-sm-3 col-lg-2 control-label text-left required">Personal Access Token </label> <label for="registry_perso_acc_token" class="col-sm-3 col-lg-2 control-label text-left required">Personal Access Token </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="password" class="form-control" id="registry_perso_acc_token" name="registry_perso_acc_token" ng-model="$ctrl.model.Token" required /> <input type="password" class="form-control" id="registry_perso_acc_token" name="registry_perso_acc_token" ng-model="$ctrl.model.Token" required />
</div> <div class="help-block" ng-show="registryFormGitlab.registry_perso_acc_token.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="registryFormGitlab.registry_perso_acc_token.$invalid"> <div ng-messages="registryFormGitlab.registry_perso_acc_token.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="registryFormGitlab.registry_perso_acc_token.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -77,15 +77,15 @@
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="instance_url" name="instance_url" ng-model="$ctrl.model.Gitlab.InstanceURL" placeholder="https://gitlab.com" required /> <input type="text" class="form-control" id="instance_url" name="instance_url" ng-model="$ctrl.model.Gitlab.InstanceURL" placeholder="https://gitlab.com" required />
</div> <div class="help-block" ng-show="registryFormGitlab.instance_url.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="registryFormGitlab.instance_url.$invalid"> <div ng-messages="registryFormGitlab.instance_url.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="registryFormGitlab.instance_url.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -98,15 +98,15 @@
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_url" name="registry_url" ng-model="$ctrl.model.URL" placeholder="https://registry.gitlab.com" required /> <input type="text" class="form-control" id="registry_url" name="registry_url" ng-model="$ctrl.model.URL" placeholder="https://registry.gitlab.com" required />
</div> <div class="help-block" ng-show="registryFormGitlab.registry_url.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="registryFormGitlab.registry_url.$invalid"> <div ng-messages="registryFormGitlab.registry_url.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="registryFormGitlab.registry_url.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

98
app/portainer/components/forms/registry-form-proget/registry-form-proget.html
View File

@ -12,19 +12,19 @@
<label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label> <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="proget-registry" required auto-focus /> <input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="proget-registry" required auto-focus />
</div> <div class="help-block" ng-show="$ctrl.registryFormProGet.registry_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_name.$invalid"> <div ng-messages="$ctrl.registryFormProGet.registry_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormProGet.registry_name.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. <p ng-message="used" class="vertical-center">
</p> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="used" class="vertical-center"> A registry with the same name already exists.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
A registry with the same name already exists. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -37,15 +37,15 @@
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_url" name="registry_url" ng-model="$ctrl.model.URL" placeholder="proget.example.com/example-registry" required /> <input type="text" class="form-control" id="registry_url" name="registry_url" ng-model="$ctrl.model.URL" placeholder="proget.example.com/example-registry" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormProGet.registry_url.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_url.$invalid"> <div ng-messages="$ctrl.registryFormProGet.registry_url.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormProGet.registry_url.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -58,15 +58,15 @@
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_base_url" name="registry_base_url" ng-model="$ctrl.model.BaseURL" placeholder="proget.example.com" required /> <input type="text" class="form-control" id="registry_base_url" name="registry_base_url" ng-model="$ctrl.model.BaseURL" placeholder="proget.example.com" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormProGet.registry_base_url.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_base_url.$invalid"> <div ng-messages="$ctrl.registryFormProGet.registry_base_url.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormProGet.registry_base_url.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -77,15 +77,15 @@
<label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label> <label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required /> <input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormProGet.registry_username.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_username.$invalid"> <div ng-messages="$ctrl.registryFormProGet.registry_username.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormProGet.registry_username.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -95,15 +95,15 @@
<label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">Password</label> <label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">Password</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required /> <input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormProGet.registry_password.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_password.$invalid"> <div ng-messages="$ctrl.registryFormProGet.registry_password.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormProGet.registry_password.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

80
app/portainer/components/forms/registry-form-quay/registry-form-quay.html
View File

@ -5,19 +5,19 @@
<label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label> <label for="registry_name" class="col-sm-3 col-lg-2 control-label text-left required">Name</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="Quay" required /> <input type="text" class="form-control" id="registry_name" name="registry_name" ng-model="$ctrl.model.Name" placeholder="Quay" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormQuay.registry_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormQuay.registry_name.$invalid"> <div ng-messages="$ctrl.registryFormQuay.registry_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormQuay.registry_name.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. <p ng-message="used" class="vertical-center">
</p> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="used" class="vertical-center"> A registry with the same name already exists.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
A registry with the same name already exists. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -27,15 +27,15 @@
<label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label> <label for="registry_username" class="col-sm-3 col-lg-2 control-label text-left required">Username</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required auto-focus /> <input type="text" class="form-control" id="registry_username" name="registry_username" ng-model="$ctrl.model.Username" required auto-focus />
</div> <div class="help-block" ng-show="$ctrl.registryFormQuay.registry_username.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormQuay.registry_username.$invalid"> <div ng-messages="$ctrl.registryFormQuay.registry_username.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormQuay.registry_username.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -45,15 +45,15 @@
<label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">Password</label> <label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left required">Password</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required /> <input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormQuay.registry_password.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormQuay.registry_password.$invalid"> <div ng-messages="$ctrl.registryFormQuay.registry_password.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormQuay.registry_password.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>
@ -77,15 +77,15 @@
<label for="organisation_name" class="col-sm-3 col-lg-2 control-label text-left required">Organisation name</label> <label for="organisation_name" class="col-sm-3 col-lg-2 control-label text-left required">Organisation name</label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input type="text" class="form-control" id="organisation_name" name="organisation_name" ng-model="$ctrl.model.Quay.organisationName" required /> <input type="text" class="form-control" id="organisation_name" name="organisation_name" ng-model="$ctrl.model.Quay.organisationName" required />
</div> <div class="help-block" ng-show="$ctrl.registryFormQuay.organisation_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="$ctrl.registryFormQuay.organisation_name.$invalid"> <div ng-messages="$ctrl.registryFormQuay.organisation_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="$ctrl.registryFormQuay.organisation_name.$error"> <pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon> </p>
This field is required. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

7
app/portainer/views/account/account.html
View File

@ -38,7 +38,12 @@
</div> </div>
</div> </div>
</div> </div>
<password-check-hint password-valid="form.new_password.$valid && formValues.newPassword" force-change-password="forceChangePassword"></password-check-hint> <div class="form-group">
<div class="col-sm-3 col-lg-2"></div>
<div class="col-sm-8">
<password-check-hint password-valid="form.new_password.$valid && formValues.newPassword" force-change-password="forceChangePassword"></password-check-hint>
</div>
</div>
<!-- !confirm-password-input --> <!-- !confirm-password-input -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">

2
app/portainer/views/init/admin/initAdmin.html
View File

@ -70,7 +70,7 @@
<!-- !confirm-password-input --> <!-- !confirm-password-input -->
<!-- note --> <!-- note -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-12 text-muted"> <div class="col-sm-12 text-warning">
<p class="vertical-center"> <p class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon> <pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
<span>The password must be at least {{ requiredPasswordLength }} characters long.</span> <span>The password must be at least {{ requiredPasswordLength }} characters long.</span>

18
app/portainer/views/stacks/create/createstack.html
View File

@ -19,15 +19,15 @@
auto-focus auto-focus
ng-pattern="STACK_NAME_VALIDATION_REGEX" ng-pattern="STACK_NAME_VALIDATION_REGEX"
/> />
</div> <div class="help-block" ng-show="createStackForm.stack_name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="createStackForm.stack_name.$invalid"> <div ng-messages="createStackForm.stack_name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="pattern">
<div ng-messages="createStackForm.stack_name.$error"> <span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span>
<p ng-message="pattern"> This field must consist of lower case alphanumeric characters, '_' or '-' (e.g. 'my-name', or 'abc-123').
<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> </p>
<span>This field must consist of lower case alphanumeric characters, '_' or '-' (e.g. 'my-name', or 'abc-123').</span> </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

26
app/portainer/views/tags/tags.html
View File

@ -20,19 +20,19 @@
required required
auto-focus auto-focus
/> />
</div> <div class="help-block" ng-show="tagCreationForm.name.$invalid">
</div> <div class="small text-warning">
<div class="form-group" ng-show="tagCreationForm.name.$invalid"> <div ng-messages="tagCreationForm.name.$error">
<div class="col-sm-12 small text-warning"> <p ng-message="required" class="vertical-center">
<div ng-messages="tagCreationForm.name.$error"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
<p ng-message="required" class="vertical-center"> This field is required.
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> </p>
This field is required. <p ng-message="validName" class="vertical-center">
</p> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
<p ng-message="validName" class="vertical-center"> This tag already exists.
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> </p>
This tag already exists. </div>
</p> </div>
</div> </div>
</div> </div>
</div> </div>

2
app/react/components/PasswordCheckHint.tsx
View File

@ -16,7 +16,7 @@ export function PasswordCheckHint({
return ( return (
<div> <div>
<p className="text-muted vertical-center"> <p className="text-warning vertical-center">
<Icon icon="alert-triangle" className="icon-warning" feather /> <Icon icon="alert-triangle" className="icon-warning" feather />
{forceChangePassword && {forceChangePassword &&
'An administrator has changed your password requirements, '} 'An administrator has changed your password requirements, '}

37
app/react/components/form-components/FormControl/FormControl.tsx
View File

@ -29,29 +29,28 @@ export function FormControl({
required, required,
}: PropsWithChildren<Props>) { }: PropsWithChildren<Props>) {
return ( return (
<> <div className={clsx('form-group', styles.container)}>
<div className={clsx('form-group', styles.container)}> <label
<label htmlFor={inputId}
htmlFor={inputId} className={clsx(sizeClassLabel(size), 'control-label', 'text-left')}
className={clsx(sizeClassLabel(size), 'control-label', 'text-left')} >
> {label}
{label}
{required && <span className="text-danger">*</span>} {required && <span className="text-danger">*</span>}
{tooltip && <Tooltip message={tooltip} />} {tooltip && <Tooltip message={tooltip} />}
</label> </label>
<div className={sizeClassChildren(size)}>{children}</div> <div className={sizeClassChildren(size)}>
</div> {children}
{errors && (
<div className="form-group"> {errors && (
<div className="col-md-12"> <span className="help-block">
<FormError>{errors}</FormError> <FormError>{errors}</FormError>
</div> </span>
</div> )}
)} </div>
</> </div>
); );
} }