diff --git a/src/app/appmarket/admin/configuration/details/configurationdetails.component.html b/src/app/appmarket/admin/configuration/details/configurationdetails.component.html
index 88eab2f854b50262c29235fa6f525437813ef728..8b2772bd8dd4ce52531e59c63e81c4332c4f15d1 100644
--- a/src/app/appmarket/admin/configuration/details/configurationdetails.component.html
+++ b/src/app/appmarket/admin/configuration/details/configurationdetails.component.html
@@ -68,12 +68,12 @@
[(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>
@@ -107,9 +107,11 @@
[checked]="this.configuration.bulkDomainsSendEmailForNewAccounts === true">
</div>
</div>
+ <div class="flex justify-content-end">
+ <button class="btn btn-primary"
+ type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button>
+ </div>
- <button class="btn btn-primary"
- type="submit">{{ 'PORTAL_CONFIGURATION.SUBMIT_BUTTON' | translate }}</button>
<div class="alert alert-danger" style="margin-top: 5px" *ngIf="errorMsg">
{{errorMsg}}
</div>
diff --git a/src/app/appmarket/admin/languagemanagement/languagedetails/languagedetails.component.html b/src/app/appmarket/admin/languagemanagement/languagedetails/languagedetails.component.html
index 8916eb8f49035e509d9f32b3174ba4a60281f219..ea34b0aed3d99fa3eac1f1f7f258f9b5956dfeb7 100644
--- a/src/app/appmarket/admin/languagemanagement/languagedetails/languagedetails.component.html
+++ b/src/app/appmarket/admin/languagemanagement/languagedetails/languagedetails.component.html
@@ -40,18 +40,22 @@
</ng-template>
<tr>
<td><input [(ngModel)]="newNestedKeys[ix][i]" name="newNestedElementKey" /></td>
- <td><input [(ngModel)]="newNestedValues[ix][i]" name="newNestedElementValue" /></td>
+ <td><input [(ngModel)]="newNestedValues[ix][i]" name="newNestedElementValue" />
+ <button class="btn btn-primary ml-4" (click)="handleAddingNewElements(languageContent[key][innerKey], ix, i)">{{'LANGUAGE_MANAGEMENT.ADD_NEW_ITEM_BUTTON' | translate }}</button>
+ </td>
</tr>
- <button class="btn btn-primary" (click)="handleAddingNewElements(languageContent[key][innerKey], ix, i)">{{'LANGUAGE_MANAGEMENT.ADD_NEW_ITEM_BUTTON' | translate }}</button>
+
</tbody>
</table>
</tr>
</ng-template>
<tr>
<td><input [(ngModel)]="newKeys[ix]" name="newElementKey" /></td>
- <td><input [(ngModel)]="newValues[ix]" name="newElementValue" /></td>
+ <td><input [(ngModel)]="newValues[ix]" name="newElementValue" />
+ <button class="btn btn-primary ml-4" (click)="handleAddingNewElements(languageContent[key], ix, undefined)">{{'LANGUAGE_MANAGEMENT.ADD_NEW_ITEM_BUTTON' | translate }}</button>
+ </td>
</tr>
- <button class="btn btn-primary" (click)="handleAddingNewElements(languageContent[key], ix, undefined)">{{'LANGUAGE_MANAGEMENT.ADD_NEW_ITEM_BUTTON' | translate }}</button>
+
</tbody>
</table>
<div class="alert alert-danger" *ngIf="errorMsg && !hide[ix]">
@@ -121,8 +125,10 @@
</div>
</ng-template>
</div>
+<div class="flex justify-content-end">
+ <button class="btn btn-primary" *ngIf="language" (click)="saveChanges()">{{'LANGUAGE_MANAGEMENT.SUBMIT_BUTTON' | translate }}</button>
+</div>
-<button class="btn btn-primary" *ngIf="language" (click)="saveChanges()">{{'LANGUAGE_MANAGEMENT.SUBMIT_BUTTON' | translate }}</button>
<div class="alert alert-danger" *ngIf="formErrorMsg" style="margin-top: 10px;">
{{formErrorMsg}}
diff --git a/src/app/appmarket/admin/languagemanagement/languagelist/languagelist.component.html b/src/app/appmarket/admin/languagemanagement/languagelist/languagelist.component.html
index bef7233b0d44018cc324e3a429b2a10ff1035932..fb9fcc5dce55c757cd218532db961cea45ee2c53 100644
--- a/src/app/appmarket/admin/languagemanagement/languagelist/languagelist.component.html
+++ b/src/app/appmarket/admin/languagemanagement/languagelist/languagelist.component.html
@@ -52,6 +52,6 @@
{{'LANGUAGE_MANAGEMENT.LANGUAGE_ERROR' | translate}}
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (click)="modal.hide()">{{'LANGUAGE_MANAGEMENT.MODAL.CLOSE_BUTTON' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'LANGUAGE_MANAGEMENT.MODAL.CLOSE_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/admin/monitor/details/monitor-details.component.html b/src/app/appmarket/admin/monitor/details/monitor-details.component.html
index a9b8e7c06361aad9acddf8a4b7889121f7a8cfdc..2e0a86e0866b612a8dc6bc0486481a8c44f673ff 100644
--- a/src/app/appmarket/admin/monitor/details/monitor-details.component.html
+++ b/src/app/appmarket/admin/monitor/details/monitor-details.component.html
@@ -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>
diff --git a/src/app/appmarket/appdetails/appdetails.component.css b/src/app/appmarket/appdetails/appdetails.component.css
index 463297bb0fc616ec9bd1397d2cea1f50d37ae173..59a19d772ba2deb41fa86137484fce97d7b4f1c8 100644
--- a/src/app/appmarket/appdetails/appdetails.component.css
+++ b/src/app/appmarket/appdetails/appdetails.component.css
@@ -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;
diff --git a/src/app/appmarket/appdetails/appdetails.component.html b/src/app/appmarket/appdetails/appdetails.component.html
index 8a31ad83ea781ec764ab12e53edd80fcbdaea616..4ba9674e295eeb8528aeb7426f08f1dbeea2cf49 100644
--- a/src/app/appmarket/appdetails/appdetails.component.html
+++ b/src/app/appmarket/appdetails/appdetails.component.html
@@ -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>
diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.css b/src/app/appmarket/appinstance/appinstance/appinstance.component.css
index 12ecd7c998a4d135f430c996cb562214b954c67b..77a5be710f9d54a07eee03a21eee3b19838063a4 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.css
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.css
@@ -78,7 +78,6 @@
:host ::ng-deep .p-dropdown {
width: 200px;
}
-.ui-dropdown-panel {
+.p-dropdown-items {
max-height: 150px;
- overflow-y: auto;
}
diff --git a/src/app/appmarket/appinstance/appinstance/appinstance.component.html b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
index 394ce52a597a6ea716030cbe9b8aa8485ad9936e..35a1a2a1aba53896f8dd9959defc24925816b35a 100644
--- a/src/app/appmarket/appinstance/appinstance/appinstance.component.html
+++ b/src/app/appmarket/appinstance/appinstance/appinstance.component.html
@@ -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}}
@@ -416,7 +416,7 @@
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-primary"
(click)="redeploy(); redeployConfirm.hide()">{{'REDEPLOY_MODAL.OK_BUTTON' | translate}}</button>
- <button type="button" class="btn btn-primary"
+ <button type="button" class="btn btn-secondary"
(click)="redeployConfirm.hide()">{{'REDEPLOY_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
@@ -432,7 +432,7 @@
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-primary"
(click)="removalFailedInstance(); removeConfirm.hide()">{{'REMOVE_MODAL.OK_BUTTON' | translate}}</button>
- <button type="button" class="btn btn-primary"
+ <button type="button" class="btn btn-secondary"
(click)="removeConfirm.hide()">{{'REMOVE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
@@ -448,7 +448,7 @@
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-primary"
(click)="enableAutoUpgrades(); enableAutoUpgradesConfirm.hide()">{{'ENABLE_AUTO_UPGRADES_MODAL.OK_BUTTON' | translate}}</button>
- <button type="button" class="btn btn-primary"
+ <button type="button" class="btn btn-secondary"
(click)="enableAutoUpgradesConfirm.hide()">{{'ENABLE_AUTO_UPGRADES_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
@@ -464,7 +464,7 @@
<div class="nmaas-modal-footer">
<button type="button" class="btn btn-primary"
(click)="disableAutoUpgrades(); disableAutoUpgradesConfirm.hide()">{{'DISABLE_AUTO_UPGRADES_MODAL.OK_BUTTON' | translate}}</button>
- <button type="button" class="btn btn-primary"
+ <button type="button" class="btn btn-secondary"
(click)="disableAutoUpgradesConfirm.hide()">{{'DISABLE_AUTO_UPGRADES_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/appinstance/modals/add-members-modal/add-members-modal.component.html b/src/app/appmarket/appinstance/modals/add-members-modal/add-members-modal.component.html
index 874d2ba9e83f214f21bc2cc86d9810793a7dd43e..45398c808ba0c5b485ffe0b6a5a87cb1cb0ba217 100644
--- a/src/app/appmarket/appinstance/modals/add-members-modal/add-members-modal.component.html
+++ b/src/app/appmarket/appinstance/modals/add-members-modal/add-members-modal.component.html
@@ -26,7 +26,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-success" (click)="submit()">
+ <button type="button" class="btn btn-primary" (click)="submit()">
{{'ADD_MEMBERS_MODAL.SUBMIT_BUTTON' | translate}}
</button>
<button type="button" class="btn btn-primary"
diff --git a/src/app/appmarket/appmanagement/app-access-method-edit-component/app-access-method-edit.component.html b/src/app/appmarket/appmanagement/app-access-method-edit-component/app-access-method-edit.component.html
index 8aad3424dcde471b407750c7d32feaa4b8a4324e..c53036075dcf0e89c3c83bb0c2e1fc9f51e7a18b 100644
--- a/src/app/appmarket/appmanagement/app-access-method-edit-component/app-access-method-edit.component.html
+++ b/src/app/appmarket/appmanagement/app-access-method-edit-component/app-access-method-edit.component.html
@@ -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>
diff --git a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html
index 4e103de0b2a785623baf7e8081165b046e789229..4fbade572a717bc1ceaa366511bc588551d6f8b7 100644
--- a/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html
+++ b/src/app/appmarket/appmanagement/app-add-json-app/app-add-json-app.component.html
@@ -17,7 +17,7 @@
<textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false; this.error = ''"></textarea>
</div>
<div class="flex flex-row justify-content-center justify-content-center mt-2">
- <button *ngIf="jsonText.length >0" pButton class="btn btn-success"
+ <button *ngIf="jsonText.length >0" pButton class="btn btn-secondary"
(click)="sendJsonText()"> {{'APPS_MANAGEMENT.SEND_JSON' | translate}}</button>
</div>
@@ -32,7 +32,7 @@
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (click)="modal.hide()">
+ <button type="button" class="btn btn-primary" (click)="modal.hide()">
{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}
</button>
</div>
diff --git a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html
index 7b228696a1610a3f2de818942a34ec135aca945a..b1aebf85fa2ec769679f9d620222cb298756fc8c 100644
--- a/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html
+++ b/src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html
@@ -17,7 +17,7 @@
<textarea rows="10" cols="100" pInputTextarea [(ngModel)]="jsonText" (keyup)="this.JsonError = false; this.error = ''"></textarea>
</div>
<div class="flex flex-row justify-content-center justify-content-center mt-2">
- <button *ngIf="jsonText.length >0" pButton class="btn btn-success"
+ <button *ngIf="jsonText.length >0" pButton class="btn btn-primary"
(click)="sendJsonText()"> {{'APPS_MANAGEMENT.SEND_JSON' | translate}}</button>
</div>
@@ -32,7 +32,7 @@
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (click)="modal.hide()">
+ <button type="button" class="btn btn-primary" (click)="modal.hide()">
{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}
</button>
</div>
diff --git a/src/app/appmarket/appmanagement/app-change-owner-modal/app-change-owner-modal.component.html b/src/app/appmarket/appmanagement/app-change-owner-modal/app-change-owner-modal.component.html
index a1775639656d216c413fd48be9c25779ffc5b200..b9bdad7579139c2b35a093187883df888e18cd3f 100644
--- a/src/app/appmarket/appmanagement/app-change-owner-modal/app-change-owner-modal.component.html
+++ b/src/app/appmarket/appmanagement/app-change-owner-modal/app-change-owner-modal.component.html
@@ -18,12 +18,12 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (click)="modal.hide()">
- {{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}
- </button>
<button type="button" class="btn btn-primary" (click)="submit()" [disabled]="selectOwner.invalid">
{{'APPS_MANAGEMENT.CHANGE_OWNER_BUTTON' | translate}}
</button>
+ <button type="button" class="btn btn-secondary" (click)="modal.hide()">
+ {{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}
+ </button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/appmanagement/app-change-state-modal/appchangestatemodal.component.html b/src/app/appmarket/appmanagement/app-change-state-modal/appchangestatemodal.component.html
index aef3439cfb56dc449a0ae6bad1cf0c17435ae79e..1dd32a582bcaaf95e0e17ed15b0b237081705d77 100644
--- a/src/app/appmarket/appmanagement/app-change-state-modal/appchangestatemodal.component.html
+++ b/src/app/appmarket/appmanagement/app-change-state-modal/appchangestatemodal.component.html
@@ -39,7 +39,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (click)="modal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
+ <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)="submit()" [disabled]="changeState.invalid">{{'APP_CHANGE_STATE_MODAL.CHANGE_STATE_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
index 98404f57b713f9b18afa820f83a7a7bdb3ea5035..1e8d9408d3a34ef3129c565b7d319709c63fcaa2 100644
--- a/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
@@ -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>
diff --git a/src/app/appmarket/appmanagement/app-preview/apppreview.component.html b/src/app/appmarket/appmanagement/app-preview/apppreview.component.html
index d7f088194c8af28187e30d1cc32e5ab57994e89c..786c99b34c52d97b136610eeac55793cbccc58a0 100644
--- a/src/app/appmarket/appmanagement/app-preview/apppreview.component.html
+++ b/src/app/appmarket/appmanagement/app-preview/apppreview.component.html
@@ -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>
diff --git a/src/app/appmarket/appmanagement/app-static-global-deploy-parameters-edit/app-static-global-deploy-parameters-edit.component.html b/src/app/appmarket/appmanagement/app-static-global-deploy-parameters-edit/app-static-global-deploy-parameters-edit.component.html
index 5a6ca05a8d7370ad60d23024b7b1623e8cca5864..c99e9dbba7e80560f0afb12e3a36d2a006202945 100644
--- a/src/app/appmarket/appmanagement/app-static-global-deploy-parameters-edit/app-static-global-deploy-parameters-edit.component.html
+++ b/src/app/appmarket/appmanagement/app-static-global-deploy-parameters-edit/app-static-global-deploy-parameters-edit.component.html
@@ -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>
diff --git a/src/app/appmarket/appmanagement/app-storage-volume-edit-component/app-storage-volume-edit.component.html b/src/app/appmarket/appmanagement/app-storage-volume-edit-component/app-storage-volume-edit.component.html
index 66c93c6b64cebc0256d12d0b175ef8ead26467fd..5e7d346a803c7987debc061d9555a45fd4fbf6fc 100644
--- a/src/app/appmarket/appmanagement/app-storage-volume-edit-component/app-storage-volume-edit.component.html
+++ b/src/app/appmarket/appmanagement/app-storage-volume-edit-component/app-storage-volume-edit.component.html
@@ -46,7 +46,7 @@
</div>
</div>
<div class="col-sm-1">
- <button class="btn btn-success" role="button" (click)="addNewDeployParam()" [disabled]="!isNewDeployParamValid()">{{'APP_STORAGE_VOLUME_EDIT.ADD_PARAM' | translate}}</button>
+ <button class="btn btn-secondary" role="button" (click)="addNewDeployParam()" [disabled]="!isNewDeployParamValid()">{{'APP_STORAGE_VOLUME_EDIT.ADD_PARAM' | translate}}</button>
</div>
</li>
</ul>
diff --git a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
index b62490ca3e95fad81a7678c5a643b0724829f747..2ab7728bbcc7926c992d6a14c9a25960430c5a9d 100644
--- a/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
+++ b/src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
@@ -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">
diff --git a/src/app/appmarket/bulkDeployment/appDeployment/appnavigator/appnavigator.component.css b/src/app/appmarket/bulkDeployment/appDeployment/appnavigator/appnavigator.component.css
index b995a7c9878bfbbde68a6a2b4acb84079fb614d5..3cd6365aa9c2c2f020c6da28d75b23c26c1e8777 100644
--- a/src/app/appmarket/bulkDeployment/appDeployment/appnavigator/appnavigator.component.css
+++ b/src/app/appmarket/bulkDeployment/appDeployment/appnavigator/appnavigator.component.css
@@ -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;
}
diff --git a/src/app/appmarket/bulkDeployment/bulk-list/bulk-list.component.html b/src/app/appmarket/bulkDeployment/bulk-list/bulk-list.component.html
index 7d52cd49fb84d6381df4d2bfc7a6f656176e91a7..c68bbe80370e26c7df8dfd879c91785745f46cb2 100644
--- a/src/app/appmarket/bulkDeployment/bulk-list/bulk-list.component.html
+++ b/src/app/appmarket/bulkDeployment/bulk-list/bulk-list.component.html
@@ -132,7 +132,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (click)="modal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
+ <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" [disabled]="false">{{'BULK.REMOVE.REMOVE' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html b/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html
index 47c02259b58430695a4c44238a52dba993baadf6..c42594752a704d430b01c6c597c099788a2ccb41 100644
--- a/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html
+++ b/src/app/appmarket/domains/domain-group-view/domain-group-view.component.html
@@ -40,7 +40,7 @@
</div>
<div class="panel-body">
<div *roles="['ROLE_SYSTEM_ADMIN']" style="display: flex; justify-content: end">
- <button type="button" class="btn btn-success" (click)="showModalUser()">{{'DOMAINS.GROUP.ADD_USERS' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="showModalUser()">{{'DOMAINS.GROUP.ADD_USERS' | translate}}</button>
</div>
<div *roles="['ROLE_VL_MANAGER']" style="display: flex; justify-content: end">
<button type="button" class="btn btn-warning" (click)="removeMyAccess()">{{'DOMAINS.GROUP.DELETE_MYSELF' | translate}}</button>
@@ -82,7 +82,7 @@
</div>
<div class="panel-body collapse" id="domains-list">
<div style="display: flex; justify-content: end">
- <button type="button" class="btn btn-success" (click)="showModal()">{{'DOMAINS.LIST.ADD' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="showModal()">{{'DOMAINS.LIST.ADD' | translate}}</button>
</div>
<table class="table table-hover table-condensed" aria-describedby="Domains in Group table" style="margin-top: 2rem">
<thead>
@@ -118,7 +118,7 @@
</div>
<div class="panel-body collapse" id="app-status" >
<div style="display: flex; justify-content: end; margin-bottom: 2rem">
- <button class="btn btn-primary" type="button" (click)="toggleAll()">{{'SHARED.TOGGLE' | translate}}</button>
+ <button class="btn btn-secondary" type="button" (click)="toggleAll()">{{'SHARED.TOGGLE' | translate}}</button>
</div>
<table class="table table-hover table-condensed" aria-describedby="Domain details table">
<thead>
@@ -181,8 +181,9 @@
</table>
</div>
</div>
-
- <button type="submit" class="btn btn-default" [disabled]="!domainForm.form.valid">{{ 'DOMAIN_DETAILS.SUBMIT_BUTTON' | translate }}</button>
+ <div class="flex justify-content-end">
+ <button type="submit" class="btn btn-primary" [disabled]="!domainForm.form.valid">{{ 'DOMAIN_DETAILS.SUBMIT_BUTTON' | translate }}</button>
+ </div>
</form>
</div>
@@ -210,8 +211,8 @@
</table>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (click)="modal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="closeModal()" [disabled]="false">{{'DOMAINS.LIST.ADD' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
@@ -233,7 +234,7 @@
<tr class="table-row">
<td>{{user.username}}</td>
<td>{{user.firstname}} {{user.lastname}}</td>
- <td> <button *roles="['ROLE_SYSTEM_ADMIN']" type="button" class="btn btn-success" (click)="addUser(user)">{{'DOMAINS.GROUP.ADD' | translate}}</button> </td>
+ <td> <button *roles="['ROLE_SYSTEM_ADMIN']" type="button" class="btn btn-secondary" (click)="addUser(user)">{{'DOMAINS.GROUP.ADD' | translate}}</button> </td>
</tr>
</ng-template>
</thead>
@@ -257,7 +258,7 @@
</table>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (click)="closeModalUserAccess()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
<button type="button" class="btn btn-primary" (click)="saveUsers()" [disabled]="false">{{'DOMAINS.GROUP.ADD_USERS' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="closeModalUserAccess()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/appmarket/domains/domain/domain.component.html b/src/app/appmarket/domains/domain/domain.component.html
index c199e2c30d0deaeaf31169341133ced26f5c2796..110fee5f7ec7c8547801b82bdfaa430334c7ac9f 100644
--- a/src/app/appmarket/domains/domain/domain.component.html
+++ b/src/app/appmarket/domains/domain/domain.component.html
@@ -225,7 +225,7 @@
</div>
</div>
<br>
- <button type="button" class="btn btn-sm btn-default" (click)="addNetwork()" *ngIf="!isInMode(ComponentMode.VIEW)"><span class="glyphicon glyphicon-plus"></span> {{'DOMAIN_DETAILS.ADD' | translate}}</button>
+ <button type="button" class="btn btn-sm btn-primary" (click)="addNetwork()" *ngIf="!isInMode(ComponentMode.VIEW)"><span class="glyphicon glyphicon-plus"></span> {{'DOMAIN_DETAILS.ADD' | translate}}</button>
</div>
</div>
@@ -257,8 +257,9 @@
</div>
</div>
-
- <button *ngIf="!isInMode(ComponentMode.VIEW)" type="submit" class="btn btn-default" [disabled]="!domainForm.form.valid">{{ 'DOMAIN_DETAILS.SUBMIT_BUTTON' | translate }}</button>
+ <div class="flex justify-content-end">
+ <button *ngIf="!isInMode(ComponentMode.VIEW)" type="submit" class="btn btn-primary" [disabled]="!domainForm.form.valid">{{ 'DOMAIN_DETAILS.SUBMIT_BUTTON' | translate }}</button>
+ </div>
</form>
</div>
diff --git a/src/app/appmarket/domains/list/domainslist.component.html b/src/app/appmarket/domains/list/domainslist.component.html
index af69e2cfaa29c32d7f78ee05275dbd470a4c0d34..0e6e766792619153fc9668fda83660da110c6c2d 100644
--- a/src/app/appmarket/domains/list/domainslist.component.html
+++ b/src/app/appmarket/domains/list/domainslist.component.html
@@ -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>
diff --git a/src/app/appmarket/domains/modals/removal-confirmation-modal/removal-confirmation-modal.component.html b/src/app/appmarket/domains/modals/removal-confirmation-modal/removal-confirmation-modal.component.html
index 8fe3940ad35eb9ebd9caf1440931f10ac74ebe7d..987b430dc73d2fc1b20d64de2f39ea98c4904e2f 100644
--- a/src/app/appmarket/domains/modals/removal-confirmation-modal/removal-confirmation-modal.component.html
+++ b/src/app/appmarket/domains/modals/removal-confirmation-modal/removal-confirmation-modal.component.html
@@ -7,7 +7,7 @@
</p>
</div>
<div class="nmaas-modal-footer">
- <button [disabled]="disableButton" role="button" type="button" class="btn btn-success" (click)="removeDomain()">{{ 'DOMAIN_DETAILS.MODAL.BUTTONS.CONFIRM' | translate}}</button>
- <button type="button" class="btn btn-primary" (click)="modal.hide()">{{ 'DOMAIN_DETAILS.MODAL.BUTTONS.CANCEL' | translate}}</button>
+ <button [disabled]="disableButton" role="button" type="button" class="btn btn-primary" (click)="removeDomain()">{{ 'DOMAIN_DETAILS.MODAL.BUTTONS.CONFIRM' | translate}}</button>
+ <button type="button" class="btn btn-secondary" (click)="modal.hide()">{{ 'DOMAIN_DETAILS.MODAL.BUTTONS.CANCEL' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/shared/admin/clusters/details/clusterdetails.component.html b/src/app/shared/admin/clusters/details/clusterdetails.component.html
index 468c28cee49ba7a58a0acef5aeba00b8a7506e36..8d086868fe9beadb049eb635e58a6153ec82e304 100644
--- a/src/app/shared/admin/clusters/details/clusterdetails.component.html
+++ b/src/app/shared/admin/clusters/details/clusterdetails.component.html
@@ -231,7 +231,7 @@
<tr *ngIf="!isInMode(ComponentMode.VIEW)">
<td></td><td></td><td></td><td></td><td></td><td></td>
<td>
- <button type="button" class="btn btn-sm btn-success"
+ <button type="button" class="btn btn-sm btn-secondary"
(click)="addNetwork()">{{ 'CLUSTERS.ADD_BUTTON' | translate }}
</button>
</td>
diff --git a/src/app/shared/comments/comments.component.html b/src/app/shared/comments/comments.component.html
index 1398989b6e6b076bfebc94b62166905be2107291..cddcab5aa1d914ef530ac4f255ff7f7d86fea7e1 100644
--- a/src/app/shared/comments/comments.component.html
+++ b/src/app/shared/comments/comments.component.html
@@ -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>
diff --git a/src/app/shared/comments/single-comment/single-comment.component.html b/src/app/shared/comments/single-comment/single-comment.component.html
index 66a4935d7910a4f97f44a960a89922ce553f591f..d651792c58c1b3be7f80b00d6e8795123f3366b9 100644
--- a/src/app/shared/comments/single-comment/single-comment.component.html
+++ b/src/app/shared/comments/single-comment/single-comment.component.html
@@ -37,8 +37,8 @@
<div class="form-group">
<textarea #textAreaComment name="comment" id="comment2" placeholder="{{'COMMENTS.PLACEHOLDER' | translate}}"
class="form-control" rows="2"></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>
</form>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/shared/common/password/password.component.html b/src/app/shared/common/password/password.component.html
index 1850c05802cbe755cfa719348b6aec718bd966cd..dadd98f0bde525ef688faaa9ee82297241ca120d 100644
--- a/src/app/shared/common/password/password.component.html
+++ b/src/app/shared/common/password/password.component.html
@@ -42,7 +42,7 @@
</div>
<div class="nmaas-modal-footer">
<button type="submit" class="btn btn-primary" (click)="submit()">{{'PASSWORD.SUBMIT_BUTTON' | translate}}</button>
- <button class="btn btn-danger" (click)="hide()">Cancel</button>
+ <button class="btn btn-secondary" (click)="hide()">Cancel</button>
</div>
</nmaas-modal>
diff --git a/src/app/shared/contact/contact.component.html b/src/app/shared/contact/contact.component.html
index 34ce46b8c2439a5912ea85737a1f34b9359fde9a..7527a6375a2639f9d4e109f268a75a1dc95b8cbd 100644
--- a/src/app/shared/contact/contact.component.html
+++ b/src/app/shared/contact/contact.component.html
@@ -26,7 +26,7 @@
{{ 'CONTACT_FORM.MODAL.MESSAGE' | translate }}
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (click)="modal.hide()">
+ <button type="button" class="btn btn-primary" (click)="modal.hide()">
{{'CONTACT_FORM.MODAL.CLOSE_BUTTON' | translate}}
</button>
</div>
diff --git a/src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html b/src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html
index 4f6430f6206bf1061806261ce492092e812d77cc..826defac24c854dbfe46797077b2e1331ea1dc36 100644
--- a/src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html
+++ b/src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html
@@ -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">
@@ -63,8 +63,8 @@
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (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-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>
+ <button type="button" class="btn btn-secondary" (click)="editModal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
</div>
-</nmaas-modal>
\ No newline at end of file
+</nmaas-modal>
diff --git a/src/app/shared/modal/appinstall/appinstallmodal.component.html b/src/app/shared/modal/appinstall/appinstallmodal.component.html
index 7f5da386fa2d688a41132bb82d86ecbc8a889b8c..a20f13295c6c956e9c89c730e710bd492875de95 100644
--- a/src/app/shared/modal/appinstall/appinstallmodal.component.html
+++ b/src/app/shared/modal/appinstall/appinstallmodal.component.html
@@ -29,7 +29,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default" (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>
diff --git a/src/app/shared/modal/modal-notification-send/modal-notification-send.component.html b/src/app/shared/modal/modal-notification-send/modal-notification-send.component.html
index 110dfa9a340a3368694f36eed3a698f77cd69bf0..435992b9e9b3e71156a5ded7e6ca4008a93fd501 100644
--- a/src/app/shared/modal/modal-notification-send/modal-notification-send.component.html
+++ b/src/app/shared/modal/modal-notification-send/modal-notification-send.component.html
@@ -14,6 +14,6 @@
</div>
<div class="nmaas-modal-footer">
<button type="submit" class="btn btn-primary text-center" [disabled]="!f.valid" form="notification-form">{{'MESSAGE_MODAL.CONFIRM' | translate}}</button>
- <button type="button" (click)="modal.hide()" class="btn ntn-secondary text-center">{{'MESSAGE_MODAL.DISMISS' | translate}}</button>
+ <button type="button" (click)="modal.hide()" class="btn btn-secondary text-center">{{'MESSAGE_MODAL.DISMISS' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/shared/users/details/userdetails.component.html b/src/app/shared/users/details/userdetails.component.html
index c443f899a5a6d820b405f288a8047a628c9240f6..98a4227aabc594f41570935d5b90fc1f2ccdc115 100644
--- a/src/app/shared/users/details/userdetails.component.html
+++ b/src/app/shared/users/details/userdetails.component.html
@@ -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-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>
+
+
<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">
diff --git a/src/app/shared/users/list/userslist.component.html b/src/app/shared/users/list/userslist.component.html
index 8b4f99260baed2f4e1a0faa4e3fea198ef5c6105..dcae8ac082f4203c553b5edad904b31c99eabb05 100644
--- a/src/app/shared/users/list/userslist.component.html
+++ b/src/app/shared/users/list/userslist.component.html
@@ -176,7 +176,7 @@
</span>
</td>
<td *ngIf="isModeAllowed(ComponentMode.EDIT)" style="width: 170px">
- <button class="btn btn-success" role="button"
+ <button class="btn btn-secondary" role="button"
(click)="addToCurrentDomain(user)"> {{'USERS.ADD_TO_DOMAIN_BUTTON' | translate}}</button>
</td>
</tr>
diff --git a/src/app/shared/users/new-ssh-key/new-ssh-key.component.html b/src/app/shared/users/new-ssh-key/new-ssh-key.component.html
index 209a73c2783921008bc689223a7de9a6838c6bd9..fa6c415c393941a1004522b79955733164f864e7 100644
--- a/src/app/shared/users/new-ssh-key/new-ssh-key.component.html
+++ b/src/app/shared/users/new-ssh-key/new-ssh-key.component.html
@@ -1,4 +1,4 @@
-<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>
diff --git a/src/app/shared/users/preferences/preferences.component.html b/src/app/shared/users/preferences/preferences.component.html
index d90fa2f74bb87918dcddef800affa50d5e6273c9..22fe2433fbb7bd015706009efd368458d51b17c1 100644
--- a/src/app/shared/users/preferences/preferences.component.html
+++ b/src/app/shared/users/preferences/preferences.component.html
@@ -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-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>
+
<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>
diff --git a/src/app/shared/users/ssh-keys/ssh-keys.component.html b/src/app/shared/users/ssh-keys/ssh-keys.component.html
index 041ec1505c4c86cb91dc0bb0ecc26110cad073e8..efb4cb027d9813f2b99c014a6a7894b6ea6e829d 100644
--- a/src/app/shared/users/ssh-keys/ssh-keys.component.html
+++ b/src/app/shared/users/ssh-keys/ssh-keys.component.html
@@ -1,6 +1,9 @@
<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>
diff --git a/src/app/welcome/login/login.component.html b/src/app/welcome/login/login.component.html
index fd6b29f97824ecdc039cdeb67d53d3c1263002bf..27418cc9a946d4901ca623c444d8dde34dfc66ca 100644
--- a/src/app/welcome/login/login.component.html
+++ b/src/app/welcome/login/login.component.html
@@ -56,7 +56,7 @@
{{'RESET_PASSWORD.MODAL.BODY' | translate}}
</div>
<div class="nmaas-modal-footer">
- <button type="button" class="btn btn-default"
+ <button type="button" class="btn btn-primary"
routerLink="/welcome/login">{{'RESET_PASSWORD.MODAL.CLOSE_BUTTON' | translate}}</button>
</div>
</nmaas-modal>
diff --git a/src/app/welcome/passwordreset/password-reset.component.html b/src/app/welcome/passwordreset/password-reset.component.html
index 8eb8296db0bbc30d13277ffeef9542ce3e8a21c8..c62301d65a9f27622c178c45b8c299fa04ca760a 100644
--- a/src/app/welcome/passwordreset/password-reset.component.html
+++ b/src/app/welcome/passwordreset/password-reset.component.html
@@ -46,7 +46,7 @@
</div>
<div *ngIf="!user" class="form-group form-group-sm">
<p class="alert alert-danger" style="text-align: center">{{'RESET_PASSWORD.INVALID_TOKEN' | translate}}</p>
- <button class="btn btn-default text-center center-block" (click)="goBack()" type="button">{{'RESET_PASSWORD.GO_BACK' | translate}}</button>
+ <button class="btn btn-primary text-center center-block" (click)="goBack()" type="button">{{'RESET_PASSWORD.GO_BACK' | translate}}</button>
</div>
</div>
</div>
diff --git a/src/app/welcome/registration/registration.component.html b/src/app/welcome/registration/registration.component.html
index c85ba608ea25d0bbb74e3c5554071f2e67818bcf..1f441ce69d2110142f3a18b2dae93c9c64bff7e8 100644
--- a/src/app/welcome/registration/registration.component.html
+++ b/src/app/welcome/registration/registration.component.html
@@ -77,7 +77,7 @@
</div>
</div>
<div class="nmaas-modal-footer">
- <button class="btn btn-danger center-block" [routerLink]="['/welcome/login']">{{ 'REGISTRATION.DONE_MESSAGE' | translate }}</button>
+ <button class="btn btn-primary center-block" (click)="modal.hide()" [routerLink]="['/welcome/login']">{{ 'REGISTRATION.DONE_MESSAGE' | translate }}</button>
</div>
</nmaas-modal>
<modal-info-terms></modal-info-terms>
diff --git a/src/favicon.ico b/src/favicon.ico
index 2cb7f9d9710124cd8eb447960fcc4710854b37a2..3f1a6d0b085b289ede1fb0078657388f168c2214 100644
Binary files a/src/favicon.ico and b/src/favicon.ico differ
diff --git a/src/styles.css b/src/styles.css
index 1e608c31cb0b02c4dc8573e311be7325a5a2e82f..290b2bde17930613d3ac116a25829272f8eb6218 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -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;
+}