diff options
author | sgiehl <stefan@piwik.org> | 2015-01-20 01:09:44 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2015-01-20 01:09:44 +0300 |
commit | 567b68c9586e85a512b40f41eb36b2322902f9c2 (patch) | |
tree | 9eaa50d6d5bd41fa206d3a54b35d85ca95c71e13 /plugins | |
parent | fa4ae23332189ec1e2e9a5eff47d80a82fbb27cf (diff) |
removed old windows icons; updated some tests
Diffstat (limited to 'plugins')
23 files changed, 23 insertions, 23 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 95459f0177..587229bf99 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 @@ -51,8 +51,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +149,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 95459f0177..587229bf99 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 @@ -51,8 +51,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +149,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 95459f0177..587229bf99 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 @@ -51,8 +51,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +149,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 95459f0177..587229bf99 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 @@ -51,8 +51,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +149,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 95459f0177..587229bf99 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 @@ -51,8 +51,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> @@ -149,8 +149,8 @@ <referrerSearchEngineIcon /> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> 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 00263a9a2c..c25ce30caa 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 @@ -92,8 +92,8 @@ <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <deviceType>Desktop</deviceType> <operatingSystem>Windows XP</operatingSystem> - <operatingSystemCode>WXP</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon> + <operatingSystemCode>WIN</operatingSystemCode> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> diff --git a/plugins/DevicesDetection/Columns/Os.php b/plugins/DevicesDetection/Columns/Os.php index affce6cd6e..f8c66bee3f 100644 --- a/plugins/DevicesDetection/Columns/Os.php +++ b/plugins/DevicesDetection/Columns/Os.php @@ -25,7 +25,7 @@ class Os extends Base $segment = new Segment(); $segment->setSegment('operatingSystemCode'); $segment->setName('DevicesDetection_ColumnOperatingSystem'); - $segment->setAcceptedValues('WXP, WI7, MAC, LIN, AND, IPD, etc.'); + $segment->setAcceptedValues('WIN, MAC, LIN, AND, IPD, etc.'); $this->addSegment($segment); } diff --git a/plugins/DevicesDetection/images/os/W10.gif b/plugins/DevicesDetection/images/os/W10.gif Binary files differdeleted file mode 100644 index 76ffe21587..0000000000 --- a/plugins/DevicesDetection/images/os/W10.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W2K.gif b/plugins/DevicesDetection/images/os/W2K.gif Binary files differdeleted file mode 100644 index db610368b9..0000000000 --- a/plugins/DevicesDetection/images/os/W2K.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W61.gif b/plugins/DevicesDetection/images/os/W61.gif Binary files differdeleted file mode 100644 index 773c4d48d1..0000000000 --- a/plugins/DevicesDetection/images/os/W61.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W65.gif b/plugins/DevicesDetection/images/os/W65.gif Binary files differdeleted file mode 100644 index 773c4d48d1..0000000000 --- a/plugins/DevicesDetection/images/os/W65.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W75.gif b/plugins/DevicesDetection/images/os/W75.gif Binary files differdeleted file mode 100644 index 3ca9cebca0..0000000000 --- a/plugins/DevicesDetection/images/os/W75.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W81.gif b/plugins/DevicesDetection/images/os/W81.gif Binary files differdeleted file mode 100644 index 76ffe21587..0000000000 --- a/plugins/DevicesDetection/images/os/W81.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W95.gif b/plugins/DevicesDetection/images/os/W95.gif Binary files differdeleted file mode 100644 index db610368b9..0000000000 --- a/plugins/DevicesDetection/images/os/W95.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/W98.gif b/plugins/DevicesDetection/images/os/W98.gif Binary files differdeleted file mode 100644 index db610368b9..0000000000 --- a/plugins/DevicesDetection/images/os/W98.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WI7.gif b/plugins/DevicesDetection/images/os/WI7.gif Binary files differdeleted file mode 100644 index 486f78064a..0000000000 --- a/plugins/DevicesDetection/images/os/WI7.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WI8.gif b/plugins/DevicesDetection/images/os/WI8.gif Binary files differdeleted file mode 100644 index 76ffe21587..0000000000 --- a/plugins/DevicesDetection/images/os/WI8.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WME.gif b/plugins/DevicesDetection/images/os/WME.gif Binary files differdeleted file mode 100644 index 1ba0336426..0000000000 --- a/plugins/DevicesDetection/images/os/WME.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WNT.gif b/plugins/DevicesDetection/images/os/WNT.gif Binary files differdeleted file mode 100644 index db610368b9..0000000000 --- a/plugins/DevicesDetection/images/os/WNT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WP7.gif b/plugins/DevicesDetection/images/os/WP7.gif Binary files differdeleted file mode 100644 index 3ca9cebca0..0000000000 --- a/plugins/DevicesDetection/images/os/WP7.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WS3.gif b/plugins/DevicesDetection/images/os/WS3.gif Binary files differdeleted file mode 100644 index 486f78064a..0000000000 --- a/plugins/DevicesDetection/images/os/WS3.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WVI.gif b/plugins/DevicesDetection/images/os/WVI.gif Binary files differdeleted file mode 100644 index 486f78064a..0000000000 --- a/plugins/DevicesDetection/images/os/WVI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WXP.gif b/plugins/DevicesDetection/images/os/WXP.gif Binary files differdeleted file mode 100644 index 486f78064a..0000000000 --- a/plugins/DevicesDetection/images/os/WXP.gif +++ /dev/null |