change the title and the date range labels

DesktopWebAnalytics · May 10, 2012 · c08a944 · c08a944
1 parent 969c878
commit c08a944
Show file tree

Hide file tree

Showing 21 changed files with 272 additions and 96 deletions.
diff --git a/src/style/Style.css b/src/style/Style.css
@@ -15,7 +15,7 @@
 s|Application
 {
 	background-color:#FFFFFF;
-	color:black;
+	color: #898989;
 	fontSize:16;
 }
 s|ActionBar{
@@ -157,9 +157,8 @@ s|RadioButton
 	color:#FF9E00;
 }
 
-#titleView{
+#titleLabel{
 	fontSize: 18;
-	textAlign: center;
 }
 
 .legend{

diff --git a/src/views/reports/actions/Downloads.mxml b/src/views/reports/actions/Downloads.mxml
@@ -8,7 +8,6 @@
 -->
 <s:View xmlns:fx="http://ns.adobe.com/mxml/2009"
 		xmlns:s="library://ns.adobe.com/flex/spark"
-		xmlns:views="views.*"
 		xmlns:states="views.states.*"
 		actionBarVisible="false" currentState="loading" viewActivate="initView()">
 	<fx:Script>
@@ -26,7 +25,9 @@
 			private var result:XMLListCollection;
 			
 			private function initView():void{
-				titleView.text = data + ' - ' + resourceManager.getString('piwik', 'General_DateRange') + ' ' + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate) + " - " + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate);
+				titleLabel.text = data as String;
+				dateLabel.text = resourceManager.getString('piwik', 'General_DateRangeFromTo').replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate)).replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate));
+				
 				profile = FlexGlobals.topLevelApplication.selectedProfile;
 				
 				report = new Reports();
@@ -62,9 +63,10 @@
 	<fx:Declarations>
 		<!-- Placer ici les éléments non visuels (services et objets de valeur, par exemple). -->
 
-		<s:DateTimeFormatter id="dateTimeFormatter"
+		<s:DateTimeFormatter id="shortDateFormatter" dateStyle="short"
 							 locale="{resourceManager.getString('piwik', 'General_Locale')}"
 							 timeStyle="none"/>
+
 	</fx:Declarations>
 
 	<s:states>
@@ -77,7 +79,13 @@
 		<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10"/>
 	</s:layout>
 
-	<s:Label id="titleView" width="100%"/>
+	<s:Group width="100%">
+		<s:layout>
+			<s:VerticalLayout horizontalAlign="center"/>
+		</s:layout>
+		<s:Label id="titleLabel"/>
+		<s:Label id="dateLabel"/>
+	</s:Group>
 
 	<states:Loader includeIn="loading" width="100%" height="100%"/>
 

diff --git a/src/views/reports/actions/Outlinks.mxml b/src/views/reports/actions/Outlinks.mxml
@@ -26,7 +26,9 @@
 			private var result:XMLListCollection;
 			
 			private function initView():void{
-				titleView.text = data + ' - ' + resourceManager.getString('piwik', 'General_DateRange') + ' ' + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate) + " - " + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate);
+				titleLabel.text = data as String;
+				dateLabel.text = resourceManager.getString('piwik', 'General_DateRangeFromTo').replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate)).replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate));
+				
 				profile = FlexGlobals.topLevelApplication.selectedProfile;
 				
 				report = new Reports();
@@ -61,9 +63,10 @@
 	<fx:Declarations>
 		<!-- Placer ici les éléments non visuels (services et objets de valeur, par exemple). -->
 
-		<s:DateTimeFormatter id="dateTimeFormatter"
+		<s:DateTimeFormatter id="shortDateFormatter" dateStyle="short"
 							 locale="{resourceManager.getString('piwik', 'General_Locale')}"
 							 timeStyle="none"/>
+
 	</fx:Declarations>
 
 	<s:states>
@@ -76,7 +79,13 @@
 		<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10"/>
 	</s:layout>
 
-	<s:Label id="titleView" width="100%"/>
+	<s:Group width="100%">
+		<s:layout>
+			<s:VerticalLayout horizontalAlign="center"/>
+		</s:layout>
+		<s:Label id="titleLabel"/>
+		<s:Label id="dateLabel"/>
+	</s:Group>
 
 	<states:Loader includeIn="loading" width="100%" height="100%"/>
 

diff --git a/src/views/reports/actions/PageTitles.mxml b/src/views/reports/actions/PageTitles.mxml
@@ -25,7 +25,9 @@
 			private var result:XMLListCollection;
 			
 			private function initView():void{
-				titleView.text = data + " - " + resourceManager.getString('piwik', 'General_DateRange') + ' ' + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate) + " - " + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate);
+				titleLabel.text = data as String;
+				dateLabel.text = resourceManager.getString('piwik', 'General_DateRangeFromTo').replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate)).replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate));
+				
 				profile = FlexGlobals.topLevelApplication.selectedProfile;
 				
 				report = new Reports();
@@ -60,9 +62,10 @@
 	<fx:Declarations>
 		<!-- Placer ici les éléments non visuels (services et objets de valeur, par exemple). -->
 
-		<s:DateTimeFormatter id="dateTimeFormatter"
+		<s:DateTimeFormatter id="shortDateFormatter" dateStyle="short"
 							 locale="{resourceManager.getString('piwik', 'General_Locale')}"
 							 timeStyle="none"/>
+
 	</fx:Declarations>
 
 	<s:states>
@@ -75,7 +78,13 @@
 		<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10"/>
 	</s:layout>
 
-	<s:Label id="titleView" width="100%"/>
+	<s:Group width="100%">
+		<s:layout>
+			<s:VerticalLayout horizontalAlign="center"/>
+		</s:layout>
+		<s:Label id="titleLabel"/>
+		<s:Label id="dateLabel"/>
+	</s:Group>
 
 	<states:Loader includeIn="loading" width="100%" height="100%"/>
 

diff --git a/src/views/reports/actions/Pages.mxml b/src/views/reports/actions/Pages.mxml
@@ -26,7 +26,9 @@
 			private var result:XMLListCollection;
 			
 			private function initView():void{
-				titleView.text = data + " - " + resourceManager.getString('piwik', 'General_DateRange') + ' ' + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate) + " - " + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate);
+				titleLabel.text = data as String;
+				dateLabel.text = resourceManager.getString('piwik', 'General_DateRangeFromTo').replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate)).replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate));
+				
 				profile = FlexGlobals.topLevelApplication.selectedProfile;
 				
 				report = new Reports();
@@ -61,9 +63,10 @@
 	<fx:Declarations>
 		<!-- Placer ici les éléments non visuels (services et objets de valeur, par exemple). -->
 
-		<s:DateTimeFormatter id="dateTimeFormatter"
+		<s:DateTimeFormatter id="shortDateFormatter" dateStyle="short"
 							 locale="{resourceManager.getString('piwik', 'General_Locale')}"
 							 timeStyle="none"/>
+
 	</fx:Declarations>
 
 	<s:states>
@@ -76,7 +79,13 @@
 		<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10"/>
 	</s:layout>
 
-	<s:Label id="titleView" width="100%"/>
+	<s:Group width="100%">
+		<s:layout>
+			<s:VerticalLayout horizontalAlign="center"/>
+		</s:layout>
+		<s:Label id="titleLabel"/>
+		<s:Label id="dateLabel"/>
+	</s:Group>
 
 	<states:Loader includeIn="loading" width="100%" height="100%"/>
 

diff --git a/src/views/reports/referers/Campaigns.mxml b/src/views/reports/referers/Campaigns.mxml
@@ -26,7 +26,9 @@
 			private var result:XMLListCollection;
 			
 			private function initView():void{
-				titleView.text = data + ' - ' + resourceManager.getString('piwik', 'General_DateRange') + ' ' + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate) + " - " + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate);
+				titleLabel.text = data as String;
+				dateLabel.text = resourceManager.getString('piwik', 'General_DateRangeFromTo').replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate)).replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate));
+				
 				profile = FlexGlobals.topLevelApplication.selectedProfile;
 				
 				report = new Reports();
@@ -61,9 +63,10 @@
 	<fx:Declarations>
 		<!-- Placer ici les éléments non visuels (services et objets de valeur, par exemple). -->
 
-		<s:DateTimeFormatter id="dateTimeFormatter"
+		<s:DateTimeFormatter id="shortDateFormatter" dateStyle="short"
 							 locale="{resourceManager.getString('piwik', 'General_Locale')}"
 							 timeStyle="none"/>
+
 	</fx:Declarations>
 
 	<s:states>
@@ -76,7 +79,13 @@
 		<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10"/>
 	</s:layout>
 
-	<s:Label id="titleView" width="100%"/>
+	<s:Group width="100%">
+		<s:layout>
+			<s:VerticalLayout horizontalAlign="center"/>
+		</s:layout>
+		<s:Label id="titleLabel"/>
+		<s:Label id="dateLabel"/>
+	</s:Group>
 
 	<states:Loader includeIn="loading" width="100%" height="100%"/>
 

diff --git a/src/views/reports/referers/Keywords.mxml b/src/views/reports/referers/Keywords.mxml
@@ -27,7 +27,9 @@
 			private var result:XMLListCollection;
 			
 			private function initView():void{
-				titleView.text = data + ' - ' + resourceManager.getString('piwik', 'General_DateRange') + ' ' + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate) + " - " + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate);
+				titleLabel.text = data as String;
+				dateLabel.text = resourceManager.getString('piwik', 'General_DateRangeFromTo').replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate)).replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate));
+				
 				profile = FlexGlobals.topLevelApplication.selectedProfile;
 				
 				report = new Reports();
@@ -62,9 +64,10 @@
 	<fx:Declarations>
 		<!-- Placer ici les éléments non visuels (services et objets de valeur, par exemple). -->
 
-		<s:DateTimeFormatter id="dateTimeFormatter"
+		<s:DateTimeFormatter id="shortDateFormatter" dateStyle="short"
 							 locale="{resourceManager.getString('piwik', 'General_Locale')}"
 							 timeStyle="none"/>
+
 	</fx:Declarations>
 
 	<s:states>
@@ -77,7 +80,13 @@
 		<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10"/>
 	</s:layout>
 
-	<s:Label id="titleView" width="100%"/>
+	<s:Group width="100%">
+		<s:layout>
+			<s:VerticalLayout horizontalAlign="center"/>
+		</s:layout>
+		<s:Label id="titleLabel"/>
+		<s:Label id="dateLabel"/>
+	</s:Group>
 
 	<states:Loader includeIn="loading" width="100%" height="100%"/>
 

diff --git a/src/views/reports/referers/SearchEngines.mxml b/src/views/reports/referers/SearchEngines.mxml
@@ -26,7 +26,9 @@
 			private var result:XMLListCollection;
 			
 			private function initView():void{
-				titleView.text = data + ' - ' + resourceManager.getString('piwik', 'General_DateRange') + ' ' + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate) + " - " + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate);
+				titleLabel.text = data as String;
+				dateLabel.text = resourceManager.getString('piwik', 'General_DateRangeFromTo').replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate)).replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate));
+				
 				profile = FlexGlobals.topLevelApplication.selectedProfile;
 				
 				report = new Reports();
@@ -62,9 +64,10 @@
 	<fx:Declarations>
 		<!-- Placer ici les éléments non visuels (services et objets de valeur, par exemple). -->
 
-		<s:DateTimeFormatter id="dateTimeFormatter"
+		<s:DateTimeFormatter id="shortDateFormatter" dateStyle="short"
 							 locale="{resourceManager.getString('piwik', 'General_Locale')}"
 							 timeStyle="none"/>
+
 	</fx:Declarations>
 
 	<s:states>
@@ -77,7 +80,13 @@
 		<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10"/>
 	</s:layout>
 
-	<s:Label id="titleView" width="100%"/>
+	<s:Group width="100%">
+		<s:layout>
+			<s:VerticalLayout horizontalAlign="center"/>
+		</s:layout>
+		<s:Label id="titleLabel"/>
+		<s:Label id="dateLabel"/>
+	</s:Group>
 
 	<states:Loader includeIn="loading" width="100%" height="100%"/>
 

diff --git a/src/views/reports/referers/Websites.mxml b/src/views/reports/referers/Websites.mxml
@@ -26,7 +26,9 @@
 			private var result:XMLListCollection;
 			
 			private function initView():void{
-				titleView.text = data + ' - ' + resourceManager.getString('piwik', 'General_DateRange') + ' ' + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate) + " - " + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate);
+				titleLabel.text = data as String;
+				dateLabel.text = resourceManager.getString('piwik', 'General_DateRangeFromTo').replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate)).replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate));
+				
 				profile = FlexGlobals.topLevelApplication.selectedProfile;
 				
 				report = new Reports();
@@ -61,9 +63,10 @@
 	<fx:Declarations>
 		<!-- Placer ici les éléments non visuels (services et objets de valeur, par exemple). -->
 
-		<s:DateTimeFormatter id="dateTimeFormatter"
+		<s:DateTimeFormatter id="shortDateFormatter" dateStyle="short"
 							 locale="{resourceManager.getString('piwik', 'General_Locale')}"
 							 timeStyle="none"/>
+
 	</fx:Declarations>
 
 	<s:states>
@@ -76,7 +79,13 @@
 		<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10"/>
 	</s:layout>
 
-	<s:Label id="titleView" width="100%"/>
+	<s:Group width="100%">
+		<s:layout>
+			<s:VerticalLayout horizontalAlign="center"/>
+		</s:layout>
+		<s:Label id="titleLabel"/>
+		<s:Label id="dateLabel"/>
+	</s:Group>
 
 	<states:Loader includeIn="loading" width="100%" height="100%"/>
 

diff --git a/src/views/reports/visitors/BrowserFamilies.mxml b/src/views/reports/visitors/BrowserFamilies.mxml
@@ -25,7 +25,9 @@
 			private var result:XMLListCollection;
 			
 			private function initView():void{
-				titleView.text = data + " - " + resourceManager.getString('piwik', 'General_DateRange') + ' ' + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate) + " - " + dateTimeFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate);
+				titleLabel.text = data as String;
+				dateLabel.text = resourceManager.getString('piwik', 'General_DateRangeFromTo').replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedStartDate)).replace('%s', shortDateFormatter.format(FlexGlobals.topLevelApplication.selectedEndDate));
+				
 				profile = FlexGlobals.topLevelApplication.selectedProfile;
 				
 				report = new Reports();
@@ -60,9 +62,10 @@
 	<fx:Declarations>
 		<!-- Placer ici les éléments non visuels (services et objets de valeur, par exemple). -->
 
-		<s:DateTimeFormatter id="dateTimeFormatter"
+		<s:DateTimeFormatter id="shortDateFormatter" dateStyle="short"
 							 locale="{resourceManager.getString('piwik', 'General_Locale')}"
 							 timeStyle="none"/>
+
 	</fx:Declarations>
 
 	<s:states>
@@ -76,7 +79,13 @@
 		<s:VerticalLayout paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="10"/>
 	</s:layout>
 
-	<s:Label id="titleView" width="100%"/>
+	<s:Group width="100%">
+		<s:layout>
+			<s:VerticalLayout horizontalAlign="center"/>
+		</s:layout>
+		<s:Label id="titleLabel"/>
+		<s:Label id="dateLabel"/>
+	</s:Group>
 
 	<states:Loader includeIn="loading" width="100%" height="100%"/>