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

refactor(service): docker service edition page [EE-3520] (#7327)

pull/7353/head
Zhang Hao 2022-07-27 09:55:16 +08:00 committed by GitHub
parent ac6296b86d
commit 5ffcbe8677
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/docker/views/containers/create/createcontainer.html
View File

@ -672,7 +672,7 @@
<div class="col-sm-12" style="margin-top: 5px">
<label class="control-label text-left">Sysctls</label>
<span class="label label-default interactive" style="margin-left: 10px" ng-click="addSysctl()">
<pr-icon icon="'plus'" mode="'alt'" feather="true"></pr-icon> add sysctl
<pr-icon icon="'plus'" feather="true"></pr-icon> add sysctl
</span>
</div>
<!-- sysctls-input-list -->

4
app/portainer/components/environment-variables-panel/environment-variables-panel.html
View File

@ -18,14 +18,14 @@
<a class="small interactive" ng-click="$ctrl.switchEnvMode()"> <i class="fa fa-list-ol space-right" aria-hidden="true"></i> Simple mode </a>
</div>
<div class="col-sm-12 small text-muted">
<i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
<pr-icon icon="'alert-circle'" mode="'primary'" feather="true"></pr-icon>
Switch to simple mode to define variables line by line, or load from .env file
</div>
<div class="form-group" style="margin-left: 1px">
<code-editor identifier="environment-variables-editor" placeholder="e.g. key=value" value="$ctrl.editorText" yml="false" on-change="($ctrl.editorUpdate)"></code-editor>
</div>
<div class="col-sm-12 small text-muted" ng-if="$ctrl.showHelpMessage">
<i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
<pr-icon icon="'alert-circle'" mode="'primary'" feather="true"></pr-icon>
Environment changes will not take effect until redeployment occurs manually or via webhook.
</div>
</div>

4
app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode-item/environment-variables-simple-mode-item.html
View File

@ -14,9 +14,9 @@
/>
</div>
<div class="form-group" style="margin-top: 5px" ng-show="$ctrl[$ctrl.formName].name.$invalid">
<div class="col-sm-12 small text-warning">
<div class="col-sm-12 small">
<div ng-messages="$ctrl[$ctrl.formName].name.$error">
<p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Name is required. </p>
<p ng-message="required"> <pr-icon icon="'alert-triangle'" mode="'warning'" feather="true"></pr-icon> Name is required. </p>
<p ng-message="pattern">
<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
This field must consist alphanumeric characters, '-' or '_', start with an alphabetic character, and end with an alphanumeric character (e.g. 'my-var', or 'MY_VAR123').

10
app/portainer/components/environment-variables-panel/environment-variables-simple-mode/environment-variables-simple-mode.html
View File

@ -1,13 +1,13 @@
<div class="environment-variables-simple-mode">
<div class="col-sm-12">
<a class="small interactive" ng-click="$ctrl.onSwitchModeClick()"> <i class="fa fa-list-ol space-right" aria-hidden="true"></i> Advanced mode </a>
<a class="small interactive" ng-click="$ctrl.onSwitchModeClick()"> <pr-icon icon="'list'" feather="true"></pr-icon> Advanced mode </a>
</div>
<div class="col-sm-12 small text-muted">
<i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
<pr-icon icon="'alert-circle'" mode="'primary'" feather="true"></pr-icon>
Switch to advanced mode to copy & paste multiple variables
</div>
<div class="col-sm-12 environment-variables-simple-mode--actions">
<button type="button" class="btn btn-sm btn-default" ng-click="$ctrl.add()"> <i class="fa fa-plus-circle" aria-hidden="true"></i> Add an environment variable </button>
<button type="button" class="btn btn-sm btn-default" ng-click="$ctrl.add()"> <pr-icon icon="'plus'" feather="true"></pr-icon> Add an environment variable </button>
<button
type="button"
class="btn btn-sm btn-default"
@ -17,7 +17,7 @@
ngf-max-size="1MB"
ngf-model-invalid="errorFile"
>
<i class="fa fa-file-upload" aria-hidden="true"></i> Load variables from .env file
<pr-icon icon="'upload'" feather="true"></pr-icon>
</button>
<span class="space-left" ng-if="errorFile.$error == 'maxSize'">
<i class="fa fa-times red-icon space-right" aria-hidden="true"></i>
@ -34,7 +34,7 @@
></environment-variables-simple-mode-item>
</div>
<div class="col-sm-12 small text-muted" ng-if="$ctrl.ngModel.length > 0 && $ctrl.showHelpMessage">
<i class="fa fa-info-circle blue-icon space-right" aria-hidden="true"></i>
<pr-icon icon="'alert-circle'" mode="'primary'" feather="true"></pr-icon>
Environment changes will not take effect until redeployment occurs manually or via webhook.
</div>
</div>