From bdc35268aed672188f49c17578255ae9974f4dfe Mon Sep 17 00:00:00 2001
From: tamaradesmith <tdesmith81@gmail.com>
Date: Mon, 8 Jul 2024 15:20:03 -0700
Subject: [PATCH] fix/asa-206: subpanel tables and panel button icon

---
 .../lib/components/panel/panel.component.html | 68 +++++++++++++------
 .../themes/suite8/css/components/_svg.scss    | 12 ++--
 .../themes/suite8/css/layout/_listview.scss   | 22 +++++-
 .../src/themes/suite8/css/layout/_panel.scss  | 15 +++-
 .../src/themes/suite8/images/Contacts.svg     |  7 ++
 .../src/themes/suite8/images/Documents.svg    |  6 ++
 .../src/themes/suite8/images/Meetings.svg     |  6 ++
 7 files changed, 107 insertions(+), 29 deletions(-)
 create mode 100755 docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Contacts.svg
 create mode 100755 docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Documents.svg
 create mode 100755 docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Meetings.svg

diff --git a/docker/advocase-image/build-files/suitecrm/core/app/core/src/lib/components/panel/panel.component.html b/docker/advocase-image/build-files/suitecrm/core/app/core/src/lib/components/panel/panel.component.html
index 6becf3a0e..3d42ed179 100644
--- a/docker/advocase-image/build-files/suitecrm/core/app/core/src/lib/components/panel/panel.component.html
+++ b/docker/advocase-image/build-files/suitecrm/core/app/core/src/lib/components/panel/panel.component.html
@@ -1,10 +1,38 @@
+<! --
+/**
+* SuiteCRM is a customer relationship management program developed by SalesAgility Ltd.
+* Copyright (C) 2021 SalesAgility Ltd.
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU Affero General Public License version 3 as published by the
+* Free Software Foundation with the addition of the following permission added
+* to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+* IN WHICH THE COPYRIGHT IS OWNED BY SALESAGILITY, SALESAGILITY DISCLAIMS THE
+* WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+* details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see http://www.gnu.org/licenses.
+*
+* In accordance with Section 7(b) of the GNU Affero General Public License
+* version 3, these Appropriate Legal Notices must retain the display of the
+* "Supercharged by SuiteCRM" logo. If the display of the logos is not reasonably
+* feasible for technical reasons, the Appropriate Legal Notices must display
+* the words "Supercharged by SuiteCRM".
+*/
+-->
+
 <div [class.collapsed]="isCollapsed" class="card panel-card {{klass}}">
     <div *ngIf="showHeader" class="card-header d-flex justify-content-end align-items-center">
         <div
-            class="flex-grow-1 align-items-center justify-content-between d-flex panel-title-upper-header"
+            class="flex-grow-1 align-items-center justify-content-between sub-panel-flex-content d-flex"
             >
-            <div *ngIf="title" class="panel-title">{{title}}</div>
-            <div *ngIf="titleKey" class="pl-1 panel-title">
+            <div *ngIf="title" class="panel-title panel-title-upper-header">{{title}}</div>
+            <div *ngIf="titleKey" class="pl-1 panel-title panel-title-upper-header">
                 <scrm-label [labelKey]="titleKey"></scrm-label>
             </div>
             <div class="d-flex align-items-center">
@@ -19,30 +47,30 @@
             </div>
         </div>
     </div>
+    <div class="card-body card-body-padding" [ngbCollapse]="isCollapsed">
 
-    <div class="flex-grow-1 align-items-center d-flex justify-content-between panel-title-header">
-        <div *ngIf="isCollapsible()" class="d-flex align-items-center">
-            <scrm-minimise-button
-                *ngIf="isCollapsible()"
-                [config]="minimiseButton"
-                [status]="minimiseStatus">
-            </scrm-minimise-button>
+        <div class="flex-grow-1 align-items-center d-flex justify-content-between panel-title-header">
+            <div *ngIf="isCollapsible()" class="d-flex align-items-center">
+                <scrm-minimise-button
+                    *ngIf="isCollapsible()"
+                    [config]="minimiseButton"
+                    [status]="minimiseStatus">
+                </scrm-minimise-button>
 
-            <ng-content select="[panel-icon-area]"></ng-content>
-        </div>
+                <ng-content select="[panel-icon-area]"></ng-content>
+            </div>
 
-        <div *ngIf="title" class="pl-1 panel-title">{{title}}</div>
+            <div *ngIf="title" class="pl-1 panel-title">{{title}}</div>
 
-        <div *ngIf="titleKey" class="pl-1 panel-title">
-            <scrm-label [labelKey]="titleKey"></scrm-label>
-        </div>
+            <div *ngIf="titleKey" class="pl-1 panel-title">
+                <scrm-label [labelKey]="titleKey"></scrm-label>
+            </div>
 
-        <div class="panel-buttons float-right">
-            <ng-content select="[panel-header-button]"></ng-content>
+            <div class="panel-buttons float-right">
+                <ng-content select="[panel-header-button]"></ng-content>
+            </div>
         </div>
-    </div>
 
-    <div class="card-body card-body-padding" [ngbCollapse]="isCollapsed">
         <ng-content select="[panel-body]"></ng-content>
     </div>
 </div>
diff --git a/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/components/_svg.scss b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/components/_svg.scss
index 560997699..71b4a0762 100644
--- a/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/components/_svg.scss
+++ b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/components/_svg.scss
@@ -88,14 +88,13 @@
 }
 
 .line-action svg {
-  fill: $sky-blue;
+  fill: $typography-color-link;
 }
 
 .line-action:hover svg {
-  fill: $bright-purple;
+  fill: $typography-color-link-hover;
 }
 
-
 .back-to-top svg {
   width: 1em;
   height: 1em;
@@ -115,6 +114,11 @@
   height: 14px;
 }
 
+.card-body .sicon svg {
+  width: 1.25rem;
+  height: 1.25rem;
+}
+
 .sicon-xs svg {
   width: 0.5em;
   height: 0.5em;
@@ -296,4 +300,4 @@
     vertical-align: middle;
     fill: $off-white;
   }
-}
\ No newline at end of file
+}
diff --git a/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/layout/_listview.scss b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/layout/_listview.scss
index 0b0b82bf3..4096e3156 100644
--- a/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/layout/_listview.scss
+++ b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/layout/_listview.scss
@@ -24,7 +24,7 @@
  * the words "Supercharged by SuiteCRM".
  */
 
- .list-view {
+.list-view {
   margin: 82px 56px 32px 56px;
   background-color: #ffffff;
   border: 1px solid rgba(0,0,0,.1);
@@ -75,6 +75,15 @@
 .table-header-select-count {
   margin-right: 24px;
   margin-bottom: 0;
+  color: $primary_text;
+  font-family: "BC Sans";
+  font-size: 36px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: normal;
+}
+
+.table-header-select-count {
   color:$primary_text;
   font-family: "BC Sans";
   font-size: 16px;
@@ -164,14 +173,20 @@
   border-bottom-left-radius: 0.3em;
 }
 
+.card-body .table-footer {
+  margin-top: 8px;
+}
+
 .table td {
   vertical-align: middle;
   padding: 0.45em;
+  font-weight: 400;
 }
 
 .table th {
   border-top: 0;
   padding: 0.5rem 0.45em;
+  font-weight: 700;
 }
 
 .table thead th {
@@ -179,7 +194,7 @@
 }
 
 .table td, .table th {
-  font-size: 0.797rem;
+  font-size: 1rem;
   max-width: 220px;
 }
 
@@ -415,6 +430,8 @@ td {
 }
 
 .centre-pagination {
+  margin: 0 0.7em;
+  font-weight: bold;
   position: relative;
   top: initial;
   bottom: initial;
@@ -440,3 +457,4 @@ td {
 td.cdk-column-checkbox {
   min-width: 32px;
 }
+
diff --git a/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/layout/_panel.scss b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/layout/_panel.scss
index 88d46ede9..437899bf8 100644
--- a/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/layout/_panel.scss
+++ b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/css/layout/_panel.scss
@@ -37,7 +37,11 @@
 }
 
 .sub-panel .panel-title-upper-header {
-    display:  none !important;
+    display: none !important;
+}
+
+.sub-panel .sub-panel-flex-content {
+  justify-content: flex-end !important;
 }
 
 .panel-card.collapsed .card-header {
@@ -58,7 +62,12 @@
 }
 
 .panel-card .card-body-padding {
-    padding: 2rem !important;
+    padding: 1rem 2.5rem;
+    border-radius: 0px 0px  6px 6px;
+    border-right:  2px solid  #D8D8D8;
+    border-bottom:  2px solid #D8D8D8;
+    border-left:  2px solid #D8D8D8;
+    background: $white;
 }
 
 .panel-title-header .panel-title {
@@ -75,7 +84,7 @@
 }
 
 .panel-title-header {
-  padding: 1rem 2rem;
+  padding-bottom: 1.5rem;
 }
 
 .panel-title-upper-header {
diff --git a/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Contacts.svg b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Contacts.svg
new file mode 100755
index 000000000..ca27e7398
--- /dev/null
+++ b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Contacts.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 6C1 3.23858 3.23858 1 6 1H42C44.7614 1 47 3.23858 47 6V42C47 44.7614 44.7614 47 42 47H6C3.23858 47 1 44.7614 1 42V6Z" fill="#255A90"/>
+<path d="M1 6C1 3.23858 3.23858 1 6 1H42C44.7614 1 47 3.23858 47 6V42C47 44.7614 44.7614 47 42 47H6C3.23858 47 1 44.7614 1 42V6Z" stroke="#255A90" stroke-width="2"/>
+<path d="M34.5 13.5C36.1406 13.5 37.5 14.8594 37.5 16.5V31.5C37.5 33.1875 36.1406 34.5 34.5 34.5H13.5C11.8125 34.5 10.5 33.1875 10.5 31.5V16.5C10.5 14.8594 11.8125 13.5 13.5 13.5H34.5ZM18.75 18C17.0625 18 15.75 19.3594 15.75 21C15.75 22.6875 17.0625 24 18.75 24C20.3906 24 21.75 22.6875 21.75 21C21.75 19.3594 20.3906 18 18.75 18ZM23.25 30C23.625 30 24 29.6719 24 29.25C24 27.1875 22.3125 25.5 20.25 25.5H17.25C15.1406 25.5 13.5 27.1875 13.5 29.25C13.5 29.6719 13.8281 30 14.25 30H23.25ZM33.75 27C34.125 27 34.5 26.6719 34.5 26.25C34.5 25.875 34.125 25.5 33.75 25.5H27.75C27.3281 25.5 27 25.875 27 26.25C27 26.6719 27.3281 27 27.75 27H33.75ZM33.75 24C34.125 24 34.5 23.6719 34.5 23.25C34.5 22.875 34.125 22.5 33.75 22.5H27.75C27.3281 22.5 27 22.875 27 23.25C27 23.6719 27.3281 24 27.75 24H33.75ZM33.75 21C34.125 21 34.5 20.6719 34.5 20.25C34.5 19.875 34.125 19.5 33.75 19.5H27.75C27.3281 19.5 27 19.875 27 20.25C27 20.6719 27.3281 21 27.75 21H33.75Z" fill="white"/>
+</svg>
+
diff --git a/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Documents.svg b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Documents.svg
new file mode 100755
index 000000000..f83dcc88e
--- /dev/null
+++ b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Documents.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 6C1 3.23858 3.23858 1 6 1H42C44.7614 1 47 3.23858 47 6V42C47 44.7614 44.7614 47 42 47H6C3.23858 47 1 44.7614 1 42V6Z" fill="#255A90"/>
+<path d="M1 6C1 3.23858 3.23858 1 6 1H42C44.7614 1 47 3.23858 47 6V42C47 44.7614 44.7614 47 42 47H6C3.23858 47 1 44.7614 1 42V6Z" stroke="#255A90" stroke-width="2"/>
+<path d="M30.5625 15.9375C29.3906 14.8125 27.5625 14.8125 26.3906 15.9375L17.7656 24.5625C15.7969 26.5312 15.7969 29.7656 17.7656 31.7344C19.7344 33.7031 22.9688 33.7031 24.9375 31.7344L32.0625 24.6094C32.5781 24.0938 33.375 24.0938 33.8906 24.6094C34.4062 25.125 34.4062 25.9219 33.8906 26.4375L26.7656 33.5625C23.7656 36.5625 18.9375 36.5625 15.9375 33.5625C12.9375 30.5625 12.9375 25.7344 15.9375 22.7344L24.5625 14.1094C26.7188 11.9062 30.2344 11.9062 32.3906 14.1094C34.5938 16.2656 34.5938 19.7812 32.3906 21.9375L24.1406 30.1875C22.8281 31.5469 20.625 31.5469 19.3125 30.1875C17.9531 28.875 17.9531 26.6719 19.3125 25.3594L26.0625 18.6094C26.5781 18.0938 27.375 18.0938 27.8906 18.6094C28.4062 19.125 28.4062 19.9219 27.8906 20.4375L21.1406 27.1875C20.8594 27.5156 20.8594 28.0312 21.1406 28.3594C21.4688 28.6406 21.9844 28.6406 22.3125 28.3594L30.5625 20.1094C31.6875 18.9375 31.6875 17.1094 30.5625 15.9375Z" fill="white"/>
+</svg>
diff --git a/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Meetings.svg b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Meetings.svg
new file mode 100755
index 000000000..3edbe96dd
--- /dev/null
+++ b/docker/advocase-image/build-files/suitecrm/core/app/shell/src/themes/suite8/images/Meetings.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 6C1 3.23858 3.23858 1 6 1H42C44.7614 1 47 3.23858 47 6V42C47 44.7614 44.7614 47 42 47H6C3.23858 47 1 44.7614 1 42V6Z" fill="#255A90"/>
+<path d="M1 6C1 3.23858 3.23858 1 6 1H42C44.7614 1 47 3.23858 47 6V42C47 44.7614 44.7614 47 42 47H6C3.23858 47 1 44.7614 1 42V6Z" stroke="#255A90" stroke-width="2"/>
+<path d="M24 12C30.6094 12 36 17.3906 36 24C36 30.6562 30.6094 36 24 36C21.4219 36 19.0781 35.2031 17.1094 33.8906C16.4531 33.375 16.2656 32.4375 16.7344 31.7812C17.2031 31.0781 18.1406 30.9375 18.8438 31.4062C20.2969 32.4375 22.0781 33 24 33C28.9688 33 33 28.9688 33 24C33 19.0312 28.9688 15 24 15C21.4688 15 19.2656 16.0312 17.625 17.6719L19.0781 19.0781C19.7812 19.8281 19.2656 21 18.2812 21H13.125C12.4688 21 12 20.5312 12 19.875V14.7188C12 13.7344 13.1719 13.2188 13.875 13.9219L15.4688 15.5156C17.6719 13.3594 20.6719 12 23.9531 12H24ZM24 18C24.6094 18 25.125 18.5156 25.125 19.125V23.5781L28.125 26.5781C28.5938 27.0469 28.5938 27.75 28.125 28.1719C27.7031 28.6406 27 28.6406 26.5781 28.1719L23.2031 24.7969C22.9688 24.6094 22.875 24.3281 22.875 24V19.125C22.875 18.5156 23.3438 18 24 18Z" fill="white"/>
+</svg>