Merge branch 'master' into 3.0

Conflicts:
	core/Version.php
	plugins/Actions/Menu.php
	plugins/CoreHome/angularjs/history/history.service.js
	plugins/CoreHome/javascripts/menu.js
	plugins/CoreHome/templates/_menu.twig
	plugins/Dashboard/Menu.php
	plugins/Ecommerce/Menu.php
	plugins/ExampleUI/Menu.php
	plugins/Goals/Menu.php
	plugins/Referrers/Menu.php
	plugins/VisitsSummary/Menu.php
	tests/UI/expected-ui-screenshots
	tests/UI/specs/UIIntegration_spec.js

11 files changed, 39 insertions, 29 deletions

diff --git a/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler-urllistener.service.js b/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler-urllistener.service.js
index 690f39c0c5..e8fc3c1c54 100644
--- a/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler-urllistener.service.js
+++ b/plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler-urllistener.service.js
@@ -83,6 +83,8 @@
             service.checkUrlForDialog();
         });
 
+        service.checkUrlForDialog(); // check on initial page load
+
         return service;
     }
 })();
\ No newline at end of file
diff --git a/plugins/CoreHome/angularjs/history/history.service.js b/plugins/CoreHome/angularjs/history/history.service.js
index 7dadf35ad0..fdad7667ac 100644
--- a/plugins/CoreHome/angularjs/history/history.service.js
+++ b/plugins/CoreHome/angularjs/history/history.service.js
@@ -36,19 +36,6 @@
             loadCurrentPage();
         }
 
-        function cleanHash(hash)
-        {
-            var chars = ['#', '/', '?'];
-            for (var i = 0; i != chars.length; ++i) {
-                var charToRemove = chars[i];
-                if (hash.charAt(0) == charToRemove) {
-                    hash = hash.substring(1);
-                }
-            }
-
-            return hash;
-        }
-
         // currently, the AJAX content URL is stored in $location.search(), but before it was stored in $location.path().
         // this function makes sure URLs like http://piwik.net/?...#/module=Whatever&action=whatever still work.
         function changePathToSearch() {
@@ -95,9 +82,10 @@
 
         function load(hash) {
             // make sure the hash is just the query parameter values, w/o a starting #, / or ? char. broadcast.pageload & $location.path should get neither
-            hash = cleanHash(hash);
-            
-            if (location.hash === '#?' + hash) {
+            hash = normalizeHash(hash);
+
+            var currentHash = normalizeHash(location.hash);
+            if (currentHash === hash) {
                 loadCurrentPage(); // it would not trigger a location change success event as URL is the same, call it manually
             } else if (hash) {
                 $location.search(hash);
@@ -111,5 +99,16 @@
 
             setTimeout(function () { $rootScope.$apply(); }, 1);
         }
+
+        function normalizeHash(hash) {
+            var chars = ['#', '/', '?'];
+            for (var i = 0; i != chars.length; ++i) {
+                var charToRemove = chars[i];
+                if (hash.charAt(0) == charToRemove) {
+                    hash = hash.substring(1);
+                }
+            }
+            return hash;
+        }
     }
 })(window, jQuery, broadcast);
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
index 3a4cbec8f2..9ee4932163 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.html
@@ -13,8 +13,8 @@
 
     <input ng-if="inputName" type="hidden" name="{{ inputName }}" ng-value="selectedSite.id"/>
 
-    <a ng-click="view.showSitesList=!view.showSitesList; view.showSitesList && model.loadInitialSites();"
-       piwik-onenter="view.showSitesList=!view.showSitesList; view.showSitesList && model.loadInitialSites();"
+    <a ng-click="view.showSitesList=!view.showSitesList; view.showSitesList && !model.isLoading && model.loadInitialSites();"
+       piwik-onenter="view.showSitesList=!view.showSitesList; view.showSitesList && !model.isLoading && model.loadInitialSites();"
        href="javascript:void(0)"
        title="{{ 'General_ChooseWebsite'|translate }}"
        ng-class="{'loading': model.isLoading}"
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
index 4afc63a8f9..1614ceb4cd 100644
--- a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
+++ b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.less
@@ -33,7 +33,7 @@
 
 .siteSelector.expanded {
   .loading {
-    background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat right 9px;
+    background: url(plugins/Morpheus/images/loading-blue.gif) no-repeat 94% 11px;
   }
 }
 
diff --git a/plugins/CoreHome/lang/de.json b/plugins/CoreHome/lang/de.json
index e0f2df2505..4c744998eb 100644
--- a/plugins/CoreHome/lang/de.json
+++ b/plugins/CoreHome/lang/de.json
@@ -49,7 +49,8 @@
         "ClickRowToExpandOrContract": "Klicken Sie auf diese Zeile um die Untertabelle anzuzeigen oder zu verbergen.",
         "UndoPivotBySubtable": "Pivot erstellt für diesen Bericht %s Pivot rückgängig machen",
         "PivotBySubtable": "Kein Pivot erstellt für diesen Bericht %s Pivot erstellen mit %s",
-        "QuickAccessTitle": "Suche nach Menüeinträgen, Segmenten und Websites. Tastenkürzel: Drücken Sie 'f' um zu suchen.",
+        "QuickAccessTitle": "Suche nach %s. Tastenkürzel: Drücken Sie 'f' um zu suchen.",
+        "MenuEntries": "Menüeinträge",
         "Segments": "Segmente",
         "AdblockIsMaybeUsed": "Für den Fall, dass Sie einen Ad-Blocker verwenden, deaktivieren Sie diesen bitte für diese Seite um sicherzustellen, dass Piwik problemlos läuft."
     }
diff --git a/plugins/CoreHome/lang/el.json b/plugins/CoreHome/lang/el.json
index 5f09a036d7..242a7af9e6 100644
--- a/plugins/CoreHome/lang/el.json
+++ b/plugins/CoreHome/lang/el.json
@@ -49,7 +49,8 @@
         "ClickRowToExpandOrContract": "Πατήστε στη γραμμή για να επεκταθεί ή να κρυφτεί ο υποπίνακας.",
         "UndoPivotBySubtable": "Η αναφορά θεμελιώθηκε %s Αναίρεση της θεμελίωσης",
         "PivotBySubtable": "Η αναφορά αυτή δεν είναι θεμελιωμένη %s Να θεμελιωθεί από %s",
-        "QuickAccessTitle": "Αναζήτηση για καταχωρήσεις μενού, τμήματα και ιστοτόπους. Πλήκτρο συντόμευσης: Πατήστε 'f' για αναζήτηση.",
+        "QuickAccessTitle": "Αναζήτηση για το %s. Πλήκτρο συντόμευσης: Πατήστε 'f' για αναζήτηση.",
+        "MenuEntries": "Καταχωρήσεις μενού",
         "Segments": "Τμήματα",
         "AdblockIsMaybeUsed": "Σε περίπτωση που χρησιμοποιείτε κάποια πρόγραμμα που μπλοκάρει τις διαφημίσεις, παρακαλούμε απενεργοποιήστε το για αυτόν τον ιστοτόπο για να είστε σίγουροι ότι το Piwik δουλεύει σωστά."
     }
diff --git a/plugins/CoreHome/lang/it.json b/plugins/CoreHome/lang/it.json
index d002b7d057..1d1513c8de 100644
--- a/plugins/CoreHome/lang/it.json
+++ b/plugins/CoreHome/lang/it.json
@@ -49,7 +49,9 @@
         "ClickRowToExpandOrContract": "Clicca su questa riga per espandere o restringere la sotto-tabella.",
         "UndoPivotBySubtable": "Questo report è stato imperniato al Pivot %s Undo",
         "PivotBySubtable": "Questo report non è imperniato al Pivot %s da %s",
-        "QuickAccessTitle": "Ricerca selezioni da menù, segmenti e siti web. Scorciatoia: Premi 'f' per la ricerca.",
-        "Segments": "Segmenti"
+        "QuickAccessTitle": "Cerca %s. Shortcut: Premi 'f' per la ricerca.",
+        "MenuEntries": "Ingressi da menù",
+        "Segments": "Segmenti",
+        "AdblockIsMaybeUsed": "Se stai utilizzando un plugin di blocco della pubblicità, disabilitalo per questo sito, per essere sicuro che Piwik lavori senza problemi."
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/pt-br.json b/plugins/CoreHome/lang/pt-br.json
index 61c4fe3819..69f02cb1ad 100644
--- a/plugins/CoreHome/lang/pt-br.json
+++ b/plugins/CoreHome/lang/pt-br.json
@@ -49,7 +49,9 @@
         "ClickRowToExpandOrContract": "Clique nesta linha para expandir ou contrair a subtabela.",
         "UndoPivotBySubtable": "Este relatório foi articulado %s desfazer articulação",
         "PivotBySubtable": "Este relatório não foi articulado %s Articular por %s",
-        "QuickAccessTitle": "Procurar por entradas do menu, segmentos e websites. Atalho: Pressione 'f' para pesquisar.",
-        "Segments": "Segmentos"
+        "QuickAccessTitle": "Buscar por %s. Atalho: Tecle 'f' para buscar.",
+        "MenuEntries": "Itens do menu",
+        "Segments": "Segmentos",
+        "AdblockIsMaybeUsed": "Caso você esteja usando um bloqueador de anúncios, por favor desative-o para este site, pois assim poderá certificar-se de que o Piwik funciona sem qualquer problema."
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less
index ac6d3ed8a6..5cffdf3be8 100644
--- a/plugins/CoreHome/stylesheets/layout.less
+++ b/plugins/CoreHome/stylesheets/layout.less
@@ -129,7 +129,7 @@
       margin-left: 45px;
     }
 
-    #secondNavBar {
+    #secondNavBar:not(.standalone) {
       z-index: 9999;
       position: absolute;
       border-right: 1px solid @theme-color-background-tinyContrast;
@@ -380,7 +380,9 @@
       font-size: 11px;
     }
   }
+}
 
+#root, #standalone, .ui-dialog, .ngdialog {
   .borderedControl {
     background-color: @theme-color-background-base;
     border: 1px solid @theme-color-background-tinyContrast;
diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
index 12811eb445..a12fe42b5b 100644
--- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
@@ -63,7 +63,7 @@
                                 {% if rowMetrics[columnId] is empty %}
                                     0
                                 {% else %}
-                                    {{ rowMetrics[columnId] }}
+                                    {{ rowMetrics[columnId]|number(2) }}
                                 {% endif %}
                             {% endif %}
                         </td>
diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig
index b04b809405..51b87bc301 100644
--- a/plugins/CoreHome/templates/_menu.twig
+++ b/plugins/CoreHome/templates/_menu.twig
@@ -1,6 +1,7 @@
+
 {% macro menu(menu, anchorlink, cssClass, currentModule, currentAction) %}
     <div id="secondNavBar" class="{{ cssClass }}">
-        <div id="search">
+        <div id="search" ng-cloak>
             <div piwik-quick-access class="borderedControl"></div>
         </div>
         <ul class="navbar">
@@ -26,7 +27,7 @@
                             {% for name,urlParameters in level2 %}
                                 {% if name|slice(0,1) != '_' %}
                                     <li {% if urlParameters._url.module is defined and urlParameters._url.module == currentModule and urlParameters._url.action is defined and urlParameters._url.action == currentAction %}class="active"{% endif %}
-                                        >
+                                            >
                                         <a class="item"
                                            href="index.php?{{ urlParameters._url|urlRewriteWithParameters|slice(1) }}">
                                             {{ name|translate }}