Merge remote-tracking branch 'origin/master' into plugin_namespaces

Conflicts:
	core/Tracker/Request.php
	core/ViewDataTable.php
	core/ViewDataTable/HtmlTable/Goals.php
	plugins/Actions/Actions.php
	plugins/Annotations/API.php
	plugins/CoreHome/CoreHome.php
	plugins/DBStats/DBStats.php
	plugins/DevicesDetection/DevicesDetection.php
	plugins/Goals/Goals.php
	plugins/Live/Live.php
	plugins/Referers/Referers.php
	plugins/UserSettings/UserSettings.php
	plugins/UsersManager/API.php
	plugins/VisitTime/VisitTime.php
	plugins/VisitorInterest/VisitorInterest.php

17 files changed, 63 insertions, 336 deletions

diff --git a/plugins/Zeitgeist/javascripts/ajaxHelper.js b/plugins/Zeitgeist/javascripts/ajaxHelper.js
index 02711b6945..2a50ec2abc 100644
--- a/plugins/Zeitgeist/javascripts/ajaxHelper.js
+++ b/plugins/Zeitgeist/javascripts/ajaxHelper.js
@@ -10,7 +10,7 @@
  *
  * @type {Array} array holding XhrRequests with automatic cleanup
  */
-var globalAjaxQueue = new Array();
+var globalAjaxQueue = [];
 
 /**
  * Extend Array.push with automatic cleanup for finished requests
diff --git a/plugins/Zeitgeist/stylesheets/base.css b/plugins/Zeitgeist/stylesheets/base.css
index 959c4065eb..3eea5ab03a 100644
--- a/plugins/Zeitgeist/stylesheets/base.css
+++ b/plugins/Zeitgeist/stylesheets/base.css
@@ -1,7 +1,7 @@
 /* TO GENERATE: lessc plugins/Zeitgeist/stylesheets/base.less plugins/Zeitgeist/stylesheets/base.css */
 /* base.less is a standalone Less file */
 /* base.css is automatically generated. DO NOT MODIFY */
-/* Genreral styles */
+/* General styles */
 /* reset style */
 html,
 body,
diff --git a/plugins/Zeitgeist/stylesheets/base.less b/plugins/Zeitgeist/stylesheets/base.less
index cce7c66822..f4afcc6220 100644
--- a/plugins/Zeitgeist/stylesheets/base.less
+++ b/plugins/Zeitgeist/stylesheets/base.less
@@ -27,11 +27,5 @@
 
 @import "ui/_loading.less";
 
-@import "ui/_sparkline.less";
-
-@import "ui/_jqplot.less";
-
-@import "ui/_transitions.less";
-
 /* Remote components */
 @import "../../CoreHome/stylesheets/_donate.less";
diff --git a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
index bca00bf69d..ea0820c28b 100644
--- a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
+++ b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
@@ -72,7 +72,7 @@ div.ui-state-highlight {
 }
 
 .ui-datepicker-header {
-  background: #847b6d url(../images/dashboard_h_bg_hover.png) repeat-x 0 0 !important;
+  background: #847b6d url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important;
   color: #fff !important;
   border-radius: 0 !important;
 }
@@ -82,11 +82,11 @@ div.ui-state-highlight {
 }
 
 .ui-datepicker-header .ui-icon-circle-triangle-w {
-  background: url(../images/datepicker_arr_l.png) no-repeat 5px 4px !important;
+  background: url(plugins/Zeitgeist/images/datepicker_arr_l.png) no-repeat 5px 4px !important;
 }
 
 .ui-datepicker-header .ui-icon-circle-triangle-e {
-  background: url(../images/datepicker_arr_r.png) no-repeat 6px 4px !important;
+  background: url(plugins/Zeitgeist/images/datepicker_arr_r.png) no-repeat 6px 4px !important;
 }
 
 .ui-datepicker .ui-datepicker-next-hover,
diff --git a/plugins/Zeitgeist/stylesheets/general/_misc.less b/plugins/Zeitgeist/stylesheets/general/_misc.less
index 38ef9f463f..de419973f1 100644
--- a/plugins/Zeitgeist/stylesheets/general/_misc.less
+++ b/plugins/Zeitgeist/stylesheets/general/_misc.less
@@ -4,4 +4,38 @@
 
 .exception-backtrace {
     color: #888;
+}
+
+.section-toggler-link {
+  font-size: .8em;
+  font-style: italic;
+  text-decoration: none;
+}
+
+.section-toggler-link:hover {
+  text-decoration: underline;
+}
+
+.metricEvolution {
+  display: inline-block;
+  font-size: 9pt;
+  opacity: 0.75;
+}
+
+.metricEvolution > .positive-evolution {
+  color: green;
+}
+
+.metricEvolution > .negative-evolution {
+  color: #e02a3b;
+}
+
+.reportsByDimensionView > .entityList {
+  float: left;
+  width: 220px;
+  min-height: 450px;
+}
+
+.dimensionCategory {
+  margin-top: 10px;
 }
\ No newline at end of file
diff --git a/plugins/Zeitgeist/stylesheets/general/_utils.less b/plugins/Zeitgeist/stylesheets/general/_utils.less
index 0077685734..cd7faddea2 100644
--- a/plugins/Zeitgeist/stylesheets/general/_utils.less
+++ b/plugins/Zeitgeist/stylesheets/general/_utils.less
@@ -27,38 +27,4 @@ html.old-ie .ie-hide {
   margin: auto;
   text-align: center;
   padding-bottom: 10px;
-}
-
-.section-toggler-link {
-  font-size: .8em;
-  font-style: italic;
-  text-decoration: none;
-}
-
-.section-toggler-link:hover {
-  text-decoration: underline;
-}
-
-.metricEvolution {
-  display: inline-block;
-  font-size: 9pt;
-  opacity: 0.75;
-}
-
-.metricEvolution > .positive-evolution {
-  color: green;
-}
-
-.metricEvolution > .negative-evolution {
-  color: #e02a3b;
-}
-
-.reportsByDimensionView > .entityList {
-  float: left;
-  width: 220px;
-  min-height: 450px;
-}
-
-.dimensionCategory {
-  margin-top: 10px;
 }
\ No newline at end of file
diff --git a/plugins/Zeitgeist/stylesheets/ui/_headerMessage.less b/plugins/Zeitgeist/stylesheets/ui/_headerMessage.less
index 779e391e70..7941861a90 100644
--- a/plugins/Zeitgeist/stylesheets/ui/_headerMessage.less
+++ b/plugins/Zeitgeist/stylesheets/ui/_headerMessage.less
@@ -13,6 +13,12 @@
   border-radius: 4px;
 }
 
+@media all and (max-width: 949px) {
+  #header_message {
+    display: none;
+  }
+}
+
 #header_message:hover,
 #header_message.active {
   width: auto;
diff --git a/plugins/Zeitgeist/stylesheets/ui/_jqplot.less b/plugins/Zeitgeist/stylesheets/ui/_jqplot.less
deleted file mode 100644
index b8f47543d2..0000000000
--- a/plugins/Zeitgeist/stylesheets/ui/_jqplot.less
+++ /dev/null
@@ -1,150 +0,0 @@
-// evolution graph colors
-.evolution-graph-colors[data-name=series1] {
-    color: #5170AE;
-}
-
-.evolution-graph-colors[data-name=series2] {
-    color: #F29007;
-}
-
-.evolution-graph-colors[data-name=series3] {
-    color: #CC3399;
-}
-
-.evolution-graph-colors[data-name=series4] {
-    color: #9933CC;
-}
-
-.evolution-graph-colors[data-name=series5] {
-    color: #80a033;
-}
-
-.evolution-graph-colors[data-name=series6] {
-    color: #246AD2;
-}
-
-.evolution-graph-colors[data-name=series7] {
-    color: #FD16EA;
-}
-
-.evolution-graph-colors[data-name=series8] {
-    color: #49C100;
-}
-
-.evolution-graph-colors[data-name=grid-background] {
-    color: #fff;
-}
-
-.evolution-graph-colors[data-name=grid-border] {
-    color: #f00;
-}
-
-.evolution-graph-colors[data-name=ticks] {
-    color: #ccc;
-}
-
-.evolution-graph-colors[data-name=single-metric-label] {
-    color: #666;
-}
-
-// bar graph colors
-.bar-graph-colors[data-name=series1] {
-    color: #5170AE;
-}
-
-.bar-graph-colors[data-name=series2] {
-    color: #F3A010;
-}
-
-.bar-graph-colors[data-name=series3] {
-    color: #CC3399;
-}
-
-.bar-graph-colors[data-name=series4] {
-    color: #9933CC;
-}
-
-.bar-graph-colors[data-name=series5] {
-    color: #80a033;
-}
-
-.bar-graph-colors[data-name=series6] {
-    color: #246AD2;
-}
-
-.bar-graph-colors[data-name=series7] {
-    color: #FD16EA;
-}
-
-.bar-graph-colors[data-name=series8] {
-    color: #49C100;
-}
-
-.bar-graph-colors[data-name=grid-background] {
-    color: #fff;
-}
-
-.bar-graph-colors[data-name=grid-border] {
-    color: #f00;
-}
-
-.bar-graph-colors[data-name=ticks] {
-    color: #ccc;
-}
-
-.bar-graph-colors[data-name=single-metric-label] {
-    color: #666;
-}
-
-// pie graph colors
-.pie-graph-colors[data-name=series1] {
-    color: #59727F;
-}
-
-.pie-graph-colors[data-name=series2] {
-    color: #7DAAC0;
-}
-
-.pie-graph-colors[data-name=series3] {
-    color: #7F7259;
-}
-
-.pie-graph-colors[data-name=series4] {
-    color: #C09E7D;
-}
-
-.pie-graph-colors[data-name=series5] {
-    color: #9BB39B;
-}
-
-.pie-graph-colors[data-name=series6] {
-    color: #B1D8B3;
-}
-
-.pie-graph-colors[data-name=series7] {
-    color: #B39BA7;
-}
-
-.pie-graph-colors[data-name=series8] {
-    color: #D8B1C5;
-}
-
-.pie-graph-colors[data-name=series9] {
-    color: #A5A5A5;
-}
-
-.pie-graph-colors[data-name=grid-background] {
-    color: #fff;
-}
-
-.pie-graph-colors[data-name=grid-border] {
-    color: #f00;
-}
-
-.pie-graph-colors[data-name=ticks] {
-    color: #ccc;
-}
-
-.pie-graph-colors[data-name=single-metric-label] {
-    color: #666;
-}
diff --git a/plugins/Zeitgeist/stylesheets/ui/_languageSelect.less b/plugins/Zeitgeist/stylesheets/ui/_languageSelect.less
index b0eafb2707..cbe890246e 100644
--- a/plugins/Zeitgeist/stylesheets/ui/_languageSelect.less
+++ b/plugins/Zeitgeist/stylesheets/ui/_languageSelect.less
@@ -3,11 +3,8 @@
   overflow-y: auto;
   overflow-x: hidden;
   padding: 0 !important;
-  position: absolute;
-  z-index: 9999;
   background:#FFF;
   border: 1px solid #1F447F!important;
-  position: relative;
 }
 
 #languageSelection > form {
@@ -20,7 +17,8 @@
 
 #languageSelection .ui-autocomplete-input:after {
   display: inline;
-  content: " \25BC"
+  content: " \25BC";
+  font-size: 0.9em;
 }
 #languageSelection .ui-autocomplete-input {
   text-decoration: underline;
@@ -30,12 +28,12 @@
   text-decoration: underline;
 }
 
-#languageSelect a{
+#languageSelect a {
   text-decoration:none!important;
   padding: 1px 25px 1px 3px!important;
 }
 
-#languageSelect a:hover{
+#languageSelect a:hover {
   background:#176999!important;
   color:#FFF!important;
 }
\ No newline at end of file
diff --git a/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less b/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less
index 30ff58d2d0..3a87f4eb60 100644
--- a/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less
+++ b/plugins/Zeitgeist/stylesheets/ui/_periodSelect.less
@@ -51,9 +51,11 @@
 #periodMore {
   padding: 6px 0 0 0;
   display: none;
+  overflow: hidden;
 }
 
-#periodString .period-date, #periodString .period-range {
+#periodString .period-date,
+#periodString .period-range {
   float: left;
   padding: 0 16px 0 0;
 }
diff --git a/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less b/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less
index 474c43788b..e3c3ca4ff4 100644
--- a/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less
+++ b/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less
@@ -5,6 +5,7 @@
   position: absolute;
   font-size: 12px;
   display: inline-block;
+  max-height: 30px; /* Hack to not push the dashboard widget bellow */
 }
 
 .top_bar_sites_selector {
@@ -40,17 +41,17 @@
 }
 
 .sites_autocomplete .custom_select_main_link {
-  padding: 0 20px 0 4px;
-  display: block;
-  text-decoration: none;
-  background: url(plugins/Zeitgeist/images/sort_subtable_desc.png) no-repeat right 0;
-}
-
-.sites_autocomplete .custom_select_main_link.noselect {
   padding: 0 8px;
   display: block;
   text-decoration: none;
   background: none;
+  cursor: default;
+}
+
+.sites_autocomplete--dropdown .custom_select_main_link {
+  padding: 0 20px 0 4px;
+  background: url(plugins/Zeitgeist/images/sort_subtable_desc.png) no-repeat right 0;
+  cursor: pointer;
 }
 
 .sites_autocomplete .custom_select_loading {
diff --git a/plugins/Zeitgeist/stylesheets/ui/_sparkline.less b/plugins/Zeitgeist/stylesheets/ui/_sparkline.less
deleted file mode 100644
index 7d2b9c7c8b..0000000000
--- a/plugins/Zeitgeist/stylesheets/ui/_sparkline.less
+++ /dev/null
@@ -1,26 +0,0 @@
-// sparkline styles
-div.sparkline {
-    border-bottom: 1px solid white;
-}
-
-div.sparkline:hover {
-    cursor: pointer;
-    border-bottom: 1px dashed #c3c3c3;
-}
-
-// sparkline colors
-.sparkline-colors[data-name=lineColor] {
-    color: rgb(22, 44, 74);
-}
-
-.sparkline-colors[data-name=red] {
-    color: #ff7f7f;
-}
-
-.sparkline-colors[data-name=blue] {
-    color: #55AAFF;
-}
-
-.sparkline-colors[data-name=green] {
-    color: #75BF7C;
-}
diff --git a/plugins/Zeitgeist/stylesheets/ui/_transitions.less b/plugins/Zeitgeist/stylesheets/ui/_transitions.less
deleted file mode 100644
index e74d16b341..0000000000
--- a/plugins/Zeitgeist/stylesheets/ui/_transitions.less
+++ /dev/null
@@ -1,98 +0,0 @@
-// 
-// transitions colors
-// 
-
-// colors for entries gradients
-.transition-entries[data-name=light] {
-    color: #fff;
-}
-
-.transition-entries[data-name=dark] {
-    color: #BACFE8;
-}
-
-.transition-entries[data-name=light-highlighted] {
-    color: #fff;
-}
-
-.transition-entries[data-name=dark-highlighted] {
-    color: #FAD293;
-}
-
-// colors for exits gradients
-.transition-exits[data-name=light] {
-    color: #fff;
-}
-
-.transition-exits[data-name=dark] {
-    color: #BACFE8;
-}
-
-.transition-exits[data-name=light-highlighted] {
-    color: #fff;
-}
-
-.transition-exits[data-name=dark-highlighted] {
-    color: #FAD293;
-}
-
-// background gradients colors
-.transition-background[data-name=light] {
-    color: #fff;
-}
-
-.transition-background[data-name=dark] {
-    color: #BACFE8;
-}
-
-.transition-background[data-name=light-highlighted] {
-    color: #fff;
-}
-
-.transition-background[data-name=dark-highlighted] {
-    color: #FAD293;
-}
-
-// closed group gradient colors
-.transition-closed-group[data-name=light] {
-    color: #DDE4ED;
-}
-
-.transition-closed-group[data-name=dark] {
-    color: #9BBADE;
-}
-
-.transition-closed-group[data-name=light-highlighted] {
-    color: #FAE2C0;
-}
-
-.transition-closed-group[data-name=dark-highlighted] {
-    color: #FAD293;
-}
-
-// items gradient colors
-.transition-items[data-name=light] {
-    color: #E3DFD1;
-}
-
-.transition-items[data-name=dark] {
-    color: #E8E4D5;
-}
-
-// 'others' gradients colors
-.transition-others[data-name=light] {
-    color: #F5F3EB;
-}
-
-.transition-others[data-name=dark] {
-    color: #E8E4D5;
-}
-
-// loop gradient colors
-.transition-loops[data-name=light] {
-    color: #F5F3EB;
-}
-
-.transition-loops[data-name=dark] {
-    color: #E8E4D5;
-}
\ No newline at end of file
diff --git a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
index 0ec9e5478d..fc60d946f2 100644
--- a/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
+++ b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
@@ -34,4 +34,3 @@
     piwik.config.action_url_category_delimiter = "{{ config_action_url_category_delimiter }}";
     {% endif %}
 </script>
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=IE8"/>
diff --git a/plugins/Zeitgeist/templates/_sparklineFooter.twig b/plugins/Zeitgeist/templates/_sparklineFooter.twig
index b8b864d75c..60664aa216 100644
--- a/plugins/Zeitgeist/templates/_sparklineFooter.twig
+++ b/plugins/Zeitgeist/templates/_sparklineFooter.twig
@@ -1,5 +1,5 @@
 <script type="text/javascript">
-    $(document).ready(function () {
+    $(function () {
         initializeSparklines();
     });
 </script>
diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig
index f9daab8a91..ef0fca6029 100644
--- a/plugins/Zeitgeist/templates/admin.twig
+++ b/plugins/Zeitgeist/templates/admin.twig
@@ -20,6 +20,7 @@
         {% endblock %}
     </head>
     <body>
+    {% set isAdminLayout = true %}
     {% include "_iframeBuster.twig" %}
     {% include "@CoreHome/_javaScriptDisabled.twig" %}
 
diff --git a/plugins/Zeitgeist/templates/genericForm.twig b/plugins/Zeitgeist/templates/genericForm.twig
index 1c509a9ae5..e506f190aa 100644
--- a/plugins/Zeitgeist/templates/genericForm.twig
+++ b/plugins/Zeitgeist/templates/genericForm.twig
@@ -4,7 +4,7 @@
 		<strong>{{ 'Installation_PleaseFixTheFollowingErrors'|translate }}:</strong>
 		<ul>
             {% for data in form_data.errors %}
-				<li>{{ data }}</li>
+				<li>{{ data|raw }}</li>
             {% endfor %}
 		</ul>	
 	</div>