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

feat(ui): renovate the edge group creation page EE-3527 (#7191)

pull/7352/head^2
andres-portainer 2022-08-01 18:24:05 -03:00 committed by GitHub
parent d0b88d7e2f
commit 9dc6aa81cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/edge/components/group-form/groupForm.html
View File

@ -1,28 +1,37 @@
<form class="form-horizontal" name="EdgeGroupForm" ng-submit="$ctrl.formAction()"> <form class="form-horizontal" name="EdgeGroupForm" ng-submit="$ctrl.formAction()">
<div class="form-group"> <div class="form-group">
<label for="group_name" class="col-sm-3 col-lg-2 control-label text-left"> Name </label> <label for="group_name" class="col-sm-3 col-lg-2 control-label text-left required"> 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="group_name" name="group_name" ng-model="$ctrl.model.Name" required auto-focus data-cy="edgeGroupCreate-groupNameInput" /> <input
type="text"
class="form-control"
id="group_name"
name="group_name"
ng-model="$ctrl.model.Name"
required
auto-focus
data-cy="edgeGroupCreate-groupNameInput"
placeholder="e.g. mystack"
/>
</div> </div>
</div> </div>
<div class="form-group" ng-show="EdgeGroupForm.group_name.$invalid"> <div class="form-group" ng-show="EdgeGroupForm.group_name.$invalid">
<div class="col-sm-12 small text-warning"> <div class="col-sm-12 small text-warning">
<div ng-messages="EdgeGroupForm.group_name.$error"> <div ng-messages="EdgeGroupForm.group_name.$error">
<p ng-message="required"> <p ng-message="required" class="vertical-center">
<i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <pr-icon icon="'alert-triangle'" class-name="'icon-sm icon-warning'" feather="true"></pr-icon> This field is required.
This field is required.
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-12 form-section-title"> Group type </div> <div class="col-sm-12 form-section-title"> Group type </div>
<div class="form-group col-sm-12"> <div class="col-sm-12 !px-0">
<div class="boxselector_wrapper"> <div class="boxselector_wrapper">
<div class="boxselector"> <div class="boxselector">
<input type="radio" id="static-group" ng-model="$ctrl.model.Dynamic" ng-value="false" ng-checked="!$ctrl.model.Dynamic" /> <input type="radio" id="static-group" ng-model="$ctrl.model.Dynamic" ng-value="false" ng-checked="!$ctrl.model.Dynamic" />
<label for="static-group"> <label for="static-group">
<div class="boxselector_header"> <div class="boxselector_header vertical-center">
<pr-icon icon="'list'" feather="true"></pr-icon> <pr-icon icon="'list'" feather="true"></pr-icon>
Static Static
</div> </div>
@ -32,8 +41,8 @@
<div class="boxselector"> <div class="boxselector">
<input type="radio" id="dynamic-group" ng-model="$ctrl.model.Dynamic" ng-value="true" ng-checked="$ctrl.model.Dynamic" /> <input type="radio" id="dynamic-group" ng-model="$ctrl.model.Dynamic" ng-value="true" ng-checked="$ctrl.model.Dynamic" />
<label for="dynamic-group"> <label for="dynamic-group">
<div class="boxselector_header"> <div class="boxselector_header vertical-center">
<i class="fa fa-tags" aria-hidden="true" style="margin-right: 2px"></i> <pr-icon icon="'tag'" feather="true" className="'feather'"></pr-icon>
Dynamic Dynamic
</div> </div>
<p>Automatically associate environments via tags</p> <p>Automatically associate environments via tags</p>
@ -74,7 +83,7 @@
<div class="boxselector"> <div class="boxselector">
<input type="radio" id="or-selector" ng-model="$ctrl.model.PartialMatch" ng-value="true" ng-checked="$ctrl.model.PartialMatch" /> <input type="radio" id="or-selector" ng-model="$ctrl.model.PartialMatch" ng-value="true" ng-checked="$ctrl.model.PartialMatch" />
<label for="or-selector"> <label for="or-selector">
<div class="boxselector_header"> <div class="boxselector_header vertical-center">
<pr-icon icon="'tag'" feather="true"></pr-icon> <pr-icon icon="'tag'" feather="true"></pr-icon>
Partial match Partial match
</div> </div>
@ -84,8 +93,8 @@
<div class="boxselector"> <div class="boxselector">
<input type="radio" id="and-selector" ng-model="$ctrl.model.PartialMatch" ng-value="false" ng-checked="!$ctrl.model.PartialMatch" /> <input type="radio" id="and-selector" ng-model="$ctrl.model.PartialMatch" ng-value="false" ng-checked="!$ctrl.model.PartialMatch" />
<label for="and-selector"> <label for="and-selector">
<div class="boxselector_header"> <div class="boxselector_header vertical-center">
<i class="fa fa-tag" aria-hidden="true" style="margin-right: 2px"></i> <pr-icon icon="'tag'" feather="true" className="'feather'"></pr-icon>
Full match Full match
</div> </div>
<p>Associate any environment matching all of the selected tags</p> <p>Associate any environment matching all of the selected tags</p>

2
app/portainer/components/group-association-table/groupAssociationTable.html
View File

@ -1,7 +1,7 @@
<div class="datatable"> <div class="datatable">
<table class="table table-hover" data-cy="{{ $ctrl.cyValue }}"> <table class="table table-hover" data-cy="{{ $ctrl.cyValue }}">
<div class="col-sm-12"> <div class="col-sm-12">
<i class="fa fa-search searchIcon" aria-hidden="true"></i> <span><pr-icon icon="'search'" feather="true" class-name="'searchIcon'"></pr-icon></span>
<input <input
type="text" type="text"
class="searchInput" class="searchInput"