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

updated buttons

parent 9055ea76
No related branches found
No related tags found
1 merge request!26Resolve "Design new layout for buttons and apply wherever required to be consistent"
Hide whitespace changes
Inline Side-by-side
Showing
with 98 additions and 69 deletions
src/app/appmarket/admin/configuration/details/configurationdetails.component.html
+ 7
− 4
View file @ 13e89a09
......@@ -75,20 +75,23 @@
[(ngModel)]="configuration.appInstanceFailureEmailList[i]"/>
</div>
<button role="button" type="button" class="btn btn-default" (click)="removeEmailEntry(email)">
<button role="button" type="button" class="btn btn-danger" (click)="removeEmailEntry(email)">
Remove
</button>
</div>
<div class="pd-left-15">
<button role="button" type="button" class="btn btn-success" (click)="addEmailEntry()">Add
<button role="button" type="button" class="btn btn-secondary" (click)="addEmailEntry()">Add
</button>
</div>
</div>
</div>
<button class="btn btn-primary"
type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button>
<div class="flex justify-content-end">
<button class="btn btn-primary"
type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button>
</div>
<div class="alert alert-danger" style="margin-top: 5px" *ngIf="errorMsg">
{{errorMsg}}
</div>
......
src/app/appmarket/appdetails/appdetails.component.css
+ 4
− 4
View file @ 13e89a09
......@@ -32,10 +32,10 @@ hr{
border: 0;
}
.first-button-substitute{
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
/*.first-button-substitute{*/
/* border-top-right-radius: 0;*/
/* border-bottom-right-radius: 0;*/
/*}*/
.disabled-url {
pointer-events: none;
......
src/app/appmarket/appdetails/appdetails.component.html
+ 3
− 3
View file @ 13e89a09
......@@ -60,11 +60,11 @@
pTooltip="{{'APPLICATIONS.TOOLTIP_MESSAGE_SUBSCRIBE' | translate}}" tooltipPosition="bottom" [showDelay]="50" [tooltipDisabled]="defaultTooltipDisabled">
<button class="btn btn-primary" [disabled]="!active || !isApplicationEnabledInDomain()" (click)="subscribe()">{{'APPLICATIONS.SUBSCRIBE_BUTTON' | translate}}</button>
</div>
<div *ngIf="subscribed" class="btn-group pull-right" >
<div *ngIf="subscribed" class=" pull-right" >
<div class="btn no-padding" pTooltip="{{'APPLICATIONS.TOOLTIP_MESSAGE_DEPLOY' | translate}}" tooltipPosition="bottom" [showDelay]="50" [tooltipDisabled]="defaultTooltipDisabled">
<button *ngIf="isSubscriptionAllowed()" class="btn btn-primary first-button-substitute" [disabled]="!isApplicationEnabledInDomain()" (click)="appInstallModal.show()">{{'APPLICATIONS.DEPLOY_BUTTON' | translate}}</button>
<button *ngIf="isSubscriptionAllowed()" class="btn btn-primary m-1" [disabled]="!isApplicationEnabledInDomain()" (click)="appInstallModal.show()">{{'APPLICATIONS.DEPLOY_BUTTON' | translate}}</button>
</div>
<button *ngIf="isSubscriptionAllowed()" class="btn btn-danger" (click)="unsubscribe()">{{'APPLICATIONS.UNSUBSCRIBE_BUTTON' | translate}}</button>
<button *ngIf="isSubscriptionAllowed()" class="btn btn-danger m-1" (click)="unsubscribe()">{{'APPLICATIONS.UNSUBSCRIBE_BUTTON' | translate}}</button>
</div>
</div>
......
src/app/appmarket/appmanagement/app-access-method-edit-component/app-access-method-edit.component.html
+ 1
− 1
View file @ 13e89a09
......@@ -61,7 +61,7 @@
</div>
</div>
<div class="col-sm-1">
<button class="btn btn-success" role="button" (click)="addNewDeployParam()" [disabled]="!isNewDeployParamValid()">{{'APP_ACCESS_METHOD_EDIT.ADD_PARAM' | translate}}</button>
<button class="btn btn-secondary" role="button" (click)="addNewDeployParam()" [disabled]="!isNewDeployParamValid()">{{'APP_ACCESS_METHOD_EDIT.ADD_PARAM' | translate}}</button>
</div>
</li>
</ul>
......
src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
+ 12
− 12
View file @ 13e89a09
......@@ -14,7 +14,7 @@
</div>
<input type="checkbox" [checked]="rulesAccepted"
(click)="changeRulesAcceptedFlag()"> {{'APPS_WIZARD.ACCEPT_RULES_CHECKBOX' | translate}}
<button type="button" class="btn btn-success pull-right" (click)="nextStep()" [disabled]="!rulesAccepted"
<button type="button" class="btn btn-primary pull-right" (click)="nextStep()" [disabled]="!rulesAccepted"
[tooltipDisabled]="rulesAccepted" pTooltip="{{'APPS_WIZARD.ACCEPT_RULES_TOOLTIP' | translate}}"
tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button>
</div>
......@@ -131,7 +131,7 @@
</div>
</form>
</div>
<button type="button" class="btn btn-success pull-right" (click)="nextStep()" [disabled]="basicInfoForm.invalid"
<button type="button" class="btn btn-primary pull-right" (click)="nextStep()" [disabled]="basicInfoForm.invalid"
[tooltipDisabled]="!basicInfoForm.invalid" pTooltip="{{'APPS_WIZARD.DISABLED_NEXT_BUTTON_TOOLTIP' | translate}}"
tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button>
</div>
......@@ -173,7 +173,7 @@
</p-fileUpload>
</div>
</div>
<button type="button" class="btn btn-success pull-right"
<button type="button" class="btn btn-primary pull-right"
(click)="nextStep()">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button>
</div>
......@@ -265,7 +265,7 @@
</div>
</div>
</form>
<button type="button" class="btn btn-success pull-right" (click)="nextStep()"
<button type="button" class="btn btn-primary pull-right" (click)="nextStep()"
[disabled]="descriptionForm.invalid" [tooltipDisabled]="!descriptionForm.invalid"
pTooltip="{{'APPS_WIZARD.DISABLED_NEXT_BUTTON_TOOLTIP' | translate}}"
tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button>
......@@ -381,7 +381,7 @@
(output)="removeStorageVolume($event)"></app-storage-volume-edit>
</li>
</ul>
<button class="btn btn-success" role="button"
<button class="btn btn-primary" role="button"
(click)="addNewStorageVolume()">{{'APPS_WIZARD.NEW_STORAGE_VOLUME' | translate}}</button>
</div>
......@@ -395,14 +395,14 @@
(output)="removeAccessMethod($event)"></app-access-method-edit>
</li>
</ul>
<button class="btn btn-success" role="button"
<button class="btn btn-primary" role="button"
(click)="addNewAccessMethod()">{{'APPS_WIZARD.NEW_ACCESS_METHOD' | translate}}</button>
</div>
</div>
</form>
</div>
<button type="button" class="btn btn-success pull-right" [disabled]="appDeploymentForm.invalid" (click)="nextStep()"
<button type="button" class="btn btn-primary pull-right" [disabled]="appDeploymentForm.invalid" (click)="nextStep()"
[tooltipDisabled]="!appDeploymentForm.invalid" pTooltip="{{'APPS_WIZARD.DISABLED_NEXT_BUTTON_TOOLTIP' | translate}}"
tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}} </button>
</div>
......@@ -468,7 +468,7 @@
[(ngModel)]="termsContent"
pTooltip="{{'APPS_WIZARD.TERMS_CONTENT_TOOLTIP' | translate}}"
tooltipPosition="bottom" [showDelay]="50"></textarea>
<button role="button" class="btn btn-success" (click)="changeTermsAcceptanceInForms()">{{'APPS_WIZARD.TERMS_CONTENT_BUTTON' | translate}}</button>
<button role="button" class="btn btn-primary" (click)="changeTermsAcceptanceInForms()">{{'APPS_WIZARD.TERMS_CONTENT_BUTTON' | translate}}</button>
</div>
</div>
<div *ngIf="applicationDTO.application.appConfigurationSpec.configFileRepositoryRequired">
......@@ -591,7 +591,7 @@
</div>
</div>
</div>
<button type="button" class="btn btn-success pull-right" [disabled]="appConfigForm.invalid" (click)="nextStep()"
<button type="button" class="btn btn-primary pull-right" [disabled]="appConfigForm.invalid" (click)="nextStep()"
[tooltipDisabled]="!appConfigForm.invalid" pTooltip="{{'APPS_WIZARD.DISABLED_NEXT_BUTTON_TOOLTIP' | translate}}"
tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}} </button>
</div>
......@@ -602,14 +602,14 @@
<div class="alert alert-danger" *ngIf="errorMessage">
{{errorMessage}}
</div>
<button type="button" class="btn btn-success pull-right" (click)="addApplication()"
<button type="button" class="btn btn-primary pull-right" (click)="addApplication()"
*ngIf="activeStepIndex === 6 && isInMode(ComponentMode.CREATE)"
[disabled]="isInvalidDescriptions()">{{'APPS_WIZARD.SUBMIT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-success pull-right" (click)="updateApplication()"
<button type="button" class="btn btn-primary pull-right" (click)="updateApplication()"
*ngIf="activeStepIndex === 4 && isInMode(ComponentMode.EDIT)"
[disabled]="isInvalidDescriptions()">{{'APPS_WIZARD.SUBMIT_BUTTON' | translate}}</button>
</div>
<button type="button" class="btn btn-warning pull-left" (click)="previousStep()"
<button type="button" class="btn btn-secondary pull-left" (click)="previousStep()"
*ngIf="activeStepIndex != 0">{{'APPS_WIZARD.PREVIOUS_BUTTON' | translate}}</button>
<nmaas-modal>
......
src/app/appmarket/appmanagement/app-preview/apppreview.component.html
+ 3
− 3
View file @ 13e89a09
......@@ -47,9 +47,9 @@
</div>
</div>
<div class="row">
<div class="btn-group pull-right">
<button class="btn btn-primary">{{'APPLICATIONS.DEPLOY_BUTTON' | translate}}</button>
<button class="btn btn-danger">{{'APPLICATIONS.UNSUBSCRIBE_BUTTON' | translate}}</button>
<div class=" pull-right">
<button class="btn btn-primary m-1">{{'APPLICATIONS.DEPLOY_BUTTON' | translate}}</button>
<button class="btn btn-danger m-1">{{'APPLICATIONS.UNSUBSCRIBE_BUTTON' | translate}}</button>
</div>
</div>
......
src/app/appmarket/appmanagement/app-static-global-deploy-parameters-edit/app-static-global-deploy-parameters-edit.component.html
+ 1
− 1
View file @ 13e89a09
......@@ -41,7 +41,7 @@
</div>
</div>
<div class="col-sm-1">
<button class="btn btn-success" role="button" (click)="addNewDeployParam()" [disabled]="!isNewDeployParamValid()">{{'APP_ACCESS_METHOD_EDIT.ADD_PARAM' | translate}}</button>
<button class="btn btn-secondary" role="button" (click)="addNewDeployParam()" [disabled]="!isNewDeployParamValid()">{{'APP_ACCESS_METHOD_EDIT.ADD_PARAM' | translate}}</button>
</div>
</li>
</ul>
......
src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
+ 10
− 10
View file @ 13e89a09
......@@ -25,7 +25,7 @@
</ng-template>
</p-dropdown>
</div>
<button type="button" class="btn btn-success pull-right" (click)="nextStep()" [disabled]="!rulesAccepted" [tooltipDisabled]="rulesAccepted" pTooltip="{{'APPS_WIZARD.ACCEPT_RULES_TOOLTIP' | translate}}" tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary pull-right" (click)="nextStep()" [disabled]="!rulesAccepted" [tooltipDisabled]="rulesAccepted" pTooltip="{{'APPS_WIZARD.ACCEPT_RULES_TOOLTIP' | translate}}" tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button>
</div>
<div *ngIf="activeStepIndex === 1">
......@@ -49,7 +49,7 @@
</div>
</form>
</div>
<button type="button" class="btn btn-success pull-right" (click)="nextStep()" [disabled]="basicInfoForm.invalid" [tooltipDisabled]="!basicInfoForm.invalid" pTooltip="{{'APPS_WIZARD.DISABLED_NEXT_BUTTON_TOOLTIP' | translate}}" tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary pull-right" (click)="nextStep()" [disabled]="basicInfoForm.invalid" [tooltipDisabled]="!basicInfoForm.invalid" pTooltip="{{'APPS_WIZARD.DISABLED_NEXT_BUTTON_TOOLTIP' | translate}}" tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}}</button>
</div>
</div>
......@@ -146,7 +146,7 @@
<app-storage-volume-edit [storageVolume]="s" [id]="i" [storageVolumeTypes]="storageVolumeTypeOptions()" (output)="removeStorageVolume($event)"></app-storage-volume-edit>
</li>
</ul>
<button class="btn btn-success" role="button" (click)="addNewStorageVolume()">{{'APPS_WIZARD.NEW_STORAGE_VOLUME' | translate}}</button>
<button class="btn btn-primary" role="button" (click)="addNewStorageVolume()">{{'APPS_WIZARD.NEW_STORAGE_VOLUME' | translate}}</button>
</div>
<div class="form-group form-group-sm">
......@@ -156,13 +156,13 @@
<app-access-method-edit [accessMethod]="a" [id]="i" [accessMethodTypes]="accessMethodTypeOptions()" (output)="removeAccessMethod($event)"></app-access-method-edit>
</li>
</ul>
<button class="btn btn-success" role="button" (click)="addNewAccessMethod()">{{'APPS_WIZARD.NEW_ACCESS_METHOD' | translate}}</button>
<button class="btn btn-primary" role="button" (click)="addNewAccessMethod()">{{'APPS_WIZARD.NEW_ACCESS_METHOD' | translate}}</button>
</div>
</div>
</form>
</div>
<button type="button" class="btn btn-success pull-right" [disabled]="appDeploymentForm.invalid" (click)="nextStep()" [tooltipDisabled]="!appDeploymentForm.invalid" pTooltip="{{'APPS_WIZARD.DISABLED_NEXT_BUTTON_TOOLTIP' | translate}}" tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}} </button>
<button type="button" class="btn btn-primary pull-right" [disabled]="appDeploymentForm.invalid" (click)="nextStep()" [tooltipDisabled]="!appDeploymentForm.invalid" pTooltip="{{'APPS_WIZARD.DISABLED_NEXT_BUTTON_TOOLTIP' | translate}}" tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}} </button>
</div>
<div *ngIf="activeStepIndex === 3">
......@@ -221,7 +221,7 @@
tooltipPosition="bottom" [showDelay]="50">
</textarea>
<button role="button" class="btn btn-success" (click)="changeTermsAcceptanceInForms()">{{'APPS_WIZARD.TERMS_CONTENT_BUTTON' | translate}}</button>
<button role="button" class="btn btn-primary" (click)="changeTermsAcceptanceInForms()">{{'APPS_WIZARD.TERMS_CONTENT_BUTTON' | translate}}</button>
</div>
</div>
<div *ngIf="applicationDTO.application.appConfigurationSpec.configFileRepositoryRequired">
......@@ -321,7 +321,7 @@
</div>
</div>
</div>
<button type="button" class="btn btn-success pull-right" [disabled]="appConfigForm.invalid" (click)="nextStep()"
<button type="button" class="btn btn-primary pull-right" [disabled]="appConfigForm.invalid" (click)="nextStep()"
[tooltipDisabled]="!appConfigForm.invalid" pTooltip="{{'APPS_WIZARD.DISABLED_NEXT_BUTTON_TOOLTIP' | translate}}"
tooltipPosition="bottom" [showDelay]="50">{{'APPS_WIZARD.NEXT_BUTTON' | translate}} </button>
</div>
......@@ -332,10 +332,10 @@
<div class="alert alert-danger" *ngIf="errorMessage">
{{errorMessage}}
</div>
<button type="button" class="btn btn-success pull-right" (click)="addApplication()" *ngIf="activeStepIndex === 4 && isInMode(ComponentMode.CREATE)">{{'APPS_WIZARD.SUBMIT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-success pull-right" (click)="updateApplication()" *ngIf="activeStepIndex === 4 && isInMode(ComponentMode.EDIT)">{{'APPS_WIZARD.SUBMIT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary pull-right" (click)="addApplication()" *ngIf="activeStepIndex === 4 && isInMode(ComponentMode.CREATE)">{{'APPS_WIZARD.SUBMIT_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary pull-right" (click)="updateApplication()" *ngIf="activeStepIndex === 4 && isInMode(ComponentMode.EDIT)">{{'APPS_WIZARD.SUBMIT_BUTTON' | translate}}</button>
</div>
<button type="button" class="btn btn-warning pull-left" (click)="previousStep()" *ngIf="activeStepIndex != 0">{{'APPS_WIZARD.PREVIOUS_BUTTON' | translate}}</button>
<button type="button" class="btn btn-secondary pull-left" (click)="previousStep()" *ngIf="activeStepIndex != 0">{{'APPS_WIZARD.PREVIOUS_BUTTON' | translate}}</button>
<nmaas-modal>
<div class="nmaas-modal-header">
......
src/app/appmarket/bulkDeployment/appDeployment/appnavigator/appnavigator.component.css
+ 4
− 4
View file @ 13e89a09
......@@ -45,7 +45,7 @@
.line-1 {
height: 10px;
background: #428bca;
background: #233354;
width: 100% !important;
margin-top: 19px;
}
......@@ -58,18 +58,18 @@
}
.step-active {
background-color: #428bca;
background-color: #233354;
color: white;
}
.step-done {
background-color: #428bca;
background-color: #233354;
color: white;
}
.step-next {
background-color: white;
color: #428bca;
color: #233354;
}
src/app/appmarket/domains/domain-group-view/domain-group-view.component.html
+ 1
− 1
View file @ 13e89a09
......@@ -182,7 +182,7 @@
</div>
</div>
<button type="submit" class="btn btn-default" [disabled]="!domainForm.form.valid">{{ 'DOMAIN_DETAILS.SUBMIT_BUTTON' | translate }}</button>
<button type="submit" class="btn btn-primary" [disabled]="!domainForm.form.valid">{{ 'DOMAIN_DETAILS.SUBMIT_BUTTON' | translate }}</button>
</form>
</div>
......
src/app/appmarket/domains/domain/domain.component.html
+ 1
− 1
View file @ 13e89a09
......@@ -258,7 +258,7 @@
</div>
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="submit" class="btn btn-default" [disabled]="!domainForm.form.valid">{{ 'DOMAIN_DETAILS.SUBMIT_BUTTON' | translate }}</button>
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="submit" class="btn btn-primary" [disabled]="!domainForm.form.valid">{{ 'DOMAIN_DETAILS.SUBMIT_BUTTON' | translate }}</button>
</form>
</div>
......
src/app/appmarket/domains/list/domainslist.component.html
+ 1
− 1
View file @ 13e89a09
......@@ -6,7 +6,7 @@
role="button">{{'DOMAINS.ADD_BUTTON' | translate}}</a>
</div>
<div *roles="['ROLE_SYSTEM_ADMIN']" class="flex" style="align-content: center; height: 35px; margin-top: 10px;">
<button class="btn btn-secondary" [routerLink]="['annotations']">{{'DOMAINS.ANNOTATIONS.EDIT' | translate}}</button>
<button class="btn btn-primary" [routerLink]="['annotations']">{{'DOMAINS.ANNOTATIONS.EDIT' | translate}}</button>
</div>
<div *roles="['ROLE_SYSTEM_ADMIN']" class="flex" style="align-content: center; height: 35px; margin-top: 8px;">
<span style="align-content: center; margin-right: 5px; margin-top: 10px;"> {{'DOMAINS.NOTACTIVE' | translate}}</span>
......
src/app/shared/comments/comments.component.html
+ 1
− 1
View file @ 13e89a09
......@@ -6,7 +6,7 @@
<label class="sr-only" for="comment">{{'COMMENTS.ADD_COMMENT' | translate}}:</label>
<textarea #textAreaNewComment name="comment" id="comment" placeholder="{{'COMMENTS.PLACEHOLDER' | translate}}"
class="form-control mb-4" rows="2" required [(ngModel)]="newComment.comment" style="resize: none; height: 100px; border-radius: 10px"></textarea>
<button type="submit" class="btn btn-default pull-right">{{'COMMENTS.ADD_BUTTON' | translate}}</button>
<button type="submit" class="btn btn-primary pull-right">{{'COMMENTS.ADD_BUTTON' | translate}}</button>
<div class="alert alert-danger" *ngIf="commentErrorMsg">
{{commentErrorMsg}}
</div>
......
src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html
+ 2
− 2
View file @ 13e89a09
......@@ -8,7 +8,7 @@
</div>
<div class="panel-body">
<div style="display: flex; justify-content: end">
<button type="button" class="btn btn-success" (click)="addAnnotation()">{{'DOMAINS.ANNOTATIONS.ADD'| translate}}</button>
<button type="button" class="btn btn-primary" (click)="addAnnotation()">{{'DOMAINS.ANNOTATIONS.ADD'| translate}}</button>
</div>
<div class="grid flex flex-grow-1">
<div class="col-4">
......@@ -97,4 +97,4 @@
<button type="button" class="btn btn-default" (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>
</div>
</nmaas-modal>
\ No newline at end of file
</nmaas-modal>
src/app/shared/users/details/userdetails.component.html
+ 11
− 8
View file @ 13e89a09
......@@ -2,6 +2,16 @@
<div class="panel-heading">{{'USER_DETAILS.HEADER' | translate}}</div>
<div class="panel-body">
<form *ngIf="user" (submit)="submit()" class="form-horizontal" #userDetailsForm="ngForm">
<div class="flex justify-content-end mb-4">
<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>
<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>
<div class="form-group">
<label class="col-sm-2 control-label">{{'USER_DETAILS.USERNAME' | translate}}</label>
......@@ -43,14 +53,7 @@
<p class="form-control-static">{{user?.id}}</p>
</div>
</div>
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="button"
class="btn btn-default" (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>
<button *ngIf="isInMode(ComponentMode.VIEW) && isModeAllowed(ComponentMode.EDIT) && authService.hasRole('ROLE_SYSTEM_ADMIN')" type="button"
class="btn btn-default" (click)="onModeChange()">{{'USER_DETAILS.EDIT_BUTTON' | translate}}</button>
<button (click)="passwordModal.show()" class="btn btn-success" *ngIf="canChangePassword() && !user.ssoUser" style="float: right;">{{'USER_DETAILS.CHANGE_PASSWORD_BUTTON' | translate}}</button>
<button (click)="passwordModal.show()" class="btn btn-secondary" *ngIf="canChangePassword() && !user.ssoUser" style="float: right;">{{'USER_DETAILS.CHANGE_PASSWORD_BUTTON' | translate}}</button>
</form>
<br>
<div class="alert alert-danger" *ngIf="errorMessage">
......
src/app/shared/users/new-ssh-key/new-ssh-key.component.html
+ 3
− 4
View file @ 13e89a09
<button type="button" class="btn btn-success" (click)="modal.show()">{{'SSH_KEYS.BUTTON_NEW_KEY' | translate}}</button>
<button type="button" class="btn btn-secondary" (click)="modal.show()">{{'SSH_KEYS.BUTTON_NEW_KEY' | translate}}</button>
<nmaas-modal styleModal="info">
<div class="nmaas-modal-header">{{'SSH_KEYS.MODAL.HEADER' | translate}}</div>
......@@ -27,11 +27,10 @@
<div *ngIf="key.errors.pattern">{{'SSH_KEYS.MODAL.ERROR.KEY_PATTERN' | translate}}</div>
</div>
<input type="submit" class="btn btn-success" value="{{'SSH_KEYS.MODAL.BUTTON_ADD' | translate}}" [disabled]="!requestForm.valid">
<button type="button" class="btn btn-primary pull-right" (click)="modal.hide()">{{'SSH_KEYS.MODAL.BUTTON_CANCEL' | translate}}</button>
<input type="submit" style="border-radius: 4px" class="btn btn-primary" value="{{'SSH_KEYS.MODAL.BUTTON_ADD' | translate}}" [disabled]="!requestForm.valid">
<button type="button" class="btn btn-secondary pull-right" (click)="modal.hide()">{{'SSH_KEYS.MODAL.BUTTON_CANCEL' | translate}}</button>
</form>
<hr/>
<div *ngIf="error" class="alert alert-danger">
{{error}}
</div>
......
src/app/shared/users/preferences/preferences.component.html
+ 9
− 6
View file @ 13e89a09
......@@ -3,6 +3,15 @@
<div class="panel-body">
<form *ngIf="user" (submit)="submit()" class="form-horizontal" #userPreferencesForm="ngForm">
<div class="flex justify-content-end mb-4">
<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>
<button *ngIf="isInMode(ComponentMode.VIEW) && isModeAllowed(ComponentMode.EDIT)" type="button"
class="btn btn-text" (click)="onModeChange()">{{'USER_DETAILS.EDIT_BUTTON' | translate}}</button>
</div>
<div class="form-group" [ngClass]="{'has-error': defaultDomain.invalid && (defaultDomain.dirty || defaultDomain.touched),
'has-success': defaultDomain.valid && (defaultDomain.dirty || defaultDomain.touched)}">
<label for="defaultDomain" class="col-sm-2 control-label">{{'USER_DETAILS.DEFAULT_DOMAIN' | translate}}:</label>
......@@ -15,12 +24,6 @@
</div>
</div>
<button *ngIf="!isInMode(ComponentMode.VIEW)" type="button"
class="btn btn-default" (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>
<button *ngIf="isInMode(ComponentMode.VIEW) && isModeAllowed(ComponentMode.EDIT)" type="button"
class="btn btn-default" (click)="onModeChange()">{{'USER_DETAILS.EDIT_BUTTON' | translate}}</button>
</form>
</div>
</div>
src/app/shared/users/ssh-keys/ssh-keys.component.html
+ 3
− 3
View file @ 13e89a09
<div style="margin-bottom: 120px;" class="panel panel-default">
<div class="panel-heading">{{'SSH_KEYS.HEADER' | translate}}</div>
<div class="panel-body">
<div class="flex justify-content-end mb-4">
<app-new-ssh-key (out)="getData()"></app-new-ssh-key>
</div>
<table class="table table-hover" aria-describedby="User ssh keys table">
<thead>
<tr>
......@@ -22,8 +25,5 @@
</tr>
</tbody>
</table>
<div>
<app-new-ssh-key (out)="getData()"></app-new-ssh-key>
</div>
</div>
</div>
src/favicon.ico
+ 0
− 0
View replaced file @ 9055ea76 View file @ 13e89a09
src/favicon.ico

1.12 KiB | W: 16px | H: 16px

src/favicon.ico

15 KiB | W: 48px | H: 48px

src/favicon.ico
src/favicon.ico
src/favicon.ico
src/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
src/styles.css
+ 21
− 0
View file @ 13e89a09
......@@ -71,3 +71,24 @@
.btn-primary[disabled]:hover{
background: #414f6b;
}
.btn{
border:none
}
.btn-secondary{
background: #3767BE;
color: #ffffff;
}
.btn-secondary:hover{
background: #32559B;
color: #ffffff
}
.btn-danger{
background: #C70500;
}
.btn-text{
color: #32559B;
background: #ffffff;
}
.btn-text:hover{
background: #EBEEF5;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment