update Piwik to version 2.16 (fixes #91)
This commit is contained in:
oliver
parent
296343bf3b
commit
d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -1,4 +1,4 @@
|
|||
<h2 id="{{ reportId }}" style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
|
||||
<h2 id="{{ reportId }}" style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt; font-weight:normal;">
|
||||
{{ reportName }}
|
||||
</h2>
|
||||
|
||||
|
|
@ -23,16 +23,16 @@
|
|||
|
||||
{% if displayTable %}
|
||||
<table style="border-collapse:collapse; margin-left: 5px;">
|
||||
<thead style="background-color: rgb({{ tableHeaderBgColor }}); color: rgb({{ tableHeaderTextColor }}); font-size: {{ reportTableHeaderTextSize }}pt;">
|
||||
<thead style="background-color: rgb({{ tableHeaderBgColor }}); color: rgb({{ tableHeaderTextColor }}); font-size: {{ reportTableHeaderTextSize }}pt; text-transform: {{ reportTableHeaderTextTransform }}; line-height:2.5em;">
|
||||
{% for columnName in reportColumns %}
|
||||
<th style="padding: 6px 0;">
|
||||
<th style="font-weight: {{ reportTableHeaderTextWeight }}; font-size:10px; text-align:left; padding: 6px 0;">
|
||||
{{ columnName }}
|
||||
</th>
|
||||
{% endfor %}
|
||||
</thead>
|
||||
<tbody>
|
||||
{% set cycleValues=['','background-color: rgb('~tableBgColor~')'] %}
|
||||
{% set cycleIndex=0 %}
|
||||
{% set cycleIndex=1 %}
|
||||
{% for rowId,row in reportRows %}
|
||||
{% set rowMetrics=row.columns %}
|
||||
|
||||
|
|
@ -41,10 +41,10 @@
|
|||
{% else %}
|
||||
{% set rowMetadata=null %}
|
||||
{% endif %}
|
||||
<tr style="{{ cycle(cycleValues, cycleIndex) }}">
|
||||
<tr style="{{ cycle(cycleValues, cycleIndex) }};line-height: 22px;">
|
||||
{% set cycleIndex=cycleIndex+1 %}
|
||||
{% for columnId, columnName in reportColumns %}
|
||||
<td style="font-size: {{ reportTableRowTextSize }}pt; border-bottom: 1px solid rgb({{ tableCellBorderColor }}); padding: 5px 0 5px 5px;">
|
||||
<td style="font-size: {{ reportTableRowTextSize }}; {% if columnId == 'label' %}border-right: 1px solid rgb({{ tableCellBorderColor }}); {% else %}border-left: 1px solid rgb({{ tableCellBorderColor }}); {% endif %} padding: 5px 0 5px 5px;">
|
||||
{% if columnId == 'label' %}
|
||||
{% if rowMetrics[columnId] is defined %}
|
||||
{% if rowMetadata.logo is defined %}
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
{% if rowMetrics[columnId] is empty %}
|
||||
0
|
||||
{% else %}
|
||||
{{ rowMetrics[columnId] }}
|
||||
{{ rowMetrics[columnId]|number(2) }}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="robots" content="noindex,nofollow">
|
||||
</head>
|
||||
<body style="color: rgb({{ reportTextColor }});">
|
||||
<body style="font-family: {{ reportFontFamily }}; color: rgb({{ reportTextColor }});line-height: 1.33;">
|
||||
|
||||
<a id="reportTop" target="_blank" href="{{ currentPath }}"><img title="{{ 'General_GoTo'|translate("Piwik") }}" border="0" alt="Piwik" src='{{ logoHeader }}'/></a>
|
||||
<a id="reportTop" rel="noreferrer" target="_blank" href="{{ currentPath }}"><img title="{{ 'General_GoTo'|translate("Piwik") }}" border="0" alt="Piwik" src='{{ logoHeader }}'/></a>
|
||||
|
||||
<h1 style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
|
||||
<h1 style="font-weight:normal; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
|
||||
{{ reportTitle }}
|
||||
</h1>
|
||||
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
{% endif %}
|
||||
|
||||
{% if reportMetadata|length > 1 %}
|
||||
<h2 style="color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
|
||||
<h2 style="font-weight:normal; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportTitleTextSize }}pt;">
|
||||
{{ 'ScheduledReports_TableOfContent'|translate }}
|
||||
</h2>
|
||||
<ul>
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<div style="float:left;max-width:900px;">
|
||||
<div style="float:left;max-width:730px;">
|
||||
<div class="loadingPiwik" style="display:none;">
|
||||
<img src="plugins/Zeitgeist/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }}
|
||||
<img src="plugins/Morpheus/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }}
|
||||
</div>
|
||||
|
||||
<div class="dimensionReport">{{ firstReport|raw }}</div>
|
||||
|
|
|
|||
36
www/analytics/plugins/CoreHome/templates/_adblockDetect.twig
Normal file
36
www/analytics/plugins/CoreHome/templates/_adblockDetect.twig
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
<div id="bottomAd" style="font-size: 2px;"> </div>
|
||||
<script type="text/javascript">
|
||||
if ('undefined' === (typeof hasBlockedContent) || hasBlockedContent !== false) {
|
||||
{# if hasBlockedContent was "false" most likely nothing was blocked #}
|
||||
(function () {
|
||||
{# most likely jQuery is not available, have to use vanilla JS here #}
|
||||
var body = document.getElementsByTagName('body');
|
||||
|
||||
if (!body || !body[0]) {
|
||||
return;
|
||||
}
|
||||
|
||||
var bottomAd = document.getElementById('bottomAd');
|
||||
var wasMostLikelyCausedByAdblock = false;
|
||||
|
||||
if (!bottomAd) {
|
||||
wasMostLikelyCausedByAdblock = true;
|
||||
} else if (bottomAd.style && bottomAd.style.display === 'none') {
|
||||
wasMostLikelyCausedByAdblock = true;
|
||||
} else if ('undefined' !== (typeof bottomAd.clientHeight) && bottomAd.clientHeight === 0) {
|
||||
wasMostLikelyCausedByAdblock = true;
|
||||
}
|
||||
|
||||
if (wasMostLikelyCausedByAdblock) {
|
||||
var warning = document.createElement('h3');
|
||||
warning.innerHTML = '{{ 'CoreHome_AdblockIsMaybeUsed'|translate|e('js') }}';
|
||||
|
||||
body[0].appendChild(warning);
|
||||
warning.style.color = 'red';
|
||||
warning.style.fontWeight = 'bold';
|
||||
warning.style.marginLeft = '16px';
|
||||
warning.style.marginBottom = '16px';
|
||||
}
|
||||
})();
|
||||
}
|
||||
</script>
|
||||
|
|
@ -7,11 +7,12 @@
|
|||
<div class="dataTable {{ visualizationCssClass }} {{ properties.datatable_css_class|default('') }} {% if isSubtable %}subDataTable{% endif %}"
|
||||
data-table-type="{{ properties.datatable_js_type }}"
|
||||
data-report="{{ properties.report_id }}"
|
||||
data-report-metadata="{{ reportMetdadata|json_encode|e('html_attr') }}"
|
||||
data-props="{% if clientSideProperties is empty %}{}{% else %}{{ clientSideProperties|json_encode }}{% endif %}"
|
||||
data-params="{% if clientSideParameters is empty %}{}{% else %}{{ clientSideParameters|json_encode }}{% endif %}">
|
||||
<div class="reportDocumentation">
|
||||
{% if properties.documentation|default is not empty %}<p>{{ properties.documentation|raw }}</p>{% endif %}
|
||||
{% if reportLastUpdatedMessage is defined %}<span class='helpDate'>{{ reportLastUpdatedMessage }}</span>{% endif %}
|
||||
{% if reportLastUpdatedMessage is defined %}<span class='helpDate'>{{ reportLastUpdatedMessage|raw }}</span>{% endif %}
|
||||
</div>
|
||||
<div class="dataTableWrapper">
|
||||
{% if error is defined %}
|
||||
|
|
|
|||
|
|
@ -2,25 +2,11 @@
|
|||
{% set tooltipIndex = column ~ '_tooltip' %}
|
||||
{% if row.getMetadata(tooltipIndex) %}<span class="cell-tooltip" data-tooltip="{{ row.getMetadata(tooltipIndex) }}">{% endif %}
|
||||
{% if not row.getIdSubDataTable() and column=='label' and row.getMetadata('url') %}
|
||||
<a target="_blank" href='{% if row.getMetadata('url')|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.getMetadata('url')|raw }}'>
|
||||
<a rel="noreferrer" target="_blank" href='{% if row.getMetadata('url')|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.getMetadata('url')|rawSafeDecoded }}'>
|
||||
{% if not row.getMetadata('logo') %}
|
||||
<img class="link" width="10" height="9" src="plugins/Zeitgeist/images/link.gif"/>
|
||||
<img class="link" width="10" height="9" src="plugins/Morpheus/images/link.gif"/>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if column=='label' %}
|
||||
{% import 'macros.twig' as piwik %}
|
||||
|
||||
<span class='label{% if row.getMetadata('is_aggregate') %} highlighted{% endif %}'
|
||||
{% if properties is defined and properties.tooltip_metadata_name is not empty %}title="{{ row.getMetadata(properties.tooltip_metadata_name) }}"{% endif %}>
|
||||
{{ piwik.logoHtml(row.getMetadata(), row.getColumn('label')) }}
|
||||
{% if row.getMetadata('html_label_prefix') %}<span class='label-prefix'>{{ row.getMetadata('html_label_prefix') | raw }} </span>{% endif -%}
|
||||
{%- if row.getMetadata('html_label_suffix') %}<span class='label-suffix'>{{ row.getMetadata('html_label_suffix') | raw }}</span>{% endif -%}
|
||||
{% endif %}<span class="value">{% if row.getColumn(column) %}{{- row.getColumn(column)|raw -}}{% else %}-{% endif %}</span>
|
||||
{% if column=='label' %}</span>{% endif %}
|
||||
{% if not row.getIdSubDataTable() and column=='label' and row.getMetadata('url') %}
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if row.getMetadata(tooltipIndex) %}</span>{% endif %}
|
||||
|
||||
{% set totals = dataTable.getMetadata('totals') %}
|
||||
{% if column in totals|keys -%}
|
||||
|
|
@ -39,11 +25,30 @@
|
|||
|
||||
{% if siteTotal and siteTotal > reportTotal %}
|
||||
{% set totalPercentage = row.getColumn(column)|percentage(siteTotal, 1) %}
|
||||
{% set totalRatioTooltip = 'General_TotalRatioTooltip'|translate(totalPercentage, siteTotal, metricTitle) %}
|
||||
{% set totalRatioTooltip = 'General_TotalRatioTooltip'|translate(totalPercentage, siteTotal|number(2,0), metricTitle) %}
|
||||
{% else %}
|
||||
{% set totalRatioTooltip = '' %}
|
||||
{% endif %}
|
||||
|
||||
<span class="ratio" title="{{ reportRatioTooltip|raw }} {{ totalRatioTooltip|e('html_attr') }}"> {{ rowPercentage }}</span>
|
||||
{%- endif %}
|
||||
|
||||
{% if column=='label' %}
|
||||
{% import 'macros.twig' as piwik %}
|
||||
|
||||
<span class='label{% if row.getMetadata('is_aggregate') %} highlighted{% endif %}'
|
||||
{% if properties is defined and properties.tooltip_metadata_name is not empty %}title="{{ row.getMetadata(properties.tooltip_metadata_name) }}"{% endif %}>
|
||||
{{ piwik.logoHtml(row.getMetadata(), row.getColumn('label')) }}
|
||||
{% if row.getMetadata('html_label_prefix') %}<span class='label-prefix'>{{ row.getMetadata('html_label_prefix') | raw }} </span>{% endif -%}
|
||||
{%- if row.getMetadata('html_label_suffix') %}<span class='label-suffix'>{{ row.getMetadata('html_label_suffix') | raw }}</span>{% endif -%}
|
||||
{% endif %}<span class="value">
|
||||
{%- if row.getColumn(column) %}{% if column=='label' %}{{- row.getColumn(column)|raw -}}{% else %}{{- row.getColumn(column)|number(2,0)|raw -}}{% endif %}
|
||||
{%- else -%}-
|
||||
{%- endif -%}</span>
|
||||
{% if column=='label' %}</span>{% endif %}
|
||||
{% if not row.getIdSubDataTable() and column=='label' and row.getMetadata('url') %}
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if row.getMetadata(tooltipIndex) %}</span>{% endif %}
|
||||
|
||||
{% endspaceless %}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,14 @@
|
|||
|
||||
{% if properties.show_search %}
|
||||
<span class="dataTableSearchPattern">
|
||||
<input type="text" class="searchInput" length="15" />
|
||||
<label for="widgetSearch_{{ properties.report_id }}" style="display:none;"> {{ 'General_Search'|translate }} {{ visualization.config.translations.label|default('') }}</label>
|
||||
<input id="widgetSearch_{{ properties.report_id }}" type="text" class="searchInput" length="15" />
|
||||
<input type="submit" value="{{ 'General_Search'|translate }}" />
|
||||
</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<span class="loadingPiwik" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
|
||||
<span class="loadingPiwik" style="display:none;"><img src="plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
|
||||
|
||||
{% if properties.show_footer_icons %}
|
||||
<div class="dataTableFooterIcons">
|
||||
|
|
@ -30,12 +31,15 @@
|
|||
{% for footerIconGroup in footerIcons %}
|
||||
<div class="tableIconsGroup">
|
||||
<span class="{{ footerIconGroup.class }}">
|
||||
{% for footerIcon in footerIconGroup.buttons %}
|
||||
{% for footerIcon in footerIconGroup.buttons if footerIcon.icon %}
|
||||
{% set isActiveEcommerceView = clientSideParameters.abandonedCarts is defined and
|
||||
((footerIcon.id == 'ecommerceOrder' and clientSideParameters.abandonedCarts == 0) or
|
||||
(footerIcon.id == 'ecommerceAbandonedCart' and clientSideParameters.abandonedCarts == 1)) %}
|
||||
<span>
|
||||
{% if properties.show_active_view_icon and clientSideParameters.viewDataTable == footerIcon.id %}
|
||||
<img src="plugins/Zeitgeist/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/>
|
||||
{% if properties.show_active_view_icon and (clientSideParameters.viewDataTable == footerIcon.id or isActiveEcommerceView) %}
|
||||
<img src="plugins/Morpheus/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/>
|
||||
{% endif %}
|
||||
<a class="tableIcon {% if clientSideParameters.viewDataTable == footerIcon.id %}activeIcon{% endif %}" data-footer-icon-id="{{ footerIcon.id }}">
|
||||
<a class="tableIcon {% if clientSideParameters.viewDataTable == footerIcon.id or isActiveEcommerceView %}activeIcon{% endif %}" data-footer-icon-id="{{ footerIcon.id }}">
|
||||
<img width="16" height="16" title="{{ footerIcon.title }}" src="{{ footerIcon.icon }}"/>
|
||||
{% if footerIcon.text is defined %}<span>{{ footerIcon.text }}</span>{% endif %}
|
||||
</a>
|
||||
|
|
@ -46,31 +50,32 @@
|
|||
{% endfor %}
|
||||
<div class="tableIconsGroup">
|
||||
{% if footerIcons is empty %}
|
||||
<img src="plugins/Zeitgeist/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/>
|
||||
<img src="plugins/Morpheus/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/>
|
||||
{% endif %}
|
||||
<span class="exportToFormatIcons">
|
||||
<a class="tableIcon" var="export">
|
||||
<img width="16" height="16" src="plugins/Zeitgeist/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/>
|
||||
<img width="16" height="16" src="plugins/Morpheus/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/>
|
||||
</a>
|
||||
</span>
|
||||
<span class="exportToFormatItems" style="display:none;">
|
||||
{{ 'General_Export'|translate }}:
|
||||
<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="CSV" filter_limit="{{ properties.export_limit }}">CSV</a> |
|
||||
<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="TSV" filter_limit="{{ properties.export_limit }}">TSV (Excel)</a> |
|
||||
<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="XML" filter_limit="{{ properties.export_limit }}">XML</a> |
|
||||
<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="JSON" filter_limit="{{ properties.export_limit }}">Json</a> |
|
||||
<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="PHP" filter_limit="{{ properties.export_limit }}">Php</a>
|
||||
<span class="exportToFormatItems" style="display:none;">
|
||||
{{ 'General_Export'|translate }}:
|
||||
{% set requestParams = properties.request_parameters_to_modify|json_encode %}
|
||||
<a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="CSV" filter_limit="{{ properties.export_limit }}">CSV</a> |
|
||||
<a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="TSV" filter_limit="{{ properties.export_limit }}">TSV (Excel)</a> |
|
||||
<a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="XML" filter_limit="{{ properties.export_limit }}">XML</a> |
|
||||
<a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="JSON" filter_limit="{{ properties.export_limit }}">Json</a> |
|
||||
<a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="PHP" filter_limit="{{ properties.export_limit }}">Php</a>
|
||||
{% if properties.show_export_as_rss_feed %}
|
||||
|
|
||||
<a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.export_limit }}" date="last10">
|
||||
<img border="0" src="plugins/Zeitgeist/images/feed.png"/>
|
||||
<a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.export_limit }}" date="last10">
|
||||
<img border="0" src="plugins/Morpheus/images/feed.png"/>
|
||||
</a>
|
||||
{% endif %}
|
||||
</span>
|
||||
</span>
|
||||
{% if properties.show_export_as_image_icon %}
|
||||
<span id="dataTableFooterExportAsImageIcon">
|
||||
<a class="tableIcon" href="#" onclick="$(this).closest('.dataTable').find('div.jqplot-target').trigger('piwikExportAsImage'); return false;">
|
||||
<img title="{{ 'General_ExportAsImage'|translate }}" src="plugins/Zeitgeist/images/image.png"/>
|
||||
<img title="{{ 'General_ExportAsImage'|translate }}" src="plugins/Morpheus/images/image.png"/>
|
||||
</a>
|
||||
</span>
|
||||
{% endif %}
|
||||
|
|
@ -78,7 +83,7 @@
|
|||
|
||||
</div>
|
||||
<div class="limitSelection {% if not properties.show_pagination_control and not properties.show_limit_control %} hidden{% endif %}"
|
||||
title="{{ 'General_RowsToDisplay'|translate }}"></div>
|
||||
title="{{ 'General_RowsToDisplay'|translate }}" alt="{{ 'General_RowsToDisplay'|translate }}"></div>
|
||||
<div class="tableConfiguration">
|
||||
<a class="tableConfigurationIcon" href="#"></a>
|
||||
<ul>
|
||||
|
|
@ -97,12 +102,17 @@
|
|||
<div class="configItem dataTableExcludeLowPopulation"></div>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if properties.show_pivot_by_subtable|default is not empty %}
|
||||
<li>
|
||||
<div class="configItem dataTablePivotBySubtable"></div>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
{% if isPluginLoaded('Annotations') and not properties.hide_annotations_view %}
|
||||
<div class="annotationView" title="{{ 'Annotations_IconDesc'|translate }}">
|
||||
<a class="tableIcon">
|
||||
<img width="16" height="16" src="plugins/Zeitgeist/images/annotations.png"/>
|
||||
<img width="16" height="16" src="plugins/Morpheus/images/annotations.png"/>
|
||||
</a>
|
||||
<span>{{ 'Annotations_Annotations'|translate }}</span>
|
||||
</div>
|
||||
|
|
@ -135,6 +145,6 @@
|
|||
|
||||
</div>
|
||||
|
||||
<span class="loadingPiwikBelow" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
|
||||
<span class="loadingPiwikBelow" style="display:none;"><img src="plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
|
||||
|
||||
<div class="dataTableSpacer"></div>
|
||||
|
|
|
|||
|
|
@ -5,12 +5,13 @@
|
|||
{% if properties.metrics_documentation[column]|default is not empty %}
|
||||
<div class="columnDocumentation">
|
||||
<div class="columnDocumentationTitle">
|
||||
{{ properties.translations[column]|default(column)|raw }}
|
||||
<span class="icon-help"></span>
|
||||
{{ properties.translations[column]|default(column)|rawSafeDecoded }}
|
||||
</div>
|
||||
{{ properties.metrics_documentation[column]|raw }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<div id="thDIV">{{ properties.translations[column]|default(column)|raw }}</div>
|
||||
<div id="thDIV" class="thDIV">{{ properties.translations[column]|default(column)|rawSafeDecoded }}</div>
|
||||
</th>
|
||||
{% endfor %}
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -24,28 +24,28 @@
|
|||
<div class="slider-position"></div>
|
||||
</div>
|
||||
<div style="display:inline-block;">
|
||||
<div class="slider-donate-amount">$30/{{ 'General_YearShort'|translate }}</div>
|
||||
<div class="slider-donate-amount">$30/{{ 'Intl_Year_Short'|translate }}</div>
|
||||
|
||||
<img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/images/smileyprog_1.png"/>
|
||||
<img class="slider-smiley-face" width="40" height="40" src="plugins/Morpheus/images/smileyprog_1.png"/>
|
||||
</div>
|
||||
|
||||
<input type="hidden" name="os0" value="Option 1"/>
|
||||
</div>
|
||||
|
||||
<div class="donate-submit">
|
||||
<input type="image" src="plugins/Zeitgeist/images/paypal_subscribe.gif" border="0" name="submit"
|
||||
<input type="image" src="plugins/Morpheus/images/paypal_subscribe.gif" border="0" name="submit"
|
||||
title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/>
|
||||
<a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a>
|
||||
<a href="index.php?module=CoreHome&action=redirectToPaypal&idSite=1&cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82"
|
||||
target="_blank" class="donate-one-time">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a>
|
||||
rel="noreferrer" target="_blank" class="donate-one-time">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a>
|
||||
</div>
|
||||
|
||||
<!-- to cache images -->
|
||||
<img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_0.png"/>
|
||||
<img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_1.png"/>
|
||||
<img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_2.png"/>
|
||||
<img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_3.png"/>
|
||||
<img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_4.png"/>
|
||||
<img style="display:none;" src="plugins/Morpheus/images/smileyprog_0.png"/>
|
||||
<img style="display:none;" src="plugins/Morpheus/images/smileyprog_1.png"/>
|
||||
<img style="display:none;" src="plugins/Morpheus/images/smileyprog_2.png"/>
|
||||
<img style="display:none;" src="plugins/Morpheus/images/smileyprog_3.png"/>
|
||||
<img style="display:none;" src="plugins/Morpheus/images/smileyprog_4.png"/>
|
||||
</form>
|
||||
{% if footerMessage is defined %}
|
||||
<div class="form-description">
|
||||
|
|
|
|||
5
www/analytics/plugins/CoreHome/templates/_favicon.twig
Normal file
5
www/analytics/plugins/CoreHome/templates/_favicon.twig
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{% if isCustomLogo and customFavicon is defined and customFavicon %}
|
||||
<link rel="shortcut icon" href="{{ customFavicon }}"/>
|
||||
{% else %}
|
||||
<link rel="shortcut icon" href="plugins/CoreHome/images/favicon.png"/>
|
||||
{% endif %}
|
||||
|
|
@ -1,47 +1,59 @@
|
|||
{# testing, remove test_ from var names #}
|
||||
{% set test_latest_version_available="3.0" %}
|
||||
{% set test_latest_version_available="4.0.0" %}
|
||||
{% set test_piwikUrl='http://demo.piwik.org/' %}
|
||||
{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.piwik.org/' or piwikUrl == 'https://demo.piwik.org/'}}{% endset %}
|
||||
{% set isPiwikDemo %}{{ piwikUrl == 'http://demo.piwik.org/' or piwikUrl == 'https://demo.piwik.org/' }}{% endset %}
|
||||
|
||||
{% set updateCheck %}
|
||||
<div id="updateCheckLinkContainer">
|
||||
<span class='loadingPiwik' style="display:none;"><img src='plugins/Zeitgeist/images/loading-blue.gif'/></span>
|
||||
<img class="icon" src="plugins/Zeitgeist/images/reload.png"/>
|
||||
<a href="#" id="checkForUpdates"><em>{{ 'CoreHome_CheckForUpdates'|translate }}</em></a>
|
||||
</div>
|
||||
<span id="updateCheckLinkContainer">
|
||||
{{ 'CoreHome_CheckForUpdates'|translate }}
|
||||
<span class="icon icon-fixed icon-reload"></span>
|
||||
</span>
|
||||
{% endset %}
|
||||
|
||||
{% if isPiwikDemo or (latest_version_available and hasSomeViewAccess and not isUserIsAnonymous) or (isSuperUser and adminMenu is defined and adminMenu) %}
|
||||
<span id="header_message" class="{% if isPiwikDemo or not latest_version_available %}header_info{% else %}header_alert{% endif %}">
|
||||
<span class="header_short">
|
||||
<div piwik-expand-on-hover
|
||||
id="header_message"
|
||||
class="piwikSelector borderedControl {% if isPiwikDemo or not latest_version_available %}header_info{% else %}{% endif %} {% if isPiwikDemo %}isPiwikDemo{% else %}piwikTopControl{% endif %} {% if latest_version_available %}update_available{% endif %}"
|
||||
>
|
||||
|
||||
<a class="title" href="#">
|
||||
{% if isPiwikDemo %}
|
||||
{{ 'General_YouAreViewingDemoShortMessage'|translate }}
|
||||
{% elseif latest_version_available %}
|
||||
{{ 'General_NewUpdatePiwikX'|translate(latest_version_available) }}
|
||||
<span class="icon-warning"></span>
|
||||
{% elseif isSuperUser and adminMenu is defined and adminMenu %}
|
||||
{{ updateCheck|raw }}
|
||||
{% endif %}
|
||||
</span>
|
||||
</a>
|
||||
|
||||
<span class="header_full">
|
||||
<div class="dropdown">
|
||||
{% if isPiwikDemo %}
|
||||
{{ 'General_YouAreViewingDemoShortMessage'|translate }}
|
||||
<br />
|
||||
{{ 'General_DownloadFullVersion'|translate("<a href='http://piwik.org/'>","</a>","<a href='http://piwik.org'>piwik.org</a>")|raw }}
|
||||
<br/>
|
||||
{% if isSuperUser and adminMenu is defined and adminMenu %}
|
||||
<br/>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if latest_version_available and isSuperUser %}
|
||||
{{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>","</a>")|raw }}
|
||||
<br/>
|
||||
{{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }}
|
||||
<br />
|
||||
{% elseif latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous %}
|
||||
{% set updateSubject = 'General_NewUpdatePiwikX'|translate(latest_version_available)|e('url') %}
|
||||
{{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }}
|
||||
{% elseif isSuperUser and adminMenu is defined and adminMenu %}
|
||||
{{ updateCheck|raw }}
|
||||
<br />
|
||||
{{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }}
|
||||
{% endif %}
|
||||
</span>
|
||||
</span>
|
||||
{% endif %}
|
||||
|
||||
{% if isPiwikDemo and isSuperUser and adminMenu is defined and adminMenu %}
|
||||
<br/>
|
||||
{{ updateCheck|raw }}
|
||||
<br/>
|
||||
<br/>
|
||||
{% endif %}
|
||||
|
||||
{{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="clear:right"></div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
{% import 'ajaxMacros.twig' as ajax %}
|
||||
<div class="pageWrap">
|
||||
{% include "@CoreHome/_notifications.twig" %}
|
||||
<div class="top_controls">
|
||||
{% include "@CoreHome/_periodSelect.twig" %}
|
||||
{{ postEvent("Template.nextToCalendar") }}
|
||||
{% render dashboardSettingsControl %}
|
||||
{% include "@CoreHome/_headerMessage.twig" %}
|
||||
{{ ajax.requestErrorDiv }}
|
||||
</div>
|
||||
|
||||
{{ ajax.loadingDiv() }}
|
||||
|
||||
<div id="content" class="home">
|
||||
{% if content %}{{ content }}{% endif %}
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
||||
<br/><br/>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<span id="logo">
|
||||
<a href="index.php" title="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik # {{ 'General_OpenSourceWebAnalytics'|translate }}">
|
||||
<a href="index.php" tabindex="-1" title="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik # {{ 'General_OpenSourceWebAnalytics'|translate }}">
|
||||
{% if hasSVGLogo %}
|
||||
<img src='{{ logoSVG }}' alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" class="ie-hide {% if not isCustomLogo %}default-piwik-logo{% endif %}" />
|
||||
<img src='{{ logoSVG }}' tabindex="3" alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" class="ie-hide {% if not isCustomLogo %}default-piwik-logo{% endif %}" />
|
||||
<!--[if lt IE 9]>
|
||||
{% endif %}
|
||||
<img src='{{ logoHeader }}' alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" />
|
||||
|
|
|
|||
|
|
@ -1,23 +1,67 @@
|
|||
<div class="Menu--dashboard">
|
||||
<ul class="Menu-tabList">
|
||||
{% for level1,level2 in menu %}
|
||||
<li id="{{ level2._url|urlRewriteWithParameters }}">
|
||||
<a href="#{{ level2._url|urlRewriteWithParameters|slice(1) }}"
|
||||
onclick="return piwikMenu.onItemClick(this);">{{ level1|translate }}</a>
|
||||
<ul>
|
||||
{% macro submenuItem(name, url, anchorlink, tooltip) %}
|
||||
{% if name|slice(0,1) != '_' %}
|
||||
<li role="menuitem" title="{{ tooltip|default("")|translate|e('html_attr') }}">
|
||||
<a class="item" href="{% if anchorlink %}#{% else %}index.php?{% endif %}{{ url|urlRewriteWithParameters|slice(1) }}" tabindex="5">
|
||||
{{ name|translate }}
|
||||
</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endmacro %}
|
||||
|
||||
{% macro groupedItem(name, group, anchorlink) %}
|
||||
<li role="menuitem" title="{{ name|translate|e('html_attr') }}">
|
||||
<div piwik-menudropdown show-search="true" menu-title="{{ name|translate|e('html_attr') }}">
|
||||
{% for item in group.getItems %}
|
||||
<a class="item menuItem"
|
||||
href='{% if anchorlink %}#?{% else %}index.php?{% endif %}{{ item.url|urlRewriteWithParameters|slice(1) }}'
|
||||
title="{% if item.tooltip %}{{ item.tooltip|e('html_attr') }}{% endif %}">
|
||||
{{ item.name|translate }}
|
||||
</a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</li>
|
||||
{% endmacro %}
|
||||
|
||||
{% macro getId(urlParameters) -%}
|
||||
{% if urlParameters is iterable -%}
|
||||
{{ urlParameters|urlRewriteWithParameters }}
|
||||
{%- endif %}
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro menu(menu, anchorlink, cssClass) %}
|
||||
<div id="secondNavBar" class="{{ cssClass }}">
|
||||
<div id="search" ng-cloak>
|
||||
<div piwik-quick-access class="borderedControl"></div>
|
||||
</div>
|
||||
<ul role="menu" aria-label="{{ 'CoreHome_MainNavigation'|translate|e('html_attr') }}" class="navbar">
|
||||
{% for level1,level2 in menu %}
|
||||
{% set hasSubmenuItem = false %}
|
||||
{% for name,urlParameters in level2 %}
|
||||
{% if name|slice(0,1) != '_' %}
|
||||
<li>
|
||||
<a href='#{{ urlParameters._url|urlRewriteWithParameters|slice(1) }}'
|
||||
onclick='return piwikMenu.onItemClick(this);'>
|
||||
{{ name|translate }}
|
||||
</a>
|
||||
</li>
|
||||
{% if urlParameters._url is defined and urlParameters._url is not iterable %}
|
||||
{% set hasSubmenuItem = true %}
|
||||
{% elseif name|slice(0,1) != '_' %}
|
||||
{% set hasSubmenuItem = true %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
<div class="nav_sep"></div>
|
||||
|
||||
{% if hasSubmenuItem %}
|
||||
<li role="menuitem" class="menuTab" id="{% if level2._url is defined and level2._url is not empty %}{{ _self.getId(level2._url) }}{% endif %}">
|
||||
<a class="item" href="" tabindex="5">
|
||||
<span class="menu-icon {{ level2._icon|default('icon-arrow-right') }}"></span>{{ level1|translate }}
|
||||
</a>
|
||||
|
||||
<ul role="menu" title="{{ level1|translate|e('html_attr') }}">
|
||||
{% for name,urlParameters in level2 %}
|
||||
{% if urlParameters._url is defined and urlParameters._url is not iterable %}
|
||||
{{ _self.groupedItem(name,urlParameters._url, anchorlink) }}
|
||||
{% elseif name|slice(0,1) != '_' %}
|
||||
{{ _self.submenuItem(name,urlParameters._url, anchorlink, urlParameters._tooltip) }}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
<div id="periodString" class="piwikTopControl periodSelector">
|
||||
<div id="date">{{ 'General_DateRange'|translate }} <strong>{{ prettyDate }}</strong></div>
|
||||
<div class="calendar-icon"></div>
|
||||
<div id="periodMore">
|
||||
<div id="periodString" piwik-expand-on-click class="piwikTopControl piwikSelector borderedControl periodSelector">
|
||||
<a id="date" class="title" title="{{ 'General_ChooseDate'|translate(prettyDateLong|default(''))|e('html_attr') }}" tabindex="4">
|
||||
<span class="icon icon-calendar"></span>
|
||||
{{ prettyDate }}
|
||||
</a>
|
||||
<div id="periodMore" class="dropdown">
|
||||
<div class="period-date">
|
||||
<h6>{{ 'General_Date'|translate }}</h6>
|
||||
|
||||
<div id="datepicker"></div>
|
||||
</div>
|
||||
<div class="period-range" style="display:none;">
|
||||
<div id="calendarRangeFrom">
|
||||
<h6>{{ 'General_DateRangeFrom'|translate }}<input tabindex="1" type="text" id="inputCalendarFrom" name="inputCalendarFrom"/></h6>
|
||||
<h6>{{ 'General_DateRangeFrom'|translate }}<input tabindex="4" type="text" id="inputCalendarFrom" name="inputCalendarFrom"/></h6>
|
||||
|
||||
<div id="calendarFrom"></div>
|
||||
</div>
|
||||
<div id="calendarRangeTo">
|
||||
<h6>{{ 'General_DateRangeTo'|translate }}<input tabindex="2" type="text" id="inputCalendarTo" name="inputCalendarTo"/></h6>
|
||||
<h6>{{ 'General_DateRangeTo'|translate }}<input tabindex="4" type="text" id="inputCalendarTo" name="inputCalendarTo"/></h6>
|
||||
|
||||
<div id="calendarTo"></div>
|
||||
</div>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<br/>
|
||||
{% endfor %}
|
||||
</span>
|
||||
<input tabindex="3" type="submit" value="{{ 'General_ApplyDateRange'|translate }}" id="calendarRangeApply"/>
|
||||
<input tabindex="4" type="submit" value="{{ 'General_Apply'|translate }}" id="calendarApply" class="btn"/>
|
||||
{% import 'ajaxMacros.twig' as ajax %}
|
||||
{{ ajax.loadingDiv('ajaxLoadingCalendar') }}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
<div class="top_bar_sites_selector {% if currentModule == 'CoreHome' %}sites_selector_in_dashboard{% endif %}">
|
||||
<label>{{ 'General_Website'|translate }}</label>
|
||||
<div piwik-siteselector class="sites_autocomplete"></div>
|
||||
|
||||
<div class="top_bar_sites_selector piwikTopControl">
|
||||
<div piwik-siteselector show-selected-site="true" class="sites_autocomplete"></div>
|
||||
</div>
|
||||
|
|
@ -1,5 +1,34 @@
|
|||
{{ postEvent("Template.beforeTopBar", userAlias, userLogin, topMenu) }}
|
||||
<div id="topBars">
|
||||
{% include "@CoreHome/_topBarHelloMenu.twig" %}
|
||||
{% include "@CoreHome/_topBarTopMenu.twig" %}
|
||||
</div>
|
||||
{{ postEvent("Template.beforeTopBar", userAlias, userLogin, topMenu, userMenu) }}
|
||||
<ul role="menubar" class="navbar-right">
|
||||
|
||||
{% macro menuItemLabel(label, icon) %}
|
||||
{% if icon is defined and icon and icon starts with 'icon-' %}
|
||||
<span class="{{ icon|striptags }}"></span>
|
||||
{% else %}
|
||||
{{ label|translate }}
|
||||
{% endif %}
|
||||
{% endmacro %}
|
||||
|
||||
{% macro topMenuItem(label, menu, currentModule, currentAction) %}
|
||||
{% if menu._html is defined %}
|
||||
{{ menu._html|raw }}
|
||||
{% else %}
|
||||
<a {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %}
|
||||
class="topBarElem {% if (menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %}active{% endif %}"
|
||||
id="topmenu-{{ menu._url.module|lower }}"
|
||||
href="index.php{{ menu._url|urlRewriteWithParameters }}" tabindex="3">{{ _self.menuItemLabel(label, menu._icon) }}</a>
|
||||
{% endif %}
|
||||
{% endmacro %}
|
||||
|
||||
{% if topMenuModule is not defined %}
|
||||
{% set topMenuModule = currentModule %}
|
||||
{% set topMenuAction = currentAction %}
|
||||
{% endif %}
|
||||
|
||||
{% spaceless %}
|
||||
{% for label,menu in topMenu %}
|
||||
<li role="menuitem">{{ _self.topMenuItem(label, menu, topMenuModule, topMenuAction) }}</li>
|
||||
{% endfor %}
|
||||
{% endspaceless %}
|
||||
|
||||
</ul>
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
<div id="topRightBar">
|
||||
{% set helloAlias %}
|
||||
{% if userAlias is not empty %}
|
||||
<strong>{{ userAlias }}</strong>
|
||||
{% else %}
|
||||
<strong>{{ userLogin }}</strong>
|
||||
{% endif %}
|
||||
{% endset %}
|
||||
<span class="topBarElem">{{ 'General_HelloUser'|translate(helloAlias|trim)|raw }}</span>
|
||||
{% if userLogin != 'anonymous' %}
|
||||
|
|
||||
{% if isAdminLayout is defined %}
|
||||
<span class="topBarElem topBarElemActive">{{ 'General_Settings'|translate }}</span>
|
||||
{% else %}
|
||||
<span class="topBarElem"><a href='index.php?module=CoreAdminHome'>{{ 'General_Settings'|translate }}</a></span>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
| <span class="topBarElem">
|
||||
{% if userLogin == 'anonymous' %}
|
||||
<a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a>
|
||||
{% else %}
|
||||
<a href='index.php?module={{ loginModule }}&action=logout'>{{ 'General_Logout'|translate }}</a>
|
||||
{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
<div id="topLeftBar">
|
||||
{% for label,menu in topMenu %}
|
||||
{% if menu._html is defined %}
|
||||
{{ menu._html|raw }}
|
||||
{% elseif (menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %}
|
||||
<span class="topBarElem topBarElemActive"><strong>{{ label|translate }}</strong></span>{% if not loop.last %} |{% endif %}
|
||||
{% else %}
|
||||
<span class="topBarElem" {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %}>
|
||||
<a id="topmenu-{{ menu._url.module|lower }}" href="index.php{{ menu._url|urlRewriteWithParameters }}">{{ label|translate }}</a>
|
||||
</span>{% if not loop.last %} | {% endif %}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
|
@ -1,4 +1,15 @@
|
|||
<div id="header">
|
||||
{% include "@CoreHome/_logo.twig" %}
|
||||
{% include "@CoreHome/_topBar.twig" %}
|
||||
</div>
|
||||
<div id="header" class="container-fluid">
|
||||
<a href="#main" tabindex="1" class="accessibility-skip-to-content">{{'CoreHome_SkipToContent'|translate}}</a>
|
||||
<div id="topRightBar" class="navbar row">
|
||||
<div class="navbar-header col-md-3">
|
||||
<span class="toggle-second-menu icon-menu-hamburger"></span>
|
||||
{% include "@CoreHome/_logo.twig" %}
|
||||
|
||||
<!-- we need to put button to toggle nav for responsiveness here -->
|
||||
|
||||
</div>
|
||||
<div class="collapse navbar-collapse col-md-9" id="navbar-collapse1">
|
||||
{% include "@CoreHome/_topBar.twig" %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,6 +1,9 @@
|
|||
<div class="{{ cssIdentifier }} {{ cssClass }}"
|
||||
data-props="{{ clientSideProperties|json_encode }}"
|
||||
data-params="{{ clientSideParameters|json_encode }}">
|
||||
{% render implView with implOverride %}
|
||||
{% for name,value in htmlAttributes %}
|
||||
{{ name }}="{{ value|e('html_attr') }}"
|
||||
{% endfor %}
|
||||
data-props="{{ clientSideProperties|json_encode }}"
|
||||
data-params="{{ clientSideParameters|json_encode }}">
|
||||
{% render implView with implOverride %}
|
||||
</div>
|
||||
<script>$(document).ready(function () { require('{{ jsNamespace }}').{{ jsClass }}.initElements(); });</script>
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
{# untrusted host warning #}
|
||||
{% if (isValidHost is defined and invalidHostMessage is defined and isValidHost == false) %}
|
||||
{% set invalidHostText %}
|
||||
<a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/images/help.png"/></a>
|
||||
<a class="btn btn-link" style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank">
|
||||
<span class="icon-help"></span>
|
||||
{{ 'General_Help'|translate }}
|
||||
</a>
|
||||
<strong>{{ 'General_Warning'|translate }}: </strong>{{ invalidHostMessage|raw }}
|
||||
|
||||
<br>
|
||||
<br>
|
||||
|
||||
<small>{{ invalidHostMessageHowToFix|raw }}
|
||||
<br/><br/><a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank">{{ 'General_Help'|translate }}
|
||||
<img style="vertical-align: bottom;" src="plugins/Zeitgeist/images/help.png"/></a><br/>
|
||||
</small>
|
||||
{{ invalidHostMessageHowToFix|raw }}
|
||||
{% endset %}
|
||||
|
||||
<div style="clear:both;width:800px;">
|
||||
|
|
|
|||
|
|
@ -1,14 +1,20 @@
|
|||
{% extends "dashboard.twig" %}
|
||||
{% block notification %}{% endblock %}
|
||||
{% block content %}
|
||||
|
||||
{% include "@CoreHome/_siteSelectHeader.twig" %}
|
||||
|
||||
{% if (menu is defined and menu) %}
|
||||
{% include "@CoreHome/_menu.twig" %}
|
||||
{% endif %}
|
||||
|
||||
{% include "@CoreHome/_indexContent.twig" %}
|
||||
{% import 'ajaxMacros.twig' as ajax %}
|
||||
|
||||
{% block topcontrols %}
|
||||
{% include "@CoreHome/_siteSelectHeader.twig" %}
|
||||
{% include "@CoreHome/_periodSelect.twig" %}
|
||||
{{ postEvent("Template.nextToCalendar") }}
|
||||
{% render dashboardSettingsControl %}
|
||||
{% include "@CoreHome/_headerMessage.twig" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{{ ajax.requestErrorDiv(emailSuperUser|default(''), arePiwikProAdsEnabled) }}
|
||||
{{ ajax.loadingDiv() }}
|
||||
|
||||
<div id="content" class="home">
|
||||
{% if content %}{{ content }}{% endif %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<h2>{{ availableRecordsText|translate }}</h2>
|
||||
<table class="metrics" border="0" cellpadding="0" cellspacing="0">
|
||||
{% for i, metric in metrics %}
|
||||
<tr>
|
||||
<tr {% if metric.hide|default %}style="display:none"{% endif %}>
|
||||
<td class="sparkline">
|
||||
{{ metric.sparkline|raw }}
|
||||
</td>
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
<a href="#" class="rowevolution-startmulti">» {{ 'RowEvolution_PickAnotherRow'|translate }}</a>
|
||||
<a href="#" class="rowevolution-startmulti">» {{ 'RowEvolution_PickAnotherRow'|translate }}</a>
|
||||
</div>
|
||||
{% if availableMetrics|length > 1 %}
|
||||
<div class="metric-selectbox">
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
<div id="piwik-promo">
|
||||
<div id="piwik-promo-video">
|
||||
<div id="piwik-promo-thumbnail">
|
||||
<img src="plugins/Zeitgeist/images/video_play.png"/>
|
||||
<img src="plugins/Morpheus/images/video_play.png"/>
|
||||
</div>
|
||||
|
||||
<div id="piwik-promo-embed" style="display:none;">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<a id="piwik-promo-videos-link" href="http://piwik.org/blog/2012/12/piwik-how-to-videos/" target="_blank">
|
||||
<a id="piwik-promo-videos-link" href="http://piwik.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank">
|
||||
{{ 'CoreHome_ViewAllPiwikVideoTutorials'|translate }}
|
||||
</a>
|
||||
|
||||
|
|
@ -16,18 +16,18 @@
|
|||
<span>{{ 'CoreHome_ShareThis'|translate }}:</span>
|
||||
|
||||
{# facebook #}
|
||||
<a href="http://www.facebook.com/sharer.php?u={{ promoVideoUrl|url_encode }}" target="_blank">
|
||||
<a href="http://www.facebook.com/sharer.php?u={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank">
|
||||
<img src="plugins/Referrers/images/socials/facebook.com.png" />
|
||||
</a>
|
||||
|
||||
{# twitter #}
|
||||
<a href="http://twitter.com/share?text={{ shareText|url_encode }}&url={{ promoVideoUrl|url_encode }}" target="_blank">
|
||||
<a href="http://twitter.com/share?text={{ shareText|url_encode }}&url={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank">
|
||||
<img src="plugins/Referrers/images/socials/twitter.com.png" />
|
||||
</a>
|
||||
|
||||
{# email #}
|
||||
<a href="mailto:?body={{ shareTextLong|url_encode(true) }}&subject={{ shareText|url_encode(true) }}" target="_blank">
|
||||
<img src="plugins/Zeitgeist/images/email.png" />
|
||||
<img src="plugins/Morpheus/images/email.png" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
|
|
@ -35,3 +35,18 @@
|
|||
|
||||
<div id="piwik-widget-footer" style="color:#666;">{{ 'CoreHome_CloseWidgetDirections'|translate }}</div>
|
||||
</div>
|
||||
|
||||
<script type="application/javascript">
|
||||
$(function () {
|
||||
$('#piwik-promo-thumbnail').click(function () {
|
||||
var promoEmbed = $('#piwik-promo-embed'),
|
||||
widgetWidth = $(this).closest('.widgetContent').width(),
|
||||
height = (266 * widgetWidth) / 421,
|
||||
embedHtml = '<iframe width="100%" height="' + height + '" src="https://www.youtube-nocookie.com/embed/OslfF_EH81g?autoplay=1&vq=hd720&wmode=transparent" frameborder="0" wmode="Opaque"></iframe>';
|
||||
|
||||
$(this).hide();
|
||||
promoEmbed.height(height).html(embedHtml);
|
||||
promoEmbed.show();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
<div class="metrics-container">
|
||||
<h2>{{ availableMetricsText|raw }}</h2>
|
||||
|
||||
<div class="rowevolution-documentation">
|
||||
<div class="alert alert-info">
|
||||
{{ 'RowEvolution_Documentation'|translate }}
|
||||
</div>
|
||||
<table class="metrics" border="0" cellpadding="0" cellspacing="0" data-thing="{{ seriesColorCount }}">
|
||||
{% for i, metric in metrics %}
|
||||
<tr data-i="{{ i }}">
|
||||
<tr data-i="{{ i }}" {% if metric.hide|default %}style="display:none"{% endif %}>
|
||||
<td class="sparkline">
|
||||
{{ metric.sparkline|raw }}
|
||||
</td>
|
||||
|
|
@ -31,9 +31,9 @@
|
|||
<div class="compare-container">
|
||||
<h2>{{ 'RowEvolution_CompareRows'|translate }}</h2>
|
||||
|
||||
<div class="rowevolution-documentation">
|
||||
<div class="alert alert-info">
|
||||
{{ 'RowEvolution_CompareDocumentation'|translate|raw }}
|
||||
</div>
|
||||
<a href="#" class="rowevolution-startmulti">» {{ 'RowEvolution_PickARow'|translate }}</a>
|
||||
<a href="#" class="rowevolution-startmulti">» {{ 'RowEvolution_PickARow'|translate }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue