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

feat(ui): EE-3571 css portainer tags (#7383)

pull/7400/head
congs 2022-08-02 14:22:20 +12:00 committed by GitHub
parent 5469392ec7
commit 2c25e1d48e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/portainer/components/datatables/tags-datatable/tagsDatatable.html
View File

@ -28,15 +28,19 @@
<thead>
<tr>
<th>
<span class="md-checkbox">
<input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
<label for="select_all"></label>
</span>
<a ng-click="$ctrl.changeOrderBy('Name')">
Name
<pr-icon icon="'arrow-down'" feather="true" ng-if="$ctrl.state.orderBy === 'Name' && !$ctrl.state.reverseOrder"></pr-icon>
<pr-icon icon="'arrow-up'" feather="true" ng-if="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"></pr-icon>
</a>
<div class="vertical-center">
<span class="md-checkbox">
<input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
<label for="select_all"></label>
</span>
<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>
</div>
</th>
</tr>
</thead>
@ -67,7 +71,7 @@
<div class="paginationControls">
<form class="form-inline vertical-center">
<span class="limitSelector">
<span style="margin-right: 5px"> Items per page </span>
<span class="space-right"> Items per page </span>
<select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
<option value="0">All</option>
<option value="10">10</option>

19
app/portainer/views/tags/tags.html
View File

@ -8,7 +8,7 @@
<form class="form-horizontal" name="tagCreationForm" ng-submit="createTag()">
<!-- name-input -->
<div class="form-group">
<label for="name" class="col-sm-2 control-label text-left"> Name </label>
<label for="name" class="col-sm-2 control-label text-left required"> Name </label>
<div class="col-sm-10">
<input
type="text"
@ -25,8 +25,14 @@
<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"><pr-icon icon="'alert-triangle'" feather="true"></pr-icon> This field is required.</p>
<p ng-message="validName"><pr-icon icon="'alert-triangle'" feather="true"></pr-icon> This tag already exists.</p>
<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>
@ -40,7 +46,10 @@
ng-click="createTag()"
button-spinner="state.actionInProgress"
>
<span ng-hide="state.actionInProgress"><pr-icon icon="'plus'" feather="true"></pr-icon> Create tag</span>
<span ng-hide="state.actionInProgress" class="vertical-center">
<pr-icon icon="'plus'" feather="true"></pr-icon>
Create tag
</span>
<span ng-show="state.actionInProgress">Creating tag...</span>
</button>
</div>
@ -53,6 +62,6 @@
<div class="row">
<div class="col-sm-12">
<tags-datatable title-text="Tags" title-icon="tag" dataset="tags" table-key="tags" order-by="Name" remove-action="removeAction"></tags-datatable>
<tags-datatable title-text="Tags" title-icon="svg-tag2" dataset="tags" table-key="tags" order-by="Name" remove-action="removeAction"></tags-datatable>
</div>
</div>