Skip to content
Extraits de code Groupes Projets
Valider bb80f8c3 rédigé par sgiehl's avatar sgiehl
Parcourir les fichiers

cs

parent a27ea708
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -55,7 +55,7 @@
*/
var TrackingCodeGenerator = function () {
// empty
}
};
var TrackingCodeGeneratorSingleton = exports.TrackingCodeGenerator = new TrackingCodeGenerator();
......@@ -285,7 +285,7 @@
actionName: $('#image-tracker-action-name').val(),
piwikHost: piwikHost,
piwikPath: piwikPath
}
};
if ($('#image-tracking-goal-check').is(':checked')) {
generateDataParams.idGoal = $('#image-tracker-goal').val();
......
......@@ -86,7 +86,7 @@
return;
}
var $existingNode = $('.system.notification[data-id=' + options.id + ']')
var $existingNode = $('.system.notification[data-id=' + options.id + ']');
if ($existingNode && $existingNode.length) {
$existingNode.remove();
}
......
......@@ -36,9 +36,9 @@ angular.module('piwikApp').controller('SiteSelectorController', function($scope,
};
$scope.getUrlAllSites = function () {
var newParameters = 'module=MultiSites&action=index'
var newParameters = 'module=MultiSites&action=index';
return piwik.helper.getCurrentQueryStringWithParametersModified(newParameters);
}
};
$scope.getUrlForSiteId = function (idSite) {
var idSiteParam = 'idSite=' + idSite;
var newParameters = 'segment=&' + idSiteParam;
......
......@@ -28,12 +28,12 @@ $(document).ready(function () {
var filterStatus = getCurrentFilterStatus();
updateNumberOfMatchingPluginsInFilter('[data-filter-status="all"]', filterOrigin, 'all');
updateNumberOfMatchingPluginsInFilter('[data-filter-status="active"]', filterOrigin, 'active')
updateNumberOfMatchingPluginsInFilter('[data-filter-status="inactive"]', filterOrigin, 'inactive')
updateNumberOfMatchingPluginsInFilter('[data-filter-status="active"]', filterOrigin, 'active');
updateNumberOfMatchingPluginsInFilter('[data-filter-status="inactive"]', filterOrigin, 'inactive');
updateNumberOfMatchingPluginsInFilter('[data-filter-origin="all"]', 'all', filterStatus)
updateNumberOfMatchingPluginsInFilter('[data-filter-origin="core"]', 'core', filterStatus)
updateNumberOfMatchingPluginsInFilter('[data-filter-origin="noncore"]', 'noncore', filterStatus)
updateNumberOfMatchingPluginsInFilter('[data-filter-origin="all"]', 'all', filterStatus);
updateNumberOfMatchingPluginsInFilter('[data-filter-origin="core"]', 'core', filterStatus);
updateNumberOfMatchingPluginsInFilter('[data-filter-origin="noncore"]', 'noncore', filterStatus);
}
function updateNumberOfMatchingPluginsInFilter(selectorFilterToUpdate, filterOrigin, filterStatus)
......
......@@ -55,7 +55,7 @@ class Controller extends \Piwik\Plugin\Controller
* Default action
*
* @param none
* @return void
* @return string
*/
function index()
{
......
......@@ -33,7 +33,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
model.totalRevenue = '?';
model.searchTerm = '';
model.lastVisits = '?';
model.lastVisitsDate = '?'
model.lastVisitsDate = '?';
fetchPreviousSummary();
......@@ -141,15 +141,15 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
model.getNumberOfFilteredSites = function () {
return model.sites.length;
}
};
model.getNumberOfPages = function () {
return Math.ceil(model.sites.length / model.pageSize - 1);
}
};
model.getCurrentPagingOffsetStart = function() {
return Math.ceil(model.currentPage * model.pageSize);
}
};
model.getCurrentPagingOffsetEnd = function() {
var end = model.getCurrentPagingOffsetStart() + parseInt(model.pageSize, 10);
......@@ -157,7 +157,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
end = model.sites.length
}
return parseInt(end, 10);
}
};
model.previousPage = function () {
model.currentPage = model.currentPage - 1;
......@@ -194,7 +194,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
model.searchTerm = term;
model.currentPage = 0;
model.sites = nestedSearch(allSitesByGroup, term);
}
};
function fetchPreviousSummary () {
piwikApi.fetch({
......
......@@ -38,7 +38,7 @@ angular.module('piwikApp').directive('piwikMultisitesSite', function($document,
this.getWebsite = function () {
return $scope.website;
}
};
$scope.sparklineImage = function(website){
var append = '';
......
......@@ -143,7 +143,7 @@ function bindUpdateSuperUserAccess() {
}
message = _pk_translate(message);
message = message.replace('%s', login)
message = message.replace('%s', login);
$('#superUserAccessConfirm h2').text(message);
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter