Skip to content

Commit

Permalink
refs matomo-org#3962 - moved os/browser images to DevicesDetection pl…
Browse files Browse the repository at this point in the history
…ugin
  • Loading branch information
sgiehl committed Dec 8, 2014
1 parent 0e058f9 commit 49577cd
Show file tree
Hide file tree
Showing 249 changed files with 513 additions and 513 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down Expand Up @@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down Expand Up @@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down Expand Up @@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down Expand Up @@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down Expand Up @@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,12 @@
<deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser>
<browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion>
<events>0</events>
Expand Down
4 changes: 2 additions & 2 deletions plugins/DevicesDetection/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ function getBrowserName($label)
*/
function getBrowserLogo($short)
{
$path = 'plugins/UserSettings/images/browsers/%s.gif';
$path = 'plugins/DevicesDetection/images/browsers/%s.gif';

// If name is given instead of short code, try to find matching shortcode
if (strlen($short) > 2) {
Expand Down Expand Up @@ -258,7 +258,7 @@ function _mapLegacyOsShortCodes($shortCode)
*/
function getOsLogo($short)
{
$path = 'plugins/UserSettings/images/os/%s.gif';
$path = 'plugins/DevicesDetection/images/os/%s.gif';

$short = _mapLegacyOsShortCodes($short);

Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Mac OS</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>webkit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 19.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>19.0</browserVersion>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -171,11 +171,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 6.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>6.0</browserVersion>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -265,11 +265,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>webkit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Chrome 19.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/CH.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon>
<browserCode>CH</browserCode>
<browserVersion>19.0</browserVersion>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -359,11 +359,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>webkit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Epiphany 2.30</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -453,11 +453,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Windows 7</operatingSystem>
<operatingSystemCode>WI7</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WI7.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/WI7.gif</operatingSystemIcon>
<browserFamily>ie</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 9.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>9.0</browserVersion>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -547,11 +547,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browserName>Firefox 6.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode>
<browserVersion>6.0</browserVersion>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -641,11 +641,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Linux</operatingSystem>
<operatingSystemCode>LIN</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/LIN.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon>
<browserFamily>webkit</browserFamily>
<browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription>
<browserName>Epiphany 2.30</browserName>
<browserIcon>plugins/UserSettings/images/browsers/EP.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon>
<browserCode>EP</browserCode>
<browserVersion>2.30</browserVersion>
<deviceType>Desktop</deviceType>
Expand Down Expand Up @@ -735,11 +735,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Android</operatingSystem>
<operatingSystemCode>AND</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/AND.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>Android Browser </browserName>
<browserIcon>plugins/UserSettings/images/browsers/AN.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon>
<browserCode>AN</browserCode>
<browserVersion />
<deviceType>Smartphone</deviceType>
Expand Down Expand Up @@ -829,11 +829,11 @@
<referrerSearchEngineIcon />
<operatingSystem>Mac OS</operatingSystem>
<operatingSystemCode>MAC</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/MAC.gif</operatingSystemIcon>
<operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon>
<browserFamily>unknown</browserFamily>
<browserFamilyDescription>Unknown</browserFamilyDescription>
<browserName>RockMelt 0.9</browserName>
<browserIcon>plugins/UserSettings/images/browsers/UNK.gif</browserIcon>
<browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon>
<browserCode>RM</browserCode>
<browserVersion>0.9</browserVersion>
<deviceType>Desktop</deviceType>
Expand Down
Loading

0 comments on commit 49577cd

Please sign in to comment.