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

UI fixes

Browse source
This commit is contained in:
matias.spinarolli 2022-07-22 15:57:56 -03:00
parent 434fee2c52
commit 8e8151102d
2 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.html
View file

@ -2,11 +2,9 @@
<rd-widget>
<rd-widget-body classes="no-padding">
<div class="toolBar">
<div class="toolBarTitle vertical-center">
<span><pr-icon icon="$ctrl.titleIcon" feather="true"></pr-icon></span> {{ $ctrl.titleText }}
</div>
<div class="searchBar">
<span><pr-icon icon="'search'" feather="true" class-name="'searchIcon'"></pr-icon></span>
<div class="toolBarTitle vertical-center"> <pr-icon icon="$ctrl.titleIcon" feather="true"></pr-icon> {{ $ctrl.titleText }} </div>
<div class="searchBar vertical-center">
<pr-icon icon="'search'" feather="true" class-name="'searchIcon'"></pr-icon>
<input
type="text"
class="searchInput"
@ -23,25 +21,31 @@
<thead>
<tr>
<th>
<a ng-click="$ctrl.changeOrderBy('Name')">
Name
<span><pr-icon icon="'arrow-down'" feather="true" ng-if="$ctrl.state.orderBy === 'Name' && !$ctrl.state.reverseOrder"></pr-icon></span>
<span><pr-icon icon="'arrow-up'" feather="true" ng-if="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"></pr-icon></span>
</a>
<table-column-header
col-title="'Name'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'Name'"
is-sorted-desc="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('Name')"
></table-column-header>
</th>
<th>
<a ng-click="$ctrl.changeOrderBy('Status')">
Status
<span><pr-icon icon="'arrow-down'" feather="true" ng-if="$ctrl.state.orderBy === 'Status' && !$ctrl.state.reverseOrder"></pr-icon></span>
<span><pr-icon icon="'arrow-up'" feather="true" ng-if="$ctrl.state.orderBy === 'Status' && $ctrl.state.reverseOrder"></pr-icon></span>
</a>
<table-column-header
col-title="'Status'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'Status'"
is-sorted-desc="$ctrl.state.orderBy === 'Status' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('Status')"
></table-column-header>
</th>
<th>
<a ng-click="$ctrl.changeOrderBy('Error')">
Error
<span><pr-icon icon="'arrow-down'" feather="true" ng-if="$ctrl.state.orderBy === 'Error' && !$ctrl.state.reverseOrder"></pr-icon></span>
<span><pr-icon icon="'arrow-up'" feather="true" ng-if="$ctrl.state.orderBy === 'Error' && $ctrl.state.reverseOrder"></pr-icon></span>
</a>
<table-column-header
col-title="'Error'"
can-sort="true"
is-sorted="$ctrl.state.orderBy === 'Error'"
is-sorted-desc="$ctrl.state.orderBy === 'Error' && $ctrl.state.reverseOrder"
ng-click="$ctrl.changeOrderBy('Error')"
></table-column-header>
</th>
</tr>
</thead>

4
app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.html
View file

@ -7,7 +7,7 @@
<form class="form-horizontal" name="$ctrl.form">
<!-- name-input -->
<div class="form-group">
<label for="stack_name" class="col-sm-1 control-label text-left"> Name </label>
<label for="stack_name" class="col-sm-1 control-label text-left required"> Name </label>
<div class="col-sm-11">
<input
type="text"
@ -43,7 +43,7 @@
<div class="form-group">
<div class="col-sm-12">
<div class="small text-muted space-right" ng-if="$ctrl.formValues.DeploymentType === 0 && $ctrl.hasKubeEndpoint()">
<span><pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon></span>
<pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon>
Portainer uses <a href="https://kompose.io/" target="_blank">Kompose</a> to convert your Compose manifest to a Kubernetes compliant manifest. Be wary that not all
the Compose format options are supported by Kompose at the moment.
</div>