updated buttons

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}}

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>

src/app/appmarket/appinstance/appinstance/appinstance.component.html

@@ -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

@@ -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-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>

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>

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>
 

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>

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>

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>

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-primary" [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>

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-primary" [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>
 

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>

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>

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>
+</div>
\ No newline at end of file

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>
 

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>

src/app/shared/domain-namespace-annotations/domain-namespace-annotations.component.html

@@ -63,7 +63,7 @@
 
     </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)="closeModal()" [disabled]="isKeyNotUniqueAdd(newAnnotations) || !isKeyPatternCorrect">{{'DOMAINS.ADD_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-secondary" (click)="editModal.hide()">{{'APP_CHANGE_STATE_MODAL.CANCEL_BUTTON' | translate}}</button>
         <button type="button" class="btn btn-primary" (click)="closeModalEdit()" [disabled]="isEditAnnotationCorrect(editAnnotation) || !isKeyPatternCorrect">{{'DOMAINS.EDIT_BUTTON' | translate}}</button>
     </div>
 </nmaas-modal>

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-secondary" (click)="modal.hide()">{{'INSTALL_MODAL.CLOSE_BUTTON' | translate}}</button>
 		<button type="button" class="btn btn-primary" (click)="create()" [disabled]="instance_name.invalid || clicked">{{'INSTALL_MODAL.DEPLOY_BUTTON' | translate}}</button>
 	</div>
 </nmaas-modal>

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>