Merge branch 'master' of https://github.com/piwik/piwik into issue_9577

plugins/CoreHome/Menu.php

@@ -35,7 +35,7 @@ class Menu extends \Piwik\Plugin\Menu
 
         if (Piwik::isUserIsAnonymous()) {
             if (Plugin\Manager::getInstance()->isPluginActivated('ScheduledReports')) {
-                $menu->addItem($login, null, array('module' => 'ScheduledReports', 'action' => 'index'), 970, Piwik::translate('ScheduledReports_PersonalEmailReports'));
+                $menu->addItem($login, null, array('module' => 'ScheduledReports', 'action' => 'index'), 970, Piwik::translate('UsersManager_PersonalSettings'));
             } else {
                 $menu->addItem($login, null, array('module' => 'API', 'action' => 'listAllAPI'), 970, Piwik::translate('API_ReportingApiReference'));
             }

plugins/CoreHome/stylesheets/dataTable/_dataTable.less

@@ -292,7 +292,7 @@ div.dataTable, div.dataTable > .dataTableWrapper {
     margin-bottom: -1px;
     margin-left: auto;
     margin-right: auto;
-    background-color: @theme-color-background-base;
+    background-color: @theme-color-widget-background;
     border: 1px solid @theme-color-background-tinyContrast;
     height: 9px;
     width: 70px;
@@ -336,7 +336,7 @@ div.dataTable, div.dataTable > .dataTableWrapper {
     margin-top: 0px;
     margin-left: auto;
     margin-right: auto;
-    background-color: @theme-color-background-base;
+    background-color: @theme-color-widget-background;
     border: 1px solid @theme-color-background-tinyContrast;
     -webkit-border-top-left-radius: 10px;
     -webkit-border-top-right-radius: 10px;

plugins/CoreHome/stylesheets/layout.less

+ body {
+     :focus {
+         outline: 0;
+         -moz-box-shadow: inset 0 0 0 2px @theme-color-background-highContrast;
+         -webkit-box-shadow: inset 0 0 0 2px @theme-color-background-highContrast;
+         box-shadow: inset 0 0 0 2px @theme-color-background-highContrast;
+         border-radius: 2px;
+         -moz-border-radius:2px;
+         -webkit-border-radius:2px;
+         }
+ }
+
  #header {
   padding: 0 15px;
   background-color: @theme-color-background-base;
@@ -167,7 +179,7 @@
         float: none;
         display: inline-block;
       }
-      
+
       .isPiwikDemo {
         margin-top: 8px;
       }

plugins/CoreHome/templates/_logo.twig

 <span id="logo">
-    <a href="index.php" title="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik # {{ 'General_OpenSourceWebAnalytics'|translate }}" tabindex="3">
+    <a href="index.php" tabindex="-1" title="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik # {{ 'General_OpenSourceWebAnalytics'|translate }}">
     {% if hasSVGLogo %}
-        <img src='{{ logoSVG }}' alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" class="ie-hide {% if not isCustomLogo %}default-piwik-logo{% endif %}" />
+        <img src='{{ logoSVG }}' tabindex="3"  alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" class="ie-hide {% if not isCustomLogo %}default-piwik-logo{% endif %}" />
         <!--[if lt IE 9]>
     {% endif %}
         <img src='{{ logoHeader }}' alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" />

plugins/Dashboard/stylesheets/widget.less

 .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;
+}

plugins/ExamplePlugin/plugin.json

@@ -14,6 +14,6 @@
     }
   ],
   "homepage": "",
-  "license": "",
+  "license": "GPL v3+",
   "keywords": []
 }
\ No newline at end of file

plugins/ExampleTheme/plugin.json

@@ -5,7 +5,7 @@
     "theme": true,
     "stylesheet": "stylesheets/theme.less",
     "homepage": "",
-    "license": "",
+    "license": "GPL v3+",
     "keywords": [],
     "authors": [
         {

plugins/Live/stylesheets/live.less

@@ -41,7 +41,7 @@
 }
 
 #visitsLive .settings {
-    background: @theme-color-background-base none repeat scroll 0 0;
+    background: @theme-color-widget-background none repeat scroll 0 0;
 }
 
 #visitsLive .settings a {
@@ -322,4 +322,4 @@ a.visitor-log-visitor-profile-link {
 }
 .segmentedlog:hover {
   background-image: url('plugins/Live/images/visitorlog-hover.png');
-}
\ No newline at end of file
+}

plugins/Morpheus/stylesheets/theme-advanced.less

@@ -8,3 +8,6 @@
 
 @theme-color-code: #F3F3F3;
 @theme-color-code-background: #4D4D4D;
+
+@theme-color-widget-background: @theme-color-background-base;
+@theme-color-widget-border:     @color-silver-l85;

plugins/UsersManager/javascripts/usersManager.js

@@ -272,7 +272,7 @@ $(document).ready(function () {
         newRowId = 'row' + newRowId;
 
         $($.parseHTML(' <tr id="' + newRowId + '">\
-				<td><input id="useradd_login" placeholder="login" size="10" /></td>\
+				<td><input id="useradd_login" placeholder="username" size="10" /></td>\
 				<td><input id="useradd_password" placeholder="password" size="10" /></td>\
 				<td><input id="useradd_email" placeholder="email@domain.com" size="15" /></td>\
 				<td><input id="useradd_alias" placeholder="alias" size="15" /></td>\

plugins/UsersManager/lang/en.json

@@ -25,9 +25,9 @@
         "ExceptionEditAnonymous": "The anonymous user cannot be edited or deleted. It is used by Piwik to define a user that has not logged in yet. For example, you can make your statistics public by granting the 'view' access to the 'anonymous' user.",
         "ExceptionEmailExists": "User with email '%s' already exists.",
         "ExceptionInvalidEmail": "The email doesn't have a valid format.",
-        "ExceptionInvalidLoginFormat": "The login must be between %1$s and %2$s characters long and contain only letters, numbers, or the characters '_' or '-' or '.' or '@' or '+'",
+        "ExceptionInvalidLoginFormat": "The username must be between %1$s and %2$s characters long and contain only letters, numbers, or the characters '_' or '-' or '.' or '@' or '+'",
         "ExceptionInvalidPassword": "The password length must be between %1$s and %2$s characters.",
-        "ExceptionLoginExists": "Login '%s' already exists.",
+        "ExceptionLoginExists": "Username '%s' already exists.",
         "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth is expecting a MD5-hashed password (32 chars long string). Please call the md5() function on the password before calling this method.",
         "ExceptionRemoveSuperUserAccessOnlySuperUser": "Removing the Super User access from user '%s' is not possible.",
         "ExceptionSuperUserAccess": "This user has Super User access and has already permission to access and modify all websites in Piwik. You may remove the Super User access from this user and try again.",
@@ -72,4 +72,4 @@
         "YourVisitsAreIgnoredOnDomain": "%sYour visits are ignored by Piwik on %s %s (the Piwik ignore cookie was found in your browser).",
         "YourVisitsAreNotIgnored": "%sYour visits are not ignored by Piwik%s (the Piwik ignore cookie was not found in your browser)."
     }
-}
\ No newline at end of file
+}

tests/UI/specs/Dashboard_spec.js

@@ -197,7 +197,7 @@ describe("Dashboard", function () {
         }, done);
     });
 
-    it("should not fail when default widget selection changed", function (done) {
+    it.skip("should not fail when default widget selection changed", function (done) {
         expect.screenshot("default_widget_selection_changed").to.be.capture(function (page) {
             page.load(url);
             page.click('.dashboard-manager .title');
@@ -206,7 +206,7 @@ describe("Dashboard", function () {
         }, done);
     });
 
-    it("should create new dashboard with new default widget selection when create dashboard process completed", function (done) {
+    it.skip("should create new dashboard with new default widget selection when create dashboard process completed", function (done) {
         expect.screenshot("create_new").to.be.capture(function (page) {
             page.click('.dashboard-manager .title');
             page.click('li[data-action=createDashboard]');