mirror of https://github.com/portainer/portainer
fix(registry): correct words in registry page and other places EE-4894 (#8356)
parent
5a375ff055
commit
89dd72b4ac
|
@ -25,7 +25,7 @@ Each commit message should include a **type**, a **scope** and a **subject**:
|
||||||
<type>(<scope>): <subject>
|
<type>(<scope>): <subject>
|
||||||
```
|
```
|
||||||
|
|
||||||
Lines should not exceed 100 characters. This allows the message to be easier to read on github as well as in various git tools and produces a nice, neat commit log ie:
|
Lines should not exceed 100 characters. This allows the message to be easier to read on GitHub as well as in various git tools and produces a nice, neat commit log ie:
|
||||||
|
|
||||||
```
|
```
|
||||||
#271 feat(containers): add exposed ports in the containers view
|
#271 feat(containers): add exposed ports in the containers view
|
||||||
|
@ -63,7 +63,7 @@ The subject contains succinct description of the change:
|
||||||
|
|
||||||
## Contribution process
|
## Contribution process
|
||||||
|
|
||||||
Our contribution process is described below. Some of the steps can be visualized inside Github via specific `status/` labels, such as `status/1-functional-review` or `status/2-technical-review`.
|
Our contribution process is described below. Some of the steps can be visualized inside GitHub via specific `status/` labels, such as `status/1-functional-review` or `status/2-technical-review`.
|
||||||
|
|
||||||
### Bug report
|
### Bug report
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<span class="col-sm-12 text-muted small">
|
<span class="col-sm-12 text-muted small">
|
||||||
<p>
|
<p>
|
||||||
For information on how to generate a Gitlab Personal Access Token, follow the
|
For information on how to generate a GitLab Personal Access Token, follow the
|
||||||
<a href="https://gitlab.com/help/user/profile/personal_access_tokens.md" target="_blank">gitlab guide</a>.
|
<a href="https://gitlab.com/help/user/profile/personal_access_tokens.md" target="_blank">GitLab guide</a>.
|
||||||
</p>
|
</p>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-12 form-section-title"> Gitlab registry connection details </div>
|
<div class="col-sm-12 form-section-title"> GitLab registry connection details </div>
|
||||||
<!-- credentials-user -->
|
<!-- credentials-user -->
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="registry_username" class="col-sm-3 col-lg-2 control-label required text-left">Username</label>
|
<label for="registry_username" class="col-sm-3 col-lg-2 control-label required text-left">Username</label>
|
||||||
|
@ -122,7 +122,7 @@
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<div class="form-horizontal" ng-if="$ctrl.projects">
|
<div class="form-horizontal" ng-if="$ctrl.projects">
|
||||||
<div class="col-sm-12 form-section-title"> Gitlab projects </div>
|
<div class="col-sm-12 form-section-title"> GitLab projects </div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<span class="col-sm-12 text-muted small"> Select the project's registries you want to manage. Portainer will create one registry for each selected project. </span>
|
<span class="col-sm-12 text-muted small"> Select the project's registries you want to manage. Portainer will create one registry for each selected project. </span>
|
||||||
<span class="col-sm-12 text-muted small vertical-center">
|
<span class="col-sm-12 text-muted small vertical-center">
|
||||||
|
@ -133,7 +133,7 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<gitlab-projects-datatable
|
<gitlab-projects-datatable
|
||||||
title-text="Gitlab projects"
|
title-text="GitLab projects"
|
||||||
title-icon="list"
|
title-icon="list"
|
||||||
dataset="$ctrl.projects"
|
dataset="$ctrl.projects"
|
||||||
table-key="gitlab_projects"
|
table-key="gitlab_projects"
|
||||||
|
|
|
@ -63,7 +63,7 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="col-sm-12">
|
<div class="col-sm-12">
|
||||||
<por-switch-field
|
<por-switch-field
|
||||||
label="'Use organisation registry'"
|
label="'Use organization registry'"
|
||||||
checked="$ctrl.model.Quay.useOrganisation"
|
checked="$ctrl.model.Quay.useOrganisation"
|
||||||
on-change="($ctrl.toggleOrganisation)"
|
on-change="($ctrl.toggleOrganisation)"
|
||||||
label-class="'col-sm-2'"
|
label-class="'col-sm-2'"
|
||||||
|
@ -74,7 +74,7 @@
|
||||||
<div ng-if="$ctrl.model.Quay.useOrganisation">
|
<div ng-if="$ctrl.model.Quay.useOrganisation">
|
||||||
<!-- organisation_name -->
|
<!-- organisation_name -->
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="organisation_name" class="col-sm-3 col-lg-2 control-label required text-left">Organisation name</label>
|
<label for="organisation_name" class="col-sm-3 col-lg-2 control-label required text-left">Organization 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 class="help-block" ng-show="$ctrl.registryFormQuay.organisation_name.$invalid">
|
<div class="help-block" ng-show="$ctrl.registryFormQuay.organisation_name.$invalid">
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="btn btn-primary btn-lg btn-block" ng-if="ctrl.state.OAuthProvider === 'Github'">
|
<div class="btn btn-primary btn-lg btn-block" ng-if="ctrl.state.OAuthProvider === 'Github'">
|
||||||
<pr-icon icon="'svg-github'"></pr-icon>
|
<pr-icon icon="'svg-github'"></pr-icon>
|
||||||
Login with Github
|
Login with GitHub
|
||||||
</div>
|
</div>
|
||||||
<div class="btn btn-primary btn-lg btn-block" ng-if="ctrl.state.OAuthProvider === 'OAuth'">
|
<div class="btn btn-primary btn-lg btn-block" ng-if="ctrl.state.OAuthProvider === 'OAuth'">
|
||||||
<pr-icon icon="'log-in'"></pr-icon>
|
<pr-icon icon="'log-in'"></pr-icon>
|
||||||
|
|
|
@ -48,8 +48,8 @@ export const options = [
|
||||||
{
|
{
|
||||||
id: 'registry_gitlab',
|
id: 'registry_gitlab',
|
||||||
icon: Gitlab,
|
icon: Gitlab,
|
||||||
label: 'Gitlab',
|
label: 'GitLab',
|
||||||
description: 'Gitlab container registry',
|
description: 'GitLab container registry',
|
||||||
value: '4',
|
value: '4',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -209,7 +209,7 @@
|
||||||
<div ng-if="$ctrl.registry.Type == $ctrl.RegistryTypes.QUAY">
|
<div ng-if="$ctrl.registry.Type == $ctrl.RegistryTypes.QUAY">
|
||||||
<!-- organisation-checkbox -->
|
<!-- organisation-checkbox -->
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label class="col-sm-3 col-lg-2 control-label text-left"> Use organisation registry </label>
|
<label class="col-sm-3 col-lg-2 control-label text-left"> Use organization registry </label>
|
||||||
<div class="col-sm-9 col-lg-10">
|
<div class="col-sm-9 col-lg-10">
|
||||||
<por-switch-field
|
<por-switch-field
|
||||||
checked="$ctrl.registry.Quay.UseOrganisation"
|
checked="$ctrl.registry.Quay.UseOrganisation"
|
||||||
|
@ -222,7 +222,7 @@
|
||||||
<div ng-if="$ctrl.registry.Quay.UseOrganisation">
|
<div ng-if="$ctrl.registry.Quay.UseOrganisation">
|
||||||
<!-- organisation_name -->
|
<!-- organisation_name -->
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="organisation_name" class="col-sm-3 col-lg-2 control-label required text-left">Organisation name</label>
|
<label for="organisation_name" class="col-sm-3 col-lg-2 control-label required text-left">Organization 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.registry.Quay.OrganisationName" required />
|
<input type="text" class="form-control" id="organisation_name" name="organisation_name" ng-model="$ctrl.registry.Quay.OrganisationName" required />
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue