Skip to content
Extraits de code Groupes Projets
Valider 49577cd2 rédigé par sgiehl's avatar sgiehl
Parcourir les fichiers

refs #3962 - moved os/browser images to DevicesDetection plugin

parent 0e058f9c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 24 ajouts et 24 suppressions
plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+ 4
− 4
Voir le fichier @ 49577cd2
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
......
plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+ 4
− 4
Voir le fichier @ 49577cd2
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
......
plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+ 4
− 4
Voir le fichier @ 49577cd2
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
......
plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+ 4
− 4
Voir le fichier @ 49577cd2
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
......
plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+ 4
− 4
Voir le fichier @ 49577cd2
...@@ -46,12 +46,12 @@ ...@@ -46,12 +46,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
......
plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
+ 2
− 2
Voir le fichier @ 49577cd2
...@@ -119,12 +119,12 @@ ...@@ -119,12 +119,12 @@
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
<operatingSystemIcon>plugins/UserSettings/images/os/WXP.gif</operatingSystemIcon> <operatingSystemIcon>plugins/DevicesDetection/images/os/WXP.gif</operatingSystemIcon>
<browserFamily>Gecko</browserFamily> <browserFamily>Gecko</browserFamily>
<browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription>
<browser>Firefox 3.6</browser> <browser>Firefox 3.6</browser>
<browserName>Firefox</browserName> <browserName>Firefox</browserName>
<browserIcon>plugins/UserSettings/images/browsers/FF.gif</browserIcon> <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon>
<browserCode>FF</browserCode> <browserCode>FF</browserCode>
<browserVersion>3.6</browserVersion> <browserVersion>3.6</browserVersion>
<events>0</events> <events>0</events>
......
plugins/DevicesDetection/functions.php
+ 2
− 2
Voir le fichier @ 49577cd2
...@@ -80,7 +80,7 @@ function getBrowserName($label) ...@@ -80,7 +80,7 @@ function getBrowserName($label)
*/ */
function getBrowserLogo($short) 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 name is given instead of short code, try to find matching shortcode
if (strlen($short) > 2) { if (strlen($short) > 2) {
...@@ -258,7 +258,7 @@ function _mapLegacyOsShortCodes($shortCode) ...@@ -258,7 +258,7 @@ function _mapLegacyOsShortCodes($shortCode)
*/ */
function getOsLogo($short) function getOsLogo($short)
{ {
$path = 'plugins/UserSettings/images/os/%s.gif'; $path = 'plugins/DevicesDetection/images/os/%s.gif';
$short = _mapLegacyOsShortCodes($short); $short = _mapLegacyOsShortCodes($short);
......
plugins/UserSettings/images/browsers/AA.gif → plugins/DevicesDetection/images/browsers/AA.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/AB.gif → plugins/DevicesDetection/images/browsers/AB.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/AG.gif → plugins/DevicesDetection/images/browsers/AG.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/AM.gif → plugins/DevicesDetection/images/browsers/AM.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/AN.gif → plugins/DevicesDetection/images/browsers/AN.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/AR.gif → plugins/DevicesDetection/images/browsers/AR.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/AV.gif → plugins/DevicesDetection/images/browsers/AV.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/AW.gif → plugins/DevicesDetection/images/browsers/AW.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/B2.gif → plugins/DevicesDetection/images/browsers/B2.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/BB.gif → plugins/DevicesDetection/images/browsers/BB.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/BD.gif → plugins/DevicesDetection/images/browsers/BD.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/BE.gif → plugins/DevicesDetection/images/browsers/BE.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
plugins/UserSettings/images/browsers/BJ.gif → plugins/DevicesDetection/images/browsers/BJ.gif
+0 o (+0%)
Voir le fichier @ 49577cd2
Le fichier a été supprimé par une entrée .gitattributes, ou son encodage n'est pas pris en charge.
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter