Merge pull request #350 from bcgov/dev

DEV -> UAT

docker/advocase-image/build-files/suitecrm/public/legacy/custom/modules/Meetings/metadata/editviewdefs.php

@@ -1,121 +1,112 @@
 <?php
-$viewdefs ['Meetings'] = 
+$viewdefs ['Meetings'] =
 array (
-  'EditView' => 
+  'EditView' =>
   array (
-    'templateMeta' => 
+    'templateMeta' =>
     array (
-      'includes' => 
+      'includes' =>
       array (
-        0 => 
+        0 =>
         array (
           'file' => 'modules/Reminders/Reminders.js',
         ),
       ),
       'maxColumns' => '2',
-      'form' => 
+      'form' =>
       array (
-        'hidden' => 
+        'hidden' =>
         array (
           0 => '<input type="hidden" name="isSaveAndNew" value="false">',
         ),
-        'buttons' => 
+        'buttons' =>
         array (
-          0 => 
+          0 => 'CANCEL',
+          1 =>
           array (
             'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_HEADER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
           ),
-          1 => 'CANCEL',
-          2 => 
-          array (
-            'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_header" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
-          ),
-          3 => 
-          array (
-            'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_header" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
-          ),
         ),
         'headerTpl' => 'modules/Meetings/tpls/header.tpl',
-        'buttons_footer' => 
+        'buttons_footer' =>
         array (
-          0 => 
+          0 =>
           array (
             'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_FOOTER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
           ),
           1 => 'CANCEL',
-          2 => 
+          2 =>
           array (
             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_footer" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
           ),
-          3 => 
+          3 =>
           array (
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_footer" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
           ),
         ),
         'footerTpl' => 'modules/Meetings/tpls/footer.tpl',
       ),
-      'widths' => 
+      'widths' =>
       array (
-        0 => 
+        0 =>
         array (
           'label' => '10',
           'field' => '30',
         ),
-        1 => 
+        1 =>
         array (
           'label' => '10',
           'field' => '30',
         ),
       ),
       'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
 {sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}
-<script>toggle_portal_flag();function toggle_portal_flag()  {ldelim} {$TOGGLE_JS} {rdelim} 
+<script>toggle_portal_flag();function toggle_portal_flag()  {ldelim} {$TOGGLE_JS} {rdelim}
 function formSubmitCheck(){ldelim}if(check_form(\'EditView\')){ldelim}document.EditView.submit();{rdelim}{rdelim}</script>',
       'useTabs' => false,
-      'tabDefs' => 
+      'tabDefs' =>
       array (
-        'LBL_MEETING_INFORMATION' => 
+        'LBL_MEETING_INFORMATION' =>
         array (
           'newTab' => false,
           'panelDefault' => 'expanded',
         ),
       ),
     ),
-    'panels' => 
+    'panels' =>
     array (
-      'lbl_meeting_information' => 
+      'lbl_meeting_information' =>
       array (
-        0 => 
+        0 =>
         array (
-          0 => 
+          0 =>
           array (
             'name' => 'name',
           ),
-          1 => 
+          1 =>
           array (
             'name' => 'date_end',
             'type' => 'datetimecombo',
-            'displayParams' => 
+            'displayParams' =>
             array (
               'required' => true,
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
           ),
         ),
-        1 => 
+        1 =>
         array (
-          0 => 
+          0 =>
           array (
             'name' => 'date_start',
             'type' => 'datetimecombo',
-            'label' => 'LBL_ADVOCASE_COMM_DATE',
-            'displayParams' => 
+            'displayParams' =>
             array (
               'required' => true,
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
           ),
-          1 => 
+          1 =>
           array (
             'name' => 'duration',
             'customCode' => '
@@ -131,37 +122,37 @@ function formSubmitCheck(){ldelim}if(check_form(\'EditView\')){ldelim}document.E
                         initEditView(YAHOO.util.Selector.query(\'#duration\')[0].form);
                     });
                     {/literal}
-                </script>            
+                </script>
             ',
             'customCodeReadOnly' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
           ),
         ),
-        2 => 
+        2 =>
         array (
-          0 => 
+          0 =>
           array (
             'name' => 'advocase_comm_type_c',
             'studio' => 'visible',
             'label' => 'LBL_ADVOCASE_COMM_TYPE',
           ),
           1 => '',
         ),
-        3 => 
+        3 =>
         array (
-          0 => 
+          0 =>
           array (
             'name' => 'parent_name',
             'label' => 'LBL_LIST_RELATED_TO',
           ),
           1 => '',
         ),
-        4 => 
+        4 =>
         array (
-          0 => 
+          0 =>
           array (
             'name' => 'description',
             'comment' => 'Full text of the note',
-            'label' => 'LBL_COMMUNICATION_NOTES',
+            'label' => 'LBL_DESCRIPTION',
           ),
           1 => '',
         ),

docker/advocase-image/build-files/suitecrm/public/legacy/include/language/en_us.lang.php

@@ -1460,7 +1460,7 @@
     'LBL_LINK_ALL' => 'All',
     'LBL_LINK_RECORDS' => 'Records',
     'LBL_LINK_SELECT' => 'Select',
-    'LBL_LINK_ACTIONS' => 'ACTIONS',
+    'LBL_LINK_ACTIONS' => 'More Actions',
     'LBL_CLOSE_ACTIVITY_HEADER' => 'Confirm',
     'LBL_CLOSE_ACTIVITY_CONFIRM' => 'Do you want to close this #module#?',
     'LBL_INVALID_FILE_EXTENSION' => 'Invalid File Extension',

docker/advocase-image/build-files/suitecrm/public/legacy/modules/SugarFeed/Dashlets/SugarFeedDashlet/UserPostForm.tpl

@@ -0,0 +1,72 @@
+{*
+
+/**
+ *
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
+ *
+ * SuiteCRM is an extension to SugarCRM Community Edition developed by SalesAgility Ltd.
+ * Copyright (C) 2011 - 2018 SalesAgility Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ *
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address [email protected].
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo and "Supercharged by SuiteCRM" logo. If the display of the logos is not
+ * reasonably feasible for technical reasons, the Appropriate Legal Notices must
+ * display the words "Powered by SugarCRM" and "Supercharged by SuiteCRM".
+ */
+
+
+*}
+
+<form name='form_{$id}' id='form_{$id}'>
+<div id='more_{$id}' style='display:none;padding-top:5px'>
+<table>
+<tr>
+    <td>{html_options name='link_type' options=$link_types}</td>
+    <td><input type='text' name='link_url' title="{sugar_translate label='LBL_URL_LINK_TITLE' module='SugarFeed'}"  size='30'/></td>
+
+</tr>
+</table>
+</div>
+</div>
+
+</form>
+
+<form name='SugarFeedReplyForm_{$id}' id='SugarFeedReplyForm_{$id}'>
+<input type='hidden' name='parentFeed' value=''>
+<div style='white-space:nowrap; display: none;'>
+ <table border=0 cellspacing=0 cellpadding=2>
+    <tr>
+      <td nowrap="nowrap"><b>{$user_name}</b>&nbsp;</td>
+      <td style="padding-right: 5px;"><input id="text" name="text" type="text" size='25' maxlength='100' value="" /></td>
+      <td nowrap="nowrap">
+      <input type="submit" value="{$LBL_POST}" class="button" style="vertical-align:top" onclick="SugarFeed.replyToFeed('{$id}'); return false;"></td>
+    </tr>
+</table>
+</div>
+</form>
+

docker/advocase-image/build-files/suitecrm/public/legacy/themes/suite8/css/suitep-base/aor.scss

@@ -341,6 +341,10 @@ ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover {
     border-top-left-radius: 0;
   }
 
+  .list-view-rounded-corners > table th:first-of-type::after {
+    content: url('data:image/svg+xml,<svg width="9" height="13" viewBox="0 0 9 13" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M3.87109 0.898438C4.19922 0.542969 4.77344 0.542969 5.10156 0.898438L8.60156 4.39844C8.84766 4.64453 8.92969 5.02734 8.79297 5.35547C8.65625 5.68359 8.35547 5.90234 8 5.90234H1C0.644531 5.90234 0.316406 5.68359 0.179688 5.35547C0.0429688 5.02734 0.125 4.64453 0.371094 4.39844L3.87109 0.898438ZM3.87109 12.6289L0.371094 9.12891C0.125 8.88281 0.0429688 8.5 0.179688 8.17188C0.316406 7.84375 0.644531 7.625 1 7.625H8C8.32812 7.625 8.65625 7.84375 8.79297 8.17188C8.92969 8.5 8.84766 8.88281 8.60156 9.12891L5.10156 12.6289C4.77344 12.9844 4.19922 12.9844 3.87109 12.6289Z" fill="%232D2D2D"/></svg>');
+  }
+
   .list-view-rounded-corners > table th:last-of-type {
     border-top-right-radius: 0;
   }

docker/advocase-image/build-files/suitecrm/public/legacy/themes/suite8/css/suitep-base/aow.scss

@@ -115,7 +115,7 @@
 
 #aow_conditionLines td:first-of-type button {
   margin-top: 6px;
-  line-height: 30px;  
+  line-height: 30px;
 }
 
 #aow_conditionLines input {
@@ -512,7 +512,7 @@
       padding: 0!important;
       vertical-align: middle;
     }
-  }  
+  }
 }
 
 table.lines {
@@ -565,7 +565,7 @@ table.relationship {
     height: 28px!important;
     color: $black;
     padding: 7px!important;
-  }  
+  }
 }
 
 table.email-line {
@@ -600,9 +600,11 @@ table.email-line {
     opacity: 0.2;
     position: absolute;
     top: 0.3em;
-    right: 0px;
-    margin: 0;
-    padding-right: 16px;
+    right: 185px;
+  }
+i
+  #date_start_trigger.btn {
+    right: 0;
   }
 }