Merge master => 3.0

8 files changed, 28 insertions, 9 deletions

diff --git a/plugins/Dashboard/javascripts/dashboard.js b/plugins/Dashboard/javascripts/dashboard.js
index 6286f74791..196196ea5b 100644
--- a/plugins/Dashboard/javascripts/dashboard.js
+++ b/plugins/Dashboard/javascripts/dashboard.js
@@ -79,7 +79,7 @@ function showChangeDashboardLayoutDialog() {
 function showEmptyDashboardNotification() {
     piwikHelper.modalConfirm(makeSelectorLastId('dashboardEmptyNotification'), {
         resetDashboard: function () { $('#dashboardWidgetsArea').dashboard('resetLayout'); },
-        addWidget: function () { $('.dashboardSettings').trigger('click'); }
+        addWidget: function () { $('.dashboardSettings > a').trigger('click'); }
     });
 }
 
diff --git a/plugins/Dashboard/javascripts/dashboardObject.js b/plugins/Dashboard/javascripts/dashboardObject.js
index 457fc67f7a..b1da76c099 100644
--- a/plugins/Dashboard/javascripts/dashboardObject.js
+++ b/plugins/Dashboard/javascripts/dashboardObject.js
@@ -502,7 +502,7 @@
 
         // widgetized
         var success = function (dashboards) {
-            var dashboardMenuList = $('#Dashboard').find('> ul');
+            var dashboardMenuList = $('#Dashboard_embeddedIndex_1').closest('ul');
             var dashboardMenuListItems = dashboardMenuList.find('>li');
 
             dashboardMenuListItems.filter(function () {
@@ -518,9 +518,9 @@
             ) {
                 var items = [];
                 for (var i = 0; i < dashboards.length; i++) {
-                    var $link = $('<a/>').attr('data-idDashboard', dashboards[i].iddashboard).text(dashboards[i].name).addClass('item title');
-                    var $li = $('<li/>').attr('id', 'Dashboard_embeddedIndex_' + dashboards[i].iddashboard)
-                        .addClass('dashboardMenuItem').append($link);
+                    var $link = $('<a/>').attr('data-iddashboard', dashboards[i].iddashboard).text(dashboards[i].name).addClass('item');
+                    var $li = $('<li/>').attr('id', 'Dashboard_embeddedIndex_' + dashboards[i].iddashboard).addClass('dashboardMenuItem').attr('role', 'menuitem').append($link);
+
                     items.push($li);
 
                     if (dashboards[i].iddashboard == dashboardId) {
@@ -531,16 +531,17 @@
                 dashboardMenuList.prepend(items);
             }
 
-            dashboardMenuList.find('a[data-idDashboard]').click(function (e) {
+            dashboardMenuList.find('a[data-iddashboard]').click(function (e) {
                 e.preventDefault();
 
-                var idDashboard = $(this).attr('data-idDashboard');
+                var idDashboard = $(this).attr('data-iddashboard');
 
                 $('#Dashboard ul li').removeClass('active');
 
                 methods.loadDashboard.apply(_self, [idDashboard]);
 
                 $(this).closest('li').addClass('active');
+
             });
         };
 
diff --git a/plugins/Dashboard/lang/sq.json b/plugins/Dashboard/lang/sq.json
index 39d39bb28b..2c17ddc435 100644
--- a/plugins/Dashboard/lang/sq.json
+++ b/plugins/Dashboard/lang/sq.json
@@ -3,15 +3,24 @@
         "AddAWidget": "Shtoni një widget",
         "AddPreviewedWidget": "Klikojeni që të shtohet widget-i te pulti",
         "ChangeDashboardLayout": "Ndryshoni skemën e pultit",
+        "CopyDashboardToUser": "Kopjoje pultin te përdoruesi",
+        "CreateNewDashboard": "Krijoni pult të ri",
         "Dashboard": "Pulti",
+        "DashboardCopied": "Pulti i tanishëm u kopjua me sukses te përdoruesi i përzgjedhur.",
+        "DashboardName": "Emër pulti:",
+        "DashboardOf": "Pulti i %s",
         "DeleteWidgetConfirm": "Jeni i sigurt se doni të fshihet ky \"widget\" prej pulti?",
         "LoadingWidget": "Widget-i po ngarkohet, ju lutemi, pritni...",
+        "ManageDashboard": "Administroni pultin",
         "Maximise": "Maksimizoje",
         "Minimise": "Minimizoje",
+        "RemoveDefaultDashboardNotPossible": "Pulti parazgjedhje s’mund të hiqet",
+        "RenameDashboard": "Riemërtoni pultin",
         "ResetDashboard": "Riktheje pultin te parazgjedhjet",
         "ResetDashboardConfirm": "Doni vërtet ta riktheni skemën e pultit tuaj te përzgjedhja parazgjedhje për Widget-et?",
         "SelectDashboardLayout": "Ju lutemi, përzgjidhni skemën e re për pultin tuaj",
         "SelectWidget": "Përzgjidhni widget-in që doni të shtohet te pulti",
+        "SetAsDefaultWidgets": "Caktojeni si përzgjedhje widget-esh parazgjedhje",
         "WidgetNotFound": "Nuk u gjet \"widget\"",
         "WidgetPreview": "Paraparje widget-i"
     }
diff --git a/plugins/Dashboard/lang/sv.json b/plugins/Dashboard/lang/sv.json
index bf14760780..4f2b0f7772 100644
--- a/plugins/Dashboard/lang/sv.json
+++ b/plugins/Dashboard/lang/sv.json
@@ -21,6 +21,7 @@
         "PluginDescription": "Ditt dashboard för webbanalys. Anpassa ditt dashboard genom att lägga till nya widgets, flytta runt dem och ändra kolumnindelning. Varje användare kan anpassa sin egen dashboard.",
         "RemoveDashboard": "Ta bort instrumentpanel",
         "RemoveDashboardConfirm": "Vill du verkligen radera instrumentpanelen \"%s\"?",
+        "RemoveDefaultDashboardNotPossible": "Standardinstrumentpanelen kan inte tas bort",
         "RenameDashboard": "Byt namn på instrumentpanelen",
         "ResetDashboard": "Återställ instrumentpanel",
         "ResetDashboardConfirm": "Vill du verkligen återställa instrumentpanelens layout för Widgets?",
diff --git a/plugins/Dashboard/lang/tr.json b/plugins/Dashboard/lang/tr.json
index 645b2c2f13..b69bbc0900 100644
--- a/plugins/Dashboard/lang/tr.json
+++ b/plugins/Dashboard/lang/tr.json
@@ -7,6 +7,7 @@
         "CreateNewDashboard": "Yeni panel ekle",
         "Dashboard": "Pano",
         "DashboardCopied": "Panel başarılı şekilde seçilen kullanıcı için kopyalandı",
+        "DashboardEmptyNotification": "Kontrol Panelin hiçbir widget içermiyor. Widget ekleyerek veya kontrol panelini resetleyerek varsayılan widget seçimi ile başlayabilirsin.",
         "DashboardName": "Panel adı:",
         "DashboardOf": "Kontrol paneli %s",
         "DefaultDashboard": "Varsayılan panel - Varsayılan widget seçimleri ve sütunları kullanın",
@@ -17,6 +18,7 @@
         "Maximise": "Maksimize",
         "Minimise": "Küçült",
         "NotUndo": "Bu eylemi geri alamazsınız.",
+        "PluginDescription": "Web Analitik ve Gösterge Tablon. Yeni widget ekleyerek, onları sürükle bırak yaparak ve gösterge paneli sütun düzgisini değiştirerek gösterge panelini özelleştirebilirsin. Her kullanıcı kendi özelleşmiş gösterge panelini yönetebilir.",
         "RemoveDashboard": "Paneli kaldır",
         "RemoveDashboardConfirm": "\"%s\" panelini kaldırmak istediğinize emin misiniz?",
         "RemoveDefaultDashboardNotPossible": "Varsayılan pano silinemez",
@@ -25,6 +27,10 @@
         "ResetDashboardConfirm": "Kontrol paneli şablonunuzu varsayılan widget seçimlerine sıfırlamak istediğinizden emin misiniz?",
         "SelectDashboardLayout": "Lütfen yeni panel düzenini seçiniz.",
         "SelectWidget": "Panoya eklemek için bileşen seçiniz.",
+        "SetAsDefaultWidgets": "Varsayılan widget seçimi olarak ata",
+        "SetAsDefaultWidgetsConfirm": "Mevcut widget seçimini ve kontrol paneli düzenini varsayılan kontrol paneli teması olarak atamak istediğinizden emin misiniz?",
+        "SetAsDefaultWidgetsConfirmHelp": "Bu widgetlerin seçimi ve gösterge panelinin sütun dizgisi herhangi bir kullanıcı yeni gösterge paneli yarattığında veya \"%s\" özellii kullanıldığında kullanılabilir.",
+        "TopLinkTooltip": "%s için Web Analatik raporunu görüntüle.",
         "WidgetNotFound": "Bileşen bulunamadı",
         "WidgetPreview": "Bileşen görünümü"
     }
diff --git a/plugins/Dashboard/lang/vi.json b/plugins/Dashboard/lang/vi.json
index afa5cc2dbf..9f56c6aa38 100644
--- a/plugins/Dashboard/lang/vi.json
+++ b/plugins/Dashboard/lang/vi.json
@@ -21,6 +21,7 @@
         "PluginDescription": "Bảng điều khiển của bạn. Có thể tùy biến bằng cách thêm widget, kéo thả hoặc thêm các trường dữ liệu. Mỗi người dùng có thể tùy biến bảng điều khiến cho riêng mình.",
         "RemoveDashboard": "Loại bỏ bảng điều khiển",
         "RemoveDashboardConfirm": "Bạn có chắc chắn muốn loại bỏ bảng điều khiển \"%s\"?",
+        "RemoveDefaultDashboardNotPossible": "Các bảng điều khiển mặc định không thể bị gỡ bỏ",
         "RenameDashboard": "Đổi tên bảng điều khiển",
         "ResetDashboard": "Bảng điều khiển mặc định",
         "ResetDashboardConfirm": "Bạn có chắc chắn muốn thiết lập lại bố trí bảng điều khiển của bạn cho thiết lập các Widget mặc định?",
diff --git a/plugins/Dashboard/lang/zh-cn.json b/plugins/Dashboard/lang/zh-cn.json
index 6d9ff142de..52952d5ec3 100644
--- a/plugins/Dashboard/lang/zh-cn.json
+++ b/plugins/Dashboard/lang/zh-cn.json
@@ -21,6 +21,7 @@
         "PluginDescription": "您的 Web 分析面板。如果需要自定义，您可以添加新的小工具，拖动这些小工具，和更改面板的列数和布局。每个用户都可以独立定制属于他自己的面板。",
         "RemoveDashboard": "删除面板",
         "RemoveDashboardConfirm": "确认要删除面板\"%s\"吗?",
+        "RemoveDefaultDashboardNotPossible": "默认的仪表盘无法删除",
         "RenameDashboard": "重命名面板",
         "ResetDashboard": "重置面板",
         "ResetDashboardConfirm": "确认重置面板布局并且使用默认的小工具？",
diff --git a/plugins/Dashboard/templates/index.twig b/plugins/Dashboard/templates/index.twig
index ddaac2428c..17f3a5363d 100644
--- a/plugins/Dashboard/templates/index.twig
+++ b/plugins/Dashboard/templates/index.twig
@@ -6,9 +6,9 @@
     <div id="Dashboard" class="piwikTopControl borderedControl piwikSelector">
         <ul>
             {% for dashboard in dashboards %}
-                <li class="dashboardMenuItem" id="Dashboard_embeddedIndex_{{ dashboard.iddashboard }}">
+                <li id="Dashboard_embeddedIndex_{{ dashboard.iddashboard }}">
                     <a href="javascript:$('#dashboardWidgetsArea').dashboard('loadDashboard', {{ dashboard.iddashboard }});"
-                       class="title">{{ dashboard.name|escape }}</a>
+                       class="item">{{ dashboard.name|escape }}</a>
                 </li>
             {% endfor %}
         </ul>