refs #4633 rename segmentFilter => segment

13 files changed, 39 insertions, 39 deletions

diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
index ad30423f17..311ac59259 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
@@ -58,17 +58,17 @@
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
 				<contentTarget>http://www.example.com</contentTarget>
-				<segmentFilter>contentName==ImageAd</segmentFilter>
+				<segment>contentName==ImageAd</segment>
 				
 			</row>
 			<row>
 				<contentTarget>http://piwik.org/</contentTarget>
-				<segmentFilter>contentName==Text+Ad</segmentFilter>
+				<segment>contentName==Text+Ad</segment>
 				
 			</row>
 			<row>
 				<contentTarget />
-				<segmentFilter>contentName==Video+Ad</segmentFilter>
+				<segment>contentName==Video+Ad</segment>
 				
 			</row>
 		</result>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
index c1665283d0..2f19e727d9 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
@@ -82,27 +82,27 @@
 		<result prettyDate="Sunday 3 January 2010">
 			<row>
 				<contentTarget>http://piwik.org/download</contentTarget>
-				<segmentFilter>contentPiece==Click+to+download+Piwik+now</segmentFilter>
+				<segment>contentPiece==Click+to+download+Piwik+now</segment>
 				
 			</row>
 			<row>
 				<contentTarget>http://www.example.com</contentTarget>
-				<segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter>
+				<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 				
 			</row>
 			<row>
 				<contentTarget>http://www.example.com</contentTarget>
-				<segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter>
+				<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 				
 			</row>
 			<row>
 				<contentTarget>http://piwik.org/</contentTarget>
-				<segmentFilter>contentPiece==Click+NOW</segmentFilter>
+				<segment>contentPiece==Click+NOW</segment>
 				
 			</row>
 			<row>
 				<contentTarget />
-				<segmentFilter>contentPiece==movie.mov</segmentFilter>
+				<segment>contentPiece==movie.mov</segment>
 				
 			</row>
 			<row>
@@ -111,7 +111,7 @@
 			</row>
 			<row>
 				<contentTarget />
-				<segmentFilter>contentPiece==Unknown</segmentFilter>
+				<segment>contentPiece==Unknown</segment>
 				
 			</row>
 		</result>
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml
index 190e3be524..c93f842124 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_day.xml
@@ -21,6 +21,6 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.333</avg_time_generation>
 		<url>http://www.example.org/page</url>
-		<segmentFilter>pageUrl==http%3A%2F%2Fwww.example.org%2Fpage</segmentFilter>
+		<segment>pageUrl==http%3A%2F%2Fwww.example.org%2Fpage</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml
index 6213a85ca6..c24ffddb6c 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Actions.getPageUrls_month.xml
@@ -21,6 +21,6 @@
 		<exit_rate>100%</exit_rate>
 		<avg_time_generation>0.333</avg_time_generation>
 		<url>http://www.example.org/page</url>
-		<segmentFilter>pageUrl==http%3A%2F%2Fwww.example.org%2Fpage</segmentFilter>
+		<segment>pageUrl==http%3A%2F%2Fwww.example.org%2Fpage</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
index 630f06f47c..e81ffde69d 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_day.xml
@@ -8,7 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>25%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentName==ImageAd</segmentFilter>
+		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
 		<label>Text Ad</label>
@@ -18,7 +18,7 @@
 		<nb_interactions>4</nb_interactions>
 		<interaction_rate>66.67%</interaction_rate>
 		<contentTarget>http://piwik.org/</contentTarget>
-		<segmentFilter>contentName==Text+Ad</segmentFilter>
+		<segment>contentName==Text+Ad</segment>
 	</row>
 	<row>
 		<label>Video Ad</label>
@@ -28,6 +28,6 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
-		<segmentFilter>contentName==Video+Ad</segmentFilter>
+		<segment>contentName==Video+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
index 0560531eff..069388968b 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentNames_month.xml
@@ -8,7 +8,7 @@
 		<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
 		<interaction_rate>25%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentName==ImageAd</segmentFilter>
+		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
 		<label>Text Ad</label>
@@ -18,7 +18,7 @@
 		<sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors>
 		<interaction_rate>66.67%</interaction_rate>
 		<contentTarget>http://piwik.org/</contentTarget>
-		<segmentFilter>contentName==Text+Ad</segmentFilter>
+		<segment>contentName==Text+Ad</segment>
 	</row>
 	<row>
 		<label>Video Ad</label>
@@ -28,6 +28,6 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
-		<segmentFilter>contentName==Video+Ad</segmentFilter>
+		<segment>contentName==Video+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
index 8598065093..a7e56b692a 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_day.xml
@@ -8,7 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://piwik.org/download</contentTarget>
-		<segmentFilter>contentPiece==Click+to+download+Piwik+now</segmentFilter>
+		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
 		<label>/path/ad.jpg</label>
@@ -18,7 +18,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter>
+		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
 		<label>/path/ad2.jpg</label>
@@ -28,7 +28,7 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter>
+		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
 		<label>Click NOW</label>
@@ -38,7 +38,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://piwik.org/</contentTarget>
-		<segmentFilter>contentPiece==Click+NOW</segmentFilter>
+		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
 		<label>movie.mov</label>
@@ -48,7 +48,7 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
-		<segmentFilter>contentPiece==movie.mov</segmentFilter>
+		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
 		<label>Content Piece not defined</label>
@@ -67,6 +67,6 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
-		<segmentFilter>contentPiece==Unknown</segmentFilter>
+		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
index 0b8e36e62a..56da535eeb 100644
--- a/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents__Contents.getContentPieces_month.xml
@@ -8,7 +8,7 @@
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://piwik.org/download</contentTarget>
-		<segmentFilter>contentPiece==Click+to+download+Piwik+now</segmentFilter>
+		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
 		<label>/path/ad.jpg</label>
@@ -18,7 +18,7 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter>
+		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
 		<label>/path/ad2.jpg</label>
@@ -28,7 +28,7 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter>
+		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
 		<label>Click NOW</label>
@@ -38,7 +38,7 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://piwik.org/</contentTarget>
-		<segmentFilter>contentPiece==Click+NOW</segmentFilter>
+		<segment>contentPiece==Click+NOW</segment>
 	</row>
 	<row>
 		<label>movie.mov</label>
@@ -48,7 +48,7 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
-		<segmentFilter>contentPiece==movie.mov</segmentFilter>
+		<segment>contentPiece==movie.mov</segment>
 	</row>
 	<row>
 		<label>Content Piece not defined</label>
@@ -67,6 +67,6 @@
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
-		<segmentFilter>contentPiece==Unknown</segmentFilter>
+		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
index 470a9b027f..f0c23afff4 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentNames_day.xml
@@ -8,6 +8,6 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentName==ImageAd</segmentFilter>
+		<segment>contentName==ImageAd</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
index bb14d08c71..ae70087a09 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Contents.getContentPieces_day.xml
@@ -8,7 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter>
+		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
 		<label>/path/ad2.jpg</label>
@@ -18,6 +18,6 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter>
+		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
index 1729025fed..1f75bfaa1b 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentNames_day.xml
@@ -8,7 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>25%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentName==ImageAd</segmentFilter>
+		<segment>contentName==ImageAd</segment>
 	</row>
 	<row>
 		<label>Text Ad</label>
@@ -18,6 +18,6 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://piwik.org/download</contentTarget>
-		<segmentFilter>contentName==Text+Ad</segmentFilter>
+		<segment>contentName==Text+Ad</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
index 9c897b080d..98fbf6ad4a 100644
--- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
+++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Contents.getContentPieces_day.xml
@@ -8,7 +8,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>50%</interaction_rate>
 		<contentTarget>http://piwik.org/download</contentTarget>
-		<segmentFilter>contentPiece==Click+to+download+Piwik+now</segmentFilter>
+		<segment>contentPiece==Click+to+download+Piwik+now</segment>
 	</row>
 	<row>
 		<label>/path/ad.jpg</label>
@@ -18,7 +18,7 @@
 		<nb_interactions>2</nb_interactions>
 		<interaction_rate>100%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentPiece==%2Fpath%2Fad.jpg</segmentFilter>
+		<segment>contentPiece==%2Fpath%2Fad.jpg</segment>
 	</row>
 	<row>
 		<label>/path/ad2.jpg</label>
@@ -28,7 +28,7 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget>http://www.example.com</contentTarget>
-		<segmentFilter>contentPiece==%2Fpath%2Fad2.jpg</segmentFilter>
+		<segment>contentPiece==%2Fpath%2Fad2.jpg</segment>
 	</row>
 	<row>
 		<label>Content Piece not defined</label>
@@ -47,6 +47,6 @@
 		<nb_interactions>0</nb_interactions>
 		<interaction_rate>0%</interaction_rate>
 		<contentTarget />
-		<segmentFilter>contentPiece==Unknown</segmentFilter>
+		<segment>contentPiece==Unknown</segment>
 	</row>
 </result>
\ No newline at end of file
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
index 873cd38c17..1fbbf6517f 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
@@ -31,7 +31,7 @@
 
                 {% if showRow %}
                 <tr {% if rowHasSubtable %}id="{{ row.getIdSubDataTable() }}"{% endif %}
-                    {% if row.getMetadata('segmentFilter') is not false %} data-segment-filter="{{ row.getMetadata('segmentFilter')|e('html_attr') }}"{% endif %}
+                    {% if row.getMetadata('segment') is not false %} data-segment-filter="{{ row.getMetadata('segment')|e('html_attr') }}"{% endif %}
                     {% if row.getMetadata('url') is not false %} data-url-label="{{ row.getMetadata('url')|rawSafeDecoded }}"{% endif %}
                     class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %}"
                     {% if rowHasSubtable %}title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"{% endif %}>