New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New flag icons #11553

Merged
merged 28 commits into from Mar 29, 2017

Conversation

Projects
None yet
2 participants
@Findus23
Member

Findus23 commented Mar 29, 2017

Replacement for #11272

I hope I haven't forgot something. Let's see what the tests are saying.

Tests:

https://travis-ci.org/piwik/piwik/jobs/216225571#L703:

I don't know what's wrong. We have a gb-eng-flag: https://github.com/piwik/piwik-icons/blob/master/dist/flags/gb-eng.png

TODO:

Fix plugins/CustomDimensions

diff --git a/tests/System/expected/test___Live.getLastVisitsDetails_year.xml b/tests/System/expected/test___Live.getLastVisitsDetails_year.xml
index 9b55fd8..65bb6be 100644
--- a/tests/System/expected/test___Live.getLastVisitsDetails_year.xml
+++ b/tests/System/expected/test___Live.getLastVisitsDetails_year.xml
@@ -85,7 +85,7 @@
                <continentCode>eur</continentCode>
                <country>France</country>
                <countryCode>fr</countryCode>
-               <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+               <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
                <region />
                <regionCode />
                <city />
@@ -203,7 +203,7 @@
                <continentCode>eur</continentCode>
                <country>France</country>
                <countryCode>fr</countryCode>
-               <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+               <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
                <region />
                <regionCode />
                <city />
@@ -319,7 +319,7 @@
                <continentCode>eur</continentCode>
                <country>France</country>
                <countryCode>fr</countryCode>
-               <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+               <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
                <region />
                <regionCode />
                <city />
@@ -467,7 +467,7 @@
                <continentCode>eur</continentCode>
                <country>France</country>
                <countryCode>fr</countryCode>
-               <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+               <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
                <region />
                <regionCode />
                <city />
@@ -583,7 +583,7 @@
                <continentCode>eur</continentCode>
                <country>France</country>
                <countryCode>fr</countryCode>
-               <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
+               <countryFlag>plugins/Morpheus/icons/dist/flags/fr.png</countryFlag>
                <region />
                <regionCode />
                <city />

@Findus23 Findus23 requested a review from mattab Mar 29, 2017

@Findus23 Findus23 referenced this pull request Mar 29, 2017

Closed

[WIP] New flag icons #11272

@Findus23 Findus23 self-assigned this Mar 29, 2017

mattab added a commit to matomo-org/plugin-CustomDimensions that referenced this pull request Mar 29, 2017

@mattab

This comment has been minimized.

@mattab mattab added this to the 3.0.3 milestone Mar 29, 2017

mattab and others added some commits Mar 29, 2017

@Findus23

This comment has been minimized.

Member

Findus23 commented Mar 29, 2017

  • Goals overview and Visitor Log: 0a5b2a5

  • Visitors in Real-Time: not necessary:
    screenshot_20170329_173311

  • Real-time-map-popup: black background

  • E-Commerce log: can't test, but looks similar to Visitor Log.

  • Reports: I have no idea how to apply css only to the flags report

  • E-Mail Reports: I don't know how they are generated. But it doesn't seem so important:
    screenshot_20170329_173938

  • Mobile Apps: We need to test, if the flags are displayed properly there.

@mattab

This comment has been minimized.

Member

mattab commented Mar 29, 2017

Status: grey border needed in:

  • Country + Region + City reports
  • Visitor profile
  • Ideally in email reports too

I'll try take a quick look at the Country + Region + City reports first

@Findus23

This comment has been minimized.

Member

Findus23 commented Mar 29, 2017

Visitor profile should be easy. I'll look into it Done: f7c43c2

@mattab

This comment has been minimized.

Member

mattab commented Mar 29, 2017

Info:

  • Not going to set a border in the PDF Reports

@mattab mattab merged commit a21b868 into 3.x-dev Mar 29, 2017

0 of 2 checks passed

continuous-integration/travis-ci/push The Travis CI build failed
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

@mattab mattab deleted the new-flag-icons branch Mar 29, 2017

@Findus23 Findus23 referenced this pull request Mar 30, 2017

Closed

thin border around flags #5371

@mattab mattab added the Major label Apr 3, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment