diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-04-26 09:52:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 09:52:46 +0300 |
| commit | 317700513cc732bb2371edbe645555feadbbc545 (patch) | |
| tree | efc28c578903563cd72d8436dbefcec32ab161c7 /plugins | |
| parent | bc8222d451337185db343486319af6782b009148 (diff) | |
| parent | 199e43ef5809d09803416db72ce0ace6c9a4d895 (diff) | |
Merge pull request #11651 from piwik/3.x-dev3.0.4-b1
Release Piwik 3.0.4-b1
Diffstat (limited to 'plugins')
33 files changed, 78 insertions, 139 deletions
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 b16427cf44..0513e6b34b 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 @@ -56,7 +56,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -168,7 +168,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 b16427cf44..0513e6b34b 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 @@ -56,7 +56,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -168,7 +168,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 b16427cf44..0513e6b34b 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 @@ -56,7 +56,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -168,7 +168,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 b16427cf44..0513e6b34b 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 @@ -56,7 +56,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -168,7 +168,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> 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 b16427cf44..0513e6b34b 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 @@ -56,7 +56,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> @@ -168,7 +168,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> diff --git a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu-model.js b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu-model.js index ca26581da0..d2979772bb 100644 --- a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu-model.js +++ b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu-model.js @@ -147,6 +147,7 @@ var pagesPromise = reportingPagesModel.reloadAllPages(); return pagesPromise.then(function (pages) { model.menu = buildMenuFromPages(pages); + return model.menu; }); } diff --git a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js index dd2b685dc5..1c94136827 100644 --- a/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js +++ b/plugins/CoreHome/angularjs/reporting-menu/reportingmenu.controller.js @@ -120,6 +120,21 @@ } }); + $rootScope.$on('updateReportingMenu', function () { + menuModel.reloadMenuItems().then(function (menu) { + var $search = $location.search(); + var category = $search.category; + var subcategory = $search.subcategory; + // we need to make sure to select same categories again + if (category && subcategory) { + var found = menuModel.findSubcategory(category, subcategory); + if (found) { + enterSubcategory(found.category, found.subcategory, found.subsubcategory); + } + } + }); + }); + $rootScope.$on('$locationChangeSuccess', function () { var $search = $location.search(); var category = $search.category; diff --git a/plugins/CoreHome/templates/_dataTableCell.twig b/plugins/CoreHome/templates/_dataTableCell.twig index 8b1c2b99e3..2db3545136 100644 --- a/plugins/CoreHome/templates/_dataTableCell.twig +++ b/plugins/CoreHome/templates/_dataTableCell.twig @@ -46,7 +46,7 @@ {{ piwik.logoHtml(row.getMetadata(), row.getColumn('label')) }} {% if row.getMetadata('html_label_prefix') %}<span class='label-prefix'>{{ row.getMetadata('html_label_prefix') | raw }} </span>{% endif -%} {% endif %}<span class="value"> - {%- if row.getColumn(column) or (column=='label' and row.getColumn(column) is same as("0")) %}{% if column=='label' %}{{- row.getColumn(column)|rawSafeDecoded -}}{% else %}{{- row.getColumn(column)|number(2,0)|raw -}}{% endif %} + {%- if row.getColumn(column) or (column=='label' and row.getColumn(column) is same as("0")) %}{% if column=='label' %}{{- row.getColumn(column)|rawSafeDecoded -}}{% else %}{% if row.getMetadata('html_column_' ~ column ~ '_prefix') %}<span class='column-prefix'>{{ row.getMetadata('html_column_' ~ column ~ '_prefix') | raw }} </span>{% endif -%}{{- row.getColumn(column)|number(2,0)|rawSafeDecoded -}}{% endif %} {%- else -%}- {%- endif -%}</span> {% if column=='label' %}{%- if row.getMetadata('html_label_suffix') %}<span class='label-suffix'>{{ row.getMetadata('html_label_suffix') | raw }}</span>{% endif -%}</span>{% endif %} diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject ebc37665207419a365d74d7d595b038715de20b +Subproject 25f77f15039c714b6f7a73ec2bf2a06da9034ee 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 4a884ae177..3c1c505115 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 @@ -97,7 +97,7 @@ <languageCode>fr</languageCode> <language>French</language> <deviceType>Desktop</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/normal.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Windows XP</operatingSystem> diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index af821c43c7..8aa6f312d3 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -155,26 +155,13 @@ function getDeviceTypeLogo($label) { if (is_numeric($label) && in_array($label, DeviceParser::getAvailableDeviceTypes())) { $label = array_search($label, DeviceParser::getAvailableDeviceTypes()); - } - - $label = strtolower($label); - - $deviceTypeLogos = Array( - "desktop" => "normal.png", - "smartphone" => "smartphone.png", - "tablet" => "tablet.png", - "tv" => "tv.png", - "feature phone" => "mobile.png", - "console" => "console.png", - "car browser" => "carbrowser.png", - "camera" => "camera.png"); - - if (!array_key_exists($label, $deviceTypeLogos)) { - $label = 'unknown.png'; + $label = strtolower($label); + $label = str_replace(' ', '_', $label); } else { - $label = $deviceTypeLogos[$label]; + $label = "unknown"; } - $path = 'plugins/DevicesDetection/images/screens/' . $label; + + $path = 'plugins/Morpheus/icons/dist/devices/' . $label . ".png"; return $path; } diff --git a/plugins/DevicesDetection/images/screens/camera.png b/plugins/DevicesDetection/images/screens/camera.png Binary files differdeleted file mode 100644 index bd9deed867..0000000000 --- a/plugins/DevicesDetection/images/screens/camera.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/carbrowser.png b/plugins/DevicesDetection/images/screens/carbrowser.png Binary files differdeleted file mode 100644 index 4200115cc8..0000000000 --- a/plugins/DevicesDetection/images/screens/carbrowser.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/computer.png b/plugins/DevicesDetection/images/screens/computer.png Binary files differdeleted file mode 100644 index 9763689e6f..0000000000 --- a/plugins/DevicesDetection/images/screens/computer.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/console.png b/plugins/DevicesDetection/images/screens/console.png Binary files differdeleted file mode 100644 index 78bcdfa660..0000000000 --- a/plugins/DevicesDetection/images/screens/console.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/dual.png b/plugins/DevicesDetection/images/screens/dual.png Binary files differdeleted file mode 100644 index 0311d7c599..0000000000 --- a/plugins/DevicesDetection/images/screens/dual.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/mobile.png b/plugins/DevicesDetection/images/screens/mobile.png Binary files differdeleted file mode 100644 index 77e59f4b84..0000000000 --- a/plugins/DevicesDetection/images/screens/mobile.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/normal.png b/plugins/DevicesDetection/images/screens/normal.png Binary files differdeleted file mode 100644 index a89b2421c5..0000000000 --- a/plugins/DevicesDetection/images/screens/normal.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/smartphone.png b/plugins/DevicesDetection/images/screens/smartphone.png Binary files differdeleted file mode 100644 index c5bfb31ca4..0000000000 --- a/plugins/DevicesDetection/images/screens/smartphone.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/tablet.png b/plugins/DevicesDetection/images/screens/tablet.png Binary files differdeleted file mode 100644 index e6ac30bdd8..0000000000 --- a/plugins/DevicesDetection/images/screens/tablet.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/tv.png b/plugins/DevicesDetection/images/screens/tv.png Binary files differdeleted file mode 100644 index fb6db07cf4..0000000000 --- a/plugins/DevicesDetection/images/screens/tv.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/unknown.png b/plugins/DevicesDetection/images/screens/unknown.png Binary files differdeleted file mode 100644 index 166a505bbc..0000000000 --- a/plugins/DevicesDetection/images/screens/unknown.png +++ /dev/null diff --git a/plugins/DevicesDetection/images/screens/wide.png b/plugins/DevicesDetection/images/screens/wide.png Binary files differdeleted file mode 100644 index 8a7bb13d7e..0000000000 --- a/plugins/DevicesDetection/images/screens/wide.png +++ /dev/null diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml index 7db59b5306..bab8a9f0cf 100644 --- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml +++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml @@ -19,7 +19,7 @@ <nb_conversions>2</nb_conversions> <revenue>52.26</revenue> <segment>deviceType==tablet</segment> - <logo>plugins/DevicesDetection/images/screens/tablet.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/tablet.png</logo> </row> <row> <label>Smartphone</label> @@ -40,7 +40,7 @@ <nb_conversions>2</nb_conversions> <revenue>52.26</revenue> <segment>deviceType==smartphone</segment> - <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/smartphone.png</logo> </row> <row> <label>Unknown</label> @@ -60,7 +60,7 @@ </goals> <nb_conversions>2</nb_conversions> <revenue>52.26</revenue> - <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/unknown.png</logo> </row> <row> <label>Desktop</label> @@ -81,7 +81,7 @@ <nb_conversions>1</nb_conversions> <revenue>10</revenue> <segment>deviceType==desktop</segment> - <logo>plugins/DevicesDetection/images/screens/normal.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/desktop.png</logo> </row> <row> <label>Tv</label> @@ -94,48 +94,48 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>deviceType==tv</segment> - <logo>plugins/DevicesDetection/images/screens/tv.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/tv.png</logo> </row> <row> <label>Camera</label> <nb_visits>0</nb_visits> <segment>deviceType==camera</segment> - <logo>plugins/DevicesDetection/images/screens/camera.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/camera.png</logo> </row> <row> <label>Car browser</label> <nb_visits>0</nb_visits> <segment>deviceType==car+browser</segment> - <logo>plugins/DevicesDetection/images/screens/carbrowser.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/car_browser.png</logo> </row> <row> <label>Console</label> <nb_visits>0</nb_visits> <segment>deviceType==console</segment> - <logo>plugins/DevicesDetection/images/screens/console.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/console.png</logo> </row> <row> <label>Feature phone</label> <nb_visits>0</nb_visits> <segment>deviceType==feature+phone</segment> - <logo>plugins/DevicesDetection/images/screens/mobile.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/feature_phone.png</logo> </row> <row> <label>Phablet</label> <nb_visits>0</nb_visits> <segment>deviceType==phablet</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/phablet.png</logo> </row> <row> <label>Portable media player</label> <nb_visits>0</nb_visits> <segment>deviceType==portable+media+player</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/portable_media_player.png</logo> </row> <row> <label>Smart display</label> <nb_visits>0</nb_visits> <segment>deviceType==smart+display</segment> - <logo>plugins/DevicesDetection/images/screens/unknown.png</logo> + <logo>plugins/Morpheus/icons/dist/devices/smart_display.png</logo> </row> </result>
\ 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 6d2f99e5d5..95e3605e4c 100644 --- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml @@ -110,7 +110,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -218,7 +218,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -326,7 +326,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -434,7 +434,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -542,7 +542,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -650,7 +650,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -758,7 +758,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -866,7 +866,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -974,7 +974,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1082,7 +1082,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> 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 1e3914be4c..42517f659c 100644 --- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml @@ -110,7 +110,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -218,7 +218,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -326,7 +326,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -434,7 +434,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -542,7 +542,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -650,7 +650,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -758,7 +758,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -866,7 +866,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -974,7 +974,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1082,7 +1082,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1190,7 +1190,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1298,7 +1298,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1406,7 +1406,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1514,7 +1514,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1622,7 +1622,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1730,7 +1730,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1838,7 +1838,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -1946,7 +1946,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -2054,7 +2054,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> @@ -2162,7 +2162,7 @@ <languageCode /> <language>Unknown</language> <deviceType>Unknown</deviceType> - <deviceTypeIcon>plugins/DevicesDetection/images/screens/unknown.png</deviceTypeIcon> + <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/unknown.png</deviceTypeIcon> <deviceBrand>Unknown</deviceBrand> <deviceModel /> <operatingSystem>Unknown</operatingSystem> diff --git a/plugins/Marketplace/stylesheets/marketplace.less b/plugins/Marketplace/stylesheets/marketplace.less index 2a4115e60f..e5302fa270 100644 --- a/plugins/Marketplace/stylesheets/marketplace.less +++ b/plugins/Marketplace/stylesheets/marketplace.less @@ -108,7 +108,7 @@ list-style: none; li { text-overflow: ellipsis; - overflow-x: hidden; + overflow: hidden; white-space: nowrap; line-height: 18px; font-size: 13px; diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons -Subproject 10891baaf590cc0026bb7caefc2edf597d79a7e +Subproject 3937b5daef048afb3446fbbeb6cdca5b9f6d6f5 diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php index fdadbf518f..574b014454 100644 --- a/plugins/SEO/API.php +++ b/plugins/SEO/API.php @@ -23,7 +23,7 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/functions.php'; /** * The SEO API lets you access a list of SEO metrics for the specified URL: Google PageRank, Google/Bing indexed pages - * Alexa Rank, age of the Domain name and count of DMOZ entries. + * Alexa Rank and age of the Domain name. * * @method static API getInstance() */ diff --git a/plugins/SEO/Metric/Aggregator.php b/plugins/SEO/Metric/Aggregator.php index ef3c93e606..6b81744087 100644 --- a/plugins/SEO/Metric/Aggregator.php +++ b/plugins/SEO/Metric/Aggregator.php @@ -50,7 +50,6 @@ class Aggregator implements MetricsProvider $container->get('Piwik\Plugins\SEO\Metric\Bing'), $container->get('Piwik\Plugins\SEO\Metric\Alexa'), $container->get('Piwik\Plugins\SEO\Metric\DomainAge'), - $container->get('Piwik\Plugins\SEO\Metric\Dmoz'), ); /** diff --git a/plugins/SEO/Metric/Dmoz.php b/plugins/SEO/Metric/Dmoz.php deleted file mode 100644 index c14792aa31..0000000000 --- a/plugins/SEO/Metric/Dmoz.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -namespace Piwik\Plugins\SEO\Metric; - -use Piwik\Http; -use Piwik\NumberFormatter; -use Psr\Log\LoggerInterface; - -/** - * Retrieves the number of Dmoz.org entries. - */ -class Dmoz implements MetricsProvider -{ - const URL = 'http://www.dmoz.org/search?q='; - - /** - * @var LoggerInterface - */ - private $logger; - - /** - * @param LoggerInterface $logger - */ - public function __construct(LoggerInterface $logger) - { - $this->logger = $logger; - } - - public function getMetrics($domain) - { - try { - $response = Http::sendHttpRequest(self::URL . urlencode($domain), $timeout = 10, @$_SERVER['HTTP_USER_AGENT']); - - preg_match('#[0-9] - [0-9]+ of ([0-9]+)#', $response, $p); - if (!empty($p[1])) { - $value = NumberFormatter::getInstance()->formatNumber((int)$p[1]); - } else { - $value = 0; - } - - // Add DMOZ only if > 0 entries found - if ($value == 0) { - return array(); - } - } catch (\Exception $e) { - $this->logger->warning('Error while getting Dmoz SEO stats: {message}', array('message' => $e->getMessage())); - $value = null; - } - - $logo = "plugins/Morpheus/icons/dist/SEO/dmoz.org.png"; - - return array( - new Metric('dmoz', 'SEO_Dmoz', $value, $logo) - ); - } -} diff --git a/plugins/SEO/lang/en.json b/plugins/SEO/lang/en.json index 7007ad48f2..589d445fd2 100644 --- a/plugins/SEO/lang/en.json +++ b/plugins/SEO/lang/en.json @@ -3,11 +3,10 @@ "PluginDescription": "This Plugin extracts and displays SEO metrics: Alexa web ranking, Google Pagerank, number of Indexed pages and backlinks of the currently selected website.", "AlexaRank": "Alexa Rank", "Bing_IndexedPages": "Bing indexed pages", - "Dmoz": "DMOZ entries", "DomainAge": "Domain Age", "Google_IndexedPages": "Google indexed pages", "Rank": "Rank", "SeoRankings": "SEO Rankings", "SEORankingsFor": "SEO Rankings for %s" } -}
\ No newline at end of file +} diff --git a/plugins/TreemapVisualization b/plugins/TreemapVisualization -Subproject 1b92d94a0a927563accf9507664f40a7c3eb2d2 +Subproject 5dca6c69cc1dcd002518846afe181b591485438 |
