Skip to content
Extraits de code Groupes Projets
Valider 16bbf7b8 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

refs #8569 in the website selector display tooltip with full website name

parent 1d8222d9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -133,6 +133,7 @@ class CoreHome extends \Piwik\Plugin ...@@ -133,6 +133,7 @@ class CoreHome extends \Piwik\Plugin
$jsFiles[] = "plugins/CoreHome/angularjs/common/filters/length.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/filters/length.js";
$jsFiles[] = "plugins/CoreHome/angularjs/common/filters/trim.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/filters/trim.js";
$jsFiles[] = "plugins/CoreHome/angularjs/common/filters/pretty-url.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/filters/pretty-url.js";
$jsFiles[] = "plugins/CoreHome/angularjs/common/filters/htmldecode.js";
$jsFiles[] = "plugins/CoreHome/angularjs/common/directives/directive.module.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/directive.module.js";
$jsFiles[] = "plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js"; $jsFiles[] = "plugins/CoreHome/angularjs/common/directives/autocomplete-matched.js";
...@@ -180,7 +181,6 @@ class CoreHome extends \Piwik\Plugin ...@@ -180,7 +181,6 @@ class CoreHome extends \Piwik\Plugin
$translationKeys[] = 'General_Show'; $translationKeys[] = 'General_Show';
$translationKeys[] = 'General_Hide'; $translationKeys[] = 'General_Hide';
$translationKeys[] = 'General_Website'; $translationKeys[] = 'General_Website';
$translationKeys[] = 'General_ChooseWebsite';
$translationKeys[] = 'Intl_Year_Short'; $translationKeys[] = 'Intl_Year_Short';
$translationKeys[] = 'General_MultiSitesSummary'; $translationKeys[] = 'General_MultiSitesSummary';
$translationKeys[] = 'General_SearchNoResults'; $translationKeys[] = 'General_SearchNoResults';
...@@ -275,5 +275,6 @@ class CoreHome extends \Piwik\Plugin ...@@ -275,5 +275,6 @@ class CoreHome extends \Piwik\Plugin
$translationKeys[] = 'CoreHome_Segments'; $translationKeys[] = 'CoreHome_Segments';
$translationKeys[] = 'CoreHome_MenuEntries'; $translationKeys[] = 'CoreHome_MenuEntries';
$translationKeys[] = 'SitesManager_Sites'; $translationKeys[] = 'SitesManager_Sites';
$translationKeys[] = 'CoreHome_ChangeCurrentWebsite';
} }
} }
/*!
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
(function () {
angular.module('piwikApp.filter').filter('htmldecode', htmldecode);
htmldecode.$inject = ['piwik'];
/**
* Be aware that this filter can cause XSS so only use it when you're sure it is safe.
* Eg it should be safe when it is afterwards escaped by angular sanitize again.
*/
function htmldecode(piwik) {
return function(text) {
if (text && text.length) {
return piwik.helper.htmlDecode(text);
}
return text;
};
}
})();
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<a ng-click="view.showSitesList=!view.showSitesList; view.showSitesList && !model.isLoading && 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();" piwik-onenter="view.showSitesList=!view.showSitesList; view.showSitesList && !model.isLoading && model.loadInitialSites();"
href="javascript:void(0)" href="javascript:void(0)"
title="{{ 'General_ChooseWebsite'|translate }}" title="{{ 'CoreHome_ChangeCurrentWebsite'|translate:((selectedSite.name || model.firstSiteName)|htmldecode) }}"
ng-class="{'loading': model.isLoading}" ng-class="{'loading': model.isLoading}"
class="title"> class="title">
<span class="icon icon-arrow-bottom" <span class="icon icon-arrow-bottom"
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
"QuickAccessTitle": "Search for %s. Shortcut: Press 'f' to search.", "QuickAccessTitle": "Search for %s. Shortcut: Press 'f' to search.",
"MenuEntries": "Menu entries", "MenuEntries": "Menu entries",
"Segments": "Segments", "Segments": "Segments",
"AdblockIsMaybeUsed": "In case you are using an ad blocker, please disable it for this site to make sure Piwik works without any issues." "AdblockIsMaybeUsed": "In case you are using an ad blocker, please disable it for this site to make sure Piwik works without any issues.",
"ChangeCurrentWebsite": "Choose a website, currently selected website: %s"
} }
} }
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter