Skip to content
Snippets Groups Projects
Commit d03667b9 authored by Joanna Kaźmierczak's avatar Joanna Kaźmierczak
Browse files

buttons and dropdown

parent f512d375
Branches
Tags
1 merge request!26Resolve "Design new layout for buttons and apply wherever required to be consistent"
......@@ -36,9 +36,11 @@
<div class="alert alert-danger" *ngIf="errMsg">
{{errMsg}}
</div>
<button *ngIf="!isInMode(ComponentMode.VIEW)" [disabled]="!monitorForm.form.valid" type="submit"
class="btn btn-primary">{{'MONITOR_DETAILS.SUBMIT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-danger" [routerLink]="['/admin/monitor']">{{'MONITOR_DETAILS.GO_BACK_BUTTON' | translate}}</button>
<div class="flex justify-content-between">
<button type="button" class="btn btn-secondary" [routerLink]="['/admin/monitor']">{{'MONITOR_DETAILS.GO_BACK_BUTTON' | translate}}</button>
<button *ngIf="!isInMode(ComponentMode.VIEW)" [disabled]="!monitorForm.form.valid" type="submit"
class="btn btn-primary">{{'MONITOR_DETAILS.SUBMIT_BUTTON' | translate}}</button>
</div>
</form>
<div *ngIf="!monitorEntry">{{'MONITOR_DETAILS.NOT_FOUND_ERROR' | translate}}</div>
</div>
\ No newline at end of file
</div>
......@@ -78,7 +78,6 @@
:host ::ng-deep .p-dropdown {
width: 200px;
}
.ui-dropdown-panel {
.p-dropdown-items {
max-height: 150px;
overflow-y: auto;
}
......@@ -134,6 +134,12 @@
{{'APP_INSTANCE.ENABLE_AUTO_UPGRADES_BUTTON' | translate}}
</a>
</li>
<li *ngIf="appInstance.autoUpgradesEnabled">
<a *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']"
role="button" (click)="this.disableAutoUpgradesModal.show()">
{{'APP_INSTANCE.DISABLE_AUTO_UPGRADES_BUTTON' | translate}}
</a>
</li>
<li *ngIf="appInstance.upgradePossible">
<a *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']"
role="button" (click)="this.appUpgradeModal.show()">
......@@ -151,12 +157,6 @@
{{'APP_INSTANCES.MANUAL_UPDATE.HEADER' | translate}}
</a>
</li>
<li *ngIf="appInstance.autoUpgradesEnabled">
<a *roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']"
role="button" (click)="this.disableAutoUpgradesModal.show()">
{{'APP_INSTANCE.DISABLE_AUTO_UPGRADES_BUTTON' | translate}}
</a>
</li>
<li *ngIf="app.application.appDeploymentSpec.allowLogAccess">
<a role="button" [routerLink]="router.url + '/logs'">
{{'APP_INSTANCE.VIEW_LOGS' | translate}}
......
......@@ -63,8 +63,8 @@
</div>
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="closeModal()" [disabled]="isKeyNotUniqueAdd(newAnnotations) || !isKeyPatternCorrect">{{'DOMAINS.ADD_BUTTON' | translate}}</button>
<button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
......@@ -94,7 +94,7 @@
</div>
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-secondary" (click)="editModal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="closeModalEdit()" [disabled]="isEditAnnotationCorrect(editAnnotation) || !isKeyPatternCorrect">{{'DOMAINS.EDIT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-secondary" (click)="editModal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
......@@ -29,7 +29,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'INSTALL_MODAL.CLOSE_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="create()" [disabled]="instance_name.invalid || clicked">{{'INSTALL_MODAL.DEPLOY_BUTTON' | translate}}</button>
<button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'INSTALL_MODAL.CLOSE_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
......@@ -6,7 +6,7 @@
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="button"
class="btn btn-text" (click)="onModeChange()">{{'USER_DETAILS.VIEW_BUTTON' | translate}}</button>
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="submit" [disabled]="userDetailsForm.invalid"
class="btn btn-danger">{{'USER_DETAILS.SUBMIT_BUTTON' | translate}}</button>
class="btn btn-primary">{{'USER_DETAILS.SUBMIT_BUTTON' | translate}}</button>
<button *ngIf="isInMode(ComponentMode.VIEW) && isModeAllowed(ComponentMode.EDIT) && authService.hasRole('ROLE_SYSTEM_ADMIN')" type="button"
class="btn btn-text" (click)="onModeChange()">{{'USER_DETAILS.EDIT_BUTTON' | translate}}</button>
</div>
......
......@@ -7,7 +7,7 @@
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="button"
class="btn btn-text" (click)="onModeChange()">{{'USER_DETAILS.VIEW_BUTTON' | translate}}</button>
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="submit" [disabled]="userPreferencesForm.invalid"
class="btn btn-danger">{{'USER_DETAILS.SUBMIT_BUTTON' | translate}}</button>
class="btn btn-primary">{{'USER_DETAILS.SUBMIT_BUTTON' | translate}}</button>
<button *ngIf="isInMode(ComponentMode.VIEW) && isModeAllowed(ComponentMode.EDIT)" type="button"
class="btn btn-text" (click)="onModeChange()">{{'USER_DETAILS.EDIT_BUTTON' | translate}}</button>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment