Merge branch 'master' into more_numberformats

13 files changed, 28 insertions, 26 deletions

diff --git a/plugins/Actions/Menu.php b/plugins/Actions/Menu.php
index 9a7424b4e9..9063be50a3 100644
--- a/plugins/Actions/Menu.php
+++ b/plugins/Actions/Menu.php
@@ -15,7 +15,7 @@ class Menu extends \Piwik\Plugin\Menu
 {
     public function configureReportingMenu(MenuReporting $menu)
     {
-        $menu->addActionsItem('', $this->urlForAction('menuGetPageUrls'), 15);
+        $menu->addActionsItem('', array(), 15);
 
         $idSite  = Common::getRequestVar('idSite', 0, 'int');
         $idSites = Common::getRequestVar('idSites', '', 'string');
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/javascripts/menu.js b/plugins/CoreHome/javascripts/menu.js
index 04be00227a..d30e854ff3 100644
--- a/plugins/CoreHome/javascripts/menu.js
+++ b/plugins/CoreHome/javascripts/menu.js
@@ -24,13 +24,22 @@ menu.prototype =
         $('#secondNavBar').trigger('piwikSwitchPage', this);
         $('#secondNavBar').removeClass('open fadeInLeft');
 
+        var $link = $(this);
+        var href = $link.attr('href');
+
         if (!$('#content.admin').size()) {
-            broadcast.propagateAjax( $(this).attr('href').substr(1) );
+            if (!href && $link.parent().is('.menuTab')) {
+                var $li = $link.parents('li').first();
+                $li.siblings().removeClass('sfActive');
+                $li.addClass('sfActive');
+
+            } else if (href) {
+                broadcast.propagateAjax(href.substr(1));
+            }
 
             return false;
         }
 
-        var href = $(this).attr('href');
         return !!href;
     },
 
@@ -149,7 +158,7 @@ menu.prototype =
 
     loadFirstSection: function () {
         if (broadcast.isHashExists() == false) {
-            $('li:first a:first', this.menuNode).click().addClass('sfActive');
+            $('.navbar li:first ul a:first', this.menuNode).click().addClass('sfActive');
         }
     }
 };
\ No newline at end of file
diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less
index 41ef9374bd..e1ada48519 100644
--- a/plugins/CoreHome/stylesheets/layout.less
+++ b/plugins/CoreHome/stylesheets/layout.less
@@ -378,7 +378,9 @@
       font-size: 11px;
     }
   }
+}
 
+#root, .ui-dialog, .ngdialog {
   .borderedControl {
     background-color: @theme-color-background-base;
     border: 1px solid @theme-color-background-tinyContrast;
diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig
index f81cf6a226..dcacc6856e 100644
--- a/plugins/CoreHome/templates/_menu.twig
+++ b/plugins/CoreHome/templates/_menu.twig
@@ -28,12 +28,6 @@
     {%- endif %}
 {%- endmacro %}
 
-{% macro getFirstUrl(urlParameters) -%}
-    {% if urlParameters is iterable -%}
-        {{ urlParameters|urlRewriteWithParameters|slice(1)  }}
-    {%- endif %}
-{%- endmacro %}
-
 {% macro menu(menu, anchorlink, cssClass) %}
     <div id="secondNavBar" class="{{ cssClass }}">
         <div id="search">
@@ -41,8 +35,6 @@
         </div>
         <ul class="navbar">
             {% for level1,level2 in menu %}
-                {% set hasMainCategoryUrl = level2._url is defined and level2._url is not empty %}
-
                 {% set hasSubmenuItem = false %}
                 {% for name,urlParameters in level2 %}
                     {% if urlParameters._url is defined and urlParameters._url is not iterable %}
@@ -52,10 +44,10 @@
                     {% endif %}
                 {% endfor %}
 
-                {% if hasMainCategoryUrl or hasSubmenuItem %}
+                {% if hasSubmenuItem %}
                     <li id="{% if level2._url is defined and level2._url is not empty %}{{ _self.getId(level2._url) }}{% endif %}" class="menuTab">
 
-                        <a class="item" {% if hasMainCategoryUrl %}href="{% if anchorlink %}#{% else %}index.php?{% endif %}{{ _self.getFirstUrl(level2._url) }}"{% endif %}>
+                        <a class="item" href="">
                             <span class="menu-icon {{ level2._icon|default('icon-arrow-right') }}"></span>{{ level1|translate }}
                             <span class="hidden">
                              {{ 'CoreHome_Menu'|translate }}
diff --git a/plugins/Dashboard/Menu.php b/plugins/Dashboard/Menu.php
index 250807eca5..9baa8c8a6d 100644
--- a/plugins/Dashboard/Menu.php
+++ b/plugins/Dashboard/Menu.php
@@ -21,7 +21,7 @@ class Menu extends \Piwik\Plugin\Menu
 {
     public function configureReportingMenu(MenuReporting $menu)
     {
-        $menu->addItem('Dashboard_Dashboard', '', $this->urlForAction('embeddedIndex', array('idDashboard' => 1)), 5);
+        $menu->addItem('Dashboard_Dashboard', '', array(), 5);
 
         if (Piwik::isUserIsAnonymous()) {
             $this->addDefaultDashboard($menu);
diff --git a/plugins/Ecommerce/Menu.php b/plugins/Ecommerce/Menu.php
index 331715be4f..992f50aa3c 100644
--- a/plugins/Ecommerce/Menu.php
+++ b/plugins/Ecommerce/Menu.php
@@ -28,10 +28,9 @@ class Menu extends \Piwik\Plugin\Menu
 
         if ($site->isEcommerceEnabled()) {
             $ecommerceParams = array('idGoal' => Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER);
-            $ecommerceUrl    = $this->urlForAction('ecommerceReport', $ecommerceParams);
 
-            $menu->addItem('Goals_Ecommerce', '', $ecommerceUrl, 24);
-            $menu->addItem('Goals_Ecommerce', 'General_Overview', $ecommerceUrl, 1);
+            $menu->addItem('Goals_Ecommerce', '', array(), 24);
+            $menu->addItem('Goals_Ecommerce', 'General_Overview', $this->urlForAction('ecommerceReport', $ecommerceParams), 1);
             $menu->addItem('Goals_Ecommerce', 'Goals_EcommerceLog', $this->urlForAction('ecommerceLogReport'), 2);
             $menu->addItem('Goals_Ecommerce', 'Goals_Products', $this->urlForAction('products', $ecommerceParams), 3);
             $menu->addItem('Goals_Ecommerce', 'Ecommerce_Sales', $this->urlForAction('sales', $ecommerceParams), 4);
diff --git a/plugins/ExampleUI/Menu.php b/plugins/ExampleUI/Menu.php
index e25bd10817..fe41612847 100644
--- a/plugins/ExampleUI/Menu.php
+++ b/plugins/ExampleUI/Menu.php
@@ -18,7 +18,7 @@ class Menu extends \Piwik\Plugin\Menu
 {
     public function configureReportingMenu(MenuReporting $menu)
     {
-        $menu->addItem('UI Framework', '', $this->urlForAction('dataTables'), 30);
+        $menu->addItem('UI Framework', '', array(), 30);
 
         $this->addSubMenu($menu, 'Data tables', 'dataTables', 1);
         $this->addSubMenu($menu, 'Bar graph', 'barGraph', 2);
diff --git a/plugins/Goals/Menu.php b/plugins/Goals/Menu.php
index 85db036797..d032aea4a2 100644
--- a/plugins/Goals/Menu.php
+++ b/plugins/Goals/Menu.php
@@ -28,7 +28,7 @@ class Menu extends \Piwik\Plugin\Menu
             $linkToAddNewGoal = $this->urlForAction('addNewGoal', array(
                 'idGoal' => null,
             ));
-            $menu->addItem($mainGoalMenu, '', $linkToAddNewGoal, 25);
+            $menu->addItem($mainGoalMenu, '', array(), 25);
             $menu->addItem($mainGoalMenu, 'Goals_AddNewGoal', $linkToAddNewGoal, 1);
             return;
         }
diff --git a/plugins/Referrers/Menu.php b/plugins/Referrers/Menu.php
index cb92a43db3..1088cb738e 100644
--- a/plugins/Referrers/Menu.php
+++ b/plugins/Referrers/Menu.php
@@ -14,7 +14,7 @@ class Menu extends \Piwik\Plugin\Menu
 {
     public function configureReportingMenu(MenuReporting $menu)
     {
-        $menu->addReferrersItem('', $this->urlForAction('index'), 20);
+        $menu->addReferrersItem('', array(), 20);
         $menu->addReferrersItem('General_Overview', $this->urlForAction('index'), 1);
         $menu->addReferrersItem('Referrers_WidgetGetAll', $this->urlForAction('allReferrers'), 2);
         $menu->addReferrersItem('Referrers_SubmenuSearchEngines', $this->urlForAction('getSearchEnginesAndKeywords'), 3);
diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js
index f73259c5e7..22b7fe7ea2 100644
--- a/plugins/UserCountryMap/javascripts/realtime-map.js
+++ b/plugins/UserCountryMap/javascripts/realtime-map.js
@@ -61,7 +61,7 @@
             initTopControls();
             $('#secondNavBar').on('piwikSwitchPage', function (event, item) {
                 var href = $(item).attr('href');
-                var clickedMenuIsNotMap = (href.indexOf('module=UserCountryMap&action=realtimeWorldMap') == -1);
+                var clickedMenuIsNotMap = !href || (href.indexOf('module=UserCountryMap&action=realtimeWorldMap') == -1);
                 if (clickedMenuIsNotMap) {
                     $('#periodString').show();
                     initTopControls();
diff --git a/plugins/VisitsSummary/Menu.php b/plugins/VisitsSummary/Menu.php
index 1b87e46be9..be7fc7ed09 100644
--- a/plugins/VisitsSummary/Menu.php
+++ b/plugins/VisitsSummary/Menu.php
@@ -14,7 +14,7 @@ class Menu extends \Piwik\Plugin\Menu
 {
     public function configureReportingMenu(MenuReporting $menu)
     {
-        $menu->addVisitorsItem('', array('module' => 'VisitsSummary', 'action' => 'index'), 10);
+        $menu->addVisitorsItem('', array(), 10);
         $menu->addVisitorsItem('General_Overview', array('module' => 'VisitsSummary', 'action' => 'index'), 1);
     }
 }