mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
Merge remote-tracking branch 'origin/CST-11045' into CST-11045
This commit is contained in:
@@ -79,12 +79,12 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngFor="let patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; let i = index"
|
<div *ngFor="let patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; let i = index"
|
||||||
formGroupName="notifyServiceInboundPatterns">
|
formGroupName="notifyServiceInboundPatterns" [class.marked-for-deletion]="markedForDeletionInboundPattern.includes(i)">
|
||||||
|
|
||||||
<ng-container [formGroupName]="i">
|
<ng-container [formGroupName]="i">
|
||||||
|
|
||||||
|
|
||||||
<div [class.marked-for-deletion]="markedForDeletionInboundPattern.includes(i)" class="row mb-1">
|
<div class="row mb-1">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<select #inboundPattern formControlName="pattern" id="additionalInboundPattern{{i}}"
|
<select #inboundPattern formControlName="pattern" id="additionalInboundPattern{{i}}"
|
||||||
name="additionalInboundPattern{{i}}" required>
|
name="additionalInboundPattern{{i}}" required>
|
||||||
@@ -115,11 +115,14 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-sm-1 btn-group">
|
<div class="col-sm-2">
|
||||||
<button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button" type="button">
|
<button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark"
|
||||||
|
type="button">
|
||||||
<i class="fas fa-trash"></i>
|
<i class="fas fa-trash"></i>
|
||||||
</button>
|
</button>
|
||||||
<button (click)="unmarkForInboundPatternDeletion(i)" *ngIf="markedForDeletionInboundPattern.includes(i)" class="btn btn-outline-dark undo-button"
|
|
||||||
|
|
||||||
|
<button (click)="unmarkForInboundPatternDeletion(i)" *ngIf="markedForDeletionInboundPattern.includes(i)" class="btn btn-warning ml-2"
|
||||||
type="button">
|
type="button">
|
||||||
<i class="fas fa-undo"></i>
|
<i class="fas fa-undo"></i>
|
||||||
</button>
|
</button>
|
||||||
@@ -152,12 +155,12 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div *ngFor="let patternGroup of formModel.get('notifyServiceOutboundPatterns')['controls']; let i = index"
|
<div *ngFor="let patternGroup of formModel.get('notifyServiceOutboundPatterns')['controls']; let i = index"
|
||||||
formGroupName="notifyServiceOutboundPatterns">
|
formGroupName="notifyServiceOutboundPatterns" [class.marked-for-deletion]="markedForDeletionOutboundPattern.includes(i)">
|
||||||
|
|
||||||
<ng-container [formGroupName]="i">
|
<ng-container [formGroupName]="i">
|
||||||
|
|
||||||
<!-- Input elements in a separate row -->
|
<!-- Input elements in a separate row -->
|
||||||
<div [class.marked-for-deletion]="markedForDeletionOutboundPattern.includes(i)" class="row mb-1">
|
<div class="row mb-1">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<select #outboundPattern formControlName="pattern" id="additionalOutboundPattern{{i}}"
|
<select #outboundPattern formControlName="pattern" id="additionalOutboundPattern{{i}}"
|
||||||
name="additionalOutboundPattern{{i}}"
|
name="additionalOutboundPattern{{i}}"
|
||||||
@@ -185,11 +188,11 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-sm-1 btn-group">
|
<div class="col-sm-2">
|
||||||
<button (click)="markForOutboundPatternDeletion(i)" class="btn btn-outline-dark trash-button" type="button">
|
<button (click)="markForOutboundPatternDeletion(i)" class="btn btn-outline-dark trash-button" type="button">
|
||||||
<i class="fas fa-trash"></i>
|
<i class="fas fa-trash"></i>
|
||||||
</button>
|
</button>
|
||||||
<button (click)="unmarkForOutboundPatternDeletion(i)" *ngIf="markedForDeletionOutboundPattern.includes(i)" class="btn btn-outline-dark undo-button"
|
<button (click)="unmarkForOutboundPatternDeletion(i)" *ngIf="markedForDeletionOutboundPattern.includes(i)" class="btn btn-warning ml-2"
|
||||||
type="button">
|
type="button">
|
||||||
<i class="fas fa-undo"></i>
|
<i class="fas fa-undo"></i>
|
||||||
</button>
|
</button>
|
||||||
|
@@ -1,8 +1,6 @@
|
|||||||
form {
|
form {
|
||||||
max-width: 800px;
|
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
input[type="text"],
|
input[type="text"],
|
||||||
@@ -127,7 +125,7 @@ form button.btn.btn-primary[type="submit"] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.marked-for-deletion {
|
.marked-for-deletion {
|
||||||
background-color: #ffcccc;
|
background-color: lighten($red, 30%);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user