merge master => 3.0

5 files changed, 41 insertions, 7 deletions

diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php
index 5eee375988..44814f6800 100644
--- a/plugins/Dashboard/Dashboard.php
+++ b/plugins/Dashboard/Dashboard.php
@@ -9,10 +9,12 @@
 namespace Piwik\Plugins\Dashboard;
 
 use Piwik\Common;
+use Piwik\Container\StaticContainer;
 use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Category\Subcategory;
 use Piwik\Widget\WidgetConfig;
+use Piwik\Plugin;
 
 /**
  */
@@ -132,11 +134,19 @@ class Dashboard extends \Piwik\Plugin
         $defaultLayout = $this->getLayoutForUser('', 1);
 
         if (empty($defaultLayout)) {
+            $topWidget = '';
+
+            $advertising = StaticContainer::get('Piwik\PiwikPro\Advertising');
+            if ($advertising->arePiwikProAdsEnabled() && Plugin\Manager::getInstance()->isPluginActivated('PiwikPro')) {
+                $topWidget .= '{"uniqueId":"widgetPiwikPropromoPiwikPro",'
+                    . '"parameters":{"module":"PiwikPro","action":"promoPiwikPro"}},';
+            }
+
             if (Piwik::hasUserSuperUserAccess()) {
-                $topWidget = '{"uniqueId":"widgetCoreHomegetDonateForm",'
+                $topWidget .= '{"uniqueId":"widgetCoreHomegetDonateForm",'
                     . '"parameters":{"module":"CoreHome","action":"getDonateForm"}},';
             } else {
-                $topWidget = '{"uniqueId":"widgetCoreHomegetPromoVideo",'
+                $topWidget .= '{"uniqueId":"widgetCoreHomegetPromoVideo",'
                     . '"parameters":{"module":"CoreHome","action":"getPromoVideo"}},';
             }
 
diff --git a/plugins/Dashboard/lang/ar.json b/plugins/Dashboard/lang/ar.json
index f4537a9f50..6796ea5776 100644
--- a/plugins/Dashboard/lang/ar.json
+++ b/plugins/Dashboard/lang/ar.json
@@ -21,6 +21,7 @@
         "PluginDescription": "لوحة معلومات تحليلات الويب الخاصة بك. خصّص لوحة معلوماتك بإضافة عناصر واجهة جديدة وسحبها وإسقاطها أينما شئت ، بإمكانك أيضاً تغيير تخطيط أعمدة لوحة المعلومات. يمكن لكل مستخدم إدارة لوحة معلومات يخصصها كما يشاء.",
         "RemoveDashboard": "إزالة اللوحة",
         "RemoveDashboardConfirm": "هل أنت متأكد من رغبتك حذف لوحة المعلومات \"%s\" ؟",
+        "RemoveDefaultDashboardNotPossible": "لايمكن حذف لوحة المعلومات الافتراضية",
         "RenameDashboard": "إعادة تسمية اللوحة",
         "ResetDashboard": "أعد ضبط لوحة المعلومات",
         "ResetDashboardConfirm": "هل ترغب حقاً في تنضيد تخطيط اللوحة الرئيسية ومجموعة التطبيقات المعروضة فيها إلى الافتراضية؟",
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
index b45398379c..20a5fbac92 100644
--- a/plugins/Dashboard/stylesheets/dashboard.less
+++ b/plugins/Dashboard/stylesheets/dashboard.less
@@ -112,9 +112,19 @@
   font-size: 10pt;
 }
 
+.widgetLoadingError {
+  .alert.alert-danger {
+    border: 0;
+  }
+}
+
 .widgetLoadingError, .dimensionLoadingError {
   color: @theme-color-brand;
   text-align: left;
+  a {
+    color: @theme-color-brand;
+    text-decoration: underline;
+  }
 }
 
 #closeMenuIcon {
@@ -257,7 +267,7 @@
 
 ul.widgetpreview-widgetlist,
 ul.widgetpreview-categorylist {
-  color: #5d5342;
+  color: @theme-color-text-light;
   list-style: none;
   font-size: 11px;
   line-height: 20px;
@@ -318,7 +328,7 @@ div.widgetpreview-preview {
   font-weight: normal;
   padding-top: 10px;
   margin-left: 10px;
-  color: #5D5342;
+  color: @theme-color-text-light;
   list-style: none;
   font-size: 11px;
   line-height: 20px;
diff --git a/plugins/Dashboard/stylesheets/widget.less b/plugins/Dashboard/stylesheets/widget.less
index 09357f7784..c6743eb559 100644
--- a/plugins/Dashboard/stylesheets/widget.less
+++ b/plugins/Dashboard/stylesheets/widget.less
@@ -1,7 +1,7 @@
 .widget {
     .font-default(13px, 18px);
-    background: @theme-color-background-base;
-    border: 1px solid @color-silver-l85;
+    background: @theme-color-widget-background;
+    border: 1px solid @theme-color-widget-border;
     box-shadow: 0 1px 1px rgba(204,204,204,.5);
     overflow: hidden;
     z-index: 1;
@@ -54,6 +54,7 @@
             padding-left: 50px;
             right: 8px;
             display: none;
+            color: @theme-color-widget-title-text;
             background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px);
             background: -webkit-linear-gradient(left,rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px);
             background: linear-gradient(to right, rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px);
@@ -115,3 +116,15 @@
         display:none;
     }
 }
+
+.widget table.dataTable tr td {
+  background-color: @theme-color-widget-background;
+}
+
+.dataTable table.dataTable tr td {
+  background-color: @theme-color-widget-background;
+}
+
+.bar-graph-colors[data-name=grid-background] {
+    color: @theme-color-widget-background !important;
+}
diff --git a/plugins/Dashboard/templates/_dashboardSettings.twig b/plugins/Dashboard/templates/_dashboardSettings.twig
index b82e913743..db21def819 100644
--- a/plugins/Dashboard/templates/_dashboardSettings.twig
+++ b/plugins/Dashboard/templates/_dashboardSettings.twig
@@ -1,4 +1,4 @@
-<a class="title" title="{{ 'Dashboard_ManageDashboard'|translate|e('html_attr') }}"><span class="icon icon-arrow-bottom"></span>{{ 'Dashboard_Dashboard'|translate }} </a>
+<a class="title" title="{{ 'Dashboard_ManageDashboard'|translate|e('html_attr') }}" tabindex="4"><span class="icon icon-arrow-bottom"></span>{{ 'Dashboard_Dashboard'|translate }} </a>
 <ul class="dropdown submenu">
     <li>
         <div class="addWidget">{{ 'Dashboard_AddAWidget'|translate }}</div>