Skip to content

Commit

Permalink
fix: uX improvements regarding transition to Angular 15
Browse files Browse the repository at this point in the history
  • Loading branch information
HejdaJakub committed Mar 8, 2023
1 parent 22586d4 commit fadc5fd
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 22 deletions.
2 changes: 1 addition & 1 deletion apps/admin-gui/src/_styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1628,7 +1628,7 @@ table .mdc-text-field {
margin-top: 0 !important;
}
table .mat-mdc-form-field-infix {
height: 35px !important;
min-height: 35px !important;
padding-top: 7px !important;
padding-bottom: 0 !important;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ export class FacilityResourcesComponent implements OnInit, AfterViewInit {
this.setAuthRights();
this.servicesManager.getAssignedServices(this.facility.id).subscribe((services) => {
this.services = [this.emptyService].concat(services);
this.refreshTable();
});
this.loadResourcesForFacility();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h1 mat-dialog-title>{{'DIALOGS.EDIT_MEMBER_SPONSORS.TITLE' | translate}}</h1>
<th *matHeaderCellDef mat-header-cell>
{{'DIALOGS.EDIT_MEMBER_SPONSORS.TABLE_EXPIRATION' | translate}}
</th>
<td *matCellDef="let sponsor" mat-cell>
<td *matCellDef="let sponsor" class="align-elements" mat-cell>
<span>{{parseDate(sponsor.validityTo)}}</span>
<button
*ngIf="isExpirationAuthorized(sponsor)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@
{{tag.tagName}}
</div>
<div *ngIf="isChanging.isSelected(tag)">
<mat-form-field>
<mat-label>{{'VO_DETAIL.RESOURCES.TAGS.CHANGE_TAG_NAME' | translate}}</mat-label>
<input [(ngModel)]="tag.tagName" matInput />
<mat-form-field subscriptSizing="dynamic">
<input
[(ngModel)]="tag.tagName"
matInput
placeholder="{{'VO_DETAIL.RESOURCES.TAGS.CHANGE_TAG_NAME' | translate}}" />
</mat-form-field>
</div>
</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
</div>

<div
class="ms-auto"
class="ms-auto mt-2"
[matTooltipDisabled]="expirationAttribute.writable"
[matTooltipPosition]="'above'"
matTooltip="{{'VO_MANAGEMENT.SETTINGS.EXPIRATION.PERMISSION_DENIED_HINT' | translate}}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
width: 325px;
}

.align-elements {
display: flex;
align-items: center;
flex-wrap: wrap;
}

.fix-select {
margin-top: 8px;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
width: 325px;
}

.align-elements {
display: flex;
align-items: center;
flex-wrap: wrap;
}

.fix-select {
margin-top: 8px;
}
4 changes: 2 additions & 2 deletions apps/admin-gui/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2084,8 +2084,8 @@
"TITLE": "Edit sponsors of sponsored member",
"EXPIRATION": "Sponsorship expiration",
"TABLE_ID": "Id",
"TABLE_NAME": "name",
"TABLE_EXPIRATION": "expiration",
"TABLE_NAME": "Name",
"TABLE_EXPIRATION": "Expiration",
"CANCEL": "Close",
"SUBMIT": "Submit",
"REMOVE_SPONSOR_DISABLED": "You are not authorized to remove sponsor",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,4 @@
overflow: hidden;
text-overflow: ellipsis;
max-width: 400px;
cursor: default;
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@
{{'DIALOGS.CHANGE_EXPIRATION.GROUP_RULES'|translate}}
</mat-radio-button>
<mat-radio-button value="never">
{{'DIALOGS.CHANGE_EXPIRATION.EXPIRATION_NEVER'|translate}}
<span class="cursor-pointer">
{{'DIALOGS.CHANGE_EXPIRATION.EXPIRATION_NEVER'|translate}}
</span>
</mat-radio-button>
</mat-radio-group>
<perun-web-apps-alert
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@
.bottom-padding {
padding-bottom: 20px;
}

.cursor-pointer {
cursor: pointer;
}

0 comments on commit fadc5fd

Please sign in to comment.