General: Adjust button alignment (#1754)

Author: Bofan-Zhu

src/main/webapp/app/job/my-positions/my-positions-page.component.html

@@ -37,6 +37,13 @@
     <div class="page-header">
       <h1 jhiTranslate="myPositionsPage.header.title"></h1>
     </div>
+    <jhi-button
+      label="myPositionsPage.header.createButton"
+      icon="plus"
+      severity="primary"
+      (click)="onCreateJob()"
+      [shouldTranslate]="true"
+    />
   </div>
   <div class="my-positions-container">
     <div class="body">
@@ -58,16 +65,7 @@ <h1 jhiTranslate="myPositionsPage.header.title"></h1>
           },
         ]"
         [sortableFields]="sortableFields"
-      >
-        <!-- Content projection: This button is projected into the search-filter-sort-bar component's ng-content slot -->
-        <jhi-button
-          label="myPositionsPage.header.createButton"
-          icon="plus"
-          severity="primary"
-          (click)="onCreateJob()"
-          [shouldTranslate]="true"
-        />
-      </jhi-search-filter-sort-bar>
+      />
       <div class="table-wrapper">
         <jhi-dynamic-table
           [columns]="columns()"

src/main/webapp/app/shared/components/molecules/search-filter-sort-bar/search-filter-sort-bar.html

@@ -32,15 +32,8 @@
       </div>
     }
   </div>
-  @if (totalRecords() > 0) {
-    <div class="flex justify-between items-end gap-4 mt-4">
-      <div
-        class="text-text-secondary text-md"
-        jhiTranslate="entity.filters.recordsFound"
-        [translateValues]="{ count: totalRecords(), entity: totalRecords() === 1 ? singleEntity() : multipleEntities() }"
-      ></div>
-      <!-- Content projection slot for parent components to inject custom controls (e.g. action buttons) -->
-      <ng-content />
-    </div>
-  }
+  <div
+    jhiTranslate="entity.filters.recordsFound"
+    [translateValues]="{ count: totalRecords(), entity: totalRecords() === 1 ? singleEntity() : multipleEntities() }"
+  ></div>
 </div>

src/main/webapp/app/usermanagement/research-group/research-group-info/research-group-info.component.html

@@ -1,12 +1,12 @@
 <div class="page-container">
-  <div class="page-header">
-    <h1 jhiTranslate="researchGroup.groupInfoHeader"></h1>
+  <div class="header-container">
+    <div class="page-header">
+      <h1 jhiTranslate="researchGroup.groupInfoHeader"></h1>
+    </div>
+    <jhi-button [label]="'button.save'" icon="save" [shouldTranslate]="true" [disabled]="!form.valid || isSaving()" (click)="onSave()" />
   </div>
   <div class="card">
-    <div class="card-header">
-      <p jhiTranslate="researchGroup.groupInfo.description"></p>
-      <jhi-button [label]="'button.save'" icon="save" [shouldTranslate]="true" [disabled]="!form.valid || isSaving()" (click)="onSave()" />
-    </div>
+    <p jhiTranslate="researchGroup.groupInfo.description"></p>
     <div class="card-body">
       <div class="space-y-4">
         <form [formGroup]="form">

src/main/webapp/app/usermanagement/research-group/research-group-info/research-group-info.component.scss

@@ -40,7 +40,6 @@ export interface ResearchGroupFormData {
     InfoBoxComponent,
   ],
   templateUrl: './research-group-info.component.html',
-  styleUrl: './research-group-info.component.scss',
 })
 export class ResearchGroupInfoComponent {
   // Effect to initialize when user data becomes available

src/main/webapp/app/usermanagement/research-group/research-group-info/research-group-info.component.ts

@@ -7,10 +7,6 @@ <h1 jhiTranslate="researchGroup.memberHeaderAdmin"></h1>
         <h1 jhiTranslate="researchGroup.memberHeader"></h1>
       }
     </div>
-  </div>
-
-  <!-- Members Table -->
-  <div class="actions flex justify-end gap-4">
     <jhi-button
       [label]="'researchGroup.members.addMembers'"
       icon="user-plus"
@@ -19,6 +15,8 @@ <h1 jhiTranslate="researchGroup.memberHeader"></h1>
       (click)="openAddMembersModal()"
     />
   </div>
+
+  <!-- Members Table -->
   <div class="table-wrapper">
     <jhi-dynamic-table
       [columns]="columns()"

src/main/webapp/app/usermanagement/research-group/research-group-members/research-group-members.component.html

@@ -1,16 +1,12 @@
 <div class="page-container">
-  <div class="page-header">
-    <h1 jhiTranslate="researchGroup.emailTemplatesHeader">Applications - Overview</h1>
+  <div class="header-container">
+    <div class="page-header">
+      <h1 jhiTranslate="researchGroup.emailTemplatesHeader">Applications - Overview</h1>
+    </div>
+    <jhi-button label="researchGroup.emailTemplates.newTemplate" icon="plus" [shouldTranslate]="true" (click)="navigateToCreate()" />
   </div>
 
   <div class="table-wrapper">
-    <div class="actions flex justify-end gap-4">
-      <jhi-button label="researchGroup.emailTemplates.newTemplate" icon="plus" [shouldTranslate]="true" (click)="navigateToCreate()" />
-      <!-- Will be added later
-      <jhi-button label="researchGroup.emailTemplates.signature" variant="outlined" icon="pen-nib" [shouldTranslate]="true" />
-      -->
-    </div>
-
     <jhi-dynamic-table
       [columns]="columns()"
       [data]="tableData()"

src/main/webapp/app/usermanagement/research-group/research-group-templates/research-group-templates.html

@@ -282,7 +282,7 @@ describe('SearchFilterSortBar', () => {
         totalRecords: 10,
       });
 
-      const recordCount = fixture.nativeElement.querySelector('.text-text-secondary.text-md');
+      const recordCount = fixture.nativeElement.querySelector('div[jhiTranslate="entity.filters.recordsFound"]');
       expect(recordCount).toBeTruthy();
     });