diff --git a/plugins/CoreHome/Visitor.php b/plugins/CoreHome/Visitor.php index efc818a2f1950d224adef57cf4ce09040fab779a..962eabce31dd7b45bfdce1ba1f2697eb96604739 100644 --- a/plugins/CoreHome/Visitor.php +++ b/plugins/CoreHome/Visitor.php @@ -32,9 +32,9 @@ class Visitor $status = $this->getVisitEcommerceStatus(); if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) { - return "plugins/Morpheus/images/ecommerceOrder.gif"; + return "plugins/Morpheus/images/ecommerceOrder.png"; } elseif ($status == 'abandonedCart') { - return "plugins/Morpheus/images/ecommerceAbandonedCart.gif"; + return "plugins/Morpheus/images/ecommerceAbandonedCart.png"; } // Note: it is important that there is no icon when there was no ecommerce conversion return null; @@ -83,7 +83,7 @@ class Visitor if ($type == 'returning' || $type == 'returningCustomer' ) { - return "plugins/Live/images/returningVisitor.gif"; + return "plugins/Live/images/returningVisitor.png"; } return null; } diff --git a/plugins/CoreHome/images/bg_header.jpg b/plugins/CoreHome/images/bg_header.jpg deleted file mode 100644 index 1733b0e355c7670cad30d6bd645565ee90013529..0000000000000000000000000000000000000000 Binary files a/plugins/CoreHome/images/bg_header.jpg and /dev/null differ diff --git a/plugins/CoreHome/images/bg_header.png b/plugins/CoreHome/images/bg_header.png new file mode 100644 index 0000000000000000000000000000000000000000..f0fc545f9f2f66cd2a8aa59830a4a9c8c29a2270 Binary files /dev/null and b/plugins/CoreHome/images/bg_header.png differ diff --git a/plugins/CoreHome/images/bullet1.gif b/plugins/CoreHome/images/bullet1.gif deleted file mode 100644 index f2707da68c56cae54cc62b357f4acb14d99195e9..0000000000000000000000000000000000000000 Binary files a/plugins/CoreHome/images/bullet1.gif and /dev/null differ diff --git a/plugins/CoreHome/images/bullet1.png b/plugins/CoreHome/images/bullet1.png new file mode 100644 index 0000000000000000000000000000000000000000..6a4bc2a467ea4d156c242ca68f69324f7c4ad2bd Binary files /dev/null and b/plugins/CoreHome/images/bullet1.png differ diff --git a/plugins/CoreHome/images/bullet2.gif b/plugins/CoreHome/images/bullet2.gif deleted file mode 100644 index 26e1b6af33055b574c8e98e15ea34ddeaf4005e0..0000000000000000000000000000000000000000 Binary files a/plugins/CoreHome/images/bullet2.gif and /dev/null differ diff --git a/plugins/CoreHome/images/bullet2.png b/plugins/CoreHome/images/bullet2.png new file mode 100644 index 0000000000000000000000000000000000000000..2e00eda5ec845ccbab38ecf250cc4d7c7b13b5cb Binary files /dev/null and b/plugins/CoreHome/images/bullet2.png differ diff --git a/plugins/CoreHome/images/favicon.ico b/plugins/CoreHome/images/favicon.ico index e29ea5b4203afbec34f390a7a5a4e10b6d2a38ba..616228c5bc402a4c7cc058106187665cb2769b6b 100644 Binary files a/plugins/CoreHome/images/favicon.ico and b/plugins/CoreHome/images/favicon.ico differ diff --git a/plugins/CoreHome/images/more_date.gif b/plugins/CoreHome/images/more_date.gif deleted file mode 100644 index 87da6b4963a889de9911a348841238c274d7ea61..0000000000000000000000000000000000000000 Binary files a/plugins/CoreHome/images/more_date.gif and /dev/null differ diff --git a/plugins/CoreHome/images/more_date.png b/plugins/CoreHome/images/more_date.png new file mode 100644 index 0000000000000000000000000000000000000000..17983a7e4a22cdbe80e7c7b1cfd51a5fe3f0464f Binary files /dev/null and b/plugins/CoreHome/images/more_date.png differ diff --git a/plugins/CoreHome/images/more_period.gif b/plugins/CoreHome/images/more_period.gif deleted file mode 100644 index b0c9787851ade06be664b0939e363b792dcef74d..0000000000000000000000000000000000000000 Binary files a/plugins/CoreHome/images/more_period.gif and /dev/null differ diff --git a/plugins/CoreHome/images/more_period.png b/plugins/CoreHome/images/more_period.png new file mode 100644 index 0000000000000000000000000000000000000000..92b10dd7824e553b218cee1c4693c9edc8c65938 Binary files /dev/null and b/plugins/CoreHome/images/more_period.png differ diff --git a/plugins/CoreHome/templates/_dataTableCell.twig b/plugins/CoreHome/templates/_dataTableCell.twig index 3a54c3fac02699a7b9643307e9291def76daefc0..cd49028b33a388437eb9f604d0c94dbe07afbdd2 100644 --- a/plugins/CoreHome/templates/_dataTableCell.twig +++ b/plugins/CoreHome/templates/_dataTableCell.twig @@ -7,7 +7,7 @@ href='{% if row.getMetadata('url')|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.getMetadata('url')|rawSafeDecoded }}'> {% if not row.getMetadata('logo') %} <img class="link" width="10" height="9" - src="plugins/Morpheus/images/link.gif"/> + src="plugins/Morpheus/images/link.png"/> {% endif %} {% endif %} diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig index 10263d0c8715bd1b70da0fbec94d4a7cb0beb726..c4de056774e720ac112ce9c33f33ab2b00ce98ed 100755 --- a/plugins/CoreHome/templates/_donate.twig +++ b/plugins/CoreHome/templates/_donate.twig @@ -33,7 +33,7 @@ </div> <div class="donate-submit"> - <input type="image" src="plugins/Morpheus/images/paypal_subscribe.gif" border="0" name="submit" + <input type="image" src="plugins/Morpheus/images/paypal_subscribe.png" border="0" name="submit" title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/> <a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a> <a href="index.php?module=CoreHome&action=redirectToPaypal&idSite=1&cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82" diff --git a/plugins/CorePluginsAdmin/images/paypal_donate.jpg b/plugins/CorePluginsAdmin/images/paypal_donate.jpg deleted file mode 100644 index e21d93f2c6dad417e11f0763cd333c3c7ab7a2c6..0000000000000000000000000000000000000000 Binary files a/plugins/CorePluginsAdmin/images/paypal_donate.jpg and /dev/null differ diff --git a/plugins/CorePluginsAdmin/images/paypal_donate.png b/plugins/CorePluginsAdmin/images/paypal_donate.png new file mode 100644 index 0000000000000000000000000000000000000000..45a1df1786704bcd7e1c120215feec3bf82f4c13 Binary files /dev/null and b/plugins/CorePluginsAdmin/images/paypal_donate.png differ diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index 81b026322003da3996d7cdf29b9e761287d7041d..6e6f3c7115b39b75e7b86bf582952eccdd7fd9ca 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -158,7 +158,7 @@ <p>{{ 'CorePluginsAdmin_ConsiderDonatingCreatorOf'|translate("<b>" ~ name ~ "</b>")|raw }}</p> <div class="donation-links"> {% if plugin.info.donate.paypal is defined and plugin.info.donate.paypal %} - <a class="donation-link paypal" target="_blank" href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&item_name=Piwik%20Plugin%20{{ name|escape('url') }}&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted&business={{ plugin.info.donate.paypal|escape('url') }}"><img src="plugins/CorePluginsAdmin/images/paypal_donate.jpg" height="30"/></a> + <a class="donation-link paypal" target="_blank" href="https://www.paypal.com/cgi-bin/webscr?cmd=_donations&item_name=Piwik%20Plugin%20{{ name|escape('url') }}&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted&business={{ plugin.info.donate.paypal|escape('url') }}"><img src="plugins/CorePluginsAdmin/images/paypal_donate.png" height="30"/></a> {% endif %} {% if plugin.info.donate.flattr is defined and plugin.info.donate.flattr %} <a class="donation-link flattr" target="_blank" href="{{ plugin.info.donate.flattr }}"><img class="alignnone" title="Flattr" alt="" src="plugins/CorePluginsAdmin/images/flattr.png" height="29" /></a> diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index 4f59edc8a983e33ef6c496b2b4a0de609443ad2d..e50edf8dde75b9b39322f3cc4db41e5bc90481d8 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -17,11 +17,11 @@ use DeviceDetector\Parser\Client\Browser AS BrowserParser; function getBrandLogo($label) { $label = preg_replace("/[^a-z0-9_-]+/i", "_", $label); - $path = dirname(__FILE__) . '/images/brand/' . $label . '.ico'; + $path = dirname(__FILE__) . '/images/brand/' . $label . '.png'; if (file_exists($path)) { - return 'plugins/DevicesDetection/images/brand/' . $label . '.ico'; + return 'plugins/DevicesDetection/images/brand/' . $label . '.png'; } else { - return 'plugins/DevicesDetection/images/brand/Unknown.ico'; + return 'plugins/DevicesDetection/images/brand/Unknown.png'; } } @@ -160,17 +160,17 @@ function getDeviceTypeLogo($label) $label = strtolower($label); $deviceTypeLogos = Array( - "desktop" => "normal.gif", + "desktop" => "normal.png", "smartphone" => "smartphone.png", "tablet" => "tablet.png", "tv" => "tv.png", - "feature phone" => "mobile.gif", - "console" => "console.gif", + "feature phone" => "mobile.png", + "console" => "console.png", "car browser" => "carbrowser.png", "camera" => "camera.png"); if (!array_key_exists($label, $deviceTypeLogos)) { - $label = 'unknown.gif'; + $label = 'unknown.png'; } else { $label = $deviceTypeLogos[$label]; } diff --git a/plugins/DevicesDetection/images/brand/3Q.ico b/plugins/DevicesDetection/images/brand/3Q.png similarity index 100% rename from plugins/DevicesDetection/images/brand/3Q.ico rename to plugins/DevicesDetection/images/brand/3Q.png diff --git a/plugins/DevicesDetection/images/brand/Acer.ico b/plugins/DevicesDetection/images/brand/Acer.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Acer.ico rename to plugins/DevicesDetection/images/brand/Acer.png diff --git a/plugins/DevicesDetection/images/brand/Alcatel.ico b/plugins/DevicesDetection/images/brand/Alcatel.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Alcatel.ico rename to plugins/DevicesDetection/images/brand/Alcatel.png diff --git a/plugins/DevicesDetection/images/brand/Apple.ico b/plugins/DevicesDetection/images/brand/Apple.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Apple.ico rename to plugins/DevicesDetection/images/brand/Apple.png diff --git a/plugins/DevicesDetection/images/brand/Archos.ico b/plugins/DevicesDetection/images/brand/Archos.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Archos.ico rename to plugins/DevicesDetection/images/brand/Archos.png diff --git a/plugins/DevicesDetection/images/brand/Asus.ico b/plugins/DevicesDetection/images/brand/Asus.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Asus.ico rename to plugins/DevicesDetection/images/brand/Asus.png diff --git a/plugins/DevicesDetection/images/brand/Audiovox.ico b/plugins/DevicesDetection/images/brand/Audiovox.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Audiovox.ico rename to plugins/DevicesDetection/images/brand/Audiovox.png diff --git a/plugins/DevicesDetection/images/brand/Avvio.ico b/plugins/DevicesDetection/images/brand/Avvio.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Avvio.ico rename to plugins/DevicesDetection/images/brand/Avvio.png diff --git a/plugins/DevicesDetection/images/brand/BBK.ico b/plugins/DevicesDetection/images/brand/BBK.png similarity index 100% rename from plugins/DevicesDetection/images/brand/BBK.ico rename to plugins/DevicesDetection/images/brand/BBK.png diff --git a/plugins/DevicesDetection/images/brand/BangOlufsen.ico b/plugins/DevicesDetection/images/brand/BangOlufsen.png similarity index 100% rename from plugins/DevicesDetection/images/brand/BangOlufsen.ico rename to plugins/DevicesDetection/images/brand/BangOlufsen.png diff --git a/plugins/DevicesDetection/images/brand/Barnes_Noble.ico b/plugins/DevicesDetection/images/brand/Barnes_Noble.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Barnes_Noble.ico rename to plugins/DevicesDetection/images/brand/Barnes_Noble.png diff --git a/plugins/DevicesDetection/images/brand/Becker.ico b/plugins/DevicesDetection/images/brand/Becker.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Becker.ico rename to plugins/DevicesDetection/images/brand/Becker.png diff --git a/plugins/DevicesDetection/images/brand/Beetel.ico b/plugins/DevicesDetection/images/brand/Beetel.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Beetel.ico rename to plugins/DevicesDetection/images/brand/Beetel.png diff --git a/plugins/DevicesDetection/images/brand/BenQ.ico b/plugins/DevicesDetection/images/brand/BenQ.png similarity index 100% rename from plugins/DevicesDetection/images/brand/BenQ.ico rename to plugins/DevicesDetection/images/brand/BenQ.png diff --git a/plugins/DevicesDetection/images/brand/Cat.ico b/plugins/DevicesDetection/images/brand/Cat.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Cat.ico rename to plugins/DevicesDetection/images/brand/Cat.png diff --git a/plugins/DevicesDetection/images/brand/Celkon.ico b/plugins/DevicesDetection/images/brand/Celkon.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Celkon.ico rename to plugins/DevicesDetection/images/brand/Celkon.png diff --git a/plugins/DevicesDetection/images/brand/Cherry_Mobile.ico b/plugins/DevicesDetection/images/brand/Cherry_Mobile.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Cherry_Mobile.ico rename to plugins/DevicesDetection/images/brand/Cherry_Mobile.png diff --git a/plugins/DevicesDetection/images/brand/CnM.ico b/plugins/DevicesDetection/images/brand/CnM.png similarity index 100% rename from plugins/DevicesDetection/images/brand/CnM.ico rename to plugins/DevicesDetection/images/brand/CnM.png diff --git a/plugins/DevicesDetection/images/brand/Compal.ico b/plugins/DevicesDetection/images/brand/Compal.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Compal.ico rename to plugins/DevicesDetection/images/brand/Compal.png diff --git a/plugins/DevicesDetection/images/brand/Compaq.ico b/plugins/DevicesDetection/images/brand/Compaq.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Compaq.ico rename to plugins/DevicesDetection/images/brand/Compaq.png diff --git a/plugins/DevicesDetection/images/brand/ConCorde.ico b/plugins/DevicesDetection/images/brand/ConCorde.png similarity index 100% rename from plugins/DevicesDetection/images/brand/ConCorde.ico rename to plugins/DevicesDetection/images/brand/ConCorde.png diff --git a/plugins/DevicesDetection/images/brand/Coolpad.ico b/plugins/DevicesDetection/images/brand/Coolpad.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Coolpad.ico rename to plugins/DevicesDetection/images/brand/Coolpad.png diff --git a/plugins/DevicesDetection/images/brand/CreNova.ico b/plugins/DevicesDetection/images/brand/CreNova.png similarity index 100% rename from plugins/DevicesDetection/images/brand/CreNova.ico rename to plugins/DevicesDetection/images/brand/CreNova.png diff --git a/plugins/DevicesDetection/images/brand/Cricket.ico b/plugins/DevicesDetection/images/brand/Cricket.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Cricket.ico rename to plugins/DevicesDetection/images/brand/Cricket.png diff --git a/plugins/DevicesDetection/images/brand/Crius_Mea.ico b/plugins/DevicesDetection/images/brand/Crius_Mea.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Crius_Mea.ico rename to plugins/DevicesDetection/images/brand/Crius_Mea.png diff --git a/plugins/DevicesDetection/images/brand/Crosscall.ico b/plugins/DevicesDetection/images/brand/Crosscall.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Crosscall.ico rename to plugins/DevicesDetection/images/brand/Crosscall.png diff --git a/plugins/DevicesDetection/images/brand/DMM.ico b/plugins/DevicesDetection/images/brand/DMM.png similarity index 100% rename from plugins/DevicesDetection/images/brand/DMM.ico rename to plugins/DevicesDetection/images/brand/DMM.png diff --git a/plugins/DevicesDetection/images/brand/Danew.ico b/plugins/DevicesDetection/images/brand/Danew.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Danew.ico rename to plugins/DevicesDetection/images/brand/Danew.png diff --git a/plugins/DevicesDetection/images/brand/Dell.ico b/plugins/DevicesDetection/images/brand/Dell.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Dell.ico rename to plugins/DevicesDetection/images/brand/Dell.png diff --git a/plugins/DevicesDetection/images/brand/Denver.ico b/plugins/DevicesDetection/images/brand/Denver.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Denver.ico rename to plugins/DevicesDetection/images/brand/Denver.png diff --git a/plugins/DevicesDetection/images/brand/DoCoMo.ico b/plugins/DevicesDetection/images/brand/DoCoMo.png similarity index 100% rename from plugins/DevicesDetection/images/brand/DoCoMo.ico rename to plugins/DevicesDetection/images/brand/DoCoMo.png diff --git a/plugins/DevicesDetection/images/brand/Easypix.ico b/plugins/DevicesDetection/images/brand/Easypix.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Easypix.ico rename to plugins/DevicesDetection/images/brand/Easypix.png diff --git a/plugins/DevicesDetection/images/brand/Ericsson.ico b/plugins/DevicesDetection/images/brand/Ericsson.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Ericsson.ico rename to plugins/DevicesDetection/images/brand/Ericsson.png diff --git a/plugins/DevicesDetection/images/brand/Evertek.ico b/plugins/DevicesDetection/images/brand/Evertek.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Evertek.ico rename to plugins/DevicesDetection/images/brand/Evertek.png diff --git a/plugins/DevicesDetection/images/brand/Fly.ico b/plugins/DevicesDetection/images/brand/Fly.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Fly.ico rename to plugins/DevicesDetection/images/brand/Fly.png diff --git a/plugins/DevicesDetection/images/brand/Fujitsu.ico b/plugins/DevicesDetection/images/brand/Fujitsu.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Fujitsu.ico rename to plugins/DevicesDetection/images/brand/Fujitsu.png diff --git a/plugins/DevicesDetection/images/brand/Gemini.ico b/plugins/DevicesDetection/images/brand/Gemini.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Gemini.ico rename to plugins/DevicesDetection/images/brand/Gemini.png diff --git a/plugins/DevicesDetection/images/brand/Gigabyte.ico b/plugins/DevicesDetection/images/brand/Gigabyte.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Gigabyte.ico rename to plugins/DevicesDetection/images/brand/Gigabyte.png diff --git a/plugins/DevicesDetection/images/brand/Gigaset.ico b/plugins/DevicesDetection/images/brand/Gigaset.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Gigaset.ico rename to plugins/DevicesDetection/images/brand/Gigaset.png diff --git a/plugins/DevicesDetection/images/brand/Gionee.ico b/plugins/DevicesDetection/images/brand/Gionee.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Gionee.ico rename to plugins/DevicesDetection/images/brand/Gionee.png diff --git a/plugins/DevicesDetection/images/brand/Google.ico b/plugins/DevicesDetection/images/brand/Google.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Google.ico rename to plugins/DevicesDetection/images/brand/Google.png diff --git a/plugins/DevicesDetection/images/brand/Gradiente.ico b/plugins/DevicesDetection/images/brand/Gradiente.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Gradiente.ico rename to plugins/DevicesDetection/images/brand/Gradiente.png diff --git a/plugins/DevicesDetection/images/brand/Grundig.ico b/plugins/DevicesDetection/images/brand/Grundig.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Grundig.ico rename to plugins/DevicesDetection/images/brand/Grundig.png diff --git a/plugins/DevicesDetection/images/brand/HP.ico b/plugins/DevicesDetection/images/brand/HP.png similarity index 100% rename from plugins/DevicesDetection/images/brand/HP.ico rename to plugins/DevicesDetection/images/brand/HP.png diff --git a/plugins/DevicesDetection/images/brand/HTC.ico b/plugins/DevicesDetection/images/brand/HTC.png similarity index 100% rename from plugins/DevicesDetection/images/brand/HTC.ico rename to plugins/DevicesDetection/images/brand/HTC.png diff --git a/plugins/DevicesDetection/images/brand/Haier.ico b/plugins/DevicesDetection/images/brand/Haier.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Haier.ico rename to plugins/DevicesDetection/images/brand/Haier.png diff --git a/plugins/DevicesDetection/images/brand/Huawei.ico b/plugins/DevicesDetection/images/brand/Huawei.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Huawei.ico rename to plugins/DevicesDetection/images/brand/Huawei.png diff --git a/plugins/DevicesDetection/images/brand/Humax.ico b/plugins/DevicesDetection/images/brand/Humax.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Humax.ico rename to plugins/DevicesDetection/images/brand/Humax.png diff --git a/plugins/DevicesDetection/images/brand/Hyundai.ico b/plugins/DevicesDetection/images/brand/Hyundai.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Hyundai.ico rename to plugins/DevicesDetection/images/brand/Hyundai.png diff --git a/plugins/DevicesDetection/images/brand/INQ.ico b/plugins/DevicesDetection/images/brand/INQ.png similarity index 100% rename from plugins/DevicesDetection/images/brand/INQ.ico rename to plugins/DevicesDetection/images/brand/INQ.png diff --git a/plugins/DevicesDetection/images/brand/Ikea.ico b/plugins/DevicesDetection/images/brand/Ikea.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Ikea.ico rename to plugins/DevicesDetection/images/brand/Ikea.png diff --git a/plugins/DevicesDetection/images/brand/Intek.ico b/plugins/DevicesDetection/images/brand/Intek.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Intek.ico rename to plugins/DevicesDetection/images/brand/Intek.png diff --git a/plugins/DevicesDetection/images/brand/Inverto.ico b/plugins/DevicesDetection/images/brand/Inverto.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Inverto.ico rename to plugins/DevicesDetection/images/brand/Inverto.png diff --git a/plugins/DevicesDetection/images/brand/Jolla.ico b/plugins/DevicesDetection/images/brand/Jolla.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Jolla.ico rename to plugins/DevicesDetection/images/brand/Jolla.png diff --git a/plugins/DevicesDetection/images/brand/KDDI.ico b/plugins/DevicesDetection/images/brand/KDDI.png similarity index 100% rename from plugins/DevicesDetection/images/brand/KDDI.ico rename to plugins/DevicesDetection/images/brand/KDDI.png diff --git a/plugins/DevicesDetection/images/brand/Karbonn.ico b/plugins/DevicesDetection/images/brand/Karbonn.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Karbonn.ico rename to plugins/DevicesDetection/images/brand/Karbonn.png diff --git a/plugins/DevicesDetection/images/brand/Kindle.ico b/plugins/DevicesDetection/images/brand/Kindle.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Kindle.ico rename to plugins/DevicesDetection/images/brand/Kindle.png diff --git a/plugins/DevicesDetection/images/brand/Kyocera.ico b/plugins/DevicesDetection/images/brand/Kyocera.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Kyocera.ico rename to plugins/DevicesDetection/images/brand/Kyocera.png diff --git a/plugins/DevicesDetection/images/brand/LG.ico b/plugins/DevicesDetection/images/brand/LG.png similarity index 100% rename from plugins/DevicesDetection/images/brand/LG.ico rename to plugins/DevicesDetection/images/brand/LG.png diff --git a/plugins/DevicesDetection/images/brand/LGUPlus.ico b/plugins/DevicesDetection/images/brand/LGUPlus.png similarity index 100% rename from plugins/DevicesDetection/images/brand/LGUPlus.ico rename to plugins/DevicesDetection/images/brand/LGUPlus.png diff --git a/plugins/DevicesDetection/images/brand/Lanix.ico b/plugins/DevicesDetection/images/brand/Lanix.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Lanix.ico rename to plugins/DevicesDetection/images/brand/Lanix.png diff --git a/plugins/DevicesDetection/images/brand/Le_Pan.ico b/plugins/DevicesDetection/images/brand/Le_Pan.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Le_Pan.ico rename to plugins/DevicesDetection/images/brand/Le_Pan.png diff --git a/plugins/DevicesDetection/images/brand/Lenovo.ico b/plugins/DevicesDetection/images/brand/Lenovo.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Lenovo.ico rename to plugins/DevicesDetection/images/brand/Lenovo.png diff --git a/plugins/DevicesDetection/images/brand/Loewe.ico b/plugins/DevicesDetection/images/brand/Loewe.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Loewe.ico rename to plugins/DevicesDetection/images/brand/Loewe.png diff --git a/plugins/DevicesDetection/images/brand/MSI.ico b/plugins/DevicesDetection/images/brand/MSI.png similarity index 100% rename from plugins/DevicesDetection/images/brand/MSI.ico rename to plugins/DevicesDetection/images/brand/MSI.png diff --git a/plugins/DevicesDetection/images/brand/Manta_Multimedia.ico b/plugins/DevicesDetection/images/brand/Manta_Multimedia.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Manta_Multimedia.ico rename to plugins/DevicesDetection/images/brand/Manta_Multimedia.png diff --git a/plugins/DevicesDetection/images/brand/MediaTek.ico b/plugins/DevicesDetection/images/brand/MediaTek.png similarity index 100% rename from plugins/DevicesDetection/images/brand/MediaTek.ico rename to plugins/DevicesDetection/images/brand/MediaTek.png diff --git a/plugins/DevicesDetection/images/brand/Medion.ico b/plugins/DevicesDetection/images/brand/Medion.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Medion.ico rename to plugins/DevicesDetection/images/brand/Medion.png diff --git a/plugins/DevicesDetection/images/brand/Metz.ico b/plugins/DevicesDetection/images/brand/Metz.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Metz.ico rename to plugins/DevicesDetection/images/brand/Metz.png diff --git a/plugins/DevicesDetection/images/brand/MicroMax.ico b/plugins/DevicesDetection/images/brand/MicroMax.png similarity index 100% rename from plugins/DevicesDetection/images/brand/MicroMax.ico rename to plugins/DevicesDetection/images/brand/MicroMax.png diff --git a/plugins/DevicesDetection/images/brand/Microsoft.ico b/plugins/DevicesDetection/images/brand/Microsoft.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Microsoft.ico rename to plugins/DevicesDetection/images/brand/Microsoft.png diff --git a/plugins/DevicesDetection/images/brand/Mio.ico b/plugins/DevicesDetection/images/brand/Mio.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Mio.ico rename to plugins/DevicesDetection/images/brand/Mio.png diff --git a/plugins/DevicesDetection/images/brand/Mitsubishi.ico b/plugins/DevicesDetection/images/brand/Mitsubishi.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Mitsubishi.ico rename to plugins/DevicesDetection/images/brand/Mitsubishi.png diff --git a/plugins/DevicesDetection/images/brand/Motorola.ico b/plugins/DevicesDetection/images/brand/Motorola.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Motorola.ico rename to plugins/DevicesDetection/images/brand/Motorola.png diff --git a/plugins/DevicesDetection/images/brand/MyPhone.ico b/plugins/DevicesDetection/images/brand/MyPhone.png similarity index 100% rename from plugins/DevicesDetection/images/brand/MyPhone.ico rename to plugins/DevicesDetection/images/brand/MyPhone.png diff --git a/plugins/DevicesDetection/images/brand/NEC.ico b/plugins/DevicesDetection/images/brand/NEC.png similarity index 100% rename from plugins/DevicesDetection/images/brand/NEC.ico rename to plugins/DevicesDetection/images/brand/NEC.png diff --git a/plugins/DevicesDetection/images/brand/NGM.ico b/plugins/DevicesDetection/images/brand/NGM.png similarity index 100% rename from plugins/DevicesDetection/images/brand/NGM.ico rename to plugins/DevicesDetection/images/brand/NGM.png diff --git a/plugins/DevicesDetection/images/brand/Nexian.ico b/plugins/DevicesDetection/images/brand/Nexian.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Nexian.ico rename to plugins/DevicesDetection/images/brand/Nexian.png diff --git a/plugins/DevicesDetection/images/brand/Nikon.ico b/plugins/DevicesDetection/images/brand/Nikon.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Nikon.ico rename to plugins/DevicesDetection/images/brand/Nikon.png diff --git a/plugins/DevicesDetection/images/brand/Nintendo.ico b/plugins/DevicesDetection/images/brand/Nintendo.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Nintendo.ico rename to plugins/DevicesDetection/images/brand/Nintendo.png diff --git a/plugins/DevicesDetection/images/brand/Nokia.ico b/plugins/DevicesDetection/images/brand/Nokia.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Nokia.ico rename to plugins/DevicesDetection/images/brand/Nokia.png diff --git a/plugins/DevicesDetection/images/brand/O2.ico b/plugins/DevicesDetection/images/brand/O2.png similarity index 100% rename from plugins/DevicesDetection/images/brand/O2.ico rename to plugins/DevicesDetection/images/brand/O2.png diff --git a/plugins/DevicesDetection/images/brand/OPPO.ico b/plugins/DevicesDetection/images/brand/OPPO.png similarity index 100% rename from plugins/DevicesDetection/images/brand/OPPO.ico rename to plugins/DevicesDetection/images/brand/OPPO.png diff --git a/plugins/DevicesDetection/images/brand/Onda.ico b/plugins/DevicesDetection/images/brand/Onda.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Onda.ico rename to plugins/DevicesDetection/images/brand/Onda.png diff --git a/plugins/DevicesDetection/images/brand/OnePlus.ico b/plugins/DevicesDetection/images/brand/OnePlus.png similarity index 100% rename from plugins/DevicesDetection/images/brand/OnePlus.ico rename to plugins/DevicesDetection/images/brand/OnePlus.png diff --git a/plugins/DevicesDetection/images/brand/Orange.ico b/plugins/DevicesDetection/images/brand/Orange.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Orange.ico rename to plugins/DevicesDetection/images/brand/Orange.png diff --git a/plugins/DevicesDetection/images/brand/PEAQ.ico b/plugins/DevicesDetection/images/brand/PEAQ.png similarity index 100% rename from plugins/DevicesDetection/images/brand/PEAQ.ico rename to plugins/DevicesDetection/images/brand/PEAQ.png diff --git a/plugins/DevicesDetection/images/brand/Panasonic.ico b/plugins/DevicesDetection/images/brand/Panasonic.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Panasonic.ico rename to plugins/DevicesDetection/images/brand/Panasonic.png diff --git a/plugins/DevicesDetection/images/brand/Pantech.ico b/plugins/DevicesDetection/images/brand/Pantech.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Pantech.ico rename to plugins/DevicesDetection/images/brand/Pantech.png diff --git a/plugins/DevicesDetection/images/brand/Philips.ico b/plugins/DevicesDetection/images/brand/Philips.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Philips.ico rename to plugins/DevicesDetection/images/brand/Philips.png diff --git a/plugins/DevicesDetection/images/brand/Polaroid.ico b/plugins/DevicesDetection/images/brand/Polaroid.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Polaroid.ico rename to plugins/DevicesDetection/images/brand/Polaroid.png diff --git a/plugins/DevicesDetection/images/brand/PolyPad.ico b/plugins/DevicesDetection/images/brand/PolyPad.png similarity index 100% rename from plugins/DevicesDetection/images/brand/PolyPad.ico rename to plugins/DevicesDetection/images/brand/PolyPad.png diff --git a/plugins/DevicesDetection/images/brand/Quechua.ico b/plugins/DevicesDetection/images/brand/Quechua.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Quechua.ico rename to plugins/DevicesDetection/images/brand/Quechua.png diff --git a/plugins/DevicesDetection/images/brand/RIM.ico b/plugins/DevicesDetection/images/brand/RIM.png similarity index 100% rename from plugins/DevicesDetection/images/brand/RIM.ico rename to plugins/DevicesDetection/images/brand/RIM.png diff --git a/plugins/DevicesDetection/images/brand/SFR.ico b/plugins/DevicesDetection/images/brand/SFR.png similarity index 100% rename from plugins/DevicesDetection/images/brand/SFR.ico rename to plugins/DevicesDetection/images/brand/SFR.png diff --git a/plugins/DevicesDetection/images/brand/Sagem.ico b/plugins/DevicesDetection/images/brand/Sagem.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Sagem.ico rename to plugins/DevicesDetection/images/brand/Sagem.png diff --git a/plugins/DevicesDetection/images/brand/Samsung.ico b/plugins/DevicesDetection/images/brand/Samsung.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Samsung.ico rename to plugins/DevicesDetection/images/brand/Samsung.png diff --git a/plugins/DevicesDetection/images/brand/Sanyo.ico b/plugins/DevicesDetection/images/brand/Sanyo.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Sanyo.ico rename to plugins/DevicesDetection/images/brand/Sanyo.png diff --git a/plugins/DevicesDetection/images/brand/Sega.ico b/plugins/DevicesDetection/images/brand/Sega.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Sega.ico rename to plugins/DevicesDetection/images/brand/Sega.png diff --git a/plugins/DevicesDetection/images/brand/Selevision.ico b/plugins/DevicesDetection/images/brand/Selevision.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Selevision.ico rename to plugins/DevicesDetection/images/brand/Selevision.png diff --git a/plugins/DevicesDetection/images/brand/Sencor.ico b/plugins/DevicesDetection/images/brand/Sencor.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Sencor.ico rename to plugins/DevicesDetection/images/brand/Sencor.png diff --git a/plugins/DevicesDetection/images/brand/Sharp.ico b/plugins/DevicesDetection/images/brand/Sharp.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Sharp.ico rename to plugins/DevicesDetection/images/brand/Sharp.png diff --git a/plugins/DevicesDetection/images/brand/Siemens.ico b/plugins/DevicesDetection/images/brand/Siemens.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Siemens.ico rename to plugins/DevicesDetection/images/brand/Siemens.png diff --git a/plugins/DevicesDetection/images/brand/Smart.ico b/plugins/DevicesDetection/images/brand/Smart.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Smart.ico rename to plugins/DevicesDetection/images/brand/Smart.png diff --git a/plugins/DevicesDetection/images/brand/Smartfren.ico b/plugins/DevicesDetection/images/brand/Smartfren.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Smartfren.ico rename to plugins/DevicesDetection/images/brand/Smartfren.png diff --git a/plugins/DevicesDetection/images/brand/Softbank.ico b/plugins/DevicesDetection/images/brand/Softbank.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Softbank.ico rename to plugins/DevicesDetection/images/brand/Softbank.png diff --git a/plugins/DevicesDetection/images/brand/Sony.ico b/plugins/DevicesDetection/images/brand/Sony.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Sony.ico rename to plugins/DevicesDetection/images/brand/Sony.png diff --git a/plugins/DevicesDetection/images/brand/Sony_Ericsson.ico b/plugins/DevicesDetection/images/brand/Sony_Ericsson.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Sony_Ericsson.ico rename to plugins/DevicesDetection/images/brand/Sony_Ericsson.png diff --git a/plugins/DevicesDetection/images/brand/Spice.ico b/plugins/DevicesDetection/images/brand/Spice.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Spice.ico rename to plugins/DevicesDetection/images/brand/Spice.png diff --git a/plugins/DevicesDetection/images/brand/T-Mobile.ico b/plugins/DevicesDetection/images/brand/T-Mobile.png similarity index 100% rename from plugins/DevicesDetection/images/brand/T-Mobile.ico rename to plugins/DevicesDetection/images/brand/T-Mobile.png diff --git a/plugins/DevicesDetection/images/brand/TCL.ico b/plugins/DevicesDetection/images/brand/TCL.png similarity index 100% rename from plugins/DevicesDetection/images/brand/TCL.ico rename to plugins/DevicesDetection/images/brand/TCL.png diff --git a/plugins/DevicesDetection/images/brand/TechniSat.ico b/plugins/DevicesDetection/images/brand/TechniSat.png similarity index 100% rename from plugins/DevicesDetection/images/brand/TechniSat.ico rename to plugins/DevicesDetection/images/brand/TechniSat.png diff --git a/plugins/DevicesDetection/images/brand/TechnoTrend.ico b/plugins/DevicesDetection/images/brand/TechnoTrend.png similarity index 100% rename from plugins/DevicesDetection/images/brand/TechnoTrend.ico rename to plugins/DevicesDetection/images/brand/TechnoTrend.png diff --git a/plugins/DevicesDetection/images/brand/Tecno_Mobile.ico b/plugins/DevicesDetection/images/brand/Tecno_Mobile.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Tecno_Mobile.ico rename to plugins/DevicesDetection/images/brand/Tecno_Mobile.png diff --git a/plugins/DevicesDetection/images/brand/Telefunken.ico b/plugins/DevicesDetection/images/brand/Telefunken.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Telefunken.ico rename to plugins/DevicesDetection/images/brand/Telefunken.png diff --git a/plugins/DevicesDetection/images/brand/Telit.ico b/plugins/DevicesDetection/images/brand/Telit.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Telit.ico rename to plugins/DevicesDetection/images/brand/Telit.png diff --git a/plugins/DevicesDetection/images/brand/Thomson.ico b/plugins/DevicesDetection/images/brand/Thomson.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Thomson.ico rename to plugins/DevicesDetection/images/brand/Thomson.png diff --git a/plugins/DevicesDetection/images/brand/TiPhone.ico b/plugins/DevicesDetection/images/brand/TiPhone.png similarity index 100% rename from plugins/DevicesDetection/images/brand/TiPhone.ico rename to plugins/DevicesDetection/images/brand/TiPhone.png diff --git a/plugins/DevicesDetection/images/brand/Tolino.ico b/plugins/DevicesDetection/images/brand/Tolino.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Tolino.ico rename to plugins/DevicesDetection/images/brand/Tolino.png diff --git a/plugins/DevicesDetection/images/brand/Toshiba.ico b/plugins/DevicesDetection/images/brand/Toshiba.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Toshiba.ico rename to plugins/DevicesDetection/images/brand/Toshiba.png diff --git a/plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico b/plugins/DevicesDetection/images/brand/Tunisie_Telecom.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Tunisie_Telecom.ico rename to plugins/DevicesDetection/images/brand/Tunisie_Telecom.png diff --git a/plugins/DevicesDetection/images/brand/Unknown.ico b/plugins/DevicesDetection/images/brand/Unknown.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Unknown.ico rename to plugins/DevicesDetection/images/brand/Unknown.png diff --git a/plugins/DevicesDetection/images/brand/Vertu.ico b/plugins/DevicesDetection/images/brand/Vertu.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Vertu.ico rename to plugins/DevicesDetection/images/brand/Vertu.png diff --git a/plugins/DevicesDetection/images/brand/Vestel.ico b/plugins/DevicesDetection/images/brand/Vestel.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Vestel.ico rename to plugins/DevicesDetection/images/brand/Vestel.png diff --git a/plugins/DevicesDetection/images/brand/Videocon.ico b/plugins/DevicesDetection/images/brand/Videocon.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Videocon.ico rename to plugins/DevicesDetection/images/brand/Videocon.png diff --git a/plugins/DevicesDetection/images/brand/Videoweb.ico b/plugins/DevicesDetection/images/brand/Videoweb.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Videoweb.ico rename to plugins/DevicesDetection/images/brand/Videoweb.png diff --git a/plugins/DevicesDetection/images/brand/ViewSonic.ico b/plugins/DevicesDetection/images/brand/ViewSonic.png similarity index 100% rename from plugins/DevicesDetection/images/brand/ViewSonic.ico rename to plugins/DevicesDetection/images/brand/ViewSonic.png diff --git a/plugins/DevicesDetection/images/brand/Voxtel.ico b/plugins/DevicesDetection/images/brand/Voxtel.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Voxtel.ico rename to plugins/DevicesDetection/images/brand/Voxtel.png diff --git a/plugins/DevicesDetection/images/brand/Wiko.ico b/plugins/DevicesDetection/images/brand/Wiko.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Wiko.ico rename to plugins/DevicesDetection/images/brand/Wiko.png diff --git a/plugins/DevicesDetection/images/brand/Wolder.ico b/plugins/DevicesDetection/images/brand/Wolder.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Wolder.ico rename to plugins/DevicesDetection/images/brand/Wolder.png diff --git a/plugins/DevicesDetection/images/brand/Woxter.ico b/plugins/DevicesDetection/images/brand/Woxter.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Woxter.ico rename to plugins/DevicesDetection/images/brand/Woxter.png diff --git a/plugins/DevicesDetection/images/brand/Xiaomi.ico b/plugins/DevicesDetection/images/brand/Xiaomi.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Xiaomi.ico rename to plugins/DevicesDetection/images/brand/Xiaomi.png diff --git a/plugins/DevicesDetection/images/brand/Yarvik.ico b/plugins/DevicesDetection/images/brand/Yarvik.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Yarvik.ico rename to plugins/DevicesDetection/images/brand/Yarvik.png diff --git a/plugins/DevicesDetection/images/brand/Yuandao.ico b/plugins/DevicesDetection/images/brand/Yuandao.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Yuandao.ico rename to plugins/DevicesDetection/images/brand/Yuandao.png diff --git a/plugins/DevicesDetection/images/brand/ZTE.ico b/plugins/DevicesDetection/images/brand/ZTE.png similarity index 100% rename from plugins/DevicesDetection/images/brand/ZTE.ico rename to plugins/DevicesDetection/images/brand/ZTE.png diff --git a/plugins/DevicesDetection/images/brand/Zonda.ico b/plugins/DevicesDetection/images/brand/Zonda.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Zonda.ico rename to plugins/DevicesDetection/images/brand/Zonda.png diff --git a/plugins/DevicesDetection/images/brand/Zopo.ico b/plugins/DevicesDetection/images/brand/Zopo.png similarity index 100% rename from plugins/DevicesDetection/images/brand/Zopo.ico rename to plugins/DevicesDetection/images/brand/Zopo.png diff --git a/plugins/DevicesDetection/images/brand/bq.ico b/plugins/DevicesDetection/images/brand/bq.png similarity index 100% rename from plugins/DevicesDetection/images/brand/bq.ico rename to plugins/DevicesDetection/images/brand/bq.png diff --git a/plugins/DevicesDetection/images/brand/eTouch.ico b/plugins/DevicesDetection/images/brand/eTouch.png similarity index 100% rename from plugins/DevicesDetection/images/brand/eTouch.ico rename to plugins/DevicesDetection/images/brand/eTouch.png diff --git a/plugins/DevicesDetection/images/brand/i-mobile.ico b/plugins/DevicesDetection/images/brand/i-mobile.png similarity index 100% rename from plugins/DevicesDetection/images/brand/i-mobile.ico rename to plugins/DevicesDetection/images/brand/i-mobile.png diff --git a/plugins/DevicesDetection/images/brand/iBerry.ico b/plugins/DevicesDetection/images/brand/iBerry.png similarity index 100% rename from plugins/DevicesDetection/images/brand/iBerry.ico rename to plugins/DevicesDetection/images/brand/iBerry.png diff --git a/plugins/DevicesDetection/images/brand/teXet.ico b/plugins/DevicesDetection/images/brand/teXet.png similarity index 100% rename from plugins/DevicesDetection/images/brand/teXet.ico rename to plugins/DevicesDetection/images/brand/teXet.png diff --git a/plugins/DevicesDetection/images/screens/console.gif b/plugins/DevicesDetection/images/screens/console.gif deleted file mode 100644 index 7957a9106a94b79f8595bccceba2233f53a52726..0000000000000000000000000000000000000000 Binary files a/plugins/DevicesDetection/images/screens/console.gif and /dev/null differ diff --git a/plugins/DevicesDetection/images/screens/console.png b/plugins/DevicesDetection/images/screens/console.png new file mode 100644 index 0000000000000000000000000000000000000000..78bcdfa660d089ab8dc0bb06a843475e482b08ed Binary files /dev/null and b/plugins/DevicesDetection/images/screens/console.png differ diff --git a/plugins/DevicesDetection/images/screens/dual.gif b/plugins/DevicesDetection/images/screens/dual.gif deleted file mode 100644 index a8cb8b2963161e15e2b303a568734d8aab4f5f52..0000000000000000000000000000000000000000 Binary files a/plugins/DevicesDetection/images/screens/dual.gif and /dev/null differ diff --git a/plugins/DevicesDetection/images/screens/dual.png b/plugins/DevicesDetection/images/screens/dual.png new file mode 100644 index 0000000000000000000000000000000000000000..0311d7c59962a1c6a6e75d7fa31993323408a74e Binary files /dev/null and b/plugins/DevicesDetection/images/screens/dual.png differ diff --git a/plugins/DevicesDetection/images/screens/mobile.gif b/plugins/DevicesDetection/images/screens/mobile.gif deleted file mode 100644 index 814642933fd6eaa9d27969b7f6a0ec117f86ffed..0000000000000000000000000000000000000000 Binary files a/plugins/DevicesDetection/images/screens/mobile.gif and /dev/null differ diff --git a/plugins/DevicesDetection/images/screens/mobile.png b/plugins/DevicesDetection/images/screens/mobile.png new file mode 100644 index 0000000000000000000000000000000000000000..77e59f4b840f1503110c14d7ed728b782337ae9c Binary files /dev/null and b/plugins/DevicesDetection/images/screens/mobile.png differ diff --git a/plugins/DevicesDetection/images/screens/normal.gif b/plugins/DevicesDetection/images/screens/normal.gif deleted file mode 100644 index afe97e9d9f27c9d441553d85acb415a3024e1d79..0000000000000000000000000000000000000000 Binary files a/plugins/DevicesDetection/images/screens/normal.gif and /dev/null differ diff --git a/plugins/DevicesDetection/images/screens/normal.png b/plugins/DevicesDetection/images/screens/normal.png new file mode 100644 index 0000000000000000000000000000000000000000..a89b2421c5b38417f880557074606e9ce1aec8ec Binary files /dev/null and b/plugins/DevicesDetection/images/screens/normal.png differ diff --git a/plugins/DevicesDetection/images/screens/unknown.gif b/plugins/DevicesDetection/images/screens/unknown.gif deleted file mode 100644 index 2c44083422b7fbc300fa4a7486d805321244f7e5..0000000000000000000000000000000000000000 Binary files a/plugins/DevicesDetection/images/screens/unknown.gif and /dev/null differ diff --git a/plugins/DevicesDetection/images/screens/unknown.png b/plugins/DevicesDetection/images/screens/unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..166a505bbcaa585a55120012dc10047c1f5f3e46 Binary files /dev/null and b/plugins/DevicesDetection/images/screens/unknown.png differ diff --git a/plugins/DevicesDetection/images/screens/wide.gif b/plugins/DevicesDetection/images/screens/wide.gif deleted file mode 100644 index 1b09fc529b110e3e7cee16ff55a6ddc63bba909b..0000000000000000000000000000000000000000 Binary files a/plugins/DevicesDetection/images/screens/wide.gif and /dev/null differ diff --git a/plugins/DevicesDetection/images/screens/wide.png b/plugins/DevicesDetection/images/screens/wide.png new file mode 100644 index 0000000000000000000000000000000000000000..8a7bb13d7ef768e33e8d9bf2d4c4290ae3e0335c Binary files /dev/null and b/plugins/DevicesDetection/images/screens/wide.png differ diff --git a/plugins/Ecommerce/templates/getSparklines.twig b/plugins/Ecommerce/templates/getSparklines.twig index 62487c46e234f8c69e7b20720ef2be4044302e74..17e6c880fd250396d35526942575f1990127ee78 100644 --- a/plugins/Ecommerce/templates/getSparklines.twig +++ b/plugins/Ecommerce/templates/getSparklines.twig @@ -3,7 +3,7 @@ <div class="sparkline">{{ sparkline(urlSparklineConversions) }} <strong>{{ nb_conversions|number }}</strong> {{ 'General_EcommerceOrders'|translate }} - <img src='plugins/Morpheus/images/ecommerceOrder.gif'> + <img src='plugins/Morpheus/images/ecommerceOrder.png'> {% if goalAllowMultipleConversionsPerVisit is defined and goalAllowMultipleConversionsPerVisit %} ({{ 'General_NVisits'|translate("<strong>"~nb_visits_converted~"</strong>")|raw }}) @@ -31,7 +31,7 @@ </div> <div id='rightcolumn' {% if not isWidget %}style='width:30%;'{% endif %}> <div> - <img src='plugins/Morpheus/images/ecommerceAbandonedCart.gif'> {{ 'General_AbandonedCarts'|translate }} + <img src='plugins/Morpheus/images/ecommerceAbandonedCart.png'> {{ 'General_AbandonedCarts'|translate }} </div> <div class="sparkline"> diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index de54b7d9b341d239c80fbfa38367eac95cfc9bb4..a7d9abaf32ed820cca499070de76bc8144c692bf 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -417,7 +417,7 @@ class Visitor implements VisitorInterface break; case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER: case Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART: - $details['icon'] = 'plugins/Morpheus/images/' . $details['type'] . '.gif'; + $details['icon'] = 'plugins/Morpheus/images/' . $details['type'] . '.png'; break; case Action::TYPE_DOWNLOAD: $details['type'] = 'download'; @@ -425,7 +425,7 @@ class Visitor implements VisitorInterface break; case Action::TYPE_OUTLINK: $details['type'] = 'outlink'; - $details['icon'] = 'plugins/Morpheus/images/link.gif'; + $details['icon'] = 'plugins/Morpheus/images/link.png'; break; case Action::TYPE_SITE_SEARCH: $details['type'] = 'search'; diff --git a/plugins/Live/images/pause.gif b/plugins/Live/images/pause.gif deleted file mode 100644 index 23162c35baaa0ae4fb1c587a5eafcb9c7bc09814..0000000000000000000000000000000000000000 Binary files a/plugins/Live/images/pause.gif and /dev/null differ diff --git a/plugins/Live/images/pause.png b/plugins/Live/images/pause.png new file mode 100644 index 0000000000000000000000000000000000000000..96a0579c0d718bdbc9ee9c6e39121b27be5afce5 Binary files /dev/null and b/plugins/Live/images/pause.png differ diff --git a/plugins/Live/images/play.gif b/plugins/Live/images/play.gif deleted file mode 100644 index c49479e7101339d6ab8bd484dbab0a5a43cc0765..0000000000000000000000000000000000000000 Binary files a/plugins/Live/images/play.gif and /dev/null differ diff --git a/plugins/Live/images/play.png b/plugins/Live/images/play.png new file mode 100644 index 0000000000000000000000000000000000000000..c9295ec03f0d95859daaf116120dcff0e05e7feb Binary files /dev/null and b/plugins/Live/images/play.png differ diff --git a/plugins/Live/images/returningVisitor.gif b/plugins/Live/images/returningVisitor.gif deleted file mode 100644 index bc71867e555f8982450c073f875a5e2e0becc07a..0000000000000000000000000000000000000000 Binary files a/plugins/Live/images/returningVisitor.gif and /dev/null differ diff --git a/plugins/Live/images/returningVisitor.png b/plugins/Live/images/returningVisitor.png new file mode 100644 index 0000000000000000000000000000000000000000..7be746f337b797ef87ee3c48fb1a9f371dba0ef0 Binary files /dev/null and b/plugins/Live/images/returningVisitor.png differ diff --git a/plugins/Live/images/unknown_avatar.jpg b/plugins/Live/images/unknown_avatar.jpg deleted file mode 100644 index dfd7ec81de6db91cd38339e32f20a87dabfc0007..0000000000000000000000000000000000000000 Binary files a/plugins/Live/images/unknown_avatar.jpg and /dev/null differ diff --git a/plugins/Live/images/unknown_avatar.png b/plugins/Live/images/unknown_avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..fe4dd7d1f9d8cfcd54bf2fb81bb83ab8cb5b84f3 Binary files /dev/null and b/plugins/Live/images/unknown_avatar.png differ diff --git a/plugins/Live/images/visitor_profile_background.jpg b/plugins/Live/images/visitor_profile_background.jpg deleted file mode 100644 index 082d637dcf661814ff38ca4e158448ae7cae5d6e..0000000000000000000000000000000000000000 Binary files a/plugins/Live/images/visitor_profile_background.jpg and /dev/null differ diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less index 8ee00269ca39e79ae5439686807a4dbf62a56c1c..c471009e50c267bfeab9971e4a44bee780548f33 100644 --- a/plugins/Live/stylesheets/live.less +++ b/plugins/Live/stylesheets/live.less @@ -33,7 +33,7 @@ } #visitsLive .country { - background: @theme-color-background-base url(plugins/CoreHome/images/bullet1.gif) no-repeat scroll 0 0; + background: @theme-color-background-base url(plugins/CoreHome/images/bullet1.png) no-repeat scroll 0 0; } #visitsLive .referrer { diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index 35100d8f46b1cf5e6e59f4acbb1bc1714bd2523d..1a57eb69588bf4ca6b95611bc6ee29dcdde70533 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -13,7 +13,7 @@ <div class="visitor-profile-avatar"> <div> <div class="visitor-profile-image-frame"> - <img src="{{ visitorData.visitorAvatar|default("plugins/Live/images/unknown_avatar.jpg") }}" + <img src="{{ visitorData.visitorAvatar|default("plugins/Live/images/unknown_avatar.png") }}" alt="{{ visitorData.visitorDescription|default('') }}" title="{{ visitorData.visitorDescription|default('') }}" /> </div> diff --git a/plugins/Live/templates/index.twig b/plugins/Live/templates/index.twig index bf2ccbeedbd6330ac28fc6361ffa8120aa139eaf..5112c85d103c305ec315d0272f9038bcf944bb21 100644 --- a/plugins/Live/templates/index.twig +++ b/plugins/Live/templates/index.twig @@ -39,10 +39,10 @@ {% spaceless %} <div class="visitsLiveFooter"> <a title="{{ 'Live_OnClickPause'|translate('Live_VisitorsInRealTime'|translate) }}" href="javascript:void(0);" onclick="onClickPause();"> - <img id="pauseImage" border="0" src="plugins/Live/images/pause.gif" /> + <img id="pauseImage" border="0" src="plugins/Live/images/pause.png" /> </a> <a title="{{ 'Live_OnClickStart'|translate('Live_VisitorsInRealTime'|translate) }}" href="javascript:void(0);" onclick="onClickPlay();"> - <img id="playImage" style="display: none;" border="0" src="plugins/Live/images/play.gif" /> + <img id="playImage" style="display: none;" border="0" src="plugins/Live/images/play.png" /> </a> {% if not disableLink %} diff --git a/plugins/Morpheus/images/calendar.gif b/plugins/Morpheus/images/calendar.gif deleted file mode 100644 index ec93ddf2606eb5ad82a6192c1c197736b202b7b1..0000000000000000000000000000000000000000 Binary files a/plugins/Morpheus/images/calendar.gif and /dev/null differ diff --git a/plugins/Morpheus/images/calendar.png b/plugins/Morpheus/images/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..275c10bd67a27487fb1fbee76d91faec356a4d51 Binary files /dev/null and b/plugins/Morpheus/images/calendar.png differ diff --git a/plugins/Morpheus/images/collapsed_arrows.gif b/plugins/Morpheus/images/collapsed_arrows.gif deleted file mode 100644 index 458728fdec293c6b87fb40704e6892ed0e37a546..0000000000000000000000000000000000000000 Binary files a/plugins/Morpheus/images/collapsed_arrows.gif and /dev/null differ diff --git a/plugins/Morpheus/images/collapsed_arrows.png b/plugins/Morpheus/images/collapsed_arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..9ebb8852941da76d3e66a99d0147922ba82a3c29 Binary files /dev/null and b/plugins/Morpheus/images/collapsed_arrows.png differ diff --git a/plugins/Morpheus/images/ecommerceAbandonedCart.gif b/plugins/Morpheus/images/ecommerceAbandonedCart.gif deleted file mode 100644 index b4ec1d75f70563e318426789e07156f0b38ae8b4..0000000000000000000000000000000000000000 Binary files a/plugins/Morpheus/images/ecommerceAbandonedCart.gif and /dev/null differ diff --git a/plugins/Morpheus/images/ecommerceAbandonedCart.png b/plugins/Morpheus/images/ecommerceAbandonedCart.png new file mode 100644 index 0000000000000000000000000000000000000000..b0e83ae2cf4acf667de2f00d0920b77cd76ce2ac Binary files /dev/null and b/plugins/Morpheus/images/ecommerceAbandonedCart.png differ diff --git a/plugins/Morpheus/images/ecommerceOrder.gif b/plugins/Morpheus/images/ecommerceOrder.gif deleted file mode 100644 index 664e035509f9031a7042d57e22cf692b59181f9a..0000000000000000000000000000000000000000 Binary files a/plugins/Morpheus/images/ecommerceOrder.gif and /dev/null differ diff --git a/plugins/Morpheus/images/ecommerceOrder.png b/plugins/Morpheus/images/ecommerceOrder.png new file mode 100644 index 0000000000000000000000000000000000000000..ed8bc4998e9b0b2e871a53334c77976e2db2179c Binary files /dev/null and b/plugins/Morpheus/images/ecommerceOrder.png differ diff --git a/plugins/Morpheus/images/expanded_arrows.gif b/plugins/Morpheus/images/expanded_arrows.gif deleted file mode 100644 index ed3395920640e36068cf3fa17d20ce3941d01cac..0000000000000000000000000000000000000000 Binary files a/plugins/Morpheus/images/expanded_arrows.gif and /dev/null differ diff --git a/plugins/Morpheus/images/expanded_arrows.png b/plugins/Morpheus/images/expanded_arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..eaf98d9ffa6bb9363bac6809e0323e5e8fc9bb8c Binary files /dev/null and b/plugins/Morpheus/images/expanded_arrows.png differ diff --git a/plugins/Morpheus/images/icon-calendar.gif b/plugins/Morpheus/images/icon-calendar.gif deleted file mode 100644 index bf9016663367801972c32e6a73bfad52d36d128b..0000000000000000000000000000000000000000 Binary files a/plugins/Morpheus/images/icon-calendar.gif and /dev/null differ diff --git a/plugins/Morpheus/images/icon-calendar.png b/plugins/Morpheus/images/icon-calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..7539fdb7f6faf3828722b0cc7e61b8b8f5402d88 Binary files /dev/null and b/plugins/Morpheus/images/icon-calendar.png differ diff --git a/plugins/Morpheus/images/li_dbl_gray.gif b/plugins/Morpheus/images/li_dbl_gray.gif deleted file mode 100644 index 42fe8b3b89c9be477c929e4809daa337c5139000..0000000000000000000000000000000000000000 Binary files a/plugins/Morpheus/images/li_dbl_gray.gif and /dev/null differ diff --git a/plugins/Morpheus/images/li_dbl_gray.png b/plugins/Morpheus/images/li_dbl_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..19764affd017cd5545dce1550c6dc7ccf570f711 Binary files /dev/null and b/plugins/Morpheus/images/li_dbl_gray.png differ diff --git a/plugins/Morpheus/images/link.gif b/plugins/Morpheus/images/link.gif deleted file mode 100644 index 543c76d96c763c00b2d48939b52543d1f47cc969..0000000000000000000000000000000000000000 Binary files a/plugins/Morpheus/images/link.gif and /dev/null differ diff --git a/plugins/Morpheus/images/link.png b/plugins/Morpheus/images/link.png new file mode 100644 index 0000000000000000000000000000000000000000..d3af66f4ae236a18f9af3e0f84b5aeccc2e67157 Binary files /dev/null and b/plugins/Morpheus/images/link.png differ diff --git a/plugins/Morpheus/images/paypal_subscribe.gif b/plugins/Morpheus/images/paypal_subscribe.gif deleted file mode 100755 index 50d8ee52e9d0b231abaefdc5a5bec8a6be11c686..0000000000000000000000000000000000000000 Binary files a/plugins/Morpheus/images/paypal_subscribe.gif and /dev/null differ diff --git a/plugins/Morpheus/images/paypal_subscribe.png b/plugins/Morpheus/images/paypal_subscribe.png new file mode 100644 index 0000000000000000000000000000000000000000..975c136f6466a325c35950a39aa7edc6d665f3db Binary files /dev/null and b/plugins/Morpheus/images/paypal_subscribe.png differ diff --git a/plugins/Morpheus/stylesheets/uibase/_periodSelect.less b/plugins/Morpheus/stylesheets/uibase/_periodSelect.less index 95cad2a3c33b106efc6f5720fc6fe9e93b7dbbf7..f31796b11beef0d304c563e72ecbb45e17c8060a 100644 --- a/plugins/Morpheus/stylesheets/uibase/_periodSelect.less +++ b/plugins/Morpheus/stylesheets/uibase/_periodSelect.less @@ -43,7 +43,7 @@ position:absolute; right: 19px; top: 9px; - background: url("plugins/Morpheus/images/icon-calendar.gif") no-repeat scroll; + background: url("plugins/Morpheus/images/icon-calendar.png") no-repeat scroll; cursor:pointer; } diff --git a/plugins/MultiSites/angularjs/site/site.directive.html b/plugins/MultiSites/angularjs/site/site.directive.html index 57aba591ebcc2c5024a9501b1400d72ea8cd1fc4..e5eec42a52bec96164aa3642ee09d46747799553 100644 --- a/plugins/MultiSites/angularjs/site/site.directive.html +++ b/plugins/MultiSites/angularjs/site/site.directive.html @@ -4,7 +4,7 @@ <span style="width: 10px; margin-left:3px;"> <a rel="noreferrer" target="_blank" title="{{ 'General_GoTo'|translate:website.main_url }}" ng-href="{{ website.main_url }}"> - <img src="plugins/Morpheus/images/link.gif"/></a> + <img src="plugins/Morpheus/images/link.png"/></a> </span> </td> <td ng-if="website.isGroup" class="multisites-label label"> diff --git a/plugins/MultiSites/images/arrow_asc.gif b/plugins/MultiSites/images/arrow_asc.gif deleted file mode 100644 index df463fa72f1ca9cf829a55617615df262f0b77d3..0000000000000000000000000000000000000000 Binary files a/plugins/MultiSites/images/arrow_asc.gif and /dev/null differ diff --git a/plugins/MultiSites/images/arrow_asc.png b/plugins/MultiSites/images/arrow_asc.png new file mode 100644 index 0000000000000000000000000000000000000000..0c18e14aa6c9d65f53d63d5eab700f02504108f1 Binary files /dev/null and b/plugins/MultiSites/images/arrow_asc.png differ diff --git a/plugins/MultiSites/images/arrow_desc.gif b/plugins/MultiSites/images/arrow_desc.gif deleted file mode 100644 index e8234178efaea626368f6bb5fffaa716e862b596..0000000000000000000000000000000000000000 Binary files a/plugins/MultiSites/images/arrow_desc.gif and /dev/null differ diff --git a/plugins/MultiSites/images/arrow_desc.png b/plugins/MultiSites/images/arrow_desc.png new file mode 100644 index 0000000000000000000000000000000000000000..67e3b70809143f4192519c0d8bd1f5f78936d823 Binary files /dev/null and b/plugins/MultiSites/images/arrow_desc.png differ diff --git a/plugins/Overlay/stylesheets/overlay.css b/plugins/Overlay/stylesheets/overlay.css index 465bf7fb760c6cf8f183f00e94d9fd6b1397ed1d..784677bc28a457a337713f1cdfe63bb1067c2b08 100644 --- a/plugins/Overlay/stylesheets/overlay.css +++ b/plugins/Overlay/stylesheets/overlay.css @@ -27,7 +27,7 @@ a#overlayTitle .icon-help { #overlayDateRangeSelection { padding: 0 0 0 25px; - background: url(../../Morpheus/images/icon-calendar.gif) 2px center no-repeat; + background: url(../../Morpheus/images/icon-calendar.png) 2px center no-repeat; margin: 20px 10px; } diff --git a/plugins/Referrers/images/searchEngines/xx.gif b/plugins/Referrers/images/searchEngines/xx.gif deleted file mode 100644 index 5ddb8b8edb92daf398734104bbb5d1dcff47fde3..0000000000000000000000000000000000000000 Binary files a/plugins/Referrers/images/searchEngines/xx.gif and /dev/null differ