Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-08 15:25:22 +02:00
Code Issues Releases Activity

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

Browse source 
* update warning text colour, icon and alignment to match figma
This commit is contained in:
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
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,7 @@
/>
<span class="help-block">
<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">
<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">
@ -37,7 +37,7 @@
<div class="col-sm-8">
<input type="text" class="form-control" id="description" ng-model="$ctrl.formValues.Description" name="description" required />
<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-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>

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>
</div>
<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">
<p class="vertical-center" ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Path is required. </p>
</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 class="small vertical-center" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
<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
>
</div>
@ -60,7 +60,7 @@
/>
<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="small text-muted">
<div class="small text-warning">
<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="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>
<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 />
</div>
</div>
<div class="form-group" ng-show="endpointGroupForm.group_name.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="endpointGroupForm.group_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="endpointGroupForm.group_name.$invalid">
<div class="small text-warning">
<div ng-messages="endpointGroupForm.group_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_name.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
<div class="help-block" ng-show="$ctrl.registryFormEcr.registry_name.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
</div>
</div>
</div>
</div>
</div>
@ -48,15 +48,15 @@
placeholder="aws-account-id.dkr.ecr.us-east-1.amazonaws.com/"
required
/>
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_url.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormEcr.registry_url.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_access_key.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_access_key.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormEcr.registry_access_key.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_access_key.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_secret_access_key.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_secret_access_key.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormEcr.registry_secret_access_key.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_secret_access_key.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormEcr.registry_region.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_region.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
<div class="help-block" ng-show="$ctrl.registryFormEcr.registry_region.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormEcr.registry_region.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormAzure.registry_name.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormAzure.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
<div class="help-block" ng-show="$ctrl.registryFormAzure.registry_name.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormAzure.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
</div>
</div>
</div>
</div>
</div>
@ -30,15 +30,15 @@
</label>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormAzure.registry_url.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormAzure.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormAzure.registry_url.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormAzure.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormAzure.registry_username.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormAzure.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormAzure.registry_username.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormAzure.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormAzure.registry_password.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormAzure.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormAzure.registry_password.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormAzure.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormCustom.registry_name.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormCustom.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
<div class="help-block" ng-show="$ctrl.registryFormCustom.registry_name.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormCustom.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
</div>
</div>
</div>
</div>
</div>
@ -37,15 +37,15 @@
</label>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormCustom.registry_url.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormCustom.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormCustom.registry_url.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormCustom.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormCustom.registry_username.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormCustom.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormCustom.registry_username.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormCustom.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormCustom.registry_password.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormCustom.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormCustom.registry_password.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormCustom.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormDockerhub.registry_name.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormDockerhub.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
<div class="help-block" ng-show="$ctrl.registryFormDockerhub.registry_name.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormDockerhub.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormDockerhub.registry_username.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormDockerhub.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormDockerhub.registry_username.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormDockerhub.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormDockerhub.registry_password.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormDockerhub.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormDockerhub.registry_password.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormDockerhub.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="registryFormGitlab.registry_username.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="registryFormGitlab.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="registryFormGitlab.registry_username.$invalid">
<div class="small text-warning">
<div ng-messages="registryFormGitlab.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="registryFormGitlab.registry_perso_acc_token.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="registryFormGitlab.registry_perso_acc_token.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="registryFormGitlab.registry_perso_acc_token.$invalid">
<div class="small text-warning">
<div ng-messages="registryFormGitlab.registry_perso_acc_token.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</div>
</div>
</div>
</div>
</div>
@ -77,15 +77,15 @@
</label>
<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 />
</div>
</div>
<div class="form-group" ng-show="registryFormGitlab.instance_url.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="registryFormGitlab.instance_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="registryFormGitlab.instance_url.$invalid">
<div class="small text-warning">
<div ng-messages="registryFormGitlab.instance_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</div>
</div>
</div>
</div>
</div>
@ -98,15 +98,15 @@
</label>
<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 />
</div>
</div>
<div class="form-group" ng-show="registryFormGitlab.registry_url.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="registryFormGitlab.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="registryFormGitlab.registry_url.$invalid">
<div class="small text-warning">
<div ng-messages="registryFormGitlab.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_name.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
<div class="help-block" ng-show="$ctrl.registryFormProGet.registry_name.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
</div>
</div>
</div>
</div>
</div>
@ -37,15 +37,15 @@
</label>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_url.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormProGet.registry_url.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</div>
</div>
</div>
</div>
</div>
@ -58,15 +58,15 @@
</label>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_base_url.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_base_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormProGet.registry_base_url.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_base_url.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_username.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormProGet.registry_username.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormProGet.registry_password.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormProGet.registry_password.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormProGet.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormQuay.registry_name.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormQuay.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
<div class="help-block" ng-show="$ctrl.registryFormQuay.registry_name.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormQuay.registry_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<p ng-message="used" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
A registry with the same name already exists.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormQuay.registry_username.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormQuay.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormQuay.registry_username.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormQuay.registry_username.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormQuay.registry_password.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormQuay.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormQuay.registry_password.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormQuay.registry_password.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</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>
<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 />
</div>
</div>
<div class="form-group" ng-show="$ctrl.registryFormQuay.organisation_name.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="$ctrl.registryFormQuay.organisation_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
<div class="help-block" ng-show="$ctrl.registryFormQuay.organisation_name.$invalid">
<div class="small text-warning">
<div ng-messages="$ctrl.registryFormQuay.organisation_name.$error">
<p ng-message="required" class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true"></pr-icon>
This field is required.
</p>
</div>
</div>
</div>
</div>
</div>

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

@ -38,7 +38,12 @@
</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 -->
<div class="form-group">
<div class="col-sm-12">

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

@ -70,7 +70,7 @@
<!-- !confirm-password-input -->
<!-- note -->
<div class="form-group">
<div class="col-sm-12 text-muted">
<div class="col-sm-12 text-warning">
<p class="vertical-center">
<pr-icon icon="'alert-triangle'" feather="true" mode="'warning'"></pr-icon>
<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
ng-pattern="STACK_NAME_VALIDATION_REGEX"
/>
</div>
</div>
<div class="form-group" ng-show="createStackForm.stack_name.$invalid">
<div class="col-sm-12 small text-warning">
<div ng-messages="createStackForm.stack_name.$error">
<p ng-message="pattern">
<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
<span>This field must consist of lower case alphanumeric characters, '_' or '-' (e.g. 'my-name', or 'abc-123').</span>
</p>
<div class="help-block" ng-show="createStackForm.stack_name.$invalid">
<div class="small text-warning">
<div ng-messages="createStackForm.stack_name.$error">
<p ng-message="pattern">
<span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span>
This field must consist of lower case alphanumeric characters, '_' or '-' (e.g. 'my-name', or 'abc-123').
</p>
</div>
</div>
</div>
</div>
</div>

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

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