Skip to content
Extraits de code Groupes Projets
Valider a5533127 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

refs #4691 moved components temporarily into a folder named angularjs

parent b479beaf
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Affichage de
avec 12 ajouts et 12 suppressions
......@@ -102,15 +102,15 @@ class MultiSites extends \Piwik\Plugin
public function getJsFiles(&$jsFiles)
{
$jsFiles[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-model.js";
$jsFiles[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-controller.js";
$jsFiles[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-filter.js";
$jsFiles[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard-directive.js";
$jsFiles[] = "plugins/MultiSites/javascripts/multisites-site/multisites-site-directive.js";
$jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-model.js";
$jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-controller.js";
$jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-filter.js";
$jsFiles[] = "plugins/MultiSites/angularjs/dashboard/dashboard-directive.js";
$jsFiles[] = "plugins/MultiSites/angularjs/site/site-directive.js";
}
public function getStylesheetFiles(&$stylesheets)
{
$stylesheets[] = "plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.less";
$stylesheets[] = "plugins/MultiSites/angularjs/dashboard/dashboard.less";
}
}
......@@ -26,7 +26,7 @@ angular.module('piwikApp').directive('piwikMultisitesDashboard', function($docum
showSparklines: '@',
dateSparkline: '@'
},
templateUrl: 'plugins/MultiSites/javascripts/multisites-dashboard/multisites-dashboard.html?cb=' + piwik.cacheBuster,
templateUrl: 'plugins/MultiSites/angularjs/dashboard/dashboard.html?cb=' + piwik.cacheBuster,
controller: 'MultiSitesDashboardController',
link: function (scope, element, attrs, controller) {
......
......@@ -29,7 +29,7 @@ angular.module('piwikApp').directive('piwikMultisitesSite', function($document,
dateSparkline: '=',
displayRevenueColumn: '='
},
templateUrl: 'plugins/MultiSites/javascripts/multisites-site/multisites-site.html?cb=' + piwik.cacheBuster,
templateUrl: 'plugins/MultiSites/angularjs/site/site.html?cb=' + piwik.cacheBuster,
controller: function ($scope) {
$scope.period = piwik.period;
......
Subproject commit f9aabdf4a4112b3c0505257978435dcee4039471
Subproject commit cd98a60c785ce56b45e4d142e9af3a470619a60b
Subproject commit 3189dec95a3b7be6e00a3d407837b26221513cdd
Subproject commit f6e252d5dc5e3cf004263f7450c2ca55bd2c5a71
Subproject commit 19978cb7cd926ec0fba111ce257b8f0450f34ce8
Subproject commit 2cb15300a88f7ff2a1fc27ef633a1a1f4d5fef09
......@@ -16,7 +16,7 @@
@import "ui/_headerMessage.less";
@import "../../CoreHome/javascripts/siteselector/siteselector.less";
@import "../../CoreHome/angularjs/siteselector/siteselector.less";
@import "ui/_periodSelect.less";
......
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