Squashed 'public/legacy/' changes from 5a66316965..b065977c61

b065977c61 SuiteCRM 7.12.5 Release
fd07950be0 Fix #8366 - V8 API Filtering W/ OR Operator Chained Conditions
f8504d0a42 Fix #9445 - More than 10 tabs in a views creates a loop
ec3c758b49 Fix #9451 - Missing duplicate merge filter options in Studio
3739e28428 Fix #9468 - Adding Security Suite subpanels to new custom modules
0742615e61 Fix #9427 - Adding missing help popup help strings in Studio
c79a3a6109 Add accessors for the Results, Query fields in SearchResultsController
a507575097 Fix #4075 - No way to add email signature after adding email template
9b8f5b46b2 Fix #9480 - Slow to load imap mailbox with a million email records
8184b82060 Fixed #2857 - No dynamic refreshing in dashboard
ece5919449 Fix #9508 - Legacy search fields are incorrect size
5699ad47ff Fix #9478 - Update GitHub Templates
37d54ca1ab SuiteCRM 7.12.4 Release
5a7f66f1fc Fix #9482 - Update list of modules to normalize
1807751e16 Fix #9482 - Only save update fields on utf encoding repair
08c5a32e07 Fix #9482 - Add partial bean save
a25efff51f Fix #7842 - Do not reset email addresses list upon saving
4e5b509a30 Add ExtensionManager with static method to compile ext files
77b2940fd9 Fix #9061 - Custom Labels can't be overwritten in Studio
2f40449702 Fix #9496 - Cannot save dropdown values
32c6e4a04b Merge next into suite 8
2812bd315a [Legacy] Fix user wizard finish screen re-direction
9dc1a2f017 [Legacy] User Wizard Styling Fixes
0b91cb9a53 [Legacy] Event Delegates Selector Box Styling Fixes
32d7408e93 [Legacy] Add New Task Modal Styling Fixes
e121b602da [Legacy] Workflow Styling Fixes
86ef0fae66 [Legacy] Projects Resource Panel Styling Fixes
56eb694629 [Legacy] map legacy to front-end user action called wizard
4c7ff07fcc [Legacy] Rescheduler Popup Styling Fixes
1b76260971 [Legacy] Project Gantt Chart Delete Button Styling Fixes
09959f1078 [Legacy] Configuration Settings Styling Fixes
711ded6a70 [Legacy] Notes modules styling fixes
a0aa6affc8 [Legacy] Calls Module Styling Fixes
a468cede8b [Legacy] AdminPanel Border Radius Styling Fixes
bfc8a443b7 [Legacy] Bump version to 8.0.1

git-subtree-dir: public/legacy
git-subtree-split: b065977c6116e68cea907dc099205d0b32ac99f4

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,9 @@
 <!--- Provide a general summary of the issue in the **Title** above -->
 <!--- Before you open an issue, please check if a similar issue already exists or has been closed before. --->
 <!--- If you have discovered a security risk please report it by emailing security@suitecrm.com. This will be delivered to the product team who handle security issues. Please don't disclose security bugs publicly until they have been handled by the security team. --->
-
+<!--- Please be aware that as of the 31st January 2022 we no longer support 7.10.x.
+New issues referring to 7.10.x will only be valid if applicable to 7.12.x and above.
+If your issue is still applicable in 7.12.x, please create the issue following the template below -->
 #### Issue
 <!--- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
 <!--- Ensure that all code ``` is surrounded ``` by triple back quotes. This can also be done over multiple lines -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,8 @@
 <!--- Provide a general summary of your changes in the Title above -->
+<!--- Please be aware that as of the 31st January 2022 we no longer support 7.10.x.
+New PRs to hotfix-7.10.x will be invalid. If your fix is still applicable to 7.12.x, 
+please create the pull request to the hotfix branch accordingly. -->
+
 
 ## Description
 <!--- Describe your changes in detail -->

Api/V8/JsonApi/Repository/Filter.php

@@ -44,7 +44,14 @@ class Filter
             unset($params['operator']);
         }
 
-        $params = $this->addDeletedParameter($params);
+        $deleted = false;
+        if (isset($params['deleted'])) {
+            if (isset($params['deleted']['eq'])) {
+                $deleted = ($params['deleted']['eq'] == 1);
+            }
+            
+            unset($params['deleted']);
+        }
 
         $where = [];
         foreach ($params as $field => $expr) {
@@ -75,12 +82,25 @@ class Filter
             }
         }
 
-        return implode(sprintf(' %s ', $operator), $where);
+        if (empty($where)) {
+            return sprintf(
+                "%s.deleted = '%d'",
+                $bean->getTableName(),
+                $deleted
+            );
+        }
+
+        return sprintf(
+            "(%s) AND %s.deleted = '%d'",
+            implode(sprintf(' %s ', $operator), $where),
+            $bean->getTableName(),
+            $deleted
+        );
     }
 
     /**
      * Only return deleted records if they were explicitly requested
-     *
+     * @deprecated
      * @param array $params
      * @return array
      */

ModuleInstall/ExtensionManager.php

@@ -0,0 +1,249 @@
+<?php
+
+namespace SuiteCRM\ModuleInstall;
+
+use \LoggerManager;
+
+/**
+ * Class ExtensionManager
+ */
+class ExtensionManager
+{
+    /**
+     * @var array
+     */
+    protected static $moduleList = [];
+
+    /**
+     * @var
+     */
+    protected static $logger;
+
+    /**
+     * Checks if authenticated and dies if not.
+     *
+     * @return void
+     */
+    protected static function handleAuth()
+    {
+        if (!defined('sugarEntry') || !sugarEntry) {
+            die('Not A Valid Entry Point');
+        }
+    }
+
+    /**
+     * Sets the static module and extension lists.
+     *
+     * @return void
+     */
+    protected static function initialise()
+    {
+        static::$moduleList = get_module_dir_list();
+        static::$logger = LoggerManager::getLogger();
+    }
+
+    /**
+     * Compiles source files for given extension to targeted file applying any given filters.
+     *
+     * @param string $extension Name of Extension i.e. 'Language'
+     * @param string $targetFileName Name of target file
+     * @param string $filter To filter file names such as language prefixes
+     * @param bool $applicationOnly Whether or not to only compile application extensions
+     * @return void
+     */
+    public static function compileExtensionFiles(
+        $extension,
+        $targetFileName,
+        $filter = '',
+        $applicationOnly = false
+    ) {
+        static::handleAuth();
+        static::initialise();
+
+        if ($extension === 'Language' && strpos($targetFileName, $filter) !== 0) {
+            $targetFileName = $filter . $targetFileName;
+        }
+
+        if (!$applicationOnly) {
+            static::compileModuleExtensions($extension, $targetFileName, $filter);
+        }
+
+        static::compileApplicationExtensions($extension, $targetFileName, $filter);
+    }
+
+    /**
+     * @param $extension
+     * @param $targetFileName
+     * @param string $filter
+     * @return void
+     */
+    protected static function compileApplicationExtensions(
+        $extension,
+        $targetFileName,
+        $filter = ''
+    ) {
+        static::$logger->{'debug'}("Merging application files for $targetFileName in $extension");
+
+        $extensionContents = '<?php' . PHP_EOL . '// WARNING: The contents of this file are auto-generated' . PHP_EOL;
+        $extPath = "application/Ext/$extension";
+        $moduleInstall  = "custom/Extension/$extPath";
+        $shouldSave = false;
+
+        if (is_dir($moduleInstall)) {
+            $dir = dir($moduleInstall);
+
+            while ($entry = $dir->read()) {
+                if (static::shouldSkipFile($entry, $moduleInstall, $filter)) {
+                    continue;
+                }
+                $shouldSave = true;
+                $file = file_get_contents("$moduleInstall/$entry");
+                $extensionContents .= PHP_EOL . static::removePhpTagsFromString($file);
+            }
+        }
+
+        if ($shouldSave) {
+            static::saveFile($extPath, $targetFileName, $extensionContents);
+            return;
+        }
+
+        static::unlinkFile($extPath, $targetFileName);
+    }
+
+    /**
+     * @param $extension
+     * @param $targetFileName
+     * @param string $filter
+     * @return void
+     */
+    protected static function compileModuleExtensions(
+        $extension,
+        $targetFileName,
+        $filter = ''
+    ) {
+        static::$logger->{'debug'}(
+            self::class . "::compileExtensionFiles() : Merging module files in " .
+            "custom/Extension/modules/<module>/$extension to custom/modules/<module>/$extension/$targetFileName"
+        );
+
+        foreach (static::$moduleList as $module) {
+            $extensionContents = '<?php'
+                . PHP_EOL
+                . '// WARNING: The contents of this file are auto-generated'
+                . PHP_EOL;
+
+            $extPath = "modules/$module/Ext/$extension";
+            $moduleInstall  = "custom/Extension/$extPath";
+            $shouldSave = false;
+
+            if (is_dir($moduleInstall)) {
+                $dir = dir($moduleInstall);
+                $shouldSave = true;
+                $override = [];
+
+                while ($entry = $dir->read()) {
+                    if (static::shouldSkipFile($entry, $moduleInstall, $filter)) {
+                        continue;
+                    }
+
+                    if (strpos($entry, '_override') === 0) {
+                        $override[] = $entry;
+                        continue;
+                    }
+
+                    $file = file_get_contents("$moduleInstall/$entry");
+                    static::$logger->{'debug'}(
+                        self::class . "->compileExtensionFiles(): found {$moduleInstall}{$entry}"
+                    );
+
+                    $extensionContents .= PHP_EOL . static::removePhpTagsFromString($file);
+                }
+
+                foreach ($override as $entry) {
+                    $file = file_get_contents("$moduleInstall/$entry");
+                    $extensionContents .= PHP_EOL . static::removePhpTagsFromString($file);
+                }
+            }
+
+            if ($shouldSave) {
+                static::saveFile($extPath, $targetFileName, $extensionContents);
+                continue;
+            }
+
+            static::unlinkFile($extPath, $targetFileName);
+        }
+    }
+
+    /**
+     * @param string $string
+     * @return string
+     */
+    protected static function removePhpTagsFromString($string)
+    {
+        return str_replace(
+            ['<?php', '?>', '<?PHP', '<?'],
+            '',
+            $string
+        );
+    }
+
+    /**
+     * @param $entry
+     * @param $moduleInstall
+     * @param $filter
+     * @return bool
+     */
+    protected static function shouldSkipFile(
+        $entry,
+        $moduleInstall,
+        $filter
+    ) {
+        if ($entry === '.' || $entry === '..' || strtolower(substr($entry, -4)) !== '.php') {
+            return true;
+        }
+
+        if (!is_file("$moduleInstall/$entry")) {
+            return true;
+        }
+
+        if (!empty($filter) && substr_count($entry, $filter) <= 0) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $extPath
+     * @param string $targetFileName
+     * @param string $extensionContents
+     * @return void
+     */
+    protected static function saveFile(
+        $extPath,
+        $targetFileName,
+        $extensionContents
+    ) {
+        if (!file_exists("custom/$extPath")) {
+            mkdir_recursive("custom/$extPath", true);
+        }
+
+        $extensionContents .= PHP_EOL;
+
+        $out = sugar_fopen("custom/$extPath/$targetFileName", 'wb');
+        fwrite($out, $extensionContents);
+        fclose($out);
+    }
+
+    /**
+     * @param $extPath
+     * @param $targetFileName
+     * @return void
+     */
+    protected static function unlinkFile($extPath, $targetFileName)
+    {
+        if (file_exists("custom/$extPath/$targetFileName")) {
+            unlink("custom/$extPath/$targetFileName");
+        }
+    }
+}

README.md

@@ -2,7 +2,7 @@
   <img width="180px" height="41px" src="https://suitecrm.com/wp-content/uploads/2017/12/logo.png" align="right" />
 </a>
 
-# SuiteCRM 7.12.3
+# SuiteCRM 7.12.5
 
 [![LICENSE](https://img.shields.io/github/license/suitecrm/suitecrm.svg)](https://github.com/salesagility/suitecrm/blob/hotfix/LICENSE.txt)
 [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/salesagility/SuiteCRM-Core/issues)

data/SugarBean.php

@@ -380,6 +380,11 @@ class SugarBean
      */
     public $in_save;
 
+    /**
+     * @var array $bean_fields_to_save
+     */
+    public $bean_fields_to_save;
+
     /**
      * @var integer $logicHookDepth
      */
@@ -2506,6 +2511,70 @@ class SugarBean
         return $this->id;
     }
 
+    /**
+     * Saves only the listed fields. Does not create record, existing records only.
+     * @param array $fieldToSave
+     * @return void
+     */
+    public function saveFields(array $fieldToSave): void
+    {
+        global $current_user, $action, $timedate;
+
+        if (empty($this->id) || $this->new_with_id || empty($fieldToSave)) {
+            return;
+        }
+
+        $this->in_save = true;
+
+        // cn: SECURITY - strip XSS potential vectors
+        $this->cleanBean();
+
+        // This is used so custom/3rd-party code can be upgraded with fewer issues,
+        // this will be removed in a future release
+        $this->fixUpFormatting();
+
+        $isUpdate = true;
+
+        $this->bean_fields_to_save = $fieldToSave;
+
+        if (empty($this->date_modified) || $this->update_date_modified) {
+            $this->date_modified = $timedate->nowDb();
+            $this->bean_fields_to_save[] = 'date_modified';
+        }
+
+        $this->_checkOptimisticLocking($action, $isUpdate);
+
+        if (!empty($this->modified_by_name)) {
+            $this->old_modified_by_name = $this->modified_by_name;
+        }
+
+        if ($this->update_modified_by) {
+            $this->modified_user_id = 1;
+            $this->bean_fields_to_save[] = 'modified_user_id';
+
+            if (!empty($current_user)) {
+                $this->modified_user_id = $current_user->id;
+
+                $this->modified_by_name = $current_user->user_name;
+                $this->bean_fields_to_save[] = 'modified_by_name';
+            }
+        }
+
+        if ($this->deleted != 1) {
+            $this->deleted = 0;
+        }
+
+        if (isset($this->custom_fields)) {
+            $this->custom_fields->bean = $this;
+            $this->custom_fields->save($isUpdate);
+        }
+
+        $this->db->update($this);
+
+        $this->bean_fields_to_save = null;
+        $this->in_save = false;
+    }
+
     /**
      * Cleans char, varchar, text, etc. fields of XSS type materials
      */

files.md5

@@ -1,5 +1,5 @@
 <?php
-// created: 2022-01-26 17:00:00
+// created: 2022-03-01 17:00:00
 $md5_string = array (
   './Api/Core/Config/ApiConfig.php' => '69a1e7b3d7755a2a63499a16ddae81cf',
   './Api/Core/Config/slim.php' => 'b134e68765e6a1403577e2a5a06322b8',
@@ -40,7 +40,7 @@ $md5_string = array (
   './Api/V8/JsonApi/Helper/AttributeObjectHelper.php' => '8c2e2f889cefdc7912fd62da3e6a6f71',
   './Api/V8/JsonApi/Helper/PaginationObjectHelper.php' => 'dbeb8f36cc7b70ff9459443c26bdfb70',
   './Api/V8/JsonApi/Helper/RelationshipObjectHelper.php' => '6681a3fc26e420f12875d4239532946e',
-  './Api/V8/JsonApi/Repository/Filter.php' => 'cc024de98508d60c0d091a58a49fa879',
+  './Api/V8/JsonApi/Repository/Filter.php' => '21279c505e18aacd9f6aea51cc62a3bc',
   './Api/V8/JsonApi/Repository/Sort.php' => '7e9fb4704a056bc944840def1482042d',
   './Api/V8/JsonApi/Response/AttributeResponse.php' => '84318e63e42f0062c8f8231fd4c230d5',
   './Api/V8/JsonApi/Response/DataResponse.php' => '08239b06a911f9d0bd46a28a28d11eda',
@@ -101,6 +101,7 @@ $md5_string = array (
   './Api/index.php' => 'c69f9b5950f7c42e8f9b73e1eb5e7e49',
   './HandleAjaxCall.php' => '954cebdd8ea2ab1e5c03658b184322fd',
   './LICENSE.txt' => 'd3f150e4a5bed444763ebe8a81742a95',
+  './ModuleInstall/ExtensionManager.php' => 'e9699caa01beb5c4fdae7cc9c8cc4bc6',
   './ModuleInstall/ModuleInstaller.php' => '526a3e11024b84f3602f9857d69a8e47',
   './ModuleInstall/ModuleScanner.php' => '5bd029e1955c5c243ce4cc567cc99367',
   './ModuleInstall/PackageManager/ListViewPackages.php' => 'dd40ddc497010be809cb03c63499ac4f',
@@ -115,7 +116,7 @@ $md5_string = array (
   './ModuleInstall/PackageManager/tpls/PackageManagerLicense.tpl' => 'df5e267d1df5ce08fb9406e42d5b4816',
   './ModuleInstall/PackageManager/tpls/PackageManagerScripts.tpl' => '98e396c0aa57329731fda19c790fffb2',
   './ModuleInstall/extensions.php' => '094f4650261f6efbab1b90b119829388',
-  './README.md' => 'b9d83b3570f46a4e80c328aaf7e184b6',
+  './README.md' => 'b9189e1dc12fb6ee741b6057b9e70147',
   './RoboFile.php' => '045b82c1df69553824d0e4ffcce6e03c',
   './SugarSecurity.php' => '47e316b2d408e8c5192c8ea4a4f921b3',
   './TreeData.php' => '32873e20cb5fd33f9d1cdaf18c3cac5c',
@@ -519,7 +520,7 @@ $md5_string = array (
   './data/Relationships/One2OneRelationship.php' => 'c46d3067d5651fbc928763600d5e1a51',
   './data/Relationships/RelationshipFactory.php' => '98a46e44186f2d2db23be9b894a4f1e2',
   './data/Relationships/SugarRelationship.php' => 'a71b96492ee7457826fc91a2356c4ebd',
-  './data/SugarBean.php' => 'd8544e7bffbd4eeea20053f52c5514bd',
+  './data/SugarBean.php' => 'ccf600118e4ad9437e82efb376443ea4',
   './deprecated.php' => 'f5f507fd6314f38d29c97e2cc2c62239',
   './dictionary.php' => 'b7c1370fb75a2940c04db74627c4462c',
   './download.php' => '1d337efcbfc68d524faab8c4460e107a',
@@ -699,7 +700,7 @@ $md5_string = array (
   './include/SearchForm/tpls/header.tpl' => '2d1c49e167dbeb93e8e03ec79c1fec2c',
   './include/SearchForm/tpls/headerPopup.tpl' => '49f913824175dafd993fbc8a1bf7923c',
   './include/Services/Batch/BatchJob.php' => 'bada8d2023e3824673b3a709a54e76f7',
-  './include/Services/NormalizeRecords/NormalizeRecords.php' => 'a0d64b3a4d41c72d4f00dad0b0d62f7d',
+  './include/Services/NormalizeRecords/NormalizeRecords.php' => '0daac688a03ca6212dee84f6411a8b30',
   './include/Services/NormalizeRecords/NormalizeRecordsSchedulerJob.php' => '8931bcef83a853868bd8f0dc934818d1',
   './include/Smarty/plugins/block.minify.php' => 'a4a8771c5a8a48c7ab030b0b552957dd',
   './include/Smarty/plugins/block.nocache.php' => '66bb941778de43b9e52d06a47becb9f5',
@@ -851,7 +852,7 @@ $md5_string = array (
   './include/SugarDependentDropdown/javascript/SugarDependentDropdown.js' => '14748d0133b9731b97c11b95e3713489',
   './include/SugarDependentDropdown/metadata/dependentDropdown.php' => 'deb131d92c6a4447d8265600ba46e9b2',
   './include/SugarEmailAddress/SugarEmailAddress.js' => 'def2d76e0bee474993ae52ce8bafe7c0',
-  './include/SugarEmailAddress/SugarEmailAddress.php' => '141b5619a3476eaef690ae6adba2a126',
+  './include/SugarEmailAddress/SugarEmailAddress.php' => 'aaf058b834446b2ca595aa957e7d958e',
   './include/SugarEmailAddress/getEmailAddressWidget.php' => '732df9ab640f7e9713d81a2a2c5579d0',
   './include/SugarEmailAddress/templates/forDetailView.tpl' => 'f40f05d1278c144c7e7fd4a1e9e77eb4',
   './include/SugarEmailAddress/templates/forDuplicatesView.tpl' => '99609f76277d97556395e7dc3923c402',
@@ -1032,7 +1033,7 @@ $md5_string = array (
   './include/SugarLogger/SugarLogger.php' => '6d9af5c4188da26af4e791ec168c3cf6',
   './include/SugarOAuthServer.php' => 'c0f2ca51199ee2876bcfcdd82f47875d',
   './include/SugarOauth.php' => '2911b35f051569a701eecb9d53f23597',
-  './include/SugarObjects/LanguageManager.php' => 'a2bae88124926a27721ce4d6f1e9bd50',
+  './include/SugarObjects/LanguageManager.php' => 'a8906e64d8e063305a02b5f8763dfdef',
   './include/SugarObjects/SugarConfig.php' => '8d4e3692d1ae8d49de22c4d27690808d',
   './include/SugarObjects/SugarRegistry.php' => '8a694257c940b967209750983849a49d',
   './include/SugarObjects/SugarSession.php' => '43948517d3dc23cc227474220a1fe06e',
@@ -1063,10 +1064,11 @@ $md5_string = array (
   './include/SugarObjects/templates/basic/metadata/detailviewdefs.php' => '5e50674a38a33a6a32e0ccaf452901cf',
   './include/SugarObjects/templates/basic/metadata/editviewdefs.php' => 'a72fc3bcb6c8d3af8c7e2fd5a16b449e',
   './include/SugarObjects/templates/basic/metadata/listviewdefs.php' => '12c67a104a6f959be11749ba807adf8a',
-  './include/SugarObjects/templates/basic/metadata/metafiles.php' => '5dc7c77d1e65d8f0e5dafa6f5d4b3969',
+  './include/SugarObjects/templates/basic/metadata/metafiles.php' => '80e1c107fcf93fe0a78cf5dd7146b3f5',
   './include/SugarObjects/templates/basic/metadata/popupdefs.php' => '853844b094d4dfe9a29d59759b21ce1b',
   './include/SugarObjects/templates/basic/metadata/quickcreatedefs.php' => '4b0e405788feef127942e060963a7ee8',
   './include/SugarObjects/templates/basic/metadata/searchdefs.php' => '94bf8c5a3bbffdfb32a1415dd9328587',
+  './include/SugarObjects/templates/basic/metadata/subpaneldefs.php' => 'decf6423acb6b44f331f9f8b54c19ff0',
   './include/SugarObjects/templates/basic/metadata/subpanels/default.php' => 'eef3e143d70cb857fdc15b0014bcbf2d',
   './include/SugarObjects/templates/basic/vardefs.php' => '0c874ef332c71fca9a1255b24ff3a9c8',
   './include/SugarObjects/templates/company/Company.php' => 'b39fc86fb36507f7eb9dcaa95e58e295',
@@ -1085,10 +1087,11 @@ $md5_string = array (
   './include/SugarObjects/templates/company/metadata/detailviewdefs.php' => '6b9f79584faeb9de6b3ea8e1b7773390',
   './include/SugarObjects/templates/company/metadata/editviewdefs.php' => '9149a6f92ca93c9f77d6dcfa74b36f6a',
   './include/SugarObjects/templates/company/metadata/listviewdefs.php' => 'ceae1760bc12932b69ab3f35f68f1998',
-  './include/SugarObjects/templates/company/metadata/metafiles.php' => '5dc7c77d1e65d8f0e5dafa6f5d4b3969',
+  './include/SugarObjects/templates/company/metadata/metafiles.php' => '80e1c107fcf93fe0a78cf5dd7146b3f5',
   './include/SugarObjects/templates/company/metadata/popupdefs.php' => 'e59bf2a176a15e758c982d110b876ab3',
   './include/SugarObjects/templates/company/metadata/quickcreatedefs.php' => '26986647ae09963d834ca32deedf04c7',
   './include/SugarObjects/templates/company/metadata/searchdefs.php' => '32412c1a5d2bec1928b8c1e750308e25',
+  './include/SugarObjects/templates/company/metadata/subpaneldefs.php' => '50acf29d6c53bd5a58dac8b21971d94b',
   './include/SugarObjects/templates/company/metadata/subpanels/default.php' => 'd572c5b3d3492d77bc86949f62fb9a5e',
   './include/SugarObjects/templates/company/vardefs.php' => 'e8c82088efe99f717f63a02b5dc83b29',
   './include/SugarObjects/templates/file/File.php' => 'ea3b3d8394cfac726b77e699597c6370',
@@ -1109,9 +1112,10 @@ $md5_string = array (
   './include/SugarObjects/templates/file/metadata/detailviewdefs.php' => '38ba4302edc39bde885cd3fbd23cef46',
   './include/SugarObjects/templates/file/metadata/editviewdefs.php' => '4e01916bccc26dd18213c486af79339f',
   './include/SugarObjects/templates/file/metadata/listviewdefs.php' => 'ba627c916655ab0e7086aaafba0a2278',
-  './include/SugarObjects/templates/file/metadata/metafiles.php' => '30b981844f4f61f7120cc6fd71e6df2b',
+  './include/SugarObjects/templates/file/metadata/metafiles.php' => 'c44b4a1bae97f1d29608af2aaf3e931d',
   './include/SugarObjects/templates/file/metadata/quickcreatedefs.php' => '6d473036b76f6d6fcc6bf754c8d28748',
   './include/SugarObjects/templates/file/metadata/searchdefs.php' => '968d0e10883675aae697ac2a4915bfcd',
+  './include/SugarObjects/templates/file/metadata/subpaneldefs.php' => 'decf6423acb6b44f331f9f8b54c19ff0',
   './include/SugarObjects/templates/file/metadata/subpanels/default.php' => '1843a1eea57d11427483b4e8760a9c8e',
   './include/SugarObjects/templates/file/vardefs.php' => 'b9cd2c914907a6d18c30117a0ac07b66',
   './include/SugarObjects/templates/file/views/view.edit.php' => 'c6ad729501b57cb2d1c567277a706ee2',
@@ -1133,10 +1137,11 @@ $md5_string = array (
   './include/SugarObjects/templates/issue/metadata/detailviewdefs.php' => '3f99f9fd8ae0b8fc67b635e33b2c69e3',
   './include/SugarObjects/templates/issue/metadata/editviewdefs.php' => 'b0df2be5daf35ad78b51a1bb085e2c36',
   './include/SugarObjects/templates/issue/metadata/listviewdefs.php' => 'fdfc52d80121c3bb7b769955abefd892',
-  './include/SugarObjects/templates/issue/metadata/metafiles.php' => '5dc7c77d1e65d8f0e5dafa6f5d4b3969',
+  './include/SugarObjects/templates/issue/metadata/metafiles.php' => '80e1c107fcf93fe0a78cf5dd7146b3f5',
   './include/SugarObjects/templates/issue/metadata/popupdefs.php' => '0d8e904d55dd66a7a90d38f1d0664bd8',
   './include/SugarObjects/templates/issue/metadata/quickcreatedefs.php' => '368961ada69c8553e7137b604a877f09',
   './include/SugarObjects/templates/issue/metadata/searchdefs.php' => '79c07472d9392384942e22bc6132c8fa',
+  './include/SugarObjects/templates/issue/metadata/subpaneldefs.php' => 'decf6423acb6b44f331f9f8b54c19ff0',
   './include/SugarObjects/templates/issue/metadata/subpanels/default.php' => '11ea1311363e3db9a0b077d21f84f257',
   './include/SugarObjects/templates/issue/vardefs.php' => 'cec1c24e9ae386c840dda523c65ecd77',
   './include/SugarObjects/templates/person/Person.php' => '5586b56db82db3b6a69d31f4cd46d1d9',
@@ -1156,10 +1161,11 @@ $md5_string = array (
   './include/SugarObjects/templates/person/metadata/detailviewdefs.php' => '298b0c970095d044eb0977c8e5ee0376',
   './include/SugarObjects/templates/person/metadata/editviewdefs.php' => '955ed57a59f08bbd8cbb0b7459b2fdb3',
   './include/SugarObjects/templates/person/metadata/listviewdefs.php' => '693f66188d1665c8e410b6bf5be15d27',
-  './include/SugarObjects/templates/person/metadata/metafiles.php' => '5dc7c77d1e65d8f0e5dafa6f5d4b3969',
+  './include/SugarObjects/templates/person/metadata/metafiles.php' => '80e1c107fcf93fe0a78cf5dd7146b3f5',
   './include/SugarObjects/templates/person/metadata/popupdefs.php' => '94cac00bca2eecc5ad30c6169147aa2b',
   './include/SugarObjects/templates/person/metadata/quickcreatedefs.php' => 'a720ca8346a61cb442fa6ad93a51d1b3',
   './include/SugarObjects/templates/person/metadata/searchdefs.php' => '21606aab371fa03e267883d902d944be',
+  './include/SugarObjects/templates/person/metadata/subpaneldefs.php' => 'decf6423acb6b44f331f9f8b54c19ff0',
   './include/SugarObjects/templates/person/metadata/subpanels/default.php' => '552bbb8e4bdecc081ea5567effb05c6b',
   './include/SugarObjects/templates/person/vardefs.php' => '0ff81025316998a27fd5b63f678fa2e4',
   './include/SugarObjects/templates/sale/Chance.php' => 'a22453ee390a8e4f4fe89cde6b7f937c',
@@ -1183,10 +1189,11 @@ $md5_string = array (
   './include/SugarObjects/templates/sale/metadata/detailviewdefs.php' => '3f1afa19a4c3d714e132f69c9d6e7cfa',
   './include/SugarObjects/templates/sale/metadata/editviewdefs.php' => '767b86f216ab3624cb51bebc36c7b79e',
   './include/SugarObjects/templates/sale/metadata/listviewdefs.php' => 'b8a70bd4bc2da7021120f6c92a914acd',
-  './include/SugarObjects/templates/sale/metadata/metafiles.php' => 'c66eca250effcffa927a528e55be1420',
+  './include/SugarObjects/templates/sale/metadata/metafiles.php' => 'c44b4a1bae97f1d29608af2aaf3e931d',
   './include/SugarObjects/templates/sale/metadata/popupdefs.php' => 'dd08f5844bddaf9c47b2323388ae8f00',
   './include/SugarObjects/templates/sale/metadata/quickcreatedefs.php' => '40de9275a19046c346932a467511d903',
   './include/SugarObjects/templates/sale/metadata/searchdefs.php' => '259ca47ed60f67f3fcc5ff9b21487022',
+  './include/SugarObjects/templates/sale/metadata/subpaneldefs.php' => 'decf6423acb6b44f331f9f8b54c19ff0',
   './include/SugarObjects/templates/sale/metadata/subpanels/default.php' => '933ed06ff0fd822b455b6c05d3526b35',
   './include/SugarObjects/templates/sale/vardefs.php' => '0594cbe418f268edf893cced47b022f3',
   './include/SugarObjects/translated_prefix.php' => 'ba8e90a225dfa38f779119b10c366d40',
@@ -1322,7 +1329,7 @@ $md5_string = array (
   './include/contextMenus/menuDefs/sugarObject.php' => '119e653126765edb0358ab54697b862a',
   './include/contextMenus/menuDefs/sugarPerson.php' => '215d244d2fbd4bce5facc8fe2091cc27',
   './include/controller/Controller.php' => '0ee78cfd4c12448eec89ea50b7ea143b',
-  './include/database/DBManager.php' => 'd2ecb6db9ceda8d9f1042c2f00ba5d63',
+  './include/database/DBManager.php' => 'd43d19f2e402b1d9eb2f8a13d2162e90',
   './include/database/DBManagerFactory.php' => 'ba1e996ceb661905208e38df2459b095',
   './include/database/FreeTDSManager.php' => '23ec109e38260e0ffa2a1676d486fd62',
   './include/database/MssqlManager.php' => '8ec8ad4bd3df1c19aa96b228f3b356a7',
@@ -2335,7 +2342,7 @@ $md5_string = array (
   './include/javascript/yui/build/yuitest/yuitest_core.js' => 'ed5230a0f4a885d8ea51c2fe78895d07',
   './include/javascript/yui/ygDDList.js' => '0cd9051a220de7e8c79bf5b9cccce10f',
   './include/json_config.php' => 'ba7fb6f2fb1df51bc367835406ef7ba5',
-  './include/language/en_us.lang.php' => 'b3e2e4ddf37fa8614a55749c8f22aea6',
+  './include/language/en_us.lang.php' => '9b8bee2691bda327f6b973fa789de805',
   './include/language/en_us.notify_template.html' => 'c6a897ace7af46a44889dfab1a9d44c5',
   './include/language/getJSLanguage.php' => '1bc910bd5a9953fbf443d3d97fddbffa',
   './include/language/jsLanguage.php' => '3d27819dc00f2fe5426f72733a7edca1',
@@ -2435,7 +2442,7 @@ $md5_string = array (
   './include/utils/db_utils.php' => '7fa7c67aec162fd9da259a1f33cef514',
   './include/utils/encryption_utils.php' => 'cf87e84efe3764464056e6473aac9c79',
   './include/utils/external_cache.php' => '7439d9b6252e242a9c852ecb58df44ec',
-  './include/utils/file_utils.php' => '28de9dc2ca22c07972fb85f334024bea',
+  './include/utils/file_utils.php' => '32ed2174485ae7cdc829415d4dcaef86',
   './include/utils/layout_utils.php' => 'f1bfbecd81ffaea9483b39ee7925a523',
   './include/utils/logic_utils.php' => 'df0882131989fd10f9855cc3b66d4572',
   './include/utils/mvc_utils.php' => '38de4382713debfb1cbbe33442a8fc5b',
@@ -2874,7 +2881,7 @@ $md5_string = array (
   './lib/Search/UI/MVC/View.php' => '060017bf23671e429cca7187b72ddd2a',
   './lib/Search/UI/SearchFormController.php' => '2cf159703562da6348ece57ef68313b4',
   './lib/Search/UI/SearchFormView.php' => '15662e4bd9237044fe1b74f41632660d',
-  './lib/Search/UI/SearchResultsController.php' => '5c3be29f03a58a39dea00393c1dfc01e',
+  './lib/Search/UI/SearchResultsController.php' => '21c2ecf52498c7e3109464e4fddd32a7',
   './lib/Search/UI/SearchResultsView.php' => 'ce2615a6390cfe62924d44fdfc7a18fa',
   './lib/Search/UI/SearchThrowableHandler.php' => '14cd2232a5a73df32a755e85a52cd7fd',
   './lib/Search/UI/templates/search.form.tpl' => '8a03f27dd8860270f7c91d64c211fffe',
@@ -3396,7 +3403,7 @@ $md5_string = array (
   './modules/AOR_Reports/vardefs.php' => 'bf0ea6c174abbb8e242b4d6963b8686f',
   './modules/AOR_Reports/views/view.detail.php' => '4b9c8598d6e8a76aa6ec470227012cbc',
   './modules/AOR_Reports/views/view.edit.php' => '0e078b86d2078fc47e4ccf24b3b5d8d4',
-  './modules/AOR_Scheduled_Reports/AOR_Scheduled_Reports.php' => '1d67cfee23f2da1d546578bc27545a74',
+  './modules/AOR_Scheduled_Reports/AOR_Scheduled_Reports.php' => '37085ac71ea851fc00d66dbf569885f7',
   './modules/AOR_Scheduled_Reports/Menu.php' => '5a02efb3ec80ffcb5044e33ac30338c7',
   './modules/AOR_Scheduled_Reports/emailRecipients.js' => '30056240ca6885b19bac0dffe6a15b06',
   './modules/AOR_Scheduled_Reports/emailRecipients.php' => '7859bbf38e5016778fc56495e7d4e177',
@@ -3891,7 +3898,7 @@ $md5_string = array (
   './modules/Bugs/views/view.edit.php' => 'f406f3c7f19e15cd646373151994fa1c',
   './modules/Calendar/Cal.js' => '106379c83260c2472f7c65114d7a9fdb',
   './modules/Calendar/Calendar.php' => '8b5970e1adbf735e0d7f5222012f48ec',
-  './modules/Calendar/CalendarActivity.php' => '0cead97402da329cb1f4748058f3dd0a',
+  './modules/Calendar/CalendarActivity.php' => '9e55048969b6abcb58443296057f8fce',
   './modules/Calendar/CalendarDisplay.php' => 'fd05f849dff1db7bb47713be26e6a3d2',
   './modules/Calendar/CalendarGrid.php' => 'a77c39c149c93a681a75e91f889f9b2c',
   './modules/Calendar/CalendarUtils.php' => '295ad053fe74484ae3943b9fb4487ae1',
@@ -4442,7 +4449,7 @@ $md5_string = array (
   './modules/Documents/views/view.detail.php' => 'eac3d5189949259727d9a1037f0e0070',
   './modules/Documents/views/view.edit.php' => '80f2e5e7e9fa1170f7e0452b9ca8b816',
   './modules/Documents/views/view.extdoc.php' => 'a596ceb8005df2241ae53b4146bfc8f5',
-  './modules/DynamicFields/DynamicField.php' => '872af3f181df101e6dada8b0d39e685f',
+  './modules/DynamicFields/DynamicField.php' => 'c0ff8ecd1a1453c37756ef849de12664',
   './modules/DynamicFields/FieldCases.php' => '727d05978bb8a62c33ec9c8b7ab91489',
   './modules/DynamicFields/FieldViewer.php' => '85058d135229ad1103524d52cfd06d82',
   './modules/DynamicFields/FieldsMetaData.php' => '8e5a2e1af51b342d83f81910e11cb046',
@@ -4652,10 +4659,10 @@ $md5_string = array (
   './modules/Emails/controller.php' => '65d6d5ad5e977930403a2b89cb15004a',
   './modules/Emails/field_arrays.php' => 'f8ad985446f13141ea7365aa8565c500',
   './modules/Emails/include/ComposeView/ComposeView.php' => '45b1a69671ca5c5f2a8ab1455e9f730c',
-  './modules/Emails/include/ComposeView/ComposeView.tpl' => '1ec29fbb9803c24e5ed8a12155668e58',
+  './modules/Emails/include/ComposeView/ComposeView.tpl' => 'aee5736e992aecc485afbb5973d9e535',
   './modules/Emails/include/ComposeView/ComposeViewBlank.tpl' => '22365ce6727ffb560e5ad3fc187f13f2',
   './modules/Emails/include/ComposeView/ComposeViewToolbar.tpl' => '656b26827857375278124e4610b9ff06',
-  './modules/Emails/include/ComposeView/EmailsComposeView.js' => '65624a5e5985e5f9deee1e4725533462',
+  './modules/Emails/include/ComposeView/EmailsComposeView.js' => '8ed14ba39eff3d7ec030538431ad3999',
   './modules/Emails/include/DetailView/EmailsDetailView.php' => 'f95937f398f37afe3927ecc035b8b743',
   './modules/Emails/include/DetailView/EmailsDraftDetailView.php' => 'baafca815e89a4c0ec3df8b6192552ea',
   './modules/Emails/include/DetailView/EmailsNonImportedDetailView.php' => 'ef9ecbcf65fa6f03e32f94b6a9805b2f',
@@ -4754,7 +4761,7 @@ $md5_string = array (
   './modules/Emails/templates/outboundDialogTest.tpl' => '6d9e938d23d33fb7fa5582fa15c65662',
   './modules/Emails/templates/overlay.tpl' => '2e323ca505c0e45a3c660f993a20ba29',
   './modules/Emails/templates/successMessage.tpl' => 'dcafb0a92cfae5ffd539a75cb82db2b7',
-  './modules/Emails/vardefs.php' => '3b7cf8c8a768bd5c4d1bcdb5bd05e7d2',
+  './modules/Emails/vardefs.php' => 'dae3869d4728b0bc63a3afe2532ee0cb',
   './modules/Emails/views/view.compose.php' => '655ace129db29e568d901f3223b8afbb',
   './modules/Emails/views/view.deletedraftemail.php' => '4a14718938a8577c683466fbbfec9b23',
   './modules/Emails/views/view.detail.php' => '1dd813258abcba95f09418ef063f0fa7',
@@ -4766,7 +4773,7 @@ $md5_string = array (
   './modules/Emails/views/view.popup.php' => '4ff1e52f105970c29fed966e2f058dd3',
   './modules/Emails/views/view.savedraftemail.php' => '000c8d786c87e0ad997fc5de443d9b2c',
   './modules/Emails/views/view.sendemail.php' => '78784b11ddb5257b0f3f5c59c9db17a1',
-  './modules/Employees/Employee.php' => 'c837db1f7627ee68383a041c51bb8b9c',
+  './modules/Employees/Employee.php' => '2a70486e775ccc8e4c36176855d5c1e7',
   './modules/Employees/EmployeeStatus.php' => 'a2be5cfeb49ef4f8deec01de9686edb9',
   './modules/Employees/EmployeesSearchForm.php' => '0437d91e2221d02c38e0db6830fef057',
   './modules/Employees/EmployeesStudioModule.php' => '5b71bea7b6e7b7a77bc5a48d4fb10a55',
@@ -5170,7 +5177,7 @@ $md5_string = array (
   './modules/ModuleBuilder/MB/header.php' => 'de67588e0b8d859dc2d9fc71709036b4',
   './modules/ModuleBuilder/Module/DropDownBrowser.php' => '3f1698938d776a91255703c257049fac',
   './modules/ModuleBuilder/Module/DropDownTree.php' => '3685a4b70a81e30fccf6c6b2f770c9d8',
-  './modules/ModuleBuilder/Module/IconRepository.php' => '20cd01f8300b411bacffb53361ed6f08',
+  './modules/ModuleBuilder/Module/IconRepository.php' => '5fbd04824f79784669ba38326a18096f',
   './modules/ModuleBuilder/Module/MainTree.php' => '3122ae95f6c9a62db7c6eec12b2581f0',
   './modules/ModuleBuilder/Module/StudioBrowser.php' => '32112741c23435fe2794f797933cfacc',
   './modules/ModuleBuilder/Module/StudioModule.php' => '35525c18e7b1e00379f7d766b9001af5',
@@ -5188,13 +5195,13 @@ $md5_string = array (
   './modules/ModuleBuilder/javascript/studio2RowDD.js' => 'ce2a4bfa3dbaca4249d73df0bc5dfaad',
   './modules/ModuleBuilder/javascript/studiotabgroups.js' => 'c3d48dec838914e457aa099d9225d174',
   './modules/ModuleBuilder/javascript/wizardTemplate.js' => '92c65dce9153db13c20731de44d14d87',
-  './modules/ModuleBuilder/language/en_us.lang.php' => '9171bfd805fcedff0bbc38266d6395b5',
+  './modules/ModuleBuilder/language/en_us.lang.php' => 'b73ec441c51179efa58d1a65e2160252',
   './modules/ModuleBuilder/parsers/ModuleBuilderParser.php' => '1a5d8c3c8c7736c4e9011960732c4647',
   './modules/ModuleBuilder/parsers/ParserFactory.php' => '9f49fbae9d8aadc97257d4cf18672978',
   './modules/ModuleBuilder/parsers/StandardField.php' => '4cbf549bc313959427dc126e9afe01e7',
   './modules/ModuleBuilder/parsers/constants.php' => '01917f1fa30ccbaabf69cf03f3a37946',
   './modules/ModuleBuilder/parsers/parser.dropdown.php' => 'adfd8f59d8b6072d2aabee8f2ec68ceb',
-  './modules/ModuleBuilder/parsers/parser.label.php' => 'b026e2f0249fe89f848312ece6d1ca1d',
+  './modules/ModuleBuilder/parsers/parser.label.php' => '282ab5608f39a5ea18d3ff0b6c236766',
   './modules/ModuleBuilder/parsers/parser.modifylayoutview.php' => 'f69b0f61304ac1a038a9ee4fc5e64faf',
   './modules/ModuleBuilder/parsers/parser.modifylistview.php' => '7b370f6ed426a6e1be2f6b0fa422eb76',
   './modules/ModuleBuilder/parsers/parser.modifysubpanel.php' => '27b433079ba0b51495f59defd0bb348f',
@@ -5547,7 +5554,7 @@ $md5_string = array (
   './modules/ProjectTask/vardefs.php' => 'd1966d1060fcc2f8245f83e983f4a477',
   './modules/ProjectTask/views/view.list.php' => '8beeb6373e9925ea68b4f1d2121abf06',
   './modules/ProspectLists/Delete.php' => '49e5493083f478e993c36e0941d16bcd',
-  './modules/ProspectLists/Duplicate.php' => '51ef701820dbf25644722d961ed1121f',
+  './modules/ProspectLists/Duplicate.php' => 'f73bdc77dd9e63b24e69897105947500',
   './modules/ProspectLists/Forms.html' => 'f2cb6003b845b3ae60c954c3543c6fe8',
   './modules/ProspectLists/Forms.php' => '304e40b1231cb7dcc58dd49612680582',
   './modules/ProspectLists/Menu.php' => '353995ef7f262ec1186a49f0425f21c0',
@@ -5753,7 +5760,7 @@ $md5_string = array (
   './modules/Spots/vardefs.php' => '5e4d751e31f3684b35e34af55d53be25',
   './modules/Spots/views/view.edit.php' => 'be1fbcd8c6b5871b18244cdb7ef02bb3',
   './modules/Spots/views/view.list.php' => '0d9934545e44b644cb8f65f33a908004',
-  './modules/Studio/DropDowns/DropDownHelper.php' => '459e0789955425379aeae7314e581b10',
+  './modules/Studio/DropDowns/DropDownHelper.php' => 'fca5f36c4e2b0ab0a6fbff17cf051def',
   './modules/Studio/DropDowns/EditView.php' => 'fc1f1181fe3ecf9d446078ef3998a912',
   './modules/Studio/DropDowns/EditView.tpl' => '1daa9d2575cfd5788576f7c8f06940a5',
   './modules/Studio/Forms.php' => 'f1b9c09d71cbf6919f46b99b9a0286d3',
@@ -6048,7 +6055,7 @@ $md5_string = array (
   './modules/Users/SetTimezone.tpl' => 'f0fb5ed64fae81a5657ebc8f167967c9',
   './modules/Users/UpdateTourStatus.php' => 'cc111e28e6df1d96b98678661dd42490',
   './modules/Users/User.js' => '351f8d8e74bd1bd0a56dcc2bae31b147',
-  './modules/Users/User.php' => 'e0e65bf73d91fcc730b923eb95fe37c2',
+  './modules/Users/User.php' => 'a75ad79197349bc156f9365ef3830b9c',
   './modules/Users/UserEditView.js' => '421e1c38f1ee78933134b987b7c3c251',
   './modules/Users/UserEmailOptions.tpl' => '96b848efbf7f6d4fee7b6bf13a1a1aee',
   './modules/Users/UserEmailSettings.tpl' => '5d9ff3379f63dcf7c5efbbcc3e88d8ed',
@@ -6265,7 +6272,7 @@ $md5_string = array (
   './modules/vCals/HTTP_WebDAV_Server_vCal.php' => '966b7f0c7c2297ce1bea3a944e4cbd91',
   './modules/vCals/Server.php' => '42c9c6a727bca02d7f1a6c6f4591257b',
   './modules/vCals/field_arrays.php' => 'a1a41e8dd4710a3671fa359dcb8267ba',
-  './modules/vCals/vCal.php' => '11257a95accc06fa64afc8d60425d663',
+  './modules/vCals/vCal.php' => 'e20c0d7ec2b900ce37c8d621db8835ad',
   './modules/vCals/vardefs.php' => 'aa722f4d5a1fa352bc808da9fce072bd',
   './pdf.php' => '9c17ce70f633f699b8f5accd104f7e67',
   './php_version.php' => '928257f676637cf31a03032c3e661e27',
@@ -6335,32 +6342,32 @@ $md5_string = array (
   './soap.php' => 'e28988c2e0b8e2c484587b537a710525',
   './sugar_version.json' => 'bdfbcefae2f9af559bef6a36367df7bb',
   './sugar_version.php' => 'db7b6c8d51f87879fce1e6172eedfbed',
-  './suitecrm_version.php' => '4c7d3c4f6802cc2a615832b2c09f8c8e',
+  './suitecrm_version.php' => '44698d65949ec2aaa3489747310fb8be',
   './themes/SuiteP/css/Dawn/color-palette.scss' => 'e64677d79e1d68c069bdc2dc661c4f99',
   './themes/SuiteP/css/Dawn/icons.scss' => 'd59f8c5855e7a8df09542a663835a196',
   './themes/SuiteP/css/Dawn/select.ico' => '22393ad23f16c3f1462455bae8f20279',
-  './themes/SuiteP/css/Dawn/style.css' => '4b00f6c1bbea501b7b2d100b7b11e556',
+  './themes/SuiteP/css/Dawn/style.css' => 'fa371bfc0663c488d723ce828d1e7171',
   './themes/SuiteP/css/Dawn/style.scss' => '2fe759bc1c69865732f0ae0cca88916c',
   './themes/SuiteP/css/Dawn/variables.scss' => 'f8f8acf976e6cb0f1d27ea46891ead2e',
   './themes/SuiteP/css/Day/color-palette.scss' => '91bed2ed878a141ccdc521512f0daa33',
   './themes/SuiteP/css/Day/icons.scss' => '7a77bb17a810866e1ec4e0667e58e536',
-  './themes/SuiteP/css/Day/style.css' => 'aa909eb7a2ec2772a66ca0707fe8d419',
+  './themes/SuiteP/css/Day/style.css' => '6d2e8777837f4a3c9c673b403b95eef2',
   './themes/SuiteP/css/Day/style.scss' => '9cdabde7436f1037e691c81017972b8f',
   './themes/SuiteP/css/Day/variables.scss' => '31b6e279ea974581ad42f95a3bb694a4',
   './themes/SuiteP/css/Dusk/color-palette.scss' => '3fa059d1033bfd1bfa342ec0bc4ffe25',
   './themes/SuiteP/css/Dusk/icons.scss' => '7a77bb17a810866e1ec4e0667e58e536',
-  './themes/SuiteP/css/Dusk/style.css' => 'c948f679584e96d3ce39050d36b82e8b',
+  './themes/SuiteP/css/Dusk/style.css' => '5bfde54ca4e8a9315b384a4ae0cdc7f7',
   './themes/SuiteP/css/Dusk/style.scss' => '2fe759bc1c69865732f0ae0cca88916c',
   './themes/SuiteP/css/Dusk/variables.scss' => 'ac38ee874a0668e1d3b86972a850f91d',
   './themes/SuiteP/css/Night/color-palette.scss' => '25653200b97822a2d0f2594b180858c8',
   './themes/SuiteP/css/Night/icons.scss' => '2adfbf917fd7f0748090ef79ec4657c9',
-  './themes/SuiteP/css/Night/style.css' => 'b08ab4c6a46bca69b8b5affc3c108f24',
+  './themes/SuiteP/css/Night/style.css' => 'ee55328617a2cfa5a1a7583db1afd6b6',
   './themes/SuiteP/css/Night/style.scss' => '4b811594274100e02331d7bace01a687',
   './themes/SuiteP/css/Night/variables.scss' => '4fc04d66ddb30f18da508b82e71a6cde',
   './themes/SuiteP/css/Noon/color-palette.scss' => '952a2c7a3fb020ca2232b24a9ac58fe4',
   './themes/SuiteP/css/Noon/icons.scss' => 'b5d0e65cf55142e8591bfcd792b6bed6',
   './themes/SuiteP/css/Noon/select.ico' => '09333d8f426c1a4743e9b977a67d1d1f',
-  './themes/SuiteP/css/Noon/style.css' => '5f0a4b744c3057d5efc137791411aa2a',
+  './themes/SuiteP/css/Noon/style.css' => '504a6fcca636cdbad859ac6a8d1b47c8',
   './themes/SuiteP/css/Noon/style.scss' => '2fe759bc1c69865732f0ae0cca88916c',
   './themes/SuiteP/css/Noon/variables.scss' => 'bea284c3121762d58279aca24c873d9e',
   './themes/SuiteP/css/bootstrap/alerts.scss' => 'c0e5396555dd4c70b9eeb314e4c4613d',
@@ -6460,7 +6467,7 @@ $md5_string = array (
   './themes/SuiteP/css/suitep-base/email.scss' => '4b0a570ce4cdac8bb449f31bccb0ee72',
   './themes/SuiteP/css/suitep-base/forms.scss' => 'e1626b89c1cf4ac8fc16c5f5532c8ac0',
   './themes/SuiteP/css/suitep-base/jstree.scss' => '946510970bb0774a31a01c2fb57a9552',
-  './themes/SuiteP/css/suitep-base/listview.scss' => '083c62124b7f3c7dbf32a3f10e06cf35',
+  './themes/SuiteP/css/suitep-base/listview.scss' => '46898f8372bdd796e5ddeed167bd0c30',
   './themes/SuiteP/css/suitep-base/login.scss' => '25d85a91770e80b7b0357cece6eb5c4b',
   './themes/SuiteP/css/suitep-base/main.scss' => '0ddf085214424ea1f19a13f7930f1c9a',
   './themes/SuiteP/css/suitep-base/mixins.scss' => '9edffdf421f6277979bd76df64d34fad',
@@ -7740,15 +7747,15 @@ $md5_string = array (
   './themes/SuiteP/images/wizmenu/left-start.png' => '85bb13bfd189a2c3e306e7c08753434d',
   './themes/SuiteP/images/wizmenu/right-empty.png' => 'd3037d7c75385e7d5a5708092e8cb94c',
   './themes/SuiteP/images/wizmenu/right-full.png' => '2f6f9936252b8c9dfd7bb71b140061e5',
-  './themes/SuiteP/include/Dashlets/DashletHeader.tpl' => '83586d72dbd43540f4d71b6b5db354f5',
+  './themes/SuiteP/include/Dashlets/DashletHeader.tpl' => '09e4767d1ff01a830c0de2706e833a11',
-  './themes/SuiteP/include/DetailView/DetailView.tpl' => '4829a5f5b6ac00c01c321948b4481a95',
+  './themes/SuiteP/include/DetailView/DetailView.tpl' => 'ff62ab3dc8d5b6e91a4c1041c043592e',
   './themes/SuiteP/include/DetailView/actions_buttons.tpl' => '8a6fff7933b92178c28f5a58feddef75',
   './themes/SuiteP/include/DetailView/actions_menu.tpl' => '43988446570fc2820b7b0fb3da42e199',
   './themes/SuiteP/include/DetailView/footer.tpl' => '74cd1da7edd3386ee51db3e8ba8bb53b',
   './themes/SuiteP/include/DetailView/header.tpl' => 'ba7fbc5faa2a0e336373aae9b1e52a8e',
   './themes/SuiteP/include/DetailView/tab_panel_content.tpl' => '6d222e6e0637382cff40a4dff5dbb851',
   './themes/SuiteP/include/DetailView/test.tpl' => 'fcf838f4139733066cc727fc7f3818ae',
-  './themes/SuiteP/include/EditView/EditView.tpl' => '5e279ffcc56b22f3c2d6032247fa288e',
+  './themes/SuiteP/include/EditView/EditView.tpl' => '7ad41f35fa8b0aa7dbaae48189c38edb',
   './themes/SuiteP/include/EditView/QuickCreate.tpl' => '3acca81ef6a983731de021c1943f4c0b',
   './themes/SuiteP/include/EditView/SugarVCR.tpl' => 'eed25c746ed4a7ffeeaaae25a36f49c4',
   './themes/SuiteP/include/EditView/actions_buttons.tpl' => '3ccfac667a36f3f67706deb6de2f9a77',

include/Services/NormalizeRecords/NormalizeRecords.php

@@ -43,8 +43,8 @@ if (!defined('sugarEntry') || !sugarEntry) {
     die('Not A Valid Entry Point');
 }
 
-require_once __DIR__ .'/../../../modules/SchedulersJobs/SchedulersJob.php';
+require_once __DIR__ . '/../../../modules/SchedulersJobs/SchedulersJob.php';
-require_once __DIR__ .'/../Batch/BatchJob.php';
+require_once __DIR__ . '/../Batch/BatchJob.php';
 
 
 class NormalizeRecords extends BatchJob
@@ -110,6 +110,9 @@ class NormalizeRecords extends BatchJob
             if (empty($ids)) {
                 $this->debugLog("No ids found for module $type");
                 $this->echoOutput($echo, "No ids found for module $type");
+                $this->echoOutput($echo, "$type 0 records normalized");
+                $messages[] = "$type 0 records normalized";
+                $this->debugLog("$type 0 records normalized");
                 continue;
             }
 
@@ -291,17 +294,13 @@ class NormalizeRecords extends BatchJob
     protected function setupTracking(): array
     {
         // Populate the $moduleList variable to target only specific modules
-        $moduleList = [];
+        $moduleList = $this->getModulesToNormalize();
-        if (empty($moduleList)) {
-            $moduleList = $GLOBALS["moduleList"];
-            $moduleList[] = 'Users';
-        }
 
         $tracking = [];
 
         foreach ($moduleList as $module) {
 
-            if (empty($GLOBALS["beanList"][$module])){
+            if (empty($GLOBALS["beanList"][$module])) {
                 continue;
             }
 
@@ -406,8 +405,8 @@ class NormalizeRecords extends BatchJob
         $records = $this->getRecordChunk($ids, $type);
         foreach ($records as $row) {
 
-            $normalized = $this->repairStringValues($row, $fieldList);
+            $normalized = $this->repairStringValues($type, $row, $fieldList);
-            if (!$normalized) {
+            if (empty($normalized)) {
                 continue;
             }
 
@@ -417,7 +416,7 @@ class NormalizeRecords extends BatchJob
             $bean->update_modified_by = false;
             $bean->processed = true;
             $bean->notify_inworkflow = false;
-            $bean->save(false);
+            $bean->saveFields($normalized);
             $this->debugLog("$type - " . $bean->id . " normalized");
             ++$i;
             if ($i % 100 === 0) {
@@ -425,7 +424,7 @@ class NormalizeRecords extends BatchJob
             }
         }
         $messages[] = "$type " . $i . " records normalized";
-        $result['normalize_count']  = $i;
+        $result['normalize_count'] = $i;
         $this->debugLog("$type " . $i . " records normalized");
 
         $result['messages'] = $messages;
@@ -437,14 +436,29 @@ class NormalizeRecords extends BatchJob
      * Check and Normalize values from database row
      * which exist in the $fieldList array
      *
-     * @param $row
+     * @param string $type
+     * @param array $row
      * @param array $fieldList
-     * @return bool
+     * @return array
      */
-    protected function repairStringValues(&$row, array $fieldList): bool
+    protected function repairStringValues(string $type, &$row, array $fieldList): array
     {
-        $normalized = false;
+        $fieldsToExclude = [
+            'Users' => [
+                'user_hash' => true
+            ],
+        ];
+
+        $normalized = [];
         foreach ($fieldList as $fieldName) {
+
+            $exclude = $fieldsToExclude[$type][$fieldName] ?? false;
+
+            if ($exclude === true) {
+                $this->debugLog("Excluded $fieldName");
+                continue;
+            }
+
             if (!empty($row[$fieldName])) {
 
                 // Check if normalization is required
@@ -455,7 +469,7 @@ class NormalizeRecords extends BatchJob
                 //debugLog("Pre : $row[$fieldName]");
                 $row[$fieldName] = Normalizer::normalize($row[$fieldName], Normalizer::FORM_C);
                 //debugLog("Post: $row[$fieldName]");
-                $normalized = true;
+                $normalized[] = $fieldName;
             }
         }
 
@@ -479,6 +493,10 @@ class NormalizeRecords extends BatchJob
         $repairableTypes = ['enum', 'longtext', 'name', 'text', 'varchar'];
         $varDefFields = $bean->getFieldDefinitions();
 
+        if ($type === 'Users') {
+            $repairableTypes[] = 'user_name';
+        }
+
         $fieldList = array();
         foreach ($varDefFields as $field) {
             if (in_array($field['type'], $repairableTypes, true)) {
@@ -532,7 +550,7 @@ class NormalizeRecords extends BatchJob
     {
         global $log;
 
-        $log->info("[utf-normalize]" . $string);
+        $log->info("[utf-normalize] " . $string);
     }
 
     /**
@@ -542,13 +560,105 @@ class NormalizeRecords extends BatchJob
      */
     protected function echoOutput(bool $echo, string $string): void
     {
-        if (empty($echo)){
+        if (empty($echo)) {
             return;
         }
 
-        echo '<div>' . $string. '</div>';
+        echo '<div>' . $string . '</div>';
         ob_flush();
         flush();
     }
 
+    /**
+     * @return array|mixed
+     */
+    protected function getModulesToNormalize()
+    {
+        $moduleList = [];
+        if (empty($moduleList)) {
+            $moduleList = $GLOBALS["moduleList"];
+            $moduleList[] = 'Users';
+        }
+
+        $modInvisList = $GLOBALS["modInvisList"] ?? [];
+
+        $toExlude = [
+            'Calendar',
+            'Administration',
+            'CustomFields',
+            'Connectors',
+            'Dropdown',
+            'Dynamic',
+            'DynamicFields',
+            'DynamicLayout',
+            'EditCustomFields',
+            'Help',
+            'Import',
+            'MySettings',
+            'EditCustomFields',
+            'FieldsMetaData',
+            'UpgradeWizard',
+            'Trackers',
+            'Connectors',
+            'Employees',
+            'Calendar',
+            'Sync',
+            'Versions',
+            'LabelEditor',
+            'Roles',
+            'EmailMarketing',
+            'OptimisticLock',
+            'TeamMemberships',
+            'TeamSets',
+            'TeamSetModule',
+            'Audit',
+            'MailMerge',
+            'MergeRecords',
+            'EmailText',
+            'Schedulers',
+            'Schedulers_jobs',
+            'CampaignTrackers',
+            'CampaignLog',
+            'EmailMan',
+            'Groups',
+            'InboundEmail',
+            'ACLActions',
+            'ACLRoles',
+            'DocumentRevisions',
+            'ModuleBuilder',
+            'Alert',
+            'ResourceCalendar',
+            'ACL',
+            'Configurator',
+            'UserPreferences',
+            'SavedSearch',
+            'Studio',
+            'Connectors',
+            'SugarFeed',
+            'EAPM',
+            'OAuthKeys',
+            'OAuthTokens',
+            'AM_TaskTemplates',
+            'Reminders',
+            'Reminders_Invitees',
+            'AOD_IndexEvent',
+            'AOD_Index',
+            'AOR_Fields',
+            'AOR_Charts',
+            'AOR_Conditions',
+            'AOS_Line_Item_Groups',
+            'AOW_Processed',
+            'Calls_Reschedule',
+            'OutboundEmailAccounts',
+            'TemplateSectionLine',
+            'OAuth2Tokens',
+            'OAuth2Clients',
+        ];
+
+        $modInvisList = array_diff($modInvisList, $toExlude);
+        $moduleList = array_merge($moduleList, $modInvisList);
+
+        return $moduleList;
+    }
+
 }

include/SugarEmailAddress/SugarEmailAddress.php

@@ -239,7 +239,7 @@ class SugarEmailAddress extends SugarBean
             || !isset($_REQUEST[$bean->module_dir . '_email_widget_id'])
             || !isset($_REQUEST['massupdate'])
         ) {
-            if (empty($this->addresses) || (!empty($bean->email1))) {
+            if (empty($this->addresses)) {
                 $this->addresses = array();
                 $optOut = (isset($bean->email_opt_out) && $bean->email_opt_out == '1');
                 $invalid = (isset($bean->invalid_email) && $bean->invalid_email == '1');

include/SugarObjects/LanguageManager.php

@@ -202,6 +202,9 @@ class LanguageManager
             'custom/modules/' . $module . '/Ext/Language/' . $lang . '.lang.ext.php',
         );
 
+        require_once 'ModuleInstall/ExtensionManager.php';
+        SuiteCRM\ModuleInstall\ExtensionManager::compileExtensionFiles('Language', '.lang.ext.php', $lang);
+
         #27023, if this module template language file was not attached , get the template from this module vardef cache file if exsits and load the template language files.
         static $createdModules;
         if (empty($createdModules[$module]) && isset($GLOBALS['beanList'][$module])) {

include/SugarObjects/templates/basic/metadata/metafiles.php

@@ -46,4 +46,5 @@ $metafiles[$module_name] = array(
     'searchdefs' => 'modules/' . $module_name . '/metadata/searchdefs.php',
     'popupdefs' => 'modules/' . $module_name . '/metadata/popupdefs.php',
     'searchfields' => 'modules/' . $module_name . '/metadata/SearchFields.php',
+    'subpaneldefs' => 'modules/' . $module_name . '/metadata/subpaneldefs.php',
 );

include/SugarObjects/templates/basic/metadata/subpaneldefs.php

@@ -0,0 +1,14 @@
+<?php
+$module_name = '<module_name>';
+$layout_defs[$module_name]['subpanel_setup']['securitygroups'] = array(
+    'top_buttons' => array(array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'SecurityGroups', 'mode' => 'MultiSelect')),
+    'order' => 900,
+    'sort_by' => 'name',
+    'sort_order' => 'asc',
+    'module' => 'SecurityGroups',
+    'refresh_page' => 1,
+    'subpanel_name' => 'default',
+    'get_subpanel_data' => 'SecurityGroups',
+    'add_subpanel_data' => 'securitygroup_id',
+    'title_key' => 'LBL_SECURITYGROUPS_SUBPANEL_TITLE',
+);

include/SugarObjects/templates/company/metadata/metafiles.php

@@ -46,4 +46,5 @@ $metafiles[$module_name] = array(
     'searchdefs' => 'modules/' . $module_name . '/metadata/searchdefs.php',
     'popupdefs' => 'modules/' . $module_name . '/metadata/popupdefs.php',
     'searchfields' => 'modules/' . $module_name . '/metadata/SearchFields.php',
+    'subpaneldefs' => 'modules/' . $module_name . '/metadata/subpaneldefs.php',
 );

include/SugarObjects/templates/company/metadata/subpaneldefs.php

@@ -0,0 +1,14 @@
+<?php
+$module_name = '<module_name>';
+$layout_defs[$module_name]['subpanel_setup']['securitygroups'] = array(
+    'top_buttons' => array(array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'SecurityGroups', 'mode' => 'MultiSelect'),),
+    'order' => 900,
+    'sort_by' => 'name',
+    'sort_order' => 'asc',
+    'module' => 'SecurityGroups',
+    'refresh_page' => 1,
+    'subpanel_name' => 'default',
+    'get_subpanel_data' => 'SecurityGroups',
+    'add_subpanel_data' => 'securitygroup_id',
+    'title_key' => 'LBL_SECURITYGROUPS_SUBPANEL_TITLE',
+);

include/SugarObjects/templates/file/metadata/metafiles.php

@@ -50,4 +50,5 @@ $metafiles[$module_name] = array(
     'searchdefs' => 'modules/' . $module_name . '/metadata/searchdefs.php',
     'popupdefs' => 'modules/' . $module_name . '/metadata/popupdefs.php',
     'searchfields' => 'modules/' . $module_name . '/metadata/SearchFields.php',
+    'subpaneldefs' => 'modules/' . $module_name . '/metadata/subpaneldefs.php',
 );

include/SugarObjects/templates/file/metadata/subpaneldefs.php

@@ -0,0 +1,14 @@
+<?php
+$module_name = '<module_name>';
+$layout_defs[$module_name]['subpanel_setup']['securitygroups'] = array(
+    'top_buttons' => array(array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'SecurityGroups', 'mode' => 'MultiSelect')),
+    'order' => 900,
+    'sort_by' => 'name',
+    'sort_order' => 'asc',
+    'module' => 'SecurityGroups',
+    'refresh_page' => 1,
+    'subpanel_name' => 'default',
+    'get_subpanel_data' => 'SecurityGroups',
+    'add_subpanel_data' => 'securitygroup_id',
+    'title_key' => 'LBL_SECURITYGROUPS_SUBPANEL_TITLE',
+);

include/SugarObjects/templates/issue/metadata/metafiles.php

@@ -46,4 +46,5 @@ $metafiles[$module_name] = array(
     'searchdefs' => 'modules/' . $module_name . '/metadata/searchdefs.php',
     'popupdefs' => 'modules/' . $module_name . '/metadata/popupdefs.php',
     'searchfields' => 'modules/' . $module_name . '/metadata/SearchFields.php',
+    'subpaneldefs' => 'modules/' . $module_name . '/metadata/subpaneldefs.php',
 );

include/SugarObjects/templates/issue/metadata/subpaneldefs.php

@@ -0,0 +1,14 @@
+<?php
+$module_name = '<module_name>';
+$layout_defs[$module_name]['subpanel_setup']['securitygroups'] = array(
+    'top_buttons' => array(array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'SecurityGroups', 'mode' => 'MultiSelect')),
+    'order' => 900,
+    'sort_by' => 'name',
+    'sort_order' => 'asc',
+    'module' => 'SecurityGroups',
+    'refresh_page' => 1,
+    'subpanel_name' => 'default',
+    'get_subpanel_data' => 'SecurityGroups',
+    'add_subpanel_data' => 'securitygroup_id',
+    'title_key' => 'LBL_SECURITYGROUPS_SUBPANEL_TITLE',
+);

include/SugarObjects/templates/person/metadata/metafiles.php

@@ -46,4 +46,5 @@ $metafiles[$module_name] = array(
     'searchdefs' => 'modules/' . $module_name . '/metadata/searchdefs.php',
     'popupdefs' => 'modules/' . $module_name . '/metadata/popupdefs.php',
     'searchfields' => 'modules/' . $module_name . '/metadata/SearchFields.php',
+    'subpaneldefs' => 'modules/' . $module_name . '/metadata/subpaneldefs.php',
 );

include/SugarObjects/templates/person/metadata/subpaneldefs.php

@@ -0,0 +1,14 @@
+<?php
+$module_name = '<module_name>';
+$layout_defs[$module_name]['subpanel_setup']['securitygroups'] = array(
+    'top_buttons' => array(array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'SecurityGroups', 'mode' => 'MultiSelect')),
+    'order' => 900,
+    'sort_by' => 'name',
+    'sort_order' => 'asc',
+    'module' => 'SecurityGroups',
+    'refresh_page' => 1,
+    'subpanel_name' => 'default',
+    'get_subpanel_data' => 'SecurityGroups',
+    'add_subpanel_data' => 'securitygroup_id',
+    'title_key' => 'LBL_SECURITYGROUPS_SUBPANEL_TITLE',
+);

include/SugarObjects/templates/sale/metadata/metafiles.php

@@ -50,5 +50,5 @@ $metafiles[$module_name] = array(
     'searchdefs' => 'modules/' . $module_name . '/metadata/searchdefs.php',
     'popupdefs' => 'modules/' . $module_name . '/metadata/popupdefs.php',
     'searchfields' => 'modules/' . $module_name . '/metadata/SearchFields.php',
-
+    'subpaneldefs' => 'modules/' . $module_name . '/metadata/subpaneldefs.php',
 );

include/SugarObjects/templates/sale/metadata/subpaneldefs.php

@@ -0,0 +1,14 @@
+<?php
+$module_name = '<module_name>';
+$layout_defs[$module_name]['subpanel_setup']['securitygroups'] = array(
+    'top_buttons' => array(array('widget_class' => 'SubPanelTopSelectButton', 'popup_module' => 'SecurityGroups', 'mode' => 'MultiSelect')),
+    'order' => 900,
+    'sort_by' => 'name',
+    'sort_order' => 'asc',
+    'module' => 'SecurityGroups',
+    'refresh_page' => 1,
+    'subpanel_name' => 'default',
+    'get_subpanel_data' => 'SecurityGroups',
+    'add_subpanel_data' => 'securitygroup_id',
+    'title_key' => 'LBL_SECURITYGROUPS_SUBPANEL_TITLE',
+);

include/database/DBManager.php

@@ -2090,6 +2090,11 @@ abstract class DBManager
                 if (!empty($val) && !empty($fieldDef['len']) && strlen($val) > $fieldDef['len']) {
                     $val = $this->truncate($val, $fieldDef['len']);
                 }
+
+                if (!empty($bean->bean_fields_to_save) && !in_array($fieldDef['name'], $bean->bean_fields_to_save, true)) {
+                    continue;
+                }
+
                 $columnName = $this->quoteIdentifier($fieldDef['name']);
                 if (!is_null($val) || !empty($fieldDef['required'])) {
                     $columns[] = "{$columnName}=".$this->massageValue($val, $fieldDef);

include/images/icon_configure.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_configure</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon_configure" fill="#E98074">
+            <path d="M79.9963395,58.659984 L48.0290895,35.330034 L47.356428,34.846047 L47.4794775,34.033935 C47.590221,33.377685 47.668152,32.676285 47.7296715,31.942125 C47.7912015,31.2530625 47.8076025,30.551715 47.8076025,29.833935 C47.8076025,22.89816 45.1210725,16.614435 40.7939175,12.082635 C36.4667625,7.566795 30.4989825,4.769595 23.9036175,4.769595 C21.9800175,4.769595 20.1219375,5.003388 18.3418725,5.4586575 C17.2016775,5.741664 16.0901475,6.1149075 15.0278625,6.5660925 L24.7157925,13.9571475 L25.248993,14.3632035 L25.248993,29.6575035 L24.3261375,29.952816 L10.4220375,34.546566 L9.7493865,34.7639475 L9.1874685,34.325079 L0.1107435,27.401589 L0.1107435,27.47952 C0.049224,28.2465135 0,29.025855 0,29.80926 C0,36.745035 2.68653,43.02876 7.013685,47.56056 C11.34084,52.0764 17.30862,54.8736 23.903985,54.8736 C25.905495,54.8736 27.841485,54.623406 29.687175,54.139419 C31.594395,53.639031 33.41961,52.904829 35.10948,51.953319 L35.860062,51.530862 L36.5491245,52.03125 L68.0323245,75 L79.9844745,58.61055 L79.9963395,58.659984 Z" id="Page-1"></path>
+        </g>
+    </g>
+</svg>

include/images/icon_create_users.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_create_users</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon_create_users" fill="#E98074">
+            <g id="Group">
+                <g id="Page-1">
+                    <path d="M32.0647619,40 C37.3251429,40 42.3733333,37.9092381 46.0933333,34.1889524 C49.8133333,30.4686667 51.904381,25.420381 51.904381,20.160381 C51.904381,14.8962857 49.813619,9.85180952 46.0933333,6.128 C42.3731429,2.40780952 37.3247619,0.316952381 32.0647619,0.316952381 C26.8006667,0.316952381 21.7561905,2.40771429 18.032381,6.128 C14.3121905,9.852 12.2213333,14.8965714 12.2213333,20.160381 C12.2213333,25.4207619 14.3120952,30.4689524 18.032381,34.1889524 C21.756381,37.9091429 26.8009524,40 32.0647619,40 Z M32.0647619,8.2552381 C36.8787619,8.2552381 41.2202857,11.1533333 43.0619048,15.6026667 C44.9034286,20.0520952 43.8878,25.1712381 40.4800952,28.5750476 C37.0760952,31.9827619 31.9570476,32.998381 27.5077143,31.1568571 C23.0582857,29.3153333 20.1602857,24.9738095 20.1602857,20.1597143 C20.1602857,13.582381 25.4877143,8.25495238 32.0650476,8.25495238 L32.0647619,8.2552381 Z" id="Fill-1"></path>
+                    <path d="M49.8028571,51.9047619 C49.8028571,50.8519048 49.3824667,49.8437143 48.638381,49.0997143 C47.8942952,48.3557143 46.8861905,47.9352381 45.8333333,47.9352381 L12.2209524,47.9352381 C5.64733333,47.9352381 0.316190476,53.266381 0.316190476,59.84 L0.316190476,67.7789524 C0.316190476,69.9701905 2.09447619,71.7447619 4.28571429,71.7447619 C6.47695238,71.7447619 8.2552381,69.9701905 8.2552381,67.7789524 L8.2552381,59.84 C8.2552381,57.6487619 10.0298095,55.8741905 12.2210476,55.8741905 L45.8334286,55.8741905 C46.8862857,55.8741905 47.8944762,55.4538 48.6384762,54.7097143 C49.3824762,53.9656286 49.8029524,52.9575238 49.8029524,51.9046667 L49.8028571,51.9047619 Z" id="Fill-2"></path>
+                    <path d="M75.7142857,59.84 L67.7790476,59.84 L67.7790476,51.9047619 C67.7790476,49.7135238 66.0007619,47.9352381 63.8095238,47.9352381 C61.6182857,47.9352381 59.84,49.7135238 59.84,51.9047619 L59.84,59.84 L51.9047619,59.84 C49.7135238,59.84 47.9352381,61.6182857 47.9352381,63.8095238 C47.9352381,66.0007619 49.7135238,67.7790476 51.9047619,67.7790476 L59.84,67.7790476 L59.84,75.7142857 C59.84,77.9055238 61.6182857,79.6838105 63.8095238,79.6838105 C66.0007619,79.6838105 67.7790476,77.9055238 67.7790476,75.7142857 L67.7790476,67.7790476 L75.7142857,67.7790476 C77.9055238,67.7790476 79.6838095,66.0007619 79.6838095,63.8095238 C79.6838095,61.6182857 77.9055238,59.84 75.7142857,59.84 Z" id="Fill-3"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

include/images/icon_documentation.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_documentation</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon_documentation" fill="#E98074">
+            <g id="Page-1" transform="translate(10.000000, 0.000000)">
+                <polygon id="Fill-1" points="12.7738614 0.99009901 0.396039604 12.3746535 12.7738614 12.3746535"></polygon>
+                <path d="M17.7211881,0.00158415842 L17.7211881,17.3314851 L0.391287129,17.3314851 L0.391287129,79.2110891 L59.7972277,79.2110891 L59.8018733,0.00158415842 L17.7211881,0.00158415842 Z M47.4241584,64.3548515 L12.7738614,64.3548515 L12.7738614,59.4027723 L47.4289109,59.4027723 L47.4241584,64.3548515 Z M47.4241584,51.9817822 L12.7738614,51.9817822 L12.7738614,47.029703 L47.4289109,47.029703 L47.4241584,51.9817822 Z M47.4241584,39.6039604 L12.7738614,39.6039604 L12.7738614,34.6518812 L47.4289109,34.6518812 L47.4241584,39.6039604 Z" id="Fill-2"></path>
+            </g>
+        </g>
+    </g>
+</svg>

include/images/icon_forums.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="50px" height="50px" viewBox="0 0 50 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_forums</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon_forums" fill="#E98074">
+            <path d="M19.4455289,79.7322961 L42.6379289,61.9914926 L55.2738489,61.9914926 C60.8838489,61.9914926 66.2632889,59.7640366 70.2268089,55.7970846 C74.1936729,51.8302206 76.4246489,46.4506046 76.4246489,40.8441246 L76.4246489,21.9584446 C76.4246489,16.3484446 74.1936729,10.9690046 70.2268089,7.00196456 C66.2633769,3.03510056 60.8838489,0.807556558 55.2738489,0.807556558 L24.1508889,0.807556558 C18.5408889,0.807556558 13.1614489,3.03501256 9.19440888,7.00196456 C5.23097688,10.9688286 3,16.3484446 3,21.9584446 L3,40.8441246 C3,46.4506926 5.23097688,51.8300446 9.19440888,55.7970846 C13.1612729,59.7639486 18.5408889,61.9914926 24.1508889,61.9914926 L17.4443209,78.1922961 C17.2174481,78.7388553 17.3858801,79.3678872 17.8533801,79.7288632 C18.3243209,80.089804 18.9739721,80.089804 19.4449481,79.7323005 L19.4455289,79.7322961 Z" id="Page-1"></path>
+        </g>
+    </g>
+</svg>

include/images/icon_import_data.svg

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_import_data</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon_import_data" fill="#E98074">
+            <g id="Page-1">
+                <path d="M74.9913514,10.1264865 L50.4854054,34.5945946 L56.9718919,41.043027 C57.9938486,42.0818811 58.2937297,43.6316757 57.7278054,44.9745946 C57.1745946,46.3175135 55.8696432,47.2001081 54.4127784,47.2085405 L36.3976432,47.2085405 C35.9246703,47.2000973 35.4601405,47.1029622 35.0252108,46.9171568 C34.1468324,46.5539784 33.4458595,45.8529622 33.0826162,44.9745622 C32.8968108,44.5396 32.7996757,44.0750703 32.7912324,43.6021297 L32.7912324,25.5869946 C32.7996757,24.1300216 33.6822811,22.8251568 35.0251784,22.2719676 C36.3680973,21.7060865 37.9179351,22.0059243 38.9567459,23.0278811 L45.4051784,29.5143676 L69.8732865,5.00842162 C71.2879892,3.59793514 73.5768541,3.59793514 74.9915568,5.00842162 C76.4020432,6.42312432 76.4020432,8.71198919 74.9915568,10.1266919 L74.9913514,10.1264865 Z" id="Fill-1"></path>
+                <path d="M67.027027,79.6410811 L12.972973,79.6410811 C6.0092973,79.6410811 0.358918919,73.9907027 0.358918919,67.027027 L0.358918919,12.972973 C0.358918919,6.0092973 6.0092973,0.358918919 12.972973,0.358918919 L36.3978378,0.358918919 C38.3868108,0.358918919 40,1.97210811 40,3.9652973 C40,5.95427027 38.3868108,7.56745946 36.3978378,7.56745946 L12.972973,7.56745946 C9.98735135,7.56745946 7.56756757,9.98724324 7.56756757,12.9728649 L7.56756757,67.0269189 C7.56756757,70.0125405 9.98735135,72.4323243 12.972973,72.4323243 L67.027027,72.4323243 C70.0126486,72.4323243 72.4324324,70.0125405 72.4324324,67.0269189 L72.4324324,43.6020541 C72.4324324,41.6130811 74.0456216,39.9998919 76.0345946,39.9998919 C78.0278919,39.9998919 79.640973,41.6130811 79.640973,43.6020541 L79.640973,67.0269189 C79.640973,70.3715676 78.3107027,73.580973 75.9458378,75.9458378 C73.580973,78.3107027 70.3715676,79.640973 67.0269189,79.640973 L67.027027,79.6410811 Z" id="Fill-2"></path>
+            </g>
+        </g>
+    </g>
+</svg>

include/images/icon_start_using.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_start_using</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon_start_using" fill="#E98074">
+            <path d="M47.4388625,21.99786 C47.4388625,19.273342 45.2319425,17.058048 42.4701125,17.058048 C39.7290585,17.058048 37.5013625,19.294012 37.5013625,21.99786 L37.5013625,36.93326 L34.1888625,36.93326 L34.1888625,5.49366 C34.1888625,2.73183 31.9819425,0.495972 29.2201125,0.495972 C26.4790585,0.495972 24.2513625,2.702892 24.2513625,5.49366 L24.2513625,39.58326 C17.4317465,32.29576 8.45524253,24.28322 4.78234253,27.98156 C1.18003853,31.60464 10.4674405,41.58348 23.4150225,63.38344 C29.2532905,73.20911 36.6438225,80 49.0956425,80 C62.8131025,80 73.9399225,68.87424 73.9399225,55.15572 L73.9399225,28.67692 C73.9399225,25.923358 71.7330025,23.6875 68.9711725,23.6875 C66.2301185,23.6875 64.0024225,25.923464 64.0024225,28.67692 L64.0024225,36.9375 L60.6899225,36.9375 L60.6899225,25.3146 C60.6899225,22.581814 58.4830025,20.374788 55.7211725,20.374788 C52.9801185,20.374788 50.7524225,22.569306 50.7524225,25.3146 L50.7524225,33.624788 L47.4399225,33.624788 L47.4388625,21.99786 Z" id="Page-1"></path>
+        </g>
+    </g>
+</svg>

include/images/icon_view_and_manage.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_view_and_manage</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon_view_and_manage" fill="#E98074">
+            <g id="Page-1">
+                <path d="M77.0911325,31.6916605 L68.7888168,31.6916605 C68.1720371,29.4965913 67.2952575,27.4165387 66.1705525,25.4149699 L72.078288,19.5313175 C73.1788135,18.4307797 73.1788135,16.6589966 72.078288,15.5343719 L64.3685415,7.84884315 C63.268016,6.7483054 61.472104,6.7483054 60.3716404,7.84884315 L54.4940907,13.7324956 C52.4985813,12.6319579 50.4125148,11.7612677 48.21747,11.1142021 L48.21747,2.81179392 C48.21747,1.23360415 46.9778734,0 45.4057074,0 L34.5153131,0 C32.9673266,0 31.7035505,1.2396104 31.7035505,2.81179392 L31.7035505,11.1142021 C29.5388462,11.7612213 27.4284763,12.6319733 25.4571156,13.7324956 L19.5493801,7.84884315 C18.4488546,6.7483054 16.6770912,6.7483054 15.5826648,7.84884315 L7.8548068,15.5343719 C6.75428131,16.6590895 6.75428131,18.4308416 7.8548068,19.5313175 L13.7383937,25.4149699 C12.6378682,27.4105015 11.7671878,29.4965913 11.1503152,31.6916605 L2.81781058,31.6916605 C1.26982412,31.6916605 0.00604798308,32.9554662 0.00604798308,34.5034544 L0,45.4000072 C0,46.9480109 1.26379162,48.2118012 2.81176259,48.2118012 L11.1442625,48.2118012 C11.7610423,50.3765295 12.6378218,52.486923 13.7323411,54.4884918 L7.85479132,60.3721442 C6.75426583,61.472682 6.75426583,63.2444651 7.85479132,64.3389037 L15.5645378,72.0487361 C16.6650633,73.1492739 18.4368267,73.1492739 19.5312531,72.0487361 L25.4389886,66.1650837 C27.4101946,67.2656214 29.5205645,68.1363116 31.6854236,68.7833771 L31.6854236,77.0857853 C31.6854236,78.633789 32.9492152,79.8975793 34.4971862,79.8975793 L45.3875805,79.8975793 C46.9657527,79.8975793 48.1993431,78.6337736 48.1993431,77.0857853 L48.1993431,68.7833771 C50.3943879,68.136358 52.4744173,67.2656059 54.4759637,66.1650837 L60.3595507,72.0487361 C61.4600761,73.1492739 63.2559881,73.1492739 64.3564517,72.0487361 L72.0661982,64.3389037 C73.1667237,63.2383659 73.1667237,61.4665828 72.0661982,60.3721442 L66.1584627,54.4884918 C67.2831677,52.4929602 68.153972,50.3766843 68.776727,48.2118012 L77.0790427,48.2118012 C78.6572149,48.2118012 79.8908053,46.9479955 79.8908053,45.4000072 L79.8908053,34.5094916 C79.9089477,32.9614879 78.6693512,31.6916605 77.091117,31.6916605 L77.0911325,31.6916605 Z M39.9704174,55.9519745 C31.1300215,55.9519745 23.9828133,48.7743457 23.9828133,39.9394242 C23.9828133,31.129116 31.1301763,23.951642 39.9704174,23.951642 C48.8106584,23.951642 55.9580215,31.1292708 55.9580215,39.9394242 C55.9580215,48.7738813 48.8046213,55.9519745 39.9704174,55.9519745 Z" id="Fill-1"></path>
+            </g>
+        </g>
+    </g>
+</svg>

include/images/icon_visit_site.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="80px" height="80px" viewBox="0 0 80 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_visit_site</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon_visit_site" fill="#E98074">
+            <path d="M40.37,-0.1006675 C24.09279,-0.1006675 11,13.5973225 11,30.1593325 C11,36.0382275 12.59577,41.7328925 15.728125,46.7079925 L15.728125,46.735805 C19.166462,52.082747 24.092701,56.031855 26.130445,60.253125 L26.1026325,72.935625 C26.0922017,76.6311711 28.6509695,80 32.3604005,80 L48.3804005,80 C52.1386035,80 54.6104005,76.537366 54.6104005,72.88 L54.6104005,60.25268 C56.6476995,56.032122 61.5739385,52.082747 65.0127205,46.73536 L65.0127205,46.7075475 C68.1450755,41.7326255 69.7408455,36.0382275 69.7408455,30.1588875 C69.7408455,13.5968775 56.6480555,-0.1011125 40.3708455,-0.1011125 L40.37,-0.1006675 Z M40.37,5.2393325 C53.65414,5.2393325 64.4,16.3919225 64.4,30.1593325 C64.4,35.0786295 63.085826,39.7375125 60.50625,43.8430825 C60.5027701,43.8500334 60.5097299,43.8639441 60.50625,43.870895 C57.968326,47.806386 53.16375,51.536732 50.27125,56.859555 L43.04,56.859555 L43.04,44.371965 C43.6101518,44.5214583 44.204654,44.6222775 44.82,44.6222775 C48.720692,44.6222775 51.94,41.4029695 51.94,37.5022775 C51.94,33.6015855 48.720692,30.3822775 44.82,30.3822775 C43.140837,30.3822775 41.59375,30.9767708 40.37,31.9675455 C39.14625,30.9767085 37.599163,30.3822775 35.92,30.3822775 C32.019308,30.3822775 28.8,33.6015855 28.8,37.5022775 C28.8,41.4029695 32.019308,44.6222775 35.92,44.6222775 C36.5353549,44.6222775 37.129866,44.5214583 37.7,44.371965 L37.7,56.859555 L30.46875,56.859555 C27.57625,51.53691 22.771674,47.806475 20.23375,43.870895 C20.2302701,43.8639441 20.2372299,43.8500334 20.23375,43.8430825 C17.654174,39.7372455 16.34,35.0786295 16.34,30.1593325 C16.34,16.3919225 27.08586,5.2393325 40.37,5.2393325 Z M35.92,35.7218325 C36.935134,35.7218325 37.7,36.4866807 37.7,37.5018325 C37.7,38.5169843 36.9351518,39.2818325 35.92,39.2818325 C34.9048482,39.2818325 34.14,38.5169843 34.14,37.5018325 C34.14,36.4866807 34.9048482,35.7218325 35.92,35.7218325 Z M44.82,35.7218325 C45.835134,35.7218325 46.6,36.4866807 46.6,37.5018325 C46.6,38.5169843 45.8351518,39.2818325 44.82,39.2818325 C43.8048482,39.2818325 43.04,38.5169843 43.04,37.5018325 C43.04,36.4866807 43.8048482,35.7218325 44.82,35.7218325 Z M31.47,62.1993325 L49.27,62.1993325 L49.27,72.8793325 C49.27,74.1517655 48.4391049,74.6593325 48.38,74.6593325 L32.36,74.6593325 C32.2522299,74.6593325 31.438672,74.1691383 31.442232,72.9349575 L31.47,62.1993325 Z" id="Page-1"></path>
+        </g>
+    </g>
+</svg>

include/images/initial_page_bg.svg

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="2400px" height="1308px" viewBox="0 0 2400 1308" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 43.2 (39069) - http://www.bohemiancoding.com/sketch -->
+    <title>bg_initial_page</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <polygon id="path-1" points="0.370345924 0.570984799 382.049858 0.570984799 382.049858 79.4984727 382.049858 158.425961 0.370345924 158.425961 0.370345924 0.570984799"></polygon>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="bg_initial_page">
+            <g id="Group" transform="translate(-189.000000, -24.000000)">
+                <rect id="Rectangle-2" fill="#FFD797" x="94" y="0" width="2550.62097" height="386.922379"></rect>
+                <g id="Page-1" transform="translate(0.000000, 333.508852)">
+                    <polygon id="Fill-1" fill="#FFD797" points="182.926642 972.058566 2594.92945 972.058566 2594.92945 24.2906798 182.926642 24.2906798"></polygon>
+                    <polygon id="Fill-2" fill="#778490" points="2411.01048 642.047076 2658.4651 480.69998 2795.56833 747.382485"></polygon>
+                    <g id="Group-48" transform="translate(0.000000, 0.267519)">
+                        <path d="M1937.80938,480.450436 C1937.80938,537.363325 1891.67247,583.499398 1834.76042,583.499398 C1777.84837,583.499398 1731.71229,537.363325 1731.71229,480.450436 C1731.71229,423.537547 1777.84837,377.401473 1834.76042,377.401473 C1891.67247,377.401473 1937.80938,423.537547 1937.80938,480.450436" id="Fill-3" fill="#F8EFA3"></path>
+                        <polygon id="Fill-5" fill="#E4BCA8" points="2752.44602 718.865849 2023.17554 449.352664 1784.29071 521.913713 1458.54012 392.035989 1210.64745 464.597039 936.587285 394.474588 618.29461 577.402066 971.944035 806.060996 2748.7877 892.037262"></polygon>
+                        <path d="M121.719747,659.541197 C121.17635,654.975827 124.185097,649.747512 128.406038,647.924206 L508.180317,483.824178 C512.401257,482.000037 519.476285,481.527699 523.902045,482.774168 L1144.39532,657.510565 C1148.82108,658.757034 1155.96048,658.444371 1160.26001,656.815853 L1529.70389,516.907021 C1534.00425,515.278502 1541.0124,515.351234 1545.27681,517.068368 L2143.46991,757.87431 C2147.73516,759.591444 2148.68485,763.772257 2145.5808,767.163054 L1972.22547,956.601264 C1969.12142,959.993733 1962.82052,962.707374 1958.22338,962.632134 L162.627506,933.285355 C158.030368,933.210115 153.823639,929.413024 153.281078,924.847654 L121.719747,659.541197 Z" id="Fill-7" fill="#778490"></path>
+                        <path d="M93.7710863,821.018123 C94.5142861,816.48034 98.7920742,811.940886 103.277189,810.929331 L1222.33634,558.509743 C1226.82145,557.498188 1233.97255,558.095925 1238.22777,559.838975 L1848.07548,809.600099 C1852.3307,811.343149 1859.2076,811.150034 1863.35915,809.172069 L2129.87864,682.179365 C2134.03019,680.202236 2141.04252,679.619548 2145.46242,680.88608 L2746.84819,853.149603 C2751.26894,854.4153 2754.88545,859.213077 2754.88545,863.811051 L2754.88545,993.43296 C2754.88545,998.030934 2751.12347,1001.77118 2746.5255,1001.74359 L75.1451107,985.796143 C70.5471365,985.767719 67.3929262,982.033328 68.136126,977.495546 L93.7710863,821.018123 Z" id="Fill-9" fill="#8EAE7B"></path>
+                        <path d="M181.882902,914.878159 C182.487327,899.501697 183.154451,884.126071 184.084914,868.765494 C514.210267,841.282984 963.195762,843.986592 1455.55269,883.417147 C1842.8108,914.417526 2199.96305,963.572378 2491.25057,1021.91482 L176.221542,1021.91482 C179.425076,986.326499 180.48261,950.574323 181.882902,914.878159" id="Fill-11" fill="#A0C488"></path>
+                        <path d="M2294.80061,988.141277 C2295.64831,1000.19633 2298.72143,1011.5667 2303.57606,1021.91214 L2480.35145,1009.48758 C2483.71131,998.565303 2485.16427,986.876416 2484.31657,974.821364 C2480.68417,923.125922 2436.30118,884.028093 2384.79718,886.643086 C2384.16266,886.634726 2383.53065,886.679034 2382.89947,886.724178 C2369.05372,887.69644 2356.05148,891.626454 2344.58414,897.828703 C2312.66834,914.937348 2292.09617,949.659577 2294.80061,988.141277" id="Fill-13" fill="#759067"></path>
+                        <path d="M1688.2917,1014.89798 C1689.72376,1035.27035 1700.63099,1052.70336 1716.33851,1063.18507 L1793.61958,1057.7536 C1807.70694,1045.17773 1816.06857,1026.3904 1814.63651,1006.01803 C1812.99712,982.696272 1798.98667,963.260217 1779.47622,953.627879 C1769.72099,948.81171 1758.65826,946.468416 1747.02455,947.286019 C1716.912,949.401923 1693.27758,972.171927 1688.88693,1000.78387 C1688.14874,1005.33252 1687.95229,1010.05422 1688.2917,1014.89798" id="Fill-15" fill="#759067"></path>
+                        <path d="M1743.89517,1053.31213 C1744.08076,1055.94384 1744.31818,1058.57305 1744.71361,1061.19055 L2007.40424,1042.72759 C2007.42932,1040.08083 2007.29723,1037.44494 2007.11164,1034.81239 C2005.06596,1005.70052 1993.69642,979.413486 1976.10875,958.747682 C1949.91702,927.840935 1909.79008,909.394699 1866.25395,912.454441 C1831.82599,914.873812 1801.37904,930.292909 1779.4768,953.628047 C1755.10503,979.465318 1741.20577,1015.0411 1743.89517,1053.31213" id="Fill-19" fill="#759067"></path>
+                        <path d="M2198.56234,973.744017 C2200.03202,994.643063 2208.53827,1013.30164 2221.60989,1027.67324 L2362.27279,1017.78676 C2373.20594,1001.72896 2379.01861,982.063006 2377.55061,961.163959 C2375.73733,935.369324 2363.20827,912.91867 2344.58397,897.828118 C2327.52632,883.94976 2305.45604,876.295387 2281.76644,877.96069 C2246.60114,880.431892 2217.64978,902.834894 2205.08728,933.343707 C2199.92585,945.715602 2197.55664,959.425089 2198.56234,973.744017" id="Fill-21" fill="#759067"></path>
+                        <path d="M1964.07217,1024.61157 C1964.57628,1031.77104 1965.65053,1038.78504 1967.18458,1045.55493 L2232.40159,1026.9139 C2232.97341,1019.99604 2233.05701,1012.90179 2232.55374,1005.74232 C2230.63346,978.420324 2220.63412,953.570363 2205.08711,933.343456 C2178.58105,898.703155 2135.67777,877.646941 2088.87791,880.936582 C2038.18232,884.498758 1996.04314,915.711479 1976.108,958.747682 C1966.87694,978.706234 1962.4261,1001.18615 1964.07217,1024.61157" id="Fill-23" fill="#759067"></path>
+                        <path d="M2603.89759,850.135923 C2620.55563,838.754683 2640.36705,831.595219 2661.95078,830.078724 C2667.09215,829.716738 2672.17667,829.695838 2677.18847,829.982584 C2673.0553,885.571257 2669.0233,941.176649 2663.36612,996.624874 L2565.05474,1003.53438 C2557.66789,989.504702 2553.01223,973.696867 2551.82846,956.850725 C2548.74615,912.998591 2569.90017,872.998723 2603.89759,850.135923" id="Fill-25" fill="#759067"></path>
+                        <path d="M2376.25548,942.738706 C2378.17911,970.113373 2388.49445,994.940761 2404.59823,1014.81153 L2616.22459,999.938341 C2629.39068,978.009348 2636.13131,951.983978 2634.20769,924.608476 C2632.20632,896.129459 2621.08674,870.40672 2603.89784,850.135505 C2578.22108,819.774663 2538.86075,801.697101 2496.16731,804.697488 C2444.6817,808.316512 2402.42297,841.599993 2384.79768,886.642585 C2377.97345,903.946016 2374.86773,922.997513 2376.25548,942.738706" id="Fill-27" fill="#759067"></path>
+                        <path d="M2750.49723,207.90334 C2750.49723,270.361386 2598.60106,320.993442 2411.22692,320.993442 C2223.85279,320.993442 2071.95662,270.361386 2071.95662,207.90334 C2071.95662,145.445294 2223.85279,94.8132381 2411.22692,94.8132381 C2598.60106,94.8132381 2750.49723,145.445294 2750.49723,207.90334" id="Fill-29" fill="#A9839A"></path>
+                        <g id="Group-33" transform="translate(2486.250062, 0.000000)">
+                            <mask id="mask-2" fill="white">
+                                <use xlink:href="#path-1"></use>
+                            </mask>
+                            <g id="Clip-32"></g>
+                            <path d="M382.049858,79.4988071 C382.049858,123.089275 296.607793,158.425961 191.21052,158.425961 C85.8115749,158.425961 0.370345924,123.089275 0.370345924,79.4988071 C0.370345924,35.9083395 85.8115749,0.5708176 191.21052,0.5708176 C296.607793,0.5708176 382.049858,35.9083395 382.049858,79.4988071" id="Fill-31" fill="#A9839A" mask="url(#mask-2)"></path>
+                        </g>
+                        <path d="M2179.27409,186.547087 C2179.27409,188.815143 2179.10354,191.04725 2178.77333,193.254278 L1995.62682,193.254278 C1995.29827,191.04725 1995.12773,188.815143 1995.12773,186.547087 C1995.12773,180.38831 1996.38256,174.437695 1998.71248,168.803087 C2009.77353,142.071301 2045.2005,122.523222 2087.20007,122.523222 C2138.05367,122.523222 2179.27409,151.193682 2179.27409,186.547087" id="Fill-34" fill="#FFFFFF"></path>
+                        <path d="M2024.81008,193.254612 L1917.88293,193.254612 C1922.32207,176.620813 1944.56623,163.986416 1971.3465,163.986416 C1981.33414,163.986416 1990.68809,165.742006 1998.71197,168.803421 C2012.23671,173.961512 2022.02956,182.815539 2024.81008,193.254612" id="Fill-36" fill="#FFFFFF"></path>
+                        <path d="M478.049708,179.230038 C478.049708,180.657082 478.00122,182.084126 477.891705,183.49863 L122.109655,183.49863 C122.000976,182.084126 121.951652,180.657082 121.951652,179.230038 C121.951652,122.315477 201.671329,76.1810761 300.000262,76.1810761 C361.269523,76.1810761 415.318292,94.0956197 447.354468,121.364115 C466.732839,137.864154 478.049708,157.778399 478.049708,179.230038" id="Fill-38" fill="#A9839A"></path>
+                        <path d="M581.70903,179.230038 C581.70903,180.669622 581.622923,182.09583 581.46492,183.49863 L381.95213,183.49863 C381.793291,182.09583 381.708856,180.669622 381.708856,179.230038 C381.708856,152.657091 409.050082,130.010814 447.354552,121.364115 C458.06198,118.961464 469.634663,117.644772 481.708943,117.644772 C536.939809,117.644772 581.70903,145.217569 581.70903,179.230038" id="Fill-40" fill="#A9839A"></path>
+                        <path d="M315.854412,179.230038 C315.854412,202.466528 245.148436,221.303175 157.927373,221.303175 C70.70631,221.303175 0.000334398125,202.466528 0.000334398125,179.230038 C0.000334398125,155.993549 70.70631,137.156902 157.927373,137.156902 C245.148436,137.156902 315.854412,155.993549 315.854412,179.230038" id="Fill-42" fill="#FFFFFF"></path>
+                        <path d="M1739.02867,247.63268 C1739.02867,255.455924 1689.98584,261.797784 1629.48737,261.797784 C1568.98973,261.797784 1519.94607,255.455924 1519.94607,247.63268 C1519.94607,239.810272 1568.98973,233.468411 1629.48737,233.468411 C1689.98584,233.468411 1739.02867,239.810272 1739.02867,247.63268" id="Fill-44" fill="#FFFFFF"></path>
+                        <path d="M1655.92873,217.414375 C1655.92873,229.410072 1628.87007,239.133533 1595.49129,239.133533 C1562.11334,239.133533 1535.05468,229.410072 1535.05468,217.414375 C1535.05468,205.418678 1562.11334,195.695217 1595.49129,195.695217 C1628.87007,195.695217 1655.92873,205.418678 1655.92873,217.414375" id="Fill-46" fill="#FFFFFF"></path>
+                    </g>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

include/images/sa_logo.svg

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 595.3 419.5" style="enable-background:new 0 0 595.3 419.5;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#474154;}
+	.st1{fill:#E3A025;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M75.5,172.9c-0.4,0.7-0.9,1.3-1.4,1.6c-0.5,0.3-1.1,0.5-1.8,0.5c-0.7,0-1.5-0.3-2.4-0.8
+			c-0.9-0.5-1.9-1.2-3.1-1.8c-1.2-0.7-2.6-1.3-4.2-1.8c-1.6-0.6-3.5-0.8-5.7-0.8c-2,0-3.7,0.2-5.2,0.7c-1.5,0.5-2.7,1.1-3.7,2
+			c-1,0.8-1.8,1.9-2.3,3c-0.5,1.2-0.7,2.5-0.7,3.9c0,1.8,0.5,3.3,1.5,4.5c1,1.2,2.3,2.2,4,3.1c1.7,0.8,3.6,1.6,5.7,2.3
+			c2.1,0.7,4.3,1.4,6.5,2.1c2.2,0.8,4.4,1.6,6.5,2.7c2.1,1,4,2.3,5.7,3.8c1.7,1.5,3,3.4,4,5.6c1,2.2,1.5,4.9,1.5,8.1
+			c0,3.5-0.6,6.7-1.8,9.7c-1.2,3-2.9,5.7-5.2,7.9c-2.3,2.2-5.1,4-8.3,5.3c-3.3,1.3-7.1,1.9-11.3,1.9c-2.4,0-4.8-0.2-7.2-0.7
+			c-2.4-0.5-4.6-1.2-6.8-2c-2.2-0.9-4.2-1.9-6.1-3.2c-1.9-1.2-3.6-2.6-5.1-4.1l4.2-6.8c0.4-0.5,0.8-0.9,1.4-1.2
+			c0.6-0.3,1.2-0.5,1.8-0.5c0.9,0,1.8,0.4,2.9,1.1c1,0.7,2.2,1.5,3.7,2.4c1.4,0.9,3.1,1.7,5,2.4c1.9,0.7,4.2,1.1,6.8,1.1
+			c4.1,0,7.2-1,9.4-2.9c2.2-1.9,3.3-4.7,3.3-8.3c0-2-0.5-3.7-1.5-4.9c-1-1.3-2.3-2.3-4-3.2c-1.7-0.9-3.6-1.6-5.7-2.2
+			c-2.1-0.6-4.3-1.3-6.5-2c-2.2-0.7-4.3-1.6-6.5-2.5c-2.1-1-4-2.3-5.7-3.9c-1.7-1.6-3-3.6-4-6c-1-2.4-1.5-5.3-1.5-8.8
+			c0-2.8,0.6-5.5,1.7-8.2c1.1-2.7,2.7-5,4.9-7.1c2.1-2.1,4.7-3.7,7.8-4.9c3.1-1.2,6.7-1.9,10.7-1.9c4.5,0,8.7,0.7,12.5,2.1
+			c3.8,1.4,7.1,3.4,9.8,5.9L75.5,172.9z"/>
+		<path class="st0" d="M88.8,188.8c6.3-5.7,13.8-8.6,22.6-8.6c3.2,0,6,0.5,8.5,1.6c2.5,1,4.6,2.5,6.4,4.4c1.7,1.9,3,4.1,3.9,6.7
+			c0.9,2.6,1.4,5.4,1.4,8.5v34.4h-5.9c-1.2,0-2.2-0.2-2.9-0.6c-0.7-0.4-1.2-1.1-1.6-2.3l-1.2-3.9c-1.4,1.2-2.7,2.3-4,3.3
+			c-1.3,0.9-2.7,1.7-4.1,2.4c-1.4,0.6-2.9,1.1-4.5,1.5c-1.6,0.3-3.4,0.5-5.3,0.5c-2.3,0-4.4-0.3-6.4-0.9c-1.9-0.6-3.6-1.5-5-2.8
+			c-1.4-1.2-2.5-2.8-3.3-4.6c-0.8-1.8-1.2-4-1.2-6.4c0-1.4,0.2-2.7,0.7-4.1c0.5-1.4,1.2-2.7,2.3-3.9c1-1.2,2.4-2.4,4.1-3.5
+			c1.7-1.1,3.7-2,6.1-2.9c2.4-0.8,5.2-1.5,8.5-2c3.2-0.5,6.9-0.8,11-0.9v-3.2c0-3.6-0.8-6.3-2.3-8.1c-1.6-1.8-3.8-2.6-6.7-2.6
+			c-2.1,0-3.9,0.2-5.3,0.7c-1.4,0.5-2.6,1.1-3.7,1.7c-1.1,0.6-2,1.2-2.9,1.7c-0.9,0.5-1.8,0.7-2.9,0.7c-0.9,0-1.7-0.2-2.3-0.7
+			c-0.6-0.5-1.1-1-1.5-1.7L88.8,188.8z M118.8,212.4c-3.8,0.2-7,0.5-9.5,1c-2.6,0.5-4.6,1.1-6.2,1.8c-1.6,0.7-2.7,1.6-3.3,2.6
+			c-0.7,1-1,2.1-1,3.2c0,2.3,0.7,3.9,2,4.9c1.4,1,3.1,1.5,5.3,1.5c2.7,0,5-0.5,7-1.5c2-1,3.9-2.4,5.8-4.4V212.4z"/>
+		<path class="st0" d="M157.1,156.8v78.8H144v-78.8H157.1z"/>
+		<path class="st0" d="M180.3,210.1c0.2,2.8,0.7,5.2,1.5,7.2c0.8,2,1.8,3.7,3.1,5c1.3,1.3,2.8,2.3,4.5,3c1.8,0.7,3.7,1,5.8,1
+			c2.1,0,3.9-0.2,5.5-0.7c1.5-0.5,2.9-1,4-1.6c1.1-0.6,2.2-1.2,3-1.6c0.9-0.5,1.7-0.7,2.5-0.7c1.1,0,1.9,0.4,2.4,1.2l3.8,4.8
+			c-1.5,1.7-3.1,3.1-4.9,4.3c-1.8,1.1-3.7,2.1-5.6,2.8c-2,0.7-4,1.2-6,1.5c-2,0.3-4,0.4-5.9,0.4c-3.8,0-7.3-0.6-10.5-1.9
+			c-3.3-1.3-6.1-3.1-8.5-5.6c-2.4-2.5-4.3-5.5-5.7-9.1c-1.4-3.6-2.1-7.8-2.1-12.6c0-3.7,0.6-7.2,1.8-10.5c1.2-3.3,2.9-6.1,5.2-8.5
+			c2.2-2.4,5-4.3,8.2-5.8c3.2-1.4,6.9-2.1,10.9-2.1c3.4,0,6.6,0.6,9.5,1.6c2.9,1.1,5.4,2.7,7.5,4.8c2.1,2.1,3.7,4.7,4.9,7.7
+			c1.2,3.1,1.8,6.5,1.8,10.5c0,2-0.2,3.3-0.6,4c-0.4,0.7-1.2,1-2.4,1H180.3z M205.3,202.2c0-1.7-0.2-3.3-0.7-4.8
+			c-0.5-1.5-1.2-2.8-2.1-3.9c-1-1.1-2.2-2-3.6-2.7c-1.5-0.7-3.2-1-5.1-1c-3.8,0-6.8,1.1-8.9,3.2c-2.2,2.2-3.6,5.2-4.2,9.2H205.3z"/>
+		<path class="st0" d="M260,191.8c-0.4,0.6-0.7,1-1.1,1.2c-0.4,0.2-0.9,0.3-1.5,0.3c-0.6,0-1.3-0.2-2-0.5c-0.7-0.4-1.6-0.7-2.5-1.2
+			c-1-0.4-2-0.8-3.3-1.2c-1.2-0.4-2.7-0.5-4.3-0.5c-2.6,0-4.6,0.5-6.1,1.6c-1.5,1.1-2.2,2.5-2.2,4.3c0,1.2,0.4,2.1,1.1,2.9
+			c0.8,0.8,1.8,1.5,3,2.1c1.3,0.6,2.7,1.1,4.3,1.6c1.6,0.5,3.2,1,4.9,1.6c1.6,0.6,3.3,1.2,4.8,1.9c1.6,0.7,3,1.6,4.3,2.8
+			c1.3,1.1,2.3,2.5,3,4c0.8,1.6,1.1,3.4,1.1,5.6c0,2.6-0.5,5-1.4,7.2c-0.9,2.2-2.3,4.1-4.2,5.7c-1.8,1.6-4.1,2.9-6.8,3.8
+			c-2.7,0.9-5.8,1.4-9.4,1.4c-1.9,0-3.7-0.2-5.5-0.5c-1.8-0.3-3.5-0.8-5.1-1.4c-1.6-0.6-3.2-1.3-4.6-2.1c-1.4-0.8-2.6-1.7-3.7-2.7
+			l3-5c0.4-0.6,0.8-1.1,1.4-1.4c0.5-0.3,1.2-0.5,2-0.5c0.8,0,1.6,0.2,2.3,0.7c0.7,0.5,1.6,1,2.5,1.5c1,0.5,2.1,1,3.4,1.5
+			c1.3,0.5,2.9,0.7,4.9,0.7c1.6,0,2.9-0.2,4-0.6c1.1-0.4,2-0.9,2.8-1.5c0.7-0.6,1.3-1.3,1.6-2.1c0.3-0.8,0.5-1.6,0.5-2.5
+			c0-1.3-0.4-2.3-1.1-3.1c-0.8-0.8-1.8-1.5-3-2.1c-1.3-0.6-2.7-1.1-4.3-1.6c-1.6-0.5-3.3-1-4.9-1.6c-1.7-0.6-3.3-1.2-4.9-2
+			c-1.6-0.8-3-1.7-4.3-2.9c-1.3-1.2-2.3-2.6-3-4.3c-0.8-1.7-1.1-3.7-1.1-6.2c0-2.2,0.4-4.3,1.3-6.4c0.9-2,2.2-3.8,3.9-5.3
+			c1.7-1.5,3.9-2.7,6.4-3.6c2.6-0.9,5.5-1.4,8.9-1.4c3.7,0,7.2,0.6,10.2,1.9c3.1,1.2,5.6,2.9,7.7,4.9L260,191.8z"/>
+	</g>
+	<g>
+		<path class="st1" d="M340.5,235.6h-10.7c-1.2,0-2.1-0.3-2.8-0.9c-0.7-0.6-1.1-1.3-1.4-2.3l-3.2-16h-28.6l-7.1,16
+			c-0.4,0.8-1,1.5-1.9,2.2c-0.9,0.6-1.9,1-3,1h-10.8l37.1-76.7h14L340.5,235.6z M320.5,206.8l-5.2-26.2c-0.2-1.2-0.5-2.6-0.7-4.2
+			c-0.3-1.6-0.6-3.3-0.8-5.2c-0.7,1.9-1.4,3.6-2.1,5.2c-0.7,1.6-1.3,3-1.8,4.2l-11.6,26.2H320.5z"/>
+		<path class="st1" d="M398.5,183.2l-0.6,4.2c-0.2,1.7-1.1,2.8-2.6,3.4l-5.6,1.4c0.2,0.7,0.3,1.5,0.4,2.3c0.1,0.8,0.1,1.6,0.1,2.5
+			c0,1.6-0.2,3.1-0.5,4.4c-0.4,1.3-0.8,2.5-1.3,3.6c-0.5,1.1-1.1,2.1-1.7,3.1c-0.6,1-1.2,2-1.7,3c-0.5,1-0.9,2.1-1.3,3.2
+			c-0.4,1.1-0.5,2.3-0.5,3.7c0,1.5,0.3,2.8,0.9,4c0.6,1.2,1.2,2.5,2,3.7c0.7,1.3,1.4,2.6,2,4.1c0.6,1.5,0.9,3.1,0.9,5
+			c0,2.7-0.7,5.2-1.9,7.7c-1.2,2.4-2.9,4.5-5.2,6.4c-2.2,1.8-5,3.3-8.2,4.3c-3.3,1.1-6.9,1.6-11,1.6c-3.3,0-6.3-0.3-9-1
+			c-2.7-0.7-5-1.7-6.8-2.9c-1.9-1.2-3.3-2.7-4.3-4.4c-1-1.7-1.5-3.5-1.5-5.5c0-2.5,0.5-4.6,1.6-6.5c1.1-1.8,2.5-3.4,4.2-4.6
+			c1.8-1.3,3.8-2.3,6.1-3c2.3-0.7,4.7-1.3,7.2-1.6c2.5-0.3,4.9-0.4,7.4-0.4s4.8,0.3,6.9,0.6c-0.3-1.1-0.5-2.2-0.5-3.4
+			c0-2.1,0.6-4.3,1.7-6.8c-1.3,0.9-2.9,1.6-4.6,2.1c-1.7,0.5-3.8,0.7-6.2,0.7c-2,0-4-0.3-5.9-1c-1.9-0.7-3.5-1.7-4.9-3.1
+			c-1.4-1.4-2.5-3.1-3.4-5.2c-0.8-2.1-1.2-4.5-1.2-7.2c0-2.7,0.5-5.2,1.5-7.8c1-2.5,2.5-4.8,4.4-6.8c1.9-2,4.3-3.6,7.2-4.8
+			c2.9-1.2,6.2-1.8,10-1.8c2,0,3.9,0.2,5.8,0.7c1.8,0.5,3.5,1.2,5,2.1H398.5z M363.8,245.6c2,0,3.8-0.2,5.4-0.7
+			c1.6-0.5,3-1.2,4.2-2.1c1.2-0.9,2.1-1.9,2.7-3.1c0.6-1.2,1-2.5,1-3.9c0-0.5,0-1-0.1-1.5c-0.1-0.5-0.1-0.9-0.2-1.4
+			c-4.2-0.7-7.7-1-10.7-0.9c-3,0.1-5.4,0.5-7.3,1.1c-1.9,0.6-3.3,1.5-4.1,2.5c-0.9,1.1-1.3,2.2-1.3,3.4c0,2.1,0.9,3.7,2.6,4.8
+			C357.6,245.1,360.2,245.6,363.8,245.6z M368.5,210.1c1.6,0,3-0.4,4.2-1.1c1.2-0.7,2.2-1.7,3-2.9c0.8-1.2,1.5-2.6,1.9-4.1
+			c0.4-1.5,0.7-3,0.7-4.6c0-2.6-0.6-4.7-1.9-6.1c-1.3-1.4-3.1-2.1-5.4-2.1c-1.6,0-3,0.3-4.2,1c-1.2,0.7-2.2,1.6-3,2.8
+			c-0.8,1.2-1.4,2.5-1.8,4c-0.4,1.5-0.6,3-0.6,4.6c0,2.7,0.6,4.8,1.9,6.3C364.4,209.4,366.2,210.1,368.5,210.1z"/>
+		<path class="st1" d="M419.6,181.2l-6.5,54.4h-12.9l6.5-54.4H419.6z M422.9,165.4c0,1.1-0.2,2.2-0.7,3.2c-0.5,1-1.1,1.9-1.9,2.6
+			c-0.8,0.7-1.7,1.3-2.7,1.8c-1,0.4-2,0.7-3.1,0.7c-1,0-2-0.2-3-0.7c-1-0.4-1.8-1-2.5-1.8c-0.7-0.7-1.3-1.6-1.8-2.6
+			c-0.4-1-0.7-2-0.7-3.2c0-1.1,0.2-2.2,0.7-3.2c0.5-1,1.1-1.9,1.8-2.7c0.7-0.8,1.6-1.4,2.6-1.8c1-0.4,2-0.7,3-0.7
+			c1.1,0,2.1,0.2,3.1,0.7c1,0.4,1.9,1,2.6,1.8c0.8,0.7,1.4,1.6,1.8,2.7C422.7,163.1,422.9,164.2,422.9,165.4z"/>
+		<path class="st1" d="M425.8,235.6l9.5-78.8h12.9l-9.6,78.8H425.8z"/>
+		<path class="st1" d="M470.9,181.2l-6.5,54.4h-12.9l6.5-54.4H470.9z M474.2,165.4c0,1.1-0.2,2.2-0.7,3.2c-0.5,1-1.1,1.9-1.9,2.6
+			c-0.8,0.7-1.7,1.3-2.7,1.8c-1,0.4-2,0.7-3.1,0.7c-1,0-2-0.2-3-0.7c-1-0.4-1.8-1-2.5-1.8c-0.7-0.7-1.3-1.6-1.8-2.6
+			c-0.4-1-0.7-2-0.7-3.2c0-1.1,0.2-2.2,0.7-3.2c0.5-1,1.1-1.9,1.8-2.7c0.7-0.8,1.6-1.4,2.6-1.8c1-0.4,2-0.7,3-0.7
+			c1.1,0,2.1,0.2,3.1,0.7c1,0.4,1.9,1,2.6,1.8c0.8,0.7,1.4,1.6,1.8,2.7C474,163.1,474.2,164.2,474.2,165.4z"/>
+		<path class="st1" d="M481.5,224.5c0-0.2,0-0.5,0-0.9c0-0.3,0-0.8,0.1-1.5c0.1-0.7,0.1-1.5,0.3-2.6c0.1-1.1,0.3-2.5,0.5-4.2l3-24.4
+			h-5.1c-0.6,0-1.2-0.2-1.6-0.7c-0.4-0.5-0.5-1.1-0.4-2.1l0.6-5.2l8.3-1.4l4.3-14.8c0.2-0.7,0.6-1.3,1.1-1.6
+			c0.5-0.4,1.1-0.6,1.9-0.6h7l-2.1,17.1h13.1l-1.1,9.3h-13.2l-2.9,23.7c-0.2,1.4-0.3,2.6-0.4,3.4c-0.1,0.8-0.2,1.5-0.2,2
+			c-0.1,0.5-0.1,0.8-0.1,1c0,0.2,0,0.3,0,0.4c0,1.3,0.3,2.4,1,3.2c0.7,0.8,1.6,1.2,2.8,1.2c0.7,0,1.4-0.1,1.9-0.3
+			c0.5-0.2,1-0.4,1.4-0.6c0.4-0.2,0.7-0.4,1.1-0.6c0.3-0.2,0.6-0.3,0.9-0.3c0.4,0,0.7,0.1,0.9,0.3c0.2,0.2,0.4,0.5,0.6,0.9l2.8,6.4
+			c-1.9,1.6-4.1,2.8-6.4,3.6c-2.4,0.8-4.7,1.2-7.2,1.2c-3.9,0-6.9-1-9.1-3.1C482.8,231.3,481.6,228.3,481.5,224.5z"/>
+		<path class="st1" d="M568.3,181.2l-35.9,69.5c-0.5,0.9-1.1,1.6-1.7,2c-0.7,0.4-1.5,0.7-2.5,0.7h-9.7l12.1-21.9l-13.7-50.2h11
+			c1,0,1.7,0.2,2.1,0.7c0.5,0.5,0.8,1.1,1,1.7l6.7,28.2c0.4,1.8,0.6,3.6,0.8,5.4c0.4-0.9,0.8-1.8,1.2-2.7c0.4-0.9,0.8-1.8,1.2-2.7
+			l13.4-28.2c0.4-0.7,0.9-1.3,1.5-1.7c0.7-0.4,1.4-0.7,2.1-0.7H568.3z"/>
+	</g>
+</g>
+</svg>

include/language/en_us.lang.php

@@ -930,6 +930,9 @@ $app_list_strings = array(
     'custom_fields_merge_dup_dom' => array(
         0 => 'Disabled',
         1 => 'Enabled',
+        2 => 'Filter',
+        3 => 'Default selected filter',
+        4 => 'Only filter',
     ),
 
     'projects_priority_options' => array(

include/portability/action_name_map.php

@@ -43,6 +43,7 @@ $action_name_map = [
     'ComposeView' => 'compose',
     'SetTimezone' => 'set-timezone',
     'WizardHome' => 'wizard-home',
+    'Wizard' => 'wizard',
     'WizardEmailSetup' => 'wizard-email-setup',
     'CampaignDiagnostic' => 'diagnostic',
     'WebToLeadCreation' => 'web-to-lead',

include/utils/file_utils.php

@@ -116,7 +116,7 @@ function remove_file_extension($filename)
 
 function write_array_to_file($the_name, $the_array, $the_file, $mode="w", $header='')
 {
-    if (!empty($header) && ($mode != 'a' || !file_exists($the_file))) {
+    if (!empty($header) && ($mode !== 'a' || $mode !== 'ab' || !file_exists($the_file))) {
         $the_string = $header;
     } else {
         $the_string =   "<?php\n" .
@@ -129,6 +129,27 @@ function write_array_to_file($the_name, $the_array, $the_file, $mode="w", $heade
     return sugar_file_put_contents($the_file, $the_string, LOCK_EX) !== false;
 }
 
+function write_override_label_to_file($the_name, $the_array, $the_file, $mode = 'w', $header = '')
+{
+    if (!empty($header) && ($mode !== 'a' || $mode !== 'ab' || !file_exists($the_file))) {
+        $the_string = $header;
+    } else {
+        $the_string = "<?php\n" .
+            '// created: ' . date('Y-m-d H:i:s') . "\n";
+    }
+
+    foreach ($the_array as $labelName => $labelValue) {
+        $the_string .= '$' . "{$the_name}['{$labelName}'] = '{$labelValue}';\n";
+    }
+
+    $result = sugar_file_put_contents($the_file, $the_string, LOCK_EX) !== false;
+
+    if (function_exists('opcache_invalidate')) {
+        opcache_invalidate($the_file, true);
+    }
+    return $result;
+}
+
 function write_encoded_file($soap_result, $write_to_dir, $write_to_file="")
 {
     // this function dies when encountering an error -- use with caution!

lib/Search/UI/SearchResultsController.php

@@ -86,6 +86,16 @@ class SearchResultsController extends Controller
         $this->results = $results;
     }
 
+    public function getQuery(): SearchQuery
+    {
+        return $this->query;
+    }
+
+    public function getResults(): SearchResults
+    {
+        return $this->results;
+    }
+
     public function display(): void
     {
         $headers = [];

modules/AOR_Scheduled_Reports/AOR_Scheduled_Reports.php

@@ -83,9 +83,7 @@ class AOR_Scheduled_Reports extends basic
 
     public function save($check_notify = false)
     {
-        if (isset($_POST['email_recipients']) && is_array($_POST['email_recipients'])) {
+        $this->parseRecipients();
-            $this->email_recipients = base64_encode(serialize($_POST['email_recipients']));
-        }
 
         return parent::save($check_notify);
     }
@@ -180,7 +178,7 @@ class AOR_Scheduled_Reports extends basic
         }
 
         $lastRun = $this->last_run ? $timedate->fromDb($this->last_run) : $timedate->fromDb($this->date_entered);
-        
+
         $this->handleTimeZone($lastRun);
         $next = $cron->getNextRunDate($lastRun);
 
@@ -200,4 +198,26 @@ class AOR_Scheduled_Reports extends basic
         $date->modify($offset . 'second');
     }
 
+    /**
+     * Parse and set recipients
+     * @return void
+     */
+    protected function parseRecipients(): void
+    {
+        $recipients = $_POST['email_recipients'] ?? null;
+        unset($_POST['email_recipients'], $_REQUEST['email_recipients'], $_GET['email_recipients']);
+        $this->email_recipients = null;
+
+        if (is_array($recipients)) {
+            $types = $recipients['email_target_type'] ?? [];
+            $emailInfo = $recipients['email'] ?? [];
+            $recipients = [
+                'email_target_type' => $types,
+                'email' => $emailInfo,
+            ];
+
+            $this->email_recipients = base64_encode(serialize($recipients));
+        }
+    }
+
 }

modules/AOW_Actions/actions/actionSendEmail.php

@@ -111,7 +111,9 @@ class actionSendEmail extends actionBase
         ) . ':<span class="required">*</span></label></td>';
         $html .= '<td valign="top" scope="row">';
 
-        $html .='<button type="button" onclick="add_emailLine('.$line.')"><img src="'.SugarThemeRegistry::current()->getImageURL('id-ff-add.png').'"></button>';
+        $html .='<button type="button" onclick="add_emailLine('.$line.')" id="plus-icon">
+            <span class="suitepicon suitepicon-action-plus"></span>
+        </button>';
         $html .= '<table id="emailLine'.$line.'_table" width="100%" class="email-line"></table>';
         $html .= '</td>';
         $html .= "</tr>";

modules/Calendar/CalendarActivity.php

@@ -266,11 +266,12 @@ class CalendarActivity
                 }
 
                 $focus_list = build_related_list_by_user_id($bean, $user_id, $where);
-                require_once 'modules/SecurityGroups/SecurityGroup.php';
+                //require_once 'modules/SecurityGroups/SecurityGroup.php';
                 foreach ($focus_list as $focusBean) {
                     if (isset($seen_ids[$focusBean->id])) {
                         continue;
                     }
+                    /* TODO update currently unused functionality, disabled as expensive
                     $in_group = SecurityGroup::groupHasAccess($key, $focusBean->id, 'list');
                     $show_as_busy = !ACLController::checkAccess(
                         $key,
@@ -279,7 +280,7 @@ class CalendarActivity
                         'module',
                         $in_group
                     );
-                    $focusBean->show_as_busy = $show_as_busy;
+                    $focusBean->show_as_busy = $show_as_busy;*/
 
                     $seen_ids[$focusBean->id] = 1;
                     $act = new CalendarActivity($focusBean);

modules/DynamicFields/DynamicField.php

@@ -445,6 +445,11 @@ class DynamicField
                 if ($field['type'] == 'html' || $field['type'] == 'parent') {
                     continue;
                 }
+
+                if (!empty($this->bean->bean_fields_to_save) && !in_array($name, $this->bean->bean_fields_to_save, true)){
+                    continue;
+                }
+
                 if (isset($this->bean->$name)) {
                     $quote = "'";
 

modules/Emails/include/ComposeView/ComposeView.tpl

@@ -226,7 +226,7 @@
         $(function(){
             $('#EditView_tabs ul.nav.nav-tabs li > a[data-toggle="tab"]').click(function(e){
                 if(typeof $(this).parent().find('a').first().attr('id') != 'undefined') {
-                    var tab = parseInt($(this).parent().find('a').first().attr('id').match(/^tab(.)*$/)[1]);
+                    var tab = parseInt($(this).parent().find('a').first().attr('id').match(/^tab(?<number>(.)*)$/)[1]);
                     selectTab(tab);
                 }
             });
@@ -263,4 +263,4 @@
       {rdelim});
     </script>
     {/if}
-</form>
+</form>

modules/Emails/include/ComposeView/EmailsComposeView.js

@@ -349,7 +349,7 @@
     };
 
 
-    self.updateSignature = function () {
+    $.fn.EmailsComposeView.updateSignature = self.updateSignature = function () {
       var inboundId = $('#from_addr_name').find('option:selected').attr('inboundId');
       if (inboundId === undefined) {
         console.warn('Unable to retrieve selected inbound id in the "From" field.');
@@ -1340,6 +1340,7 @@
         $.fn.EmailsComposeView.loadAttachmentDataFromAjaxResponse(response);
         $(form).find('[name="name"]').val(response.data.subject);
         tinymce.activeEditor.setContent(response.data.body_from_html, {format: 'html'});
+        $.fn.EmailsComposeView.updateSignature();
       });
       set_return(args);
     };

modules/Emails/vardefs.php

@@ -754,6 +754,11 @@ $dictionary['Email'] = array(
             'type' => 'index',
             'fields' => array('category_id')
         ),
+        array(
+            'name' => 'idx_email_uid',
+            'type' => 'index',
+            'fields' => array('uid')
+        ),
     ) // end indices
 );
 

modules/Employees/Employee.php

@@ -186,6 +186,11 @@ class Employee extends Person
 
     public function create_export_query($order_by, $where, $relate_link_join = '')
     {
+        global $current_user;
+        if (!is_admin($current_user)) {
+            throw new RuntimeException('Not authorized');
+        }
+
         include('modules/Employees/field_arrays.php');
 
         $cols = '';

modules/ModuleBuilder/Module/IconRepository.php

@@ -14,14 +14,13 @@ class IconRepository
      */
     private static $iconNames = [
         AOS_Contracts::class => 'aos-contracts-signature',
+        AOR_Scheduled_Reports::class => 'aor-reports',
         'EmailTemplates' => 'emails',
         'Employees' => 'users',
         jjwg_Address_Cache::class => 'jjwg-markers',
         'ProjectTask' => 'am-tasktemplates',
         AM_ProjectTemplates::class => 'am-tasktemplates',
-        'SurveyQuestionOptions' => self::DEFAULT_ICON,
+        'SurveyQuestionResponses' =>  'survey-responses',
-        'SurveyQuestionResponses' =>  self::DEFAULT_ICON,
-        'SurveyQuestions' => self::DEFAULT_ICON,
         'SurveyResponses' => 'survey-responses',
         'Prospects' => 'targets'
     ];
@@ -33,8 +32,6 @@ class IconRepository
      */
     public static function getIconName($module)
     {
-        return isset(static::$iconNames[$module])
+        return static::$iconNames[$module] ?? strtolower(str_replace('_', '-', $module));
-            ? static::$iconNames[$module]
-            : strtolower(str_replace('_', '-', $module));
     }
 }

modules/ModuleBuilder/language/en_us.lang.php

@@ -615,6 +615,10 @@ $mod_strings = array(
 
 //POPUP HELP
     'LBL_POPHELP_FIELD_DATA_TYPE' => 'Select the appropriate data type based on the type of data that will be entered into the field.',
+    'LBL_POPHELP_IMPORTABLE' => '<b>Yes</b>: The field will be included in an import operation.<br><b>No</b>: The field will not be included in an import.<br><b>Required</b>: A value for the field must be provided in any import.',
+    'LBL_POPHELP_IMAGE_WIDTH' => 'Enter a number for Width, as measured in pixels.<br> The uploaded image will be scaled to this Width.',
+    'LBL_POPHELP_IMAGE_HEIGHT' => 'Enter a number for the Height, as measured in pixels.<br> The uploaded image will be scaled to this Height.',
+    'LBL_POPHELP_DUPLICATE_MERGE' => '<b>Enabled</b>: The field will appear in the Merge Duplicates feature, but will not be available to use for the filter conditions in the Find Duplicates feature.<br><b>Disabled</b>: The field will not appear in the Merge Duplicates feature, and will not be available to use for the filter conditions in the Find Duplicates feature.<br><b>Filter</b>: The field will appear in the Merge Duplicates feature, and will be available to use for the filter conditions in the Find Duplicates feature.<br><b>Default selected filter</b>: The field will appear in the Merge Duplicates feature, and will be used by default for the filter conditions in the Find Duplicates feature.<br><b>Only filter</b>: The field will not appear in the Merge Duplicates feature, but will be available to use for the filter conditions in the Find Duplicates feature.',
 
 //Revert Module labels
     'LBL_RESET' => 'Reset',

modules/ModuleBuilder/parsers/parser.label.php

@@ -60,6 +60,11 @@ class ParserLabel
      */
     protected $moduleName;
 
+    /**
+     * @var LoggerManager
+     */
+    protected static $logger;
+
     /**
      * ParserLabel constructor.
      * @param string $moduleName
@@ -71,6 +76,16 @@ class ParserLabel
         if (!empty($packageName)) {
             $this->packageName = $packageName;
         }
+
+        static::setLogger();
+    }
+
+    /**
+     * @return void
+     */
+    protected static function setLogger()
+    {
+        static::$logger = LoggerManager::getLogger();
     }
 
     /**
@@ -111,7 +126,9 @@ class ParserLabel
      */
     public static function removeLabel($language, $label, $labelvalue, $moduleName, $basepath = null, $forRelationshipLabel = false)
     {
-        $GLOBALS [ 'log' ]->debug("ParserLabel::removeLabels($language, \$label, \$labelvalue, $moduleName, $basepath );");
+        static::setLogger();
+
+        static::$logger->debug("ParserLabel::removeLabels($language, \$label, \$labelvalue, $moduleName, $basepath );");
         if (is_null($basepath)) {
             $deployedModule = true;
             $basepath = "custom/modules/$moduleName/language";
@@ -119,7 +136,7 @@ class ParserLabel
                 $basepath = "custom/modules/$moduleName/Ext/Language";
             }
             if (!is_dir($basepath)) {
-                $GLOBALS ['log']->debug("$basepath is not a directory.");
+                static::$logger->debug("$basepath is not a directory.");
 
                 return false;
             }
@@ -139,12 +156,12 @@ class ParserLabel
                 // obtain $mod_strings
                 include $filename;
             } else {
-                $GLOBALS ['log']->debug("file $filename does not exist.");
+                static::$logger->debug("file $filename does not exist.");
 
                 return false;
             }
         } else {
-            $GLOBALS ['log']->debug("directory $basepath does not exist.");
+            static::$logger->debug("directory $basepath does not exist.");
 
             return false;
         }
@@ -158,11 +175,11 @@ class ParserLabel
 
         if ($changed) {
             if (!write_array_to_file('mod_strings', $mod_strings, $filename)) {
-                $GLOBALS [ 'log' ]->fatal("Could not write $filename");
+                static::$logger->fatal("Could not write $filename");
             } else {
                 // if we have a cache to worry about, then clear it now
                 if ($deployedModule) {
-                    $GLOBALS ['log']->debug('PaserLabel::addLabels: clearing language cache');
+                    static::$logger->debug('PaserLabel::addLabels: clearing language cache');
                     $cache_key = 'module_language.'.$language.$moduleName;
                     sugar_cache_clear($cache_key);
                     LanguageManager::clearLanguageCache($moduleName, $language);
@@ -184,25 +201,21 @@ class ParserLabel
      */
     public static function addLabels($language, $labels, $moduleName, $basepath = null, $forRelationshipLabel = false)
     {
-        $GLOBALS [ 'log' ]->debug("ParserLabel::addLabels($language, \$labels, $moduleName, $basepath );");
+        static::setLogger();
-        $GLOBALS [ 'log' ]->debug('$labels:'.print_r($labels, true));
+
+        static::$logger->debug("ParserLabel::addLabels($language, \$labels, $moduleName, $basepath );");
+        static::$logger->debug('$labels:' . print_r($labels, true));
 
         $deployedModule = false;
         if (null === $basepath) {
             $deployedModule = true;
-            $basepath = "custom/modules/$moduleName/language";
+            $basepath = "custom/Extension/modules/$moduleName/Ext/Language";
-            if ($forRelationshipLabel) {
-                $basepath = "custom/modules/$moduleName/Ext/Language";
-            }
             if (!is_dir($basepath)) {
                 mkdir_recursive($basepath);
             }
         }
 
-        $filename = "$basepath/$language.lang.php";
+        $filename = "$basepath/_override_$language.lang.php";
-        if ($forRelationshipLabel) {
-            $filename = "$basepath/$language.lang.ext.php";
-        }
         $dir_exists = is_dir($basepath);
 
         $mod_strings = array();
@@ -231,15 +244,15 @@ class ParserLabel
         }
 
         if ($changed) {
-            $GLOBALS [ 'log' ]->debug("ParserLabel::addLabels: writing new mod_strings to $filename");
+            static::$logger->debug("ParserLabel::addLabels: writing new mod_strings to $filename");
-            $GLOBALS [ 'log' ]->debug('ParserLabel::addLabels: mod_strings='.print_r($mod_strings, true));
+            static::$logger->debug('ParserLabel::addLabels: mod_strings='.print_r($mod_strings, true));
-            if (!write_array_to_file('mod_strings', $mod_strings, $filename)) {
+            if (!write_override_label_to_file('mod_strings', $mod_strings, $filename)) {
-                $GLOBALS [ 'log' ]->fatal("Could not write $filename");
+                static::$logger->fatal("Could not write $filename");
             } else {
                 // if we have a cache to worry about, then clear it now
                 if ($deployedModule) {
                     SugarCache::cleanOpcodes();
-                    $GLOBALS [ 'log' ]->debug('PaserLabel::addLabels: clearing language cache');
+                    static::$logger->debug('PaserLabel::addLabels: clearing language cache');
                     $cache_key = 'module_language.'.$language.$moduleName;
                     sugar_cache_clear($cache_key);
                     LanguageManager::clearLanguageCache($moduleName, $language);
@@ -295,8 +308,8 @@ class ParserLabel
                     fwrite($file_contents, $out, strlen($out));
                     fclose($file_contents);
                 } catch (Exception $e) {
-                    $GLOBALS ['log']->fatal("Could not write $filename");
+                    static::$logger->fatal("Could not write $filename");
-                    $GLOBALS ['log']->fatal('Exception '.$e->getMessage());
+                    static::$logger->fatal('Exception '.$e->getMessage());
                 }
 
                 //2. Overwrite custom/Extension/modules/relationships/language/{ModuleName}.php
@@ -342,8 +355,8 @@ class ParserLabel
                     fwrite($file_contents, $out, strlen($out));
                     fclose($file_contents);
                 } catch (Exception $e) {
-                    $GLOBALS ['log']->fatal("Could not write $filename");
+                    static::$logger->fatal("Could not write $filename");
-                    $GLOBALS ['log']->fatal('Exception '.$e->getMessage());
+                    static::$logger->fatal('Exception '.$e->getMessage());
                     $failed_to_write = true;
                 }
 
@@ -352,7 +365,7 @@ class ParserLabel
                         // if we have a cache to worry about, then clear it now
                         if ($deployedModule) {
                             SugarCache::cleanOpcodes();
-                            $GLOBALS ['log']->debug('PaserLabel::addLabels: clearing language cache');
+                            static::$logger->debug('PaserLabel::addLabels: clearing language cache');
                             $cache_key = 'module_language.'.$language.$moduleName;
                             sugar_cache_clear($cache_key);
                             LanguageManager::clearLanguageCache($moduleName, $language);

modules/Project/views/view.ganttchart.php

@@ -74,15 +74,14 @@ class ProjectViewGanttChart extends ViewDetail
         parent::display(); ?>
         <!--Create task pop-up-->
         <div style="display: none;">
-            <div id="dialog"  title="<?php echo $mod_strings['LBL_ADD_NEW_TASK']; ?>">
+            <div id="dialog"  class="add-new-task" title="<?php echo $mod_strings['LBL_ADD_NEW_TASK']; ?>">
                 <p>
                     <?php echo $mod_strings['LBL_EDIT_TASK_PROPERTIES']; ?>
                 </p>
                 <form id="popup_form" class="projects-gantt-chart-popup">
                     <fieldset>
 						<table width="100%">
-							<tr><td>
+							<tr><td>						
-						
 							<input type="hidden" name="project_id" id="project_id" value="<?php echo $project->id; ?>">
 							<input type="hidden" name="consider_business_hours" id="consider_business_hours" value="<?php echo $project->override_business_hours; ?>">
 							<input type="hidden" name="task_id" style="display: none; visibility: collapse;" id="task_id" value="">
@@ -226,11 +225,11 @@ class ProjectViewGanttChart extends ViewDetail
 
 
 
-        <div id="wrapper" >
+        <div id="wrapper" class="gantt-btn">
 
 			<?php
                     if (ACLController::checkAccess('Project', 'edit', true)) {
-                        echo '<div style="clear:both;padding:10px;"><button id="add_button" class="gantt_button">' . $mod_strings['LBL_ADD_NEW_TASK'] . '</button></div>';
+                        echo '<div style="clear:both;padding:10px;padding-left: 0;"><button id="add_button" class="gantt_button">' . $mod_strings['LBL_ADD_NEW_TASK'] . '</button></div>';
                         echo '<input id="is_editable" name="is_editable" type="hidden" value="1" >';
                     } ?>
             <input id="project_id" type="hidden" name="project_id" value="<?php echo $_REQUEST["record"]; ?>" />

modules/ProspectLists/Duplicate.php

@@ -55,11 +55,11 @@ $focus->retrieve($_POST['record']);
 if (isset($_POST['isDuplicate']) && $_POST['isDuplicate'] == true) {
     $focus->id='';
     $focus->name=$mod_strings['LBL_COPY_PREFIX'].' '.$focus->name;
-    
+
     $focus->save();
     $return_id=$focus->id;
     //duplicate the linked items.
-    $query  = "select * from prospect_lists_prospects where prospect_list_id = '".$_POST['record']."'";
+    $query  = "select * from prospect_lists_prospects where prospect_list_id = '". $focus->db->quote($_POST['record']) ."'";
     $result = $focus->db->query($query);
     if ($result != null) {
         while (($row = $focus->db->fetchByAssoc($result)) != null) {

modules/Schedulers/Scheduler.php

@@ -791,7 +791,7 @@ class Scheduler extends SugarBean
             }
             echo '<br>';
             echo '
-                <table cellpadding="0" cellspacing="0" width="100%" border="0" class="list view">
+                <table cellpadding="0" cellspacing="0" width="100%" border="0" class="list view box-panel">
                 <tr height="20">
                     <th><span>
                         ' . $mod_strings['LBL_CRON_INSTRUCTIONS_LINUX'] . '

modules/Studio/DropDowns/DropDownHelper.php

@@ -148,16 +148,16 @@ class DropDownHelper
                 //only if the value has changed or does not exist do we want to add it this way
                 if (!isset($my_list_strings[$dropdown_name][$key]) || strcmp($my_list_strings[$dropdown_name][$key], $value) != 0) {
                     //clear out the old value
-                    $contents = preg_replace($this->getPatternMatchGlobal($dropdown_name), "\n", $contents);
+                    $contents = preg_replace(self::getPatternMatchGlobal($dropdown_name), "\n", $contents);
-                    $contents = preg_replace($this->getPatternMatch($dropdown_name), "\n", $contents);
+                    $contents = preg_replace(self::getPatternMatch($dropdown_name), "\n", $contents);
                     //add the new ones
                     $contents .= "\n\$app_list_strings['$dropdown_name']['$key']=" . var_export_helper($value) . ";";
                 }
             }
         } else {
             //clear out the old value
-            $contents = preg_replace($this->getPatternMatchGlobal($dropdown_name), "\n", $contents);
+            $contents = preg_replace(self::getPatternMatchGlobal($dropdown_name), "\n", $contents);
-            $contents = preg_replace($this->getPatternMatch($dropdown_name), "\n", $contents);
+            $contents = preg_replace(self::getPatternMatch($dropdown_name), "\n", $contents);
             //add the new ones
             $contents .= "\n\$app_list_strings['$dropdown_name']=" . var_export_helper($dropdown) . ";";
         }
@@ -175,13 +175,13 @@ class DropDownHelper
         // ~~~~~~~~
     }
 
-    public function getPatternMatchGlobal($dropdown_name)
+    public static function getPatternMatchGlobal($dropdown_name)
     {
         return '/\s*\$GLOBALS\s*\[\s*\'app_list_strings\s*\'\s*\]\[\s*\''
             . $dropdown_name.'\'\s*\]\s*=\s*array\s*\([^\)]*\)\s*;\s*/ism';
     }
 
-    public function getPatternMatch($dropdown_name)
+    public static function getPatternMatch($dropdown_name)
     {
         return '/\s*\$app_list_strings\s*\[\s*\''.$dropdown_name.'\'\s*\]\s*=\s*array\s*\([^\)]*\)\s*;\s*/ism';
     }

modules/Users/User.php

@@ -606,6 +606,10 @@ class User extends Person implements EmailInterface
     {
         global $current_user, $mod_strings;
 
+        if (!$this->hasSaveAccess()) {
+           throw new RuntimeException('Not authorized');
+        }
+
         $msg = '';
 
         $isUpdate = !empty($this->id) && !$this->new_with_id;
@@ -1591,6 +1595,11 @@ EOQ;
 
     public function create_export_query($order_by, $where, $relate_link_join = '')
     {
+        global $current_user;
+        if (!is_admin($current_user)) {
+            throw new RuntimeException('Not authorized');
+        }
+
         include('modules/Users/field_arrays.php');
 
         $cols = '';
@@ -2437,4 +2446,25 @@ EOQ;
         }
         return $subTheme;
     }
+
+    /**
+     * Check if current user can save the current user record
+     * @return bool
+     */
+    protected function hasSaveAccess(): bool
+    {
+        global $current_user;
+
+        if (empty($this->id)) {
+            return true;
+        }
+
+        if (empty($current_user->id)) {
+            return true;
+        }
+
+        $sameUser = $current_user->id === $this->id;
+
+        return $sameUser || is_admin($current_user);
+    }
 }

modules/Users/controller.php

@@ -187,8 +187,21 @@ class UsersController extends SugarController
                 $_POST['default_locale_name_format'], 0, 'global');
         }
 
+        $next = $_POST['whatnext'] ?? '';
+
+        $base = 'index.php?action=index&module=Home';
+        $nextActions = [
+            'users' => 'index.php?action=index&module=Users' ,
+            'finish' =>  'index.php?action=index&module=Home',
+            'settings' => 'index.php?action=index&module=Administration',
+            'studio' => 'index.php?action=index&module=ModuleBuilder?type=studio',
+            'import' => 'index.php?module=Import&action=step1&import_module=Administration',
+        ];
+
+        $returnUrl = $nextActions[$next] ?? $base;
+
         // redirect to home
-        SugarApplication::redirect('index.php?action=index&module=Home');
+        SugarApplication::redirect($returnUrl);
 
     }
 
@@ -214,4 +227,4 @@ class UsersController extends SugarController
             SugarApplication::redirect("index.php?module=Home&action=index");
         }
     }
-}
+}

modules/Users/tpls/wizard.tpl

@@ -59,7 +59,7 @@
 <body class="yui-skin-sam">
 <div id="main">
 <div id="content">
-<table style="width:auto;height:600px;" align="center"><tr><td align="center">
+<table style="width:100%;height:450px;" align="center"><tr valign="top"><td align="center">
 
 <form id="UserWizard" name="UserWizard" enctype='multipart/form-data' method="POST" action="index.php" onkeypress="return disableReturnSubmission(event);">
 <input type='hidden' name='action' value='SaveUserWizard'/>
@@ -70,35 +70,25 @@
 <script type="text/javascript" src="{sugar_getjspath file='cache/include/javascript/sugar_grp_emails.js'}"></script>
 <script type="text/javascript" src="{sugar_getjspath file='modules/Users/User.js'}"></script>
 
-<div class="dashletPanelMenu wizard">
+<div class="dashletPanelMenu wizard user-wizard">
 
-<div class="bd">
+<div id="bootstrap-container" class="bd">
 
-
+<div id="welcome" class="screen welcome" style="background-image: url('include/images/initial_page_bg.svg');">
-<div id="welcome" class="screen">
+    <div class="container-fluid">
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+        <div class="row">
-        <tr>
+            <div class="col panel">
-            <td>
+                <h1>{$MOD.LBL_WIZARD_WELCOME_TITLE}</h1>
-                <div class="edit view">
+                <div class="open-crm-txt"> Open Source CRM For The World </div>
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                <div class="wizard-mainlbl">Maintained by <img src=include/images/sa_logo.svg style="height:60px;"></div>
-                        <tr>
+                <div class="wizard-lbl">{$MOD.LBL_WIZARD_WELCOME_NOSMTP}</div>
-                            <th align="left" scope="row" colspan="4"><h2>{$MOD.LBL_WIZARD_WELCOME_TITLE}</h2></th>
+                <div class="wizard-btn">
-                        </tr>
+                    <input title="{$MOD.LBL_WIZARD_NEXT_BUTTON}"
-                        <tr>
-                            <td scope="row">
-                                <p> {$MOD.LBL_WIZARD_WELCOME_NOSMTP}</p>
-                                <div class="userWizWelcome"><img src='include/images/sugar_wizard_welcome.jpg' border='0' alt='{$MOD.LBL_WIZARD_WELCOME_TAB}' width='765px' height='325px'></div>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-            </td>
-        </tr>
-    </table>
-    <div class="nav-buttons">
-        <input title="{$MOD.LBL_WIZARD_NEXT_BUTTON}"
                class="button primary" type="button" name="next_tab1" value="  {$MOD.LBL_WIZARD_NEXT_BUTTON}  "
                onclick="SugarWizard.changeScreen('personalinfo',false);" id="next_tab_personalinfo" />
+                </div>
+            </div>
+        </div>
     </div>
 </div>
 
@@ -109,54 +99,82 @@
                 <div class="edit view">
                     <table width="100%" border="0" cellspacing="0" cellpadding="0">
                         <tr>
-                            <th align="left" scope="row" colspan="4"><h2><span>{$MOD.LBL_WIZARD_PERSONALINFO}</span></h2></th>
+                            <th align="left" scope="row" colspan="4">
+                                <h2><span>{$MOD.LBL_WIZARD_PERSONALINFO}</span></h2>
+                            </th>
                         </tr>
                         <tr>
                             <td align="left" scope="row" colspan="4"><i>{$MOD.LBL_WIZARD_PERSONALINFO_DESC}</i></td>
                         </tr>
                         <tr>
-                            <td width="17%" scope="row" nowrap="nowrap"><span>{$MOD.LBL_FIRST_NAME}:</span></td>
+                            <td width="10%" scope="row" nowrap="nowrap">
-                            <td width="33%"><span><input id='first_name' name='first_name' tabindex='1' size='25' maxlength='25' type="text" value="{$FIRST_NAME}"></span></td>
+                                <span>{$MOD.LBL_FIRST_NAME}:</span>
-                            <td width="17%" scope="row" nowrap="nowrap"><span>{$MOD.LBL_LAST_NAME}: <span class="required">{$APP.LBL_REQUIRED_SYMBOL}</span></span></td>
+                            </td>
-                            <td width="33%"><span><input id='last_name' name='last_name' tabindex='2' size='25' maxlength='25' type="text" value="{$LAST_NAME}"></span></td>
+                            <td width="40%">
+                                <span><input id='first_name' name='first_name' tabindex='1' size='25' maxlength='25' type="text" value="{$FIRST_NAME}"></span>
+                            </td>
+                            <td width="10%" scope="row" nowrap="nowrap">
+                                <span>{$MOD.LBL_ADDRESS_STREET}:</span>
+                            </td>
+                            <td width="40%">
+                                <span><input name='address_street' tabindex='8' value="{$ADDRESS_STREET}"/></span>
+                            </td>
                         </tr>
                         <tr>
                             <td scope="row" width="17%">
+                                <span>{$MOD.LBL_LAST_NAME}: <span class="required">{$APP.LBL_REQUIRED_SYMBOL}</span></span>
+                            </td>
+                            <td width="33%">
+                                <span><input id='last_name' name='last_name' tabindex='2' size='25' maxlength='25' type="text" value="{$LAST_NAME}"></span>
+                            </td>
+                            <td scope="row" nowrap="nowrap">
+                                <span>{$MOD.LBL_CITY}:</span>
+                            </td>
+                            <td>
+                                <span><input name='address_city' tabindex='8' size='15' maxlength='100' value='{$ADDRESS_CITY}'></span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td width="17%" scope="row" nowrap="nowrap">
                                 {$MOD.LBL_EMAIL}: {if $REQUIRED_EMAIL_ADDRESS}<span class="required">{$APP.LBL_REQUIRED_SYMBOL}</span>{/if}
                             </td>
-                            <td width="33%"><span><input name='email1' tabindex='3' size='30' maxlength='100' value='{$EMAIL1}' id='email1' /></span></td>
+                            <td width="33%" >
-                            <td scope="row" nowrap="nowrap"><span>&nbsp;</span></td>
+                                <span><input name='email1' tabindex='3' size='30' maxlength='100' value='{$EMAIL1}' id='email1' /></span>
-                            <td><span>&nbsp;</span></td>
+                            </td>
+                            <td scope="row" nowrap="nowrap">
+                                <span>{$MOD.LBL_POSTAL_CODE}:</span>
+                            </td>
+                            <td>
+                                <span><input name='address_postalcode' tabindex='9' size='10' maxlength='20' value='{$ADDRESS_POSTALCODE}'></span>
+                            </td>
                         </tr>
                         <tr>
-                            <td width="17%" scope="row" nowrap="nowrap"><span>{$MOD.LBL_OFFICE_PHONE}:</span></td>
+                            <td scope="row">
-                            <td width="33%" ><span><input name='phone_work' type="text" tabindex='4' size='20' maxlength='25' value='{$PHONE_WORK}'></span></td>
+                                <span>{$MOD.LBL_OFFICE_PHONE}:</span>
-                            <td scope="row" nowrap="nowrap"><span>{$MOD.LBL_MESSENGER_TYPE}:</span></td>
+                            </td>
-                            <td  ><span>{$MESSENGER_TYPE_OPTIONS}</span></td>
+                            <td>
+                                <span><input name='phone_work' type="text" tabindex='4' size='20' maxlength='25' value='{$PHONE_WORK}'></span>
+                            </td>
+                            <td scope="row" nowrap="nowrap">
+                                <span>{$MOD.LBL_STATE}:</span>
+                            </td>
+                            <td>
+                                <span><input name='address_state' tabindex='9' size='15' maxlength='100' value='{$ADDRESS_STATE}'></span>
+                            </td>
                         </tr>
                         <tr>
-                            <td scope="row"><span>{$MOD.LBL_MOBILE_PHONE}:</span></td>
+                            <td width="17%" scope="row" nowrap="nowrap">
-                            <td  ><span><input name='phone_mobile' type="text" tabindex='6' size='20' maxlength='25' value='{$PHONE_MOBILE}'></span></td>
+                                <span>{$MOD.LBL_MOBILE_PHONE}:</span>
-                            <td scope="row" nowrap="nowrap"><span>{$MOD.LBL_MESSENGER_ID}:</span></td>
+                            </td>
-                            <td  ><span><input name='messenger_id' type="text" tabindex='6' size='30' maxlength='100' value='{$MESSENGER_ID}'></span></td>
+                            <td width="33%" >
-                        </tr>
+                                <span><input name='phone_mobile' type="text" tabindex='6' size='20' maxlength='25' value='{$PHONE_MOBILE}'></span>
-                        <tr>
+                            </td>
-                            <td width="17%" scope="row" nowrap="nowrap"><span>{$MOD.LBL_PRIMARY_ADDRESS}:</span></td>
+                            <td scope="row" nowrap="nowrap">
-                            <td width="33%" ><span><textarea name='address_street' rows="2" tabindex='8' cols="30">{$ADDRESS_STREET}</textarea></span></td>
+                                <span>{$MOD.LBL_COUNTRY}:</span>
-                            <td scope="row" nowrap="nowrap"><span>&nbsp;</span></td>
+                            </td>
-                            <td><span>&nbsp;</span></td>
+                            <td>
-                        </tr>
+                                <span><input name='address_country' tabindex='10' size='10' maxlength='20' value='{$ADDRESS_COUNTRY}'></span>
-                        <tr>
+                            </td>
-                            <td width="17%" scope="row" nowrap="nowrap"><span>{$MOD.LBL_CITY}:</span></td>
-                            <td width="33%" ><span><input name='address_city' tabindex='8' size='15' maxlength='100' value='{$ADDRESS_CITY}'></span></td>
-                            <td scope="row" nowrap="nowrap"><span>{$MOD.LBL_STATE}:</span></td>
-                            <td><span><input name='address_state' tabindex='9' size='15' maxlength='100' value='{$ADDRESS_STATE}'></span></td>
-                        </tr>
-                        <tr>
-                            <td scope="row" nowrap="nowrap"><span>{$MOD.LBL_POSTAL_CODE}:</span></td>
-                            <td><span><input name='address_postalcode' tabindex='9' size='10' maxlength='20' value='{$ADDRESS_POSTALCODE}'></span></td>
-                            <td scope="row" nowrap="nowrap"><span>{$MOD.LBL_COUNTRY}:</span></td>
-                            <td><span><input name='address_country' tabindex='10' size='10' maxlength='20' value='{$ADDRESS_COUNTRY}'></span></td>
                         </tr>
                     </table>
                 </div>
@@ -201,7 +219,6 @@
                             <td width="33%"><span><select tabindex='14' name='dateformat'>{$DATEOPTIONS}</select></span></td>
                             <td scope="row" nowrap="nowrap"><span>{$MOD.LBL_TIME_FORMAT}:</span>&nbsp;{sugar_help text=$MOD.LBL_TIME_FORMAT_TEXT }</td>
                             <td ><span><select tabindex='14' name='timeformat'>{$TIMEOPTIONS}</select></span></td>
-
                         </tr>
                         <tr>
                             <td colspan="4"><hr /></td>
@@ -263,39 +280,39 @@
         onclick="SugarWizard.changeScreen('finish',false);" id="next_tab_finish" />
     </div>
 </div>
-<div id="finish" class="screen">
+
+<div id="finish" class="screen wizard-finish">
     <table width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr>
             <td>
                 <div class="edit view">
-                    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                    <table width="100%" border="0" cellspacing="0" cellpadding="0" class="user-icon">
                         <tr>
                             <th align="left" scope="row" colspan="4"><h2>{$MOD.LBL_WIZARD_FINISH_TITLE}</h2></th>
                         </tr>
                         <tr>
                             <td scope="row">
-                                <h3>{$MOD.LBL_WIZARD_FINISH1}</h3>
+                                <h3 class="wizard-finish-lbl">{$MOD.LBL_WIZARD_FINISH1}</h3>
-
                                 <table cellpadding=0 cellspacing=0><input id='whatnext' name='whatnext' type="hidden" value='finish' />
                                     {if $IS_ADMIN}
-                                        <tr><td><img src=include/images/start.png style="margin-right: 5px;"></td><td><a onclick='document.UserWizard.whatnext.value="finish";document.UserWizard.submit()' href="#" ><b> {$MOD.LBL_WIZARD_FINISH2}  </b></a><br> {$MOD.LBL_WIZARD_FINISH2DESC}</td></tr>
+                                        <tr><td><img src=include/images/icon_start_using.svg style="margin-right: 5px;"></td><td><a onclick='document.UserWizard.whatnext.value="finish";document.UserWizard.submit()' href="#" ><b> {$MOD.LBL_WIZARD_FINISH2}  </b></a> <div class="img-desc"> {$MOD.LBL_WIZARD_FINISH2DESC}</div></td></tr>
                                         <tr><td colspan=2><hr style="margin: 5px 0px;"></td></tr>
-                                        <tr><td><img src=include/images/import.png style="margin-right: 5px;"></td><td><a onclick='document.UserWizard.whatnext.value="import";document.UserWizard.submit()' href="#" ><b> {$MOD.LBL_WIZARD_FINISH3} </b></a><br> {$MOD.LBL_WIZARD_FINISH4}</td></tr>
+                                        <tr><td><img src=include/images/icon_import_data.svg style="margin-right: 5px;"></td><td><a onclick='document.UserWizard.whatnext.value="import";document.UserWizard.submit()' href="#" ><b> {$MOD.LBL_WIZARD_FINISH3} </b></a>  <div class="img-desc"> {$MOD.LBL_WIZARD_FINISH4} </div></td></tr>
                                         <tr><td colspan=2><hr style="margin: 5px 0px;"></td></tr>
-                                        <tr><td><img src=include/images/create_users.png style="margin-right: 5px;"></td><td><a onclick='document.UserWizard.whatnext.value="users";document.UserWizard.submit()' href="#"  ><b> {$MOD.LBL_WIZARD_FINISH5} </b></a><br>{$MOD.LBL_WIZARD_FINISH6}</td></tr>
+                                        <tr><td><img src=include/images/icon_create_users.svg style="margin-right: 5px;"></td><td><a onclick='document.UserWizard.whatnext.value="users";document.UserWizard.submit()' href="#"  ><b> {$MOD.LBL_WIZARD_FINISH5} </b></a> <div class="img-desc"> {$MOD.LBL_WIZARD_FINISH6} </div></td></tr>
                                         <tr><td colspan=2><hr style="margin: 5px 0px;"></td></tr>
-                                        <tr><td><img src=include/images/settings.png style="margin-right: 5px;"></td><td><a  onclick='document.UserWizard.whatnext.value="settings";document.UserWizard.submit()' href="#" ><b> {$MOD.LBL_WIZARD_FINISH7} </b></a><br>{$MOD.LBL_WIZARD_FINISH8}</td></tr>
+                                        <tr><td><img src=include/images/icon_view_and_manage.svg style="margin-right: 5px;"></td><td><a  onclick='document.UserWizard.whatnext.value="settings";document.UserWizard.submit()' href="#" ><b> {$MOD.LBL_WIZARD_FINISH7} </b></a> <div class="img-desc"> {$MOD.LBL_WIZARD_FINISH8} </div></td></tr>
                                         <tr><td colspan=2><hr style="margin: 5px 0px;"></td></tr>
-                                        <tr><td><img src=include/images/configure.png style="margin-right: 5px;"></td><td><a onclick='document.UserWizard.whatnext.value="studio";document.UserWizard.submit()' href="#"  ><b> {$MOD.LBL_WIZARD_FINISH9} </b></a><br>{$MOD.LBL_WIZARD_FINISH10}</td></tr>
+                                        <tr><td><img src=include/images/icon_configure.svg style="margin-right: 5px;"></td><td><a onclick='document.UserWizard.whatnext.value="studio";document.UserWizard.submit()' href="#"  ><b> {$MOD.LBL_WIZARD_FINISH9} </b></a> <div class="img-desc"> {$MOD.LBL_WIZARD_FINISH10} </div></td></tr>
                                         <tr><td colspan=2><hr style="margin: 5px 0px;"></td></tr>
-                                        <tr><td><img src=include/images/university.png style="margin-right: 5px;"></td><td><a href="https://community.suitecrm.com" target="_blank"><b> {$MOD.LBL_WIZARD_FINISH11} </b></a></b><br>{$MOD.LBL_WIZARD_FINISH12}</td></tr>
+                                        <tr><td><img src=include/images/icon_visit_site.svg style="margin-right: 5px;"></td><td><a href="https://community.suitecrm.com" target="_blank"><b> {$MOD.LBL_WIZARD_FINISH11} </b></a></b> <div class="img-desc"> {$MOD.LBL_WIZARD_FINISH12} </div> </td></tr>
                                         <tr><td colspan=2><hr style="margin: 5px 0px;"></td></tr>
                                     {else}
-                                        <tr><td><img src=include/images/university2.png style="margin-right: 5px;"></td><td><a href="https://community.suitecrm.com" target="_blank"><b> {$MOD.LBL_WIZARD_FINISH11} </b></a></b><br>{$MOD.LBL_WIZARD_FINISH12}</td></tr>
+                                        <tr><td><img src=include/images/icon_visit_site.svg style="margin-right: 5px;"></td><td><a href="https://suitecrm.com" target="_blank"><b> {$MOD.LBL_WIZARD_FINISH11} </b></a></b> <div class="img-desc"> {$MOD.LBL_WIZARD_FINISH12}</div></td></tr>
                                         <tr><td colspan=2><hr style="margin: 5px 0px;"></td></tr>
-                                        <tr><td><img src=include/images/docs.png style="margin-right: 5px;"></td><td><a href="https://docs.suitecrm.com/user/" target="_blank"><b> {$MOD.LBL_WIZARD_FINISH14} </b></a></b><br>{$MOD.LBL_WIZARD_FINISH15}</td></tr>
+                                        <tr><td><img src=include/images/icon_documentation.svg style="margin-right: 5px;"></td><td><a href="https://docs.suitecrm.com/user/" target="_blank"><b> {$MOD.LBL_WIZARD_FINISH14} </b></a></b> <div class="img-desc"> {$MOD.LBL_WIZARD_FINISH15}</div></td></tr>
                                         <tr><td colspan=2><hr style="margin: 5px 0px;"></td></tr>
-                                        <tr><td><img src=include/images/forums.png style="margin-right: 5px;"></td><td><a href="https://community.suitecrm.com/" target="_blank"><b> {$MOD.LBL_WIZARD_FINISH18} </b></a></b><br>{$MOD.LBL_WIZARD_FINISH19}</td></tr>
+                                        <tr><td><img src=include/images/icon_forums.svg style="margin-right: 5px;"></td><td><a href="https://community.suitecrm.com/" target="_blank"><b> {$MOD.LBL_WIZARD_FINISH18} </b></a></b> <div class="img-desc">{$MOD.LBL_WIZARD_FINISH19}</div></td></tr>
                                         <tr><td colspan=2><hr style="margin: 5px 0px;"></td></tr>
                                     {/if}
                                 </table>
@@ -308,16 +325,13 @@
     </table>
     <div class="nav-buttons">
         <input title="{$MOD.LBL_WIZARD_BACK_BUTTON}"
-               class="button" type="button" name="next_tab1" value="  {$MOD.LBL_WIZARD_BACK_BUTTON}  "
+               class="button" type="button" name="next_tab1" value="{$MOD.LBL_WIZARD_BACK_BUTTON}"
         onclick="SugarWizard.changeScreen('locale',true);" id="previous_tab_locale" />&nbsp;
         <input title="{$MOD.LBL_WIZARD_FINISH_BUTTON}" class="button primary"
-               type="submit" name="save" value="  {$MOD.LBL_WIZARD_FINISH_BUTTON}  " />&nbsp;
+               type="submit" name="save" value="{$MOD.LBL_WIZARD_FINISH_BUTTON}"/>&nbsp;
     </div>
 </div>
 
-
-
-
 </div>
 
 </div>

modules/jjwg_Maps/views/view.config.php

@@ -45,9 +45,9 @@ class Jjwg_MapsViewConfig extends SugarView
 
         $unit_types = $GLOBALS['app_list_strings']['map_unit_type_list']; ?>
 
-        <p>&nbsp;</p>
+        <div class="moduleTitle">
-
+            <h2><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_TITLE']; ?></h2>
-        <p style="margin: 15px 0px 15px 0px; font-size: 1.7em;"><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_TITLE']; ?></strong></p>
+        </div>
 
         <?php if (!empty($_REQUEST['config_save_notice'])) {
             ?>
@@ -59,13 +59,11 @@ class Jjwg_MapsViewConfig extends SugarView
 <input type="hidden" name="module" value="<?php echo $GLOBALS['currentModule']; ?>">
 <input type="hidden" name="action" value="config" />
 
-
+<div class="action-buttons-config">
-<input type="submit" class="button" tabindex="101" name="submit" value="  <?php echo $GLOBALS['app_strings']['LBL_SAVE_BUTTON_LABEL']; ?>  " align="bottom">
+    <input type="submit" class="button" tabindex="101" name="submit" value="  <?php echo $GLOBALS['app_strings']['LBL_SAVE_BUTTON_LABEL']; ?>  " align="bottom">
-&nbsp;
+    <input type="button" class="button" tabindex="102" name="cancel" value="  <?php echo $GLOBALS['app_strings']['LBL_CANCEL_BUTTON_LABEL']; ?>  " align="bottom"
-<input type="button" class="button" tabindex="102" name="cancel" value="  <?php echo $GLOBALS['app_strings']['LBL_CANCEL_BUTTON_LABEL']; ?>  " align="bottom"
         onclick="document.location.href='index.php?module=Administration&amp;action=index'" title="">
-
+</div>
-<br /><br />
 
 <table class="edit view table" cellpadding="0" cellspacing="12" border="0">
     <tr>
@@ -298,7 +296,7 @@ class Jjwg_MapsViewConfig extends SugarView
     <?php
         } ?>
     <tr>
-        <td colspan="2"><hr /></td>
+        <td colspan="3"><hr /></td>
     </tr>
 
 
@@ -471,7 +469,7 @@ class Jjwg_MapsViewConfig extends SugarView
     <tr>
         <td colspan="2"><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_GOOGLE_GEOCODING_LIMIT_DESC']; ?></td>
     </tr>
-    <tr class="row odd">
+    <tr class="odd">
         <td><strong><?php echo $GLOBALS['mod_strings']['LBL_CONFIG_ALLOW_APPROXIMATE_LOCATION_TYPE_TITLE']; ?> </strong></td>
         <td>
             <?php $enabled = !empty($GLOBALS['jjwg_config']['allow_approximate_location_type']) ? '1' : '0'; ?>
@@ -718,13 +716,15 @@ class Jjwg_MapsViewConfig extends SugarView
     </tr>
 </table>
 
-<br />
 
+<div class="action-button-footer">
 <input type="submit" class="button" tabindex="211" name="submit" value="  <?php echo $GLOBALS['app_strings']['LBL_SAVE_BUTTON_LABEL']; ?>  " align="bottom">
 &nbsp;
 <input type="button" class="button" tabindex="212" name="cancel" value="  <?php echo $GLOBALS['app_strings']['LBL_CANCEL_BUTTON_LABEL']; ?>  " align="bottom"
         onclick="document.location.href='index.php?module=Administration&amp;action=index'" title="">
 
+</div>
+
 </form>
 
 

modules/jjwg_Maps/views/view.geocoded_counts.php

@@ -29,7 +29,7 @@ class Jjwg_MapsViewGeocoded_Counts extends SugarView
 
         echo '<div class="list-view-rounded-corners">';
 
-        echo '<table cellspacing="0" cellpadding="0" border="0" class="list view" style="width: 50% !important;">';
+        echo '<table cellspacing="0" cellpadding="0" border="0" class="list" style="width: 50% !important;">';
         echo '<thead>';
         echo '<tr><th>'.$GLOBALS['mod_strings']['LBL_MODULE_HEADING'].'</th>';
         foreach ($this->bean->geocoded_headings as $heading) {

modules/vCals/vCal.php

@@ -123,7 +123,7 @@
         public function create_sugar_freebusy($user_bean, $start_date_time, $end_date_time)
         {
             $ical_array = array();
-            global $DO_USER_TIME_OFFSET, $timedate, $current_user;
+            global $DO_USER_TIME_OFFSET, $timedate;
 
             $DO_USER_TIME_OFFSET = true;
             if (empty($GLOBALS['current_user']) || empty($GLOBALS['current_user']->id)) {
@@ -138,11 +138,11 @@
             // loop thru each activity, get start/end time in UTC, and return FREEBUSY strings
             foreach ($acts_arr as $act) {
                 if (empty($act->start_time)) {
-                    $startTime = $timedate->fromUser($act->sugar_bean->date_start, $user_bean);
+                    $act->start_time = $timedate->fromUser($act->sugar_bean->date_start, $user_bean);
                 }
 
                 if (empty($act->end_time)) {
-                    $endTime = $timedate->fromUser($act->sugar_bean->date_finish, $user_bean);
+                    $act->end_time = $timedate->fromUser($act->sugar_bean->date_finish, $user_bean);
                 }
 
                 $ID = $act->sugar_bean->id;

suitecrm_version.php

@@ -3,6 +3,6 @@ if (!defined('sugarEntry') || !sugarEntry) {
     die('Not A Valid Entry Point');
 }
 
-$suitecrm_version = '8.0.0';
+$suitecrm_version = '8.0.1';
-$suitecrm_legacy = '7.12.3';
+$suitecrm_legacy = '7.12.5';
-$suitecrm_timestamp = '2022-01-27 12:00:00';
+$suitecrm_timestamp = '2022-03-01 12:00:00';

tests/unit/phpunit/modules/Employees/EmployeeTest.php

@@ -128,6 +128,8 @@ class EmployeeTest extends SuitePHPUnitFrameworkTestCase
     {
         $employee = BeanFactory::newBean('Employees');
 
+        global $current_user;
+        $current_user->is_admin = '1';
         //test with empty string params
         $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 ORDER BY users.user_name";
         $actual = $employee->create_export_query('', '');
@@ -137,6 +139,11 @@ class EmployeeTest extends SuitePHPUnitFrameworkTestCase
         $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE users.user_name=\"\" AND  users.deleted = 0 ORDER BY users.id";
         $actual = $employee->create_export_query('users.id', 'users.user_name=""');
         self::assertSame($expected, $actual);
+
+        $current_user->is_admin = '0';
+        $this->expectException(RuntimeException::class);
+        $employee->create_export_query('', '');
+
     }
 
     public function testpreprocess_fields_on_save(): void

tests/unit/phpunit/modules/Users/UserTest.php

@@ -683,16 +683,22 @@ class UserTest extends SuitePHPUnitFrameworkTestCase
     {
         $user = BeanFactory::newBean('Users');
 
+        global $current_user;
+        $current_user->is_admin = '1';
         //test with empty string params
-        $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 AND users.is_admin=0 ORDER BY users.user_name";
+        $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE  users.deleted = 0 ORDER BY users.user_name";
         $actual = $user->create_export_query('', '');
         self::assertSame($expected, $actual);
 
 
         //test with valid string params
-        $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE user_name=\"\" AND  users.deleted = 0 AND users.is_admin=0 ORDER BY id";
+        $expected = "SELECT id, user_name, first_name, last_name, description, date_entered, date_modified, modified_user_id, created_by, title, department, is_admin, phone_home, phone_mobile, phone_work, phone_other, phone_fax, address_street, address_city, address_state, address_postalcode, address_country, reports_to_id, portal_only, status, receive_notifications, employee_status, messenger_id, messenger_type, is_group FROM users  WHERE user_name=\"\" AND  users.deleted = 0 ORDER BY id";
         $actual = $user->create_export_query('id', 'user_name=""');
         self::assertSame($expected, $actual);
+
+        $current_user->is_admin = '0';
+        $this->expectException(RuntimeException::class);
+        $user->create_export_query('', '');
     }
 
 

themes/suite8/css/Dawn/style.scss

@@ -152,4 +152,17 @@
 @import '../suitep-base/scheduler.scss';
 @import '../suitep-base/admin-backup.scss';
 @import '../suitep-base/admin-import.scss';
+@import '../suitep-base/oauth-consumer-key.scss';
+@import '../suitep-base/connector.scss';
+@import '../suitep-base/admin-google-maps.scss';
+@import '../suitep-base/email-queue.scss';
+@import '../suitep-base/module-builder.scss';
+@import '../suitep-base/calls.scss';
+@import '../suitep-base/notes.scss';
+@import '../suitep-base/invoices.scss';
+@import '../suitep-base/contracts.scss';
+@import '../suitep-base/configure-settings.scss';
+@import '../suitep-base/gantt-chart.scss';
+@import '../suitep-base/event-delegates.scss';
+@import '../suitep-base/user-wizard.scss';
 //

themes/suite8/css/Dawn/variables.scss

@@ -1188,6 +1188,8 @@ $select-ui-widget-control-background-url: "../../../../../themes/suite8/css/Dawn
 
 $select-edit-background-url: "../../../../../themes/default/images/arrow_down_filled.svg";
 
+$ganttchart-close-background-url: "../../../../../themes/suite8/images/close.png";
+
 
 // tables
 $table-header-bg: $color-20;

themes/suite8/css/suitep-base/activity-stream.scss

@@ -26,6 +26,7 @@
         }
     }
     table.view {
+        border-radius: 10px;
         tr td {  
             padding-left: 1em;
             padding-top: 0.5em;

themes/suite8/css/suitep-base/admin-backup.scss

@@ -31,6 +31,7 @@
         background: $white;
         padding: 1em;
         margin-top: 1em;
+        border-radius: 10px;
     }
     i {
         position: relative;

themes/suite8/css/suitep-base/admin-google-maps.scss

@@ -0,0 +1,11 @@
+.view-action-geocoded_counts {
+    table.view {
+        border-radius: 10px;
+    }
+}
+
+.view-action-config {
+    table.view {
+        border-radius: 10px;
+    }
+}

themes/suite8/css/suitep-base/admin.scss

@@ -350,3 +350,10 @@ div[aria-describedby*='dialogHelpPopup'] .ui-dialog-titlebar .ui-dialog-titlebar
 .inlineHelpTip {
   cursor: pointer;
 }
+
+.view-module-Administration {
+  table.view {
+      border-radius: 10px;
+      overflow: hidden;
+  }
+}

themes/suite8/css/suitep-base/aow.scss

@@ -24,7 +24,7 @@
  * the words "Supercharged by SuiteCRM".
  */
 
-#condition_lines_span {
+ #condition_lines_span {
   display: block;
 }
 
@@ -100,7 +100,6 @@
 }
 
 #aow_conditionLines tbody td:first-of-type {
-  padding-left: 8px;
   border-top-left-radius: 4px;
   border-bottom-left-radius: 4px;
 }
@@ -208,17 +207,6 @@
   width: 100%;
 }
 
-#aow_conditionLines [type="button"] {
-  background-color: $white;
-  padding: 7px;
-  margin-right: 10px;
-  border: 1px solid $dark-grey-line;
-  border-radius: $border-radius-base;
-  color: #000;
-  height: 29px;
-  width: 2.4em;
-}
-
 #actionLines [type="button"] {
   background-color: $danger-btn-bg;
   padding: 0;
@@ -620,4 +608,33 @@ table.email-line {
     margin-top: -1.5em;
     top: -2em;
   }
+  #plus-icon {
+    background: $white;
+    border: 1px solid $panel-border-bg;
+    border-radius: $border-radius-base;
+    padding: 0.5em 0.4em 0.2em 0.6em;
+    font-size: 16px;
+    line-height: 0;
+    font-weight: bold;
+  }
+  #aow_conditionLines [type="button"] {
+    background-color: $white;
+    padding: 7px;
+    margin-right: 10px;
+    border: 1px solid #93a4b3;
+    border-radius: 4px;
+    color: #000;
+    height: 29px;
+    width: 2.4em;
+  }
+  #aow_conditionLines input {
+    margin-top: 5px;
+    line-height: 17px;
+  }
+  #aow_conditionLines > tbody > tr > td > table.dateTime .dateTimeComboColumn .calendarstart {
+    top: -6px;
+  }
+  #aow_conditionLines > tbody > tr > td > table.dateTime .dateTimeSection {
+    margin-top: -8px;
+  }
 }

themes/suite8/css/suitep-base/calendar.scss

@@ -93,8 +93,6 @@ table#goto_date_trigger_div_t thead {
 .yui-calendar a.calnavleft
 {
   color: $default-btn-color;
-  background-color: $calendar-arrow-button-bg;
-  border: 1px solid $calendar-arrow-button-bg;
   padding: 0;
   border-radius: $border-radius-base;
   text-transform: uppercase;
@@ -110,13 +108,11 @@ table#goto_date_trigger_div_t thead {
 .yui-calendar a.calnavright {
   display: inline-block;
   font-weight: normal;
-  background-color: $calendar-arrow-button-bg;
   background-origin: padding-box;
   background-position: 0 0;
   color: $calendar-arrow-button-color;
   padding: 0;
   margin-top: 10px;
-  border: 1px solid $calendar-arrow-button-bg;
   border-radius: $border-radius-base;
   width: 32px;
   height: 32px;
@@ -131,12 +127,12 @@ table#goto_date_trigger_div_t thead {
 
 .yui-calendar .calnavleft {
   left: 0;
-  background-image: url("../../../../../themes/suite8/images/p_left.svg");
+  background-image: url("../../../../../themes/suite8/images/chevron-left.svg");
 }
 
 .yui-calendar .calnavright {
   right: 0;
-  background-image: url("../../../../../themes/suite8/images/p_right.svg");
+  background-image: url("../../../../../themes/suite8/images/chevron-right.svg");
 }
 
 .yui-module .hd {
@@ -213,9 +209,17 @@ table#goto_date_trigger_div_t thead {
 }
 
 a#callnav_today {
-  clear:both;
+  clear: both;
-  line-height: 40px;
+  line-height: 30px;
   display: block;
+  color: $white;
+  border: 1px solid lightgrey;
+  width: 8em;
+  text-align: center;
+  margin-bottom: 0.4em;
+  margin-top: 0.4em;
+  border-radius: 4px;
+  background: #93a4b3;
 }
 
 .monthHeader {
@@ -915,3 +919,102 @@ iframe.teamNoticeBox {
     width: 900px;
   }
 }
+
+.yui-panel-container {
+  .container-close {
+    color: $white;
+    line-height: 1;
+  } 
+  .yui-calendar .calheader {
+    background: #f8f9fa;
+  } 
+  .yui-calcontainer {
+    padding:0;
+    border: 1px solid lightgray;
+    border-radius: 4px;
+    .yui-cal-nav {
+      top: 3.4em;
+      font-size: 100%;
+      border: 1px solid lightgrey;
+      select {
+        background: url($select-edit-background-url) no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+      } 
+    input[type=text] {
+      background-color:$transparent-color;
+      border: 1px solid $form-border-color;
+    }
+  }
+}
+  .bd {
+    .callnav_today {
+      text-align: center;
+      display: flex;
+      justify-content: center;
+    }
+    .yui-calendar .calhead {
+      background: $white;
+    }
+    .yui-calendar td.calcell a {
+      font-size: 15px;
+    }
+    .yui-calendar .calweekdayrow th {
+      background: #f8f9fa;
+      color: #5bc0de;
+      font-style: italic;
+      border-bottom: 1px solid lightgrey;
+    }
+    .yui-calendar td.calcell {
+      border: none;
+    }
+    .yui-calendar td.calcell.oom {
+      background: none;
+      color: lightgray;
+      font-weight: bold;
+    }
+    .yui-calendar td.calcell.selected a {
+      background: #007bff;
+      color: $white;
+    }
+    .yui-calendar td.calcell.selected {
+      background: $white;
+    }
+    .yui-calendar a.calnav {
+      background: $white;
+      color: $black;
+      border: 1px solid lightgrey;
+    }
+  }
+  .yui-calendar a.calnavleft, .yui-calendar a.calnavright {
+    display: inline-block;
+    font-weight: bold;
+    background-position: 0 0;
+    padding: 0;
+    margin-top: 10px;
+    width: 25px;
+    height: 30px;
+    text-transform: uppercase;
+    color: $black;
+    background-repeat: no-repeat;
+    background-size: 100%;
+  }
+  .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default button {
+    background-color: rgb(147, 164, 179);
+    text-shadow: none;
+  }
+  .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn button {
+    background-color: rgb(147, 164, 179);
+  }
+  .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn.yui-default {
+    background-color: rgb(147, 164, 179);
+    border: none;
+    margin-right: 0.6em;
+  }
+  .yui-calcontainer .yui-cal-nav .yui-cal-nav-btn {
+    background-color: rgb(147, 164, 179);
+  }
+  .yui-calcontainer .yui-cal-nav-b {
+    text-align: left;
+  }
+}

themes/suite8/css/suitep-base/calls.scss

@@ -0,0 +1,71 @@
+.view-module-Calls {
+    #EditView .buttons, .action_buttons {
+        bottom: 0.8em;
+    }
+    input[type=button] {
+        margin: 0.2em;
+        font-weight: bold;
+        height: 2.2em;
+        line-height: 1.1em;
+        background-color: rgb(147, 164, 179);
+        text-transform: capitalize; 
+        border-radius: 0.2em;
+        padding: 0.3em 1em;
+        letter-spacing: 0.05em;
+        &:hover {
+            background: $btn-hover-bg-color;
+        }
+    }
+    input[type="button"][disabled] {
+        opacity: 0.5;
+    }
+    #scheduler .schedulerDiv {        
+        padding-top: 0; 
+        margin-top: 1em;
+        h3 {
+            font-size: 16px;
+        }
+    }
+    .schedulerInvitees {
+        margin-top: 1em;
+        border-bottom: 1px solid $panel-border-bg;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+        h3 {
+            margin-top: 0;
+            font-size: 16px;
+        }
+    }
+    input[type=text],input[type=password],input[type=email],input[type=number]{
+        background-color: $transparent-color;
+        border: 1px solid $form-border-color;        
+    }
+    #scheduler_search {
+        .button {
+            margin: 0.2em;
+            font-weight: bold;
+            height: 2.2em;
+            line-height: 1.1em;
+            background-color: rgb(147, 164, 179);
+            text-transform: capitalize; 
+            border-radius: 0.2em;
+            padding: 0.3em 1em;
+            letter-spacing: 0.05em;
+            &:hover {
+                background: $btn-hover-bg-color;
+            }
+        }
+    } 
+    #create-invitees {
+        padding-top:0;
+        margin-top: 1em;
+        padding-bottom: 20px;
+        h3 {
+            font-size: 16px;
+        }
+    }
+    #list_div_win {
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
+    }
+}

themes/suite8/css/suitep-base/campaign-email.scss

@@ -7,6 +7,9 @@
             color: $shell-grey;
         }
     }
+    table.view {
+        border-radius: 10px;
+    }
     .action-button {
         position: absolute;
         top: 0;

themes/suite8/css/suitep-base/configure-settings.scss

@@ -0,0 +1,52 @@
+.view-action-config {
+    table.table {
+        border-radius: 10px;
+        tr td {
+            padding-left: 1.5em;
+            
+        }
+    }
+    hr {
+        border: 1px solid lightgray;
+        height: 0;
+    }
+    .action-buttons-config {
+        position: absolute;
+        right: 0;
+        margin-top: -4.3em;
+        .button {
+            background-color: $nepal-grey;
+            border-radius: 0.2em;
+            font-weight: bold;
+            height: 2.2em;
+            line-height: 1em;
+            letter-spacing: 0.05em;
+            padding: 0.3em 1em;
+            text-transform: capitalize;
+            margin: 0.2em;
+            &:hover {
+                background: $pale-blue;
+            }
+        }
+    }
+    .moduleTitle {
+        border-bottom: 1px solid lightgray;
+        margin-bottom: 1em;
+    }
+    input[type=text],input[type=password],input[type=email],input[type=number]{
+        background-color: $transparent-color;
+        border: 1px solid $form-border-color;
+    }
+    select {
+        background: url($select-edit-background-url) no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+    }
+    textarea {
+        background-color: $transparent-color;
+        border: 1px solid $form-border-color;
+    }
+    .action-button-footer {
+        display: none;
+    }
+}

themes/suite8/css/suitep-base/connector.scss

@@ -0,0 +1,5 @@
+.view-module-Connectors {
+    table.view {
+        border-radius: 10px;
+    }
+}

themes/suite8/css/suitep-base/contracts.scss

@@ -0,0 +1,41 @@
+.view-module-AOS_Contracts {
+    select {
+        background: url($select-edit-background-url) no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+        margin-bottom: 0.5em;
+    }
+}
+
+.view-module-Surveys {
+    select {
+        background: url($select-edit-background-url) no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+        margin-bottom: 0.5em;
+    }    
+    textarea {
+        background-color: $transparent-color;
+        border: 1px solid $form-border-color;
+    }    
+}
+
+.view-module-FP_Event_Locations {
+    textarea {
+        background-color: $transparent-color;
+        border: 1px solid $form-border-color;
+    } 
+}
+
+.view-module-AOS_Quotes {
+    select {
+        background: url($select-edit-background-url) no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+        margin-bottom: 0.5em;
+    }    
+    textarea {
+        background-color: $transparent-color;
+        border: 1px solid $form-border-color;
+    } 
+}

themes/suite8/css/suitep-base/currency-view.scss

@@ -49,5 +49,8 @@
     .h3Row {
         border-top: 1px solid lightgray;
         margin-top: 1.5em;
-    }     
+    }   
+    table.edit {
+        border-radius: 10px;
+    }  
 }

themes/suite8/css/suitep-base/editview.scss

@@ -64,7 +64,7 @@ div#searchResults {
 #scheduler .schedulerDiv {
   background-color: $panel-bg;
   color: $main-font-color;
-  padding: 20px 20px 10px 20px;
+  padding: 20px 20px 20px 20px;
   border: 1px solid $panel-border-bg;
   border-radius: $border-radius-base;
   text-align: left;
@@ -121,7 +121,6 @@ div#searchResults {
   border-left: 4px solid $scheduler-end-color ;
 }
 
-
 #scheduler .schedulerDiv table tr.schedulerAttendeeRow td.schedulerSlotCellEndTime.free {
   border-left: 4px solid $scheduler-end-color ;
 }
@@ -179,7 +178,7 @@ div#searchResults {
   height: 2.2em;
   line-height: 1.1em;
   background-color: rgb(147, 164, 179);
-  text-transform: capitalize; 
+  text-transform: capitalize;
   border-radius: 0.2em;
   padding: 0.3em 1em;
   letter-spacing: 0.05em;
@@ -201,7 +200,7 @@ div#searchResults {
   height: 2.2em;
   line-height: 1.1em;
   background-color: rgb(147, 164, 179);
-  text-transform: capitalize; 
+  text-transform: capitalize;
   border-radius: 0.2em;
   padding: 0.3em 1em;
   letter-spacing: 0.05em;
@@ -229,8 +228,8 @@ div#searchResults {
 #list_div_win {
   background-color: $panel-bg;
   color: $main-font-color;
-  padding: 20px 20px 10px 20px;
+  padding: 20px;
-  margin-top: 1em;
+  margin-top: 0;
   border: 1px solid $panel-border-bg;
   border-radius: $border-radius-base;
   text-align: left;
@@ -511,13 +510,6 @@ textarea {
   width: 100%;
 }
 
-table.view {
-  padding: 20px 16px 22px 30px;
-  margin-top: 3px;
-  margin-bottom: 3px;
-  width: 100%;
-}
-
 [field=number] {
   vertical-align: middle;
   line-height: $input-line-height;
@@ -2285,6 +2277,7 @@ table.view {
   background: $main-alternate-bg;
   padding: 0;
   margin: 0;
+  width: 100%;
 }
 
 .evenListRowS1 {
@@ -5194,9 +5187,54 @@ object {
 @media (min-width: 980px) {
   #dialog1_c {
     z-index: 5;
-    margin-top: 100px;
+    position: absolute;
-    margin-left: 40%;
+    top: 30%!important;
+    left: 50% !important;
+    transform: translate(-50%, -50%);
+    padding: 0;
+    .container-close {
+      color: $white;
+    }
+    .yui-module {
+      border-radius: 4px;
+    }
+    .yui-panel .bd {
+      padding: 8px;
+    }
+    input[type=textbox] {
+      background-color:$transparent-color;
+      border: 1px solid $form-border-color;
+      line-height: 26px;
+      border-radius: 0.3em;
+    }
+    select {
+      background: url($select-edit-background-url) no-repeat right;
+      background-size: 25px 11px;
+      border-color: $bright-grey;
   }
+  button {
+    margin: 0.2em;
+    font-weight: bold;
+    height: 2.2em;
+    line-height: 1.1em;
+    background-color: rgb(147, 164, 179);
+    text-transform: capitalize;
+    border-radius: 0.2em;
+    padding: 0.3em 1em;
+    letter-spacing: 0.05em;
+    border: none;
+    color: $white;
+    &:hover {
+        background: $btn-hover-bg-color;
+    }
+  }
+  #date_start_trigger {
+    line-height: 2;
+    margin-right: 0.5em;
+    margin-left: 0.5em;
+    cursor: pointer;
+  }
+}
 
   #dlg {
     left: 40%;
@@ -5205,7 +5243,6 @@ object {
   #dlg_c {
     left: 50%;
   }
-
 }
 
 @media (max-width: 1023px) {
@@ -5216,7 +5253,6 @@ object {
 }
 
 @media (min-width: 1024px) {
-
   form[name="wizform"] div.wizard-unique-elem {
     width: 1000px;
   }
@@ -5226,7 +5262,6 @@ object {
   #cal-edit {
     margin: 0 0 0 200px;
   }
-
 }
 
 @media (max-width: 1360px) {

themes/suite8/css/suitep-base/email-queue.scss

@@ -0,0 +1,5 @@
+.view-module-EmailMan {
+    .view {
+        border-radius: 10px;
+    }
+}

themes/suite8/css/suitep-base/event-delegates.scss

@@ -0,0 +1,41 @@
+.view-module-FP_events {
+    .list .SugarActionMenu .sugar_action_button .subnav:hover {
+        background:rgb(147, 164, 179);
+    }
+    .clickMenu.SugarActionMenu>li>ul>li {
+        background:rgb(147, 164, 179);
+        float: right;
+    }
+    table.subpanel-table .pagination a {
+        background: transparent;
+        padding: 5px 21px!important;
+    }
+    .list .SugarActionMenu .sugar_action_button .subnav {
+        padding: 0;
+    }
+    
+    .list .SugarActionMenu .sugar_action_button>.subnav a {
+        &:hover {
+            background: rgb(75, 114, 145);
+        }
+    }
+    #selectLinkTop>.sugar_action_button>ul.subnav {
+        top: 24px;
+    }
+    .subpanel-table #selectLinkTop li.sugar_action_button {
+        top: 0;
+        bottom: 0;
+    }
+    .panel-default.sub-panel>.panel-heading>a {
+        position: fixed;
+        display: flex;
+    }
+    #selectLinkTop {
+        top: 1em;
+        display: table-cell;
+        position: absolute;
+    }
+    table.view {
+        position: relative;
+    }
+}

themes/suite8/css/suitep-base/gantt-chart.scss

@@ -0,0 +1,102 @@
+.view-action-view_GanttChart {
+    #exportToPDFSpan {       
+        .ui-icon, .ui-widget-content .ui-icon {
+            background: url($ganttchart-close-background-url) no-repeat right;
+            background-size: 70%;
+            margin-top: -4px;
+            margin-left: -5px;
+        }
+        button {
+            color: transparent;
+            background: $white;
+            border: none;
+        }
+    }
+    .gantt-btn {
+        .ui-icon-plusthick {
+            display: inherit;
+            padding: 10px;
+            vertical-align: middle;
+        }
+        #add_button {
+            padding: 0.1em 0.5em 0.6em 0.4em;
+            background-color: rgb(147, 164, 179);
+            border-radius: 4px;
+            font-size: 11px;
+            font-weight: 600;
+            border: none;
+            color: $white;
+            &:before {
+                content: ' \002B';
+                color: $white;
+                font-size: 1.5em;
+            }
+            .ui-button-icon {
+                display: none;
+            }
+        }
+    }
+  }
+
+  .add-new-task {
+    p {
+        display: none;
+    }
+    .projects-gantt-chart-popup {
+      select {
+          background: url($select-edit-background-url) no-repeat right;
+          background-size: 25px 11px;
+          border-color: $bright-grey;
+          line-height: inherit;
+          width: 30%;
+      }
+      input[type=text],input[type=password],input[type=email],input[type=number]{
+          background-color: $transparent-color;
+          border: 1px solid $form-border-color;    
+          line-height: 16px;   
+      }
+      fieldset {
+          td {
+              width: 47%;
+          }
+          td:nth-child(2) {
+              position: relative;
+              top: -1.3em;
+          }
+      }       
+    }     
+}
+
+.ui-dialog {
+    padding: 0;
+}
+
+.ui-draggable .ui-dialog-titlebar {
+  text-align: center;
+  border-bottom: 1px solid #dee2e6;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.ui-dialog .ui-dialog-buttonpane button {
+  background-color: $nepal-grey;
+  border-radius: 0.2em;
+  font-weight: bold;
+  height: 2.2em;
+  line-height: 1em;
+  letter-spacing: 0.05em;
+  padding: 0.3em 1em;
+  text-transform: capitalize;
+  border: none;
+  color: $white;
+  font-size: 12px;
+  &:hover {
+      background: $pale-blue;
+  }
+}
+
+.ui-dialog .ui-dialog-titlebar-close {
+  color: $transparent-color;
+  background: $transparent-color;
+  border: none;
+}  

themes/suite8/css/suitep-base/history-subpanel.scss

@@ -9,6 +9,9 @@
             }
         }
     }
+    table.view {
+        border-radius: 10px;
+    }
 }
 
 .view-action-historyContactsEmails {

themes/suite8/css/suitep-base/invoices.scss

@@ -0,0 +1,8 @@
+.view-module-AOS_Invoices {
+    select {
+        background: url($select-edit-background-url) no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+        margin-bottom: 0.5em;
+    }
+}

themes/suite8/css/suitep-base/listview.scss

@@ -1863,7 +1863,7 @@ div.qtip.qtip-default {
 }
 
 .search_form .view .dateTimeRangeChoice select {
-  width: 90px;
+  width: 130px;
   margin-right: 4px;
 }
 
@@ -3422,7 +3422,7 @@ ul.clickMenu > li > span.searchAppliedAlert {
 
 .search_form.non-popup input[type="text"] {
   border: none;
-  height: 20px;
+  height: 28px;
   min-height: 20px;
   padding: 5px;
   line-height: 20px;
@@ -3430,10 +3430,11 @@ ul.clickMenu > li > span.searchAppliedAlert {
 
 .search_form.non-popup select {
   border: none;
-  height: 20px;
+  height: 28px;
   min-height: 20px;
   padding: 5px;
   line-height: 20px;
+  width: 150px;
 }
 
 .search_form.non-popup textarea {

themes/suite8/css/suitep-base/meetings.scss

@@ -19,8 +19,8 @@
             font-size: 16px;
         }
     }
-    #scheduler .schedulerDiv {        
+    #scheduler .schedulerDiv {
-        padding-top: 0; 
+        padding-top: 0;
         margin-top: 1em;
         h3 {
             font-size: 16px;
@@ -28,7 +28,7 @@
     }
     input[type=text],input[type=password],input[type=email],input[type=number]{
         background-color: $transparent-color;
-        border: 1px solid $form-border-color;        
+        border: 1px solid $form-border-color;
     }
     #EditView .edit input[type=submit]#invitees_search {
         margin: 0.2em;
@@ -36,21 +36,21 @@
         height: 2.2em;
         line-height: 1.1em;
         background-color: rgb(147, 164, 179);
-        text-transform: capitalize; 
+        text-transform: capitalize;
         border-radius: 0.2em;
         padding: 0.3em 1em;
         letter-spacing: 0.05em;
         &:hover {
             background: $btn-hover-bg-color;
         }
-    }  
+    }
     input[type=button] {
         margin: 0.2em;
         font-weight: bold;
         height: 2.2em;
         line-height: 1.1em;
         background-color: rgb(147, 164, 179);
-        text-transform: capitalize; 
+        text-transform: capitalize;
         border-radius: 0.2em;
         padding: 0.3em 1em;
         letter-spacing: 0.05em;
@@ -67,4 +67,10 @@
         border-top-right-radius: 0;
         margin-top: 0;
     }
-}
+    select {
+        background: url($select-edit-background-url) no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+        margin-bottom: 0.5em;
+    }
+}

themes/suite8/css/suitep-base/module-builder.scss

@@ -0,0 +1,8 @@
+.view-module-ModuleBuilder {
+    .yui-layout .yui-layout-wrap {
+        padding: 1em;
+    }
+    .yui-layout-unit-center .yui-navset .yui-content, .yui-layout .yui-layout-unit.yui-layout-unit-center div.yui-layout-bd {
+        border-radius: 10px;
+    }
+}

themes/suite8/css/suitep-base/notes.scss

@@ -0,0 +1,11 @@
+.view-module-Notes {
+    select {
+        background: url($select-edit-background-url) no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+        margin-bottom: 0.5em;
+    }
+    .tabDetailViewDFLink {
+        line-height: 0;
+    }
+}

themes/suite8/css/suitep-base/oauth-consumer-key.scss

@@ -0,0 +1,5 @@
+.view-module-OAuth2Tokens {
+    .listViewEmpty {
+        border-radius: 10px;
+    }
+}

themes/suite8/css/suitep-base/project-resource.scss

@@ -33,4 +33,94 @@ hr.spacer {
     margin-top: 0;
     margin-bottom: 10px;
     border-top: 1px solid lightgray;
-}
+}
+
+.view-action-view_GanttChart {
+    #exportToPDFSpan {       
+        .ui-icon, .ui-widget-content .ui-icon {
+            background: url('../../../../../themes/suite8/images/close.png') no-repeat;
+            background-size: 70%;
+            margin-top: -4px;
+            margin-left: -5px;
+        }
+        button {
+            color: transparent;
+            background: $white;
+            border: none;
+        }
+    }
+  }
+/* Projects Resource Panel Edit View */
+
+.view-module-Project {    
+    #scheduler .schedulerDiv {
+        padding-top: 0; 
+        margin-top: 1em;
+        h2 {
+            font-size: 16px;
+            font-weight: bold;
+        }
+    }
+    #create-invitees {
+        padding-top:0;
+        margin-top: 1em;
+        h3 {
+            font-size: 16px;
+        }
+    }
+    .schedulerInvitees {
+        margin-top: 1em;
+        border-bottom: 1px solid $panel-border-bg;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+        h3 {
+            margin-top: 0;
+            font-size: 16px;
+        }
+    }
+    input[type=text],input[type=password],input[type=email],input[type=number]{
+        background-color: $transparent-color;
+        border: 1px solid $form-border-color;        
+    }
+    #scheduler .edit input[type=submit]#invitees_search {
+        margin: 0.2em;
+        font-weight: bold;
+        height: 2.2em;
+        line-height: 1.1em;
+        background-color: rgb(147, 164, 179);
+        text-transform: capitalize; 
+        border-radius: 0.2em;
+        padding: 0.3em 1em;
+        letter-spacing: 0.05em;
+        &:hover {
+            background: $btn-hover-bg-color;
+        }
+    }
+    #scheduler {
+        input[type=button] {
+            margin: 0.2em;
+            font-weight: bold;
+            height: 2.2em;
+            line-height: 1.1em;
+            background-color: rgb(147, 164, 179);
+            text-transform: capitalize; 
+            border-radius: 0.2em;
+            padding: 0.3em 1em;
+            letter-spacing: 0.05em;
+            &:hover {
+                background: $btn-hover-bg-color;
+            }
+        }
+        input[type="button"][disabled] {
+            background: #a59f9f;
+            opacity: 0.5;
+        }
+    } 
+    div.buttons {
+        #SAVE_HEADER,#CANCEL_HEADER {
+            display: none;
+        }
+    }    
+}
+
+/* Projects Resource Panel Edit View Ends here */

themes/suite8/css/suitep-base/rename-modules.scss

@@ -49,4 +49,7 @@
         padding-right: 0.5em;
         vertical-align: middle;
     }
+    table.view {
+        border-radius: 10px;
+    }
 }

themes/suite8/css/suitep-base/role-create.scss

@@ -29,6 +29,7 @@
             
         }
         table.view {
+            border-radius: 10px;
             tr td {
                 text-transform: uppercase;
                 font-weight: 600;

themes/suite8/css/suitep-base/roles-management.scss

@@ -7,6 +7,8 @@
     table.role-detail {
         position: relative;
         top: 2em;
+        border-radius: 10px;
+        overflow: hidden;
     }
     .action-button {
         display: flex;
@@ -57,4 +59,8 @@
             }
         }      
     }
+    .view {
+        border-radius: 10px;
+        overflow: hidden;
+    }
 }

themes/suite8/css/suitep-base/scheduler.scss

@@ -25,4 +25,12 @@
     #button_deselect_top, #button_deselect_bottom {
         padding-left: 1.5em;
     }
-}
+    .list tr th {
+        span {
+            color: $black;
+        }
+    }
+    .box-panel {
+        border-radius: 10px;
+    }
+}

themes/suite8/css/suitep-base/security-suite-setting.scss

@@ -22,6 +22,7 @@
             }
         }
         margin-top: 1em;
+        border-radius: 10px;
         h4 {
             margin-top: 1em;
             font-weight: 600;

themes/suite8/css/suitep-base/system-settings.scss

@@ -2,6 +2,10 @@
     .btn-hide {
         display: none;
     }
+    table.view {
+        border-radius: 10px;
+        margin-bottom: 1em;
+    }
     table.actionsContainer {
         .button {
             background-color: $nepal-grey;

themes/suite8/css/suitep-base/user-wizard.scss

@@ -0,0 +1,160 @@
+.user-wizard {
+    .view {
+        background: $transparent-color;
+        padding: 2em 5em 2em 5em;
+        tr th {
+            padding: 0;
+            border-bottom: 1px solid $bright-grey;
+        }
+        tr td {
+            padding-top: 0.5em;
+            white-space: normal;
+            text-transform: capitalize;
+            vertical-align: middle;
+            color: $label-light-black;
+        }
+    }
+    hr {
+        border-bottom: 0.5px solid $bright-grey;
+        height: 0.1px;
+        margin-top: 5px;
+        margin-bottom: 5px;
+    }
+    textarea {
+        background-color: $white;
+        border: 1px solid $form-border-color;
+    }
+    select {
+        background: url($select-edit-background-url) $white no-repeat right;
+        background-size: 25px 11px;
+        border-color: $bright-grey;
+    }
+    input[type=text],input[type=password],input[type=email] {
+        background-color: $white;
+        border: 1px solid $form-border-color;
+    }
+    input:not([type]) {
+        background-color:$white;
+        border: 1px solid $form-border-color;
+    }
+    input[type=submit].button:hover {
+        background: $pale-blue;
+    }
+    a {
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+    .button {
+        padding: 0 10px;
+        margin: 4px;
+        margin: 0.2em;
+        font-weight: bold;
+        height: 2.2em;
+        line-height: 1.1em;
+        padding: 0.3em 0.9em;
+        background-color: $nepal-grey;
+        text-transform: capitalize;
+        &:hover {
+            background: $pale-blue;
+        }
+    }
+    h2 {
+        font-size: 1.8em;
+        color: $midnight-blue;        
+    }
+    .user-icon {
+        img {
+            width: 30px;
+            margin-top: 7px;
+        }
+    }
+    .welcome {
+        min-height: 100vh;
+        background-size: 100%;
+        background-repeat: no-repeat;
+        @media (min-width:768px) and (max-width:1024px) {
+            background-size: auto 100%;
+            background-repeat: no-repeat;
+            background-position: bottom top;
+        }
+        @media (max-width: 750px) {
+            background-size: cover; 
+        }
+        .row {
+            display: flex;
+            justify-content: center;
+        }
+        .panel {
+            padding: 2.5em 2.5em 1.5em 2.5em;
+            margin-top: 5em;
+            background: rgba(255,255,255,0.7);
+            display: flex;
+            flex-direction: column;
+            width: 50%;
+            @media (max-width: 750px) {
+                background: transparent; 
+                box-shadow: none;
+            }
+        }
+        h1 {
+            margin-top: 0.2em; 
+            margin-bottom: 0;
+        }
+        .open-crm-txt {
+            color: $shell-grey;
+            font-size: 1.3em;
+            font-weight: 300;
+            letter-spacing: .1em;
+            text-transform: uppercase;
+            border-bottom: 1px solid #958383;
+        }
+        .wizard-mainlbl {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+        .wizard-lbl {
+            margin-bottom: 0.5em;
+            padding: 0.1em;
+        }
+        .wizard-btn {
+            align-self: center;
+            display: flex;
+            padding-top: 0.5em;
+        }
+        .button {
+            background: $modal-btn-hover;
+        }
+    }
+    .wizard-finish {        
+        .wizard-finish-lbl {
+            border-bottom: 1px solid $bright-grey;
+            margin-top: 1em;
+            padding-bottom: 0.5em;
+            color: $shell-grey;
+            font-size: 1.3em;
+            font-weight: 300;
+            letter-spacing: .1em;
+            text-transform: uppercase;
+            margin-top: 0.3em;
+            padding-bottom: 0.3em;
+        }
+        .view {
+            tr td {
+                padding-top: 0;
+            }
+            padding: 1.8em 0 0 5em;
+            margin: 0;
+        }        
+        tr th {
+            border-bottom: none;
+        }
+        h2 {
+            margin-bottom: 0;
+        }        
+    }
+    .img-desc {
+        line-height: 10px;
+    }    
+}

themes/suite8/images/chevron-left.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" stroke="#007bff" stroke-width="1px" class="bi bi-chevron-left" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z"/>
+</svg>

themes/suite8/images/chevron-right.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" stroke="#007bff" stroke-width="1px" class="bi bi-chevron-right" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z"/>
+</svg>

themes/suite8/include/Dashlets/DashletHeader.tpl

@@ -11,13 +11,13 @@
                 </td>
                 <td style="padding-right: 0px;" nowrap="" width="1%">
                     <div class="dashletToolSet">
-                        <a href="javascript:void(0)" title="{$DASHLET_BUTTON_ARIA_REFRESH}" aria-label="{$DASHLET_BUTTON_ARIA_REFRESH}" onclick="SUGAR.mySugar.retrieveCurrentPage(); return false;">                            
+                        <a href="javascript:void(0)" title="{$DASHLET_BUTTON_ARIA_REFRESH}" aria-label="{$DASHLET_BUTTON_ARIA_REFRESH}" onclick="SUGAR.mySugar.retrieveDashlet('{$DASHLET_ID}'); return false;">
                             <span class="refresh">{sugar_getimage name="refresh"}</span>
-                        </a>                        
+                        </a>
-                        <a href="javascript:void(0)" title="{$DASHLET_BUTTON_ARIA_EDIT}" aria-label="{$DASHLET_BUTTON_ARIA_EDIT}" onclick="SUGAR.mySugar.configureDashlet('{$DASHLET_ID}'); return false;">                            
+                        <a href="javascript:void(0)" title="{$DASHLET_BUTTON_ARIA_EDIT}" aria-label="{$DASHLET_BUTTON_ARIA_EDIT}" onclick="SUGAR.mySugar.configureDashlet('{$DASHLET_ID}'); return false;">
-                            <span class="settings">{sugar_getimage name="settings"}</span>                           
+                            <span class="settings">{sugar_getimage name="settings"}</span>
-                        </a>                        
+                        </a>
-                        <a href="javascript:void(0)" title="{$DASHLET_BUTTON_ARIA_DELETE}" aria-label="{$DASHLET_BUTTON_ARIA_DELETE}" onclick="SUGAR.mySugar.deleteDashlet('{$DASHLET_ID}'); return false;">                            
+                        <a href="javascript:void(0)" title="{$DASHLET_BUTTON_ARIA_DELETE}" aria-label="{$DASHLET_BUTTON_ARIA_DELETE}" onclick="SUGAR.mySugar.deleteDashlet('{$DASHLET_ID}'); return false;">
                             <span class="cross">{sugar_getimage name="cross"}</span>
                         </a>
                     </div>
@@ -29,4 +29,4 @@
 </div>
 <div class="bd">
     <div class="ml"></div>
-    <div class="bd-center">
+    <div class="bd-center">

themes/suite8/include/DetailView/DetailView.tpl

@@ -351,7 +351,7 @@
                     $(function(){
                         $('#content ul.nav.nav-tabs > li > a[data-toggle="tab"]').click(function(e){
                             if(typeof $(this).parent().find('a').first().attr('id') != 'undefined') {
-                                var tab = parseInt($(this).parent().find('a').first().attr('id').match(/^tab(.)*$/)[1]);
+                                var tab = parseInt($(this).parent().find('a').first().attr('id').match(/^tab(?<number>(.)*)$/)[1]);
                                 selectTabDetailView(tab);
                             }
                         });

themes/suite8/include/EditView/EditView.tpl

@@ -249,7 +249,7 @@ $(document).ready(function() {ldelim}
     $(function(){
         $('#EditView_tabs ul.nav.nav-tabs li > a[data-toggle="tab"]').click(function(e){
             if(typeof $(this).parent().find('a').first().attr('id') != 'undefined') {
-                var tab = parseInt($(this).parent().find('a').first().attr('id').match(/^tab(.)*$/)[1]);
+                var tab = parseInt($(this).parent().find('a').first().attr('id').match(/^tab(?<number>(.)*)$/)[1]);
                 selectTab(tab);
             }
         });