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

show union segments in a title if given

parent 3154cba0
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
"YouMayChangeSetting": "Alternatively you may change the setting in the config file (%s), or edit this Segment and choose '%s'.", "YouMayChangeSetting": "Alternatively you may change the setting in the config file (%s), or edit this Segment and choose '%s'.",
"YouMustBeLoggedInToCreateSegments": "You must be logged in to create and edit custom visitor segments.", "YouMustBeLoggedInToCreateSegments": "You must be logged in to create and edit custom visitor segments.",
"YouDontHaveAccessToCreateSegments": "You don't have the required access level to create and edit segments.", "YouDontHaveAccessToCreateSegments": "You don't have the required access level to create and edit segments.",
"AddingSegmentForAllWebsitesDisabled": "Adding segments for all websites has been disabled." "AddingSegmentForAllWebsitesDisabled": "Adding segments for all websites has been disabled.",
"SegmentXIsAUnionOf": "%s is a union of these segments:"
} }
} }
\ No newline at end of file
...@@ -99,7 +99,17 @@ ...@@ -99,7 +99,17 @@
<a class="metric_category" href="#">{{ category }}</a> <a class="metric_category" href="#">{{ category }}</a>
<ul style="display:none;"> <ul style="display:none;">
{% for segmentInCategory in segmentsInCategory %} {% 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 %} {% endfor %}
</ul> </ul>
</li> </li>
......
...@@ -274,6 +274,13 @@ ...@@ -274,6 +274,13 @@
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope visit)</name> <name>Custom Variable name (scope visit)</name>
<segment>customVariableName</segment> <segment>customVariableName</segment>
<unionOfSegments>
<row>customVariableName1</row>
<row>customVariableName2</row>
<row>customVariableName3</row>
<row>customVariableName4</row>
<row>customVariableName5</row>
</unionOfSegments>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
...@@ -310,6 +317,13 @@ ...@@ -310,6 +317,13 @@
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable name (scope page)</name> <name>Custom Variable name (scope page)</name>
<segment>customVariablePageName</segment> <segment>customVariablePageName</segment>
<unionOfSegments>
<row>customVariablePageName1</row>
<row>customVariablePageName2</row>
<row>customVariablePageName3</row>
<row>customVariablePageName4</row>
<row>customVariablePageName5</row>
</unionOfSegments>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
...@@ -346,6 +360,13 @@ ...@@ -346,6 +360,13 @@
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope page)</name> <name>Custom Variable value (scope page)</name>
<segment>customVariablePageValue</segment> <segment>customVariablePageValue</segment>
<unionOfSegments>
<row>customVariablePageValue1</row>
<row>customVariablePageValue2</row>
<row>customVariablePageValue3</row>
<row>customVariablePageValue4</row>
<row>customVariablePageValue5</row>
</unionOfSegments>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
...@@ -382,6 +403,13 @@ ...@@ -382,6 +403,13 @@
<category>Custom Variables</category> <category>Custom Variables</category>
<name>Custom Variable value (scope visit)</name> <name>Custom Variable value (scope visit)</name>
<segment>customVariableValue</segment> <segment>customVariableValue</segment>
<unionOfSegments>
<row>customVariableValue1</row>
<row>customVariableValue2</row>
<row>customVariableValue3</row>
<row>customVariableValue4</row>
<row>customVariableValue5</row>
</unionOfSegments>
</row> </row>
<row> <row>
<type>dimension</type> <type>dimension</type>
......
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