Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nmaas Portal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
nmaas
nmaas Portal
Commits
a1468a21
Commit
a1468a21
authored
1 month ago
by
Lukasz Lopatowski
Browse files
Options
Downloads
Plain Diff
Merge branch 'angular19-update' into 'develop'
delete tooltip See merge request
!245
parents
5447e649
a9095bc7
No related branches found
No related tags found
2 merge requests
!258
Develop
,
!245
delete tooltip
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/app/shared/admin/clusters/add-cluster/add-cluster.component.html
+13
-15
13 additions, 15 deletions
...red/admin/clusters/add-cluster/add-cluster.component.html
with
13 additions
and
15 deletions
src/app/shared/admin/clusters/add-cluster/add-cluster.component.html
+
13
−
15
View file @
a1468a21
...
@@ -15,12 +15,12 @@
...
@@ -15,12 +15,12 @@
</div>
</div>
<div>
<div>
<div
class=
"mt-4"
>
<div
class=
"mt-4"
>
<label
for=
"name"
>
{{'CLUSTERS.NAME' | translate}}
</label>
<label
for=
"name"
>
{{'CLUSTERS.NAME' | translate}}
*
</label>
<input
id=
"name"
type=
"text"
class=
"form-control"
[(ngModel)]=
"cluster.name"
<input
id=
"name"
type=
"text"
class=
"form-control"
[(ngModel)]=
"cluster.name"
[ngModelOptions]=
"{standalone: true}"
>
[ngModelOptions]=
"{standalone: true}"
>
</div>
</div>
<div
class=
"mt-4"
>
<div
class=
"mt-4"
>
<label
for=
"name"
>
{{'CLUSTERS.FILE' | translate}}
</label>
<label
for=
"name"
>
{{'CLUSTERS.FILE' | translate}}
*
</label>
<textarea
style=
"width:100%; overflow: auto; max-height: 500px;"
pInputTextarea
[autoResize]=
"true"
<textarea
style=
"width:100%; overflow: auto; max-height: 500px;"
pInputTextarea
[autoResize]=
"true"
class=
"form-control"
[rows]=
"50"
[(ngModel)]=
"kubernetesFile"
name=
"content-textarea"
></textarea>
class=
"form-control"
[rows]=
"50"
[(ngModel)]=
"kubernetesFile"
name=
"content-textarea"
></textarea>
</div>
</div>
...
@@ -29,13 +29,12 @@
...
@@ -29,13 +29,12 @@
<div
class=
"panel"
>
<div
class=
"panel"
>
</div>
</div>
<button
type=
"button"
class=
"btn btn-primary pull-right"
(click)=
"uploadKubernetesFile()"
[disabled]=
"!step1valid()"
<button
type=
"button"
class=
"btn btn-primary pull-right"
(click)=
"uploadKubernetesFile()"
pTooltip=
"{{'CLUSTERS.WIZARD.TOOLTIP_1' | translate}}"
tooltipPosition=
"bottom"
[disabled]=
"!step1valid()"
>
{{'APPS_WIZARD.NEXT_BUTTON' | translate}}
</button>
[showDelay]=
"50"
>
{{'APPS_WIZARD.NEXT_BUTTON' | translate}}
</button>
<div
class=
"error"
*ngIf=
"error"
>
<div
class=
"error"
*ngIf=
"error"
>
{{error}}
{{error}}
</div>
</div>
</div>
</div>
...
@@ -87,8 +86,8 @@
...
@@ -87,8 +86,8 @@
<div
class=
"col-sm-12 padding-0"
>
<div
class=
"col-sm-12 padding-0"
>
<p-dropdown
id=
"domainSelector"
[options]=
"domains"
optionLabel=
"name"
optionValue=
"name"
<p-dropdown
id=
"domainSelector"
[options]=
"domains"
optionLabel=
"name"
optionValue=
"name"
placeholder=
"Select domain"
emptyMessage=
"No domain available"
[disabled]=
"domains.length === 0"
placeholder=
"Select domain"
emptyMessage=
"No domain available"
[disabled]=
"domains.length === 0"
name=
"domainSelector"
(onChange)=
"onDomainSelection($event.value)"
[required]=
"true"
(onClear)=
"this.cluster.domainNames = []"
name=
"domainSelector"
(onChange)=
"onDomainSelection($event.value)"
[required]=
"true"
[showClear]=
"true"
ngDefaultControl
></p-dropdown>
(onClear)=
"this.cluster.domainNames = []"
[showClear]=
"true"
ngDefaultControl
></p-dropdown>
</div>
</div>
...
@@ -97,7 +96,7 @@
...
@@ -97,7 +96,7 @@
<div
class=
"mt-8 padding-0"
>
<div
class=
"mt-8 padding-0"
>
<div
*ngIf=
"showNamespaceCreation === true"
>
<div
*ngIf=
"showNamespaceCreation === true"
>
<label
for=
"ingresstlssupported"
class=
"col-sm-2 padding-0"
>
{{"Create namespace if
missing " }}
</label>
<label
for=
"ingresstlssupported"
class=
"col-sm-2 padding-0"
>
{{"Create namespace if missing " }}
</label>
<div
class=
"col-sm-10"
>
<div
class=
"col-sm-10"
>
<input
type=
"checkbox"
id=
"ingresstlssupported"
name=
"ingresstlssupported"
<input
type=
"checkbox"
id=
"ingresstlssupported"
name=
"ingresstlssupported"
[(ngModel)]=
"namespaceCreation"
[checked]=
"namespaceCreation == true"
[disabled]=
""
>
[(ngModel)]=
"namespaceCreation"
[checked]=
"namespaceCreation == true"
[disabled]=
""
>
...
@@ -107,9 +106,8 @@
...
@@ -107,9 +106,8 @@
</div>
</div>
<button
type=
"button"
class=
"btn btn-primary pull-right"
(click)=
"nextStep()"
[disabled]=
"!step2valid()"
<button
type=
"button"
class=
"btn btn-primary pull-right"
(click)=
"nextStep()"
pTooltip=
"{{'CLUSTERS.WIZARD.TOOLTIP_2' | translate}}"
tooltipPosition=
"bottom"
[disabled]=
"!step2valid()"
>
{{'APPS_WIZARD.NEXT_BUTTON' | translate}}
</button>
[showDelay]=
"50"
>
{{'APPS_WIZARD.NEXT_BUTTON' | translate}}
</button>
</div>
</div>
...
@@ -444,4 +442,4 @@
...
@@ -444,4 +442,4 @@
</div>
</div>
<!-- <button type="button" class="btn btn-primary pull-right" (click)="nextStep()"
<!-- <button type="button" class="btn btn-primary pull-right" (click)="nextStep()"
pTooltip="{{'APPS_WIZARD.ACCEPT_RULES_TOOLTIP' | translate}}" tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button> -->
pTooltip="{{'APPS_WIZARD.ACCEPT_RULES_TOOLTIP' | translate}}" tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button> -->
</div>
</div>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment