Skip to content
Snippets Groups Projects
Commit 09f9b0a7 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'

Resolve "Design new layout for buttons and apply wherever required to be consistent"

See merge request !26
parents 9e3695ec d03667b9
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 83 additions and 74 deletions
src/app/appmarket/admin/configuration/details/configurationdetails.component.html
+ 6
− 4
View file @ 09f9b0a7
......@@ -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>
......
src/app/appmarket/admin/languagemanagement/languagedetails/languagedetails.component.html
+ 11
− 5
View file @ 09f9b0a7
......@@ -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}}
......
src/app/appmarket/admin/languagemanagement/languagelist/languagelist.component.html
+ 1
− 1
View file @ 09f9b0a7
......@@ -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>
src/app/appmarket/admin/monitor/details/monitor-details.component.html
+ 6
− 4
View file @ 09f9b0a7
......@@ -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>
src/app/appmarket/appdetails/appdetails.component.css
+ 4
− 4
View file @ 09f9b0a7
......@@ -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 @ 09f9b0a7
......@@ -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/appinstance/appinstance/appinstance.component.css
+ 1
− 2
View file @ 09f9b0a7
......@@ -78,7 +78,6 @@
:host ::ng-deep .p-dropdown {
width: 200px;
}
.ui-dropdown-panel {
.p-dropdown-items {
max-height: 150px;
overflow-y: auto;
}
src/app/appmarket/appinstance/appinstance/appinstance.component.html
+ 10
− 10
View file @ 09f9b0a7
......@@ -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>
......
src/app/appmarket/appinstance/modals/add-members-modal/add-members-modal.component.html
+ 1
− 1
View file @ 09f9b0a7
......@@ -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"
......
src/app/appmarket/appmanagement/app-access-method-edit-component/app-access-method-edit.component.html
+ 1
− 1
View file @ 09f9b0a7
......@@ -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-add-json-app/app-add-json-app.component.html
+ 2
− 2
View file @ 09f9b0a7
......@@ -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>
......
src/app/appmarket/appmanagement/app-add-json-version-app/app-add-json-version-app.component.html
+ 2
− 2
View file @ 09f9b0a7
......@@ -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>
......
src/app/appmarket/appmanagement/app-change-owner-modal/app-change-owner-modal.component.html
+ 3
− 3
View file @ 09f9b0a7
......@@ -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>
src/app/appmarket/appmanagement/app-change-state-modal/appchangestatemodal.component.html
+ 1
− 1
View file @ 09f9b0a7
......@@ -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>
......
src/app/appmarket/appmanagement/app-create-wizard/app-create-wizard.component.html
+ 12
− 12
View file @ 09f9b0a7
......@@ -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 @ 09f9b0a7
......@@ -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 @ 09f9b0a7
......@@ -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-storage-volume-edit-component/app-storage-volume-edit.component.html
+ 1
− 1
View file @ 09f9b0a7
......@@ -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>
......
src/app/appmarket/appmanagement/app-version-create-wizard/app-version-create-wizard.component.html
+ 10
− 10
View file @ 09f9b0a7
......@@ -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 @ 09f9b0a7
......@@ -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;
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment