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(ui): kubernetes-consistent-styling EE-3820 (#7425)

Browse source
This commit is contained in:
Ali 2022-08-13 00:22:45 +06:00 • committed by GitHub
parent b67f404d8d
commit 36c93c7f57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 713 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/portainer/components/accessControlForm/porAccessControlForm.html
View file

@ -16,7 +16,7 @@
<!-- !access-control-switch -->
<!-- restricted-access -->
<div class="form-group" ng-if="$ctrl.formData.AccessControlEnabled" style="margin-bottom: 0">
<div class="boxselector_wrapper">
<div class="boxselector_wrapper px-[15px]">
<div ng-if="$ctrl.isAdmin">
<input type="radio" id="access_administrators" ng-model="$ctrl.formData.Ownership" value="administrators" />
<label for="access_administrators" data-cy="portainer-selectAdminAccess">

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

@ -1,7 +1,7 @@
<ng-form name="commonCustomTemplateForm">
<!-- title-input -->
<div class="form-group mb-0">
<label for="template_title" class="col-sm-3 col-lg-2 control-label text-left"> Title </label>
<label for="template_title" class="col-sm-3 col-lg-2 control-label text-left required"> Title </label>
<div class="col-sm-8">
<input
type="text"
@ -33,7 +33,7 @@
<!-- description-input -->
<div class="form-group mb-0">
<label for="description" class="col-sm-3 col-lg-2 control-label text-left">Description</label>
<label for="description" class="col-sm-3 col-lg-2 control-label text-left required">Description</label>
<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">

3
app/portainer/components/custom-template-selector/custom-template-selector.html
View file

@ -12,8 +12,7 @@
<option value="" label="Select a Custom template" disabled selected="selected"> </option>
</select>
<span class="small text-muted pt-[7px]" ng-if="!$ctrl.templates.length">
No custom templates are available. Head over to the <a class="text-blue-8 hover:underline hover:text-blue-8" ui-state="$ctrl.newTemplatePath">custom template view</a> to
create one.
No custom templates are available. Head over to the <a class="hyperlink" ui-state="$ctrl.newTemplatePath">custom template view</a> to create one.
</span>
</div>
</div>

5
app/portainer/components/custom-templates-list/customTemplatesList.html
View file

@ -2,7 +2,10 @@
<rd-widget>
<rd-widget-body classes="no-padding">
<div class="toolBar vertical-center !gap-x-5 !gap-y-1 flex-wrap">
<rd-widget-header icon="{{ $ctrl.titleIcon }}" feather-icon="true" title-text="Custom Templates" class="!flex-auto !mr-0" parent-classes="!p-0"></rd-widget-header>
<div class="toolBarTitle vertical-center">
<pr-icon icon="$ctrl.titleIcon" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon>
Custom Templates
</div>
<div class="searchBar vertical-center !mr-0">
<pr-icon icon="'search'" feather="true" class-name="'searchIcon'"></pr-icon>
<input

3
app/portainer/components/datatables/datatable.css
View file

@ -3,7 +3,8 @@
overflow: auto;
padding: 20px;
font-size: 16px;
border-radius: 8px;
border-top-left-radius: 8px;
border-top-right-radius: 8px;
display: flex;
align-items: center;

6
app/portainer/components/datatables/registries-datatable/registriesDatatable.html
View file

@ -99,9 +99,11 @@
{{ item.URL }}
</td>
<td>
<a ng-if="$ctrl.canManageAccess(item)" ng-click="$ctrl.redirectToManageAccess(item)"> <pr-icon icon="'users'" feather="true"></pr-icon> Manage access </a>
<a class="vertical-center" ng-if="$ctrl.canManageAccess(item)" ng-click="$ctrl.redirectToManageAccess(item)">
<pr-icon icon="'users'" feather="true"></pr-icon> Manage access
</a>
<be-feature-indicator feature="$ctrl.limitedFeature" ng-if="$ctrl.canBrowse(item)">
<span class="text-muted space-left" style="padding-right: 5px"> <pr-icon icon="'search'" feather="true" class-name="'searchIcon'"></pr-icon> Browse </span>
<span class="text-muted space-left" style="padding-right: 5px"> <pr-icon icon="'search'" feather="true"></pr-icon> Browse </span>
</be-feature-indicator>
<span ng-if="!$ctrl.canBrowse(item) && !$ctrl.canManageAccess(item)"> - </span>

1
app/portainer/components/form-components/web-editor-form/index.js
View file

@ -11,6 +11,7 @@ export const webEditorForm = {
value: '<',
readOnly: '<',
onChange: '<',
hideTitle: '<',
},
transclude: {

8
app/portainer/components/form-components/web-editor-form/web-editor-form.html
View file

@ -1,9 +1,7 @@
<ng-form name="$ctrl.webEditorForm">
<div class="web-editor">
<div class="col-sm-12 form-section-title"> Web editor </div>
<div class="form-group col-sm-12 col-lg-12">
<div class="text-muted small" ng-transclude="description"> </div>
</div>
<div class="web-editor overflow-auto">
<div ng-if="!$ctrl.hideTitle" class="col-sm-12 form-section-title">Web editor</div>
<div class="trancluded-item form-group col-sm-12 col-lg-12 text-muted small" ng-transclude="description"></div>
<div class="form-group">
<div class="col-sm-12 col-lg-12">
<code-editor

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

@ -2,7 +2,7 @@
<div class="form-group col-sm-12">
<div class="form-inline mt-3">
<div class="input-group col-sm-5 input-group-sm">
<span class="input-group-addon">path</span>
<span class="input-group-addon required">path</span>
<input
type="text"
name="name"
@ -13,7 +13,7 @@
required
/>
</div>
<button class="btn btn-sm btn-light btn-only-icon" type="button" ng-click="$ctrl.removeValue()" title="Remove">
<button class="btn btn-sm btn-dangerlight btn-only-icon" type="button" ng-click="$ctrl.removeValue()" title="Remove">
<pr-icon icon="'trash-2'" size="'md'" feather="true"></pr-icon>
</button>
</div>

8
app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html
View file

@ -17,7 +17,7 @@
</div>
<div ng-if="$ctrl.model.RepositoryAuthentication" class="row">
<div class="form-group">
<label for="repository_username" class="col-lg-2 col-sm-3 control-label text-left"> Username </label>
<label for="repository_username" class="col-lg-2 col-sm-3 control-label text-left required"> Username </label>
<div class="col-sm-8">
<input
type="text"
@ -30,9 +30,9 @@
/>
</div>
</div>
<div class="form-group">
<label for="repository_password" class="col-lg-2 col-sm-3 control-label text-left">
Personal Access Token
<div class="form-group flex">
<label for="repository_password" class="col-lg-2 col-sm-3 control-label text-left !pt-0">
<div class="required"> Personal Access Token </div>
<portainer-tooltip message="'Provide a personal access token or password'"></portainer-tooltip>
</label>
<div class="col-sm-8">

12
app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html
View file

@ -11,7 +11,7 @@
></por-switch-field>
</div>
</div>
<div class="small" 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>
<span class="text-muted">Any changes to this stack or application made locally in Portainer will be overridden, which may cause service interruption.</span>
</div>
@ -35,8 +35,8 @@
<label for="repository_mechanism" class="col-sm-3 col-lg-2 control-label text-left"> Webhook </label>
<div class="col-sm-8">
<span class="text-muted"> {{ $ctrl.model.RepositoryWebhookURL | truncatelr }} </span>
<button type="button" class="btn btn-sm btn-light btn-sm space-left" ng-if="$ctrl.model.RepositoryWebhookURL" ng-click="$ctrl.copyWebhook()">
<span><pr-icon icon="'copy'" size="'sm'" feather="true"></pr-icon> Copy link</span>
<button type="button" class="btn btn-sm btn-light btn-sm space-left vertical-center" ng-if="$ctrl.model.RepositoryWebhookURL" ng-click="$ctrl.copyWebhook()">
<pr-icon icon="'copy'" size="'sm'" feather="true"></pr-icon> Copy link
</button>
<span>
<pr-icon icon="'check'" mode="'success'" feather="true" style="display: none"></pr-icon>
@ -44,7 +44,7 @@
</div>
</div>
<div class="form-group" ng-if="$ctrl.model.RepositoryAutomaticUpdates && $ctrl.model.RepositoryMechanism === 'Interval'">
<label for="repository_fetch_interval" class="col-sm-3 col-lg-2 control-label text-left"> Fetch interval </label>
<label for="repository_fetch_interval" class="col-sm-3 col-lg-2 control-label text-left required"> Fetch interval </label>
<div class="col-sm-8">
<input
type="text"
@ -94,11 +94,11 @@
></por-switch-field>
</div>
</div>
<div class="small" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
<div class="small vertical-center" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
<pr-icon icon="'info'" mode="'primary'" feather="true"></pr-icon>
<span class="text-muted">When enabled, enforces automatic deployment at each interval or webhook invocation.</span>
</div>
<div class="small" ng-if="!$ctrl.model.RepositoryAutomaticUpdates">
<div class="small vertical-center" ng-if="!$ctrl.model.RepositoryAutomaticUpdates">
<pr-icon icon="'info'" mode="'primary'" feather="true"></pr-icon>
<span class="text-muted">When enabled, updates from the git repository will occur automatically at an interval or webhook.</span>
</div>

8
app/portainer/components/forms/git-form/git-form-compose-path-field/git-form-compose-path-field.html
View file

@ -1,12 +1,12 @@
<ng-form name="pathForm">
<div class="form-group">
<span class="col-sm-12 text-muted small"
><pr-icon icon="'alert-circle'" mode="'primary'" feather="true"></pr-icon> Indicate the path to the {{ $ctrl.deployMethod == 'compose' ? 'Compose' : 'Manifest' }} file from
the root of your repository (requires a yaml, yml, json, or hcl file extension)
<span class="col-sm-12 text-muted small vertical-center">
<pr-icon icon="'info'" mode="'primary'" feather="true"></pr-icon> Indicate the path to the {{ $ctrl.deployMethod == 'compose' ? 'Compose' : 'Manifest' }} file from the root
of your repository (requires a yaml, yml, json, or hcl file extension)
</span>
</div>
<div class="form-group">
<label for="stack_repository_path" class="col-lg-2 col-sm-3 control-label text-left">{{ $ctrl.deployMethod == 'compose' ? 'Compose' : 'Manifest' }} path</label>
<label for="stack_repository_path" class="col-lg-2 col-sm-3 control-label text-left required">{{ $ctrl.deployMethod == 'compose' ? 'Compose' : 'Manifest' }} path</label>
<div class="col-sm-8">
<input
type="text"

9
app/portainer/components/forms/git-form/git-form-ref-field/git-form-ref-field.html
View file

@ -1,7 +1,10 @@
<div class="form-group">
<span class="col-sm-12 text-muted small">
Specify a reference of the repository using the following syntax: branches with <code>refs/heads/branch_name</code> or tags with <code>refs/tags/tag_name</code>. If not
specified, will use the default <code>HEAD</code> reference normally the <code>master</code> branch.
<span class="col-sm-12 text-muted small vertical-center">
<pr-icon icon="'info'" mode="'primary'" feather="true"></pr-icon>
<span>
Specify a reference of the repository using the following syntax: branches with <code>refs/heads/branch_name</code> or tags with <code>refs/tags/tag_name</code>. If not
specified, will use the default <code>HEAD</code> reference normally the <code>master</code> branch.
</span>
</span>
</div>
<div class="form-group">

2
app/portainer/components/forms/git-form/git-form-url-field/git-form-url-field.html
View file

@ -2,7 +2,7 @@
<span class="col-sm-12 text-muted small"> You can use the URL of a git repository. </span>
</div>
<div class="form-group">
<label for="stack_repository_url" class="col-lg-2 col-sm-3 control-label text-left">Repository URL</label>
<label for="stack_repository_url" class="col-lg-2 col-sm-3 control-label text-left required">Repository URL</label>
<div class="col-sm-8">
<input
type="text"

2
app/portainer/components/registry-details/registry-details.html
View file

@ -1,7 +1,7 @@
<div class="row" ng-if="$ctrl.registry">
<div class="col-lg-12 col-md-12 col-xs-12">
<rd-widget>
<rd-widget-header icon="svg-plug" title-text="Registry"></rd-widget-header>
<rd-widget-header icon="radio" feather-icon="true" title-text="Registry"></rd-widget-header>
<rd-widget-body classes="no-padding">
<table class="table">
<tbody>

13
app/portainer/components/template-list/template-item/templateItem.html
View file

@ -2,11 +2,14 @@
<div ng-class="{ 'blocklist-item--selected': $ctrl.model.Selected }" class="blocklist-item template-item !mr-0 !my-0" ng-click="$ctrl.onSelect($ctrl.model)">
<div class="blocklist-item-box">
<!-- template-image -->
<div ng-if="$ctrl.model.Logo" class="vertical-center justify-center">
<img class="blocklist-item-logo" ng-src="{{ $ctrl.model.Logo }}" />
</div>
<div class="blocklist-item-logo vertical-center justify-center" ng-if="!$ctrl.model.Logo">
<pr-icon icon="'svg-rocket'" class-name="'[&>*]:!h-10 [&>*]:!w-auto [&>*>path]:stroke-blue-8'" mode="'primary'"></pr-icon>
<div class="vertical-center justify-center min-w-[56px]">
<fallback-image
src="$ctrl.model.Logo"
fallback-icon="'svg-rocket'"
class-name="'blocklist-item-logo'"
fallback-class-name="'!h-14 !w-14 [&>*]:!h-8 [&>*]:!w-auto icon-nested-blue'"
fallback-mode="'primary'"
></fallback-image>
</div>
<!-- !template-image -->
<!-- template-details -->

2
app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateView.html
View file

@ -49,7 +49,7 @@
<div class="col-sm-12">
<button
type="button"
class="btn btn-primary btn-sm"
class="btn btn-primary btn-sm !ml-0"
ng-disabled="$ctrl.actionInProgress || customTemplateForm.$invalid
|| !$ctrl.formValues.Title
|| !$ctrl.formValues.FileContent