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

66
www/analytics/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline-directive.js vendored
View file

@ -1,66 +0,0 @@
/*!
* Piwik - Web Analytics
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
/**
* Usage:
*
* <h2 piwik-enriched-headline>All Websites Dashboard</h2>
* -> uses "All Websites Dashboard" as featurename
*
* <h2 piwik-enriched-headline feature-name="All Websites Dashboard">All Websites Dashboard (Total: 309 Visits)</h2>
* -> custom featurename
*
* <h2 piwik-enriched-headline help-url="http://piwik.org/guide">All Websites Dashboard</h2>
* -> shows help icon and links to external url
*
* <h2 piwik-enriched-headline>All Websites Dashboard
* <div class="inlineHelp>My <strong>inline help</strong></div>
* </h2>
* -> shows help icon to display inline help on click. Note: You can combine inlinehelp and help-url
*/
angular.module('piwikApp').directive('piwikEnrichedHeadline', function($document, piwik, $filter){
var defaults = {
helpUrl: ''
};
return {
transclude: true,
restrict: 'A',
scope: {
helpUrl: '@',
featureName: '@'
},
templateUrl: 'plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.html?cb=' + piwik.cacheBuster,
compile: function (element, attrs) {
for (var index in defaults) {
if (!attrs[index]) { attrs[index] = defaults[index]; }
}
return function (scope, element, attrs) {
var helpNode = $('[ng-transclude] .inlineHelp', element);
if ((!helpNode || !helpNode.length) && element.next()) {
// hack for reports :(
helpNode = element.next().find('.reportDocumentation');
}
if (helpNode && helpNode.length) {
if ($.trim(helpNode.text())) {
scope.inlineHelp = $.trim(helpNode.html());
}
helpNode.remove();
}
if (!attrs.featureName) {
attrs.featureName = $.trim(element.text());
}
};
}
};
});

13
www/analytics/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.html → www/analytics/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html
View file

@ -1,18 +1,22 @@
<div class="enrichedHeadline"
ng-mouseenter="view.showIcons=true" ng-mouseleave="view.showIcons=false">
<span ng-transclude></span>
<div ng-show="!editUrl" class="title" ng-transclude tabindex="6"></div>
<a ng-show="editUrl" class="title" href="{{ editUrl }}"
title="{{ 'CoreHome_ClickToEditX'|translate:featureName }}"
ng-transclude ></a>
<span ng-show="view.showIcons">
<a ng-if="helpUrl && !inlineHelp"
rel="noreferrer"
target="_blank"
href="{{ helpUrl }}"
title="{{ 'CoreHome_ExternalHelp'|translate }}"
class="helpIcon"></a>
class="helpIcon"><span class="icon-help"></span></a>
<a ng-if="inlineHelp"
title="{{ 'General_Help'|translate }}"
ng-click="view.showInlineHelp=!view.showInlineHelp"
class="helpIcon"></a>
class="helpIcon"><span class="icon-help"></span></a>
<div class="ratingIcons"
piwik-rate-feature
@ -22,8 +26,9 @@
<div class="inlineHelp" ng-show="view.showIcons && view.showInlineHelp">
<div ng-bind-html="inlineHelp"></div>
<a ng-if="helpUrl"
rel="noreferrer"
target="_blank"
href="{{ helpUrl }}"
class="readMore">{{ 'General_MoreDetails'|translate }}</a>
</div>
</div>
</div>

77
www/analytics/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.js Normal file
View file

@ -0,0 +1,77 @@
/*!
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
/**
* Usage:
*
* <h2 piwik-enriched-headline>All Websites Dashboard</h2>
* -> uses "All Websites Dashboard" as featurename
*
* <h2 piwik-enriched-headline feature-name="All Websites Dashboard">All Websites Dashboard (Total: 309 Visits)</h2>
* -> custom featurename
*
* <h2 piwik-enriched-headline help-url="http://piwik.org/guide">All Websites Dashboard</h2>
* -> shows help icon and links to external url
*
* <h2 piwik-enriched-headline edit-url="index.php?module=Foo&action=bar&id=4">All Websites Dashboard</h2>
* -> makes the headline clickable linking to the specified url
*
* <h2 piwik-enriched-headline>All Websites Dashboard
* <div class="inlineHelp">My <strong>inline help</strong></div>
* </h2>
* -> shows help icon to display inline help on click. Note: You can combine inlinehelp and help-url
*/
(function () {
angular.module('piwikApp').directive('piwikEnrichedHeadline', piwikEnrichedHeadline);
piwikEnrichedHeadline.$inject = ['$document', 'piwik', '$filter'];
function piwikEnrichedHeadline($document, piwik, $filter){
var defaults = {
helpUrl: '',
editUrl: ''
};
return {
transclude: true,
restrict: 'A',
scope: {
helpUrl: '@',
editUrl: '@',
featureName: '@'
},
templateUrl: 'plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html?cb=' + piwik.cacheBuster,
compile: function (element, attrs) {
for (var index in defaults) {
if (!attrs[index]) { attrs[index] = defaults[index]; }
}
return function (scope, element, attrs) {
var helpNode = $('[ng-transclude] .inlineHelp', element);
if ((!helpNode || !helpNode.length) && element.next()) {
// hack for reports :(
helpNode = element.next().find('.reportDocumentation');
}
if (helpNode && helpNode.length) {
if ($.trim(helpNode.text())) {
scope.inlineHelp = $.trim(helpNode.html());
}
helpNode.remove();
}
if (!attrs.featureName) {
attrs.featureName = $.trim(element.find('.title').first().text());
}
};
}
};
}
})();

60
www/analytics/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.less Normal file
View file

@ -0,0 +1,60 @@
.inlineHelp {
display: none;
}
[piwik-enriched-headline] {
visibility: hidden;
height: 47px;
}
[piwik-enriched-headline].ng-isolate-scope {
visibility: visible;
height: auto;
}
.enrichedHeadline {
min-height: 22px;
a.title {
cursor: pointer;
}
.title {
color: @color-black-piwik;
display:inline-block;
}
.inlineHelp {
display: block;
background: #F7F7F7;
font-size: 12px;
font-weight: normal;
border: 1px solid #E4E5E4;
margin: 10px 0 10px 0;
padding: 10px;
border-radius: 4px;
max-width: 500px;
.readMore {
margin-top: 10px;
display: inline-block;
font-weight: bold;
}
}
.ratingIcons {
display: inline-block;
vertical-align: bottom;
}
.helpIcon {
cursor: pointer;
display: inline-block;
margin: 0 0 -1px 4px;
opacity: 0.3;
font-size: 15px;
&:hover {
opacity: 0.9;
}
}
}

44
www/analytics/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.less
View file

@ -1,44 +0,0 @@
.inlineHelp {
display: none;
}
.enrichedHeadline {
min-height: 22px;
.inlineHelp {
display:block;
background: #F7F7F7;
font-size: 12px;
font-weight: normal;
border: 1px solid #E4E5E4;
margin: 10px 0 10px 0;
padding: 10px;
border-radius: 4px;
max-width: 500px;
.readMore {
margin-top: 10px;
display: inline-block;
font-weight: bold;
}
}
.ratingIcons {
display:inline-block;
vertical-align: bottom;
}
.helpIcon:hover {
opacity: 0.9;
}
.helpIcon {
cursor: pointer;
display:inline-block;
margin: 0px 0px -1px 4px;
width: 16px;
opacity: 0.3;
height: 16px;
background: url(plugins/CoreHome/angularjs/enrichedheadline/help.png) no-repeat;
}
}