diff --git a/inc/inc.ClassNotificationService.php b/inc/inc.ClassNotificationService.php index ea316f1a2..631c47ddf 100644 --- a/inc/inc.ClassNotificationService.php +++ b/inc/inc.ClassNotificationService.php @@ -921,7 +921,11 @@ class SeedDMS_NotificationService { $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); } -// $this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); + /* Send mail to owner only if the currently logged in user is not the + * owner and the owner is not already in the list of notifiers. + */ + if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users'])) + $this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); } /* }}} */ public function sendNewDocumentNotifyMail($document, $user, $obj) { /* {{{ */ @@ -1014,7 +1018,11 @@ class SeedDMS_NotificationService { foreach ($nl["groups"] as $grp) { $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); } -// $this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); + /* Send mail to owner only if the currently logged in user is not the + * owner and the owner is not already in the list of notifiers. + */ + if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users'])) + $this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); } /* }}} */ public function sendSubmittedApprovalMail($content, $user, $approvelog) { /* {{{ */ @@ -1037,7 +1045,12 @@ class SeedDMS_NotificationService { $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); foreach ($nl["groups"] as $grp) $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); -// $this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); + + /* Send mail to owner only if the currently logged in user is not the + * owner and the owner is not already in the list of notifiers. + */ + if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users'])) + $this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); } /* }}} */ diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 5a2cb6807..2281bea11 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2162,7 +2162,7 @@ $(document).ready(function() { function printNewTreeNavigationHtml($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */ //echo "
\n"; - echo "
\n"; + echo "
\n"; } /* }}} */ /** @@ -2289,9 +2289,9 @@ $(function() { onCreateLi: function(node, $li) { // Add 'icon' span before title if(node.is_folder) - $li.find('.jqtree-title').before(' ').attr('data-name', node.name).attr('rel', 'folder_' + node.id).attr('formtoken', '').attr('data-uploadformtoken', '').attr('data-droptarget', 'folder_' + node.id).addClass('droptarget'); + $li.find('.jqtree-title').prepend(' ').attr('data-name', node.name).attr('rel', 'folder_' + node.id).attr('formtoken', '').attr('data-uploadformtoken', '').attr('data-droptarget', 'folder_' + node.id).addClass('droptarget'); else - $li.find('.jqtree-title').before(' '); + $li.find('.jqtree-title').prepend(' '); } }); // Unfold node for currently selected folder diff --git a/views/bootstrap/styles/application.css b/views/bootstrap/styles/application.css index 52d15a855..83b33f662 100644 --- a/views/bootstrap/styles/application.css +++ b/views/bootstrap/styles/application.css @@ -88,18 +88,12 @@ ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover { font-weight: bold; } -ul.jqtree-tree ul.jqtree_common { - margin-left: 19px; -} -ul.jqtree-tree .jqtree-title { - margin-left: 0.5em; -} -ul.jqtree-tree .jqtree-title.jqtree-title-folder { - margin-left: 0.5em; +ul.jqtree-tree li.jqtree_common { + margin-left: 8px; } ul.jqtree-tree li.jqtree_common > .jqtree-element:hover { - background-color: #E0E0E0; + background-color: #E0E0E0; } legend > span { diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php index dce5f14f5..dbf027ac1 100644 --- a/views/bootstrap4/class.Bootstrap4.php +++ b/views/bootstrap4/class.Bootstrap4.php @@ -2251,9 +2251,9 @@ $(function() { onCreateLi: function(node, $li) { // Add 'icon' span before title if(node.is_folder) - $li.find('.jqtree-title').before(' ').attr('data-name', node.name).attr('rel', 'folder_' + node.id).attr('formtoken', '').attr('data-uploadformtoken', '').attr('data-droptarget', 'folder_' + node.id).addClass('droptarget'); + $li.find('.jqtree-title').prepend(' ').attr('data-name', node.name).attr('rel', 'folder_' + node.id).attr('formtoken', '').attr('data-uploadformtoken', '').attr('data-droptarget', 'folder_' + node.id).addClass('droptarget'); else - $li.find('.jqtree-title').before(' '); + $li.find('.jqtree-title').prepend(' '); } }); // Unfold node for currently selected folder diff --git a/views/bootstrap4/styles/application.css b/views/bootstrap4/styles/application.css index f76fd79d6..76cbc7813 100644 --- a/views/bootstrap4/styles/application.css +++ b/views/bootstrap4/styles/application.css @@ -103,18 +103,12 @@ ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover { font-weight: bold; } -ul.jqtree-tree ul.jqtree_common { - margin-left: 19px; -} -ul.jqtree-tree .jqtree-title { - margin-left: 0.5em; -} -ul.jqtree-tree .jqtree-title.jqtree-title-folder { - margin-left: 0.5em; +ul.jqtree-tree li.jqtree_common { + margin-left: 8px; } ul.jqtree-tree li.jqtree_common > .jqtree-element:hover { - background-color: #E0E0E0; + background-color: #E0E0E0; } legend > span { diff --git a/views/bootstrap4/styles/styles.css b/views/bootstrap4/styles/styles.css index 91eded732..19f7d45d3 100644 --- a/views/bootstrap4/styles/styles.css +++ b/views/bootstrap4/styles/styles.css @@ -1,22 +1,3 @@ -ul.jqtree-tree ul.jqtree_common { - margin-left: 22px; -} -ul.jqtree-tree li.jqtree_common { - margin-left: 0px; -} -ul.jqtree-tree li.jqtree_folder { - margin-left: 0px; -} -ul.jqtree-tree .jqtree-title { - margin-left: 0.3em; -} -ul.jqtree-tree .jqtree-title.jqtree-title-folder { - margin-left: 0.3em; -} -#jqtreemaintree ul.jqtree-tree .jqtree-element { - display: initial; -} - /* Sticky footer styles -------------------------------------------------- */ html {