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

46
www/analytics/plugins/SegmentEditor/templates/_segmentSelector.twig
View file

@ -1,9 +1,13 @@
<div class="SegmentEditor" style="display:none;">
<div class="segmentationContainer listHtml">
<span class="segmentationTitle"></span>
<div class="dropdown-body">
<div class="segmentationContainer listHtml" title="{{ 'SegmentEditor_ChooseASegment'|translate|e('html_attr') }}. {{ 'SegmentEditor_CurrentlySelectedSegment'|translate(segmentDescription)|e('html_attr') }}">
<a class="title" tabindex="4"><span class="icon icon-segment"></span><span class="segmentationTitle"></span></a>
<div class="dropdown dropdown-body">
<div class="segmentFilterContainer">
<input class="segmentFilter" type="text" value="{{ 'General_Search'|translate }}"/>
<span/>
</div>
<ul class="submenu">
<li>{{ 'SegmentEditor_SelectSegmentOfVisitors'|translate }}
<li>{{ 'SegmentEditor_SelectSegmentOfVisits'|translate }}
<div class="segmentList">
<ul>
</ul>
@ -12,13 +16,18 @@
</ul>
{% if authorizedToCreateSegments %}
<a class="add_new_segment">{{ 'SegmentEditor_AddNewSegment'|translate }}</a>
<a class="add_new_segment btn">{{ 'SegmentEditor_AddNewSegment'|translate }}</a>
{% else %}
<hr/>
<ul class="submenu">
<li> <span class='youMustBeLoggedIn'>{{ 'SegmentEditor_YouMustBeLoggedInToCreateSegments'|translate }}
<br/>&rsaquo; <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a> </span>
<li>
{% if isUserAnonymous %}
<span class='youMustBeLoggedIn'>{{ 'SegmentEditor_YouMustBeLoggedInToCreateSegments'|translate }}
<br/>&rsaquo; <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a> </span>
{% endif %}
</li>
</ul>
<br/><br/>
{% endif %}
</div>
</div>
@ -54,6 +63,8 @@
<option value=">">{{ 'General_OperationGreaterThan'|translate }}</option>
<option value="=@">{{ 'General_OperationContains'|translate }}</option>
<option value="!@">{{ 'General_OperationDoesNotContain'|translate }}</option>
<option value="=^">{{ 'General_OperationStartsWith'|translate }}</option>
<option value="=$">{{ 'General_OperationEndsWith'|translate }}</option>
</select>
</div>
<div class="segment-input metricValueBlock">
@ -79,9 +90,10 @@
<a href="#">+ {{ 'SegmentEditor_AddANDorORCondition'|translate(andCondition)|raw }}</a>
</div>
</div>
<div class="segment-element">
<div class="segment-element borderedControl expanded">
<div class="segment-nav">
<h4 class="visits"><span class="available_segments"><strong>
<h4 class="visits">
<span class="icon-segment"></span><span class="available_segments"><strong>
<select class="available_segments_select"></select>
</strong></span></h4>
<div class="scrollable">
@ -91,7 +103,17 @@
<a class="metric_category" href="#">{{ category }}</a>
<ul style="display:none;">
{% for segmentInCategory in segmentsInCategory %}
<li data-metric="{{ segmentInCategory.segment }}"><a class="ddmetric" href="#">{{ segmentInCategory.name }}</a></li>
{% set title = segmentInCategory.name %}
{% if segmentInCategory.unionOfSegments is defined and segmentInCategory.unionOfSegments %}
{% set title = 'SegmentEditor_SegmentXIsAUnionOf'|translate(title) %}
{% for unionSegment in segmentInCategory.unionOfSegments %}
{% set title = title ~ ' ' ~ unionSegment %}
{% if not loop.last %}
{% set title = title ~ ',' %}
{% endif %}
{% endfor %}
{% endif %}
<li data-metric="{{ segmentInCategory.segment }}" title="{{ title|e('html_attr') }}"><a class="ddmetric" href="#">{{ segmentInCategory.name }}</a></li>
{% endfor %}
</ul>
</li>
@ -115,7 +137,7 @@
{{ 'SegmentEditor_SegmentIsDisplayedForWebsite'|translate }}<span class="visible_to_website"><strong>
<select class="visible_to_website_select">
<option selected="" value="{{ idSite }}">{{ 'SegmentEditor_SegmentDisplayedThisWebsiteOnly'|translate }}</option>
<option value="0">{{ 'SegmentEditor_SegmentDisplayedAllWebsites'|translate }}</option>
{% if isAddingSegmentsForAllWebsitesEnabled %}<option value="0">{{ 'SegmentEditor_SegmentDisplayedAllWebsites'|translate }}</option>{% endif %}
</select>
</strong></span>
{{ 'General_And'|translate }} <span class="auto_archive"><strong>
@ -132,7 +154,7 @@
</div>
<div class="segment-footer">
<div piwik-rate-feature title="Segment Editor" style="display:inline-block;float: left;margin-top: 2px;margin-right: 10px;"></div>
<span class="segmentFooterNote">The Segment Editor was <a class='crowdfundingLink' href='http://crowdfunding.piwik.org/custom-segments-editor/' target='_blank'>crowdfunded</a> with the awesome support of 80 companies and Piwik users worldwide!</span>
<span class="segmentFooterNote">The Segment Editor was <a class='crowdfundingLink' href='http://crowdfunding.piwik.org/custom-segments-editor/' rel='noreferrer' target='_blank'>crowdfunded</a> with the awesome support of 80 companies and Piwik users worldwide!</span>
<a class="delete" href="#">{{ 'General_Delete'|translate }}</a>
<a class="close" href="#">{{ 'General_Close'|translate }}</a>
<button class="saveAndApply">{{ 'SegmentEditor_SaveAndApply'|translate }}</button>