Commit c03f895a authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge changes I49dc225a,Ib90f3f1e

* changes:
  Bug 1501059: Contextual help positioning wrong in some cases
  Bug 1417828: Need to fetch admin activity types as well
parents 7d72d927 a74afc30
......@@ -608,9 +608,11 @@ function buildContextualHelpBox(content) {
*/
function contextualHelpPosition(ref, contextualHelpContainer) {
$j(contextualHelpContainer).css('visibility', 'hidden').removeClass('hidden');
var position = $j(ref).position();
var offset = $j(ref).offset();
if ($j(ref).parent().css('position') == 'absolute') {
position.left = offset.left;
}
var containerwidth = $j(contextualHelpContainer).outerWidth(true);
// Adjust the position. The element is moved towards the centre of the
......
......@@ -43,7 +43,7 @@ class PluginNotificationEmaildigest extends PluginNotification {
$users = array();
$sitename = get_config('sitename');
$types = get_records_assoc('activity_type', 'admin', 0, 'plugintype,pluginname,name', 'id,name,plugintype,pluginname');
$types = get_records_assoc('activity_type', null, null, 'plugintype,pluginname,name', 'id,name,plugintype,pluginname');
foreach ($types as &$type) {
if (!empty($type->plugintype)) {
$type->section = "{$type->plugintype}.{$type->pluginname}";
......
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