Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-26 12:15:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8764 from goharbor/ui-modify

Browse Source 
ui adjustment for tag-retention and webhook
This commit is contained in:
Will Sun 2019-08-21 18:39:25 +08:00 committed by GitHub
commit 427a369d3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/portal/src/app/project/tag-retention/add-rule/add-rule.component.html
View File

@ -81,32 +81,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="height-72">
<div class="clr-row">
<div class="clr-col-4">
<label>{{'TAG_RETENTION.LABELS' | translate}}</label>
</div>
<div class="clr-col-3">
<div class="clr-select-wrapper w-100">
<select [(ngModel)]="labelsSelect" class="clr-select w-100">
<option *ngFor="let d of metadata?.tag_selectors[0]?.decorations"
value="{{d}}">{{getI18nKey(d)|translate}}</option>
</select>
</div>
</div>
<div class="clr-col-5">
<div class="w-100">
<input [(ngModel)]="labelsInput" class="clr-input w-100">
</div>
</div>
</div>
<div class="clr-row">
<div class="clr-col-4"></div>
<div class="clr-col-8">
<span>{{'TAG_RETENTION.REP_LABELS' | translate}}</span>
</div>
</div>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-outline" (click)="cancel()">{{'BUTTON.CANCEL' | translate}}</button> <button type="button" class="btn btn-outline" (click)="cancel()">{{'BUTTON.CANCEL' | translate}}</button>

5
src/portal/src/app/project/tag-retention/retention.ts
View File

@ -70,11 +70,6 @@ export class Rule {
kind: 'doublestar', kind: 'doublestar',
decoration: 'matches', decoration: 'matches',
pattern: '**' pattern: '**'
},
{
kind: 'label',
decoration: "withLabels",
pattern: null
} }
]; ];
} }

34
src/portal/src/app/project/tag-retention/tag-retention.component.html
View File

@ -11,27 +11,27 @@
<li class="rule" *ngFor="let rule of retention?.rules;let i = index;"> <li class="rule" *ngFor="let rule of retention?.rules;let i = index;">
<div class="clr-row"> <div class="clr-row">
<div class="clr-col-1"> <div class="clr-col-1">
<clr-icon *ngIf="!rule?.disabled" class="color-green" shape="success-standard"></clr-icon> <clr-icon (click)="openEditor(i)" shape="ellipsis-vertical"
<clr-icon *ngIf="rule?.disabled" class="color-red" shape="error-standard"></clr-icon> class="dropdown-toggle hand"></clr-icon>
<div class="dropdown" [ngClass]="{open:ruleIndex===i}">
<div class="dropdown-menu">
<button *ngIf="!rule?.disabled" type="button" class="dropdown-item"
(click)="toggleDisable(i,true)">{{'TAG_RETENTION.DISABLE' | translate}}</button>
<button *ngIf="rule?.disabled" type="button" class="dropdown-item"
(click)="toggleDisable(i,false)">{{'TAG_RETENTION.ENABLE' | translate}}</button>
<button type="button" class="dropdown-item"
(click)="editRuleByIndex(i)">{{'TAG_RETENTION.EDIT' | translate}}</button>
<button type="button" class="dropdown-item"
(click)="deleteRule(i)">{{'TAG_RETENTION.DELETE' | translate}}</button>
</div>
</div>
</div> </div>
<div class="clr-col"> <div class="clr-col">
<span> <span>
<clr-icon (click)="openEditor(i)" shape="ellipsis-vertical" <clr-icon *ngIf="!rule?.disabled" class="color-green" shape="success-standard"></clr-icon>
class="dropdown-toggle hand"></clr-icon> <clr-icon *ngIf="rule?.disabled" class="color-red" shape="error-standard"></clr-icon>
<div class="dropdown" [ngClass]="{open:ruleIndex===i}">
<div class="dropdown-menu">
<button *ngIf="!rule?.disabled" type="button" class="dropdown-item"
(click)="toggleDisable(i,true)">{{'TAG_RETENTION.DISABLE' | translate}}</button>
<button *ngIf="rule?.disabled" type="button" class="dropdown-item"
(click)="toggleDisable(i,false)">{{'TAG_RETENTION.ENABLE' | translate}}</button>
<button type="button" class="dropdown-item"
(click)="editRuleByIndex(i)">{{'TAG_RETENTION.EDIT' | translate}}</button>
<button type="button" class="dropdown-item"
(click)="deleteRule(i)">{{'TAG_RETENTION.DELETE' | translate}}</button>
</div>
</div>
</span> </span>
<span class="rule-name"> <span class="rule-name ml-5">
<span>{{'TAG_RETENTION.IN_REPOSITORIES' | translate}}</span> <span>{{'TAG_RETENTION.IN_REPOSITORIES' | translate}}</span>
<span>{{getI18nKey(rule?.scope_selectors?.repository[0]?.decoration)|translate}}</span> <span>{{getI18nKey(rule?.scope_selectors?.repository[0]?.decoration)|translate}}</span>
<span>{{formatPattern(rule?.scope_selectors?.repository[0]?.pattern)}}</span> <span>{{formatPattern(rule?.scope_selectors?.repository[0]?.pattern)}}</span>

9
src/portal/src/app/project/webhook/add-webhook-form/add-webhook-form.component.scss
View File

@ -1,12 +1,3 @@
.align-center {
text-align: center;
}
.webhook-section {
margin-left: calc(50% - 10rem);
text-align: left;
}
.icon-tooltip { .icon-tooltip {
margin-top: 4px; margin-top: 4px;
} }

4
src/portal/src/app/project/webhook/webhook.component.scss
View File

@ -8,11 +8,11 @@
.webhook-form-wrap { .webhook-form-wrap {
width: 19rem; width: 19rem;
margin: 0 auto; margin: 0 ;
} }
.create-text { .create-text {
margin: 0 auto; margin: 0;
width: 19rem; width: 19rem;
} }