diff options
Diffstat (limited to 'plugins')
369 files changed, 242 insertions, 175 deletions
diff --git a/plugins/Contents/lang/tr.json b/plugins/Contents/lang/tr.json index e444b82427..0a9f304036 100644 --- a/plugins/Contents/lang/tr.json +++ b/plugins/Contents/lang/tr.json @@ -2,6 +2,8 @@ "Contents": { "PluginDescription": "İçerik ve reklam izleme, sayfalarınızdaki herhangi bir içeriğin (reklam, görsel, herhangi bir öge) başarımının (görülme, tıklanma, CTR) izlenmesini sağlar.", "Impressions": "Görülme", + "ContentInteraction": "İçerik Etkileşimi", + "ContentInteractions": "İçerik Etkileşimleri", "InteractionRate": "Etkileşim Oranı", "ContentName": "İçerik Adı", "ContentPiece": "İçerik Parçası", diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 436975fff5..b16427cf44 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -76,7 +76,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 /> @@ -188,7 +188,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 /> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 436975fff5..b16427cf44 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -76,7 +76,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 /> @@ -188,7 +188,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 /> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 436975fff5..b16427cf44 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -76,7 +76,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 /> @@ -188,7 +188,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 /> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 436975fff5..b16427cf44 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -76,7 +76,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 /> @@ -188,7 +188,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 /> diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 436975fff5..b16427cf44 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -76,7 +76,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 /> @@ -188,7 +188,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 /> diff --git a/plugins/CoreAdminHome/CustomLogo.php b/plugins/CoreAdminHome/CustomLogo.php index 75948fdc12..62856d1977 100644 --- a/plugins/CoreAdminHome/CustomLogo.php +++ b/plugins/CoreAdminHome/CustomLogo.php @@ -30,7 +30,7 @@ class CustomLogo public function getHeaderLogoUrl($pathOnly = false) { - $defaultLogo = 'plugins/Morpheus/images/logo-header.png'; + $defaultLogo = 'plugins/Morpheus/images/logo.svg'; $themeLogo = 'plugins/%s/images/logo-header.png'; $customLogo = static::getPathUserLogoSmall(); return $this->getPathToLogo($pathOnly, $defaultLogo, $themeLogo, $customLogo); diff --git a/plugins/CoreAdminHome/lang/de.json b/plugins/CoreAdminHome/lang/de.json index c29bcdc690..6fbf8a17e0 100644 --- a/plugins/CoreAdminHome/lang/de.json +++ b/plugins/CoreAdminHome/lang/de.json @@ -45,6 +45,7 @@ "JSTracking_TrackNoScript": "Benutzer mit deaktiviertem JavaScript tracken", "JSTracking_VisitorCustomVars": "Benutzerdefinierte Variable für diesen Besucher aufzeichnen", "JSTracking_VisitorCustomVarsDesc": "Zum Beispiel mit dem Variablennamen \"Typ\" und dem Wert \"Kunde\".", + "JSTracking_EndNote": "Hinweis: Sie können sich einen angepassten Tracking Code unter Einstellungen > %1$sTracking Code%2$s erzeugen.", "JSTrackingIntro1": "Es gibt viele verschiedene Möglichkeiten Besucher Ihrer Website zu tracken. Die empfohlene Art und Weise dies zu tun, ist die Verwendung von JavaScript. Um diese Methode zu nutzen müssen Sie sicher stellen, dass auf jeder Seite Ihrer Website ein JavaScript-Code eingebunden ist. Diesen können Sie hier generieren.", "JSTrackingIntro2": "Sobald Sie den JavaScript Tracking Code für Ihre Website haben, fügen Sie ihn auf allen Seiten ein, die Sie mit Piwik überwachen möchten.", "JSTrackingIntro3b": "Bei den meisten Webseiten, Blogs und CMS, etc. können Sie ein existierendes Plugin benutzen, das Ihnen die technische Arbeit abnimmt. (Schauen Sie hierzu in die %1$sListe der Plugins um Piwik zu integrieren%2$s.) Falls kein passendes Plugin besteht können Sie die Templates Ihrer Webseite bearbeiten und diesen Quellcode in den %lt;\/head>-Tag einfügen. Dieser ist häufig in einer 'header.php' oder header.tpl' oder ähnlich benannten Template-Datei definiert.", diff --git a/plugins/CoreAdminHome/lang/el.json b/plugins/CoreAdminHome/lang/el.json index 57ac255474..e24ee25c6e 100644 --- a/plugins/CoreAdminHome/lang/el.json +++ b/plugins/CoreAdminHome/lang/el.json @@ -45,6 +45,7 @@ "JSTracking_TrackNoScript": "Παρακολούθηση χρηστών με απενεργοποιημένη τη JavaScript", "JSTracking_VisitorCustomVars": "Παρακολούθηση προσαρμοσμένων μεταβλητών για αυτό τον επισκέπτη", "JSTracking_VisitorCustomVarsDesc": "Για παράδειγμα, με όνομα της μεταβλητής \"Τύπος\" και τιμή \"Πελάτης\".", + "JSTracking_EndNote": "Σημείωση: Μπορείτε να δημιουργήσετε προσαρμοσμένο κώδικα παρακολούθησης στο τμήμα διαχείρισης του %1$sΚώδικα Παρακολούθησης%2$s.", "JSTrackingIntro1": "Μπορείτε να παρακολουθείτε τους επισκέπτες στον ιστοτόπο σας με πολλούς διαφορετικούς τρόπους. Ο συνιστώμενος τρόπος είναι μέσω της JavaScript. Για να χρησιμοποιήσετε αυτή τη μέθοδο θα πρέπει να βεβαιωθείτε ότι κάθε σελίδα του ιστοτόπου σας έχει κάποιο κώδικα JavaScript, τον οποίο μπορείτε να δημιουργήσετε εδώ.", "JSTrackingIntro2": "Μόλις έχετε το JavaScript κώδικα παρακολούθησης για την ιστοσελίδα σας, αντιγράψετε και επικολλήστε τον σε όλες τις σελίδες που θέλετε να παρακολουθήσετε με το Piwik.", "JSTrackingIntro3b": "Στους περισσότερους ιστοτόπους, ιστολόγια, CMS, κτλ. μπορείτε να χρησιμοποιήσετε ένα προ-κατασκευασμένο πρόσθετο που θα εκτελεί την τεχνική εργασία για εσάς. (Δείτε τη %1$sλίστα των πρόσθετων για ενσωμάτωση με το Piwik%2$s.) Αν δεν υπάρχει πρόσθετο μπορείτε να επεξεργαστείτε τα αρχεία προτύπου του ιστοτόπου σας και να προσθέσετε τον κώδικα στη σήμανση <\/head> που συχνά ορίζεται στο αρχείο 'header.php', 'header.tpl' ή παρόμοιο αρχείο προτύπου.", diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json index bc045654e7..4c718121f0 100644 --- a/plugins/CoreAdminHome/lang/en.json +++ b/plugins/CoreAdminHome/lang/en.json @@ -45,6 +45,7 @@ "JSTracking_TrackNoScript": "Track users with JavaScript disabled", "JSTracking_VisitorCustomVars": "Track custom variables for this visitor", "JSTracking_VisitorCustomVarsDesc": "For example, with variable name \"Type\" and value \"Customer\".", + "JSTracking_EndNote": "Note: You can generate a customized tracking code in the %1$sTracking Code%2$s admin section.", "JSTrackingIntro1": "You can track visitors to your website many different ways. The recommended way to do it is through JavaScript. To use this method you must make sure every webpage of your website has some JavaScript code, which you can generate here.", "JSTrackingIntro2": "Once you have the JavaScript tracking code for your website, copy and paste it to all the pages you want to track with Piwik.", "JSTrackingIntro3b": "In most websites, blogs, CMS, etc. you can use a pre-made plugin to do the technical work for you. (See our %1$slist of plugins used to integrate Piwik%2$s.) If no plugin exists you can edit your website templates and add this code to the </head> tag which is often defined in a 'header.php', 'header.tpl' or similar template file.", diff --git a/plugins/CoreAdminHome/lang/pt-br.json b/plugins/CoreAdminHome/lang/pt-br.json index 1829bfe5bc..9ed3e637da 100644 --- a/plugins/CoreAdminHome/lang/pt-br.json +++ b/plugins/CoreAdminHome/lang/pt-br.json @@ -40,6 +40,7 @@ "JSTracking_MergeSubdomainsDesc": "Portanto se um visitante acessar %1$s e %2$s, ele será contado como visitante único.", "JSTracking_PageCustomVars": "Setar uma variável personalizada para cada exibição de página", "JSTracking_PageCustomVarsDesc": "Por exemplo, com variável de nome \"Categoria\" e valor \"White Papers\".", + "JSTracking_TrackNoScript": "Rastreia usuários com JavaScript desabilitado", "JSTracking_VisitorCustomVars": "Setar variáveis personalizadas para este visitante", "JSTracking_VisitorCustomVarsDesc": "Por exemplo, com nome da variável \"Tipo\" e valor \"Cliente\".", "JSTrackingIntro1": "Você pode rastrear os visitantes de seu site muitas maneiras diferentes. A maneira recomendada de fazer isso é através de JavaScript. Para usar este método, você deve se certificar de que cada página do seu site possui o código JavaScript que você pode gerar aqui.", diff --git a/plugins/CoreAdminHome/lang/sq.json b/plugins/CoreAdminHome/lang/sq.json index 8ac03ea920..a0cf52f8ea 100644 --- a/plugins/CoreAdminHome/lang/sq.json +++ b/plugins/CoreAdminHome/lang/sq.json @@ -45,6 +45,7 @@ "JSTracking_TrackNoScript": "Ndiqi përdoruesit me JavaScript të çaktivizuar", "JSTracking_VisitorCustomVars": "Ndiqni ndryshore vetjake për këtë vizitor", "JSTracking_VisitorCustomVarsDesc": "Për shembull, me emër ndryshoreje \"Lloj\" dhe vlerë \"Klient\".", + "JSTracking_EndNote": "Shënim: Te ndarja %1$sKod Ndjekjeje%2$s e përgjegjësit mund të prodhoni kod vetjak ndjekjesh.", "JSTrackingIntro1": "Vizitorët në sajtin tuaj mund t’i ndiqni në mjaft rrugë të ndryshme. Rruga e këshilluar për ta bërë është përmes JavaScript-it. Për të përdorur këtë metodë, duhet të garantoni që çdo faqe e sajtit tuaj të përmbajë një copëz kodi JavaScript, të cilin mund ta prodhoni nga këtu.", "JSTrackingIntro2": "Pasi të keni kodin JavaScript të ndjekjes për sajtin tuaj, kopjojeni dhe hidheni te krejt faqet që dëshironi të ndiqni me Piwik.", "JSTrackingIntro3b": "Në shumicën e sajteve, blogjeve, CMS-ve, etj. mund të përdorni shtojca të gatshme që do të bënin për ju punën teknike. (Shihni %1$slistën tonë të shtojcave të përdorura për të integruar Piwik-un%2$s.) Nëse nuk ka shtojcë të tillë, mund të përpunoni gjedhet e sajtit tuaj dhe të shtoni këtë kod te etiketa <\/head>, e cila shpesh përkufizohet brenda një kartele gjedhe 'header.php', 'header.tpl' ose të ngjashme.", diff --git a/plugins/CoreAdminHome/lang/zh-tw.json b/plugins/CoreAdminHome/lang/zh-tw.json index 3430c9a49a..86c3649ffc 100644 --- a/plugins/CoreAdminHome/lang/zh-tw.json +++ b/plugins/CoreAdminHome/lang/zh-tw.json @@ -45,6 +45,7 @@ "JSTracking_TrackNoScript": "追蹤已禁用 JavaScript 的訪客", "JSTracking_VisitorCustomVars": "為此訪客追蹤自訂變數", "JSTracking_VisitorCustomVarsDesc": "例如變數名稱為「類型」，值為「顧客」。", + "JSTracking_EndNote": "注意：你可以在管理中心的%1$s追蹤程式碼%2$s頁面中產生自訂的追蹤程式碼。", "JSTrackingIntro1": "你可以透過多種不同的方式追蹤你的網站訪客。推薦使用 JavaScript 的追蹤方式。要使用此方法必須先確定你網站中的每一頁都有一樣的 JavaScript 程式碼，你可以在這裡產生。", "JSTrackingIntro2": "當你有了網站的 JavaScript 追蹤程式碼，請複製並貼上到所有你想透過 Piwik 追蹤的頁面上。", "JSTrackingIntro3b": "多數的網站、部落格、CMS 等等。你可以使用一個預製的外掛來幫你做技術性的工作。（查看%1$s用來整合 Piwik 的外掛列表%2$s。）如果沒有看到你想要的外掛，你可以直接編輯網站的模板，並將程式碼貼到 <\/head> 標籤之前，通常出現在「header.php」、「header.tpl」等類似的模板檔案中。", diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index e7e46820f5..5a6a83c46a 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -130,7 +130,7 @@ class RowEvolution $metricsText = Piwik::translate('RowEvolution_AvailableMetrics'); $popoverTitle = ''; if ($this->rowLabel) { - $icon = $this->rowIcon ? '<img width="16px" height="16px" src="' . $this->rowIcon . '" alt="">' : ''; + $icon = $this->rowIcon ? '<img height="16px" src="' . $this->rowIcon . '" alt="">' : ''; $metricsText = sprintf(Piwik::translate('RowEvolution_MetricsFor'), $this->dimension . ': ' . $icon . ' ' . $this->rowLabel); $popoverTitle = $icon . ' ' . $this->rowLabel; } diff --git a/plugins/CoreHome/lang/pt-br.json b/plugins/CoreHome/lang/pt-br.json index 35060bd57a..84a4df9462 100644 --- a/plugins/CoreHome/lang/pt-br.json +++ b/plugins/CoreHome/lang/pt-br.json @@ -5,6 +5,7 @@ "CheckForUpdates": "Verificar atualizações", "CheckPiwikOut": "Verificar saída do Piwik", "ClickToEditX": "Clique para editar %s", + "ClickToSeeFullInformation": "Clique para ver toda a informação", "CloseSearch": "Fechar busca", "CloseWidgetDirections": "Você pode fechar esta ferramenta clicando no ícone \"X\" na parte superior do widget.", "DataForThisReportHasBeenPurged": "Os dados para este relatório possuem mais de %s meses e foram excluídos.", @@ -49,6 +50,7 @@ "YouAreUsingTheLatestVersion": "Você está usando a última versão do Piwik!", "ClickRowToExpandOrContract": "Clique nesta linha para expandir ou contrair a subtabela.", "UndoPivotBySubtable": "Este relatório foi articulado %s desfazer articulação", + "NoSuchPage": "Esta página não existe", "PivotBySubtable": "Este relatório não foi articulado %1$s Articular por %2$s", "SystemSummaryWidget": "Resumo do Sistema", "SystemSummaryNWebsites": "%d websites", diff --git a/plugins/CoreHome/lang/zh-tw.json b/plugins/CoreHome/lang/zh-tw.json index fb56b7839d..848918f85f 100644 --- a/plugins/CoreHome/lang/zh-tw.json +++ b/plugins/CoreHome/lang/zh-tw.json @@ -14,7 +14,7 @@ "DataTableIncludeAggregateRows": "合計列已隱藏 %s 點擊顯示", "DataTableHowToSearch": "按下 Enter 鍵或點擊搜尋圖示來搜尋", "Default": "預設", - "DonateCall1": "使用 Piwik 永遠不花你任何一毛錢，但那不表示我們開發沒有花到錢。", + "DonateCall1": "使用 Piwik 永遠不花你任何一毛錢，但那不表示我們開發不需要花到半毛錢。", "DonateCall2": "Piwik 需要你的持續支持以成長茁壯。", "DonateCall3": "如果你覺得 Piwik 為你的事業或是奮鬥過程中增添了非凡的價值，%1$s請考慮捐助%2$s或是%3$s購買高級功能%4$s。每一分錢都是幫助。", "DonateFormInstructions": "使用滑桿來選擇數量，接著點擊 Subscribe 來捐助。", diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less index 5c321005ad..2015f6ea2e 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less +++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less @@ -480,7 +480,6 @@ tr.level12 td.label { table.dataTable td.label img { margin-top: -3px; - max-width: 16px; max-height: 16px; } diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig index d331175edd..87364415df 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig @@ -53,7 +53,9 @@ {% if columnId == 'label' %} {% if rowMetrics[columnId] is defined %} {% if rowMetadata.logo is defined %} - <img width="16px" height="16px" src='{{ currentPath }}{{ rowMetadata.logo }}'> + <img height="16px" src='{{ currentPath }}{{ rowMetadata.logo }}' + {%- if 'plugins/Morpheus/icons/dist/flags' in rowMetadata.logo %} style="border: 1px solid lightgray; "{% endif -%} + > {% endif %} {% if rowMetadata.url is defined %} diff --git a/plugins/CorePluginsAdmin/lang/de.json b/plugins/CorePluginsAdmin/lang/de.json index 09b1f1cb1e..a1e0c9c9d5 100644 --- a/plugins/CorePluginsAdmin/lang/de.json +++ b/plugins/CorePluginsAdmin/lang/de.json @@ -37,6 +37,7 @@ "NoPluginSettings": "Es gibt keine Einstellungen dieser Erweiterung, die konfiguriert werden können", "Origin": "Quelle", "OriginCore": "Core", + "OriginOfficial": "Offiziell", "OriginThirdParty": "Dritt-Anbieter", "PluginHomepage": "Plugin-Website", "PluginNotCompatibleWith": "Das Plugin %1$s ist nicht kompatibel mit %2$s.", diff --git a/plugins/CorePluginsAdmin/lang/el.json b/plugins/CorePluginsAdmin/lang/el.json index 15bbccc1c1..84d4792a2f 100644 --- a/plugins/CorePluginsAdmin/lang/el.json +++ b/plugins/CorePluginsAdmin/lang/el.json @@ -37,6 +37,7 @@ "NoPluginSettings": "Δεν υπάρχουν ρυθμίσεις που μπορούν να παραμετροποιηθούν", "Origin": "Προέλευση", "OriginCore": "Πυρήνας", + "OriginOfficial": "Επίσημο", "OriginThirdParty": "Από τρίτες πηγές", "PluginHomepage": "Ιστοσελίδα πρόσθετου", "PluginNotCompatibleWith": "Το πρόσθετο %1$s δεν είναι συμβατό με το %2$s.", diff --git a/plugins/CorePluginsAdmin/lang/fr.json b/plugins/CorePluginsAdmin/lang/fr.json index a4683c5d31..c0957b7bbb 100644 --- a/plugins/CorePluginsAdmin/lang/fr.json +++ b/plugins/CorePluginsAdmin/lang/fr.json @@ -37,6 +37,7 @@ "NoPluginSettings": "Aucun paramètre de plugin ne peut être configuré", "Origin": "Origine", "OriginCore": "Principal", + "OriginOfficial": "Officiel", "OriginThirdParty": "Tierce-Partie", "PluginHomepage": "Page d'accueil du plugin", "PluginNotCompatibleWith": "Le composant %1$s n'est pas compatible avec %2$s.", diff --git a/plugins/CorePluginsAdmin/lang/sq.json b/plugins/CorePluginsAdmin/lang/sq.json index 3bc6306e4e..375bac5796 100644 --- a/plugins/CorePluginsAdmin/lang/sq.json +++ b/plugins/CorePluginsAdmin/lang/sq.json @@ -37,6 +37,7 @@ "NoPluginSettings": "S’ka rregullime shtojce që mund të formësohen", "Origin": "Origjina", "OriginCore": "Bazë", + "OriginOfficial": "Zyrtare", "OriginThirdParty": "Prej palësh të treta", "PluginHomepage": "Faqe Hyrëse e Shtojcës", "PluginNotCompatibleWith": "Shtojca %1$s s’është e përputhshme me %2$s.", diff --git a/plugins/CorePluginsAdmin/lang/zh-tw.json b/plugins/CorePluginsAdmin/lang/zh-tw.json index 7f6151bba2..6b475ed777 100644 --- a/plugins/CorePluginsAdmin/lang/zh-tw.json +++ b/plugins/CorePluginsAdmin/lang/zh-tw.json @@ -37,6 +37,7 @@ "NoPluginSettings": "沒有可以可以變更設定的外掛", "Origin": "來源", "OriginCore": "核心", + "OriginOfficial": "官方", "OriginThirdParty": "第三方", "PluginHomepage": "外掛首頁", "PluginNotCompatibleWith": "%1$s 個外掛和 %2$s 不相容。", diff --git a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php index 5b4a03cb37..8533e5675c 100644 --- a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php +++ b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php @@ -79,6 +79,8 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage CoreUpdater_ViewVersionChangelog http://piwik.org/changelog/piwik-33-0-0/ +CoreUpdater_ReceiveEmailBecauseIsSuperUser + CoreUpdater_FeedbackRequest http://piwik.org/contact/"; @@ -95,6 +97,8 @@ CoreUpdater_ThereIsNewVersionAvailableForUpdate CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage {$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable +CoreUpdater_ReceiveEmailBecauseIsSuperUser + CoreUpdater_FeedbackRequest http://piwik.org/contact/"; diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php index d39f44c111..971bd16fa0 100644 --- a/plugins/CoreUpdater/UpdateCommunication.php +++ b/plugins/CoreUpdater/UpdateCommunication.php @@ -79,6 +79,8 @@ class UpdateCommunication $message .= "\n\n"; } + $message .= Piwik::translate('CoreUpdater_ReceiveEmailBecauseIsSuperUser', $host); + $message .= "\n\n"; $message .= Piwik::translate('CoreUpdater_FeedbackRequest'); $message .= "\n"; $message .= 'http://piwik.org/contact/'; diff --git a/plugins/CoreUpdater/lang/el.json b/plugins/CoreUpdater/lang/el.json index ce020be4c8..771bfea8b1 100644 --- a/plugins/CoreUpdater/lang/el.json +++ b/plugins/CoreUpdater/lang/el.json @@ -77,6 +77,7 @@ "YouCanUpgradeAutomaticallyOrDownloadPackage": "Μπορείτε να αναβαθμίσετε στην έκδοση %s αυτόματα ή λάβετε το πακέτο και εγκαταστήστε τη χειροκίνητα:", "YouMustDownloadPackageOrFixPermissions": "Το Piwik δεν μπορεί να αντικαταστήσει την υπάρχουσα εγκατάσταση. Μπορείτε να διορθώσετε τα δικαιώματα πρόσβασης των φακέλων\/αρχείων ή κατεβάστε το πακέτο και εγκαταστήστε την έκδοση %s χειροκίνητα.", "YourDatabaseIsOutOfDate": "Η βάση δεδομένων του Piwik είναι παλιά και πρέπει να αναβαθμιστεί προτού συνεχίσετε.", - "ViewVersionChangelog": "Δείτε τις αλλαγές για αυτή την έκδοση:" + "ViewVersionChangelog": "Δείτε τις αλλαγές για αυτή την έκδοση:", + "ReceiveEmailBecauseIsSuperUser": "Λαμβάνετε το e-mail επειδή είστε Υπερ-Χρήστης του Piwik στο: %s" } }
\ No newline at end of file diff --git a/plugins/CoreUpdater/lang/en.json b/plugins/CoreUpdater/lang/en.json index cd517e0d31..16d2d91aed 100644 --- a/plugins/CoreUpdater/lang/en.json +++ b/plugins/CoreUpdater/lang/en.json @@ -77,6 +77,7 @@ "YouCanUpgradeAutomaticallyOrDownloadPackage": "You can update to version %s automatically or download the package and install it manually:", "YouMustDownloadPackageOrFixPermissions": "Piwik is unable to overwrite your current installation. You can either fix the directory\/file permissions, or download the package and install version %s manually:", "YourDatabaseIsOutOfDate": "Your Piwik database is out-of-date, and must be upgraded before you can continue.", - "ViewVersionChangelog": "View the changelog for this version:" + "ViewVersionChangelog": "View the changelog for this version:", + "ReceiveEmailBecauseIsSuperUser": "You receive this email because you are a Super User on the Piwik at: %s" } }
\ No newline at end of file diff --git a/plugins/CoreUpdater/lang/fr.json b/plugins/CoreUpdater/lang/fr.json index ac9cf688cb..8adec2ba2f 100644 --- a/plugins/CoreUpdater/lang/fr.json +++ b/plugins/CoreUpdater/lang/fr.json @@ -77,6 +77,7 @@ "YouCanUpgradeAutomaticallyOrDownloadPackage": "Vous pouvez mettre à jour vers la version %s automatiquement ou télécharger l'archive et l'installer manuellement :", "YouMustDownloadPackageOrFixPermissions": "Piwik ne peut pas écraser votre installation courante. Vous pouvez soit corriger les permissions du répertoire\/fichier, soit télécharger le package et installer la version %s manuellement:", "YourDatabaseIsOutOfDate": "Votre base de données est expirée et doit être mise à jour avant de pouvoir continuer.", - "ViewVersionChangelog": "Voir les changements pour cette version :" + "ViewVersionChangelog": "Voir les changements pour cette version :", + "ReceiveEmailBecauseIsSuperUser": "Vous recevez ce courriel car vous êtes un super utilisateur de l'installation Piwik à l'adresse: %s" } }
\ No newline at end of file diff --git a/plugins/CoreUpdater/lang/sq.json b/plugins/CoreUpdater/lang/sq.json index 2783cc9115..715382f57a 100644 --- a/plugins/CoreUpdater/lang/sq.json +++ b/plugins/CoreUpdater/lang/sq.json @@ -77,6 +77,7 @@ "YouCanUpgradeAutomaticallyOrDownloadPackage": "Mund ta përmirësoni automatikisht me versionin %s, ose të shkarkoni paketën dhe ta instaloni atë dorazi:", "YouMustDownloadPackageOrFixPermissions": "Piwik-u s’është në gjendje të mbishkruajë instalimin tuaj të tanishëm. Mundeni ose të ndreqni lejet mbi drejtorira\/kartela, ose të shkarkoni paketën dhe instaloni versionin %s dorazi:", "YourDatabaseIsOutOfDate": "Baza juaj e të dhënave për Piwik-un është e vjetruar, dhe duhet përmirësuar përpara se të mund të vazhdoni.", - "ViewVersionChangelog": "Shihni regjistër ndryshimesh për këtë version:" + "ViewVersionChangelog": "Shihni regjistër ndryshimesh për këtë version:", + "ReceiveEmailBecauseIsSuperUser": "E morët këtë email ngaqë jeni një Superpërdorues Piwik-u te: %s" } }
\ No newline at end of file diff --git a/plugins/CoreUpdater/lang/zh-tw.json b/plugins/CoreUpdater/lang/zh-tw.json index e4aa286fd4..5c2599d25d 100644 --- a/plugins/CoreUpdater/lang/zh-tw.json +++ b/plugins/CoreUpdater/lang/zh-tw.json @@ -77,6 +77,7 @@ "YouCanUpgradeAutomaticallyOrDownloadPackage": "你可以自動更新至版本 %s ，或是下載壓縮檔並手動安裝它：", "YouMustDownloadPackageOrFixPermissions": "Piwik 無法覆寫你當前的安裝。你可以修改資料夾\/檔案權限，或是下載安裝包然後手動安裝版本 %s：", "YourDatabaseIsOutOfDate": "你的 Piwik 資料庫已經過期了，所以在繼續前必須先升級。", - "ViewVersionChangelog": "查看此版本的更新紀錄：" + "ViewVersionChangelog": "查看此版本的更新紀錄：", + "ReceiveEmailBecauseIsSuperUser": "你會收到這封信件是因為你在 %s 的 Piwik 上是超級使用者。" } }
\ No newline at end of file diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig index e49d4bdd3e..4114ff463a 100644 --- a/plugins/CoreUpdater/templates/layout.twig +++ b/plugins/CoreUpdater/templates/layout.twig @@ -17,10 +17,15 @@ </head> <body id="simple" ng-app="app"> + <div class="logo"> - <img title="Piwik" alt="Piwik" src="{{ logoHeader }}"/> - <br/> - {{ 'General_OpenSourceWebAnalytics'|translate }} + {% if hasSVGLogo %} + <img src='{{ logoSVG }}' tabindex="3" + alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" + class="{% if not isCustomLogo %}default-piwik-logo{% endif %}" /> + {% else %} + <img src='{{ logoHeader }}' alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik" /> + {% endif %} </div> <div class="box"> diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js index 13c91a568c..984f8b4484 100644 --- a/plugins/CoreVisualizations/javascripts/jqplot.js +++ b/plugins/CoreVisualizations/javascripts/jqplot.js @@ -407,9 +407,10 @@ /** Export the chart as an image */ exportAsImage: function (container, lang) { + var pixelRatio = window.devicePixelRatio || 1; var exportCanvas = document.createElement('canvas'); - exportCanvas.width = container.width(); - exportCanvas.height = container.height(); + exportCanvas.width = Math.round(container.width() * pixelRatio); + exportCanvas.height = Math.round(container.height() * pixelRatio); if (!exportCanvas.getContext) { alert("Sorry, not supported in your browser. Please upgrade your browser :)"); @@ -428,7 +429,7 @@ position.left += addPosition.left; position.top += addPosition.top + parseInt(parent.css('marginTop'), 10); } - exportCtx.drawImage(canvas[0], Math.round(position.left), Math.round(position.top)); + exportCtx.drawImage(canvas[0], Math.round(position.left * pixelRatio), Math.round(position.top * pixelRatio)); } var exported = exportCanvas.toDataURL("image/png"); @@ -437,8 +438,8 @@ img.src = exported; img = $(img).css({ - width: exportCanvas.width + 'px', - height: exportCanvas.height + 'px' + width: Math.round(exportCanvas.width / pixelRatio) + 'px', + height: Math.round(exportCanvas.height / pixelRatio) + 'px' }); var popover = $(document.createElement('div')); diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 6c39cfbb2189178aa10705e1a4fb5dd3212729c +Subproject ebc37665207419a365d74d7d595b038715de20b diff --git a/plugins/CustomPiwikJs/lang/el.json b/plugins/CustomPiwikJs/lang/el.json index 7a3c1c1aaa..8e1eee2ce5 100644 --- a/plugins/CustomPiwikJs/lang/el.json +++ b/plugins/CustomPiwikJs/lang/el.json @@ -1,5 +1,6 @@ { "CustomPiwikJs": { + "PluginDescription": "Δίνει τη δυνατότητα σε κάθε πρόσθετο να επεκτείνει το αρχείο παρακολούθησης JavaScript (piwik.js) και παρέχει νέα λειτουργικότητα και δυνατότητες μετρήσεων στον ιστοτόπο.", "DiagnosticPiwikJsWritable": "Αρχείο παρακολούθησης JavaScript (\"\/piwik.js\")", "DiagnosticPiwikJsNotWritable": "Το αρχείο παρακολούθησης JavaScript \"\/piwik.js\" δεν είναι εγγράψιμο που σημαίνει ότι άλλα πρόσθετα δεν μπορούν να επεκτείνουν την κλάση παρακολούθησης. Στο μέλλον ορισμένα χαρακτηριστικά του πυρήνα δε θα δουλεύουν όπως πρέπει.", "DiagnosticPiwikJsMakeWritable": "Προτείνεται να κάνετε το αρχείο Piwik.js εγγράψιμο εκτελώντας αυτή την εντολή: %s" diff --git a/plugins/CustomPiwikJs/lang/fr.json b/plugins/CustomPiwikJs/lang/fr.json index 84853489f6..5d473f96a9 100644 --- a/plugins/CustomPiwikJs/lang/fr.json +++ b/plugins/CustomPiwikJs/lang/fr.json @@ -1,5 +1,6 @@ { "CustomPiwikJs": { + "PluginDescription": "Autorise n'importe quel composant à mettre à jour le fichier de suivit Piwik (Piwik.js) et à ajouter de nouvelles fonctionnalités ainsi que des capacités de suivit de site web.", "DiagnosticPiwikJsWritable": "Traceur JavaScript inscriptible (\"\/piwik.js\")", "DiagnosticPiwikJsNotWritable": "Le fichier du traceur JavaScript Piwik \"\/piwik.js\" ne peut pas être modifié ce qui signifie que les autres composants ne peuvent pas l'enrichir. A l'avenir même certaines fonctionnalités natives pourraient ne pas fonctionner comme prévu.", "DiagnosticPiwikJsMakeWritable": "Nous vous recommandons de permettre l'écriture de Piwik.js en exécutant la commande suivante : %s" diff --git a/plugins/CustomPiwikJs/lang/sq.json b/plugins/CustomPiwikJs/lang/sq.json index 018fd9dd7a..ecbaac3c89 100644 --- a/plugins/CustomPiwikJs/lang/sq.json +++ b/plugins/CustomPiwikJs/lang/sq.json @@ -1,5 +1,6 @@ { "CustomPiwikJs": { + "PluginDescription": "I lejon cilësdo shtojcë të zgjerojë kartelën Piwik JavaScript Tracking (piwik.js) dhe të shtojë aftësi të reja funksionimi dhe matjesh në sajt.", "DiagnosticPiwikJsWritable": "Ndjekës JavaScript i Shkrueshëm (\"\/piwik.js\")", "DiagnosticPiwikJsNotWritable": "Kartela e ndjekësit JavaScript të Piwik-ut, \"\/piwik.js\" s’është e shkrueshme, çka do të thotë se shtojcat e tjera s’mund ta zgjerojnë ndjekësin JavaScript. Në të ardhmen mund të mos punojnë siç pritet madje edhe disa veçori bazë.", "DiagnosticPiwikJsMakeWritable": "Këshillojmë bërjen e Piwik.js të shkrueshme, duke xhiruar urdhrin: %s" diff --git a/plugins/CustomPiwikJs/lang/zh-tw.json b/plugins/CustomPiwikJs/lang/zh-tw.json index 8771e2974e..ae73130274 100644 --- a/plugins/CustomPiwikJs/lang/zh-tw.json +++ b/plugins/CustomPiwikJs/lang/zh-tw.json @@ -1,5 +1,6 @@ { "CustomPiwikJs": { + "PluginDescription": "允許任何外掛擴展 Piwik JavaScript 追蹤檔案（piwik.js）來增加新功能和網站衡量能力。", "DiagnosticPiwikJsWritable": "可寫的 JavaScript 追蹤（\/piwik.js）", "DiagnosticPiwikJsNotWritable": "Piwik 的 JavaScript 追蹤檔案「\/piwik.js」不可寫入，這代表其他外掛無法擴展 JavaScript 追蹤。未來甚至有些核心功能會無法正常運作。", "DiagnosticPiwikJsMakeWritable": "我們推薦讓 Piwik.js 可寫入，請執行此指令：%s" diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index aee0c3d3da..4a884ae177 100644 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml @@ -117,7 +117,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 /> diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php index ea63485017..9f268f85a0 100644 --- a/plugins/DevicesDetection/Archiver.php +++ b/plugins/DevicesDetection/Archiver.php @@ -87,8 +87,7 @@ class Archiver extends \Piwik\Plugin\Archiver } while ($conversionRow = $query->fetch()) { - - $metrics->sumMetricsGoals($conversionRow[$labelSQL], $conversionRow); + $metrics->sumMetricsGoals(isset($conversionRow[$labelSQL]) ? $conversionRow[$labelSQL] : null, $conversionRow); } $metrics->enrichMetricsWithConversions(); } diff --git a/plugins/Goals/stylesheets/goals.css b/plugins/Goals/stylesheets/goals.css index 220f57e3d2..7fbb35d2b0 100644 --- a/plugins/Goals/stylesheets/goals.css +++ b/plugins/Goals/stylesheets/goals.css @@ -32,6 +32,11 @@ ul.ulGoalTopElements li { list-style-type: circle; } +ul.ulGoalTopElements img { + border: 1px solid lightgray; + box-sizing: content-box; +} + .ulGoalTopElements a { text-decoration: none; color: #0033CC; diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php index b596fe6d37..e9f15d0b04 100644 --- a/plugins/ImageGraph/API.php +++ b/plugins/ImageGraph/API.php @@ -263,7 +263,7 @@ class API extends \Piwik\Plugin\API case StaticGraph::GRAPH_TYPE_BASIC_PIE: if (count($ordinateColumns) > 1) { - // pChart doesn't support multiple series on pie charts + // CpChart doesn't support multiple series on pie charts throw new Exception("Pie charts do not currently support multiple series"); } diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php index 3cd7b738ee..1f74457e7d 100644 --- a/plugins/ImageGraph/StaticGraph.php +++ b/plugins/ImageGraph/StaticGraph.php @@ -9,17 +9,13 @@ namespace Piwik\Plugins\ImageGraph; -use pData; -use pImage; +use CpChart\Chart\Data; +use CpChart\Chart\Image; use Piwik\Container\StaticContainer; use Piwik\NumberFormatter; use Piwik\Piwik; use Piwik\BaseFactory; -require_once PIWIK_INCLUDE_PATH . "/libs/pChart/class/pDraw.class.php"; -require_once PIWIK_INCLUDE_PATH . "/libs/pChart/class/pImage.class.php"; -require_once PIWIK_INCLUDE_PATH . "/libs/pChart/class/pData.class.php"; - /** * The StaticGraph abstract class is used as a base class for different types of static graphs. * @@ -45,11 +41,11 @@ abstract class StaticGraph extends BaseFactory private $aliasedGraph; /** - * @var pImage + * @var Image */ protected $pImage; /** - * @var pData + * @var Data */ protected $pData; protected $ordinateLabels; @@ -102,7 +98,7 @@ abstract class StaticGraph extends BaseFactory public function sendToDisk($filename) { $filePath = self::getOutputPath($filename); - $this->pImage->Render($filePath); + $this->pImage->render($filePath); return $filePath; } @@ -238,7 +234,7 @@ abstract class StaticGraph extends BaseFactory protected function initpData() { - $this->pData = new pData(); + $this->pData = new Data(); foreach ($this->ordinateSeries as $column => $data) { $this->pData->addPoints($data, $column); @@ -257,7 +253,7 @@ abstract class StaticGraph extends BaseFactory protected function initpImage() { - $this->pImage = new pImage($this->width, $this->height, $this->pData); + $this->pImage = new Image($this->width, $this->height, $this->pData); $this->pImage->Antialias = $this->aliasedGraph; $this->pImage->setFontProperties( @@ -347,7 +343,7 @@ abstract class StaticGraph extends BaseFactory /** * Global format method * - * required to format y axis values using pcharts internal format callbacks + * required to format y axis values using CpChart internal format callbacks * @param $value * @return mixed */ diff --git a/plugins/ImageGraph/StaticGraph/Exception.php b/plugins/ImageGraph/StaticGraph/Exception.php index eca980e3b2..dd10193365 100644 --- a/plugins/ImageGraph/StaticGraph/Exception.php +++ b/plugins/ImageGraph/StaticGraph/Exception.php @@ -8,7 +8,7 @@ */ namespace Piwik\Plugins\ImageGraph\StaticGraph; -use pData; +use CpChart\Chart\Data; use Piwik\Plugins\ImageGraph\StaticGraph; /** @@ -51,7 +51,7 @@ class Exception extends StaticGraph public function renderGraph() { - $this->pData = new pData(); + $this->pData = new Data(); $message = $this->exception->getMessage(); list($textWidth, $textHeight) = $this->getTextWidthHeight($message); diff --git a/plugins/ImageGraph/StaticGraph/PieGraph.php b/plugins/ImageGraph/StaticGraph/PieGraph.php index d3e88b52f4..a43a6ff631 100644 --- a/plugins/ImageGraph/StaticGraph/PieGraph.php +++ b/plugins/ImageGraph/StaticGraph/PieGraph.php @@ -9,10 +9,8 @@ namespace Piwik\Plugins\ImageGraph\StaticGraph; +use CpChart\Chart\Pie; use Piwik\Plugins\ImageGraph\StaticGraph; -use pPie; - -require_once PIWIK_INCLUDE_PATH . "/libs/pChart/class/pPie.class.php"; /** * @@ -26,7 +24,7 @@ abstract class PieGraph extends StaticGraph const SLICE_COLOR_KEY = "SLICE_COLOR"; /** - * @var pPie + * @var Pie */ protected $pieChart; protected $xPosition; @@ -57,7 +55,7 @@ abstract class PieGraph extends StaticGraph $radius = ($this->height / 2) - self::RADIUS_MARGIN; } - $this->pieChart = new pPie($this->pImage, $this->pData); + $this->pieChart = new Pie($this->pImage, $this->pData); $numberOfSlices = count($this->abscissaSeries); $numberOfAvailableColors = count($this->colors); @@ -89,7 +87,7 @@ abstract class PieGraph extends StaticGraph * it uses a threshold to determine if an abscissa value should be drawn on the PIE * discarded abscissa values are summed in the 'other' abscissa value * - * if this process is not perform, pChart will draw pie slices that are too small to see + * if this process is not perform, CpChart will draw pie slices that are too small to see */ private function truncateSmallValues() { diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 5fa34da734..47b33fe9d4 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -376,6 +376,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin $viewTrackingHelp->jsTag = $javascriptGenerator->generate($idSite, Url::getCurrentUrlWithoutFileName()); $viewTrackingHelp->idSite = $idSite; $viewTrackingHelp->piwikUrl = Url::getCurrentUrlWithoutFileName(); + $viewTrackingHelp->isInstall = true; $view->trackingHelp = $viewTrackingHelp->render(); $view->displaySiteName = $siteName; diff --git a/plugins/Installation/lang/el.json b/plugins/Installation/lang/el.json index ddc14ca4ff..ff1d3e93d0 100644 --- a/plugins/Installation/lang/el.json +++ b/plugins/Installation/lang/el.json @@ -84,6 +84,7 @@ "SystemCheckGlobHelp": "Η εσωτερική συνάρτηση έχει απενεργοποιηθεί στον διακομιστή σας. Το Piwik θα προσπαθήσει να εξομοιώσει τη συνάρτηση αλλά ίσως να υπάρχουν επιπλέον περιορισμοί ασφαλείας. Η λειτουργικότητα μπορεί να επηρεαστεί.", "SystemCheckGzcompressHelp": "Πρέπει να ενεργοποιήσετε την επέκταση zlib και την συνάρτηση gzcompress.", "SystemCheckGzuncompressHelp": "Πρέπει να ενεργοποιήσετε την επέκταση zlib και την συνάρτηση gzuncompress.", + "SystemCheckHashHelp": "Θα πρέπει να παραμετροποιήσετε και να μεταγλωττίσετε πάλι την PHP με ενεργοποιημένη την υποστήριξη hash() παραλείποντας την επιλογή --disable-hash.", "SystemCheckIconvHelp": "Πρέπει να ρυθμίσετε και ξαναεγκαταστήσετε την PHP με ενεργοποιημένη την υποστήριξη «iconv», --with-iconv.", "SystemCheckJsonHelp": "Η επέκταση php5-json απαιτείται προκειμένου το Piwik να διαβάζει και γράφει δεδομένα σε μορφή JSON.", "SystemCheckMailHelp": "Τα μηνύματα με τις παρατηρήσεις σας και για τους Ξεχασμένους Κωδικούς δεν θα στέλνονται αν δεν είναι ενεργοποιημένη η συνάρτηση mail().", diff --git a/plugins/Installation/lang/fr.json b/plugins/Installation/lang/fr.json index 061b843ed6..43cd1b81d8 100644 --- a/plugins/Installation/lang/fr.json +++ b/plugins/Installation/lang/fr.json @@ -84,6 +84,7 @@ "SystemCheckGlobHelp": "Cette fonction native a été désactivée sur votre hôte. Piwik va tenter de l'émuler mais il pourra rencontrer des restrictions de sécurité. Les fonctionnalités pourront en être impactées.", "SystemCheckGzcompressHelp": "Vous devez activer l'extension zlib et la fonction gzcompress", "SystemCheckGzuncompressHelp": "Vous devez activer l'extension zlib et la fonction gzuncompress", + "SystemCheckHashHelp": "Vous devez reconfigurer et re-compiler PHP en avec le support de hash() activé en enlevant l'option --disable-hash.", "SystemCheckIconvHelp": "Vous devez configurer PHP et le recompiler avec le support \"iconv\" activé, --with-iconv.", "SystemCheckJsonHelp": "L'extension php5-json est nécéssaire pour lire et écrire des données au format JSON.", "SystemCheckMailHelp": "Les Feedback (commentaires) et mots de passe perdus ne pourront être envoyés sans la fonciton mail().", diff --git a/plugins/Installation/lang/sq.json b/plugins/Installation/lang/sq.json index 8a6eaae077..ba5e166ded 100644 --- a/plugins/Installation/lang/sq.json +++ b/plugins/Installation/lang/sq.json @@ -84,6 +84,7 @@ "SystemCheckGlobHelp": "Ky funksion i trupëzuar është i çaktivizuar te streha juaj. Piwik-u do të përpiqet ta emulojë këtë funksion por mund të hasë kufizime të mëtejshme sigurie. Kjo mund të ketë ndikim te funksionimi.", "SystemCheckGzcompressHelp": "Lypset të aktivizoni zgjerimin zlib dhe funksionin gzcompress.", "SystemCheckGzuncompressHelp": "Lypset të aktivizoni zgjerimin zlib dhe funksionin gzuncompress.", + "SystemCheckHashHelp": "Lypset të formësoni dhe rikrijoni PHP-në me mbulim të hash() të aktivizuar duke përjashtuar mundësinë --disable-hash.", "SystemCheckIconvHelp": "Lypset të formësoni dhe rindërtoni PHP-në me aktivizim të mbulimit të \"iconv\", --with-iconv.", "SystemCheckJsonHelp": "Zgjerimi php5-json është i domosdoshëm që Piwik-u të lexojë dhe shkruajë të dhëna JSON.", "SystemCheckMailHelp": "Mesazhet mbi Përshtypjet dhe Fjalëkalim të Humbur nuk kanë për t’u dërguar pa mail().", diff --git a/plugins/Installation/lang/zh-tw.json b/plugins/Installation/lang/zh-tw.json index bfd4089358..952c4cf2c4 100644 --- a/plugins/Installation/lang/zh-tw.json +++ b/plugins/Installation/lang/zh-tw.json @@ -84,6 +84,7 @@ "SystemCheckGlobHelp": "這個內建的功能已被你的主機商停用。Piwik 將嘗試模擬這個功能，但可能會遇到安全限制。功能可能受到影響。", "SystemCheckGzcompressHelp": "你必須啟用 zlib 擴充功能和 gzcompress 功能。", "SystemCheckGzuncompressHelp": "你必須啟用 zlib 擴充功能和 gzuncompress 功能。", + "SystemCheckHashHelp": "你必須配置並重建 PHP 經由執行 --disable-hash 選項來啟用 hash() 支援。", "SystemCheckIconvHelp": "你需要設定及重建 PHP，然後啟用 iconv 支援，--with-iconv。", "SystemCheckJsonHelp": "Piwik 要讀寫 JSON 檔案必須使用 php5-json 擴充功能。", "SystemCheckMailHelp": "意見回饋及忘記密碼的訊息若沒有 mail() 將無法寄送。", diff --git a/plugins/Live/javascripts/visitorLog.js b/plugins/Live/javascripts/visitorLog.js index 07cdd313f2..74393f7ff7 100644 --- a/plugins/Live/javascripts/visitorLog.js +++ b/plugins/Live/javascripts/visitorLog.js @@ -77,7 +77,7 @@ var prevelement; var prevhtml; var counter = 0; - $(this).find("li").each(function () { + $(this).find("> li").each(function () { counter++; $(this).val(counter); var current = $(this).html(); diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less index c471009e50..309b93cecc 100644 --- a/plugins/Live/stylesheets/live.less +++ b/plugins/Live/stylesheets/live.less @@ -297,6 +297,11 @@ a.visitor-log-visitor-profile-link { height: 16px; } +.visitorLogIconWithDetails.flag>img { + border: 1px solid lightgray; + box-sizing: content-box; +} + .visitorLogIcons>span.visitorRank>img { margin: auto 0; } diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less index 79ab10222c..5622e42f1a 100644 --- a/plugins/Live/stylesheets/visitor_profile.less +++ b/plugins/Live/stylesheets/visitor_profile.less @@ -279,6 +279,10 @@ margin-right: 1em; } } +.visitor-profile-location img { + border: 1px solid lightgray; + box-sizing: content-box; +} .visitor-profile-important-visits { diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index 99fd4488e5..5281f9974f 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -158,9 +158,9 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit </span> {% endif %} {% if visitor.getColumn('countryFlag') %} - <span class="visitorLogIconWithDetails"> + <span class="visitorLogIconWithDetails flag"> - <img src="{{ visitor.getColumn('countryFlag') }}"/> + <img height="16px" src="{{ visitor.getColumn('countryFlag') }}"/> {% if visitor.getColumn('city') %}{{ visitor.getColumn('city')|rawSafeDecoded }}{% endif -%} {%- if visitor.getColumn('region') %}{% if visitor.getColumn('city') %}, {% endif %}{{ visitor.getColumn('region')|rawSafeDecoded }}{% endif %} diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index ac1ce17e06..4e44f75427 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -19,7 +19,7 @@ {% endif %} <br /> - {% if visitor.countryFlag is defined %} <img src="{{ visitor.countryFlag }}" title="{{ visitor.location|e('html_attr') }}, {{ 'Provider_ColumnProvider'|translate }} {% if visitor.providerName is defined %}{{ visitor.providerName }}{% endif %}"/>{% endif %} + {% if visitor.countryFlag is defined %} <img height="16px" src="{{ visitor.countryFlag }}" title="{{ visitor.location|e('html_attr') }}, {{ 'Provider_ColumnProvider'|translate }} {% if visitor.providerName is defined %}{{ visitor.providerName }}{% endif %}"/>{% endif %} {% if visitor.browserIcon is defined %} <img width="16px" height="16px" src="{{ visitor.browserIcon }}" title="{{ visitor.browser|e('html_attr') }}{% if visitor.plugins is defined %}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}{% endif %}"/>{% endif %} {% if visitor.operatingSystemIcon is defined %} <img width="16px" height="16px" src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}{% if visitor.resolution is defined %}, {{ visitor.resolution }}{% endif %}"/>{% endif %} diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index 673fc82b8b..c0b3141892 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -138,7 +138,7 @@ {{ entry.prettyName }} {%- endif -%} - <img src="{{ entry.flag }}" title="{{ entry.prettyName }}"/> + <img height="16px" src="{{ entry.flag }}" title="{{ entry.prettyName }}"/> {%- endset %} {{- 'General_XFromY'|translate(entryVisits, entryCountry)|raw -}}{% if not loop.last %}, {% endif %} @@ -169,4 +169,4 @@ <script type="text/javascript"> $(function() { require('piwik/UI').VisitorProfileControl.initElements(); }); </script> -{% endif %} +{% endif %}
\ No newline at end of file diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml index ebb9d33283..6d2f99e5d5 100644 --- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml @@ -31,13 +31,13 @@ <row> <country>fr</country> <nb_visits>1</nb_visits> - <flag>plugins/UserCountry/images/flags/fr.png</flag> + <flag>plugins/Morpheus/icons/dist/flags/fr.png</flag> <prettyName>France</prettyName> </row> <row> <country>xx</country> <nb_visits>30</nb_visits> - <flag>plugins/UserCountry/images/flags/xx.png</flag> + <flag>plugins/Morpheus/icons/dist/flags/xx.png</flag> <prettyName>Unknown</prettyName> </row> </countries> @@ -130,7 +130,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -238,7 +238,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -346,7 +346,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -454,7 +454,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -562,7 +562,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -670,7 +670,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -778,7 +778,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -886,7 +886,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -994,7 +994,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1102,7 +1102,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml index 816f5a2df7..1e3914be4c 100644 --- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml @@ -31,13 +31,13 @@ <row> <country>fr</country> <nb_visits>1</nb_visits> - <flag>plugins/UserCountry/images/flags/fr.png</flag> + <flag>plugins/Morpheus/icons/dist/flags/fr.png</flag> <prettyName>France</prettyName> </row> <row> <country>xx</country> <nb_visits>30</nb_visits> - <flag>plugins/UserCountry/images/flags/xx.png</flag> + <flag>plugins/Morpheus/icons/dist/flags/xx.png</flag> <prettyName>Unknown</prettyName> </row> </countries> @@ -130,7 +130,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -238,7 +238,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -346,7 +346,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -454,7 +454,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -562,7 +562,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -670,7 +670,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -778,7 +778,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -886,7 +886,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -994,7 +994,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1102,7 +1102,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1210,7 +1210,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1318,7 +1318,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1426,7 +1426,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1534,7 +1534,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1642,7 +1642,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1750,7 +1750,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1858,7 +1858,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -1966,7 +1966,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -2074,7 +2074,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -2182,7 +2182,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> + <countryFlag>plugins/Morpheus/icons/dist/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/plugins/Marketplace/lang/el.json b/plugins/Marketplace/lang/el.json index affd65e572..e47634c476 100644 --- a/plugins/Marketplace/lang/el.json +++ b/plugins/Marketplace/lang/el.json @@ -103,6 +103,7 @@ "Updated": "Ενημερώθηκε", "UpdatingPlugin": "Γίνεται ενημέρωση του %1$s", "UploadZipFile": "Ανέβασμα του αρχείου ZIP", + "PluginUploadDisabled": "Η υποβολή πρόσθετου είναι απενεργοποιημένη στο αρχείο ρυθμίσεων. Προκειμένου να ενεργοποιήσετε το χαρακτηριστικό αυτό τροποποιήστε τις ρυθμίσεις σας ή επικοινωνήστε με τον διαχειριστή σας", "LicenseKeyExpiresSoon": "Η άδειά σας λήγει σύντομα, επικοινωνήστε με %1$s.", "LicenseKeyIsExpired": "Η άδειά σας έληξε, επικοινωνήστε με %1$s.", "MultiServerEnvironmentWarning": "Δεν μπορείτε να εγκαταστήσετε το πρόσθετο κατευθείαν, καθώς χρησιμοποιείτε το Piwik σε πολλαπλούς διακομιστές. Το πρόσθετο εγκαθίσταται σε ένα μόνο διακομιστή. Εναλλακτικά κατεβάστε το και εγκαταστήστε το χειροκίνητα σε όλους τους διακομιστές σας.", diff --git a/plugins/Marketplace/lang/fr.json b/plugins/Marketplace/lang/fr.json index a4bc8cf24e..3d467b9308 100644 --- a/plugins/Marketplace/lang/fr.json +++ b/plugins/Marketplace/lang/fr.json @@ -103,6 +103,7 @@ "Updated": "Mis à jour", "UpdatingPlugin": "Mise à jour de %1$s", "UploadZipFile": "Télécharger fichier ZIP", + "PluginUploadDisabled": "Le téléversement de composant est désactivé dans le fichier de configuration. Afin d'activer cette fonctionnalité, veuillez mettre à jour votre configuration ou contacter votre administrateur.", "LicenseKeyExpiresSoon": "Votre clef de licence expire bientôt, veuillez contacter %1$s.", "LicenseKeyIsExpired": "Votre clef de licence est expirée, veuillez contacter %1$s.", "MultiServerEnvironmentWarning": "Vous ne pouvez pas installer ou mettre à jour le composant directement car vous utilisez Piwik sur plusieurs serveurs. Ce composant serait installé sur un seul serveur. A la place téléchargez et déployez le composant manuellement sur tous les serveurs.", diff --git a/plugins/Marketplace/lang/sq.json b/plugins/Marketplace/lang/sq.json index cb1efb6021..61921f8a08 100644 --- a/plugins/Marketplace/lang/sq.json +++ b/plugins/Marketplace/lang/sq.json @@ -103,6 +103,7 @@ "Updated": "U përditësua", "UpdatingPlugin": "Po përditësohet %1$s", "UploadZipFile": "Ngarkoni kartelë ZIP", + "PluginUploadDisabled": "Ngarkimi i shtojcës është i çaktivizuar te kartela e formësimit. Që të mund të aktivizoni këtë veçori, ju lutemi, përditësoni formësimin tuaj ose lidhuni me përgjegjësin tuaj", "LicenseKeyExpiresSoon": "Kyçi juaj i licencës skadon së shpejti, ju lutemi, lidhuni me %1$s.", "LicenseKeyIsExpired": "Kyçi juaj i licencës ka skaduar, Ju lutemi, lidhuni me %1$s.", "MultiServerEnvironmentWarning": "S’mundeni ta instaloni apo përditësoni shtojcën drejtpërsëdrejti, ngaqë po përdorni Piwik-un në disa shërbyes. Shtojca do të duhej të instalohej vetëm në një shërbyes. Në vend të kësaj, shkarkojeni shtojcën dhe instalojeni dorazi te krejt shërbyesit tuaj.", diff --git a/plugins/Marketplace/lang/zh-tw.json b/plugins/Marketplace/lang/zh-tw.json index 9da6bfda08..e77a9bf605 100644 --- a/plugins/Marketplace/lang/zh-tw.json +++ b/plugins/Marketplace/lang/zh-tw.json @@ -103,6 +103,7 @@ "Updated": "已更新", "UpdatingPlugin": "更新 %1$s 中", "UploadZipFile": "上傳 ZIP 檔案", + "PluginUploadDisabled": "外掛上傳已在設定檔案中停用。要啟用這項功能請更新你的配置或聯絡你的管理員。", "LicenseKeyExpiresSoon": "你的註冊碼即將過期，請聯絡 %1$s。", "LicenseKeyIsExpired": "你的註冊碼已過期，請聯絡 %1$s。", "MultiServerEnvironmentWarning": "你在多伺服器中使用 Piwik，因此無法直接安裝或更新外掛。外掛只能在單一伺服器中安裝。請手動下載外掛並部屬到所有伺服器中。", diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons -Subproject 73ceb86e07fa0d963a791aac8337736901a9f54 +Subproject 10891baaf590cc0026bb7caefc2edf597d79a7e diff --git a/plugins/Morpheus/stylesheets/simple_structure.css b/plugins/Morpheus/stylesheets/simple_structure.css index b55fed8ab7..4e204a4218 100644 --- a/plugins/Morpheus/stylesheets/simple_structure.css +++ b/plugins/Morpheus/stylesheets/simple_structure.css @@ -4,12 +4,14 @@ body { } body#simple { background: #fff; + margin: 0; } #simple .logo { color: #888; text-align: center; font-size: 12px; - margin-top: 30px; + background-color: #37474f !important; + padding: 15px 0; } #simple .logo a { color: #888; diff --git a/plugins/Morpheus/stylesheets/ui/_popups.less b/plugins/Morpheus/stylesheets/ui/_popups.less index 4ffa175a59..0e328f37a7 100644 --- a/plugins/Morpheus/stylesheets/ui/_popups.less +++ b/plugins/Morpheus/stylesheets/ui/_popups.less @@ -2,7 +2,6 @@ color: @theme-color-text; font-weight: normal; img { - width: 16px; height: 16px; } } diff --git a/plugins/Morpheus/templates/simpleLayoutHeader.tpl b/plugins/Morpheus/templates/simpleLayoutHeader.tpl index 8c8ac2a5ff..28db4dd27e 100644 --- a/plugins/Morpheus/templates/simpleLayoutHeader.tpl +++ b/plugins/Morpheus/templates/simpleLayoutHeader.tpl @@ -11,8 +11,6 @@ <div class="logo"> <img title="Piwik" alt="Piwik" src="%logoUrl%"/> - <br/> - <a href='http://piwik.org/'>free/libre analytics platform</a> </div> <div class="box"> diff --git a/plugins/Referrers/Reports/GetReferrerType.php b/plugins/Referrers/Reports/GetReferrerType.php index 16a11d295b..dea44ccb5a 100644 --- a/plugins/Referrers/Reports/GetReferrerType.php +++ b/plugins/Referrers/Reports/GetReferrerType.php @@ -37,6 +37,7 @@ class GetReferrerType extends Base $this->hasGoalMetrics = true; $this->order = 1; $this->subcategoryId = 'Referrers_WidgetGetAll'; + $this->supportsFlatten = false; } public function getDefaultTypeViewDataTable() diff --git a/plugins/SitesManager/lang/cs.json b/plugins/SitesManager/lang/cs.json index a5d61bfdbf..49aa48194f 100644 --- a/plugins/SitesManager/lang/cs.json +++ b/plugins/SitesManager/lang/cs.json @@ -69,9 +69,7 @@ "SiteSearchUse": "Piwik můžete použít ke sledování a hlášení toho, co návštěvníci hledají pomocí interního vyhledávače.", "SiteWithoutDataTitle": "Zatím nebyla zaznamenána žádná data", "SiteWithoutDataDescription": "Pro tuto stránku nebyla zatím zaznamenána žádná analytická data.", - "SiteWithoutDataSetupTracking": "Nastavte prosím %1$sJavaScript sledovací kód%2$s na svém webu, pokud jste tak již neučinili.", "SiteWithoutDataMessageDisappears": "Tato zpráva zmizí jakmile dojde k nahrání nějakých dat pro tento web.", - "SiteWithoutDataSetupGoals": "Mezitím byste možná chtěli %1$snastavit nějaké cíle%2$s.", "SuperUserAccessCan": "Uživatel se super-uživatelským přístupem může také %1$sspecifikovat globální nastavení%2$s pro nové weby.", "Timezone": "Časová zóna", "TrackingSiteSearch": "Sledování interního vyhledávání na stránkách", diff --git a/plugins/SitesManager/lang/de.json b/plugins/SitesManager/lang/de.json index 86de40f710..2cf854456e 100644 --- a/plugins/SitesManager/lang/de.json +++ b/plugins/SitesManager/lang/de.json @@ -44,8 +44,10 @@ "ListOfIpsToBeExcludedOnAllWebsites": "Die untenstehenden IPs werden auf allen Websites ignoriert.", "ListOfQueryParametersToBeExcludedOnAllWebsites": "Die untenstehenden GET-Parameter werden von allen URLs aller Websites ignoriert.", "ListOfQueryParametersToExclude": "Geben Sie die Liste der URL Query Parameter an, einen pro Zeile, um sie von der URL Berichtsseite auszuschliessen. Reguläre Ausdrücke so wie %s werden unterstützt.", + "LogAnalytics": "Log-Analyse", "MainDescription": "Ihre Webanalyse benötigt Websites! Websites können hinzugefügt, aktualisiert und gelöscht werden. Hier wird auch der JavaScript-Code gezeigt, der in Ihre Websites eingefügt werden muss.", "MenuManage": "Verwalten", + "MobileAppsAndSDKs": "Mobile Anwendungen und SDKs", "NotAnEcommerceSite": "Dies ist keine Ecommerce Seite", "NotFound": "Keine Websites gefunden für", "NoWebsites": "Es ist noch keine Website zum administrieren vorhanden.", @@ -69,9 +71,8 @@ "SiteSearchUse": "Piwik kann auswerten, wonach Besucher in der internen Suche der Website suchen.", "SiteWithoutDataTitle": "Bisher wurden keine Daten aufgezeichnet", "SiteWithoutDataDescription": "Für diese Website wurden bisher noch keine Analysedaten aufgezeichnet.", - "SiteWithoutDataSetupTracking": "Bitte fügen Sie den %1$sJavaScript Tracking Code%2$s auf ihrer Website ein, insofern Sie dies noch nicht getan haben.", + "SiteWithoutDataSetupTracking": "Bitte fügen Sie den folgenden %1$sTracking Code%2$s auf ihrer Website ein, insofern Sie dies noch nicht getan haben.", "SiteWithoutDataMessageDisappears": "Diese Nachricht wird verschwinden sobald die ersten Daten für diese Website aufgezeichnet wurden.", - "SiteWithoutDataSetupGoals": "In den Zwischenzeit können Sie bereits %1$sZiele aufsetzen%2$s.", "SuperUserAccessCan": "Ein Nutzer mit Hauptadministrator-Berechtigung kann ebenfalls %1$sglobale Einstellungen%2$s für neue Websites vornehmen.", "Timezone": "Zeitzone", "TrackingSiteSearch": "Die interne Suche auswerten", diff --git a/plugins/SitesManager/lang/el.json b/plugins/SitesManager/lang/el.json index 79e1564ce7..ac0012afa4 100644 --- a/plugins/SitesManager/lang/el.json +++ b/plugins/SitesManager/lang/el.json @@ -44,8 +44,12 @@ "ListOfIpsToBeExcludedOnAllWebsites": "Οι παρακάτω διευθύνσεις IP θα αποκλειστούν από την ανίχνευση σε όλες τις ιστοσελίδες.", "ListOfQueryParametersToBeExcludedOnAllWebsites": "Οι παράμετροι Ερωτήματος URLs παρακάτω θα αποκλειστούν από URLs σε όλες τις ιστοσελίδες.", "ListOfQueryParametersToExclude": "Εισάγετε τη λίστα των παραμέτρων ερωτήματος στη διεύθυνση URL, μία ανά γραμμή, για να μη συμπεριληφθούν στις Αναφορές Σελίδων Διευθύνσεων URL. Κανονικές εκφράσεις όπως %s υποστηρίζονται.", + "LogAnalytics": "Ημερολόγιο Αναλυτικών", + "LogAnalyticsDescription": "Αν η μέθοδος με Javascript δεν είναι δυνατή, μπορείτε να %1$sχρησιμοποιήσετε το ημερολόγιο αναλυτικών του διακομιστή%2$s ως εναλλακτική μέθοδο για την παρακολούθηση των χρηστών του ιστοτόπου σας.", "MainDescription": "Το σύστημα αναλυτικών αναφορών χρειάζεται ιστοσελίδες! Προσθέστε, ενημερώστε, διαγράψτε ιστοσελίδες και εμφανίστε τον κώδικα Javascript που θα εισαχθεί στις ιστοσελίδες σας.", "MenuManage": "Διαχείριση", + "MobileAppsAndSDKs": "Εφαρμογές και SDK για κινητά", + "MobileAppsAndSDKsDescription": "Δεν παρακολουθείτε ένα ιστοτόπο; Μπορείτε εναλλακτικά να παρακολουθείτε μια εφαρμογή για κινητά ή οποιοδήποτε άλλο τύπο εφαρμογής με χρήση ενός από τα %1$sδιαθέσιμα SDK%2$s.", "NotAnEcommerceSite": "Δεν είναι ιστοσελίδα Ηλεκτρονικού Εμπορίου", "NotFound": "Δεν βρέθηκαν ιστοσελίδες για", "NoWebsites": "Δεν έχετε κάποια ιστοσελίδα για να διαχειριστείτε.", @@ -69,9 +73,9 @@ "SiteSearchUse": "Μπορείτε να χρησιμοποιήσετε το Piwik για να παρακολουθείτε και να έχετε αναφορές για το τι ψάχνουν οι επισκέπτες στην εσωτερική μηχανή αναζήτησης της ιστοσελίδας σας.", "SiteWithoutDataTitle": "Δεν έχουν καταγραφεί ακόμη δεδομένα", "SiteWithoutDataDescription": "Δεν έχουν ακόμη καταγραφεί δεδομένα αναλυτικών για τον ιστοτόπο αυτόν ακόμη.", - "SiteWithoutDataSetupTracking": "Παρακαλώ εισάγετε τον %1$sκώδικα παρακολούθησης JavaScript%2$s για τον ιστοτόπο σας αν δεν το έχετε ήδη κάνει.", + "SiteWithoutDataSetupTracking": "Κάντε ορισμό του %1$sκώδικα παρακολούθησης%2$s στον ιστοτόπο σας ή στην εφαρμογή για κινητά αν δεν το έχετε ήδη κάνει.", "SiteWithoutDataMessageDisappears": "Το μήνυμα θα εξαφανιστεί με το που θα καταχωρηθούν δεδομένα παρακολούθησης για τον ιστοτόπο αυτό.", - "SiteWithoutDataSetupGoals": "Στο μεταξύ, μπορεί να θέλετε να %1$sορίσετε μερικούς στόχους%2$s.", + "SiteWithoutDataSetupGoals": "Εν τω μεταξύ, μπορείτε να %1$sορίσετε ορισμένους στόχους%2$s ή να μάθετε περισσότερα σχετικά με τα %3$sχαρακτηριστικά%4$s του Piwik σε ένα από τους %5$sοδηγούς%6$s μας ή τις %7$sσυχνές ερωτήσεις-απαντήσεις%8$s.", "SuperUserAccessCan": "Ένας χρήστης με πρόσβαση Υπερ Χρήστη μπορεί επίσης να %1$s ορίσει τις καθολικές παραμέτρους%2$s για νέους ιστοτόπους.", "Timezone": "Ζώνη ώρας", "TrackingSiteSearch": "Καταγραφή Εσωτερικής Αναζήτησης Ιστοσελίδας", diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json index 898b257a82..1375674e1c 100644 --- a/plugins/SitesManager/lang/en.json +++ b/plugins/SitesManager/lang/en.json @@ -44,8 +44,12 @@ "ListOfIpsToBeExcludedOnAllWebsites": "The IPs below will be excluded from being tracked on all websites.", "ListOfQueryParametersToBeExcludedOnAllWebsites": "The Query URLs parameters below will be excluded from URLs on all websites.", "ListOfQueryParametersToExclude": "Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as %s are suported.", + "LogAnalytics": "Log Analytics", + "LogAnalyticsDescription": "If the Javascript tracking method isn’t feasible, you can %1$suse server log analytics%2$s as an alternative method for tracking your website’s users.", "MainDescription": "Your Web Analytics reports need Websites! Add, update, delete Websites, and show the JavaScript to insert in your pages.", "MenuManage": "Manage", + "MobileAppsAndSDKs": "Mobile apps and SDKs", + "MobileAppsAndSDKsDescription": "Not tracking a website? You can alternatively track a mobile app or any other type of application using one of the %1$savailable SDKs%2$s.", "NotAnEcommerceSite": "Not an Ecommerce site", "NotFound": "No websites found for", "NoWebsites": "You don't have any website to administrate.", @@ -69,9 +73,9 @@ "SiteSearchUse": "You can use Piwik to track and report what visitors are searching in your website's internal search engine.", "SiteWithoutDataTitle": "No data has been recorded yet", "SiteWithoutDataDescription": "No analytics data has been tracked for this website yet.", - "SiteWithoutDataSetupTracking": "Please set up the %1$sJavaScript tracking code%2$s on your website if you haven't done that already.", + "SiteWithoutDataSetupTracking": "Please set up the %1$stracking code%2$s below into your website or mobile app if you haven't done already.", "SiteWithoutDataMessageDisappears": "This message will disappear as soon as some data was tracked for this website.", - "SiteWithoutDataSetupGoals": "In the meantime, maybe you would like to %1$sset up some goals%2$s.", + "SiteWithoutDataSetupGoals": "In the meantime, maybe you would like to %1$sset up some goals%2$s or learn more about the %3$sfeatures%4$s of Piwik in one of our %5$sguides%6$s or %7$sFAQs%8$s.", "SuperUserAccessCan": "A user with Super User access can also %1$s specify global settings%2$s for new websites.", "Timezone": "Time zone", "TrackingSiteSearch": "Tracking Internal Site Search", diff --git a/plugins/SitesManager/lang/es.json b/plugins/SitesManager/lang/es.json index 287bc19613..a3876f7c29 100644 --- a/plugins/SitesManager/lang/es.json +++ b/plugins/SitesManager/lang/es.json @@ -69,9 +69,7 @@ "SiteSearchUse": "Puede utilizar Piwik para rastrear y obtener un informe que es lo que están buscando sus visitantes en el motor de búsqueda interno de su sitio de internet.", "SiteWithoutDataTitle": "Aun no se han grabado datos", "SiteWithoutDataDescription": "Aun no se han registrado datos analíticos para este sitio de internet.", - "SiteWithoutDataSetupTracking": "Por favor configure el %1$scódigo de rastreo Javascript%2$s en su sitio de internet si ya no lo ha hecho.", "SiteWithoutDataMessageDisappears": "Este mensaje desaparecerá tan pronto como algún dato sea rastreado en este sitio de internet.", - "SiteWithoutDataSetupGoals": "Mientras tanto, tal vez le gustaría %1$sestablecer algunas metas%2$s.", "SuperUserAccessCan": "Un usuario con acceso Super Usuario también puede %1$s especificar la configuración global%2$s para nuevos sitios web.", "Timezone": "Zona Horaria", "TrackingSiteSearch": "Seguimiento en el Buscador interno del sitio", diff --git a/plugins/SitesManager/lang/fr.json b/plugins/SitesManager/lang/fr.json index c96c2105c8..fba6d2784c 100644 --- a/plugins/SitesManager/lang/fr.json +++ b/plugins/SitesManager/lang/fr.json @@ -46,6 +46,7 @@ "ListOfQueryParametersToExclude": "Entrez la liste de vos paramètres d'URL à exclure des rapports d'URL de page, un par ligne. Les expressions régulières comme %s sont supportées.", "MainDescription": "Piwik a besoin de sites pour générer des rapports ! Ajoutez, éditez et supprimez des sites, et voyez le code JavaScript à inclure dans vos pages.", "MenuManage": "Gérer", + "MobileAppsAndSDKs": "Applications mobiles et SDKs", "NotAnEcommerceSite": "N'est pas un site d'e-commerce", "NotFound": "Aucun site trouvé pour", "NoWebsites": "Vous n'avez aucun site Internet à administrer.", @@ -69,9 +70,7 @@ "SiteSearchUse": "Vous pouvez utiliser Piwik pour suivre et effectuer un rapport sur ce que vos visiteurs cherchent sur le moteur de recherche interne de votre site web.", "SiteWithoutDataTitle": "Aucune donnée enregistrée pour le moment", "SiteWithoutDataDescription": "Aucune donnée d'analyse n'a été enregistrée pour ce site pour le moment.", - "SiteWithoutDataSetupTracking": "Veuillez configurer le %1$scode de suivit JavaScript%2$s sur votre site web si vous ne l'avez pas déjà fait.", "SiteWithoutDataMessageDisappears": "Ce message disparaitra dès lors que certaines données auront été enregistrées pour ce site web.", - "SiteWithoutDataSetupGoals": "Pendant ce temps, peut-être voudriez-vous %1$sdéfinir des objectifs%2$s.", "SuperUserAccessCan": "Un utilisateur avec un accès super utilisateur peut aussi %1$sconfigurer les paramètres globaux%2$s pour les nouveaux sites web.", "Timezone": "Fuseau horaire", "TrackingSiteSearch": "Suivi de la recherche interne sur le site", diff --git a/plugins/SitesManager/lang/it.json b/plugins/SitesManager/lang/it.json index a74de97bd2..f2b46bc947 100644 --- a/plugins/SitesManager/lang/it.json +++ b/plugins/SitesManager/lang/it.json @@ -69,9 +69,7 @@ "SiteSearchUse": "È possibile utilizzare Piwik per monitorare e creare dei report su ciò che i visitatori stanno cercando nel motore di ricerca interno del tuo sito web.", "SiteWithoutDataTitle": "Non è stato ancora registrato alcun dato", "SiteWithoutDataDescription": "Per questo sito non sono ancora stati tracciati dati statistici.", - "SiteWithoutDataSetupTracking": "Si prega di impostare il %1$sCodice di Tracciamento JavaScript%2$s sul tuo sito, se già non lo hai fatto.", "SiteWithoutDataMessageDisappears": "Questo messaggio scomparirà non appena dei dati di questo sito saranno raccolti.", - "SiteWithoutDataSetupGoals": "Nel frattempo, può essere che tu voglia %1$simpostare alcuni goal%2$s.", "SuperUserAccessCan": "Un utente con accesso Super User può anche %1$sspecificare le impostazioni globali%2$s per i nuovi siti.", "Timezone": "Fuso orario", "TrackingSiteSearch": "Tracciamento Ricerca Interna Sito", diff --git a/plugins/SitesManager/lang/ja.json b/plugins/SitesManager/lang/ja.json index 031deb101c..a0e13a643c 100644 --- a/plugins/SitesManager/lang/ja.json +++ b/plugins/SitesManager/lang/ja.json @@ -69,9 +69,7 @@ "SiteSearchUse": "Piwik を利用して、ビジターがウェブサイトの内部検索エンジンで検索しているものを追跡およびレポートすることができます。", "SiteWithoutDataTitle": "まだデータは記録されていません", "SiteWithoutDataDescription": "まだこのウエブサイトの分析データは追跡されていません。", - "SiteWithoutDataSetupTracking": "まだ行っていない場合は、ウェブサイトで %1$sJavaScriptトラッキングコード%2$s を設定してください。", "SiteWithoutDataMessageDisappears": "このメッセージは、このウェブサイトの一部のデータが追跡されるとすぐに消えます。", - "SiteWithoutDataSetupGoals": "一方で、おそらくいくつかの%1$s目標を設定したい%2$sと思われるでしょう。", "SuperUserAccessCan": "スーパーユーザーアクセス権限を持つユーザーは、新しいウェブサイトに対し %1$s グローバルリストを指定 %2$s することもできます。", "Timezone": "タイムゾーン", "TrackingSiteSearch": "サイト内検索のトラッキング", diff --git a/plugins/SitesManager/lang/ko.json b/plugins/SitesManager/lang/ko.json index 669131a57a..87821e980c 100644 --- a/plugins/SitesManager/lang/ko.json +++ b/plugins/SitesManager/lang/ko.json @@ -68,9 +68,7 @@ "SiteSearchUse": "당신은 Piwik를 사용하여 웹사이트의 내부검색 엔진에서 방문자가 어떤 검색을 했는지 추적하고 보고받을 수 있습니다.", "SiteWithoutDataTitle": "아직 아무런 데이터가 기록되지 않았습니다.", "SiteWithoutDataDescription": "아직 해당 사이트를 추적하여 분석한 데이터가 없습니다.", - "SiteWithoutDataSetupTracking": "만약 %1$s자바스크립트 추적 코드%2$s를 당신의 웹사이트에 설정하지 않았다면 이를 수행해주세요.", "SiteWithoutDataMessageDisappears": "이 글귀는 해당 웹사이트에서 데이터가 추적되어지는 즉시 사라질 것이다.", - "SiteWithoutDataSetupGoals": "한편, 당신은 %1$s목표 설정%2$s을 하고 싶을 것이다.", "SuperUserAccessCan": "슈퍼 유저는 새로운 사이트에 대해서 %1$s일반 웹사이트 설정%2$s을 통해 관리할 수 있습니다.", "Timezone": "시간대", "TrackingSiteSearch": "사이트 내부 검색 추적", diff --git a/plugins/SitesManager/lang/nb.json b/plugins/SitesManager/lang/nb.json index 834816e971..29c2f2a133 100644 --- a/plugins/SitesManager/lang/nb.json +++ b/plugins/SitesManager/lang/nb.json @@ -67,9 +67,7 @@ "SiteSearchUse": "Du kan bruke Piwik for å spore og rapportere hva besøkere søker etter i ditt nettsteds interne søkemotor.", "SiteWithoutDataTitle": "Ingen data har blitt samlet inn ennå", "SiteWithoutDataDescription": "Ingen analysedata har blitt sporet for dette nettstedet ennå.", - "SiteWithoutDataSetupTracking": "Vennligst sett opp %1$sJavaScript-sporingskoden%2$s på ditt nettsted hvis du ikke har gjort det allerede.", "SiteWithoutDataMessageDisappears": "Denne meldingen vil forsvinne så snart noe data har blitt registrert for dette nettstedet.", - "SiteWithoutDataSetupGoals": "I mellomtiden vil du kanskje %1$ssette opp noen mål%2$s.", "SuperUserAccessCan": "En bruker med superbrukertilgang kan også %1$s spesifisere globale innstillinger%2$s for nye nettsteder.", "Timezone": "Tidssone", "TrackingSiteSearch": "Sporer interne nettstedssøk", diff --git a/plugins/SitesManager/lang/nl.json b/plugins/SitesManager/lang/nl.json index 6828ce5ef9..855f878c4b 100644 --- a/plugins/SitesManager/lang/nl.json +++ b/plugins/SitesManager/lang/nl.json @@ -65,9 +65,7 @@ "SiteSearchUse": "Je kan Piwik gebruiken om te volgen en te rapporteren wat bezoekers via de interne zoekmachine op je website zoeken.", "SiteWithoutDataTitle": "Er zijn nog geen gegevens geregistreerd", "SiteWithoutDataDescription": "Er is nog geen analytics data voor deze website bijgehouden.", - "SiteWithoutDataSetupTracking": "Voeg %1$sJavaScript tracking code%2$s toe aan je website, wanneer je dit nog niet hebt gedaan.", "SiteWithoutDataMessageDisappears": "Deze melding zal verdwijnen wanneer er wat data voor deze website is ontvangen.", - "SiteWithoutDataSetupGoals": "In de tussen tijd, mischien wil je een aantal doelen%2$s opzettens%1$s.", "SuperUserAccessCan": "Een gebruiker met Super User rechten kan ook %1$s de globale instellingen specificeren%2$s voor nieuwe websites.", "Timezone": "Tijdzone", "TrackingSiteSearch": "Interne site zoekmachine bijhouden.", diff --git a/plugins/SitesManager/lang/pt-br.json b/plugins/SitesManager/lang/pt-br.json index 3401df4a6e..31e6cd5e56 100644 --- a/plugins/SitesManager/lang/pt-br.json +++ b/plugins/SitesManager/lang/pt-br.json @@ -68,9 +68,7 @@ "SiteSearchUse": "Você pode utilizar o Piwik para acompanhar e informar o que os visitantes estão procurando no motor de pesquisa interna do seu site.", "SiteWithoutDataTitle": "Ainda não há dados gravados", "SiteWithoutDataDescription": "Ainda não há dados de análises de rastreamentos para este website", - "SiteWithoutDataSetupTracking": "Por favor, configure o %1$scódigo de rastreamento JavaScript%2$s em seu website, caso ainda não tenha feito.", "SiteWithoutDataMessageDisappears": "Esta mensagem vai desaparecer assim que alguns dados foram rastreados para este site.", - "SiteWithoutDataSetupGoals": "Por enquanto, talvez você queira %1$sdefinir algumas metas%2$s.", "SuperUserAccessCan": "Um usuário com privilégio de Super Usuário também pode %1$s especificar configurações globais%2$s para novos sites.", "Timezone": "Fuso horário", "TrackingSiteSearch": "Acompanhamento de pesquisa interna do site", diff --git a/plugins/SitesManager/lang/sq.json b/plugins/SitesManager/lang/sq.json index 118ca7a9ef..172bd50d14 100644 --- a/plugins/SitesManager/lang/sq.json +++ b/plugins/SitesManager/lang/sq.json @@ -44,8 +44,12 @@ "ListOfIpsToBeExcludedOnAllWebsites": "IP-të më poshtë do të përjashtohen nga ndjekja në krejt sajtet.", "ListOfQueryParametersToBeExcludedOnAllWebsites": "Parametrat për URL-ra Kërkesash më poshtë do të përjashtohen nga URL-të për krejt sajtet.", "ListOfQueryParametersToExclude": "Jepni listën e Parametrave URL Query, një për rresht, që duhen përjashtuar nga raportet URL Faqesh. Mbulohen shprehje të rregullta si %s.", + "LogAnalytics": "Analiza Regjistri", + "LogAnalyticsDescription": "Nëse metoda Javascript e gjurmimeve s’është e mundur, si metodë alternative për gjurmimin e përdoruesve të sajtit tuaj mund të %1$spërdorni analizat e regjistrit të shërbyesit%2$s.", "MainDescription": "Raportet tuaja Analizash Web lypin sajte! Shtoni, përditësoni, hiqni sajte, dhe shfaqni JavaScript-in për futje në faqet tuaja.", "MenuManage": "Administroni", + "MobileAppsAndSDKs": "Aplikacione dhe SDK-ra për celular", + "MobileAppsAndSDKsDescription": "S’ndiqni ndonjë sajt? Mundeni të ndiqni një aplikacion për celular, ose çfarëdo lloj tjetër aplikacioni që përdor një nga %1$sSDK-të e gatshme%2$s.", "NotAnEcommerceSite": "Jo sajt E-tregtie", "NotFound": "S’u gjetën sajte për", "NoWebsites": "S’keni ndonjë sajt për ta administruar.", @@ -69,9 +73,9 @@ "SiteSearchUse": "Mund ta përdorni Piwik-un për të ndjekur dhe raportuar se çfarë kërkojnë vizitorët me motorin e kërkimeve të brendshme në sajtin tuaj .", "SiteWithoutDataTitle": "Ende s’ka të dhëna të regjistruara", "SiteWithoutDataDescription": "Për këtë sajt s’janë ndjekur ende të dhëna analitike.", - "SiteWithoutDataSetupTracking": "Ju lutemi, rregulloni te sajti juaj %1$skodin e ndjekjeve JavaScript%2$s, nëse s’e keni bërë tashmë.", + "SiteWithoutDataSetupTracking": "Ju lutemi, rregulloni më poshtë %1$skodin e gjurmimit%2$s për sajtin apo aplikacionin tuaj për celular, po qe se s’e keni bërë ende.", "SiteWithoutDataMessageDisappears": "Ky mesazh do të zhduket sapo të ketë ndoca të dhëna të ndjekura për këtë sajt.", - "SiteWithoutDataSetupGoals": "Ndoshta mund të donit, ndërkohë, të %1$scaktoni ndonjë objektiv%2$s.", + "SiteWithoutDataSetupGoals": "Ndërkohë, mund të donit ndoshta të %1$scaktoni ndonjë objektiv global%2$s ose të mësoni më tepër rreth %3$sveçorive%4$s të Piwik-ut, në një nga %5$sudhërrëgyesit%6$s tanë apo %7$sFAQ%8$s.", "SuperUserAccessCan": "Një përdorues me hyrje Superpërdoruesi mundet gjithashtu %1$s të caktojë rregullime të përgjithshme%2$s për sajte të rinj.", "Timezone": "Zonë kohore", "TrackingSiteSearch": "Ndjekje Kërkimesh Brenda Sajti", diff --git a/plugins/SitesManager/lang/sr.json b/plugins/SitesManager/lang/sr.json index cbeb9a658e..07bf1d1ffe 100644 --- a/plugins/SitesManager/lang/sr.json +++ b/plugins/SitesManager/lang/sr.json @@ -68,9 +68,7 @@ "SiteSearchUse": "Možete koristiti Piwik za praćenje i kreiranje izveštaja o tome šta posetioci traže na vašem sajtu koristeći polje za pretragu.", "SiteWithoutDataTitle": "Nikakvi podaci do sad nisu zabeleženi", "SiteWithoutDataDescription": "Još uvek nema analitičkih podataka za ova sajt.", - "SiteWithoutDataSetupTracking": "Molimo vas da postavite %1$sJavaScript kod za praćenje%2$s na vaš sajt ukoliko to već niste učinili.", "SiteWithoutDataMessageDisappears": "Ova poruka će nestati čim se zabeleži neki saobraćaj na sajtu.", - "SiteWithoutDataSetupGoals": "U međuvremenu možete da %1$spostavite neke ciljeve %2$s.", "SuperUserAccessCan": "Korisnik sa superkorisničkim nivoom pristupa može i da %1$spostavi globalna podešavanja%2$s za nove sajtove.", "Timezone": "Vremenska zona", "TrackingSiteSearch": "Praćenje pretraživanja sajta", diff --git a/plugins/SitesManager/lang/sv.json b/plugins/SitesManager/lang/sv.json index c32bf9cc29..64ab73b9aa 100644 --- a/plugins/SitesManager/lang/sv.json +++ b/plugins/SitesManager/lang/sv.json @@ -66,9 +66,7 @@ "SiteSearchUse": "Du kan använda Piwik för att spåra och rapportera om vad besökarna söker efter med din webbplats interna sökmotor.", "SiteWithoutDataTitle": "Inga data har samlats in än", "SiteWithoutDataDescription": "Inga data har samlats in för denna webbplats än.", - "SiteWithoutDataSetupTracking": "Vänligen konfigurera %1$sJavaScript spårningskoden%2$s på din webbplats om du inte redan har gjort det.", "SiteWithoutDataMessageDisappears": "Detta meddelande kommer visas tills data samlats in för denna webbsida.", - "SiteWithoutDataSetupGoals": "Under tiden kanske du vill %1$ssätta upp några mål%2$s.", "SuperUserAccessCan": "En användare med Superbehörighet kan också %1$s specificera globala inställningar%2$s för nya webbsidor.", "Timezone": "Tidszon", "TrackingSiteSearch": "Spåra webbplatsens interna sökfunktion", diff --git a/plugins/SitesManager/lang/uk.json b/plugins/SitesManager/lang/uk.json index 7d7073dbed..3b7d862150 100644 --- a/plugins/SitesManager/lang/uk.json +++ b/plugins/SitesManager/lang/uk.json @@ -69,9 +69,7 @@ "SiteSearchUse": "Ви можете використовувати Piwik для відстеження та відображення аналітики по тому, що шукають відвідувачі на вашому сайті використовуючи функціонал для внутрішнього пошуку по сайту.", "SiteWithoutDataTitle": "Ще ніякі дані не були записані", "SiteWithoutDataDescription": "Немає даних аналітики що відстежувалися на цьому сайті.", - "SiteWithoutDataSetupTracking": "Будь ласка, налаштуйте %1$sJavaScript код відстеження%2$s на вашому сайті, якщо ви цього не зробили раніше.", "SiteWithoutDataMessageDisappears": "Це повідомлення зникне, як тільки перші дані отримаються на цей сайт.", - "SiteWithoutDataSetupGoals": "У той же час, може бути, ви хотіли б %1$sвстановити деякі цілі%2$s.", "SuperUserAccessCan": "Користувач з правами суперкористувача може також %1$sвказати загальні налаштування%2$s для нових веб-сайтів.", "Timezone": "Часовий пояс", "TrackingSiteSearch": "Відстежувати внутрішній пошук по сайту", diff --git a/plugins/SitesManager/lang/zh-tw.json b/plugins/SitesManager/lang/zh-tw.json index 7ddbbcb304..837f3f2508 100644 --- a/plugins/SitesManager/lang/zh-tw.json +++ b/plugins/SitesManager/lang/zh-tw.json @@ -44,8 +44,12 @@ "ListOfIpsToBeExcludedOnAllWebsites": "以下的 IP 位址將會被所有網站排除。", "ListOfQueryParametersToBeExcludedOnAllWebsites": "以下的網址查詢參數將會被所有網站排除。", "ListOfQueryParametersToExclude": "輸入網址查詢參數列表，一行一個，將從網頁網址報表中被排除。支援正規表示式如 %s。", + "LogAnalytics": "紀錄檔分析", + "LogAnalyticsDescription": "如果無法使用 Javascript 來追蹤，你可以改用%1$s伺服器紀錄檔追蹤%2$s的方式來追蹤你的網站使用者。", "MainDescription": "你的網站分析報告需要網站！新增、更新或刪除網站，並顯示 JavaScript 追蹤程式碼插入在你的網頁之中。", "MenuManage": "管理", + "MobileAppsAndSDKs": "行動應用程式和 SDK", + "MobileAppsAndSDKsDescription": "不是追蹤網站？你也可以使用%1$s可用的 SDK%2$s 來追蹤行動應用程式或任何應用程式。", "NotAnEcommerceSite": "非電子商務網站", "NotFound": "找不到網站", "NoWebsites": "你沒有任何網站可以管理。", @@ -69,9 +73,9 @@ "SiteSearchUse": "你可以使用 Piwik 來追蹤並報告訪客在你網站內的搜尋引擎中搜尋了什麼。", "SiteWithoutDataTitle": "還沒有紀錄到資料", "SiteWithoutDataDescription": "這個網站還沒有追蹤分析資料。", - "SiteWithoutDataSetupTracking": "請在你的網站中放置 %1$sJavaScript 追蹤程式碼%2$s。", + "SiteWithoutDataSetupTracking": "請在你的網站或行動應用程式中設定%1$s追蹤程式碼%2$s（如果你還沒完成的話）。", "SiteWithoutDataMessageDisappears": "此訊息將會在這個網站開始收集到追蹤資料時隱藏。", - "SiteWithoutDataSetupGoals": "同時，你也可能想要%1$s設定一些目標%2$s。", + "SiteWithoutDataSetupGoals": "同時，你或許會想要%1$s設定一些目標%2$s，或在我們的%5$s指南%6$s和 %7$sFAQs%8$s 中了解更多關於 Piwik 的%3$s功能%4$s。", "SuperUserAccessCan": "一個擁有超級使用者權限的使用者也可以為新網站%1$s指定全域設定%2$s。", "Timezone": "時區", "TrackingSiteSearch": "追蹤站內搜尋", diff --git a/plugins/SitesManager/stylesheets/SitesManager.less b/plugins/SitesManager/stylesheets/SitesManager.less index dc3b4e48b0..2452a806ae 100644 --- a/plugins/SitesManager/stylesheets/SitesManager.less +++ b/plugins/SitesManager/stylesheets/SitesManager.less @@ -113,6 +113,10 @@ td.editable-site-field:hover { font-weight: normal; color: black; } + + p + p { + margin-top: 10px; + } } #js-visitor-cv-extra th { diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig index b5c4671c7e..a400c316ad 100644 --- a/plugins/SitesManager/templates/_displayJavascriptCode.twig +++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig @@ -13,5 +13,19 @@ <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>')|raw }}</p> - <p>{{ 'Installation_JSTracking_EndNote'|translate('','')|raw }}</p> + {% if isInstall is defined %} + <p>{{ 'Installation_JSTracking_EndNote'|translate('', '')|raw }}</p> + {% else %} + <p>{{ 'CoreAdminHome_JSTracking_EndNote'|translate('<a href="' ~ linkTo({'module': 'CoreAdminHome', 'action': 'trackingCodeGenerator'}) ~'">','</a>')|raw }}</p> + {% endif %} + + <h3>{{ 'SitesManager_LogAnalytics'|translate }}</h3> + + <p>{{ 'SitesManager_LogAnalyticsDescription'|translate('<a href="https://piwik.org/log-analytics/" rel="noreferrer" target="_blank">', '</a>')|raw }}</p> + + <h3>{{ 'SitesManager_MobileAppsAndSDKs'|translate }}</h3> + + <p>{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('<a href="https://piwik.org/integrate/#programming-language-platforms-and-frameworks" rel="noreferrer" target="_blank">','</a>')|raw }}</p> + <p></p> + </div>
\ No newline at end of file diff --git a/plugins/SitesManager/templates/siteWithoutData.twig b/plugins/SitesManager/templates/siteWithoutData.twig index d8596cf0fd..bf0db36a39 100644 --- a/plugins/SitesManager/templates/siteWithoutData.twig +++ b/plugins/SitesManager/templates/siteWithoutData.twig @@ -41,7 +41,10 @@ {{ 'SitesManager_SiteWithoutDataSetupGoals'|translate('<a href="' ~ linkTo({ 'module': 'Goals', 'action': 'manage', - }) ~ '">', "</a>")|raw }} + }) ~ '">', "</a>", + '<a href="https://piwik.org/features/" rel="noreferrer" target="_blank">', "</a>", + '<a href="https://piwik.org/docs/" rel="noreferrer" target="_blank">', "</a>", + '<a href="https://piwik.org/faq/" rel="noreferrer" target="_blank">', "</a>")|raw }} </p> {{ trackingHelp|raw }} diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index 176030ec31..c4e12b550a 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -38,8 +38,7 @@ class API extends \Piwik\Plugin\API $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getFlagFromCode')); $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\countryTranslate')); - $dataTable->queueFilter('ColumnCallbackAddMetadata', array(array(), 'logoWidth', function () { return 16; })); - $dataTable->queueFilter('ColumnCallbackAddMetadata', array(array(), 'logoHeight', function () { return 11; })); + $dataTable->queueFilter('ColumnCallbackAddMetadata', array(array(), 'logoHeight', function () { return 16; })); return $dataTable; } diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php index 33a95600bb..008e4786a5 100644 --- a/plugins/UserCountry/functions.php +++ b/plugins/UserCountry/functions.php @@ -22,7 +22,7 @@ use Piwik\Tracker\Visit; */ function getFlagFromCode($code) { - $pathInPiwik = 'plugins/UserCountry/images/flags/%s.png'; + $pathInPiwik = 'plugins/Morpheus/icons/dist/flags/%s.png'; $pathWithCode = sprintf($pathInPiwik, $code); $absolutePath = PIWIK_INCLUDE_PATH . '/' . $pathWithCode; if (file_exists($absolutePath)) { diff --git a/plugins/UserCountry/images/flags/a1.png b/plugins/UserCountry/images/flags/a1.png Binary files differdeleted file mode 100644 index da6e1bbe89..0000000000 --- a/plugins/UserCountry/images/flags/a1.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/a2.png b/plugins/UserCountry/images/flags/a2.png Binary files differdeleted file mode 100644 index da6e1bbe89..0000000000 --- a/plugins/UserCountry/images/flags/a2.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ac.png b/plugins/UserCountry/images/flags/ac.png Binary files differdeleted file mode 100644 index 405e897c52..0000000000 --- a/plugins/UserCountry/images/flags/ac.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ad.png b/plugins/UserCountry/images/flags/ad.png Binary files differdeleted file mode 100644 index 385fa1d7ea..0000000000 --- a/plugins/UserCountry/images/flags/ad.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ae.png b/plugins/UserCountry/images/flags/ae.png Binary files differdeleted file mode 100644 index cf10beb4a3..0000000000 --- a/plugins/UserCountry/images/flags/ae.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/af.png b/plugins/UserCountry/images/flags/af.png Binary files differdeleted file mode 100644 index 1b24b434fa..0000000000 --- a/plugins/UserCountry/images/flags/af.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ag.png b/plugins/UserCountry/images/flags/ag.png Binary files differdeleted file mode 100644 index 3ca9b1763c..0000000000 --- a/plugins/UserCountry/images/flags/ag.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ai.png b/plugins/UserCountry/images/flags/ai.png Binary files differdeleted file mode 100644 index 9bde3ce709..0000000000 --- a/plugins/UserCountry/images/flags/ai.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/al.png b/plugins/UserCountry/images/flags/al.png Binary files differdeleted file mode 100644 index e5f7b0647c..0000000000 --- a/plugins/UserCountry/images/flags/al.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/am.png b/plugins/UserCountry/images/flags/am.png Binary files differdeleted file mode 100644 index 6d0a22383b..0000000000 --- a/plugins/UserCountry/images/flags/am.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/an.png b/plugins/UserCountry/images/flags/an.png Binary files differdeleted file mode 100644 index c5165608ce..0000000000 --- a/plugins/UserCountry/images/flags/an.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ao.png b/plugins/UserCountry/images/flags/ao.png Binary files differdeleted file mode 100644 index c0872c46f8..0000000000 --- a/plugins/UserCountry/images/flags/ao.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ap.png b/plugins/UserCountry/images/flags/ap.png Binary files differdeleted file mode 100644 index da6e1bbe89..0000000000 --- a/plugins/UserCountry/images/flags/ap.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/aq.png b/plugins/UserCountry/images/flags/aq.png Binary files differdeleted file mode 100644 index 217eaba391..0000000000 --- a/plugins/UserCountry/images/flags/aq.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ar.png b/plugins/UserCountry/images/flags/ar.png Binary files differdeleted file mode 100644 index 0f09ebdd8e..0000000000 --- a/plugins/UserCountry/images/flags/ar.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/as.png b/plugins/UserCountry/images/flags/as.png Binary files differdeleted file mode 100644 index 774776150a..0000000000 --- a/plugins/UserCountry/images/flags/as.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/at.png b/plugins/UserCountry/images/flags/at.png Binary files differdeleted file mode 100644 index 700a656671..0000000000 --- a/plugins/UserCountry/images/flags/at.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/au.png b/plugins/UserCountry/images/flags/au.png Binary files differdeleted file mode 100644 index 709eac00de..0000000000 --- a/plugins/UserCountry/images/flags/au.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/aw.png b/plugins/UserCountry/images/flags/aw.png Binary files differdeleted file mode 100644 index 7b7d01c10f..0000000000 --- a/plugins/UserCountry/images/flags/aw.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ax.png b/plugins/UserCountry/images/flags/ax.png Binary files differdeleted file mode 100644 index ff51987a16..0000000000 --- a/plugins/UserCountry/images/flags/ax.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/az.png b/plugins/UserCountry/images/flags/az.png Binary files differdeleted file mode 100644 index 2f189667f6..0000000000 --- a/plugins/UserCountry/images/flags/az.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ba.png b/plugins/UserCountry/images/flags/ba.png Binary files differdeleted file mode 100644 index c996c301cb..0000000000 --- a/plugins/UserCountry/images/flags/ba.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bb.png b/plugins/UserCountry/images/flags/bb.png Binary files differdeleted file mode 100644 index 50992817cf..0000000000 --- a/plugins/UserCountry/images/flags/bb.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bd.png b/plugins/UserCountry/images/flags/bd.png Binary files differdeleted file mode 100644 index 685325475a..0000000000 --- a/plugins/UserCountry/images/flags/bd.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/be.png b/plugins/UserCountry/images/flags/be.png Binary files differdeleted file mode 100644 index 12c10f46e0..0000000000 --- a/plugins/UserCountry/images/flags/be.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bf.png b/plugins/UserCountry/images/flags/bf.png Binary files differdeleted file mode 100644 index 22b42bcc98..0000000000 --- a/plugins/UserCountry/images/flags/bf.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bg.png b/plugins/UserCountry/images/flags/bg.png Binary files differdeleted file mode 100644 index 41f34d8562..0000000000 --- a/plugins/UserCountry/images/flags/bg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bh.png b/plugins/UserCountry/images/flags/bh.png Binary files differdeleted file mode 100644 index 32ca603f30..0000000000 --- a/plugins/UserCountry/images/flags/bh.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bi.png b/plugins/UserCountry/images/flags/bi.png Binary files differdeleted file mode 100644 index 1f03e129ad..0000000000 --- a/plugins/UserCountry/images/flags/bi.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bj.png b/plugins/UserCountry/images/flags/bj.png Binary files differdeleted file mode 100644 index 53d4eb1e99..0000000000 --- a/plugins/UserCountry/images/flags/bj.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bl.png b/plugins/UserCountry/images/flags/bl.png Binary files differdeleted file mode 100644 index 744ede391d..0000000000 --- a/plugins/UserCountry/images/flags/bl.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bm.png b/plugins/UserCountry/images/flags/bm.png Binary files differdeleted file mode 100644 index 3cb8803156..0000000000 --- a/plugins/UserCountry/images/flags/bm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bn.png b/plugins/UserCountry/images/flags/bn.png Binary files differdeleted file mode 100644 index 9aafbb389c..0000000000 --- a/plugins/UserCountry/images/flags/bn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bo.png b/plugins/UserCountry/images/flags/bo.png Binary files differdeleted file mode 100644 index 46b519eae6..0000000000 --- a/plugins/UserCountry/images/flags/bo.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bq.png b/plugins/UserCountry/images/flags/bq.png Binary files differdeleted file mode 100644 index 77f75f6ffa..0000000000 --- a/plugins/UserCountry/images/flags/bq.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/br.png b/plugins/UserCountry/images/flags/br.png Binary files differdeleted file mode 100644 index 5cdff06a4a..0000000000 --- a/plugins/UserCountry/images/flags/br.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bs.png b/plugins/UserCountry/images/flags/bs.png Binary files differdeleted file mode 100644 index bc5333e0b9..0000000000 --- a/plugins/UserCountry/images/flags/bs.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bt.png b/plugins/UserCountry/images/flags/bt.png Binary files differdeleted file mode 100644 index 0abb9130c7..0000000000 --- a/plugins/UserCountry/images/flags/bt.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bu.png b/plugins/UserCountry/images/flags/bu.png Binary files differdeleted file mode 100644 index d96c2f30f7..0000000000 --- a/plugins/UserCountry/images/flags/bu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bv.png b/plugins/UserCountry/images/flags/bv.png Binary files differdeleted file mode 100644 index 74264c5866..0000000000 --- a/plugins/UserCountry/images/flags/bv.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bw.png b/plugins/UserCountry/images/flags/bw.png Binary files differdeleted file mode 100644 index 463a97775a..0000000000 --- a/plugins/UserCountry/images/flags/bw.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/by.png b/plugins/UserCountry/images/flags/by.png Binary files differdeleted file mode 100644 index 81c5086ca6..0000000000 --- a/plugins/UserCountry/images/flags/by.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/bz.png b/plugins/UserCountry/images/flags/bz.png Binary files differdeleted file mode 100644 index f653173d4f..0000000000 --- a/plugins/UserCountry/images/flags/bz.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ca.png b/plugins/UserCountry/images/flags/ca.png Binary files differdeleted file mode 100644 index b7c48f6341..0000000000 --- a/plugins/UserCountry/images/flags/ca.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cat.png b/plugins/UserCountry/images/flags/cat.png Binary files differdeleted file mode 100644 index 58faea35b8..0000000000 --- a/plugins/UserCountry/images/flags/cat.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cc.png b/plugins/UserCountry/images/flags/cc.png Binary files differdeleted file mode 100644 index 0791bad575..0000000000 --- a/plugins/UserCountry/images/flags/cc.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cd.png b/plugins/UserCountry/images/flags/cd.png Binary files differdeleted file mode 100644 index 6cdfe5c08b..0000000000 --- a/plugins/UserCountry/images/flags/cd.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cf.png b/plugins/UserCountry/images/flags/cf.png Binary files differdeleted file mode 100644 index d932c21016..0000000000 --- a/plugins/UserCountry/images/flags/cf.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cg.png b/plugins/UserCountry/images/flags/cg.png Binary files differdeleted file mode 100644 index 0811ccce06..0000000000 --- a/plugins/UserCountry/images/flags/cg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ch.png b/plugins/UserCountry/images/flags/ch.png Binary files differdeleted file mode 100644 index 6f6723fb89..0000000000 --- a/plugins/UserCountry/images/flags/ch.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ci.png b/plugins/UserCountry/images/flags/ci.png Binary files differdeleted file mode 100644 index b0d78c7ec6..0000000000 --- a/plugins/UserCountry/images/flags/ci.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ck.png b/plugins/UserCountry/images/flags/ck.png Binary files differdeleted file mode 100644 index 99efe50044..0000000000 --- a/plugins/UserCountry/images/flags/ck.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cl.png b/plugins/UserCountry/images/flags/cl.png Binary files differdeleted file mode 100644 index 74a69dc8e8..0000000000 --- a/plugins/UserCountry/images/flags/cl.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cm.png b/plugins/UserCountry/images/flags/cm.png Binary files differdeleted file mode 100644 index 65d3827a46..0000000000 --- a/plugins/UserCountry/images/flags/cm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cn.png b/plugins/UserCountry/images/flags/cn.png Binary files differdeleted file mode 100644 index 9f1b310908..0000000000 --- a/plugins/UserCountry/images/flags/cn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/co.png b/plugins/UserCountry/images/flags/co.png Binary files differdeleted file mode 100644 index eeb10fd86a..0000000000 --- a/plugins/UserCountry/images/flags/co.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cp.png b/plugins/UserCountry/images/flags/cp.png Binary files differdeleted file mode 100644 index 744ede391d..0000000000 --- a/plugins/UserCountry/images/flags/cp.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cr.png b/plugins/UserCountry/images/flags/cr.png Binary files differdeleted file mode 100644 index 413797bfe2..0000000000 --- a/plugins/UserCountry/images/flags/cr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cs.png b/plugins/UserCountry/images/flags/cs.png Binary files differdeleted file mode 100644 index 0e0fb6deba..0000000000 --- a/plugins/UserCountry/images/flags/cs.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cu.png b/plugins/UserCountry/images/flags/cu.png Binary files differdeleted file mode 100644 index 0303459ddd..0000000000 --- a/plugins/UserCountry/images/flags/cu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cv.png b/plugins/UserCountry/images/flags/cv.png Binary files differdeleted file mode 100644 index 7a1f79755d..0000000000 --- a/plugins/UserCountry/images/flags/cv.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cw.png b/plugins/UserCountry/images/flags/cw.png Binary files differdeleted file mode 100644 index a6d5f2834b..0000000000 --- a/plugins/UserCountry/images/flags/cw.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cx.png b/plugins/UserCountry/images/flags/cx.png Binary files differdeleted file mode 100644 index 8acecd6ec6..0000000000 --- a/plugins/UserCountry/images/flags/cx.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cy.png b/plugins/UserCountry/images/flags/cy.png Binary files differdeleted file mode 100644 index 9c2de21570..0000000000 --- a/plugins/UserCountry/images/flags/cy.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/cz.png b/plugins/UserCountry/images/flags/cz.png Binary files differdeleted file mode 100644 index 69ea675978..0000000000 --- a/plugins/UserCountry/images/flags/cz.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/de.png b/plugins/UserCountry/images/flags/de.png Binary files differdeleted file mode 100644 index 2df162b4af..0000000000 --- a/plugins/UserCountry/images/flags/de.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/dg.png b/plugins/UserCountry/images/flags/dg.png Binary files differdeleted file mode 100644 index 3e74b6a316..0000000000 --- a/plugins/UserCountry/images/flags/dg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/dj.png b/plugins/UserCountry/images/flags/dj.png Binary files differdeleted file mode 100644 index 3fe7b82cf6..0000000000 --- a/plugins/UserCountry/images/flags/dj.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/dk.png b/plugins/UserCountry/images/flags/dk.png Binary files differdeleted file mode 100644 index 622cebd2ce..0000000000 --- a/plugins/UserCountry/images/flags/dk.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/dm.png b/plugins/UserCountry/images/flags/dm.png Binary files differdeleted file mode 100644 index c49785d5ba..0000000000 --- a/plugins/UserCountry/images/flags/dm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/do.png b/plugins/UserCountry/images/flags/do.png Binary files differdeleted file mode 100644 index 46230992f8..0000000000 --- a/plugins/UserCountry/images/flags/do.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/dz.png b/plugins/UserCountry/images/flags/dz.png Binary files differdeleted file mode 100644 index 144fe154e2..0000000000 --- a/plugins/UserCountry/images/flags/dz.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ea.png b/plugins/UserCountry/images/flags/ea.png Binary files differdeleted file mode 100644 index cfd22a445c..0000000000 --- a/plugins/UserCountry/images/flags/ea.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ec.png b/plugins/UserCountry/images/flags/ec.png Binary files differdeleted file mode 100644 index 4ca13865ff..0000000000 --- a/plugins/UserCountry/images/flags/ec.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ee.png b/plugins/UserCountry/images/flags/ee.png Binary files differdeleted file mode 100644 index 17393b8b00..0000000000 --- a/plugins/UserCountry/images/flags/ee.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/eg.png b/plugins/UserCountry/images/flags/eg.png Binary files differdeleted file mode 100644 index a7131a3a78..0000000000 --- a/plugins/UserCountry/images/flags/eg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/eh.png b/plugins/UserCountry/images/flags/eh.png Binary files differdeleted file mode 100644 index 89fe31a0a9..0000000000 --- a/plugins/UserCountry/images/flags/eh.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/er.png b/plugins/UserCountry/images/flags/er.png Binary files differdeleted file mode 100644 index 2dfe8106b5..0000000000 --- a/plugins/UserCountry/images/flags/er.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/es.png b/plugins/UserCountry/images/flags/es.png Binary files differdeleted file mode 100644 index cfd22a445c..0000000000 --- a/plugins/UserCountry/images/flags/es.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/et.png b/plugins/UserCountry/images/flags/et.png Binary files differdeleted file mode 100644 index 11f79b002a..0000000000 --- a/plugins/UserCountry/images/flags/et.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/eu.png b/plugins/UserCountry/images/flags/eu.png Binary files differdeleted file mode 100644 index 8f5a3eb31c..0000000000 --- a/plugins/UserCountry/images/flags/eu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/fi.png b/plugins/UserCountry/images/flags/fi.png Binary files differdeleted file mode 100644 index f3b1058cd4..0000000000 --- a/plugins/UserCountry/images/flags/fi.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/fj.png b/plugins/UserCountry/images/flags/fj.png Binary files differdeleted file mode 100644 index 903f680324..0000000000 --- a/plugins/UserCountry/images/flags/fj.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/fk.png b/plugins/UserCountry/images/flags/fk.png Binary files differdeleted file mode 100644 index 5adec9e3e2..0000000000 --- a/plugins/UserCountry/images/flags/fk.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/fm.png b/plugins/UserCountry/images/flags/fm.png Binary files differdeleted file mode 100644 index 2e2a7a96f0..0000000000 --- a/plugins/UserCountry/images/flags/fm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/fo.png b/plugins/UserCountry/images/flags/fo.png Binary files differdeleted file mode 100644 index 39d2040bc6..0000000000 --- a/plugins/UserCountry/images/flags/fo.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/fr.png b/plugins/UserCountry/images/flags/fr.png Binary files differdeleted file mode 100644 index 744ede391d..0000000000 --- a/plugins/UserCountry/images/flags/fr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/fx.png b/plugins/UserCountry/images/flags/fx.png Binary files differdeleted file mode 100644 index 744ede391d..0000000000 --- a/plugins/UserCountry/images/flags/fx.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ga.png b/plugins/UserCountry/images/flags/ga.png Binary files differdeleted file mode 100644 index b6ca79e3bc..0000000000 --- a/plugins/UserCountry/images/flags/ga.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gb.png b/plugins/UserCountry/images/flags/gb.png Binary files differdeleted file mode 100644 index 405e897c52..0000000000 --- a/plugins/UserCountry/images/flags/gb.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gd.png b/plugins/UserCountry/images/flags/gd.png Binary files differdeleted file mode 100644 index 9b077bb889..0000000000 --- a/plugins/UserCountry/images/flags/gd.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ge.png b/plugins/UserCountry/images/flags/ge.png Binary files differdeleted file mode 100644 index a700789b0b..0000000000 --- a/plugins/UserCountry/images/flags/ge.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gf.png b/plugins/UserCountry/images/flags/gf.png Binary files differdeleted file mode 100644 index b3e22fb218..0000000000 --- a/plugins/UserCountry/images/flags/gf.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gg.png b/plugins/UserCountry/images/flags/gg.png Binary files differdeleted file mode 100644 index 479141192e..0000000000 --- a/plugins/UserCountry/images/flags/gg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gh.png b/plugins/UserCountry/images/flags/gh.png Binary files differdeleted file mode 100644 index 952b1620aa..0000000000 --- a/plugins/UserCountry/images/flags/gh.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gi.png b/plugins/UserCountry/images/flags/gi.png Binary files differdeleted file mode 100644 index f366599da8..0000000000 --- a/plugins/UserCountry/images/flags/gi.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gl.png b/plugins/UserCountry/images/flags/gl.png Binary files differdeleted file mode 100644 index f22289be9d..0000000000 --- a/plugins/UserCountry/images/flags/gl.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gm.png b/plugins/UserCountry/images/flags/gm.png Binary files differdeleted file mode 100644 index feed27f5c5..0000000000 --- a/plugins/UserCountry/images/flags/gm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gn.png b/plugins/UserCountry/images/flags/gn.png Binary files differdeleted file mode 100644 index 3efeaa534a..0000000000 --- a/plugins/UserCountry/images/flags/gn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gp.png b/plugins/UserCountry/images/flags/gp.png Binary files differdeleted file mode 100644 index 160dae80c0..0000000000 --- a/plugins/UserCountry/images/flags/gp.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gq.png b/plugins/UserCountry/images/flags/gq.png Binary files differdeleted file mode 100644 index cad564ceb4..0000000000 --- a/plugins/UserCountry/images/flags/gq.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gr.png b/plugins/UserCountry/images/flags/gr.png Binary files differdeleted file mode 100644 index dde5b025b7..0000000000 --- a/plugins/UserCountry/images/flags/gr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gs.png b/plugins/UserCountry/images/flags/gs.png Binary files differdeleted file mode 100644 index e37521f63b..0000000000 --- a/plugins/UserCountry/images/flags/gs.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gt.png b/plugins/UserCountry/images/flags/gt.png Binary files differdeleted file mode 100644 index 75e76cddb9..0000000000 --- a/plugins/UserCountry/images/flags/gt.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gu.png b/plugins/UserCountry/images/flags/gu.png Binary files differdeleted file mode 100644 index 4f034bcb29..0000000000 --- a/plugins/UserCountry/images/flags/gu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gw.png b/plugins/UserCountry/images/flags/gw.png Binary files differdeleted file mode 100644 index 2ad970b20b..0000000000 --- a/plugins/UserCountry/images/flags/gw.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/gy.png b/plugins/UserCountry/images/flags/gy.png Binary files differdeleted file mode 100644 index 889b5d786e..0000000000 --- a/plugins/UserCountry/images/flags/gy.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/hk.png b/plugins/UserCountry/images/flags/hk.png Binary files differdeleted file mode 100644 index 5a3663a87c..0000000000 --- a/plugins/UserCountry/images/flags/hk.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/hm.png b/plugins/UserCountry/images/flags/hm.png Binary files differdeleted file mode 100644 index 709eac00de..0000000000 --- a/plugins/UserCountry/images/flags/hm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/hn.png b/plugins/UserCountry/images/flags/hn.png Binary files differdeleted file mode 100644 index d29296df9c..0000000000 --- a/plugins/UserCountry/images/flags/hn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/hr.png b/plugins/UserCountry/images/flags/hr.png Binary files differdeleted file mode 100644 index 20c66c3a60..0000000000 --- a/plugins/UserCountry/images/flags/hr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ht.png b/plugins/UserCountry/images/flags/ht.png Binary files differdeleted file mode 100644 index 7aef235b83..0000000000 --- a/plugins/UserCountry/images/flags/ht.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/hu.png b/plugins/UserCountry/images/flags/hu.png Binary files differdeleted file mode 100644 index 2d01818314..0000000000 --- a/plugins/UserCountry/images/flags/hu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ic.png b/plugins/UserCountry/images/flags/ic.png Binary files differdeleted file mode 100644 index 3e48fe66e3..0000000000 --- a/plugins/UserCountry/images/flags/ic.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/id.png b/plugins/UserCountry/images/flags/id.png Binary files differdeleted file mode 100644 index 2f67d57320..0000000000 --- a/plugins/UserCountry/images/flags/id.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ie.png b/plugins/UserCountry/images/flags/ie.png Binary files differdeleted file mode 100644 index 9a799f8640..0000000000 --- a/plugins/UserCountry/images/flags/ie.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/il.png b/plugins/UserCountry/images/flags/il.png Binary files differdeleted file mode 100644 index 6512bedf75..0000000000 --- a/plugins/UserCountry/images/flags/il.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/im.png b/plugins/UserCountry/images/flags/im.png Binary files differdeleted file mode 100644 index 8df02545dc..0000000000 --- a/plugins/UserCountry/images/flags/im.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/in.png b/plugins/UserCountry/images/flags/in.png Binary files differdeleted file mode 100644 index 351c6a51d9..0000000000 --- a/plugins/UserCountry/images/flags/in.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/io.png b/plugins/UserCountry/images/flags/io.png Binary files differdeleted file mode 100644 index d87ed5f932..0000000000 --- a/plugins/UserCountry/images/flags/io.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/iq.png b/plugins/UserCountry/images/flags/iq.png Binary files differdeleted file mode 100644 index 4eb6b878bd..0000000000 --- a/plugins/UserCountry/images/flags/iq.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ir.png b/plugins/UserCountry/images/flags/ir.png Binary files differdeleted file mode 100644 index f60fb8ac2b..0000000000 --- a/plugins/UserCountry/images/flags/ir.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/is.png b/plugins/UserCountry/images/flags/is.png Binary files differdeleted file mode 100644 index a4f546273d..0000000000 --- a/plugins/UserCountry/images/flags/is.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/it.png b/plugins/UserCountry/images/flags/it.png Binary files differdeleted file mode 100644 index 534fd5e657..0000000000 --- a/plugins/UserCountry/images/flags/it.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/je.png b/plugins/UserCountry/images/flags/je.png Binary files differdeleted file mode 100644 index 76758f4cd3..0000000000 --- a/plugins/UserCountry/images/flags/je.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/jm.png b/plugins/UserCountry/images/flags/jm.png Binary files differdeleted file mode 100644 index f4012fa0dc..0000000000 --- a/plugins/UserCountry/images/flags/jm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/jo.png b/plugins/UserCountry/images/flags/jo.png Binary files differdeleted file mode 100644 index f7beba7ead..0000000000 --- a/plugins/UserCountry/images/flags/jo.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/jp.png b/plugins/UserCountry/images/flags/jp.png Binary files differdeleted file mode 100644 index 0dc03c944b..0000000000 --- a/plugins/UserCountry/images/flags/jp.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ke.png b/plugins/UserCountry/images/flags/ke.png Binary files differdeleted file mode 100644 index 5842ce3c42..0000000000 --- a/plugins/UserCountry/images/flags/ke.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/kg.png b/plugins/UserCountry/images/flags/kg.png Binary files differdeleted file mode 100644 index 766bc89816..0000000000 --- a/plugins/UserCountry/images/flags/kg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/kh.png b/plugins/UserCountry/images/flags/kh.png Binary files differdeleted file mode 100644 index c2d9aea1ce..0000000000 --- a/plugins/UserCountry/images/flags/kh.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ki.png b/plugins/UserCountry/images/flags/ki.png Binary files differdeleted file mode 100644 index 89bc45b7bd..0000000000 --- a/plugins/UserCountry/images/flags/ki.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/km.png b/plugins/UserCountry/images/flags/km.png Binary files differdeleted file mode 100644 index adfe5fb1c3..0000000000 --- a/plugins/UserCountry/images/flags/km.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/kn.png b/plugins/UserCountry/images/flags/kn.png Binary files differdeleted file mode 100644 index 4460ff6053..0000000000 --- a/plugins/UserCountry/images/flags/kn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/kp.png b/plugins/UserCountry/images/flags/kp.png Binary files differdeleted file mode 100644 index 134a9f1adf..0000000000 --- a/plugins/UserCountry/images/flags/kp.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/kr.png b/plugins/UserCountry/images/flags/kr.png Binary files differdeleted file mode 100644 index 09ad2c39b5..0000000000 --- a/plugins/UserCountry/images/flags/kr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/kw.png b/plugins/UserCountry/images/flags/kw.png Binary files differdeleted file mode 100644 index 2742d890f3..0000000000 --- a/plugins/UserCountry/images/flags/kw.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ky.png b/plugins/UserCountry/images/flags/ky.png Binary files differdeleted file mode 100644 index 3f0de844a1..0000000000 --- a/plugins/UserCountry/images/flags/ky.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/kz.png b/plugins/UserCountry/images/flags/kz.png Binary files differdeleted file mode 100644 index 37a7ddf08e..0000000000 --- a/plugins/UserCountry/images/flags/kz.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/la.png b/plugins/UserCountry/images/flags/la.png Binary files differdeleted file mode 100644 index 7d5b624359..0000000000 --- a/plugins/UserCountry/images/flags/la.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/lb.png b/plugins/UserCountry/images/flags/lb.png Binary files differdeleted file mode 100644 index 8affe4a819..0000000000 --- a/plugins/UserCountry/images/flags/lb.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/lc.png b/plugins/UserCountry/images/flags/lc.png Binary files differdeleted file mode 100644 index 2c9870761b..0000000000 --- a/plugins/UserCountry/images/flags/lc.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/li.png b/plugins/UserCountry/images/flags/li.png Binary files differdeleted file mode 100644 index 0d7ad9717c..0000000000 --- a/plugins/UserCountry/images/flags/li.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/lk.png b/plugins/UserCountry/images/flags/lk.png Binary files differdeleted file mode 100644 index 0d14120392..0000000000 --- a/plugins/UserCountry/images/flags/lk.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/lr.png b/plugins/UserCountry/images/flags/lr.png Binary files differdeleted file mode 100644 index 2376d28817..0000000000 --- a/plugins/UserCountry/images/flags/lr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ls.png b/plugins/UserCountry/images/flags/ls.png Binary files differdeleted file mode 100644 index dbc9ccb644..0000000000 --- a/plugins/UserCountry/images/flags/ls.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/lt.png b/plugins/UserCountry/images/flags/lt.png Binary files differdeleted file mode 100644 index ace453f7f2..0000000000 --- a/plugins/UserCountry/images/flags/lt.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/lu.png b/plugins/UserCountry/images/flags/lu.png Binary files differdeleted file mode 100644 index 4a9e3d5d9a..0000000000 --- a/plugins/UserCountry/images/flags/lu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/lv.png b/plugins/UserCountry/images/flags/lv.png Binary files differdeleted file mode 100644 index d9236f966b..0000000000 --- a/plugins/UserCountry/images/flags/lv.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ly.png b/plugins/UserCountry/images/flags/ly.png Binary files differdeleted file mode 100644 index b5bd4c1607..0000000000 --- a/plugins/UserCountry/images/flags/ly.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ma.png b/plugins/UserCountry/images/flags/ma.png Binary files differdeleted file mode 100644 index 44f2961c1b..0000000000 --- a/plugins/UserCountry/images/flags/ma.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mc.png b/plugins/UserCountry/images/flags/mc.png Binary files differdeleted file mode 100644 index ecc5edb750..0000000000 --- a/plugins/UserCountry/images/flags/mc.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/md.png b/plugins/UserCountry/images/flags/md.png Binary files differdeleted file mode 100644 index 80b6bf63af..0000000000 --- a/plugins/UserCountry/images/flags/md.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/me.png b/plugins/UserCountry/images/flags/me.png Binary files differdeleted file mode 100644 index 0a3ee99b21..0000000000 --- a/plugins/UserCountry/images/flags/me.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mf.png b/plugins/UserCountry/images/flags/mf.png Binary files differdeleted file mode 100644 index 744ede391d..0000000000 --- a/plugins/UserCountry/images/flags/mf.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mg.png b/plugins/UserCountry/images/flags/mg.png Binary files differdeleted file mode 100644 index b8740f880c..0000000000 --- a/plugins/UserCountry/images/flags/mg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mh.png b/plugins/UserCountry/images/flags/mh.png Binary files differdeleted file mode 100644 index 9cf98c1546..0000000000 --- a/plugins/UserCountry/images/flags/mh.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mk.png b/plugins/UserCountry/images/flags/mk.png Binary files differdeleted file mode 100644 index ee987490be..0000000000 --- a/plugins/UserCountry/images/flags/mk.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ml.png b/plugins/UserCountry/images/flags/ml.png Binary files differdeleted file mode 100644 index a28459d13f..0000000000 --- a/plugins/UserCountry/images/flags/ml.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mm.png b/plugins/UserCountry/images/flags/mm.png Binary files differdeleted file mode 100644 index 772f931f0b..0000000000 --- a/plugins/UserCountry/images/flags/mm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mn.png b/plugins/UserCountry/images/flags/mn.png Binary files differdeleted file mode 100644 index cc6c412171..0000000000 --- a/plugins/UserCountry/images/flags/mn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mo.png b/plugins/UserCountry/images/flags/mo.png Binary files differdeleted file mode 100644 index fc49f581ee..0000000000 --- a/plugins/UserCountry/images/flags/mo.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mp.png b/plugins/UserCountry/images/flags/mp.png Binary files differdeleted file mode 100644 index df0c4b8c18..0000000000 --- a/plugins/UserCountry/images/flags/mp.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mq.png b/plugins/UserCountry/images/flags/mq.png Binary files differdeleted file mode 100644 index 6ebdb3ab6c..0000000000 --- a/plugins/UserCountry/images/flags/mq.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mr.png b/plugins/UserCountry/images/flags/mr.png Binary files differdeleted file mode 100644 index 6700d1ce92..0000000000 --- a/plugins/UserCountry/images/flags/mr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ms.png b/plugins/UserCountry/images/flags/ms.png Binary files differdeleted file mode 100644 index aef23fc512..0000000000 --- a/plugins/UserCountry/images/flags/ms.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mt.png b/plugins/UserCountry/images/flags/mt.png Binary files differdeleted file mode 100644 index 837261ebc2..0000000000 --- a/plugins/UserCountry/images/flags/mt.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mu.png b/plugins/UserCountry/images/flags/mu.png Binary files differdeleted file mode 100644 index c1e8b909d3..0000000000 --- a/plugins/UserCountry/images/flags/mu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mv.png b/plugins/UserCountry/images/flags/mv.png Binary files differdeleted file mode 100644 index f03f90ac65..0000000000 --- a/plugins/UserCountry/images/flags/mv.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mw.png b/plugins/UserCountry/images/flags/mw.png Binary files differdeleted file mode 100644 index 45ea61d87f..0000000000 --- a/plugins/UserCountry/images/flags/mw.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mx.png b/plugins/UserCountry/images/flags/mx.png Binary files differdeleted file mode 100644 index c78ac89691..0000000000 --- a/plugins/UserCountry/images/flags/mx.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/my.png b/plugins/UserCountry/images/flags/my.png Binary files differdeleted file mode 100644 index d47867be7a..0000000000 --- a/plugins/UserCountry/images/flags/my.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/mz.png b/plugins/UserCountry/images/flags/mz.png Binary files differdeleted file mode 100644 index 464017e923..0000000000 --- a/plugins/UserCountry/images/flags/mz.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/na.png b/plugins/UserCountry/images/flags/na.png Binary files differdeleted file mode 100644 index d685c4973d..0000000000 --- a/plugins/UserCountry/images/flags/na.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/nc.png b/plugins/UserCountry/images/flags/nc.png Binary files differdeleted file mode 100644 index 88f4ea8559..0000000000 --- a/plugins/UserCountry/images/flags/nc.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ne.png b/plugins/UserCountry/images/flags/ne.png Binary files differdeleted file mode 100644 index b5f3b8f06d..0000000000 --- a/plugins/UserCountry/images/flags/ne.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/nf.png b/plugins/UserCountry/images/flags/nf.png Binary files differdeleted file mode 100644 index b00b331fe3..0000000000 --- a/plugins/UserCountry/images/flags/nf.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ng.png b/plugins/UserCountry/images/flags/ng.png Binary files differdeleted file mode 100644 index 6dcc973ed5..0000000000 --- a/plugins/UserCountry/images/flags/ng.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ni.png b/plugins/UserCountry/images/flags/ni.png Binary files differdeleted file mode 100644 index 44d8a0d3bd..0000000000 --- a/plugins/UserCountry/images/flags/ni.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/nl.png b/plugins/UserCountry/images/flags/nl.png Binary files differdeleted file mode 100644 index 77f75f6ffa..0000000000 --- a/plugins/UserCountry/images/flags/nl.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/no.png b/plugins/UserCountry/images/flags/no.png Binary files differdeleted file mode 100644 index 74264c5866..0000000000 --- a/plugins/UserCountry/images/flags/no.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/np.png b/plugins/UserCountry/images/flags/np.png Binary files differdeleted file mode 100644 index 2afe8d7e5f..0000000000 --- a/plugins/UserCountry/images/flags/np.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/nr.png b/plugins/UserCountry/images/flags/nr.png Binary files differdeleted file mode 100644 index 211e42bb19..0000000000 --- a/plugins/UserCountry/images/flags/nr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/nt.png b/plugins/UserCountry/images/flags/nt.png Binary files differdeleted file mode 100644 index b253914525..0000000000 --- a/plugins/UserCountry/images/flags/nt.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/nu.png b/plugins/UserCountry/images/flags/nu.png Binary files differdeleted file mode 100644 index b9f7f988f4..0000000000 --- a/plugins/UserCountry/images/flags/nu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/nz.png b/plugins/UserCountry/images/flags/nz.png Binary files differdeleted file mode 100644 index be935de872..0000000000 --- a/plugins/UserCountry/images/flags/nz.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/o1.png b/plugins/UserCountry/images/flags/o1.png Binary files differdeleted file mode 100644 index da6e1bbe89..0000000000 --- a/plugins/UserCountry/images/flags/o1.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/om.png b/plugins/UserCountry/images/flags/om.png Binary files differdeleted file mode 100644 index ec95c5aeb9..0000000000 --- a/plugins/UserCountry/images/flags/om.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pa.png b/plugins/UserCountry/images/flags/pa.png Binary files differdeleted file mode 100644 index a8a6ea5083..0000000000 --- a/plugins/UserCountry/images/flags/pa.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pe.png b/plugins/UserCountry/images/flags/pe.png Binary files differdeleted file mode 100644 index 1cf08251f1..0000000000 --- a/plugins/UserCountry/images/flags/pe.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pf.png b/plugins/UserCountry/images/flags/pf.png Binary files differdeleted file mode 100644 index 7e471d6438..0000000000 --- a/plugins/UserCountry/images/flags/pf.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pg.png b/plugins/UserCountry/images/flags/pg.png Binary files differdeleted file mode 100644 index 87160a51ee..0000000000 --- a/plugins/UserCountry/images/flags/pg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ph.png b/plugins/UserCountry/images/flags/ph.png Binary files differdeleted file mode 100644 index 703dd735a5..0000000000 --- a/plugins/UserCountry/images/flags/ph.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pk.png b/plugins/UserCountry/images/flags/pk.png Binary files differdeleted file mode 100644 index f20f3f6e2e..0000000000 --- a/plugins/UserCountry/images/flags/pk.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pl.png b/plugins/UserCountry/images/flags/pl.png Binary files differdeleted file mode 100644 index f6997a2ca6..0000000000 --- a/plugins/UserCountry/images/flags/pl.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pm.png b/plugins/UserCountry/images/flags/pm.png Binary files differdeleted file mode 100644 index 4aa799ba7b..0000000000 --- a/plugins/UserCountry/images/flags/pm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pn.png b/plugins/UserCountry/images/flags/pn.png Binary files differdeleted file mode 100644 index 6f62a64d65..0000000000 --- a/plugins/UserCountry/images/flags/pn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pr.png b/plugins/UserCountry/images/flags/pr.png Binary files differdeleted file mode 100644 index 4bf609fec4..0000000000 --- a/plugins/UserCountry/images/flags/pr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ps.png b/plugins/UserCountry/images/flags/ps.png Binary files differdeleted file mode 100644 index dd1d7821ec..0000000000 --- a/plugins/UserCountry/images/flags/ps.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pt.png b/plugins/UserCountry/images/flags/pt.png Binary files differdeleted file mode 100644 index 67e4878e88..0000000000 --- a/plugins/UserCountry/images/flags/pt.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/pw.png b/plugins/UserCountry/images/flags/pw.png Binary files differdeleted file mode 100644 index 71fd0a48ca..0000000000 --- a/plugins/UserCountry/images/flags/pw.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/py.png b/plugins/UserCountry/images/flags/py.png Binary files differdeleted file mode 100644 index 182d9dc0a9..0000000000 --- a/plugins/UserCountry/images/flags/py.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/qa.png b/plugins/UserCountry/images/flags/qa.png Binary files differdeleted file mode 100644 index 86c39fadaa..0000000000 --- a/plugins/UserCountry/images/flags/qa.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/re.png b/plugins/UserCountry/images/flags/re.png Binary files differdeleted file mode 100644 index 744ede391d..0000000000 --- a/plugins/UserCountry/images/flags/re.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ro.png b/plugins/UserCountry/images/flags/ro.png Binary files differdeleted file mode 100644 index 2535bc81f2..0000000000 --- a/plugins/UserCountry/images/flags/ro.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/rs.png b/plugins/UserCountry/images/flags/rs.png Binary files differdeleted file mode 100644 index 32f6cb945b..0000000000 --- a/plugins/UserCountry/images/flags/rs.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ru.png b/plugins/UserCountry/images/flags/ru.png Binary files differdeleted file mode 100644 index 096b9c44e7..0000000000 --- a/plugins/UserCountry/images/flags/ru.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/rw.png b/plugins/UserCountry/images/flags/rw.png Binary files differdeleted file mode 100644 index f4b0136eae..0000000000 --- a/plugins/UserCountry/images/flags/rw.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sa.png b/plugins/UserCountry/images/flags/sa.png Binary files differdeleted file mode 100644 index 03cecfb8c9..0000000000 --- a/plugins/UserCountry/images/flags/sa.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sb.png b/plugins/UserCountry/images/flags/sb.png Binary files differdeleted file mode 100644 index 8af1fb9d2f..0000000000 --- a/plugins/UserCountry/images/flags/sb.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sc.png b/plugins/UserCountry/images/flags/sc.png Binary files differdeleted file mode 100644 index fec2961dbb..0000000000 --- a/plugins/UserCountry/images/flags/sc.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sd.png b/plugins/UserCountry/images/flags/sd.png Binary files differdeleted file mode 100644 index eba0a2079b..0000000000 --- a/plugins/UserCountry/images/flags/sd.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/se.png b/plugins/UserCountry/images/flags/se.png Binary files differdeleted file mode 100644 index e2b347c78b..0000000000 --- a/plugins/UserCountry/images/flags/se.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sf.png b/plugins/UserCountry/images/flags/sf.png Binary files differdeleted file mode 100644 index f3b1058cd4..0000000000 --- a/plugins/UserCountry/images/flags/sf.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sg.png b/plugins/UserCountry/images/flags/sg.png Binary files differdeleted file mode 100644 index 84172cae18..0000000000 --- a/plugins/UserCountry/images/flags/sg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sh.png b/plugins/UserCountry/images/flags/sh.png Binary files differdeleted file mode 100644 index 7e724d4781..0000000000 --- a/plugins/UserCountry/images/flags/sh.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/si.png b/plugins/UserCountry/images/flags/si.png Binary files differdeleted file mode 100644 index 266b9df29d..0000000000 --- a/plugins/UserCountry/images/flags/si.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sj.png b/plugins/UserCountry/images/flags/sj.png Binary files differdeleted file mode 100644 index 74264c5866..0000000000 --- a/plugins/UserCountry/images/flags/sj.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sk.png b/plugins/UserCountry/images/flags/sk.png Binary files differdeleted file mode 100644 index 53d286a6e1..0000000000 --- a/plugins/UserCountry/images/flags/sk.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sl.png b/plugins/UserCountry/images/flags/sl.png Binary files differdeleted file mode 100644 index c59445bc58..0000000000 --- a/plugins/UserCountry/images/flags/sl.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sm.png b/plugins/UserCountry/images/flags/sm.png Binary files differdeleted file mode 100644 index 65ceb3aa49..0000000000 --- a/plugins/UserCountry/images/flags/sm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sn.png b/plugins/UserCountry/images/flags/sn.png Binary files differdeleted file mode 100644 index 89961cb89b..0000000000 --- a/plugins/UserCountry/images/flags/sn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/so.png b/plugins/UserCountry/images/flags/so.png Binary files differdeleted file mode 100644 index 00750dae44..0000000000 --- a/plugins/UserCountry/images/flags/so.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sr.png b/plugins/UserCountry/images/flags/sr.png Binary files differdeleted file mode 100644 index 764f544694..0000000000 --- a/plugins/UserCountry/images/flags/sr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ss.png b/plugins/UserCountry/images/flags/ss.png Binary files differdeleted file mode 100644 index 84a52ca247..0000000000 --- a/plugins/UserCountry/images/flags/ss.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/st.png b/plugins/UserCountry/images/flags/st.png Binary files differdeleted file mode 100644 index dd62dce7ff..0000000000 --- a/plugins/UserCountry/images/flags/st.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/su.png b/plugins/UserCountry/images/flags/su.png Binary files differdeleted file mode 100644 index 3e1d87c962..0000000000 --- a/plugins/UserCountry/images/flags/su.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sv.png b/plugins/UserCountry/images/flags/sv.png Binary files differdeleted file mode 100644 index 03ce5ec83c..0000000000 --- a/plugins/UserCountry/images/flags/sv.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sx.png b/plugins/UserCountry/images/flags/sx.png Binary files differdeleted file mode 100644 index 229d4014ba..0000000000 --- a/plugins/UserCountry/images/flags/sx.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sy.png b/plugins/UserCountry/images/flags/sy.png Binary files differdeleted file mode 100644 index 83de9ef018..0000000000 --- a/plugins/UserCountry/images/flags/sy.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/sz.png b/plugins/UserCountry/images/flags/sz.png Binary files differdeleted file mode 100644 index 6e40120260..0000000000 --- a/plugins/UserCountry/images/flags/sz.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ta.png b/plugins/UserCountry/images/flags/ta.png Binary files differdeleted file mode 100644 index b0eaef6dc5..0000000000 --- a/plugins/UserCountry/images/flags/ta.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tc.png b/plugins/UserCountry/images/flags/tc.png Binary files differdeleted file mode 100644 index 0c96ec08c8..0000000000 --- a/plugins/UserCountry/images/flags/tc.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/td.png b/plugins/UserCountry/images/flags/td.png Binary files differdeleted file mode 100644 index 6e2da09705..0000000000 --- a/plugins/UserCountry/images/flags/td.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tf.png b/plugins/UserCountry/images/flags/tf.png Binary files differdeleted file mode 100644 index 3ed6bc60ad..0000000000 --- a/plugins/UserCountry/images/flags/tf.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tg.png b/plugins/UserCountry/images/flags/tg.png Binary files differdeleted file mode 100644 index 2ab18d070a..0000000000 --- a/plugins/UserCountry/images/flags/tg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/th.png b/plugins/UserCountry/images/flags/th.png Binary files differdeleted file mode 100644 index c1817ebc94..0000000000 --- a/plugins/UserCountry/images/flags/th.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ti.png b/plugins/UserCountry/images/flags/ti.png Binary files differdeleted file mode 100644 index 0253120670..0000000000 --- a/plugins/UserCountry/images/flags/ti.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tj.png b/plugins/UserCountry/images/flags/tj.png Binary files differdeleted file mode 100644 index e1ddbb0889..0000000000 --- a/plugins/UserCountry/images/flags/tj.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tk.png b/plugins/UserCountry/images/flags/tk.png Binary files differdeleted file mode 100644 index 107ce1494f..0000000000 --- a/plugins/UserCountry/images/flags/tk.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tl.png b/plugins/UserCountry/images/flags/tl.png Binary files differdeleted file mode 100644 index 0fa1b59794..0000000000 --- a/plugins/UserCountry/images/flags/tl.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tm.png b/plugins/UserCountry/images/flags/tm.png Binary files differdeleted file mode 100644 index cb1b24dd1e..0000000000 --- a/plugins/UserCountry/images/flags/tm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tn.png b/plugins/UserCountry/images/flags/tn.png Binary files differdeleted file mode 100644 index 33d830d502..0000000000 --- a/plugins/UserCountry/images/flags/tn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/to.png b/plugins/UserCountry/images/flags/to.png Binary files differdeleted file mode 100644 index 8b0aa02145..0000000000 --- a/plugins/UserCountry/images/flags/to.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tp.png b/plugins/UserCountry/images/flags/tp.png Binary files differdeleted file mode 100644 index 0fa1b59794..0000000000 --- a/plugins/UserCountry/images/flags/tp.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tr.png b/plugins/UserCountry/images/flags/tr.png Binary files differdeleted file mode 100644 index 3698f405fa..0000000000 --- a/plugins/UserCountry/images/flags/tr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tt.png b/plugins/UserCountry/images/flags/tt.png Binary files differdeleted file mode 100644 index 4f36edb09f..0000000000 --- a/plugins/UserCountry/images/flags/tt.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tv.png b/plugins/UserCountry/images/flags/tv.png Binary files differdeleted file mode 100644 index e1fcffcade..0000000000 --- a/plugins/UserCountry/images/flags/tv.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tw.png b/plugins/UserCountry/images/flags/tw.png Binary files differdeleted file mode 100644 index 39ac6e00cd..0000000000 --- a/plugins/UserCountry/images/flags/tw.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/tz.png b/plugins/UserCountry/images/flags/tz.png Binary files differdeleted file mode 100644 index e31644b158..0000000000 --- a/plugins/UserCountry/images/flags/tz.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ua.png b/plugins/UserCountry/images/flags/ua.png Binary files differdeleted file mode 100644 index ddda0b21ab..0000000000 --- a/plugins/UserCountry/images/flags/ua.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ug.png b/plugins/UserCountry/images/flags/ug.png Binary files differdeleted file mode 100644 index 7a77615592..0000000000 --- a/plugins/UserCountry/images/flags/ug.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/uk.png b/plugins/UserCountry/images/flags/uk.png Binary files differdeleted file mode 100644 index 405e897c52..0000000000 --- a/plugins/UserCountry/images/flags/uk.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/um.png b/plugins/UserCountry/images/flags/um.png Binary files differdeleted file mode 100644 index 9ff9ecf851..0000000000 --- a/plugins/UserCountry/images/flags/um.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/us.png b/plugins/UserCountry/images/flags/us.png Binary files differdeleted file mode 100644 index a60ef55968..0000000000 --- a/plugins/UserCountry/images/flags/us.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/uy.png b/plugins/UserCountry/images/flags/uy.png Binary files differdeleted file mode 100644 index 7aff0bc68f..0000000000 --- a/plugins/UserCountry/images/flags/uy.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/uz.png b/plugins/UserCountry/images/flags/uz.png Binary files differdeleted file mode 100644 index c3ba2ddcf2..0000000000 --- a/plugins/UserCountry/images/flags/uz.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/va.png b/plugins/UserCountry/images/flags/va.png Binary files differdeleted file mode 100644 index c9be43d266..0000000000 --- a/plugins/UserCountry/images/flags/va.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/vc.png b/plugins/UserCountry/images/flags/vc.png Binary files differdeleted file mode 100644 index a7935eee68..0000000000 --- a/plugins/UserCountry/images/flags/vc.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ve.png b/plugins/UserCountry/images/flags/ve.png Binary files differdeleted file mode 100644 index 43eb422e11..0000000000 --- a/plugins/UserCountry/images/flags/ve.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/vg.png b/plugins/UserCountry/images/flags/vg.png Binary files differdeleted file mode 100644 index 63afb343ca..0000000000 --- a/plugins/UserCountry/images/flags/vg.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/vi.png b/plugins/UserCountry/images/flags/vi.png Binary files differdeleted file mode 100644 index dc0d214ae6..0000000000 --- a/plugins/UserCountry/images/flags/vi.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/vn.png b/plugins/UserCountry/images/flags/vn.png Binary files differdeleted file mode 100644 index a2cd8a151a..0000000000 --- a/plugins/UserCountry/images/flags/vn.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/vu.png b/plugins/UserCountry/images/flags/vu.png Binary files differdeleted file mode 100644 index e7972bc01d..0000000000 --- a/plugins/UserCountry/images/flags/vu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/wf.png b/plugins/UserCountry/images/flags/wf.png Binary files differdeleted file mode 100644 index d9d33e18b0..0000000000 --- a/plugins/UserCountry/images/flags/wf.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ws.png b/plugins/UserCountry/images/flags/ws.png Binary files differdeleted file mode 100644 index 8b40fdd224..0000000000 --- a/plugins/UserCountry/images/flags/ws.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/xx.png b/plugins/UserCountry/images/flags/xx.png Binary files differdeleted file mode 100644 index da6e1bbe89..0000000000 --- a/plugins/UserCountry/images/flags/xx.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/ye.png b/plugins/UserCountry/images/flags/ye.png Binary files differdeleted file mode 100644 index 6437e6f918..0000000000 --- a/plugins/UserCountry/images/flags/ye.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/yt.png b/plugins/UserCountry/images/flags/yt.png Binary files differdeleted file mode 100644 index ca9bacbbf7..0000000000 --- a/plugins/UserCountry/images/flags/yt.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/yu.png b/plugins/UserCountry/images/flags/yu.png Binary files differdeleted file mode 100644 index 0e0fb6deba..0000000000 --- a/plugins/UserCountry/images/flags/yu.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/za.png b/plugins/UserCountry/images/flags/za.png Binary files differdeleted file mode 100644 index 5200bf9761..0000000000 --- a/plugins/UserCountry/images/flags/za.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/zm.png b/plugins/UserCountry/images/flags/zm.png Binary files differdeleted file mode 100644 index 5145ab5547..0000000000 --- a/plugins/UserCountry/images/flags/zm.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/zr.png b/plugins/UserCountry/images/flags/zr.png Binary files differdeleted file mode 100644 index 0811ccce06..0000000000 --- a/plugins/UserCountry/images/flags/zr.png +++ /dev/null diff --git a/plugins/UserCountry/images/flags/zw.png b/plugins/UserCountry/images/flags/zw.png Binary files differdeleted file mode 100644 index 3d2d4b6591..0000000000 --- a/plugins/UserCountry/images/flags/zw.png +++ /dev/null diff --git a/plugins/UserCountry/stylesheets/userCountry.less b/plugins/UserCountry/stylesheets/userCountry.less index fc080b25c3..c035ece395 100755 --- a/plugins/UserCountry/stylesheets/userCountry.less +++ b/plugins/UserCountry/stylesheets/userCountry.less @@ -1,3 +1,10 @@ +#widgetUserCountrygetRegion, #widgetUserCountrygetCountry, #widgetUserCountrygetCity { + .dataTable .label img { + border: 1px solid lightgray; + box-sizing: content-box; + margin-top: -1px; + } +} input.location-provider { cursor: pointer; diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml index af2eb4e1ed..ae227475bd 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml @@ -28,7 +28,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> <row> <label>Vancouver, British Columbia, Canada</label> @@ -60,7 +60,7 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> <row> <label>Besançon, Franche-Comte, France</label> @@ -92,7 +92,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Franche-Comte</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> <row> <label>Lhasa, Unknown, Tibet</label> @@ -124,7 +124,7 @@ <country>ti</country> <country_name>Tibet</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/ti.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ti.png</logo> </row> <row> <label>Rome, Lazio, Italy</label> @@ -156,6 +156,6 @@ <country>it</country> <country_name>Italy</country_name> <region_name>Lazio</region_name> - <logo>plugins/UserCountry/images/flags/it.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/it.png</logo> </row> </result>
\ No newline at end of file diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml index 66bfe2fbc3..1c8ba290ed 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml @@ -23,10 +23,9 @@ <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>cn</code> - <logo>plugins/UserCountry/images/flags/cn.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/cn.png</logo> <segment>countryCode==cn</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Canada</label> @@ -51,10 +50,9 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>ca</code> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> <segment>countryCode==ca</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>France</label> @@ -79,10 +77,9 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <code>fr</code> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> <segment>countryCode==fr</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Indonesia</label> @@ -107,10 +104,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>id</code> - <logo>plugins/UserCountry/images/flags/id.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/id.png</logo> <segment>countryCode==id</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Italy</label> @@ -135,10 +131,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>it</code> - <logo>plugins/UserCountry/images/flags/it.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/it.png</logo> <segment>countryCode==it</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>Tibet</label> @@ -163,10 +158,9 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>ti</code> - <logo>plugins/UserCountry/images/flags/ti.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ti.png</logo> <segment>countryCode==ti</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> <row> <label>United States</label> @@ -191,9 +185,8 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <code>us</code> - <logo>plugins/UserCountry/images/flags/us.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/us.png</logo> <segment>countryCode==us</segment> - <logoWidth>16</logoWidth> - <logoHeight>11</logoHeight> + <logoHeight>16</logoHeight> </row> </result>
\ No newline at end of file diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml index 26b27b21a9..49fc389c31 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml @@ -26,7 +26,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/xx.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/xx.png</logo> </row> <row> <label>British Columbia, Canada</label> @@ -55,7 +55,7 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/images/flags/ca.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ca.png</logo> </row> <row> <label>Franche-Comte, France</label> @@ -84,7 +84,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Franche-Comte</region_name> - <logo>plugins/UserCountry/images/flags/fr.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/fr.png</logo> </row> <row> <label>Lazio, Italy</label> @@ -113,7 +113,7 @@ <country>it</country> <country_name>Italy</country_name> <region_name>Lazio</region_name> - <logo>plugins/UserCountry/images/flags/it.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/it.png</logo> </row> <row> <label>Unknown, Tibet</label> @@ -142,6 +142,6 @@ <country>ti</country> <country_name>Tibet</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/images/flags/ti.png</logo> + <logo>plugins/Morpheus/icons/dist/flags/ti.png</logo> </row> </result>
\ No newline at end of file diff --git a/plugins/UserCountry/tests/Unit/UserCountryTest.php b/plugins/UserCountry/tests/Unit/UserCountryTest.php index c2db05db2d..7dfc80521b 100644 --- a/plugins/UserCountry/tests/Unit/UserCountryTest.php +++ b/plugins/UserCountry/tests/Unit/UserCountryTest.php @@ -51,7 +51,7 @@ class UserCountryTest extends \PHPUnit_Framework_TestCase $countries = $dataProvider->getCountryList(true); // Get list of existing flag icons - $flags = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/UserCountry/images/flags/'); + $flags = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/Morpheus/icons/dist/flags/'); // Get list of countries foreach ($countries as $country => $continent) { diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js index 105f12eae0..8e1240228c 100644 --- a/plugins/UserCountryMap/javascripts/realtime-map.js +++ b/plugins/UserCountryMap/javascripts/realtime-map.js @@ -215,10 +215,10 @@ function visitTooltip(r) { var ds = new Date().getTime() / 1000 - r.lastActionTimestamp, ad = r.actionDetails, - ico = function (src, square) { return '<img' + (square ? ' width="16px" height="16px"' : '') + ' src="' + src + '" alt="" class="icon" /> '; }; + ico = function (src) { return '<img height="16px" src="' + src + '" alt="" class="icon" /> '; }; return '<h3>' + (r.city ? r.city + ' / ' : '') + r.country + '</h3>' + // icons - ico(r.countryFlag) + ico(r.browserIcon, true) + ico(r.operatingSystemIcon, true) + '<br/>' + + ico(r.countryFlag) + ico(r.browserIcon) + ico(r.operatingSystemIcon) + '<br/>' + // User ID (r.userId ? _pk_translate('General_UserId') + ': ' + r.userId + '<br/>' : '') + // last action diff --git a/plugins/UserId/Reports/GetUsers.php b/plugins/UserId/Reports/GetUsers.php index 776c29e02f..7fba70f472 100644 --- a/plugins/UserId/Reports/GetUsers.php +++ b/plugins/UserId/Reports/GetUsers.php @@ -25,11 +25,12 @@ class GetUsers extends Base { parent::init(); - $this->name = Piwik::translate('UserId_UserReportTitle'); - $this->subcategoryId = 'UserId_UserReportTitle'; - $this->documentation = ''; - $this->dimension = new UserId(); - $this->metrics = array('label', 'nb_visits', 'nb_actions', 'nb_visits_converted'); + $this->name = Piwik::translate('UserId_UserReportTitle'); + $this->subcategoryId = 'UserId_UserReportTitle'; + $this->documentation = ''; + $this->dimension = new UserId(); + $this->metrics = array('label', 'nb_visits', 'nb_actions', 'nb_visits_converted'); + $this->supportsFlatten = false; // This defines in which order your report appears in the mobile app, in the menu and in the list of widgets $this->order = 9; @@ -60,7 +61,6 @@ class GetUsers extends Base $view->config->show_related_reports = false; $view->config->show_insights = false; $view->config->show_pivot_by_subtable = false; - $view->config->show_flatten_table = false; if ($view->isViewDataTableId(HtmlTable::ID)) { $view->config->disable_row_evolution = false; |
