Unverified Commit 1d4d3e28 authored by Seamus Lee's avatar Seamus Lee Committed by GitHub

Merge pull request #14062 from civicrm/5.13

5.13
parents 4e2d0ca9 d1c5a34c
......@@ -1383,7 +1383,7 @@ ORDER BY civicrm_email.is_bulkmail DESC
}
}
elseif ($type == 'url') {
if ($this->url_tracking) {
if ($this->url_tracking && !empty($this->id)) {
// ensure that Google CSS and any .css files are not tracked.
if (!(strpos($token, 'css?family') || strpos($token, '.css'))) {
$data = CRM_Mailing_BAO_TrackableURL::getTrackerURL($token, $this->id, $event_queue_id);
......
......@@ -861,13 +861,4 @@ AND u.status = 1
}
}
/**
* Append Drupal7 js to coreResourcesList.
*
* @param array $list
*/
public function appendCoreResources(&$list) {
$list[] = 'js/crm.drupal7.js';
}
}
......@@ -241,6 +241,10 @@ body.crm-menubar-over-cms-menu #crm-menubar-toggle-position a i {
z-index: 99999;
}
body.crm-menubar-above-crm-container #civicrm-menu {
z-index: 100;
}
body.crm-menubar-hidden #civicrm-menu {
display: none;
}
......
......@@ -927,6 +927,7 @@ if (!CRM.vars) CRM.vars = {};
})
.on('dialogopen', function(e) {
var $el = $(e.target);
$('body').addClass('ui-dialog-open');
// Modal dialogs should disable scrollbars
if ($el.dialog('option', 'modal')) {
$el.addClass('modal-dialog');
......@@ -943,6 +944,9 @@ if (!CRM.vars) CRM.vars = {};
$(this).button('option', 'icons', {primary: 'fa-expand'});
} else {
var menuHeight = $('#civicrm-menu').outerHeight();
if ($('body').hasClass('crm-menubar-below-cms-menu')) {
menuHeight += $('#civicrm-menu').offset().top;
}
$el.data('origSize', {
position: {my: 'center', at: 'center center+' + (menuHeight / 2), of: window},
width: $el.dialog('option', 'width'),
......@@ -961,6 +965,9 @@ if (!CRM.vars) CRM.vars = {};
if ($('.ui-dialog .modal-dialog:visible').not(e.target).length < 1) {
$('body').css({overflow: ''});
}
if ($('.ui-dialog-content:visible').not(e.target).length < 1) {
$('body').removeClass('ui-dialog-open');
}
})
.on('submit', function(e) {
// CRM-14353 - disable changes warn when submitting a form
......
......@@ -572,8 +572,11 @@
var currentHeight = $wrapper.outerHeight(),
padding = currentHeight - $dialog.height(),
newHeight = $dialog.prop('scrollHeight') + padding,
menuHeight = $('#civicrm-menu').outerHeight(),
maxHeight = $(window).height() - menuHeight;
menuHeight = $('#civicrm-menu').outerHeight();
if ($('body').hasClass('crm-menubar-below-cms-menu')) {
menuHeight += $('#civicrm-menu').offset().top;
}
var maxHeight = $(window).height() - menuHeight;
newHeight = newHeight > maxHeight ? maxHeight : newHeight;
if (newHeight > (currentHeight + 15)) {
$dialog.dialog('option', {
......
// http://civicrm.org/licensing
(function($) {
$(document)
.on('dialogopen', function(e) {
// D7 hack to get the toolbar out of the way (CRM-15341)
$('#toolbar').css('z-index', '100');
})
.on('dialogclose', function(e) {
if ($('.ui-dialog-content:visible').not(e.target).length < 1) {
// D7 hack, restore toolbar position (CRM-15341)
$('#toolbar').css('z-index', '');
}
});
})(CRM.$);
# CiviCRM 5.12.1
Released April 15, 2019
- **[Synopsis](#synopsis)**
- **[Bugs resolved](#bugs)**
- **[Credits](#credits)**
- **[Feedback](#feedback)**
## <a name="synopsis"></a>Synopsis
| *Does this version...?* | |
|:--------------------------------------------------------------- |:-------:|
| Fix security vulnerabilities? | no |
| Change the database schema? | no |
| Alter the API? | no |
| Require attention to configuration options? | no |
| Fix problems installing or upgrading to a previous version? | no |
| **Introduce features?** | **yes** |
| **Fix bugs?** | **yes** |
## <a name="bugs"></a>Bugs resolved
- **([dev/core#859](https://lab.civicrm.org/dev/core/issues/859)) Dedupe - Fix
regression in handling addresses ([14013](https://github.com/civicrm/civicrm-core/pull/14013))**
- **Menu bar - Restore default colors. Allow customization.
([13996](https://github.com/civicrm/civicrm-core/pull/13996))**
## <a name="credits"></a>Credits
This release was developed by the following authors and reviewers:
AGH Strategies - Andrew Hunt; Australian Greens - Seamus Lee; CiviCRM -
Coleman Watts, Tim Otten; Dave D; Korlon - Stuart Gaston; Wikimedia
Foundation - Eileen McNaughton
## <a name="feedback"></a>Feedback
These release notes are edited by Tim Otten and Andrew Hunt. If you'd like to
provide feedback on them, please login to https://chat.civicrm.org/civicrm and
contact `@agh1`.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment