diff options
8 files changed, 17 insertions, 12 deletions
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less index 0074c18d20..5d24df1b1d 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.less @@ -134,6 +134,11 @@ td.multisites-label { text-align: left; width: 250px; + max-width: 250px; + + a { + width: auto; + } } td.multisites-label a:hover { text-decoration: underline; diff --git a/plugins/MultiSites/angularjs/site/site.directive.html b/plugins/MultiSites/angularjs/site/site.directive.html index e5eec42a52..68f200df7c 100644 --- a/plugins/MultiSites/angularjs/site/site.directive.html +++ b/plugins/MultiSites/angularjs/site/site.directive.html @@ -1,6 +1,6 @@ <tr ng-class="{'groupedWebsite': website.group, 'website': !website.group, 'group': website.isGroup}"> <td ng-if="!website.isGroup" class="multisites-label label"> - <a title="View reports" ng-href="index.php?module=CoreHome&action=index&date={{ date }}&period={{ period }}&idSite={{ website.idsite }}">{{ website.label }}</a> + <a title="View reports" ng-href="index.php?module=CoreHome&action=index&date={{ date }}&period={{ period }}&idSite={{ website.idsite }}" class="truncated-text-line">{{ website.label }}</a> <span style="width: 10px; margin-left:3px;"> <a rel="noreferrer" target="_blank" title="{{ 'General_GoTo'|translate:website.main_url }}" ng-href="{{ website.main_url }}"> diff --git a/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png index 8d97aff9c9..34309ef53c 100644 --- a/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png +++ b/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afb5f0d882f8b0790e4fe28af4544c83a38b037e39f7dc77a0ba20de371af0e0 -size 76637 +oid sha256:cace77a6ad4b3f0e3864ed7d2e81079335dbc03f26bf1f0e7a41f6dd8cbc4cdf +size 76511 diff --git a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png index 111ad21069..4c87072e47 100644 --- a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png +++ b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3491a0e47cf4fc9d136fff80d1cf476dfa7f200e1afbf076afc89ef831c1f85f -size 66362 +oid sha256:020be445294bea1e29af9b6d17aef63ee9dde8f876983a0b0730f552252edb38 +size 66237 diff --git a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png index 8d97aff9c9..34309ef53c 100644 --- a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png +++ b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afb5f0d882f8b0790e4fe28af4544c83a38b037e39f7dc77a0ba20de371af0e0 -size 76637 +oid sha256:cace77a6ad4b3f0e3864ed7d2e81079335dbc03f26bf1f0e7a41f6dd8cbc4cdf +size 76511 diff --git a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png index 4f72557eb3..731115a92a 100644 --- a/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png +++ b/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66adc63887b4c0c989b03ce7086d8d2944175472352d356e7bae6f4aa6d001aa -size 66370 +oid sha256:b5ca528773a276888e7643733fb6b5844e0ad30f8077ed5ed6bb8bcc5a556519 +size 66212 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png index 40f074269e..46bedb29dc 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_allwebsites.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8acf5a9de7a9b8ab23e474912b28ff40aec6b6bd9fe2eabc5d79cf94275f680 -size 72725 +oid sha256:fdd2d79f440a62bcddd48a3970c2b4d0667cd8ecb046982c10932eeeda6da515 +size 71229 diff --git a/tests/UI/specs/MultiSites_spec.js b/tests/UI/specs/MultiSites_spec.js index 3dff0f5cc2..034e647d25 100644 --- a/tests/UI/specs/MultiSites_spec.js +++ b/tests/UI/specs/MultiSites_spec.js @@ -27,7 +27,7 @@ describe("MultiSitesTest", function () { }; testEnvironment.callApi("SitesManager.addSite", { - siteName: '%3CMy%20website%22%27%3E%3B%2C%3F', + siteName: '%3CMy%20website%22%27%3E%3B%2C%3F with a very very very very long stupid name', urls: 'http%3A%2F%2Fpiwik.org'}, callback); }); |