Fixing layout issues

3 files changed, 12 insertions, 4 deletions

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.html
index d6fba7ea5..cd1e9b0b9 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.html
@@ -18,7 +18,7 @@
 
 <form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()">
     <div class="form-group row col-md-8">
-        <div class="col-md-1">{{'form.edit' |translate}}&nbsp;<span
+        <div class="col-md-2 col-form-label">{{'form.edit' |translate}}&nbsp;<span
                 class="fas fa-edit"></span></div>
         <div class="col-md-6">
             <input class="form-check-input" type="checkbox" [value]="editMode" [checked]="editMode"
@@ -74,14 +74,14 @@
                 </label>
             </div>
         </div>
-        <div class="col-md-2" *ngIf="editMode">
+        <div class="col-md-3" *ngIf="editMode">
             <button class="btn btn-primary" type="submit"
                     [disabled]="userForm.invalid || !userForm.dirty">{{'form.button.save'|translate}}</button>
         </div>
     </div>
 </form>
 <hr/>
-<ngb-accordion activeIds="parents,children,permissions">
+<ngb-accordion activeIds="">
     <ngb-panel id="parents">
         <ng-template ngbPanelHeader let-opened="opened">
             <div class="d-flex align-items-center justify-content-between">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.ts b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.ts
index 7654ee929..49ab9f334 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.ts
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/roles/manage-roles-edit/manage-roles-edit.component.ts
@@ -83,6 +83,13 @@ export class ManageRolesEditComponent extends EditBaseComponent<Role> implements
     }
 
     ngOnInit(): void {
+        this.route.queryParams.subscribe(
+            params => {
+                if (params.editmode) {
+                    this.editMode=true;
+                }
+            }
+        )
         this.route.params.pipe(
             map(params => params.roleid),
             filter(roleid => roleid != null),
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html
index 9c23ac08e..b4f55f5a6 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/archiva-web/src/app/modules/security/security-configuration/ldap-security/ldap-security.component.html
@@ -16,7 +16,7 @@
   ~ under the License.
   -->
 
-<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()">
+<form class="mt-3 mb-3" [formGroup]="userForm" (ngSubmit)="onSubmit()" autocomplete="new-password">
     <p class="row col-md-10">{{'security.config.ldap.explain'|translate}}</p>
     <div class="form-group row col-md-10"
          *ngFor="let attName of ['host_name','port','base_dn','groups_base_dn','bind_dn','bind_password']">
@@ -29,6 +29,7 @@
             <input [attr.type]="attName=='bind_password'?'password':'text'" formControlName="{{attName}}"
                    id="{{attName}}"
                    [ngClass]="getInputClasses(attName)"
+                   autocomplete="new-password"
             >
         </div>
     </div>