Skip to content
Snippets Groups Projects
Commit c11a6e71 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Merge branch... 

Merge branch '219-design-new-layout-for-buttons-and-apply-wherever-required-to-be-consistent' into 'develop'

buttons and dropdown

See merge request !28
parents 09f9b0a7 054a7077
No related branches found
No related tags found
1 merge request!28buttons and dropdown
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 19 deletions
src/app/appmarket/appinstance/appinstance/appinstance.component.css
+ 1
− 1
View file @ c11a6e71
......@@ -78,6 +78,6 @@
:host ::ng-deep .p-dropdown {
width: 200px;
}
.p-dropdown-items {
:host ::ng-deep.p-dropdown-panel .p-dropdown-items {
max-height: 150px;
}
src/app/appmarket/appinstance/appinstance/appinstance.component.html
+ 4
− 4
View file @ c11a6e71
......@@ -68,16 +68,16 @@
<!-- Deployment buttons -->
<!-- if application is still being deployed -->
<div class="btn-group pull-right"
<div class=" pull-right"
*ngIf="getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.FAILURE
&& getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.RUNNING
&& getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.REMOVED
&& getStateAsEnum(appInstanceStatus?.state) != AppInstanceState.DONE">
<button *ngIf="getStateAsEnum(appInstanceStatus?.state) == AppInstanceState.CONFIGURATION_AWAITING"
role="button" class="btn btn-primary" (click)="applyConfig.show()">
role="button" class="btn btn-primary m-1" (click)="applyConfig.show()">
{{'APP_INSTANCE.CONFIGURE' | translate}}
</button>
<button class="btn btn-danger"
<button class="btn btn-danger m-1"
*roles="['ROLE_DOMAIN_ADMIN', 'ROLE_SYSTEM_ADMIN']"
(click)="this.appAbortModal.show()">{{'APP_INSTANCE.ABORT_BUTTON' | translate}}</button>
</div>
......@@ -241,7 +241,7 @@
<button type="button" class="btn btn-primary "
[disabled]="appVersions.length === 0 || selectedVersion === ''"
(click)="this.manualUpdateVersion()">{{'APP_INSTANCES.MANUAL_UPDATE.YES_BUTTON' | translate}}</button>
<button type="button" class="btn btn-danger"
<button type="button" class="btn btn-secondary"
(click)="this.manualUpdateModal.hide()">{{'UNDEPLOY_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
......
src/app/appmarket/appinstance/modals/app-abort-modal/app-abort-modal.component.html
+ 2
− 2
View file @ c11a6e71
......@@ -8,7 +8,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-danger" (click)="abort()">{{'ABORT_MODAL.YES_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="modal.hide()">{{'ABORT_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="abort()">{{'ABORT_MODAL.YES_BUTTON' | translate}}</button>
<button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'ABORT_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
src/app/appmarket/appinstance/modals/app-restart-modal/app-restart-modal.component.html
+ 2
− 2
View file @ c11a6e71
......@@ -8,7 +8,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-danger" (click)="restart()">{{'RESTART_MODAL.YES_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="modal.hide()">{{'RESTART_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="restart()">{{'RESTART_MODAL.YES_BUTTON' | translate}}</button>
<button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'RESTART_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
src/app/appmarket/appinstance/modals/app-upgrade-modal/app-upgrade-modal.component.html
+ 2
− 2
View file @ c11a6e71
......@@ -14,7 +14,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-danger" (click)="upgrade()">{{'UPGRADE_MODAL.YES_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="modal.hide()">{{'UPGRADE_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="upgrade()">{{'UPGRADE_MODAL.YES_BUTTON' | translate}}</button>
<button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'UPGRADE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
src/app/appmarket/appinstance/ssh-shell/ssh-shell.component.html
+ 1
− 1
View file @ c11a6e71
<div class="upper-button-container">
<div class="btn-group" role="group">
<button type="button" class="btn btn-warning" (click)="reconnect()">{{'SHELL.RECONNECT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="reconnect()">{{'SHELL.RECONNECT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-danger" (click)="disconnectWithModal()">{{'SHELL.DISCONNECT_BUTTON' | translate}}</button>
</div>
</div>
......
src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
+ 1
− 1
View file @ c11a6e71
......@@ -626,7 +626,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
<button type="submit" class="btn btn-danger center-block"
<button type="submit" class="btn btn-primary center-block"
[routerLink]="['/admin/apps']">{{'APPS_WIZARD.NEW_APP_MODAL.BACK_TO_APP_MANAGEMENT_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
+ 1
− 1
View file @ c11a6e71
......@@ -349,6 +349,6 @@
</div>
</div>
<div class="nmaas-modal-footer">
<button type="submit" class="btn btn-danger center-block" [routerLink]="['/admin/apps']">{{'APPS_WIZARD.NEW_APP_MODAL.BACK_TO_APP_MANAGEMENT_BUTTON' | translate}}</button>
<button type="submit" class="btn btn-primary center-block" [routerLink]="['/admin/apps']">{{'APPS_WIZARD.NEW_APP_MODAL.BACK_TO_APP_MANAGEMENT_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
src/app/appmarket/domains/domain/domain.component.html
+ 2
− 2
View file @ c11a6e71
......@@ -273,7 +273,7 @@
</div>
</div>
<div class="nmaas-modal-footer text-center">
<button class="btn btn-danger" style="display: inline-block" (click)="updateDcnConfigured()">{{ 'DOMAIN_DETAILS.YES_BUTTON' | translate }}</button>
<button class="btn btn-primary" style="display: inline-block" (click)="this.modal.hide()">{{ 'DOMAIN_DETAILS.CANCEL_BUTTON' | translate }}</button>
<button class="btn btn-primary" style="display: inline-block" (click)="updateDcnConfigured()">{{ 'DOMAIN_DETAILS.YES_BUTTON' | translate }}</button>
<button class="btn btn-secondary" style="display: inline-block" (click)="this.modal.hide()">{{ 'DOMAIN_DETAILS.CANCEL_BUTTON' | translate }}</button>
</div>
</nmaas-modal>
src/app/shared/users/privileges/userprivileges.component.html
+ 1
− 1
View file @ c11a6e71
......@@ -24,7 +24,7 @@
</select>
</div>
<div class="col-lg-3">
<button type="submit" class="btn btn-danger">{{'USER_PRIVILEGES.ADD_BUTTON' | translate}}</button>
<button type="submit" class="btn btn-primary">{{'USER_PRIVILEGES.ADD_BUTTON' | translate}}</button>
</div>
</form>
<hr>
......
src/app/welcome/complete/complete.component.html
+ 2
− 2
View file @ c11a6e71
......@@ -89,8 +89,8 @@
</div>
</div>
<div class="nmaas-modal-footer">
<button class="btn btn-danger center-block" (click)="this.hide()">{{'COMPLETE_REGISTRATION.MODAL.RETURN_BUTTON' | translate}}</button>
<button class="btn btn-secondary center-block" (click)="this.hide()">{{'COMPLETE_REGISTRATION.MODAL.RETURN_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
<modal-info-terms></modal-info-terms>
<modal-info-policy></modal-info-policy>
\ No newline at end of file
<modal-info-policy></modal-info-policy>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment