Merge pull request #7334 from masudul-tikweb/master

new table design

Author: renemadsen

eform-client/src/app/common/modules/eform-shared/components/eform-new-subheader/eform-new-subheader.component.html

@@ -1,4 +1,4 @@
-<mat-card class="d-flex flex-row align-items-center mb-3 p-3">
+<mat-card class="eform-sub-header d-flex flex-row align-items-center mb-3 p-3 ">
   <div class="d-flex flex-column">
     <h2 style="margin: 0">
       {{

eform-client/src/app/components/layouts/full-layout/full-layout.component.html

@@ -1,15 +1,18 @@
 <div class="h-100 d-flex flex-column" *ngIf="selectIsAuth$ | async">
   <!--  <app-header></app-header>-->
-  <mat-toolbar style="padding-top: 5px; padding-bottom: 5px" class="d-flex align-items-center">
-    <div *ngIf="headerSettingsModel.imageLinkVisible" class="d-flex">
-      <div class="logo-container">
-        <img height="30px" id="site-header-image" [src]="logoImage | authImage | async"
-             *ngIf="headerSettingsModel.imageLinkVisible" alt="">
+  <mat-toolbar style="padding-top: 5px; padding-bottom: 5px" class="d-flex align-items-center nav-header">
+    <div class="d-flex align-items-center gap-12">
+      <button mat-icon-button (click)="toggleDrawer()" [hidden]="(selectConnectionStringExists$ | async) === false">
+        <mat-icon>menu</mat-icon>
+      </button>
+      <div *ngIf="headerSettingsModel.imageLinkVisible" class="d-flex">
+        <div class="logo-container">
+          <img height="30px" id="site-header-image" [src]="logoImage | authImage | async"
+               *ngIf="headerSettingsModel.imageLinkVisible" alt="">
+        </div>
       </div>
     </div>
-    <button mat-icon-button (click)="toggleDrawer()" [hidden]="(selectConnectionStringExists$ | async) === false">
-      <mat-icon>menu</mat-icon>
-    </button>
+
     <span class="spacer"></span>
     <div class="tag">
       <mat-icon>account_circle</mat-icon>
@@ -30,15 +33,15 @@
       </mat-menu>
     </div>
   </mat-toolbar>
-  <mat-drawer-container autosize style="height: 100%;">
+  <mat-drawer-container autosize style="height: 100%;" class="mat-app-background">
     <mat-drawer
       #drawer
       [mode]="sidenavMode"
       [opened]="(selectSideMenuOpened$ | async) === true">
       <app-navigation (clickOnLink)="onClickOnLink()"></app-navigation>
       <app-footer></app-footer>
     </mat-drawer>
-    <div class="mb-auto p-4" *ngIf="selectIsAuth$ | async">
+    <div class="mb-auto mat-app-background" *ngIf="selectIsAuth$ | async">
       <app-userback-widget></app-userback-widget>
       <router-outlet></router-outlet>
     </div>

eform-client/src/app/modules/advanced/components/entity-search/entity-search/entity-search.component.html

@@ -36,7 +36,7 @@
   [showPaginator]="true"
   [paginationTemplate]="paginatorTpl"
   [pageOnFront]="false"
-  [rowStriped]="true"
+  [rowStriped]="false"
   [showToolbar]="true"
   [showColumnMenuButton]="false"
   [toolbarTemplate]="toolbarTpl"

eform-client/src/app/modules/advanced/components/entity-select/entity-select/entity-select.component.html

@@ -36,7 +36,7 @@
   [showPaginator]="true"
   [paginationTemplate]="paginatorTpl"
   [pageOnFront]="false"
-  [rowStriped]="true"
+  [rowStriped]="false"
   [showToolbar]="true"
   [showColumnMenuButton]="false"
   [toolbarTemplate]="toolbarTpl"

eform-client/src/app/modules/advanced/components/sites/sites/sites.component.html

@@ -18,7 +18,7 @@
   [cellTemplate]="{ siteUId: siteUIdTpl, siteName: siteNameTpl, units: unitsTpl, tags: tagsTpl, actions: actionsTpl}"
   [showPaginator]="false"
   [pageOnFront]="false"
-  [rowStriped]="true"
+  [rowStriped]="false"
   [showToolbar]="false"
   [showColumnMenuButton]="false">
 </mtx-grid>

eform-client/src/app/modules/advanced/components/units/units.component.html

@@ -21,7 +21,7 @@
   actions: actionsTpl}"
   [showPaginator]="false"
   [pageOnFront]="false"
-  [rowStriped]="true"
+  [rowStriped]="false"
   [showToolbar]="false"
   [showColumnMenuButton]="false">
 </mtx-grid>

eform-client/src/app/modules/advanced/components/workers/workers/workers.component.html

@@ -19,7 +19,7 @@
   [cellTemplate]="{actions: actionsTpl}"
   [showPaginator]="false"
   [pageOnFront]="false"
-  [rowStriped]="true"
+  [rowStriped]="false"
   [showColumnMenuButton]="false">
 </mtx-grid>
 <ng-template #actionsTpl let-row let-i="index">

eform-client/src/app/modules/device-users/components/device-users-page/device-users-page.component.html

@@ -40,7 +40,7 @@
   actions: actionsTpl}"
   [showPaginator]="false"
   [pageOnFront]="false"
-  [rowStriped]="true"
+  [rowStriped]="false"
   [showToolbar]="true"
   [showColumnMenuButton]="false"
   [toolbarTemplate]="toolbarTpl">

eform-client/src/app/modules/eforms/components/eforms-page/eforms-page.component.html

@@ -45,8 +45,8 @@
 
 <!--Here you can choose approach as you like: container-row, or flex, or just element with required styles and markup-->
 <ng-template #toolbarTpl>
-  <div class="d-flex flex-row justify-content-start flex-nowrap">
-    <div class="d-flex flex-column mr-2 ml-2">
+  <div class="d-flex flex-row justify-content-start flex-nowrap align-items-center gap-12">
+    <div class="d-flex flex-column">
       <mat-form-field>
         <mat-label>{{ 'Search eForm' | translate }}</mat-label>
         <input
@@ -104,7 +104,7 @@
   actions: actionsTpl}"
   [showPaginator]="false"
   [pageOnFront]="false"
-  [rowStriped]="true"
+  [rowStriped]="false"
   [showToolbar]="true"
   [showColumnMenuButton]="false"
   [toolbarTemplate]="toolbarTpl"

eform-client/src/app/modules/email-recipients/components/email-recipients-page/email-recipients-page.component.html

@@ -49,7 +49,7 @@
   [showPaginator]="true"
   [paginationTemplate]="paginatorTpl"
   [pageOnFront]="false"
-  [rowStriped]="true"
+  [rowStriped]="false"
   [showToolbar]="true"
   [showColumnMenuButton]="false"
   [toolbarTemplate]="toolbarTpl"