coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update Piwik to version 2.16 (fixes #91)

Browse source
This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
Download patch file Download diff file Expand all files Collapse all files

62
www/analytics/plugins/Dashboard/javascripts/dashboardObject.js
View file

@ -1,5 +1,5 @@
/*!
* Piwik - Web Analytics
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -297,8 +297,49 @@
}
}
for (var i = 0; i < columnCount; i++) {
$('.col', dashboardElement)[i].className = 'col width-' + columnWidth[i];
switch (layout) {
case '100':
$('.col', dashboardElement).removeClass()
.addClass('col col-sm-12');
break;
case '50-50':
$('.col', dashboardElement).removeClass()
.addClass('col col-sm-6');
break;
case '67-33':
$('.col', dashboardElement)[0].className = 'col col-sm-8';
$('.col', dashboardElement)[1].className = 'col col-sm-4';
break;
case '33-67':
$('.col', dashboardElement)[0].className = 'col col-sm-4';
$('.col', dashboardElement)[1].className = 'col col-sm-8';
break;
case '33-33-33':
$('.col', dashboardElement)[0].className = 'col col-sm-4';
$('.col', dashboardElement)[1].className = 'col col-sm-4';
$('.col', dashboardElement)[2].className = 'col col-sm-4';
break;
case '40-30-30':
$('.col', dashboardElement)[0].className = 'col col-sm-6';
$('.col', dashboardElement)[1].className = 'col col-sm-3';
$('.col', dashboardElement)[2].className = 'col col-sm-3';
break;
case '30-40-30':
$('.col', dashboardElement)[0].className = 'col col-sm-3';
$('.col', dashboardElement)[1].className = 'col col-sm-6';
$('.col', dashboardElement)[2].className = 'col col-sm-3';
break;
case '30-30-40':
$('.col', dashboardElement)[0].className = 'col col-sm-3';
$('.col', dashboardElement)[1].className = 'col col-sm-3';
$('.col', dashboardElement)[2].className = 'col col-sm-6';
break;
case '25-25-25-25':
$('.col', dashboardElement)[0].className = 'col col-sm-3';
$('.col', dashboardElement)[1].className = 'col col-sm-3';
$('.col', dashboardElement)[2].className = 'col col-sm-3';
$('.col', dashboardElement)[3].className = 'col col-sm-3';
break;
}
makeWidgetsSortable();
@ -436,25 +477,26 @@
return $(this).attr('id').indexOf('Dashboard_embeddedIndex') == 0;
}).remove();
if (dashboards.length === 0) {
dashboards = [{iddashboard: 1, name: _pk_translate('Dashboard_Dashboard')}];
}
if (dashboards.length > 1
|| dashboardMenuListItems.length >= 1
) {
dashboardMenuList.show();
var items = [];
for (var i = 0; i < dashboards.length; i++) {
var $link = $('<a/>').attr('data-idDashboard', dashboards[i].iddashboard).text(dashboards[i].name);
var $link = $('<a/>').attr('data-idDashboard', dashboards[i].iddashboard).text(dashboards[i].name).addClass('item title');
var $li = $('<li/>').attr('id', 'Dashboard_embeddedIndex_' + dashboards[i].iddashboard)
.addClass('dashboardMenuItem').append($link);
items.push($li);
if (dashboards[i].iddashboard == dashboardId) {
dashboardName = dashboards[i].name;
$li.addClass('sfHover');
$li.addClass('sfActive');
}
}
dashboardMenuList.prepend(items);
} else {
dashboardMenuList.hide();
}
dashboardMenuList.find('a[data-idDashboard]').click(function (e) {
@ -465,13 +507,13 @@
if (typeof piwikMenu != 'undefined') {
piwikMenu.activateMenu('Dashboard', 'embeddedIndex');
}
$('#Dashboard ul li').removeClass('sfHover');
$('#Dashboard ul li').removeClass('sfActive');
if ($(dashboardElement).length) {
$(dashboardElement).dashboard('loadDashboard', idDashboard);
} else {
broadcast.propagateAjax('module=Dashboard&action=embeddedIndex&idDashboard=' + idDashboard);
}
$(this).closest('li').addClass('sfHover');
$(this).closest('li').addClass('sfActive');
});
};