diff options
-rw-r--r-- | core/DataTable.php | 4 | ||||
-rw-r--r-- | plugins/API/API.php | 2 | ||||
-rwxr-xr-x | plugins/Annotations/templates/annotation.twig | 4 | ||||
-rwxr-xr-x | plugins/Annotations/templates/annotationManager.twig | 2 | ||||
-rwxr-xr-x | plugins/Annotations/templates/evolutionAnnotations.twig | 2 | ||||
-rw-r--r-- | plugins/CoreAdminHome/templates/generalSettings.twig | 2 | ||||
-rw-r--r-- | plugins/CoreHome/images/bg_header.jpg (renamed from plugins/CoreHome/templates/images/bg_header.jpg) | bin | 9097 -> 9097 bytes | |||
-rw-r--r-- | plugins/CoreHome/images/bullet1.gif (renamed from plugins/CoreHome/templates/images/bullet1.gif) | bin | 52 -> 52 bytes | |||
-rw-r--r-- | plugins/CoreHome/images/bullet2.gif (renamed from plugins/CoreHome/templates/images/bullet2.gif) | bin | 52 -> 52 bytes | |||
-rw-r--r-- | plugins/CoreHome/images/more.png (renamed from plugins/CoreHome/templates/images/more.png) | bin | 1045 -> 1045 bytes | |||
-rw-r--r-- | plugins/CoreHome/images/more_date.gif (renamed from plugins/CoreHome/templates/images/more_date.gif) | bin | 56 -> 56 bytes | |||
-rw-r--r-- | plugins/CoreHome/images/more_period.gif (renamed from plugins/CoreHome/templates/images/more_period.gif) | bin | 53 -> 53 bytes | |||
-rwxr-xr-x | plugins/CoreHome/images/promo_splash.png (renamed from plugins/CoreHome/templates/images/promo_splash.png) | bin | 12070 -> 12070 bytes | |||
-rw-r--r-- | plugins/CoreHome/images/reset_search.png (renamed from plugins/CoreHome/templates/images/reset_search.png) | bin | 1021 -> 1021 bytes | |||
-rw-r--r-- | plugins/CoreHome/images/search.png (renamed from plugins/CoreHome/templates/images/search.png) | bin | 136 -> 136 bytes | |||
-rw-r--r-- | plugins/CoreHome/templates/datatable.css | 4 | ||||
-rw-r--r-- | plugins/CoreHome/templates/datatable.js | 2 | ||||
-rw-r--r-- | plugins/CoreHome/templates/datatable_cell.twig | 2 | ||||
-rw-r--r-- | plugins/CoreHome/templates/datatable_footer.twig | 32 | ||||
-rwxr-xr-x | plugins/CoreHome/templates/donate.js | 2 | ||||
-rwxr-xr-x | plugins/CoreHome/templates/donate.twig | 14 | ||||
-rw-r--r-- | plugins/CoreHome/templates/header_message.twig | 4 | ||||
-rw-r--r-- | plugins/CoreHome/templates/images/favicon.ico | bin | 3294 -> 0 bytes | |||
-rwxr-xr-x | plugins/CoreHome/templates/promo_video.twig | 4 | ||||
-rw-r--r-- | plugins/CoreHome/templates/reports_by_dimension.twig | 2 | ||||
-rw-r--r-- | plugins/CoreHome/templates/sites_selection.twig | 2 | ||||
-rw-r--r-- | plugins/CoreHome/templates/warning_invalid_host.twig | 2 | ||||
-rw-r--r-- | plugins/CoreUpdater/templates/layout.twig | 4 | ||||
-rw-r--r-- | plugins/CoreUpdater/templates/update_database_done.twig | 8 | ||||
-rw-r--r-- | plugins/CoreUpdater/templates/update_one_click_results.twig | 4 | ||||
-rw-r--r-- | plugins/CoreUpdater/templates/update_welcome.twig | 2 | ||||
-rwxr-xr-x | plugins/DBStats/templates/index.twig | 4 | ||||
-rw-r--r-- | plugins/Dashboard/javascripts/widgetMenu.js | 8 | ||||
-rw-r--r-- | plugins/Goals/templates/list_goal_edit.twig | 4 | ||||
-rw-r--r-- | plugins/Goals/templates/title_and_evolution_graph.twig | 2 | ||||
-rw-r--r-- | plugins/Installation/templates/databaseSetup.twig | 2 | ||||
-rw-r--r-- | plugins/Installation/templates/displayJavascriptCode.twig | 2 | ||||
-rw-r--r-- | plugins/Installation/templates/firstWebsiteSetup.twig | 4 | ||||
-rw-r--r-- | plugins/Installation/templates/structure.twig | 4 | ||||
-rw-r--r-- | plugins/Installation/templates/systemCheck.twig | 2 | ||||
-rwxr-xr-x | plugins/Installation/templates/systemCheckPage.twig | 6 | ||||
-rwxr-xr-x | plugins/Installation/templates/systemCheckSection.twig | 8 | ||||
-rw-r--r-- | plugins/Installation/templates/systemCheck_legend.twig | 6 | ||||
-rw-r--r-- | plugins/Installation/templates/tablesCreation.twig | 6 | ||||
-rw-r--r-- | plugins/Live/Visitor.php | 2 | ||||
-rw-r--r-- | plugins/Live/images/file0.png (renamed from plugins/Live/templates/images/file0.png) | bin | 593 -> 593 bytes | |||
-rw-r--r-- | plugins/Live/images/file1.png (renamed from plugins/Live/templates/images/file1.png) | bin | 637 -> 637 bytes | |||
-rw-r--r-- | plugins/Live/images/file2.png (renamed from plugins/Live/templates/images/file2.png) | bin | 642 -> 642 bytes | |||
-rw-r--r-- | plugins/Live/images/file3.png (renamed from plugins/Live/templates/images/file3.png) | bin | 674 -> 674 bytes | |||
-rw-r--r-- | plugins/Live/images/file4.png (renamed from plugins/Live/templates/images/file4.png) | bin | 611 -> 611 bytes | |||
-rw-r--r-- | plugins/Live/images/file5.png (renamed from plugins/Live/templates/images/file5.png) | bin | 668 -> 668 bytes | |||
-rw-r--r-- | plugins/Live/images/file6.png (renamed from plugins/Live/templates/images/file6.png) | bin | 659 -> 659 bytes | |||
-rw-r--r-- | plugins/Live/images/file7.png (renamed from plugins/Live/templates/images/file7.png) | bin | 681 -> 681 bytes | |||
-rw-r--r-- | plugins/Live/images/file8.png (renamed from plugins/Live/templates/images/file8.png) | bin | 642 -> 642 bytes | |||
-rw-r--r-- | plugins/Live/images/file9.png (renamed from plugins/Live/templates/images/file9.png) | bin | 569 -> 569 bytes | |||
-rw-r--r-- | plugins/Live/images/pause.gif (renamed from plugins/Live/templates/images/pause.gif) | bin | 669 -> 669 bytes | |||
-rw-r--r-- | plugins/Live/images/pause_disabled.gif (renamed from plugins/Live/templates/images/pause_disabled.gif) | bin | 619 -> 619 bytes | |||
-rw-r--r-- | plugins/Live/images/play.gif (renamed from plugins/Live/templates/images/play.gif) | bin | 666 -> 666 bytes | |||
-rw-r--r-- | plugins/Live/images/play_disabled.gif (renamed from plugins/Live/templates/images/play_disabled.gif) | bin | 407 -> 407 bytes | |||
-rw-r--r-- | plugins/Live/images/returningVisitor.gif (renamed from plugins/Live/templates/images/returningVisitor.gif) | bin | 995 -> 995 bytes | |||
-rw-r--r-- | plugins/Live/templates/index.twig | 4 | ||||
-rw-r--r-- | plugins/Live/templates/lastVisits.twig | 2 | ||||
-rw-r--r-- | plugins/Live/templates/live.css | 2 | ||||
-rw-r--r-- | plugins/Live/templates/scripts/live.js | 8 | ||||
-rw-r--r-- | plugins/Login/templates/login.twig | 6 | ||||
-rw-r--r-- | plugins/Overlay/images/info.png (renamed from plugins/Overlay/templates/info.png) | bin | 778 -> 778 bytes | |||
-rwxr-xr-x | plugins/Overlay/images/overlay_icon.png (renamed from plugins/Overlay/templates/overlay_icon.png) | bin | 359 -> 359 bytes | |||
-rwxr-xr-x | plugins/Overlay/images/overlay_icon_hover.png (renamed from plugins/Overlay/templates/overlay_icon_hover.png) | bin | 360 -> 360 bytes | |||
-rw-r--r-- | plugins/Overlay/templates/error_wrong_domain.twig | 2 | ||||
-rw-r--r-- | plugins/Overlay/templates/index.css | 4 | ||||
-rw-r--r-- | plugins/Overlay/templates/index.twig | 2 | ||||
-rw-r--r-- | plugins/Overlay/templates/rowaction.js | 4 | ||||
-rw-r--r-- | plugins/PDFReports/templates/list.twig | 4 | ||||
-rw-r--r-- | plugins/SitesManager/templates/index.twig | 6 | ||||
-rwxr-xr-x | plugins/Transitions/images/transitions_icon.png (renamed from plugins/Transitions/templates/transitions_icon.png) | bin | 643 -> 643 bytes | |||
-rwxr-xr-x | plugins/Transitions/images/transitions_icon_hover.png (renamed from plugins/Transitions/templates/transitions_icon_hover.png) | bin | 647 -> 647 bytes | |||
-rw-r--r-- | plugins/Transitions/templates/transitions.js | 4 | ||||
-rw-r--r-- | plugins/UserCountry/functions.php | 2 | ||||
-rw-r--r-- | plugins/UserCountry/images/flags/a1.png (renamed from plugins/UserCountry/flags/a1.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/a2.png (renamed from plugins/UserCountry/flags/a2.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ac.png (renamed from plugins/UserCountry/flags/ac.png) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ad.png (renamed from plugins/UserCountry/flags/ad.png) | bin | 454 -> 454 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ae.png (renamed from plugins/UserCountry/flags/ae.png) | bin | 277 -> 277 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/af.png (renamed from plugins/UserCountry/flags/af.png) | bin | 420 -> 420 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ag.png (renamed from plugins/UserCountry/flags/ag.png) | bin | 456 -> 456 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ai.png (renamed from plugins/UserCountry/flags/ai.png) | bin | 516 -> 516 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/al.png (renamed from plugins/UserCountry/flags/al.png) | bin | 434 -> 434 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/am.png (renamed from plugins/UserCountry/flags/am.png) | bin | 332 -> 332 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/an.png (renamed from plugins/UserCountry/flags/an.png) | bin | 365 -> 365 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ao.png (renamed from plugins/UserCountry/flags/ao.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ap.png (renamed from plugins/UserCountry/flags/ap.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/aq.png (renamed from plugins/UserCountry/flags/aq.png) | bin | 376 -> 376 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ar.png (renamed from plugins/UserCountry/flags/ar.png) | bin | 367 -> 367 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/as.png (renamed from plugins/UserCountry/flags/as.png) | bin | 540 -> 540 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/at.png (renamed from plugins/UserCountry/flags/at.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/au.png (renamed from plugins/UserCountry/flags/au.png) | bin | 580 -> 580 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/aw.png (renamed from plugins/UserCountry/flags/aw.png) | bin | 393 -> 393 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ax.png (renamed from plugins/UserCountry/flags/ax.png) | bin | 480 -> 480 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/az.png (renamed from plugins/UserCountry/flags/az.png) | bin | 423 -> 423 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ba.png (renamed from plugins/UserCountry/flags/ba.png) | bin | 471 -> 471 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bb.png (renamed from plugins/UserCountry/flags/bb.png) | bin | 403 -> 403 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bd.png (renamed from plugins/UserCountry/flags/bd.png) | bin | 372 -> 372 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/be.png (renamed from plugins/UserCountry/flags/be.png) | bin | 294 -> 294 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bf.png (renamed from plugins/UserCountry/flags/bf.png) | bin | 341 -> 341 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bg.png (renamed from plugins/UserCountry/flags/bg.png) | bin | 320 -> 320 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bh.png (renamed from plugins/UserCountry/flags/bh.png) | bin | 345 -> 345 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bi.png (renamed from plugins/UserCountry/flags/bi.png) | bin | 566 -> 566 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bj.png (renamed from plugins/UserCountry/flags/bj.png) | bin | 311 -> 311 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bl.png (renamed from plugins/UserCountry/flags/bl.png) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bm.png (renamed from plugins/UserCountry/flags/bm.png) | bin | 499 -> 499 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bn.png (renamed from plugins/UserCountry/flags/bn.png) | bin | 502 -> 502 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bo.png (renamed from plugins/UserCountry/flags/bo.png) | bin | 341 -> 341 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bq.png (renamed from plugins/UserCountry/flags/bq.png) | bin | 310 -> 310 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/br.png (renamed from plugins/UserCountry/flags/br.png) | bin | 486 -> 486 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bs.png (renamed from plugins/UserCountry/flags/bs.png) | bin | 391 -> 391 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bt.png (renamed from plugins/UserCountry/flags/bt.png) | bin | 471 -> 471 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bu.png (renamed from plugins/UserCountry/flags/bu.png) | bin | 336 -> 336 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bv.png (renamed from plugins/UserCountry/flags/bv.png) | bin | 397 -> 397 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bw.png (renamed from plugins/UserCountry/flags/bw.png) | bin | 327 -> 327 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/by.png (renamed from plugins/UserCountry/flags/by.png) | bin | 382 -> 382 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/bz.png (renamed from plugins/UserCountry/flags/bz.png) | bin | 476 -> 476 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ca.png (renamed from plugins/UserCountry/flags/ca.png) | bin | 471 -> 471 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cat.png (renamed from plugins/UserCountry/flags/cat.png) | bin | 353 -> 353 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cc.png (renamed from plugins/UserCountry/flags/cc.png) | bin | 496 -> 496 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cd.png (renamed from plugins/UserCountry/flags/cd.png) | bin | 477 -> 477 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cf.png (renamed from plugins/UserCountry/flags/cf.png) | bin | 456 -> 456 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cg.png (renamed from plugins/UserCountry/flags/cg.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ch.png (renamed from plugins/UserCountry/flags/ch.png) | bin | 239 -> 239 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ci.png (renamed from plugins/UserCountry/flags/ci.png) | bin | 306 -> 306 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ck.png (renamed from plugins/UserCountry/flags/ck.png) | bin | 495 -> 495 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cl.png (renamed from plugins/UserCountry/flags/cl.png) | bin | 324 -> 324 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cm.png (renamed from plugins/UserCountry/flags/cm.png) | bin | 347 -> 347 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cn.png (renamed from plugins/UserCountry/flags/cn.png) | bin | 349 -> 349 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/co.png (renamed from plugins/UserCountry/flags/co.png) | bin | 330 -> 330 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cp.png (renamed from plugins/UserCountry/flags/cp.png) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cr.png (renamed from plugins/UserCountry/flags/cr.png) | bin | 349 -> 349 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cs.png (renamed from plugins/UserCountry/flags/cs.png) | bin | 321 -> 321 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cu.png (renamed from plugins/UserCountry/flags/cu.png) | bin | 445 -> 445 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cv.png (renamed from plugins/UserCountry/flags/cv.png) | bin | 441 -> 441 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cw.png (renamed from plugins/UserCountry/flags/cw.png) | bin | 308 -> 308 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cx.png (renamed from plugins/UserCountry/flags/cx.png) | bin | 498 -> 498 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cy.png (renamed from plugins/UserCountry/flags/cy.png) | bin | 337 -> 337 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/cz.png (renamed from plugins/UserCountry/flags/cz.png) | bin | 367 -> 367 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/de.png (renamed from plugins/UserCountry/flags/de.png) | bin | 364 -> 364 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/dg.png (renamed from plugins/UserCountry/flags/dg.png) | bin | 658 -> 658 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/dj.png (renamed from plugins/UserCountry/flags/dj.png) | bin | 430 -> 430 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/dk.png (renamed from plugins/UserCountry/flags/dk.png) | bin | 352 -> 352 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/dm.png (renamed from plugins/UserCountry/flags/dm.png) | bin | 508 -> 508 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/do.png (renamed from plugins/UserCountry/flags/do.png) | bin | 368 -> 368 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/dz.png (renamed from plugins/UserCountry/flags/dz.png) | bin | 454 -> 454 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ea.png (renamed from plugins/UserCountry/flags/ea.png) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ec.png (renamed from plugins/UserCountry/flags/ec.png) | bin | 355 -> 355 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ee.png (renamed from plugins/UserCountry/flags/ee.png) | bin | 297 -> 297 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/eg.png (renamed from plugins/UserCountry/flags/eg.png) | bin | 348 -> 348 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/eh.png (renamed from plugins/UserCountry/flags/eh.png) | bin | 388 -> 388 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/er.png (renamed from plugins/UserCountry/flags/er.png) | bin | 497 -> 497 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/es.png (renamed from plugins/UserCountry/flags/es.png) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/et.png (renamed from plugins/UserCountry/flags/et.png) | bin | 445 -> 445 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/eu.png (renamed from plugins/UserCountry/flags/eu.png) | bin | 418 -> 418 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/fi.png (renamed from plugins/UserCountry/flags/fi.png) | bin | 368 -> 368 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/fj.png (renamed from plugins/UserCountry/flags/fj.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/fk.png (renamed from plugins/UserCountry/flags/fk.png) | bin | 526 -> 526 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/fm.png (renamed from plugins/UserCountry/flags/fm.png) | bin | 409 -> 409 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/fo.png (renamed from plugins/UserCountry/flags/fo.png) | bin | 377 -> 377 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/fr.png (renamed from plugins/UserCountry/flags/fr.png) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/fx.png (renamed from plugins/UserCountry/flags/fx.png) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ga.png (renamed from plugins/UserCountry/flags/ga.png) | bin | 342 -> 342 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gb.png (renamed from plugins/UserCountry/flags/gb.png) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gd.png (renamed from plugins/UserCountry/flags/gd.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ge.png (renamed from plugins/UserCountry/flags/ge.png) | bin | 493 -> 493 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gf.png (renamed from plugins/UserCountry/flags/gf.png) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gg.png (renamed from plugins/UserCountry/flags/gg.png) | bin | 524 -> 524 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gh.png (renamed from plugins/UserCountry/flags/gh.png) | bin | 336 -> 336 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gi.png (renamed from plugins/UserCountry/flags/gi.png) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gl.png (renamed from plugins/UserCountry/flags/gl.png) | bin | 351 -> 351 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gm.png (renamed from plugins/UserCountry/flags/gm.png) | bin | 363 -> 363 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gn.png (renamed from plugins/UserCountry/flags/gn.png) | bin | 319 -> 319 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gp.png (renamed from plugins/UserCountry/flags/gp.png) | bin | 353 -> 353 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gq.png (renamed from plugins/UserCountry/flags/gq.png) | bin | 405 -> 405 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gr.png (renamed from plugins/UserCountry/flags/gr.png) | bin | 391 -> 391 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gs.png (renamed from plugins/UserCountry/flags/gs.png) | bin | 522 -> 522 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gt.png (renamed from plugins/UserCountry/flags/gt.png) | bin | 333 -> 333 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gu.png (renamed from plugins/UserCountry/flags/gu.png) | bin | 384 -> 384 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gw.png (renamed from plugins/UserCountry/flags/gw.png) | bin | 346 -> 346 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/gy.png (renamed from plugins/UserCountry/flags/gy.png) | bin | 521 -> 521 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/hk.png (renamed from plugins/UserCountry/flags/hk.png) | bin | 393 -> 393 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/hm.png (renamed from plugins/UserCountry/flags/hm.png) | bin | 580 -> 580 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/hn.png (renamed from plugins/UserCountry/flags/hn.png) | bin | 411 -> 411 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/hr.png (renamed from plugins/UserCountry/flags/hr.png) | bin | 386 -> 386 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ht.png (renamed from plugins/UserCountry/flags/ht.png) | bin | 327 -> 327 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/hu.png (renamed from plugins/UserCountry/flags/hu.png) | bin | 293 -> 293 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ic.png (renamed from plugins/UserCountry/flags/ic.png) | bin | 378 -> 378 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/id.png (renamed from plugins/UserCountry/flags/id.png) | bin | 301 -> 301 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ie.png (renamed from plugins/UserCountry/flags/ie.png) | bin | 333 -> 333 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/il.png (renamed from plugins/UserCountry/flags/il.png) | bin | 326 -> 326 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/im.png (renamed from plugins/UserCountry/flags/im.png) | bin | 320 -> 320 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/in.png (renamed from plugins/UserCountry/flags/in.png) | bin | 377 -> 377 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/io.png (renamed from plugins/UserCountry/flags/io.png) | bin | 575 -> 575 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/iq.png (renamed from plugins/UserCountry/flags/iq.png) | bin | 403 -> 403 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ir.png (renamed from plugins/UserCountry/flags/ir.png) | bin | 398 -> 398 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/is.png (renamed from plugins/UserCountry/flags/is.png) | bin | 410 -> 410 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/it.png (renamed from plugins/UserCountry/flags/it.png) | bin | 283 -> 283 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/je.png (renamed from plugins/UserCountry/flags/je.png) | bin | 475 -> 475 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/jm.png (renamed from plugins/UserCountry/flags/jm.png) | bin | 508 -> 508 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/jo.png (renamed from plugins/UserCountry/flags/jo.png) | bin | 353 -> 353 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/jp.png (renamed from plugins/UserCountry/flags/jp.png) | bin | 307 -> 307 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ke.png (renamed from plugins/UserCountry/flags/ke.png) | bin | 435 -> 435 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/kg.png (renamed from plugins/UserCountry/flags/kg.png) | bin | 354 -> 354 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/kh.png (renamed from plugins/UserCountry/flags/kh.png) | bin | 422 -> 422 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ki.png (renamed from plugins/UserCountry/flags/ki.png) | bin | 551 -> 551 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/km.png (renamed from plugins/UserCountry/flags/km.png) | bin | 456 -> 456 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/kn.png (renamed from plugins/UserCountry/flags/kn.png) | bin | 480 -> 480 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/kp.png (renamed from plugins/UserCountry/flags/kp.png) | bin | 424 -> 424 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/kr.png (renamed from plugins/UserCountry/flags/kr.png) | bin | 507 -> 507 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/kw.png (renamed from plugins/UserCountry/flags/kw.png) | bin | 351 -> 351 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ky.png (renamed from plugins/UserCountry/flags/ky.png) | bin | 532 -> 532 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/kz.png (renamed from plugins/UserCountry/flags/kz.png) | bin | 459 -> 459 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/la.png (renamed from plugins/UserCountry/flags/la.png) | bin | 415 -> 415 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/lb.png (renamed from plugins/UserCountry/flags/lb.png) | bin | 393 -> 393 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/lc.png (renamed from plugins/UserCountry/flags/lc.png) | bin | 462 -> 462 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/li.png (renamed from plugins/UserCountry/flags/li.png) | bin | 399 -> 399 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/lk.png (renamed from plugins/UserCountry/flags/lk.png) | bin | 464 -> 464 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/lr.png (renamed from plugins/UserCountry/flags/lr.png) | bin | 365 -> 365 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ls.png (renamed from plugins/UserCountry/flags/ls.png) | bin | 500 -> 500 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/lt.png (renamed from plugins/UserCountry/flags/lt.png) | bin | 345 -> 345 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/lu.png (renamed from plugins/UserCountry/flags/lu.png) | bin | 338 -> 338 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/lv.png (renamed from plugins/UserCountry/flags/lv.png) | bin | 339 -> 339 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ly.png (renamed from plugins/UserCountry/flags/ly.png) | bin | 277 -> 277 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ma.png (renamed from plugins/UserCountry/flags/ma.png) | bin | 293 -> 293 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mc.png (renamed from plugins/UserCountry/flags/mc.png) | bin | 254 -> 254 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/md.png (renamed from plugins/UserCountry/flags/md.png) | bin | 404 -> 404 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/me.png (renamed from plugins/UserCountry/flags/me.png) | bin | 394 -> 394 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mf.png (renamed from plugins/UserCountry/flags/mf.png) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mg.png (renamed from plugins/UserCountry/flags/mg.png) | bin | 313 -> 313 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mh.png (renamed from plugins/UserCountry/flags/mh.png) | bin | 518 -> 518 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mk.png (renamed from plugins/UserCountry/flags/mk.png) | bin | 449 -> 449 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ml.png (renamed from plugins/UserCountry/flags/ml.png) | bin | 322 -> 322 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mm.png (renamed from plugins/UserCountry/flags/mm.png) | bin | 336 -> 336 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mn.png (renamed from plugins/UserCountry/flags/mn.png) | bin | 343 -> 343 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mo.png (renamed from plugins/UserCountry/flags/mo.png) | bin | 456 -> 456 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mp.png (renamed from plugins/UserCountry/flags/mp.png) | bin | 481 -> 481 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mq.png (renamed from plugins/UserCountry/flags/mq.png) | bin | 541 -> 541 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mr.png (renamed from plugins/UserCountry/flags/mr.png) | bin | 408 -> 408 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ms.png (renamed from plugins/UserCountry/flags/ms.png) | bin | 497 -> 497 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mt.png (renamed from plugins/UserCountry/flags/mt.png) | bin | 296 -> 296 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mu.png (renamed from plugins/UserCountry/flags/mu.png) | bin | 360 -> 360 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mv.png (renamed from plugins/UserCountry/flags/mv.png) | bin | 391 -> 391 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mw.png (renamed from plugins/UserCountry/flags/mw.png) | bin | 365 -> 365 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mx.png (renamed from plugins/UserCountry/flags/mx.png) | bin | 424 -> 424 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/my.png (renamed from plugins/UserCountry/flags/my.png) | bin | 464 -> 464 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/mz.png (renamed from plugins/UserCountry/flags/mz.png) | bin | 439 -> 439 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/na.png (renamed from plugins/UserCountry/flags/na.png) | bin | 559 -> 559 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/nc.png (renamed from plugins/UserCountry/flags/nc.png) | bin | 470 -> 470 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ne.png (renamed from plugins/UserCountry/flags/ne.png) | bin | 393 -> 393 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/nf.png (renamed from plugins/UserCountry/flags/nf.png) | bin | 474 -> 474 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ng.png (renamed from plugins/UserCountry/flags/ng.png) | bin | 341 -> 341 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ni.png (renamed from plugins/UserCountry/flags/ni.png) | bin | 372 -> 372 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/nl.png (renamed from plugins/UserCountry/flags/nl.png) | bin | 310 -> 310 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/no.png (renamed from plugins/UserCountry/flags/no.png) | bin | 397 -> 397 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/np.png (renamed from plugins/UserCountry/flags/np.png) | bin | 349 -> 349 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/nr.png (renamed from plugins/UserCountry/flags/nr.png) | bin | 391 -> 391 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/nt.png (renamed from plugins/UserCountry/flags/nt.png) | bin | 198 -> 198 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/nu.png (renamed from plugins/UserCountry/flags/nu.png) | bin | 468 -> 468 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/nz.png (renamed from plugins/UserCountry/flags/nz.png) | bin | 529 -> 529 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/o1.png (renamed from plugins/UserCountry/flags/o1.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/om.png (renamed from plugins/UserCountry/flags/om.png) | bin | 339 -> 339 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pa.png (renamed from plugins/UserCountry/flags/pa.png) | bin | 390 -> 390 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pe.png (renamed from plugins/UserCountry/flags/pe.png) | bin | 264 -> 264 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pf.png (renamed from plugins/UserCountry/flags/pf.png) | bin | 379 -> 379 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pg.png (renamed from plugins/UserCountry/flags/pg.png) | bin | 438 -> 438 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ph.png (renamed from plugins/UserCountry/flags/ph.png) | bin | 416 -> 416 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pk.png (renamed from plugins/UserCountry/flags/pk.png) | bin | 448 -> 448 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pl.png (renamed from plugins/UserCountry/flags/pl.png) | bin | 243 -> 243 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pm.png (renamed from plugins/UserCountry/flags/pm.png) | bin | 572 -> 572 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pn.png (renamed from plugins/UserCountry/flags/pn.png) | bin | 547 -> 547 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pr.png (renamed from plugins/UserCountry/flags/pr.png) | bin | 445 -> 445 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ps.png (renamed from plugins/UserCountry/flags/ps.png) | bin | 348 -> 348 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pt.png (renamed from plugins/UserCountry/flags/pt.png) | bin | 407 -> 407 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/pw.png (renamed from plugins/UserCountry/flags/pw.png) | bin | 424 -> 424 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/py.png (renamed from plugins/UserCountry/flags/py.png) | bin | 344 -> 344 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/qa.png (renamed from plugins/UserCountry/flags/qa.png) | bin | 343 -> 343 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/re.png (renamed from plugins/UserCountry/flags/re.png) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ro.png (renamed from plugins/UserCountry/flags/ro.png) | bin | 333 -> 333 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/rs.png (renamed from plugins/UserCountry/flags/rs.png) | bin | 376 -> 376 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ru.png (renamed from plugins/UserCountry/flags/ru.png) | bin | 299 -> 299 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/rw.png (renamed from plugins/UserCountry/flags/rw.png) | bin | 382 -> 382 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sa.png (renamed from plugins/UserCountry/flags/sa.png) | bin | 428 -> 428 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sb.png (renamed from plugins/UserCountry/flags/sb.png) | bin | 520 -> 520 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sc.png (renamed from plugins/UserCountry/flags/sc.png) | bin | 481 -> 481 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sd.png (renamed from plugins/UserCountry/flags/sd.png) | bin | 364 -> 364 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/se.png (renamed from plugins/UserCountry/flags/se.png) | bin | 389 -> 389 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sf.png (renamed from plugins/UserCountry/flags/sf.png) | bin | 368 -> 368 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sg.png (renamed from plugins/UserCountry/flags/sg.png) | bin | 350 -> 350 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sh.png (renamed from plugins/UserCountry/flags/sh.png) | bin | 524 -> 524 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/si.png (renamed from plugins/UserCountry/flags/si.png) | bin | 383 -> 383 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sj.png (renamed from plugins/UserCountry/flags/sj.png) | bin | 397 -> 397 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sk.png (renamed from plugins/UserCountry/flags/sk.png) | bin | 439 -> 439 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sl.png (renamed from plugins/UserCountry/flags/sl.png) | bin | 321 -> 321 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sm.png (renamed from plugins/UserCountry/flags/sm.png) | bin | 396 -> 396 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sn.png (renamed from plugins/UserCountry/flags/sn.png) | bin | 356 -> 356 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/so.png (renamed from plugins/UserCountry/flags/so.png) | bin | 376 -> 376 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sr.png (renamed from plugins/UserCountry/flags/sr.png) | bin | 370 -> 370 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ss.png (renamed from plugins/UserCountry/flags/ss.png) | bin | 422 -> 422 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/st.png (renamed from plugins/UserCountry/flags/st.png) | bin | 429 -> 429 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/su.png (renamed from plugins/UserCountry/flags/su.png) | bin | 273 -> 273 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sv.png (renamed from plugins/UserCountry/flags/sv.png) | bin | 373 -> 373 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sx.png (renamed from plugins/UserCountry/flags/sx.png) | bin | 416 -> 416 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sy.png (renamed from plugins/UserCountry/flags/sy.png) | bin | 322 -> 322 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/sz.png (renamed from plugins/UserCountry/flags/sz.png) | bin | 508 -> 508 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ta.png (renamed from plugins/UserCountry/flags/ta.png) | bin | 512 -> 512 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tc.png (renamed from plugins/UserCountry/flags/tc.png) | bin | 509 -> 509 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/td.png (renamed from plugins/UserCountry/flags/td.png) | bin | 378 -> 378 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tf.png (renamed from plugins/UserCountry/flags/tf.png) | bin | 399 -> 399 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tg.png (renamed from plugins/UserCountry/flags/tg.png) | bin | 410 -> 410 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/th.png (renamed from plugins/UserCountry/flags/th.png) | bin | 327 -> 327 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ti.png (renamed from plugins/UserCountry/flags/ti.png) | bin | 811 -> 811 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tj.png (renamed from plugins/UserCountry/flags/tj.png) | bin | 367 -> 367 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tk.png (renamed from plugins/UserCountry/flags/tk.png) | bin | 522 -> 522 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tl.png (renamed from plugins/UserCountry/flags/tl.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tm.png (renamed from plugins/UserCountry/flags/tm.png) | bin | 456 -> 456 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tn.png (renamed from plugins/UserCountry/flags/tn.png) | bin | 367 -> 367 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/to.png (renamed from plugins/UserCountry/flags/to.png) | bin | 302 -> 302 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tp.png (renamed from plugins/UserCountry/flags/tp.png) | bin | 395 -> 395 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tr.png (renamed from plugins/UserCountry/flags/tr.png) | bin | 366 -> 366 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tt.png (renamed from plugins/UserCountry/flags/tt.png) | bin | 486 -> 486 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tv.png (renamed from plugins/UserCountry/flags/tv.png) | bin | 443 -> 443 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tw.png (renamed from plugins/UserCountry/flags/tw.png) | bin | 330 -> 330 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/tz.png (renamed from plugins/UserCountry/flags/tz.png) | bin | 514 -> 514 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ua.png (renamed from plugins/UserCountry/flags/ua.png) | bin | 304 -> 304 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ug.png (renamed from plugins/UserCountry/flags/ug.png) | bin | 388 -> 388 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/uk.png (renamed from plugins/UserCountry/flags/uk.png) | bin | 545 -> 545 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/um.png (renamed from plugins/UserCountry/flags/um.png) | bin | 455 -> 455 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/us.png (renamed from plugins/UserCountry/flags/us.png) | bin | 492 -> 492 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/uy.png (renamed from plugins/UserCountry/flags/uy.png) | bin | 411 -> 411 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/uz.png (renamed from plugins/UserCountry/flags/uz.png) | bin | 411 -> 411 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/va.png (renamed from plugins/UserCountry/flags/va.png) | bin | 419 -> 419 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/vc.png (renamed from plugins/UserCountry/flags/vc.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ve.png (renamed from plugins/UserCountry/flags/ve.png) | bin | 412 -> 412 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/vg.png (renamed from plugins/UserCountry/flags/vg.png) | bin | 510 -> 510 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/vi.png (renamed from plugins/UserCountry/flags/vi.png) | bin | 523 -> 523 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/vn.png (renamed from plugins/UserCountry/flags/vn.png) | bin | 324 -> 324 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/vu.png (renamed from plugins/UserCountry/flags/vu.png) | bin | 450 -> 450 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/wf.png (renamed from plugins/UserCountry/flags/wf.png) | bin | 438 -> 438 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ws.png (renamed from plugins/UserCountry/flags/ws.png) | bin | 352 -> 352 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/xx.png (renamed from plugins/UserCountry/flags/xx.png) | bin | 290 -> 290 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/ye.png (renamed from plugins/UserCountry/flags/ye.png) | bin | 302 -> 302 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/yt.png (renamed from plugins/UserCountry/flags/yt.png) | bin | 456 -> 456 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/yu.png (renamed from plugins/UserCountry/flags/yu.png) | bin | 321 -> 321 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/za.png (renamed from plugins/UserCountry/flags/za.png) | bin | 523 -> 523 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/zm.png (renamed from plugins/UserCountry/flags/zm.png) | bin | 359 -> 359 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/zr.png (renamed from plugins/UserCountry/flags/zr.png) | bin | 380 -> 380 bytes | |||
-rw-r--r-- | plugins/UserCountry/images/flags/zw.png (renamed from plugins/UserCountry/flags/zw.png) | bin | 462 -> 462 bytes | |||
-rw-r--r-- | plugins/UserCountryMap/images/cities.png (renamed from plugins/UserCountryMap/img/cities.png) | bin | 267 -> 267 bytes | |||
-rw-r--r-- | plugins/UserCountryMap/images/realtimemap-loading.gif (renamed from plugins/UserCountryMap/img/realtimemap-loading.gif) | bin | 308 -> 308 bytes | |||
-rw-r--r-- | plugins/UserCountryMap/images/regions.png (renamed from plugins/UserCountryMap/img/regions.png) | bin | 296 -> 296 bytes | |||
-rw-r--r-- | plugins/UserCountryMap/images/zoom-out-disabled.png (renamed from plugins/UserCountryMap/img/zoom-out-disabled.png) | bin | 270 -> 270 bytes | |||
-rw-r--r-- | plugins/UserCountryMap/images/zoom-out.png (renamed from plugins/UserCountryMap/img/zoom-out.png) | bin | 289 -> 289 bytes | |||
-rw-r--r-- | plugins/UserCountryMap/img/info.png | bin | 372 -> 0 bytes | |||
-rw-r--r-- | plugins/UserCountryMap/img/world.png | bin | 384 -> 0 bytes | |||
-rw-r--r-- | plugins/UserCountryMap/templates/realtime-map.twig | 4 | ||||
-rw-r--r-- | plugins/UserCountryMap/templates/visitor-map.twig | 10 | ||||
-rw-r--r-- | plugins/Zeitgeist/images/affix-arrow.png (renamed from plugins/Zeitgeist/theme/images/affix-arrow.png) | bin | 3179 -> 3179 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/arr_r.png (renamed from plugins/Zeitgeist/theme/images/arr_r.png) | bin | 195 -> 195 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/background-submit.png (renamed from plugins/Zeitgeist/theme/images/background-submit.png) | bin | 1347 -> 1347 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/chart_bar.png (renamed from plugins/Zeitgeist/theme/images/chart_bar.png) | bin | 170 -> 170 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/chart_line_edit.png (renamed from plugins/Zeitgeist/theme/images/chart_line_edit.png) | bin | 993 -> 993 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/chart_line_edit_bg.png (renamed from plugins/Zeitgeist/theme/images/chart_line_edit_bg.png) | bin | 800 -> 800 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/chart_pie.png (renamed from plugins/Zeitgeist/theme/images/chart_pie.png) | bin | 355 -> 355 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/close.png (renamed from plugins/Zeitgeist/theme/images/close.png) | bin | 1089 -> 1089 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/collapsed_arrows.gif (renamed from plugins/Zeitgeist/theme/images/collapsed_arrows.gif) | bin | 54 -> 54 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/configure-highlight.png (renamed from plugins/Zeitgeist/theme/images/configure-highlight.png) | bin | 933 -> 933 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/configure.png (renamed from plugins/Zeitgeist/theme/images/configure.png) | bin | 387 -> 387 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/dashboard_h_bg.png (renamed from plugins/Zeitgeist/theme/images/dashboard_h_bg.png) | bin | 162 -> 162 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/dashboard_h_bg_hover.png (renamed from plugins/Zeitgeist/theme/images/dashboard_h_bg_hover.png) | bin | 333 -> 333 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/data_table_footer_active_item.png (renamed from plugins/Zeitgeist/theme/images/data_table_footer_active_item.png) | bin | 145 -> 145 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/datepicker_arr_l.png (renamed from plugins/Zeitgeist/theme/images/datepicker_arr_l.png) | bin | 191 -> 191 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/datepicker_arr_r.png (renamed from plugins/Zeitgeist/theme/images/datepicker_arr_r.png) | bin | 196 -> 196 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/delete.png (renamed from plugins/Zeitgeist/theme/images/delete.png) | bin | 2175 -> 2175 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/download.png (renamed from plugins/Zeitgeist/theme/images/download.png) | bin | 734 -> 734 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/ecommerceAbandonedCart.gif (renamed from plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif) | bin | 369 -> 369 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/ecommerceOrder.gif (renamed from plugins/Zeitgeist/theme/images/ecommerceOrder.gif) | bin | 570 -> 570 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/email.png (renamed from plugins/Zeitgeist/theme/images/email.png) | bin | 754 -> 754 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/error.png (renamed from plugins/Zeitgeist/theme/images/error.png) | bin | 1150 -> 1150 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/error_medium.png (renamed from plugins/Zeitgeist/theme/images/error_medium.png) | bin | 2622 -> 2622 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/expanded_arrows.gif (renamed from plugins/Zeitgeist/theme/images/expanded_arrows.gif) | bin | 60 -> 60 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/export.png (renamed from plugins/Zeitgeist/theme/images/export.png) | bin | 219 -> 219 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/feed.png (renamed from plugins/Zeitgeist/theme/images/feed.png) | bin | 691 -> 691 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/fullscreen.png (renamed from plugins/Zeitgeist/theme/images/fullscreen.png) | bin | 346 -> 346 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/goal.png (renamed from plugins/Zeitgeist/theme/images/goal.png) | bin | 270 -> 270 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/grey_marker.png (renamed from plugins/Zeitgeist/theme/images/grey_marker.png) | bin | 1627 -> 1627 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/help.png (renamed from plugins/Zeitgeist/theme/images/help.png) | bin | 786 -> 786 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/help_grey.png (renamed from plugins/Zeitgeist/theme/images/help_grey.png) | bin | 942 -> 942 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/html_icon.png (renamed from plugins/Zeitgeist/theme/images/html_icon.png) | bin | 3503 -> 3503 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/ico_alert.png (renamed from plugins/Zeitgeist/theme/images/ico_alert.png) | bin | 1112 -> 1112 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/ico_delete.png (renamed from plugins/Zeitgeist/theme/images/ico_delete.png) | bin | 231 -> 231 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/ico_edit.png (renamed from plugins/Zeitgeist/theme/images/ico_edit.png) | bin | 255 -> 255 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/ico_info.png (renamed from plugins/Zeitgeist/theme/images/ico_info.png) | bin | 978 -> 978 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/icon-calendar.gif (renamed from plugins/Zeitgeist/theme/images/icon-calendar.gif) | bin | 331 -> 331 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/image.png (renamed from plugins/Zeitgeist/theme/images/image.png) | bin | 306 -> 306 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/inp_bg.png (renamed from plugins/Zeitgeist/theme/images/inp_bg.png) | bin | 137 -> 137 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/li_dbl_gray.gif (renamed from plugins/Zeitgeist/theme/images/li_dbl_gray.gif) | bin | 48 -> 48 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/link.gif (renamed from plugins/Zeitgeist/theme/images/link.gif) | bin | 75 -> 75 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/loading-blue.gif (renamed from plugins/Zeitgeist/theme/images/loading-blue.gif) | bin | 723 -> 723 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/login-sprite.png (renamed from plugins/Zeitgeist/theme/images/login-sprite.png) | bin | 10200 -> 10200 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/logo-header.png (renamed from plugins/Zeitgeist/theme/images/logo-header.png) | bin | 3682 -> 3682 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/logo.png (renamed from plugins/Zeitgeist/theme/images/logo.png) | bin | 11152 -> 11152 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/logo.svg (renamed from plugins/Zeitgeist/theme/images/logo.svg) | 0 | ||||
-rw-r--r-- | plugins/Zeitgeist/images/maximise.png (renamed from plugins/Zeitgeist/theme/images/maximise.png) | bin | 3182 -> 3182 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/minimise.png (renamed from plugins/Zeitgeist/theme/images/minimise.png) | bin | 2869 -> 2869 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/minus.png (renamed from plugins/Zeitgeist/theme/images/minus.png) | bin | 176 -> 176 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/newtab.png (renamed from plugins/Zeitgeist/theme/images/newtab.png) | bin | 509 -> 509 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/ok.png (renamed from plugins/Zeitgeist/theme/images/ok.png) | bin | 626 -> 626 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/page_border_grad.png (renamed from plugins/Zeitgeist/theme/images/page_border_grad.png) | bin | 688 -> 688 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/paypal_subscribe.gif (renamed from plugins/Zeitgeist/theme/images/paypal_subscribe.gif) | bin | 3080 -> 3080 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/plus.png (renamed from plugins/Zeitgeist/theme/images/plus.png) | bin | 174 -> 174 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/plus_blue.png (renamed from plugins/Zeitgeist/theme/images/plus_blue.png) | bin | 157 -> 157 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/refresh.png (renamed from plugins/Zeitgeist/theme/images/refresh.png) | bin | 2978 -> 2978 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/reload.png (renamed from plugins/Zeitgeist/theme/images/reload.png) | bin | 892 -> 892 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/row_evolution.png (renamed from plugins/Zeitgeist/theme/images/row_evolution.png) | bin | 1934 -> 1934 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/row_evolution_hover.png (renamed from plugins/Zeitgeist/theme/images/row_evolution_hover.png) | bin | 601 -> 601 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/search_bg.png (renamed from plugins/Zeitgeist/theme/images/search_bg.png) | bin | 384 -> 384 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/search_ico.png (renamed from plugins/Zeitgeist/theme/images/search_ico.png) | bin | 175 -> 175 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/sites_selection.png (renamed from plugins/Zeitgeist/theme/images/sites_selection.png) | bin | 120 -> 120 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/smileyprog_0.png (renamed from plugins/Zeitgeist/theme/images/smileyprog_0.png) | bin | 4045 -> 4045 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/smileyprog_1.png (renamed from plugins/Zeitgeist/theme/images/smileyprog_1.png) | bin | 4268 -> 4268 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/smileyprog_2.png (renamed from plugins/Zeitgeist/theme/images/smileyprog_2.png) | bin | 4292 -> 4292 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/smileyprog_3.png (renamed from plugins/Zeitgeist/theme/images/smileyprog_3.png) | bin | 4589 -> 4589 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/smileyprog_4.png (renamed from plugins/Zeitgeist/theme/images/smileyprog_4.png) | bin | 4733 -> 4733 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/sort_subtable_asc.png (renamed from plugins/Zeitgeist/theme/images/sort_subtable_asc.png) | bin | 173 -> 173 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/sort_subtable_asc_light.png (renamed from plugins/Zeitgeist/theme/images/sort_subtable_asc_light.png) | bin | 2866 -> 2866 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/sort_subtable_desc.png (renamed from plugins/Zeitgeist/theme/images/sort_subtable_desc.png) | bin | 171 -> 171 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/sort_subtable_desc_light.png (renamed from plugins/Zeitgeist/theme/images/sort_subtable_desc_light.png) | bin | 286 -> 286 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/sortasc.png (renamed from plugins/Zeitgeist/theme/images/sortasc.png) | bin | 173 -> 173 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/sortdesc.png (renamed from plugins/Zeitgeist/theme/images/sortdesc.png) | bin | 171 -> 171 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/star.png (renamed from plugins/Zeitgeist/theme/images/star.png) | bin | 757 -> 757 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/star_empty.png (renamed from plugins/Zeitgeist/theme/images/star_empty.png) | bin | 658 -> 658 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/success_medium.png (renamed from plugins/Zeitgeist/theme/images/success_medium.png) | bin | 1346 -> 1346 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/table.png (renamed from plugins/Zeitgeist/theme/images/table.png) | bin | 151 -> 151 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/table_more.png (renamed from plugins/Zeitgeist/theme/images/table_more.png) | bin | 200 -> 200 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/tagcloud.png (renamed from plugins/Zeitgeist/theme/images/tagcloud.png) | bin | 202 -> 202 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/video_play.png (renamed from plugins/Zeitgeist/theme/images/video_play.png) | bin | 517 -> 517 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/warning.png (renamed from plugins/Zeitgeist/theme/images/warning.png) | bin | 571 -> 571 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/warning_medium.png (renamed from plugins/Zeitgeist/theme/images/warning_medium.png) | bin | 1283 -> 1283 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/images/warning_small.png (renamed from plugins/Zeitgeist/theme/images/warning_small.png) | bin | 1083 -> 1083 bytes | |||
-rwxr-xr-x | plugins/Zeitgeist/images/yellow_marker.png (renamed from plugins/Zeitgeist/theme/images/yellow_marker.png) | bin | 1618 -> 1618 bytes | |||
-rw-r--r-- | plugins/Zeitgeist/theme/admin.twig | 2 | ||||
-rw-r--r-- | plugins/Zeitgeist/theme/ajaxMacros.twig | 2 | ||||
-rw-r--r-- | plugins/Zeitgeist/theme/common.css | 28 | ||||
-rw-r--r-- | plugins/Zeitgeist/theme/dashboard.twig | 2 | ||||
-rw-r--r-- | plugins/Zeitgeist/theme/genericForm.twig | 2 | ||||
-rw-r--r-- | plugins/Zeitgeist/theme/ieonly.css | 2 | ||||
-rw-r--r-- | plugins/Zeitgeist/theme/simple_structure_header.tpl | 2 | ||||
-rw-r--r-- | plugins/Zeitgeist/theme/styles.css | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml | 38 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml | 4 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml | 10 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml | 4 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml | 38 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml | 24 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml | 20 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml | 20 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml | 10 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml | 4 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml | 6 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml | 4 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html | 6 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html | 6 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml | 8 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml | 10 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml | 2 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html | 6 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html | 6 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml | 2 | ||||
-rw-r--r-- | tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml | 6 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml | 6 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml | 6 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml | 6 | ||||
-rwxr-xr-x | tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml | 6 | ||||
-rw-r--r-- | tests/PHPUnit/Plugins/UserCountryTest.php | 2 | ||||
-rw-r--r-- | tests/PHPUnit/bootstrap.php | 2 |
499 files changed, 285 insertions, 285 deletions
diff --git a/core/DataTable.php b/core/DataTable.php index b5e2064980..3b5947bfd1 100644 --- a/core/DataTable.php +++ b/core/DataTable.php @@ -40,7 +40,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Common.php'; * 'visitors' => 155, * 'pages' => 214, * 'bounce_rate' => 67) - * - metadata = array('logo' => '/img/browsers/FF.png') + * - metadata = array('logo' => '/plugins/UserSettings/images/browsers/FF.gif') * - no sub DataTable * * A more complex example would be a DataTable_Row that is associated to a sub DataTable. @@ -50,7 +50,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Common.php'; * 'visits' => 1550, * 'visits_length' => 514214, * 'returning_visits' => 77) - * - metadata = array( 'logo' => '/img/search/google.png', + * - metadata = array( 'logo' => '/plugins/Referers/images/searchEngines/google.com.png', * 'url' => 'http://google.com') * - DataTable = DataTable containing several DataTable_Row containing the keywords information for this search engine * Example of one DataTable_Row diff --git a/plugins/API/API.php b/plugins/API/API.php index 1d8b92dbd6..810a01a8c2 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -485,7 +485,7 @@ class Piwik_API_API */ public function getSVGLogoUrl($pathOnly = false) { - $logo = 'plugins/Zeitgeist/theme/images/logo.svg'; + $logo = 'plugins/Zeitgeist/images/logo.svg'; if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1 && file_exists(Piwik_Common::getPathToPiwikRoot() . '/themes/logo.svg') ) { diff --git a/plugins/Annotations/templates/annotation.twig b/plugins/Annotations/templates/annotation.twig index e3144413af..e3e879c403 100755 --- a/plugins/Annotations/templates/annotation.twig +++ b/plugins/Annotations/templates/annotation.twig @@ -3,9 +3,9 @@ <div class="annotation-star{% if annotation.canEditOrDelete %} annotation-star-changeable{% endif %}" data-starred="{{ annotation.starred }}" {% if annotation.canEditOrDelete %}title="{{ 'Annotations_ClickToStarOrUnstar'|translate }}"{% endif %}> {% if annotation.starred %} - <img src="plugins/Zeitgeist/theme/images/star.png"/> + <img src="plugins/Zeitgeist/images/star.png"/> {% else %} - <img src="plugins/Zeitgeist/theme/images/star_empty.png"/> + <img src="plugins/Zeitgeist/images/star_empty.png"/> {% endif %} </div> <div class="annotation-period {% if annotation.canEditOrDelete %}annotation-enter-edit-mode{% endif %}">({{ annotation.date }})</div> diff --git a/plugins/Annotations/templates/annotationManager.twig b/plugins/Annotations/templates/annotationManager.twig index 6d79f1ac08..8cd93e2b10 100755 --- a/plugins/Annotations/templates/annotationManager.twig +++ b/plugins/Annotations/templates/annotationManager.twig @@ -12,7 +12,7 @@ <div class="annotation-list"> {% include "@Annotations/annotations.twig" %} - <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span> + <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span> </div> diff --git a/plugins/Annotations/templates/evolutionAnnotations.twig b/plugins/Annotations/templates/evolutionAnnotations.twig index b860d348d8..f2475c2416 100755 --- a/plugins/Annotations/templates/evolutionAnnotations.twig +++ b/plugins/Annotations/templates/evolutionAnnotations.twig @@ -6,7 +6,7 @@ {% if counts.count == 0 %}title="{{ 'Annotations_AddAnnotationsFor_js'|translate(date) }}" {% elseif counts.count == 1 %}title="{{ 'Annotations_AnnotationOnDate'|translate(date,counts.note) }}{{ 'Annotations_ClickToEditOrAdd'|translate }}" {% else %}}title="{{ 'Annotations_ViewAndAddAnnotations_js'|translate(date) }}"{% endif %}> - <img src="plugins/Zeitgeist/theme/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/> + <img src="plugins/Zeitgeist/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/> </span> {% endfor %} </div> diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index bd82f8687d..430dc195c9 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -164,7 +164,7 @@ {% if isValidHost is defined and invalidHostMessage is defined and not isValidHost %} <div class="ajaxSuccess"> <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"> - <img src="plugins/Zeitgeist/theme/images/help_grey.png"/> + <img src="plugins/Zeitgeist/images/help_grey.png"/> </a> <strong>{{ 'General_Warning'|translate }}: </strong>{{ invalidHostMessage }} </div> diff --git a/plugins/CoreHome/templates/images/bg_header.jpg b/plugins/CoreHome/images/bg_header.jpg Binary files differindex 1733b0e355..1733b0e355 100644 --- a/plugins/CoreHome/templates/images/bg_header.jpg +++ b/plugins/CoreHome/images/bg_header.jpg diff --git a/plugins/CoreHome/templates/images/bullet1.gif b/plugins/CoreHome/images/bullet1.gif Binary files differindex f2707da68c..f2707da68c 100644 --- a/plugins/CoreHome/templates/images/bullet1.gif +++ b/plugins/CoreHome/images/bullet1.gif diff --git a/plugins/CoreHome/templates/images/bullet2.gif b/plugins/CoreHome/images/bullet2.gif Binary files differindex 26e1b6af33..26e1b6af33 100644 --- a/plugins/CoreHome/templates/images/bullet2.gif +++ b/plugins/CoreHome/images/bullet2.gif diff --git a/plugins/CoreHome/templates/images/more.png b/plugins/CoreHome/images/more.png Binary files differindex cba03a05f5..cba03a05f5 100644 --- a/plugins/CoreHome/templates/images/more.png +++ b/plugins/CoreHome/images/more.png diff --git a/plugins/CoreHome/templates/images/more_date.gif b/plugins/CoreHome/images/more_date.gif Binary files differindex 87da6b4963..87da6b4963 100644 --- a/plugins/CoreHome/templates/images/more_date.gif +++ b/plugins/CoreHome/images/more_date.gif diff --git a/plugins/CoreHome/templates/images/more_period.gif b/plugins/CoreHome/images/more_period.gif Binary files differindex b0c9787851..b0c9787851 100644 --- a/plugins/CoreHome/templates/images/more_period.gif +++ b/plugins/CoreHome/images/more_period.gif diff --git a/plugins/CoreHome/templates/images/promo_splash.png b/plugins/CoreHome/images/promo_splash.png Binary files differindex 9a78f8e283..9a78f8e283 100755 --- a/plugins/CoreHome/templates/images/promo_splash.png +++ b/plugins/CoreHome/images/promo_splash.png diff --git a/plugins/CoreHome/templates/images/reset_search.png b/plugins/CoreHome/images/reset_search.png Binary files differindex cb1d9e80a2..cb1d9e80a2 100644 --- a/plugins/CoreHome/templates/images/reset_search.png +++ b/plugins/CoreHome/images/reset_search.png diff --git a/plugins/CoreHome/templates/images/search.png b/plugins/CoreHome/images/search.png Binary files differindex 6d1f037c69..6d1f037c69 100644 --- a/plugins/CoreHome/templates/images/search.png +++ b/plugins/CoreHome/images/search.png diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css index daddbc86b0..9527054647 100644 --- a/plugins/CoreHome/templates/datatable.css +++ b/plugins/CoreHome/templates/datatable.css @@ -152,11 +152,11 @@ table.dataTable td.columnodd { } table.dataTable td.labeleven { - background: #F9FAFA url(images/bullet2.gif) no-repeat; + background: #F9FAFA url(../images/bullet2.gif) no-repeat; } table.dataTable td.labelodd { - background: #fff url(images/bullet1.gif) no-repeat; + background: #fff url(../images/bullet1.gif) no-repeat; } .dataTable tr.highlight td { diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js index 49725bead6..219fc7e3a8 100644 --- a/plugins/CoreHome/templates/datatable.js +++ b/plugins/CoreHome/templates/datatable.js @@ -432,7 +432,7 @@ dataTable.prototype = if (currentPattern) { var target = this; var clearImg = $('<span style="position: relative;">\ - <img src="plugins/CoreHome/templates/images/reset_search.png" style="position: absolute; top: 4px; left: -15px; cursor: pointer; display: inline;" title="Clear" />\ + <img src="plugins/CoreHome/images/reset_search.png" style="position: absolute; top: 4px; left: -15px; cursor: pointer; display: inline;" title="Clear" />\ </span>') .click(function () { $('#keyword', target).val(''); diff --git a/plugins/CoreHome/templates/datatable_cell.twig b/plugins/CoreHome/templates/datatable_cell.twig index 7ec96403c0..dab9a6401d 100644 --- a/plugins/CoreHome/templates/datatable_cell.twig +++ b/plugins/CoreHome/templates/datatable_cell.twig @@ -3,7 +3,7 @@ {% if not row.idsubdatatable and column=='label' and row.metadata.url is not empty %} <a target="_blank" href='{% if row.metadata.url|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.metadata.url }}'> {% if row.metadata.logo is empty %} - <img class="link" width="10" height="9" src="plugins/Zeitgeist/theme/images/link.gif"/> + <img class="link" width="10" height="9" src="plugins/Zeitgeist/images/link.gif"/> {% endif %} {% endif %} {% if column=='label' %} diff --git a/plugins/CoreHome/templates/datatable_footer.twig b/plugins/CoreHome/templates/datatable_footer.twig index 7d6f0c0fe7..bf4e932068 100644 --- a/plugins/CoreHome/templates/datatable_footer.twig +++ b/plugins/CoreHome/templates/datatable_footer.twig @@ -20,38 +20,38 @@ </span> {% endif %} - <span class="loadingPiwik" style='display:none'><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> + <span class="loadingPiwik" style='display:none'><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> {% if properties.show_footer_icons %} <div class="dataTableFooterIcons"> <div class="dataTableFooterWrap" var="{{ javascriptVariablesToSet.viewDataTable }}"> {% if not properties.hide_all_views_icons %} - <img src="plugins/Zeitgeist/theme/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/> + <img src="plugins/Zeitgeist/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/> {% endif %} <div class="tableIconsGroup"> <span class="tableAllColumnsSwitch"> {% if properties.show_table %} <a class="tableIcon" format="table" var="table"> - <img title="{{ 'General_DisplaySimpleTable'|translate }}" src="plugins/Zeitgeist/theme/images/table.png"/> + <img title="{{ 'General_DisplaySimpleTable'|translate }}" src="plugins/Zeitgeist/images/table.png"/> </a> {% endif %} {% if properties.show_table_all_columns %} <a class="tableIcon" format="tableAllColumns" var="tableAllColumns"> - <img title="{{ 'General_DisplayTableWithMoreMetrics'|translate }}" src="plugins/Zeitgeist/theme/images/table_more.png"/> + <img title="{{ 'General_DisplayTableWithMoreMetrics'|translate }}" src="plugins/Zeitgeist/images/table_more.png"/> </a> {% endif %} {% if properties.show_goals %} <a class="tableIcon" format="tableGoals" var="tableGoals"> <img title="{{ 'General_DisplayTableWithGoalMetrics'|translate }}" - src="plugins/Zeitgeist/theme/images/{% if javascriptVariablesToSet.idGoal is defined and javascriptVariablesToSet.idGoal=='ecommerceOrder' %}ecommerceOrder.gif{% else %}goal.png{% endif %}"/> + src="plugins/Zeitgeist/images/{% if javascriptVariablesToSet.idGoal is defined and javascriptVariablesToSet.idGoal=='ecommerceOrder' %}ecommerceOrder.gif{% else %}goal.png{% endif %}"/> </a> {% endif %} {% if properties.show_ecommerce %} <a class="tableIcon" format="ecommerceOrder" var="ecommerceOrder"> - <img title="{{ 'General_EcommerceOrders'|translate }}" src="plugins/Zeitgeist/theme/images/ecommerceOrder.gif" /> + <img title="{{ 'General_EcommerceOrders'|translate }}" src="plugins/Zeitgeist/images/ecommerceOrder.gif" /> <span>{{ 'General_EcommerceOrders'|translate }}</span> </a> <a class="tableIcon" format="ecommerceAbandonedCart" var="ecommerceAbandonedCart"> - <img title="{{ 'General_AbandonedCarts'|translate }}" src="plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif" /> + <img title="{{ 'General_AbandonedCarts'|translate }}" src="plugins/Zeitgeist/images/ecommerceAbandonedCart.gif" /> <span>{{ 'General_AbandonedCarts'|translate }}</span> </a> {% endif %} @@ -62,17 +62,17 @@ <span class="tableGraphViews tableGraphCollapsed"> {% if properties.show_bar_chart %} <a class="tableIcon" format="graphVerticalBar" var="graphVerticalBar"> - <img width="16" height="16" src="plugins/Zeitgeist/theme/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/> + <img width="16" height="16" src="plugins/Zeitgeist/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/> </a> {% endif %} {% if properties.show_pie_chart %} <a class="tableIcon" format="graphPie" var="graphPie"> - <img width="16" height="16" src="plugins/Zeitgeist/theme/images/chart_pie.png" title="{{ 'General_Piechart'|translate }}"/> + <img width="16" height="16" src="plugins/Zeitgeist/images/chart_pie.png" title="{{ 'General_Piechart'|translate }}"/> </a> {% endif %} {% if properties.show_tag_cloud %} <a class="tableIcon" format="cloud" var="cloud"> - <img width="16" height="16" src="plugins/Zeitgeist/theme/images/tagcloud.png" title="{{ 'General_TagCloud'|translate }}"/> + <img width="16" height="16" src="plugins/Zeitgeist/images/tagcloud.png" title="{{ 'General_TagCloud'|translate }}"/> </a> {% endif %} </span> @@ -81,7 +81,7 @@ <div class="tableIconsGroup"> <span class="tableGraphViews"> <a class="tableIcon" format="graphEvolution" var="graphEvolution"> - <img width="16" height="16" src="plugins/Zeitgeist/theme/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/> + <img width="16" height="16" src="plugins/Zeitgeist/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/> </a> </span> </div> @@ -89,7 +89,7 @@ <div class="tableIconsGroup"> <span class="exportToFormatIcons"> <a class="tableIcon" var="export"> - <img width="16" height="16" src="plugins/Zeitgeist/theme/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/> + <img width="16" height="16" src="plugins/Zeitgeist/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/> </a> </span> <span class="exportToFormatItems" style="display:none"> @@ -102,14 +102,14 @@ {% if properties.show_export_as_rss_feed %} | <a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.exportLimit }}" date="last10"> - <img border="0" src="plugins/Zeitgeist/theme/images/feed.png"/> + <img border="0" src="plugins/Zeitgeist/images/feed.png"/> </a> {% endif %} </span> {% if properties.show_export_as_image_icon %} <span id="dataTableFooterExportAsImageIcon"> <a class="tableIcon" href="#" onclick="$(this).closest('.dataTable').find('div.jqplot-target').trigger('piwikExportAsImage'); return false;"> - <img title="{{ 'General_ExportAsImage_js'|translate }}" src="plugins/Zeitgeist/theme/images/image.png"/> + <img title="{{ 'General_ExportAsImage_js'|translate }}" src="plugins/Zeitgeist/images/image.png"/> </a> </span> {% endif %} @@ -139,7 +139,7 @@ {% if not properties.hide_annotations_view %} <div class="annotationView" title="{{ 'Annotations_IconDesc_js'|translate }}"> <a class="tableIcon"> - <img width="16" height="16" src="plugins/Zeitgeist/theme/images/grey_marker.png"/> + <img width="16" height="16" src="plugins/Zeitgeist/images/grey_marker.png"/> </a> <span>{{ 'Annotations_Annotations'|translate }}</span> </div> @@ -170,6 +170,6 @@ </div> -<span class="loadingPiwikBelow" style='display:none'><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> +<span class="loadingPiwikBelow" style='display:none'><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> <div class="dataTableSpacer"></div> diff --git a/plugins/CoreHome/templates/donate.js b/plugins/CoreHome/templates/donate.js index a73f12a7c3..bd540109da 100755 --- a/plugins/CoreHome/templates/donate.js +++ b/plugins/CoreHome/templates/donate.js @@ -27,7 +27,7 @@ $('.slider-donate-amount', slider).text('$' + donateAmounts[pos] + '/' + _pk_translate('General_YearShort_js')); // set the right smiley face - $('.slider-smiley-face').attr('src', 'plugins/Zeitgeist/theme/images/smileyprog_' + pos + '.png'); + $('.slider-smiley-face').attr('src', 'plugins/Zeitgeist/images/smileyprog_' + pos + '.png'); // set the hidden option input for paypal var option = Math.max(1, pos); diff --git a/plugins/CoreHome/templates/donate.twig b/plugins/CoreHome/templates/donate.twig index 6e51a0ea1b..c33dfffe9e 100755 --- a/plugins/CoreHome/templates/donate.twig +++ b/plugins/CoreHome/templates/donate.twig @@ -26,14 +26,14 @@ <div style="display:inline-block"> <div class="slider-donate-amount">$30/{{ 'General_YearShort_js'|translate }}</div> - <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/theme/images/smileyprog_1.png"/> + <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/images/smileyprog_1.png"/> </div> <input type="hidden" name="os0" value="Option 1"/> </div> <div class="donate-submit"> - <input type="image" src="plugins/Zeitgeist/theme/images/paypal_subscribe.gif" border="0" name="submit" + <input type="image" src="plugins/Zeitgeist/images/paypal_subscribe.gif" border="0" name="submit" title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/> <a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a> <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82" @@ -41,11 +41,11 @@ </div> <!-- to cache images --> - <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_0.png"/> - <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_1.png"/> - <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_2.png"/> - <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_3.png"/> - <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_4.png"/> + <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_0.png"/> + <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_1.png"/> + <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_2.png"/> + <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_3.png"/> + <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_4.png"/> </form> {% if footerMessage is defined %} <div class="form-description"> diff --git a/plugins/CoreHome/templates/header_message.twig b/plugins/CoreHome/templates/header_message.twig index 15411c683d..c929db3c03 100644 --- a/plugins/CoreHome/templates/header_message.twig +++ b/plugins/CoreHome/templates/header_message.twig @@ -32,8 +32,8 @@ {% if hasSomeAdminAccess %} <br/> <div id="updateCheckLinkContainer"> - <span class='loadingPiwik' style="display:none"><img src='plugins/Zeitgeist/theme/images/loading-blue.gif'/></span> - <img src="plugins/Zeitgeist/theme/images/reload.png"/> + <span class='loadingPiwik' style="display:none"><img src='plugins/Zeitgeist/images/loading-blue.gif'/></span> + <img src="plugins/Zeitgeist/images/reload.png"/> <a href="#" id="checkForUpdates"><em>{{ 'CoreHome_CheckForUpdates'|translate }}</em></a> </div> {% endif %} diff --git a/plugins/CoreHome/templates/images/favicon.ico b/plugins/CoreHome/templates/images/favicon.ico Binary files differdeleted file mode 100644 index ebb2412eab..0000000000 --- a/plugins/CoreHome/templates/images/favicon.ico +++ /dev/null diff --git a/plugins/CoreHome/templates/promo_video.twig b/plugins/CoreHome/templates/promo_video.twig index fde6d99c75..0ae0c23ed3 100755 --- a/plugins/CoreHome/templates/promo_video.twig +++ b/plugins/CoreHome/templates/promo_video.twig @@ -14,7 +14,7 @@ </script> <style type="text/css"> #piwik-promo-thumbnail { - background: #fff url(plugins/CoreHome/templates/images/promo_splash.png) no-repeat 0 0; + background: #fff url(plugins/CoreHome/images/promo_splash.png) no-repeat 0 0; background-position: center; width: 321px; margin: 0 auto 0 auto; @@ -96,7 +96,7 @@ <div id="piwik-promo"> <div id="piwik-promo-video"> <div id="piwik-promo-thumbnail"> - <img src="plugins/Zeitgeist/theme/images/video_play.png"/> + <img src="plugins/Zeitgeist/images/video_play.png"/> </div> <div id="piwik-promo-embed" style="display:none"> diff --git a/plugins/CoreHome/templates/reports_by_dimension.twig b/plugins/CoreHome/templates/reports_by_dimension.twig index e2bdfc380c..de23fe1053 100644 --- a/plugins/CoreHome/templates/reports_by_dimension.twig +++ b/plugins/CoreHome/templates/reports_by_dimension.twig @@ -18,7 +18,7 @@ <div style="float:left;"> <div class="loadingPiwik" style="display:none"> - <img src="plugins/Zeitgeist/theme/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }} + <img src="plugins/Zeitgeist/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }} </div> <div class="dimensionReport">{{ firstReport|raw }}</div> diff --git a/plugins/CoreHome/templates/sites_selection.twig b/plugins/CoreHome/templates/sites_selection.twig index cd13310bbc..d7c904a6c6 100644 --- a/plugins/CoreHome/templates/sites_selection.twig +++ b/plugins/CoreHome/templates/sites_selection.twig @@ -53,7 +53,7 @@ <input type="hidden" class="max_sitename_width" value="130"/> <input type="submit" value="Search" class="but"/> <img title="Clear" class="reset" style="position: relative; top: 4px; left: -44px; cursor: pointer; display: none;" - src="plugins/CoreHome/templates/images/reset_search.png"/> + src="plugins/CoreHome/images/reset_search.png"/> </div> </div> </div> diff --git a/plugins/CoreHome/templates/warning_invalid_host.twig b/plugins/CoreHome/templates/warning_invalid_host.twig index 1076e7eed0..58ec1b397f 100644 --- a/plugins/CoreHome/templates/warning_invalid_host.twig +++ b/plugins/CoreHome/templates/warning_invalid_host.twig @@ -1,7 +1,7 @@ {# untrusted host warning #} {% if (isValidHost and invalidHostMessage and isValidHost == false) %} <div class="ajaxSuccess" style='clear:both;width:800px'> - <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/theme/images/help_grey.png"/></a> + <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/images/help_grey.png"/></a> <strong>{{ 'General_Warning'|translate }}: </strong>{{ invalidHostMessage }} </div> {% endif %} diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig index 7b2ed32425..500a813e8f 100644 --- a/plugins/CoreUpdater/templates/layout.twig +++ b/plugins/CoreUpdater/templates/layout.twig @@ -4,7 +4,7 @@ <head> <title>Piwik › {{ 'CoreUpdater_UpdateTitle'|translate }}</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/> + <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/simple_structure.css"/> <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/> @@ -39,7 +39,7 @@ <body id="simple"> <div id="contentsimple"> <div id="title"> - <img title='Piwik' alt="Piwik" src='plugins/Zeitgeist/theme/images/logo-header.png' style='margin-left:10px'/> + <img title='Piwik' alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png' style='margin-left:10px'/> <span id="subh1"> # {{ 'General_OpenSourceWebAnalytics'|translate }}</span> </div> {% block content %} diff --git a/plugins/CoreUpdater/templates/update_database_done.twig b/plugins/CoreUpdater/templates/update_database_done.twig index 2c59a0463d..99ae48b124 100644 --- a/plugins/CoreUpdater/templates/update_database_done.twig +++ b/plugins/CoreUpdater/templates/update_database_done.twig @@ -8,7 +8,7 @@ <br/> <br/> <div class="error"> - <img src="plugins/Zeitgeist/theme/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} + <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} {% for message in errorMessages %} <pre>{{ message }}</pre> <br/> @@ -32,7 +32,7 @@ {% else %} {% if warningMessages|length > 0 %} <div class="warning"> - <p><img src="plugins/Zeitgeist/theme/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }}</p> + <p><img src="plugins/Zeitgeist/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }}</p> {% for message in warningMessages %} <pre>{{ message }}</pre> <br/> @@ -42,7 +42,7 @@ {% if errorMessages|length > 0 %} <div class="warning"> - <p><img src="plugins/Zeitgeist/theme/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}</p> + <p><img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}</p> {% for message in errorMessages %} <pre>{{ message }}</pre> <br/> @@ -51,7 +51,7 @@ {% if deactivatedPlugins is defined and deactivatedPlugins|length > 0 %} {% set listOfDeactivatedPlugins=deactivatedPlugins|join(', ') %} <p style="color:red"> - <img src="plugins/Zeitgeist/theme/images/error_medium.png"/> + <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }} </p> {% endif %} diff --git a/plugins/CoreUpdater/templates/update_one_click_results.twig b/plugins/CoreUpdater/templates/update_one_click_results.twig index 5f453088b8..3795153608 100644 --- a/plugins/CoreUpdater/templates/update_one_click_results.twig +++ b/plugins/CoreUpdater/templates/update_one_click_results.twig @@ -9,11 +9,11 @@ {% if coreError %} <br/> <br/> - <div class="error"><img src="plugins/Zeitgeist/theme/images/error_medium.png"/> {{ coreError }}</div> + <div class="error"><img src="plugins/Zeitgeist/images/error_medium.png"/> {{ coreError }}</div> <br/> <br/> <div class="warning"> - <img src="plugins/Zeitgeist/theme/images/warning_medium.png"/> + <img src="plugins/Zeitgeist/images/warning_medium.png"/> {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/update/'>","</a>")|raw }} </div> <br/> diff --git a/plugins/CoreUpdater/templates/update_welcome.twig b/plugins/CoreUpdater/templates/update_welcome.twig index 2fa16ab950..b527778939 100644 --- a/plugins/CoreUpdater/templates/update_welcome.twig +++ b/plugins/CoreUpdater/templates/update_welcome.twig @@ -10,7 +10,7 @@ <br/> <br/> <div class="error"> - <img src="plugins/Zeitgeist/theme/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} + <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }} {% for message in errorMessages %} <pre>{{ message|raw }}</pre> {% endfor %} diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig index 6be6661795..b28e241764 100755 --- a/plugins/DBStats/templates/index.twig +++ b/plugins/DBStats/templates/index.twig @@ -84,7 +84,7 @@ <h2>{{ 'General_Reports'|translate }}</h2> <div class="ajaxLoad" action="getIndividualReportsSummary"> - <span class="loadingPiwik"><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span> + <span class="loadingPiwik"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span> </div> </td> </tr> @@ -103,7 +103,7 @@ <h2>{{ 'General_Metrics'|translate }}</h2> <div class="ajaxLoad" action="getIndividualMetricsSummary"> - <span class="loadingPiwik"><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span> + <span class="loadingPiwik"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span> </div> </td> </tr> diff --git a/plugins/Dashboard/javascripts/widgetMenu.js b/plugins/Dashboard/javascripts/widgetMenu.js index 7bad272695..3be0597947 100644 --- a/plugins/Dashboard/javascripts/widgetMenu.js +++ b/plugins/Dashboard/javascripts/widgetMenu.js @@ -130,16 +130,16 @@ widgetsHelper.getEmptyWidgetHtml = function (uniqueId, widgetName) { return '<div id="' + uniqueId + '" class="widget">' + '<div class="widgetTop">' + '<div class="button" id="close">' + - '<img src="plugins/Zeitgeist/theme/images/close.png" title="' + _pk_translate('Dashboard_Close_js') + '" />' + + '<img src="plugins/Zeitgeist/images/close.png" title="' + _pk_translate('Dashboard_Close_js') + '" />' + '</div>' + '<div class="button" id="maximise">' + - '<img src="plugins/Zeitgeist/theme/images/maximise.png" title="' + _pk_translate('Dashboard_Maximise_js') + '" />' + + '<img src="plugins/Zeitgeist/images/maximise.png" title="' + _pk_translate('Dashboard_Maximise_js') + '" />' + '</div>' + '<div class="button" id="minimise">' + - '<img src="plugins/Zeitgeist/theme/images/minimise.png" title="' + _pk_translate('Dashboard_Minimise_js') + '" />' + + '<img src="plugins/Zeitgeist/images/minimise.png" title="' + _pk_translate('Dashboard_Minimise_js') + '" />' + '</div>' + '<div class="button" id="refresh">' + - '<img src="plugins/Zeitgeist/theme/images/refresh.png" title="' + _pk_translate('Dashboard_Refresh_js') + '" />' + + '<img src="plugins/Zeitgeist/images/refresh.png" title="' + _pk_translate('Dashboard_Refresh_js') + '" />' + '</div>' + '<div class="widgetName">' + widgetName + '</div>' + '</div>' + diff --git a/plugins/Goals/templates/list_goal_edit.twig b/plugins/Goals/templates/list_goal_edit.twig index 0149cd8a02..af4057483f 100644 --- a/plugins/Goals/templates/list_goal_edit.twig +++ b/plugins/Goals/templates/list_goal_edit.twig @@ -23,13 +23,13 @@ <td>{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite) }}{% endif %}</td> <td> <a href='#' name="linkEditGoal" id="{{ goal.idgoal }}" class="link_but"> - <img src='plugins/Zeitgeist/theme/images/ico_edit.png' border="0"/> + <img src='plugins/Zeitgeist/images/ico_edit.png' border="0"/> {{ 'General_Edit'|translate }} </a> </td> <td> <a href='#' name="linkDeleteGoal" id="{{ goal.idgoal }}" class="link_but"> - <img src='plugins/Zeitgeist/theme/images/ico_delete.png' border="0"/> + <img src='plugins/Zeitgeist/images/ico_delete.png' border="0"/> {{ 'General_Delete'|translate }} </a> </td> diff --git a/plugins/Goals/templates/title_and_evolution_graph.twig b/plugins/Goals/templates/title_and_evolution_graph.twig index cec3977955..5141cd73e0 100644 --- a/plugins/Goals/templates/title_and_evolution_graph.twig +++ b/plugins/Goals/templates/title_and_evolution_graph.twig @@ -54,7 +54,7 @@ {% if ecommerce is defined %} <div id='rightcolumn' {% if not isWidget %}style='width:30%'{% endif %}> <div> - <img src='plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif'> <i>{{ 'General_AbandonedCarts'|translate }}</i> + <img src='plugins/Zeitgeist/images/ecommerceAbandonedCart.gif'> <i>{{ 'General_AbandonedCarts'|translate }}</i> </div> <div class="sparkline"> diff --git a/plugins/Installation/templates/databaseSetup.twig b/plugins/Installation/templates/databaseSetup.twig index 846825dabc..8afdbb707a 100644 --- a/plugins/Installation/templates/databaseSetup.twig +++ b/plugins/Installation/templates/databaseSetup.twig @@ -5,7 +5,7 @@ {% if errorMessage is defined %} <div class="error"> - <img src="plugins/Zeitgeist/theme/images/error_medium.png"/> + <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'Installation_DatabaseErrorConnect'|translate }}: <br/>{{ errorMessage }} diff --git a/plugins/Installation/templates/displayJavascriptCode.twig b/plugins/Installation/templates/displayJavascriptCode.twig index 1c8679da84..64fa19be1e 100644 --- a/plugins/Installation/templates/displayJavascriptCode.twig +++ b/plugins/Installation/templates/displayJavascriptCode.twig @@ -4,7 +4,7 @@ {% if displayfirstWebsiteSetupSuccess is defined %} <span id="toFade" class="success"> {{ 'Installation_SetupWebsiteSetupSuccess'|translate(displaySiteName) }} - <img src="plugins/Zeitgeist/theme/images/success_medium.png"/> + <img src="plugins/Zeitgeist/images/success_medium.png"/> </span> {% endif %} diff --git a/plugins/Installation/templates/firstWebsiteSetup.twig b/plugins/Installation/templates/firstWebsiteSetup.twig index 5127483c43..f4a0b1449b 100644 --- a/plugins/Installation/templates/firstWebsiteSetup.twig +++ b/plugins/Installation/templates/firstWebsiteSetup.twig @@ -4,7 +4,7 @@ {% if displayGeneralSetupSuccess is defined %} <span id="toFade" class="success"> {{ 'Installation_SuperUserSetupSuccess'|translate }} - <img src="plugins/Zeitgeist/theme/images/success_medium.png"/> + <img src="plugins/Zeitgeist/images/success_medium.png"/> </span> {% endif %} @@ -12,7 +12,7 @@ <p>{{ 'Installation_SiteSetup'|translate }}</p> {% if errorMessage is defined %} <div class="error"> - <img src="plugins/Zeitgeist/theme/images/error_medium.png"/> + <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'Installation_SetupWebsiteError'|translate }}: <br/>- {{ errorMessage }} diff --git a/plugins/Installation/templates/structure.twig b/plugins/Installation/templates/structure.twig index fb2767ef33..b523ffd03d 100644 --- a/plugins/Installation/templates/structure.twig +++ b/plugins/Installation/templates/structure.twig @@ -8,7 +8,7 @@ <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/common.css"/> <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/> <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/styles.css"/> - <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/> + <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> <script type="text/javascript" src="libs/jquery/jquery.js"></script> <script type="text/javascript" src="libs/jquery/jquery-ui.js"></script> @@ -31,7 +31,7 @@ <div id="main"> <div id="content"> <div id="logo"> - <img id="title" width='160' src="plugins/Zeitgeist/theme/images/logo.png"/> <span + <img id="title" width='160' src="plugins/Zeitgeist/images/logo.png"/> <span id="subtitle"># {{ 'General_OpenSourceWebAnalytics'|translate }}</span> </div> <div style="float:right" id="topRightBar"> diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig index 8c9db4babd..fd798a0558 100644 --- a/plugins/Installation/templates/systemCheck.twig +++ b/plugins/Installation/templates/systemCheck.twig @@ -13,7 +13,7 @@ {% if not showNextStep %} <br/> <p> - <img src='plugins/Zeitgeist/theme/images/link.gif'/> + <img src='plugins/Zeitgeist/images/link.gif'/> <a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a> </p> {% include "@Installation/systemCheck_legend.twig" %} diff --git a/plugins/Installation/templates/systemCheckPage.twig b/plugins/Installation/templates/systemCheckPage.twig index 59a112c115..219e120394 100755 --- a/plugins/Installation/templates/systemCheckPage.twig +++ b/plugins/Installation/templates/systemCheckPage.twig @@ -5,13 +5,13 @@ <h2>{{ 'Installation_SystemCheck'|translate }}</h2> <p style="margin-left:1em"> {% if infos.has_errors %} - <img src='plugins/Zeitgeist/theme/images/error.png'/> + <img src='plugins/Zeitgeist/images/error.png'/> {{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>')|raw }} {{ 'Installation_SeeBelowForMoreInfo'|translate }} {% elseif infos.has_warnings %} - <img src='plugins/Zeitgeist/theme/images/warning.png'/> + <img src='plugins/Zeitgeist/images/warning.png'/> {{ 'Installation_SystemCheckSummaryThereWereWarnings'|translate }} {{ 'Installation_SeeBelowForMoreInfo'|translate }} {% else %} - <img src='plugins/Zeitgeist/theme/images/ok.png'/> + <img src='plugins/Zeitgeist/images/ok.png'/> {{ 'Installation_SystemCheckSummaryNoProblems'|translate }} {% endif %} </p> diff --git a/plugins/Installation/templates/systemCheckSection.twig b/plugins/Installation/templates/systemCheckSection.twig index bbdde4c9c6..9c0de17d00 100755 --- a/plugins/Installation/templates/systemCheckSection.twig +++ b/plugins/Installation/templates/systemCheckSection.twig @@ -1,7 +1,7 @@ -{% set ok %}<img src='plugins/Zeitgeist/theme/images/ok.png' />{% endset %} -{% set error %}<img src='plugins/Zeitgeist/theme/images/error.png' />{% endset %} -{% set warning %}<img src='plugins/Zeitgeist/theme/images/warning.png' />{% endset %} -{% set link %}<img src='plugins/Zeitgeist/theme/images/link.gif' />{% endset %} +{% set ok %}<img src='plugins/Zeitgeist/images/ok.png' />{% endset %} +{% set error %}<img src='plugins/Zeitgeist/images/error.png' />{% endset %} +{% set warning %}<img src='plugins/Zeitgeist/images/warning.png' />{% endset %} +{% set link %}<img src='plugins/Zeitgeist/images/link.gif' />{% endset %} <table class="infosServer" id="systemCheckRequired"> <tr> diff --git a/plugins/Installation/templates/systemCheck_legend.twig b/plugins/Installation/templates/systemCheck_legend.twig index ec822a0d41..04e1c20edf 100644 --- a/plugins/Installation/templates/systemCheck_legend.twig +++ b/plugins/Installation/templates/systemCheck_legend.twig @@ -2,11 +2,11 @@ <small> <h2>{{ 'Installation_Legend'|translate }}</h2> <br/> - <img src='plugins/Zeitgeist/theme/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span> + <img src='plugins/Zeitgeist/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span> <br/> - <img src='plugins/Zeitgeist/theme/images/error.png'/> <span style="color:red;font-weight:bold">{{ 'General_Error'|translate }} + <img src='plugins/Zeitgeist/images/error.png'/> <span style="color:red;font-weight:bold">{{ 'General_Error'|translate }} : {{ 'Installation_SystemCheckError'|translate }} </span><br/> - <img src='plugins/Zeitgeist/theme/images/ok.png'/> <span style="color:#26981C;font-weight:bold">{{ 'General_Ok'|translate }}</span><br/> + <img src='plugins/Zeitgeist/images/ok.png'/> <span style="color:#26981C;font-weight:bold">{{ 'General_Ok'|translate }}</span><br/> </small> </div> diff --git a/plugins/Installation/templates/tablesCreation.twig b/plugins/Installation/templates/tablesCreation.twig index 3163d7a3bb..e5f48fc017 100644 --- a/plugins/Installation/templates/tablesCreation.twig +++ b/plugins/Installation/templates/tablesCreation.twig @@ -5,7 +5,7 @@ {% if someTablesInstalled is defined %} <div class="warning">{{ 'Installation_TablesWithSameNamesFound'|translate("<span id='linkToggle'>","</span>")|raw }} - <img src="plugins/Zeitgeist/theme/images/warning_medium.png"/> + <img src="plugins/Zeitgeist/images/warning_medium.png"/> </div> <div id="toggle" style="display:none;color:#4F2410"> <small> @@ -24,12 +24,12 @@ {% if existingTablesDeleted is defined %} <div class="success"> {{ 'Installation_TablesDeletedSuccess'|translate }} - <img src="plugins/Zeitgeist/theme/images/success_medium.png"/></div> + <img src="plugins/Zeitgeist/images/success_medium.png"/></div> {% endif %} {% if tablesCreated is defined %} <div class="success"> {{ 'Installation_TablesCreatedSuccess'|translate }} - <img src="plugins/Zeitgeist/theme/images/success_medium.png"/></div> + <img src="plugins/Zeitgeist/images/success_medium.png"/></div> {% endif %} <script> diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 45a3ec7f08..8e53f9f5ee 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -215,7 +215,7 @@ class Piwik_Live_Visitor if ($type == 'returning' || $type == 'returningCustomer' ) { - return "plugins/Live/templates/images/returningVisitor.gif"; + return "plugins/Live/images/returningVisitor.gif"; } return null; } diff --git a/plugins/Live/templates/images/file0.png b/plugins/Live/images/file0.png Binary files differindex ab6632cbef..ab6632cbef 100644 --- a/plugins/Live/templates/images/file0.png +++ b/plugins/Live/images/file0.png diff --git a/plugins/Live/templates/images/file1.png b/plugins/Live/images/file1.png Binary files differindex db212e575b..db212e575b 100644 --- a/plugins/Live/templates/images/file1.png +++ b/plugins/Live/images/file1.png diff --git a/plugins/Live/templates/images/file2.png b/plugins/Live/images/file2.png Binary files differindex 28a9a30b42..28a9a30b42 100644 --- a/plugins/Live/templates/images/file2.png +++ b/plugins/Live/images/file2.png diff --git a/plugins/Live/templates/images/file3.png b/plugins/Live/images/file3.png Binary files differindex 10b60f9326..10b60f9326 100644 --- a/plugins/Live/templates/images/file3.png +++ b/plugins/Live/images/file3.png diff --git a/plugins/Live/templates/images/file4.png b/plugins/Live/images/file4.png Binary files differindex 67cb7edd0b..67cb7edd0b 100644 --- a/plugins/Live/templates/images/file4.png +++ b/plugins/Live/images/file4.png diff --git a/plugins/Live/templates/images/file5.png b/plugins/Live/images/file5.png Binary files differindex d273922e10..d273922e10 100644 --- a/plugins/Live/templates/images/file5.png +++ b/plugins/Live/images/file5.png diff --git a/plugins/Live/templates/images/file6.png b/plugins/Live/images/file6.png Binary files differindex d1d5da5672..d1d5da5672 100644 --- a/plugins/Live/templates/images/file6.png +++ b/plugins/Live/images/file6.png diff --git a/plugins/Live/templates/images/file7.png b/plugins/Live/images/file7.png Binary files differindex f1aefce06e..f1aefce06e 100644 --- a/plugins/Live/templates/images/file7.png +++ b/plugins/Live/images/file7.png diff --git a/plugins/Live/templates/images/file8.png b/plugins/Live/images/file8.png Binary files differindex a441b8f48d..a441b8f48d 100644 --- a/plugins/Live/templates/images/file8.png +++ b/plugins/Live/images/file8.png diff --git a/plugins/Live/templates/images/file9.png b/plugins/Live/images/file9.png Binary files differindex 6a162c5695..6a162c5695 100644 --- a/plugins/Live/templates/images/file9.png +++ b/plugins/Live/images/file9.png diff --git a/plugins/Live/templates/images/pause.gif b/plugins/Live/images/pause.gif Binary files differindex 5954f9f545..5954f9f545 100644 --- a/plugins/Live/templates/images/pause.gif +++ b/plugins/Live/images/pause.gif diff --git a/plugins/Live/templates/images/pause_disabled.gif b/plugins/Live/images/pause_disabled.gif Binary files differindex 98b79f7402..98b79f7402 100644 --- a/plugins/Live/templates/images/pause_disabled.gif +++ b/plugins/Live/images/pause_disabled.gif diff --git a/plugins/Live/templates/images/play.gif b/plugins/Live/images/play.gif Binary files differindex 87eded433b..87eded433b 100644 --- a/plugins/Live/templates/images/play.gif +++ b/plugins/Live/images/play.gif diff --git a/plugins/Live/templates/images/play_disabled.gif b/plugins/Live/images/play_disabled.gif Binary files differindex ef69513d69..ef69513d69 100644 --- a/plugins/Live/templates/images/play_disabled.gif +++ b/plugins/Live/images/play_disabled.gif diff --git a/plugins/Live/templates/images/returningVisitor.gif b/plugins/Live/images/returningVisitor.gif Binary files differindex bc71867e55..bc71867e55 100644 --- a/plugins/Live/templates/images/returningVisitor.gif +++ b/plugins/Live/images/returningVisitor.gif diff --git a/plugins/Live/templates/index.twig b/plugins/Live/templates/index.twig index 78e35d2fb3..98382fa253 100644 --- a/plugins/Live/templates/index.twig +++ b/plugins/Live/templates/index.twig @@ -31,10 +31,10 @@ <div class="visitsLiveFooter"> <a title="Pause Live!" href="javascript:void(0);" onclick="onClickPause();"> - <img id="pauseImage" border="0" src="plugins/Live/templates/images/pause_disabled.gif" /> + <img id="pauseImage" border="0" src="plugins/Live/images/pause_disabled.gif" /> </a> <a title="Start Live!" href="javascript:void(0);" onclick="onClickPlay();"> - <img id="playImage" border="0" src="plugins/Live/templates/images/play.gif" /> + <img id="playImage" border="0" src="plugins/Live/images/play.gif" /> </a> {% if not disableLink %} diff --git a/plugins/Live/templates/lastVisits.twig b/plugins/Live/templates/lastVisits.twig index 0d12a458ee..f8cc9a9703 100644 --- a/plugins/Live/templates/lastVisits.twig +++ b/plugins/Live/templates/lastVisits.twig @@ -109,7 +109,7 @@ - {{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty }} {% endif %} {% endset %} - <img src="plugins/Live/templates/images/file{{ col }}.png" title="{{ title }}"/> + <img src="plugins/Live/images/file{{ col }}.png" title="{{ title }}"/> {% elseif action.type == 'outlink' or action.type == 'download' %} <img class='iconPadding' src="{{ action.icon }}" title="{{ action.url }} - {{ action.serverTimePretty }}"/> diff --git a/plugins/Live/templates/live.css b/plugins/Live/templates/live.css index f1794631d7..ce03d2eade 100644 --- a/plugins/Live/templates/live.css +++ b/plugins/Live/templates/live.css @@ -18,7 +18,7 @@ } #visitsLive .country { - background: #FFF url(../../../plugins/CoreHome/templates/images/bullet1.gif) no-repeat scroll 0 0; + background: #FFF url(../../CoreHome/images/bullet1.gif) no-repeat scroll 0 0; } #visitsLive .referer { diff --git a/plugins/Live/templates/scripts/live.js b/plugins/Live/templates/scripts/live.js index f65f9ac373..f726b10671 100644 --- a/plugins/Live/templates/scripts/live.js +++ b/plugins/Live/templates/scripts/live.js @@ -201,10 +201,10 @@ })(jQuery); -var pauseImage = "plugins/Live/templates/images/pause.gif"; -var pauseDisabledImage = "plugins/Live/templates/images/pause_disabled.gif"; -var playImage = "plugins/Live/templates/images/play.gif"; -var playDisabledImage = "plugins/Live/templates/images/play_disabled.gif"; +var pauseImage = "plugins/Live/images/pause.gif"; +var pauseDisabledImage = "plugins/Live/images/pause_disabled.gif"; +var playImage = "plugins/Live/images/play.gif"; +var playDisabledImage = "plugins/Live/images/play_disabled.gif"; function onClickPause() { $('#pauseImage').attr('src', pauseImage); $('#playImage').attr('src', playDisabledImage); diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index 801cd2d005..79ce3f050c 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -6,7 +6,7 @@ <head> <title>{% if isCustomLogo == false %}Piwik › {% endif %}{{ 'Login_LogIn'|translate }}</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/> + <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> <link rel="stylesheet" type="text/css" href="plugins/Login/templates/login.css"/> <meta name="description" content="{{ 'General_OpenSourceWebAnalytics'|translate }}" /> <!--[if lt IE 9]> @@ -69,7 +69,7 @@ <br><br>{{ invalidHostMessageHowToFix }} <br/><br/><a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank">{{ 'General_Help'|translate }} - <img style='vertical-align: bottom' src="plugins/Zeitgeist/theme/images/help_grey.png"/></a><br/> + <img style='vertical-align: bottom' src="plugins/Zeitgeist/images/help_grey.png"/></a><br/> </div> {% else %} <div id="message_container"> @@ -120,7 +120,7 @@ </fieldset> <fieldset class="actions"> - <span class="loadingPiwik" style="display:none;"><img alt="Loading" src="plugins/Zeitgeist/theme/images/loading-blue.gif"/></span> + <span class="loadingPiwik" style="display:none;"><img alt="Loading" src="plugins/Zeitgeist/images/loading-blue.gif"/></span> <input class="submit" id='reset_form_submit' type="submit" value="{{ 'Login_ChangePassword'|translate }}" tabindex="100"/> </fieldset> diff --git a/plugins/Overlay/templates/info.png b/plugins/Overlay/images/info.png Binary files differindex 12cd1aef90..12cd1aef90 100644 --- a/plugins/Overlay/templates/info.png +++ b/plugins/Overlay/images/info.png diff --git a/plugins/Overlay/templates/overlay_icon.png b/plugins/Overlay/images/overlay_icon.png Binary files differindex a960d1bbc9..a960d1bbc9 100755 --- a/plugins/Overlay/templates/overlay_icon.png +++ b/plugins/Overlay/images/overlay_icon.png diff --git a/plugins/Overlay/templates/overlay_icon_hover.png b/plugins/Overlay/images/overlay_icon_hover.png Binary files differindex 10296ef392..10296ef392 100755 --- a/plugins/Overlay/templates/overlay_icon_hover.png +++ b/plugins/Overlay/images/overlay_icon_hover.png diff --git a/plugins/Overlay/templates/error_wrong_domain.twig b/plugins/Overlay/templates/error_wrong_domain.twig index 555ba53a1d..0a39680a12 100644 --- a/plugins/Overlay/templates/error_wrong_domain.twig +++ b/plugins/Overlay/templates/error_wrong_domain.twig @@ -4,7 +4,7 @@ <title></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta name="generator" content="Piwik - Open Source Web Analytics"/> - <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/> + <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> <style type="text/css"> body { diff --git a/plugins/Overlay/templates/index.css b/plugins/Overlay/templates/index.css index 495d669ad4..1d428f834e 100644 --- a/plugins/Overlay/templates/index.css +++ b/plugins/Overlay/templates/index.css @@ -87,7 +87,7 @@ a#Overlay_RowEvolution { } a#Overlay_Transitions { - background: url(../../Transitions/templates/transitions_icon_hover.png) no-repeat 0 6px; + background: url(../../Transitions/images/transitions_icon_hover.png) no-repeat 0 6px; } a#Overlay_FullScreen { @@ -127,7 +127,7 @@ a#Overlay_Transitions:hover { } h2.Overlay_MainMetrics { - background: url(./info.png) 0 1px no-repeat + background: url(../images/info.png) 0 1px no-repeat } body .ui-tooltip.Overlay_Tooltip { diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig index 6ec206d908..4b806478cb 100644 --- a/plugins/Overlay/templates/index.twig +++ b/plugins/Overlay/templates/index.twig @@ -9,7 +9,7 @@ {% block content %} <a id="Overlay_Title" href="http://piwik.org/docs/page-overlay/" target="_blank"> {{ 'Overlay_Overlay'|translate }} - <img src="plugins/Zeitgeist/theme/images/help.png" alt="Documentation" /> + <img src="plugins/Zeitgeist/images/help.png" alt="Documentation" /> </a> <div id="Overlay_DateRangeSelection"> diff --git a/plugins/Overlay/templates/rowaction.js b/plugins/Overlay/templates/rowaction.js index a3a48f1d43..caa1f10a8b 100644 --- a/plugins/Overlay/templates/rowaction.js +++ b/plugins/Overlay/templates/rowaction.js @@ -35,8 +35,8 @@ DataTable_RowActions_Registry.register({ name: 'Overlay', - dataTableIcon: 'plugins/Overlay/templates/overlay_icon.png', - dataTableIconHover: 'plugins/Overlay/templates/overlay_icon_hover.png', + dataTableIcon: 'plugins/Overlay/images/overlay_icon.png', + dataTableIconHover: 'plugins/Overlay/images/overlay_icon_hover.png', order: 30, diff --git a/plugins/PDFReports/templates/list.twig b/plugins/PDFReports/templates/list.twig index 5db9086d88..96ba0f64d5 100644 --- a/plugins/PDFReports/templates/list.twig +++ b/plugins/PDFReports/templates/list.twig @@ -72,14 +72,14 @@ <td> {# edit link #} <a href='#' name="linkEditReport" id="{{ report.idreport }}" class="link_but"> - <img src='plugins/Zeitgeist/theme/images/ico_edit.png' border="0"/> + <img src='plugins/Zeitgeist/images/ico_edit.png' border="0"/> {{ 'General_Edit'|translate }} </a> </td> <td> {*delete link *} <a href='#' name="linkDeleteReport" id="{{ report.idreport }}" class="link_but"> - <img src='plugins/Zeitgeist/theme/images/ico_delete.png' border="0"/> + <img src='plugins/Zeitgeist/images/ico_delete.png' border="0"/> {{ 'General_Delete'|translate }} </a> </td> diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig index f4809813d0..f633c38625 100644 --- a/plugins/SitesManager/templates/index.twig +++ b/plugins/SitesManager/templates/index.twig @@ -239,13 +239,13 @@ $(document).ready(function () { </td> <td> <span id="row{{ site.idsite }}" class='editSite link_but'> - <img src='plugins/Zeitgeist/theme/images/ico_edit.png' title="{{ 'General_Edit'|translate }}" border="0"/> + <img src='plugins/Zeitgeist/images/ico_edit.png' title="{{ 'General_Edit'|translate }}" border="0"/> {{ 'General_Edit'|translate }} </span> </td> <td> <span id="row{{ site.idsite }}" class="deleteSite link_but"> - <img src='plugins/Zeitgeist/theme/images/ico_delete.png' title="{{ 'General_Delete'|translate }}" border="0"/> + <img src='plugins/Zeitgeist/images/ico_delete.png' title="{{ 'General_Delete'|translate }}" border="0"/> {{ 'General_Delete'|translate }} </span> </td> @@ -340,7 +340,7 @@ $(document).ready(function () { {{ 'SitesManager_EnableSiteSpecificUserAgentExclude'|translate }} </label> <span id='enableSiteUserAgentExclude-loading' class='loadingPiwik' style='display:none'> - <img src='plugins/Zeitgeist/theme/images/loading-blue.gif'/> + <img src='plugins/Zeitgeist/images/loading-blue.gif'/> </span> </td> <td> diff --git a/plugins/Transitions/templates/transitions_icon.png b/plugins/Transitions/images/transitions_icon.png Binary files differindex b7f79961f0..b7f79961f0 100755 --- a/plugins/Transitions/templates/transitions_icon.png +++ b/plugins/Transitions/images/transitions_icon.png diff --git a/plugins/Transitions/templates/transitions_icon_hover.png b/plugins/Transitions/images/transitions_icon_hover.png Binary files differindex 380915b9af..380915b9af 100755 --- a/plugins/Transitions/templates/transitions_icon_hover.png +++ b/plugins/Transitions/images/transitions_icon_hover.png diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/templates/transitions.js index dec4442413..696bd35fe4 100644 --- a/plugins/Transitions/templates/transitions.js +++ b/plugins/Transitions/templates/transitions.js @@ -78,8 +78,8 @@ DataTable_RowActions_Registry.register({ name: 'Transitions', - dataTableIcon: 'plugins/Transitions/templates/transitions_icon.png', - dataTableIconHover: 'plugins/Transitions/templates/transitions_icon_hover.png', + dataTableIcon: 'plugins/Transitions/images/transitions_icon.png', + dataTableIconHover: 'plugins/Transitions/images/transitions_icon_hover.png', order: 20, diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php index ab1ff7e26a..debe9166b2 100644 --- a/plugins/UserCountry/functions.php +++ b/plugins/UserCountry/functions.php @@ -17,7 +17,7 @@ */ function Piwik_getFlagFromCode($code) { - $pathInPiwik = 'plugins/UserCountry/flags/%s.png'; + $pathInPiwik = 'plugins/UserCountry/images/flags/%s.png'; $pathWithCode = sprintf($pathInPiwik, $code); $absolutePath = PIWIK_INCLUDE_PATH . '/' . $pathWithCode; if (file_exists($absolutePath)) { diff --git a/plugins/UserCountry/flags/a1.png b/plugins/UserCountry/images/flags/a1.png Binary files differindex da6e1bbe89..da6e1bbe89 100644 --- a/plugins/UserCountry/flags/a1.png +++ b/plugins/UserCountry/images/flags/a1.png diff --git a/plugins/UserCountry/flags/a2.png b/plugins/UserCountry/images/flags/a2.png Binary files differindex da6e1bbe89..da6e1bbe89 100644 --- a/plugins/UserCountry/flags/a2.png +++ b/plugins/UserCountry/images/flags/a2.png diff --git a/plugins/UserCountry/flags/ac.png b/plugins/UserCountry/images/flags/ac.png Binary files differindex 405e897c52..405e897c52 100644 --- a/plugins/UserCountry/flags/ac.png +++ b/plugins/UserCountry/images/flags/ac.png diff --git a/plugins/UserCountry/flags/ad.png b/plugins/UserCountry/images/flags/ad.png Binary files differindex 385fa1d7ea..385fa1d7ea 100644 --- a/plugins/UserCountry/flags/ad.png +++ b/plugins/UserCountry/images/flags/ad.png diff --git a/plugins/UserCountry/flags/ae.png b/plugins/UserCountry/images/flags/ae.png Binary files differindex cf10beb4a3..cf10beb4a3 100644 --- a/plugins/UserCountry/flags/ae.png +++ b/plugins/UserCountry/images/flags/ae.png diff --git a/plugins/UserCountry/flags/af.png b/plugins/UserCountry/images/flags/af.png Binary files differindex 1b24b434fa..1b24b434fa 100644 --- a/plugins/UserCountry/flags/af.png +++ b/plugins/UserCountry/images/flags/af.png diff --git a/plugins/UserCountry/flags/ag.png b/plugins/UserCountry/images/flags/ag.png Binary files differindex 3ca9b1763c..3ca9b1763c 100644 --- a/plugins/UserCountry/flags/ag.png +++ b/plugins/UserCountry/images/flags/ag.png diff --git a/plugins/UserCountry/flags/ai.png b/plugins/UserCountry/images/flags/ai.png Binary files differindex 9bde3ce709..9bde3ce709 100644 --- a/plugins/UserCountry/flags/ai.png +++ b/plugins/UserCountry/images/flags/ai.png diff --git a/plugins/UserCountry/flags/al.png b/plugins/UserCountry/images/flags/al.png Binary files differindex e5f7b0647c..e5f7b0647c 100644 --- a/plugins/UserCountry/flags/al.png +++ b/plugins/UserCountry/images/flags/al.png diff --git a/plugins/UserCountry/flags/am.png b/plugins/UserCountry/images/flags/am.png Binary files differindex 6d0a22383b..6d0a22383b 100644 --- a/plugins/UserCountry/flags/am.png +++ b/plugins/UserCountry/images/flags/am.png diff --git a/plugins/UserCountry/flags/an.png b/plugins/UserCountry/images/flags/an.png Binary files differindex c5165608ce..c5165608ce 100644 --- a/plugins/UserCountry/flags/an.png +++ b/plugins/UserCountry/images/flags/an.png diff --git a/plugins/UserCountry/flags/ao.png b/plugins/UserCountry/images/flags/ao.png Binary files differindex c0872c46f8..c0872c46f8 100644 --- a/plugins/UserCountry/flags/ao.png +++ b/plugins/UserCountry/images/flags/ao.png diff --git a/plugins/UserCountry/flags/ap.png b/plugins/UserCountry/images/flags/ap.png Binary files differindex da6e1bbe89..da6e1bbe89 100644 --- a/plugins/UserCountry/flags/ap.png +++ b/plugins/UserCountry/images/flags/ap.png diff --git a/plugins/UserCountry/flags/aq.png b/plugins/UserCountry/images/flags/aq.png Binary files differindex 217eaba391..217eaba391 100644 --- a/plugins/UserCountry/flags/aq.png +++ b/plugins/UserCountry/images/flags/aq.png diff --git a/plugins/UserCountry/flags/ar.png b/plugins/UserCountry/images/flags/ar.png Binary files differindex 0f09ebdd8e..0f09ebdd8e 100644 --- a/plugins/UserCountry/flags/ar.png +++ b/plugins/UserCountry/images/flags/ar.png diff --git a/plugins/UserCountry/flags/as.png b/plugins/UserCountry/images/flags/as.png Binary files differindex 774776150a..774776150a 100644 --- a/plugins/UserCountry/flags/as.png +++ b/plugins/UserCountry/images/flags/as.png diff --git a/plugins/UserCountry/flags/at.png b/plugins/UserCountry/images/flags/at.png Binary files differindex 700a656671..700a656671 100644 --- a/plugins/UserCountry/flags/at.png +++ b/plugins/UserCountry/images/flags/at.png diff --git a/plugins/UserCountry/flags/au.png b/plugins/UserCountry/images/flags/au.png Binary files differindex 709eac00de..709eac00de 100644 --- a/plugins/UserCountry/flags/au.png +++ b/plugins/UserCountry/images/flags/au.png diff --git a/plugins/UserCountry/flags/aw.png b/plugins/UserCountry/images/flags/aw.png Binary files differindex 7b7d01c10f..7b7d01c10f 100644 --- a/plugins/UserCountry/flags/aw.png +++ b/plugins/UserCountry/images/flags/aw.png diff --git a/plugins/UserCountry/flags/ax.png b/plugins/UserCountry/images/flags/ax.png Binary files differindex ff51987a16..ff51987a16 100644 --- a/plugins/UserCountry/flags/ax.png +++ b/plugins/UserCountry/images/flags/ax.png diff --git a/plugins/UserCountry/flags/az.png b/plugins/UserCountry/images/flags/az.png Binary files differindex 2f189667f6..2f189667f6 100644 --- a/plugins/UserCountry/flags/az.png +++ b/plugins/UserCountry/images/flags/az.png diff --git a/plugins/UserCountry/flags/ba.png b/plugins/UserCountry/images/flags/ba.png Binary files differindex c996c301cb..c996c301cb 100644 --- a/plugins/UserCountry/flags/ba.png +++ b/plugins/UserCountry/images/flags/ba.png diff --git a/plugins/UserCountry/flags/bb.png b/plugins/UserCountry/images/flags/bb.png Binary files differindex 50992817cf..50992817cf 100644 --- a/plugins/UserCountry/flags/bb.png +++ b/plugins/UserCountry/images/flags/bb.png diff --git a/plugins/UserCountry/flags/bd.png b/plugins/UserCountry/images/flags/bd.png Binary files differindex 685325475a..685325475a 100644 --- a/plugins/UserCountry/flags/bd.png +++ b/plugins/UserCountry/images/flags/bd.png diff --git a/plugins/UserCountry/flags/be.png b/plugins/UserCountry/images/flags/be.png Binary files differindex 12c10f46e0..12c10f46e0 100644 --- a/plugins/UserCountry/flags/be.png +++ b/plugins/UserCountry/images/flags/be.png diff --git a/plugins/UserCountry/flags/bf.png b/plugins/UserCountry/images/flags/bf.png Binary files differindex 22b42bcc98..22b42bcc98 100644 --- a/plugins/UserCountry/flags/bf.png +++ b/plugins/UserCountry/images/flags/bf.png diff --git a/plugins/UserCountry/flags/bg.png b/plugins/UserCountry/images/flags/bg.png Binary files differindex 41f34d8562..41f34d8562 100644 --- a/plugins/UserCountry/flags/bg.png +++ b/plugins/UserCountry/images/flags/bg.png diff --git a/plugins/UserCountry/flags/bh.png b/plugins/UserCountry/images/flags/bh.png Binary files differindex 32ca603f30..32ca603f30 100644 --- a/plugins/UserCountry/flags/bh.png +++ b/plugins/UserCountry/images/flags/bh.png diff --git a/plugins/UserCountry/flags/bi.png b/plugins/UserCountry/images/flags/bi.png Binary files differindex 1f03e129ad..1f03e129ad 100644 --- a/plugins/UserCountry/flags/bi.png +++ b/plugins/UserCountry/images/flags/bi.png diff --git a/plugins/UserCountry/flags/bj.png b/plugins/UserCountry/images/flags/bj.png Binary files differindex 53d4eb1e99..53d4eb1e99 100644 --- a/plugins/UserCountry/flags/bj.png +++ b/plugins/UserCountry/images/flags/bj.png diff --git a/plugins/UserCountry/flags/bl.png b/plugins/UserCountry/images/flags/bl.png Binary files differindex 744ede391d..744ede391d 100644 --- a/plugins/UserCountry/flags/bl.png +++ b/plugins/UserCountry/images/flags/bl.png diff --git a/plugins/UserCountry/flags/bm.png b/plugins/UserCountry/images/flags/bm.png Binary files differindex 3cb8803156..3cb8803156 100644 --- a/plugins/UserCountry/flags/bm.png +++ b/plugins/UserCountry/images/flags/bm.png diff --git a/plugins/UserCountry/flags/bn.png b/plugins/UserCountry/images/flags/bn.png Binary files differindex 9aafbb389c..9aafbb389c 100644 --- a/plugins/UserCountry/flags/bn.png +++ b/plugins/UserCountry/images/flags/bn.png diff --git a/plugins/UserCountry/flags/bo.png b/plugins/UserCountry/images/flags/bo.png Binary files differindex 46b519eae6..46b519eae6 100644 --- a/plugins/UserCountry/flags/bo.png +++ b/plugins/UserCountry/images/flags/bo.png diff --git a/plugins/UserCountry/flags/bq.png b/plugins/UserCountry/images/flags/bq.png Binary files differindex 77f75f6ffa..77f75f6ffa 100644 --- a/plugins/UserCountry/flags/bq.png +++ b/plugins/UserCountry/images/flags/bq.png diff --git a/plugins/UserCountry/flags/br.png b/plugins/UserCountry/images/flags/br.png Binary files differindex 5cdff06a4a..5cdff06a4a 100644 --- a/plugins/UserCountry/flags/br.png +++ b/plugins/UserCountry/images/flags/br.png diff --git a/plugins/UserCountry/flags/bs.png b/plugins/UserCountry/images/flags/bs.png Binary files differindex bc5333e0b9..bc5333e0b9 100644 --- a/plugins/UserCountry/flags/bs.png +++ b/plugins/UserCountry/images/flags/bs.png diff --git a/plugins/UserCountry/flags/bt.png b/plugins/UserCountry/images/flags/bt.png Binary files differindex 0abb9130c7..0abb9130c7 100644 --- a/plugins/UserCountry/flags/bt.png +++ b/plugins/UserCountry/images/flags/bt.png diff --git a/plugins/UserCountry/flags/bu.png b/plugins/UserCountry/images/flags/bu.png Binary files differindex d931b1dbe4..d931b1dbe4 100644 --- a/plugins/UserCountry/flags/bu.png +++ b/plugins/UserCountry/images/flags/bu.png diff --git a/plugins/UserCountry/flags/bv.png b/plugins/UserCountry/images/flags/bv.png Binary files differindex 74264c5866..74264c5866 100644 --- a/plugins/UserCountry/flags/bv.png +++ b/plugins/UserCountry/images/flags/bv.png diff --git a/plugins/UserCountry/flags/bw.png b/plugins/UserCountry/images/flags/bw.png Binary files differindex 463a97775a..463a97775a 100644 --- a/plugins/UserCountry/flags/bw.png +++ b/plugins/UserCountry/images/flags/bw.png diff --git a/plugins/UserCountry/flags/by.png b/plugins/UserCountry/images/flags/by.png Binary files differindex 81c5086ca6..81c5086ca6 100644 --- a/plugins/UserCountry/flags/by.png +++ b/plugins/UserCountry/images/flags/by.png diff --git a/plugins/UserCountry/flags/bz.png b/plugins/UserCountry/images/flags/bz.png Binary files differindex f653173d4f..f653173d4f 100644 --- a/plugins/UserCountry/flags/bz.png +++ b/plugins/UserCountry/images/flags/bz.png diff --git a/plugins/UserCountry/flags/ca.png b/plugins/UserCountry/images/flags/ca.png Binary files differindex b7c48f6341..b7c48f6341 100644 --- a/plugins/UserCountry/flags/ca.png +++ b/plugins/UserCountry/images/flags/ca.png diff --git a/plugins/UserCountry/flags/cat.png b/plugins/UserCountry/images/flags/cat.png Binary files differindex 58faea35b8..58faea35b8 100644 --- a/plugins/UserCountry/flags/cat.png +++ b/plugins/UserCountry/images/flags/cat.png diff --git a/plugins/UserCountry/flags/cc.png b/plugins/UserCountry/images/flags/cc.png Binary files differindex 0791bad575..0791bad575 100644 --- a/plugins/UserCountry/flags/cc.png +++ b/plugins/UserCountry/images/flags/cc.png diff --git a/plugins/UserCountry/flags/cd.png b/plugins/UserCountry/images/flags/cd.png Binary files differindex 6cdfe5c08b..6cdfe5c08b 100644 --- a/plugins/UserCountry/flags/cd.png +++ b/plugins/UserCountry/images/flags/cd.png diff --git a/plugins/UserCountry/flags/cf.png b/plugins/UserCountry/images/flags/cf.png Binary files differindex d932c21016..d932c21016 100644 --- a/plugins/UserCountry/flags/cf.png +++ b/plugins/UserCountry/images/flags/cf.png diff --git a/plugins/UserCountry/flags/cg.png b/plugins/UserCountry/images/flags/cg.png Binary files differindex 0811ccce06..0811ccce06 100644 --- a/plugins/UserCountry/flags/cg.png +++ b/plugins/UserCountry/images/flags/cg.png diff --git a/plugins/UserCountry/flags/ch.png b/plugins/UserCountry/images/flags/ch.png Binary files differindex ead7c2a0d0..ead7c2a0d0 100644 --- a/plugins/UserCountry/flags/ch.png +++ b/plugins/UserCountry/images/flags/ch.png diff --git a/plugins/UserCountry/flags/ci.png b/plugins/UserCountry/images/flags/ci.png Binary files differindex b0d78c7ec6..b0d78c7ec6 100644 --- a/plugins/UserCountry/flags/ci.png +++ b/plugins/UserCountry/images/flags/ci.png diff --git a/plugins/UserCountry/flags/ck.png b/plugins/UserCountry/images/flags/ck.png Binary files differindex 99efe50044..99efe50044 100644 --- a/plugins/UserCountry/flags/ck.png +++ b/plugins/UserCountry/images/flags/ck.png diff --git a/plugins/UserCountry/flags/cl.png b/plugins/UserCountry/images/flags/cl.png Binary files differindex 74a69dc8e8..74a69dc8e8 100644 --- a/plugins/UserCountry/flags/cl.png +++ b/plugins/UserCountry/images/flags/cl.png diff --git a/plugins/UserCountry/flags/cm.png b/plugins/UserCountry/images/flags/cm.png Binary files differindex 65d3827a46..65d3827a46 100644 --- a/plugins/UserCountry/flags/cm.png +++ b/plugins/UserCountry/images/flags/cm.png diff --git a/plugins/UserCountry/flags/cn.png b/plugins/UserCountry/images/flags/cn.png Binary files differindex 9f1b310908..9f1b310908 100644 --- a/plugins/UserCountry/flags/cn.png +++ b/plugins/UserCountry/images/flags/cn.png diff --git a/plugins/UserCountry/flags/co.png b/plugins/UserCountry/images/flags/co.png Binary files differindex eeb10fd86a..eeb10fd86a 100644 --- a/plugins/UserCountry/flags/co.png +++ b/plugins/UserCountry/images/flags/co.png diff --git a/plugins/UserCountry/flags/cp.png b/plugins/UserCountry/images/flags/cp.png Binary files differindex 744ede391d..744ede391d 100644 --- a/plugins/UserCountry/flags/cp.png +++ b/plugins/UserCountry/images/flags/cp.png diff --git a/plugins/UserCountry/flags/cr.png b/plugins/UserCountry/images/flags/cr.png Binary files differindex 413797bfe2..413797bfe2 100644 --- a/plugins/UserCountry/flags/cr.png +++ b/plugins/UserCountry/images/flags/cr.png diff --git a/plugins/UserCountry/flags/cs.png b/plugins/UserCountry/images/flags/cs.png Binary files differindex 0e0fb6deba..0e0fb6deba 100644 --- a/plugins/UserCountry/flags/cs.png +++ b/plugins/UserCountry/images/flags/cs.png diff --git a/plugins/UserCountry/flags/cu.png b/plugins/UserCountry/images/flags/cu.png Binary files differindex 0303459ddd..0303459ddd 100644 --- a/plugins/UserCountry/flags/cu.png +++ b/plugins/UserCountry/images/flags/cu.png diff --git a/plugins/UserCountry/flags/cv.png b/plugins/UserCountry/images/flags/cv.png Binary files differindex 7a1f79755d..7a1f79755d 100644 --- a/plugins/UserCountry/flags/cv.png +++ b/plugins/UserCountry/images/flags/cv.png diff --git a/plugins/UserCountry/flags/cw.png b/plugins/UserCountry/images/flags/cw.png Binary files differindex a6d5f2834b..a6d5f2834b 100644 --- a/plugins/UserCountry/flags/cw.png +++ b/plugins/UserCountry/images/flags/cw.png diff --git a/plugins/UserCountry/flags/cx.png b/plugins/UserCountry/images/flags/cx.png Binary files differindex 8acecd6ec6..8acecd6ec6 100644 --- a/plugins/UserCountry/flags/cx.png +++ b/plugins/UserCountry/images/flags/cx.png diff --git a/plugins/UserCountry/flags/cy.png b/plugins/UserCountry/images/flags/cy.png Binary files differindex 9c2de21570..9c2de21570 100644 --- a/plugins/UserCountry/flags/cy.png +++ b/plugins/UserCountry/images/flags/cy.png diff --git a/plugins/UserCountry/flags/cz.png b/plugins/UserCountry/images/flags/cz.png Binary files differindex 69ea675978..69ea675978 100644 --- a/plugins/UserCountry/flags/cz.png +++ b/plugins/UserCountry/images/flags/cz.png diff --git a/plugins/UserCountry/flags/de.png b/plugins/UserCountry/images/flags/de.png Binary files differindex 2df162b4af..2df162b4af 100644 --- a/plugins/UserCountry/flags/de.png +++ b/plugins/UserCountry/images/flags/de.png diff --git a/plugins/UserCountry/flags/dg.png b/plugins/UserCountry/images/flags/dg.png Binary files differindex 3e74b6a316..3e74b6a316 100644 --- a/plugins/UserCountry/flags/dg.png +++ b/plugins/UserCountry/images/flags/dg.png diff --git a/plugins/UserCountry/flags/dj.png b/plugins/UserCountry/images/flags/dj.png Binary files differindex 3fe7b82cf6..3fe7b82cf6 100644 --- a/plugins/UserCountry/flags/dj.png +++ b/plugins/UserCountry/images/flags/dj.png diff --git a/plugins/UserCountry/flags/dk.png b/plugins/UserCountry/images/flags/dk.png Binary files differindex 622cebd2ce..622cebd2ce 100644 --- a/plugins/UserCountry/flags/dk.png +++ b/plugins/UserCountry/images/flags/dk.png diff --git a/plugins/UserCountry/flags/dm.png b/plugins/UserCountry/images/flags/dm.png Binary files differindex c49785d5ba..c49785d5ba 100644 --- a/plugins/UserCountry/flags/dm.png +++ b/plugins/UserCountry/images/flags/dm.png diff --git a/plugins/UserCountry/flags/do.png b/plugins/UserCountry/images/flags/do.png Binary files differindex 46230992f8..46230992f8 100644 --- a/plugins/UserCountry/flags/do.png +++ b/plugins/UserCountry/images/flags/do.png diff --git a/plugins/UserCountry/flags/dz.png b/plugins/UserCountry/images/flags/dz.png Binary files differindex 144fe154e2..144fe154e2 100644 --- a/plugins/UserCountry/flags/dz.png +++ b/plugins/UserCountry/images/flags/dz.png diff --git a/plugins/UserCountry/flags/ea.png b/plugins/UserCountry/images/flags/ea.png Binary files differindex cfd22a445c..cfd22a445c 100644 --- a/plugins/UserCountry/flags/ea.png +++ b/plugins/UserCountry/images/flags/ea.png diff --git a/plugins/UserCountry/flags/ec.png b/plugins/UserCountry/images/flags/ec.png Binary files differindex 4ca13865ff..4ca13865ff 100644 --- a/plugins/UserCountry/flags/ec.png +++ b/plugins/UserCountry/images/flags/ec.png diff --git a/plugins/UserCountry/flags/ee.png b/plugins/UserCountry/images/flags/ee.png Binary files differindex 17393b8b00..17393b8b00 100644 --- a/plugins/UserCountry/flags/ee.png +++ b/plugins/UserCountry/images/flags/ee.png diff --git a/plugins/UserCountry/flags/eg.png b/plugins/UserCountry/images/flags/eg.png Binary files differindex a7131a3a78..a7131a3a78 100644 --- a/plugins/UserCountry/flags/eg.png +++ b/plugins/UserCountry/images/flags/eg.png diff --git a/plugins/UserCountry/flags/eh.png b/plugins/UserCountry/images/flags/eh.png Binary files differindex 89fe31a0a9..89fe31a0a9 100644 --- a/plugins/UserCountry/flags/eh.png +++ b/plugins/UserCountry/images/flags/eh.png diff --git a/plugins/UserCountry/flags/er.png b/plugins/UserCountry/images/flags/er.png Binary files differindex 2dfe8106b5..2dfe8106b5 100644 --- a/plugins/UserCountry/flags/er.png +++ b/plugins/UserCountry/images/flags/er.png diff --git a/plugins/UserCountry/flags/es.png b/plugins/UserCountry/images/flags/es.png Binary files differindex cfd22a445c..cfd22a445c 100644 --- a/plugins/UserCountry/flags/es.png +++ b/plugins/UserCountry/images/flags/es.png diff --git a/plugins/UserCountry/flags/et.png b/plugins/UserCountry/images/flags/et.png Binary files differindex 11f79b002a..11f79b002a 100644 --- a/plugins/UserCountry/flags/et.png +++ b/plugins/UserCountry/images/flags/et.png diff --git a/plugins/UserCountry/flags/eu.png b/plugins/UserCountry/images/flags/eu.png Binary files differindex 8f5a3eb31c..8f5a3eb31c 100644 --- a/plugins/UserCountry/flags/eu.png +++ b/plugins/UserCountry/images/flags/eu.png diff --git a/plugins/UserCountry/flags/fi.png b/plugins/UserCountry/images/flags/fi.png Binary files differindex f3b1058cd4..f3b1058cd4 100644 --- a/plugins/UserCountry/flags/fi.png +++ b/plugins/UserCountry/images/flags/fi.png diff --git a/plugins/UserCountry/flags/fj.png b/plugins/UserCountry/images/flags/fj.png Binary files differindex 903f680324..903f680324 100644 --- a/plugins/UserCountry/flags/fj.png +++ b/plugins/UserCountry/images/flags/fj.png diff --git a/plugins/UserCountry/flags/fk.png b/plugins/UserCountry/images/flags/fk.png Binary files differindex 5adec9e3e2..5adec9e3e2 100644 --- a/plugins/UserCountry/flags/fk.png +++ b/plugins/UserCountry/images/flags/fk.png diff --git a/plugins/UserCountry/flags/fm.png b/plugins/UserCountry/images/flags/fm.png Binary files differindex 2e2a7a96f0..2e2a7a96f0 100644 --- a/plugins/UserCountry/flags/fm.png +++ b/plugins/UserCountry/images/flags/fm.png diff --git a/plugins/UserCountry/flags/fo.png b/plugins/UserCountry/images/flags/fo.png Binary files differindex 39d2040bc6..39d2040bc6 100644 --- a/plugins/UserCountry/flags/fo.png +++ b/plugins/UserCountry/images/flags/fo.png diff --git a/plugins/UserCountry/flags/fr.png b/plugins/UserCountry/images/flags/fr.png Binary files differindex 744ede391d..744ede391d 100644 --- a/plugins/UserCountry/flags/fr.png +++ b/plugins/UserCountry/images/flags/fr.png diff --git a/plugins/UserCountry/flags/fx.png b/plugins/UserCountry/images/flags/fx.png Binary files differindex 744ede391d..744ede391d 100644 --- a/plugins/UserCountry/flags/fx.png +++ b/plugins/UserCountry/images/flags/fx.png diff --git a/plugins/UserCountry/flags/ga.png b/plugins/UserCountry/images/flags/ga.png Binary files differindex b6ca79e3bc..b6ca79e3bc 100644 --- a/plugins/UserCountry/flags/ga.png +++ b/plugins/UserCountry/images/flags/ga.png diff --git a/plugins/UserCountry/flags/gb.png b/plugins/UserCountry/images/flags/gb.png Binary files differindex 405e897c52..405e897c52 100644 --- a/plugins/UserCountry/flags/gb.png +++ b/plugins/UserCountry/images/flags/gb.png diff --git a/plugins/UserCountry/flags/gd.png b/plugins/UserCountry/images/flags/gd.png Binary files differindex 9b077bb889..9b077bb889 100644 --- a/plugins/UserCountry/flags/gd.png +++ b/plugins/UserCountry/images/flags/gd.png diff --git a/plugins/UserCountry/flags/ge.png b/plugins/UserCountry/images/flags/ge.png Binary files differindex a700789b0b..a700789b0b 100644 --- a/plugins/UserCountry/flags/ge.png +++ b/plugins/UserCountry/images/flags/ge.png diff --git a/plugins/UserCountry/flags/gf.png b/plugins/UserCountry/images/flags/gf.png Binary files differindex 744ede391d..744ede391d 100644 --- a/plugins/UserCountry/flags/gf.png +++ b/plugins/UserCountry/images/flags/gf.png diff --git a/plugins/UserCountry/flags/gg.png b/plugins/UserCountry/images/flags/gg.png Binary files differindex 479141192e..479141192e 100644 --- a/plugins/UserCountry/flags/gg.png +++ b/plugins/UserCountry/images/flags/gg.png diff --git a/plugins/UserCountry/flags/gh.png b/plugins/UserCountry/images/flags/gh.png Binary files differindex 952b1620aa..952b1620aa 100644 --- a/plugins/UserCountry/flags/gh.png +++ b/plugins/UserCountry/images/flags/gh.png diff --git a/plugins/UserCountry/flags/gi.png b/plugins/UserCountry/images/flags/gi.png Binary files differindex f366599da8..f366599da8 100644 --- a/plugins/UserCountry/flags/gi.png +++ b/plugins/UserCountry/images/flags/gi.png diff --git a/plugins/UserCountry/flags/gl.png b/plugins/UserCountry/images/flags/gl.png Binary files differindex f22289be9d..f22289be9d 100644 --- a/plugins/UserCountry/flags/gl.png +++ b/plugins/UserCountry/images/flags/gl.png diff --git a/plugins/UserCountry/flags/gm.png b/plugins/UserCountry/images/flags/gm.png Binary files differindex feed27f5c5..feed27f5c5 100644 --- a/plugins/UserCountry/flags/gm.png +++ b/plugins/UserCountry/images/flags/gm.png diff --git a/plugins/UserCountry/flags/gn.png b/plugins/UserCountry/images/flags/gn.png Binary files differindex 3efeaa534a..3efeaa534a 100644 --- a/plugins/UserCountry/flags/gn.png +++ b/plugins/UserCountry/images/flags/gn.png diff --git a/plugins/UserCountry/flags/gp.png b/plugins/UserCountry/images/flags/gp.png Binary files differindex 160dae80c0..160dae80c0 100644 --- a/plugins/UserCountry/flags/gp.png +++ b/plugins/UserCountry/images/flags/gp.png diff --git a/plugins/UserCountry/flags/gq.png b/plugins/UserCountry/images/flags/gq.png Binary files differindex cad564ceb4..cad564ceb4 100644 --- a/plugins/UserCountry/flags/gq.png +++ b/plugins/UserCountry/images/flags/gq.png diff --git a/plugins/UserCountry/flags/gr.png b/plugins/UserCountry/images/flags/gr.png Binary files differindex dde5b025b7..dde5b025b7 100644 --- a/plugins/UserCountry/flags/gr.png +++ b/plugins/UserCountry/images/flags/gr.png diff --git a/plugins/UserCountry/flags/gs.png b/plugins/UserCountry/images/flags/gs.png Binary files differindex e37521f63b..e37521f63b 100644 --- a/plugins/UserCountry/flags/gs.png +++ b/plugins/UserCountry/images/flags/gs.png diff --git a/plugins/UserCountry/flags/gt.png b/plugins/UserCountry/images/flags/gt.png Binary files differindex 75e76cddb9..75e76cddb9 100644 --- a/plugins/UserCountry/flags/gt.png +++ b/plugins/UserCountry/images/flags/gt.png diff --git a/plugins/UserCountry/flags/gu.png b/plugins/UserCountry/images/flags/gu.png Binary files differindex 4f034bcb29..4f034bcb29 100644 --- a/plugins/UserCountry/flags/gu.png +++ b/plugins/UserCountry/images/flags/gu.png diff --git a/plugins/UserCountry/flags/gw.png b/plugins/UserCountry/images/flags/gw.png Binary files differindex 2ad970b20b..2ad970b20b 100644 --- a/plugins/UserCountry/flags/gw.png +++ b/plugins/UserCountry/images/flags/gw.png diff --git a/plugins/UserCountry/flags/gy.png b/plugins/UserCountry/images/flags/gy.png Binary files differindex 889b5d786e..889b5d786e 100644 --- a/plugins/UserCountry/flags/gy.png +++ b/plugins/UserCountry/images/flags/gy.png diff --git a/plugins/UserCountry/flags/hk.png b/plugins/UserCountry/images/flags/hk.png Binary files differindex 5a3663a87c..5a3663a87c 100644 --- a/plugins/UserCountry/flags/hk.png +++ b/plugins/UserCountry/images/flags/hk.png diff --git a/plugins/UserCountry/flags/hm.png b/plugins/UserCountry/images/flags/hm.png Binary files differindex 709eac00de..709eac00de 100644 --- a/plugins/UserCountry/flags/hm.png +++ b/plugins/UserCountry/images/flags/hm.png diff --git a/plugins/UserCountry/flags/hn.png b/plugins/UserCountry/images/flags/hn.png Binary files differindex d29296df9c..d29296df9c 100644 --- a/plugins/UserCountry/flags/hn.png +++ b/plugins/UserCountry/images/flags/hn.png diff --git a/plugins/UserCountry/flags/hr.png b/plugins/UserCountry/images/flags/hr.png Binary files differindex 20c66c3a60..20c66c3a60 100644 --- a/plugins/UserCountry/flags/hr.png +++ b/plugins/UserCountry/images/flags/hr.png diff --git a/plugins/UserCountry/flags/ht.png b/plugins/UserCountry/images/flags/ht.png Binary files differindex 7aef235b83..7aef235b83 100644 --- a/plugins/UserCountry/flags/ht.png +++ b/plugins/UserCountry/images/flags/ht.png diff --git a/plugins/UserCountry/flags/hu.png b/plugins/UserCountry/images/flags/hu.png Binary files differindex 2d01818314..2d01818314 100644 --- a/plugins/UserCountry/flags/hu.png +++ b/plugins/UserCountry/images/flags/hu.png diff --git a/plugins/UserCountry/flags/ic.png b/plugins/UserCountry/images/flags/ic.png Binary files differindex 3e48fe66e3..3e48fe66e3 100644 --- a/plugins/UserCountry/flags/ic.png +++ b/plugins/UserCountry/images/flags/ic.png diff --git a/plugins/UserCountry/flags/id.png b/plugins/UserCountry/images/flags/id.png Binary files differindex 2f67d57320..2f67d57320 100644 --- a/plugins/UserCountry/flags/id.png +++ b/plugins/UserCountry/images/flags/id.png diff --git a/plugins/UserCountry/flags/ie.png b/plugins/UserCountry/images/flags/ie.png Binary files differindex 9a799f8640..9a799f8640 100644 --- a/plugins/UserCountry/flags/ie.png +++ b/plugins/UserCountry/images/flags/ie.png diff --git a/plugins/UserCountry/flags/il.png b/plugins/UserCountry/images/flags/il.png Binary files differindex 6512bedf75..6512bedf75 100644 --- a/plugins/UserCountry/flags/il.png +++ b/plugins/UserCountry/images/flags/il.png diff --git a/plugins/UserCountry/flags/im.png b/plugins/UserCountry/images/flags/im.png Binary files differindex 8df02545dc..8df02545dc 100644 --- a/plugins/UserCountry/flags/im.png +++ b/plugins/UserCountry/images/flags/im.png diff --git a/plugins/UserCountry/flags/in.png b/plugins/UserCountry/images/flags/in.png Binary files differindex 351c6a51d9..351c6a51d9 100644 --- a/plugins/UserCountry/flags/in.png +++ b/plugins/UserCountry/images/flags/in.png diff --git a/plugins/UserCountry/flags/io.png b/plugins/UserCountry/images/flags/io.png Binary files differindex d87ed5f932..d87ed5f932 100644 --- a/plugins/UserCountry/flags/io.png +++ b/plugins/UserCountry/images/flags/io.png diff --git a/plugins/UserCountry/flags/iq.png b/plugins/UserCountry/images/flags/iq.png Binary files differindex 4eb6b878bd..4eb6b878bd 100644 --- a/plugins/UserCountry/flags/iq.png +++ b/plugins/UserCountry/images/flags/iq.png diff --git a/plugins/UserCountry/flags/ir.png b/plugins/UserCountry/images/flags/ir.png Binary files differindex f60fb8ac2b..f60fb8ac2b 100644 --- a/plugins/UserCountry/flags/ir.png +++ b/plugins/UserCountry/images/flags/ir.png diff --git a/plugins/UserCountry/flags/is.png b/plugins/UserCountry/images/flags/is.png Binary files differindex a4f546273d..a4f546273d 100644 --- a/plugins/UserCountry/flags/is.png +++ b/plugins/UserCountry/images/flags/is.png diff --git a/plugins/UserCountry/flags/it.png b/plugins/UserCountry/images/flags/it.png Binary files differindex 534fd5e657..534fd5e657 100644 --- a/plugins/UserCountry/flags/it.png +++ b/plugins/UserCountry/images/flags/it.png diff --git a/plugins/UserCountry/flags/je.png b/plugins/UserCountry/images/flags/je.png Binary files differindex 76758f4cd3..76758f4cd3 100644 --- a/plugins/UserCountry/flags/je.png +++ b/plugins/UserCountry/images/flags/je.png diff --git a/plugins/UserCountry/flags/jm.png b/plugins/UserCountry/images/flags/jm.png Binary files differindex f4012fa0dc..f4012fa0dc 100644 --- a/plugins/UserCountry/flags/jm.png +++ b/plugins/UserCountry/images/flags/jm.png diff --git a/plugins/UserCountry/flags/jo.png b/plugins/UserCountry/images/flags/jo.png Binary files differindex f7beba7ead..f7beba7ead 100644 --- a/plugins/UserCountry/flags/jo.png +++ b/plugins/UserCountry/images/flags/jo.png diff --git a/plugins/UserCountry/flags/jp.png b/plugins/UserCountry/images/flags/jp.png Binary files differindex 0dc03c944b..0dc03c944b 100644 --- a/plugins/UserCountry/flags/jp.png +++ b/plugins/UserCountry/images/flags/jp.png diff --git a/plugins/UserCountry/flags/ke.png b/plugins/UserCountry/images/flags/ke.png Binary files differindex 5842ce3c42..5842ce3c42 100644 --- a/plugins/UserCountry/flags/ke.png +++ b/plugins/UserCountry/images/flags/ke.png diff --git a/plugins/UserCountry/flags/kg.png b/plugins/UserCountry/images/flags/kg.png Binary files differindex 766bc89816..766bc89816 100644 --- a/plugins/UserCountry/flags/kg.png +++ b/plugins/UserCountry/images/flags/kg.png diff --git a/plugins/UserCountry/flags/kh.png b/plugins/UserCountry/images/flags/kh.png Binary files differindex c2d9aea1ce..c2d9aea1ce 100644 --- a/plugins/UserCountry/flags/kh.png +++ b/plugins/UserCountry/images/flags/kh.png diff --git a/plugins/UserCountry/flags/ki.png b/plugins/UserCountry/images/flags/ki.png Binary files differindex 89bc45b7bd..89bc45b7bd 100644 --- a/plugins/UserCountry/flags/ki.png +++ b/plugins/UserCountry/images/flags/ki.png diff --git a/plugins/UserCountry/flags/km.png b/plugins/UserCountry/images/flags/km.png Binary files differindex adfe5fb1c3..adfe5fb1c3 100644 --- a/plugins/UserCountry/flags/km.png +++ b/plugins/UserCountry/images/flags/km.png diff --git a/plugins/UserCountry/flags/kn.png b/plugins/UserCountry/images/flags/kn.png Binary files differindex 4460ff6053..4460ff6053 100644 --- a/plugins/UserCountry/flags/kn.png +++ b/plugins/UserCountry/images/flags/kn.png diff --git a/plugins/UserCountry/flags/kp.png b/plugins/UserCountry/images/flags/kp.png Binary files differindex 134a9f1adf..134a9f1adf 100644 --- a/plugins/UserCountry/flags/kp.png +++ b/plugins/UserCountry/images/flags/kp.png diff --git a/plugins/UserCountry/flags/kr.png b/plugins/UserCountry/images/flags/kr.png Binary files differindex 09ad2c39b5..09ad2c39b5 100644 --- a/plugins/UserCountry/flags/kr.png +++ b/plugins/UserCountry/images/flags/kr.png diff --git a/plugins/UserCountry/flags/kw.png b/plugins/UserCountry/images/flags/kw.png Binary files differindex 2742d890f3..2742d890f3 100644 --- a/plugins/UserCountry/flags/kw.png +++ b/plugins/UserCountry/images/flags/kw.png diff --git a/plugins/UserCountry/flags/ky.png b/plugins/UserCountry/images/flags/ky.png Binary files differindex 3f0de844a1..3f0de844a1 100644 --- a/plugins/UserCountry/flags/ky.png +++ b/plugins/UserCountry/images/flags/ky.png diff --git a/plugins/UserCountry/flags/kz.png b/plugins/UserCountry/images/flags/kz.png Binary files differindex 37a7ddf08e..37a7ddf08e 100644 --- a/plugins/UserCountry/flags/kz.png +++ b/plugins/UserCountry/images/flags/kz.png diff --git a/plugins/UserCountry/flags/la.png b/plugins/UserCountry/images/flags/la.png Binary files differindex 7d5b624359..7d5b624359 100644 --- a/plugins/UserCountry/flags/la.png +++ b/plugins/UserCountry/images/flags/la.png diff --git a/plugins/UserCountry/flags/lb.png b/plugins/UserCountry/images/flags/lb.png Binary files differindex 8affe4a819..8affe4a819 100644 --- a/plugins/UserCountry/flags/lb.png +++ b/plugins/UserCountry/images/flags/lb.png diff --git a/plugins/UserCountry/flags/lc.png b/plugins/UserCountry/images/flags/lc.png Binary files differindex 2c9870761b..2c9870761b 100644 --- a/plugins/UserCountry/flags/lc.png +++ b/plugins/UserCountry/images/flags/lc.png diff --git a/plugins/UserCountry/flags/li.png b/plugins/UserCountry/images/flags/li.png Binary files differindex 0d7ad9717c..0d7ad9717c 100644 --- a/plugins/UserCountry/flags/li.png +++ b/plugins/UserCountry/images/flags/li.png diff --git a/plugins/UserCountry/flags/lk.png b/plugins/UserCountry/images/flags/lk.png Binary files differindex 0d14120392..0d14120392 100644 --- a/plugins/UserCountry/flags/lk.png +++ b/plugins/UserCountry/images/flags/lk.png diff --git a/plugins/UserCountry/flags/lr.png b/plugins/UserCountry/images/flags/lr.png Binary files differindex 2376d28817..2376d28817 100644 --- a/plugins/UserCountry/flags/lr.png +++ b/plugins/UserCountry/images/flags/lr.png diff --git a/plugins/UserCountry/flags/ls.png b/plugins/UserCountry/images/flags/ls.png Binary files differindex e4f46519bb..e4f46519bb 100644 --- a/plugins/UserCountry/flags/ls.png +++ b/plugins/UserCountry/images/flags/ls.png diff --git a/plugins/UserCountry/flags/lt.png b/plugins/UserCountry/images/flags/lt.png Binary files differindex ace453f7f2..ace453f7f2 100644 --- a/plugins/UserCountry/flags/lt.png +++ b/plugins/UserCountry/images/flags/lt.png diff --git a/plugins/UserCountry/flags/lu.png b/plugins/UserCountry/images/flags/lu.png Binary files differindex 4a9e3d5d9a..4a9e3d5d9a 100644 --- a/plugins/UserCountry/flags/lu.png +++ b/plugins/UserCountry/images/flags/lu.png diff --git a/plugins/UserCountry/flags/lv.png b/plugins/UserCountry/images/flags/lv.png Binary files differindex d9236f966b..d9236f966b 100644 --- a/plugins/UserCountry/flags/lv.png +++ b/plugins/UserCountry/images/flags/lv.png diff --git a/plugins/UserCountry/flags/ly.png b/plugins/UserCountry/images/flags/ly.png Binary files differindex afaae07d48..afaae07d48 100644 --- a/plugins/UserCountry/flags/ly.png +++ b/plugins/UserCountry/images/flags/ly.png diff --git a/plugins/UserCountry/flags/ma.png b/plugins/UserCountry/images/flags/ma.png Binary files differindex 44f2961c1b..44f2961c1b 100644 --- a/plugins/UserCountry/flags/ma.png +++ b/plugins/UserCountry/images/flags/ma.png diff --git a/plugins/UserCountry/flags/mc.png b/plugins/UserCountry/images/flags/mc.png Binary files differindex ecc5edb750..ecc5edb750 100644 --- a/plugins/UserCountry/flags/mc.png +++ b/plugins/UserCountry/images/flags/mc.png diff --git a/plugins/UserCountry/flags/md.png b/plugins/UserCountry/images/flags/md.png Binary files differindex 80b6bf63af..80b6bf63af 100644 --- a/plugins/UserCountry/flags/md.png +++ b/plugins/UserCountry/images/flags/md.png diff --git a/plugins/UserCountry/flags/me.png b/plugins/UserCountry/images/flags/me.png Binary files differindex 0a3ee99b21..0a3ee99b21 100644 --- a/plugins/UserCountry/flags/me.png +++ b/plugins/UserCountry/images/flags/me.png diff --git a/plugins/UserCountry/flags/mf.png b/plugins/UserCountry/images/flags/mf.png Binary files differindex 744ede391d..744ede391d 100644 --- a/plugins/UserCountry/flags/mf.png +++ b/plugins/UserCountry/images/flags/mf.png diff --git a/plugins/UserCountry/flags/mg.png b/plugins/UserCountry/images/flags/mg.png Binary files differindex b8740f880c..b8740f880c 100644 --- a/plugins/UserCountry/flags/mg.png +++ b/plugins/UserCountry/images/flags/mg.png diff --git a/plugins/UserCountry/flags/mh.png b/plugins/UserCountry/images/flags/mh.png Binary files differindex 9cf98c1546..9cf98c1546 100644 --- a/plugins/UserCountry/flags/mh.png +++ b/plugins/UserCountry/images/flags/mh.png diff --git a/plugins/UserCountry/flags/mk.png b/plugins/UserCountry/images/flags/mk.png Binary files differindex ee987490be..ee987490be 100644 --- a/plugins/UserCountry/flags/mk.png +++ b/plugins/UserCountry/images/flags/mk.png diff --git a/plugins/UserCountry/flags/ml.png b/plugins/UserCountry/images/flags/ml.png Binary files differindex a28459d13f..a28459d13f 100644 --- a/plugins/UserCountry/flags/ml.png +++ b/plugins/UserCountry/images/flags/ml.png diff --git a/plugins/UserCountry/flags/mm.png b/plugins/UserCountry/images/flags/mm.png Binary files differindex d931b1dbe4..d931b1dbe4 100644 --- a/plugins/UserCountry/flags/mm.png +++ b/plugins/UserCountry/images/flags/mm.png diff --git a/plugins/UserCountry/flags/mn.png b/plugins/UserCountry/images/flags/mn.png Binary files differindex cc6c412171..cc6c412171 100644 --- a/plugins/UserCountry/flags/mn.png +++ b/plugins/UserCountry/images/flags/mn.png diff --git a/plugins/UserCountry/flags/mo.png b/plugins/UserCountry/images/flags/mo.png Binary files differindex fc49f581ee..fc49f581ee 100644 --- a/plugins/UserCountry/flags/mo.png +++ b/plugins/UserCountry/images/flags/mo.png diff --git a/plugins/UserCountry/flags/mp.png b/plugins/UserCountry/images/flags/mp.png Binary files differindex df0c4b8c18..df0c4b8c18 100644 --- a/plugins/UserCountry/flags/mp.png +++ b/plugins/UserCountry/images/flags/mp.png diff --git a/plugins/UserCountry/flags/mq.png b/plugins/UserCountry/images/flags/mq.png Binary files differindex 6ebdb3ab6c..6ebdb3ab6c 100644 --- a/plugins/UserCountry/flags/mq.png +++ b/plugins/UserCountry/images/flags/mq.png diff --git a/plugins/UserCountry/flags/mr.png b/plugins/UserCountry/images/flags/mr.png Binary files differindex 6700d1ce92..6700d1ce92 100644 --- a/plugins/UserCountry/flags/mr.png +++ b/plugins/UserCountry/images/flags/mr.png diff --git a/plugins/UserCountry/flags/ms.png b/plugins/UserCountry/images/flags/ms.png Binary files differindex aef23fc512..aef23fc512 100644 --- a/plugins/UserCountry/flags/ms.png +++ b/plugins/UserCountry/images/flags/ms.png diff --git a/plugins/UserCountry/flags/mt.png b/plugins/UserCountry/images/flags/mt.png Binary files differindex 837261ebc2..837261ebc2 100644 --- a/plugins/UserCountry/flags/mt.png +++ b/plugins/UserCountry/images/flags/mt.png diff --git a/plugins/UserCountry/flags/mu.png b/plugins/UserCountry/images/flags/mu.png Binary files differindex c1e8b909d3..c1e8b909d3 100644 --- a/plugins/UserCountry/flags/mu.png +++ b/plugins/UserCountry/images/flags/mu.png diff --git a/plugins/UserCountry/flags/mv.png b/plugins/UserCountry/images/flags/mv.png Binary files differindex f03f90ac65..f03f90ac65 100644 --- a/plugins/UserCountry/flags/mv.png +++ b/plugins/UserCountry/images/flags/mv.png diff --git a/plugins/UserCountry/flags/mw.png b/plugins/UserCountry/images/flags/mw.png Binary files differindex 45ea61d87f..45ea61d87f 100644 --- a/plugins/UserCountry/flags/mw.png +++ b/plugins/UserCountry/images/flags/mw.png diff --git a/plugins/UserCountry/flags/mx.png b/plugins/UserCountry/images/flags/mx.png Binary files differindex c78ac89691..c78ac89691 100644 --- a/plugins/UserCountry/flags/mx.png +++ b/plugins/UserCountry/images/flags/mx.png diff --git a/plugins/UserCountry/flags/my.png b/plugins/UserCountry/images/flags/my.png Binary files differindex d47867be7a..d47867be7a 100644 --- a/plugins/UserCountry/flags/my.png +++ b/plugins/UserCountry/images/flags/my.png diff --git a/plugins/UserCountry/flags/mz.png b/plugins/UserCountry/images/flags/mz.png Binary files differindex 464017e923..464017e923 100644 --- a/plugins/UserCountry/flags/mz.png +++ b/plugins/UserCountry/images/flags/mz.png diff --git a/plugins/UserCountry/flags/na.png b/plugins/UserCountry/images/flags/na.png Binary files differindex d685c4973d..d685c4973d 100644 --- a/plugins/UserCountry/flags/na.png +++ b/plugins/UserCountry/images/flags/na.png diff --git a/plugins/UserCountry/flags/nc.png b/plugins/UserCountry/images/flags/nc.png Binary files differindex 88f4ea8559..88f4ea8559 100644 --- a/plugins/UserCountry/flags/nc.png +++ b/plugins/UserCountry/images/flags/nc.png diff --git a/plugins/UserCountry/flags/ne.png b/plugins/UserCountry/images/flags/ne.png Binary files differindex b5f3b8f06d..b5f3b8f06d 100644 --- a/plugins/UserCountry/flags/ne.png +++ b/plugins/UserCountry/images/flags/ne.png diff --git a/plugins/UserCountry/flags/nf.png b/plugins/UserCountry/images/flags/nf.png Binary files differindex b00b331fe3..b00b331fe3 100644 --- a/plugins/UserCountry/flags/nf.png +++ b/plugins/UserCountry/images/flags/nf.png diff --git a/plugins/UserCountry/flags/ng.png b/plugins/UserCountry/images/flags/ng.png Binary files differindex 6dcc973ed5..6dcc973ed5 100644 --- a/plugins/UserCountry/flags/ng.png +++ b/plugins/UserCountry/images/flags/ng.png diff --git a/plugins/UserCountry/flags/ni.png b/plugins/UserCountry/images/flags/ni.png Binary files differindex 44d8a0d3bd..44d8a0d3bd 100644 --- a/plugins/UserCountry/flags/ni.png +++ b/plugins/UserCountry/images/flags/ni.png diff --git a/plugins/UserCountry/flags/nl.png b/plugins/UserCountry/images/flags/nl.png Binary files differindex 77f75f6ffa..77f75f6ffa 100644 --- a/plugins/UserCountry/flags/nl.png +++ b/plugins/UserCountry/images/flags/nl.png diff --git a/plugins/UserCountry/flags/no.png b/plugins/UserCountry/images/flags/no.png Binary files differindex 74264c5866..74264c5866 100644 --- a/plugins/UserCountry/flags/no.png +++ b/plugins/UserCountry/images/flags/no.png diff --git a/plugins/UserCountry/flags/np.png b/plugins/UserCountry/images/flags/np.png Binary files differindex 5b8e388fda..5b8e388fda 100644 --- a/plugins/UserCountry/flags/np.png +++ b/plugins/UserCountry/images/flags/np.png diff --git a/plugins/UserCountry/flags/nr.png b/plugins/UserCountry/images/flags/nr.png Binary files differindex 211e42bb19..211e42bb19 100644 --- a/plugins/UserCountry/flags/nr.png +++ b/plugins/UserCountry/images/flags/nr.png diff --git a/plugins/UserCountry/flags/nt.png b/plugins/UserCountry/images/flags/nt.png Binary files differindex b253914525..b253914525 100644 --- a/plugins/UserCountry/flags/nt.png +++ b/plugins/UserCountry/images/flags/nt.png diff --git a/plugins/UserCountry/flags/nu.png b/plugins/UserCountry/images/flags/nu.png Binary files differindex b9f7f988f4..b9f7f988f4 100644 --- a/plugins/UserCountry/flags/nu.png +++ b/plugins/UserCountry/images/flags/nu.png diff --git a/plugins/UserCountry/flags/nz.png b/plugins/UserCountry/images/flags/nz.png Binary files differindex be935de872..be935de872 100644 --- a/plugins/UserCountry/flags/nz.png +++ b/plugins/UserCountry/images/flags/nz.png diff --git a/plugins/UserCountry/flags/o1.png b/plugins/UserCountry/images/flags/o1.png Binary files differindex da6e1bbe89..da6e1bbe89 100644 --- a/plugins/UserCountry/flags/o1.png +++ b/plugins/UserCountry/images/flags/o1.png diff --git a/plugins/UserCountry/flags/om.png b/plugins/UserCountry/images/flags/om.png Binary files differindex ec95c5aeb9..ec95c5aeb9 100644 --- a/plugins/UserCountry/flags/om.png +++ b/plugins/UserCountry/images/flags/om.png diff --git a/plugins/UserCountry/flags/pa.png b/plugins/UserCountry/images/flags/pa.png Binary files differindex a8a6ea5083..a8a6ea5083 100644 --- a/plugins/UserCountry/flags/pa.png +++ b/plugins/UserCountry/images/flags/pa.png diff --git a/plugins/UserCountry/flags/pe.png b/plugins/UserCountry/images/flags/pe.png Binary files differindex 1cf08251f1..1cf08251f1 100644 --- a/plugins/UserCountry/flags/pe.png +++ b/plugins/UserCountry/images/flags/pe.png diff --git a/plugins/UserCountry/flags/pf.png b/plugins/UserCountry/images/flags/pf.png Binary files differindex 7e471d6438..7e471d6438 100644 --- a/plugins/UserCountry/flags/pf.png +++ b/plugins/UserCountry/images/flags/pf.png diff --git a/plugins/UserCountry/flags/pg.png b/plugins/UserCountry/images/flags/pg.png Binary files differindex 87160a51ee..87160a51ee 100644 --- a/plugins/UserCountry/flags/pg.png +++ b/plugins/UserCountry/images/flags/pg.png diff --git a/plugins/UserCountry/flags/ph.png b/plugins/UserCountry/images/flags/ph.png Binary files differindex 703dd735a5..703dd735a5 100644 --- a/plugins/UserCountry/flags/ph.png +++ b/plugins/UserCountry/images/flags/ph.png diff --git a/plugins/UserCountry/flags/pk.png b/plugins/UserCountry/images/flags/pk.png Binary files differindex f20f3f6e2e..f20f3f6e2e 100644 --- a/plugins/UserCountry/flags/pk.png +++ b/plugins/UserCountry/images/flags/pk.png diff --git a/plugins/UserCountry/flags/pl.png b/plugins/UserCountry/images/flags/pl.png Binary files differindex f6997a2ca6..f6997a2ca6 100644 --- a/plugins/UserCountry/flags/pl.png +++ b/plugins/UserCountry/images/flags/pl.png diff --git a/plugins/UserCountry/flags/pm.png b/plugins/UserCountry/images/flags/pm.png Binary files differindex 4aa799ba7b..4aa799ba7b 100644 --- a/plugins/UserCountry/flags/pm.png +++ b/plugins/UserCountry/images/flags/pm.png diff --git a/plugins/UserCountry/flags/pn.png b/plugins/UserCountry/images/flags/pn.png Binary files differindex 6f62a64d65..6f62a64d65 100644 --- a/plugins/UserCountry/flags/pn.png +++ b/plugins/UserCountry/images/flags/pn.png diff --git a/plugins/UserCountry/flags/pr.png b/plugins/UserCountry/images/flags/pr.png Binary files differindex 4bf609fec4..4bf609fec4 100644 --- a/plugins/UserCountry/flags/pr.png +++ b/plugins/UserCountry/images/flags/pr.png diff --git a/plugins/UserCountry/flags/ps.png b/plugins/UserCountry/images/flags/ps.png Binary files differindex dd1d7821ec..dd1d7821ec 100644 --- a/plugins/UserCountry/flags/ps.png +++ b/plugins/UserCountry/images/flags/ps.png diff --git a/plugins/UserCountry/flags/pt.png b/plugins/UserCountry/images/flags/pt.png Binary files differindex 67e4878e88..67e4878e88 100644 --- a/plugins/UserCountry/flags/pt.png +++ b/plugins/UserCountry/images/flags/pt.png diff --git a/plugins/UserCountry/flags/pw.png b/plugins/UserCountry/images/flags/pw.png Binary files differindex 71fd0a48ca..71fd0a48ca 100644 --- a/plugins/UserCountry/flags/pw.png +++ b/plugins/UserCountry/images/flags/pw.png diff --git a/plugins/UserCountry/flags/py.png b/plugins/UserCountry/images/flags/py.png Binary files differindex 182d9dc0a9..182d9dc0a9 100644 --- a/plugins/UserCountry/flags/py.png +++ b/plugins/UserCountry/images/flags/py.png diff --git a/plugins/UserCountry/flags/qa.png b/plugins/UserCountry/images/flags/qa.png Binary files differindex 86c39fadaa..86c39fadaa 100644 --- a/plugins/UserCountry/flags/qa.png +++ b/plugins/UserCountry/images/flags/qa.png diff --git a/plugins/UserCountry/flags/re.png b/plugins/UserCountry/images/flags/re.png Binary files differindex 744ede391d..744ede391d 100644 --- a/plugins/UserCountry/flags/re.png +++ b/plugins/UserCountry/images/flags/re.png diff --git a/plugins/UserCountry/flags/ro.png b/plugins/UserCountry/images/flags/ro.png Binary files differindex 2535bc81f2..2535bc81f2 100644 --- a/plugins/UserCountry/flags/ro.png +++ b/plugins/UserCountry/images/flags/ro.png diff --git a/plugins/UserCountry/flags/rs.png b/plugins/UserCountry/images/flags/rs.png Binary files differindex 32f6cb945b..32f6cb945b 100644 --- a/plugins/UserCountry/flags/rs.png +++ b/plugins/UserCountry/images/flags/rs.png diff --git a/plugins/UserCountry/flags/ru.png b/plugins/UserCountry/images/flags/ru.png Binary files differindex 096b9c44e7..096b9c44e7 100644 --- a/plugins/UserCountry/flags/ru.png +++ b/plugins/UserCountry/images/flags/ru.png diff --git a/plugins/UserCountry/flags/rw.png b/plugins/UserCountry/images/flags/rw.png Binary files differindex f4b0136eae..f4b0136eae 100644 --- a/plugins/UserCountry/flags/rw.png +++ b/plugins/UserCountry/images/flags/rw.png diff --git a/plugins/UserCountry/flags/sa.png b/plugins/UserCountry/images/flags/sa.png Binary files differindex 03cecfb8c9..03cecfb8c9 100644 --- a/plugins/UserCountry/flags/sa.png +++ b/plugins/UserCountry/images/flags/sa.png diff --git a/plugins/UserCountry/flags/sb.png b/plugins/UserCountry/images/flags/sb.png Binary files differindex 8af1fb9d2f..8af1fb9d2f 100644 --- a/plugins/UserCountry/flags/sb.png +++ b/plugins/UserCountry/images/flags/sb.png diff --git a/plugins/UserCountry/flags/sc.png b/plugins/UserCountry/images/flags/sc.png Binary files differindex fec2961dbb..fec2961dbb 100644 --- a/plugins/UserCountry/flags/sc.png +++ b/plugins/UserCountry/images/flags/sc.png diff --git a/plugins/UserCountry/flags/sd.png b/plugins/UserCountry/images/flags/sd.png Binary files differindex eba0a2079b..eba0a2079b 100644 --- a/plugins/UserCountry/flags/sd.png +++ b/plugins/UserCountry/images/flags/sd.png diff --git a/plugins/UserCountry/flags/se.png b/plugins/UserCountry/images/flags/se.png Binary files differindex e2b347c78b..e2b347c78b 100644 --- a/plugins/UserCountry/flags/se.png +++ b/plugins/UserCountry/images/flags/se.png diff --git a/plugins/UserCountry/flags/sf.png b/plugins/UserCountry/images/flags/sf.png Binary files differindex f3b1058cd4..f3b1058cd4 100644 --- a/plugins/UserCountry/flags/sf.png +++ b/plugins/UserCountry/images/flags/sf.png diff --git a/plugins/UserCountry/flags/sg.png b/plugins/UserCountry/images/flags/sg.png Binary files differindex 84172cae18..84172cae18 100644 --- a/plugins/UserCountry/flags/sg.png +++ b/plugins/UserCountry/images/flags/sg.png diff --git a/plugins/UserCountry/flags/sh.png b/plugins/UserCountry/images/flags/sh.png Binary files differindex 7e724d4781..7e724d4781 100644 --- a/plugins/UserCountry/flags/sh.png +++ b/plugins/UserCountry/images/flags/sh.png diff --git a/plugins/UserCountry/flags/si.png b/plugins/UserCountry/images/flags/si.png Binary files differindex 266b9df29d..266b9df29d 100644 --- a/plugins/UserCountry/flags/si.png +++ b/plugins/UserCountry/images/flags/si.png diff --git a/plugins/UserCountry/flags/sj.png b/plugins/UserCountry/images/flags/sj.png Binary files differindex 74264c5866..74264c5866 100644 --- a/plugins/UserCountry/flags/sj.png +++ b/plugins/UserCountry/images/flags/sj.png diff --git a/plugins/UserCountry/flags/sk.png b/plugins/UserCountry/images/flags/sk.png Binary files differindex 53d286a6e1..53d286a6e1 100644 --- a/plugins/UserCountry/flags/sk.png +++ b/plugins/UserCountry/images/flags/sk.png diff --git a/plugins/UserCountry/flags/sl.png b/plugins/UserCountry/images/flags/sl.png Binary files differindex c59445bc58..c59445bc58 100644 --- a/plugins/UserCountry/flags/sl.png +++ b/plugins/UserCountry/images/flags/sl.png diff --git a/plugins/UserCountry/flags/sm.png b/plugins/UserCountry/images/flags/sm.png Binary files differindex 65ceb3aa49..65ceb3aa49 100644 --- a/plugins/UserCountry/flags/sm.png +++ b/plugins/UserCountry/images/flags/sm.png diff --git a/plugins/UserCountry/flags/sn.png b/plugins/UserCountry/images/flags/sn.png Binary files differindex 89961cb89b..89961cb89b 100644 --- a/plugins/UserCountry/flags/sn.png +++ b/plugins/UserCountry/images/flags/sn.png diff --git a/plugins/UserCountry/flags/so.png b/plugins/UserCountry/images/flags/so.png Binary files differindex 00750dae44..00750dae44 100644 --- a/plugins/UserCountry/flags/so.png +++ b/plugins/UserCountry/images/flags/so.png diff --git a/plugins/UserCountry/flags/sr.png b/plugins/UserCountry/images/flags/sr.png Binary files differindex 764f544694..764f544694 100644 --- a/plugins/UserCountry/flags/sr.png +++ b/plugins/UserCountry/images/flags/sr.png diff --git a/plugins/UserCountry/flags/ss.png b/plugins/UserCountry/images/flags/ss.png Binary files differindex 84a52ca247..84a52ca247 100644 --- a/plugins/UserCountry/flags/ss.png +++ b/plugins/UserCountry/images/flags/ss.png diff --git a/plugins/UserCountry/flags/st.png b/plugins/UserCountry/images/flags/st.png Binary files differindex dd62dce7ff..dd62dce7ff 100644 --- a/plugins/UserCountry/flags/st.png +++ b/plugins/UserCountry/images/flags/st.png diff --git a/plugins/UserCountry/flags/su.png b/plugins/UserCountry/images/flags/su.png Binary files differindex 3e1d87c962..3e1d87c962 100644 --- a/plugins/UserCountry/flags/su.png +++ b/plugins/UserCountry/images/flags/su.png diff --git a/plugins/UserCountry/flags/sv.png b/plugins/UserCountry/images/flags/sv.png Binary files differindex 03ce5ec83c..03ce5ec83c 100644 --- a/plugins/UserCountry/flags/sv.png +++ b/plugins/UserCountry/images/flags/sv.png diff --git a/plugins/UserCountry/flags/sx.png b/plugins/UserCountry/images/flags/sx.png Binary files differindex 229d4014ba..229d4014ba 100644 --- a/plugins/UserCountry/flags/sx.png +++ b/plugins/UserCountry/images/flags/sx.png diff --git a/plugins/UserCountry/flags/sy.png b/plugins/UserCountry/images/flags/sy.png Binary files differindex 83de9ef018..83de9ef018 100644 --- a/plugins/UserCountry/flags/sy.png +++ b/plugins/UserCountry/images/flags/sy.png diff --git a/plugins/UserCountry/flags/sz.png b/plugins/UserCountry/images/flags/sz.png Binary files differindex 6e40120260..6e40120260 100644 --- a/plugins/UserCountry/flags/sz.png +++ b/plugins/UserCountry/images/flags/sz.png diff --git a/plugins/UserCountry/flags/ta.png b/plugins/UserCountry/images/flags/ta.png Binary files differindex b0eaef6dc5..b0eaef6dc5 100644 --- a/plugins/UserCountry/flags/ta.png +++ b/plugins/UserCountry/images/flags/ta.png diff --git a/plugins/UserCountry/flags/tc.png b/plugins/UserCountry/images/flags/tc.png Binary files differindex 0c96ec08c8..0c96ec08c8 100644 --- a/plugins/UserCountry/flags/tc.png +++ b/plugins/UserCountry/images/flags/tc.png diff --git a/plugins/UserCountry/flags/td.png b/plugins/UserCountry/images/flags/td.png Binary files differindex 6e2da09705..6e2da09705 100644 --- a/plugins/UserCountry/flags/td.png +++ b/plugins/UserCountry/images/flags/td.png diff --git a/plugins/UserCountry/flags/tf.png b/plugins/UserCountry/images/flags/tf.png Binary files differindex 3ed6bc60ad..3ed6bc60ad 100644 --- a/plugins/UserCountry/flags/tf.png +++ b/plugins/UserCountry/images/flags/tf.png diff --git a/plugins/UserCountry/flags/tg.png b/plugins/UserCountry/images/flags/tg.png Binary files differindex 2ab18d070a..2ab18d070a 100644 --- a/plugins/UserCountry/flags/tg.png +++ b/plugins/UserCountry/images/flags/tg.png diff --git a/plugins/UserCountry/flags/th.png b/plugins/UserCountry/images/flags/th.png Binary files differindex c1817ebc94..c1817ebc94 100644 --- a/plugins/UserCountry/flags/th.png +++ b/plugins/UserCountry/images/flags/th.png diff --git a/plugins/UserCountry/flags/ti.png b/plugins/UserCountry/images/flags/ti.png Binary files differindex 0253120670..0253120670 100644 --- a/plugins/UserCountry/flags/ti.png +++ b/plugins/UserCountry/images/flags/ti.png diff --git a/plugins/UserCountry/flags/tj.png b/plugins/UserCountry/images/flags/tj.png Binary files differindex e1ddbb0889..e1ddbb0889 100644 --- a/plugins/UserCountry/flags/tj.png +++ b/plugins/UserCountry/images/flags/tj.png diff --git a/plugins/UserCountry/flags/tk.png b/plugins/UserCountry/images/flags/tk.png Binary files differindex 0440c43b42..0440c43b42 100644 --- a/plugins/UserCountry/flags/tk.png +++ b/plugins/UserCountry/images/flags/tk.png diff --git a/plugins/UserCountry/flags/tl.png b/plugins/UserCountry/images/flags/tl.png Binary files differindex 0fa1b59794..0fa1b59794 100644 --- a/plugins/UserCountry/flags/tl.png +++ b/plugins/UserCountry/images/flags/tl.png diff --git a/plugins/UserCountry/flags/tm.png b/plugins/UserCountry/images/flags/tm.png Binary files differindex cb1b24dd1e..cb1b24dd1e 100644 --- a/plugins/UserCountry/flags/tm.png +++ b/plugins/UserCountry/images/flags/tm.png diff --git a/plugins/UserCountry/flags/tn.png b/plugins/UserCountry/images/flags/tn.png Binary files differindex 33d830d502..33d830d502 100644 --- a/plugins/UserCountry/flags/tn.png +++ b/plugins/UserCountry/images/flags/tn.png diff --git a/plugins/UserCountry/flags/to.png b/plugins/UserCountry/images/flags/to.png Binary files differindex 8b0aa02145..8b0aa02145 100644 --- a/plugins/UserCountry/flags/to.png +++ b/plugins/UserCountry/images/flags/to.png diff --git a/plugins/UserCountry/flags/tp.png b/plugins/UserCountry/images/flags/tp.png Binary files differindex 0fa1b59794..0fa1b59794 100644 --- a/plugins/UserCountry/flags/tp.png +++ b/plugins/UserCountry/images/flags/tp.png diff --git a/plugins/UserCountry/flags/tr.png b/plugins/UserCountry/images/flags/tr.png Binary files differindex 3698f405fa..3698f405fa 100644 --- a/plugins/UserCountry/flags/tr.png +++ b/plugins/UserCountry/images/flags/tr.png diff --git a/plugins/UserCountry/flags/tt.png b/plugins/UserCountry/images/flags/tt.png Binary files differindex 4f36edb09f..4f36edb09f 100644 --- a/plugins/UserCountry/flags/tt.png +++ b/plugins/UserCountry/images/flags/tt.png diff --git a/plugins/UserCountry/flags/tv.png b/plugins/UserCountry/images/flags/tv.png Binary files differindex e1fcffcade..e1fcffcade 100644 --- a/plugins/UserCountry/flags/tv.png +++ b/plugins/UserCountry/images/flags/tv.png diff --git a/plugins/UserCountry/flags/tw.png b/plugins/UserCountry/images/flags/tw.png Binary files differindex 39ac6e00cd..39ac6e00cd 100644 --- a/plugins/UserCountry/flags/tw.png +++ b/plugins/UserCountry/images/flags/tw.png diff --git a/plugins/UserCountry/flags/tz.png b/plugins/UserCountry/images/flags/tz.png Binary files differindex e31644b158..e31644b158 100644 --- a/plugins/UserCountry/flags/tz.png +++ b/plugins/UserCountry/images/flags/tz.png diff --git a/plugins/UserCountry/flags/ua.png b/plugins/UserCountry/images/flags/ua.png Binary files differindex ddda0b21ab..ddda0b21ab 100644 --- a/plugins/UserCountry/flags/ua.png +++ b/plugins/UserCountry/images/flags/ua.png diff --git a/plugins/UserCountry/flags/ug.png b/plugins/UserCountry/images/flags/ug.png Binary files differindex 7a77615592..7a77615592 100644 --- a/plugins/UserCountry/flags/ug.png +++ b/plugins/UserCountry/images/flags/ug.png diff --git a/plugins/UserCountry/flags/uk.png b/plugins/UserCountry/images/flags/uk.png Binary files differindex 405e897c52..405e897c52 100644 --- a/plugins/UserCountry/flags/uk.png +++ b/plugins/UserCountry/images/flags/uk.png diff --git a/plugins/UserCountry/flags/um.png b/plugins/UserCountry/images/flags/um.png Binary files differindex 9ff9ecf851..9ff9ecf851 100644 --- a/plugins/UserCountry/flags/um.png +++ b/plugins/UserCountry/images/flags/um.png diff --git a/plugins/UserCountry/flags/us.png b/plugins/UserCountry/images/flags/us.png Binary files differindex a60ef55968..a60ef55968 100644 --- a/plugins/UserCountry/flags/us.png +++ b/plugins/UserCountry/images/flags/us.png diff --git a/plugins/UserCountry/flags/uy.png b/plugins/UserCountry/images/flags/uy.png Binary files differindex 7aff0bc68f..7aff0bc68f 100644 --- a/plugins/UserCountry/flags/uy.png +++ b/plugins/UserCountry/images/flags/uy.png diff --git a/plugins/UserCountry/flags/uz.png b/plugins/UserCountry/images/flags/uz.png Binary files differindex c3ba2ddcf2..c3ba2ddcf2 100644 --- a/plugins/UserCountry/flags/uz.png +++ b/plugins/UserCountry/images/flags/uz.png diff --git a/plugins/UserCountry/flags/va.png b/plugins/UserCountry/images/flags/va.png Binary files differindex c9be43d266..c9be43d266 100644 --- a/plugins/UserCountry/flags/va.png +++ b/plugins/UserCountry/images/flags/va.png diff --git a/plugins/UserCountry/flags/vc.png b/plugins/UserCountry/images/flags/vc.png Binary files differindex a7935eee68..a7935eee68 100644 --- a/plugins/UserCountry/flags/vc.png +++ b/plugins/UserCountry/images/flags/vc.png diff --git a/plugins/UserCountry/flags/ve.png b/plugins/UserCountry/images/flags/ve.png Binary files differindex 43eb422e11..43eb422e11 100644 --- a/plugins/UserCountry/flags/ve.png +++ b/plugins/UserCountry/images/flags/ve.png diff --git a/plugins/UserCountry/flags/vg.png b/plugins/UserCountry/images/flags/vg.png Binary files differindex 63afb343ca..63afb343ca 100644 --- a/plugins/UserCountry/flags/vg.png +++ b/plugins/UserCountry/images/flags/vg.png diff --git a/plugins/UserCountry/flags/vi.png b/plugins/UserCountry/images/flags/vi.png Binary files differindex dc0d214ae6..dc0d214ae6 100644 --- a/plugins/UserCountry/flags/vi.png +++ b/plugins/UserCountry/images/flags/vi.png diff --git a/plugins/UserCountry/flags/vn.png b/plugins/UserCountry/images/flags/vn.png Binary files differindex a2cd8a151a..a2cd8a151a 100644 --- a/plugins/UserCountry/flags/vn.png +++ b/plugins/UserCountry/images/flags/vn.png diff --git a/plugins/UserCountry/flags/vu.png b/plugins/UserCountry/images/flags/vu.png Binary files differindex e7972bc01d..e7972bc01d 100644 --- a/plugins/UserCountry/flags/vu.png +++ b/plugins/UserCountry/images/flags/vu.png diff --git a/plugins/UserCountry/flags/wf.png b/plugins/UserCountry/images/flags/wf.png Binary files differindex d9d33e18b0..d9d33e18b0 100644 --- a/plugins/UserCountry/flags/wf.png +++ b/plugins/UserCountry/images/flags/wf.png diff --git a/plugins/UserCountry/flags/ws.png b/plugins/UserCountry/images/flags/ws.png Binary files differindex 8b40fdd224..8b40fdd224 100644 --- a/plugins/UserCountry/flags/ws.png +++ b/plugins/UserCountry/images/flags/ws.png diff --git a/plugins/UserCountry/flags/xx.png b/plugins/UserCountry/images/flags/xx.png Binary files differindex da6e1bbe89..da6e1bbe89 100644 --- a/plugins/UserCountry/flags/xx.png +++ b/plugins/UserCountry/images/flags/xx.png diff --git a/plugins/UserCountry/flags/ye.png b/plugins/UserCountry/images/flags/ye.png Binary files differindex 6437e6f918..6437e6f918 100644 --- a/plugins/UserCountry/flags/ye.png +++ b/plugins/UserCountry/images/flags/ye.png diff --git a/plugins/UserCountry/flags/yt.png b/plugins/UserCountry/images/flags/yt.png Binary files differindex ca9bacbbf7..ca9bacbbf7 100644 --- a/plugins/UserCountry/flags/yt.png +++ b/plugins/UserCountry/images/flags/yt.png diff --git a/plugins/UserCountry/flags/yu.png b/plugins/UserCountry/images/flags/yu.png Binary files differindex 0e0fb6deba..0e0fb6deba 100644 --- a/plugins/UserCountry/flags/yu.png +++ b/plugins/UserCountry/images/flags/yu.png diff --git a/plugins/UserCountry/flags/za.png b/plugins/UserCountry/images/flags/za.png Binary files differindex 5200bf9761..5200bf9761 100644 --- a/plugins/UserCountry/flags/za.png +++ b/plugins/UserCountry/images/flags/za.png diff --git a/plugins/UserCountry/flags/zm.png b/plugins/UserCountry/images/flags/zm.png Binary files differindex 5145ab5547..5145ab5547 100644 --- a/plugins/UserCountry/flags/zm.png +++ b/plugins/UserCountry/images/flags/zm.png diff --git a/plugins/UserCountry/flags/zr.png b/plugins/UserCountry/images/flags/zr.png Binary files differindex 0811ccce06..0811ccce06 100644 --- a/plugins/UserCountry/flags/zr.png +++ b/plugins/UserCountry/images/flags/zr.png diff --git a/plugins/UserCountry/flags/zw.png b/plugins/UserCountry/images/flags/zw.png Binary files differindex 3d2d4b6591..3d2d4b6591 100644 --- a/plugins/UserCountry/flags/zw.png +++ b/plugins/UserCountry/images/flags/zw.png diff --git a/plugins/UserCountryMap/img/cities.png b/plugins/UserCountryMap/images/cities.png Binary files differindex 81efe8e9f4..81efe8e9f4 100644 --- a/plugins/UserCountryMap/img/cities.png +++ b/plugins/UserCountryMap/images/cities.png diff --git a/plugins/UserCountryMap/img/realtimemap-loading.gif b/plugins/UserCountryMap/images/realtimemap-loading.gif Binary files differindex 10867afa72..10867afa72 100644 --- a/plugins/UserCountryMap/img/realtimemap-loading.gif +++ b/plugins/UserCountryMap/images/realtimemap-loading.gif diff --git a/plugins/UserCountryMap/img/regions.png b/plugins/UserCountryMap/images/regions.png Binary files differindex 0639a4509e..0639a4509e 100644 --- a/plugins/UserCountryMap/img/regions.png +++ b/plugins/UserCountryMap/images/regions.png diff --git a/plugins/UserCountryMap/img/zoom-out-disabled.png b/plugins/UserCountryMap/images/zoom-out-disabled.png Binary files differindex 2b57757971..2b57757971 100644 --- a/plugins/UserCountryMap/img/zoom-out-disabled.png +++ b/plugins/UserCountryMap/images/zoom-out-disabled.png diff --git a/plugins/UserCountryMap/img/zoom-out.png b/plugins/UserCountryMap/images/zoom-out.png Binary files differindex ec195a571d..ec195a571d 100644 --- a/plugins/UserCountryMap/img/zoom-out.png +++ b/plugins/UserCountryMap/images/zoom-out.png diff --git a/plugins/UserCountryMap/img/info.png b/plugins/UserCountryMap/img/info.png Binary files differdeleted file mode 100644 index 23b8095c7f..0000000000 --- a/plugins/UserCountryMap/img/info.png +++ /dev/null diff --git a/plugins/UserCountryMap/img/world.png b/plugins/UserCountryMap/img/world.png Binary files differdeleted file mode 100644 index 00b7b215fe..0000000000 --- a/plugins/UserCountryMap/img/world.png +++ /dev/null diff --git a/plugins/UserCountryMap/templates/realtime-map.twig b/plugins/UserCountryMap/templates/realtime-map.twig index 3843c9fb90..17933eca58 100644 --- a/plugins/UserCountryMap/templates/realtime-map.twig +++ b/plugins/UserCountryMap/templates/realtime-map.twig @@ -8,13 +8,13 @@ </span> <span class="no_data" style="display:none">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</span> <span class="loading_data">{{ 'General_LoadingData'|translate }}...</span> - <img src="{{ piwikUrl }}plugins/UserCountryMap/img/realtimemap-loading.gif" style="vertical-align:baseline;position:relative;left:-2px;"> + <img src="{{ piwikUrl }}plugins/UserCountryMap/images/realtimemap-loading.gif" style="vertical-align:baseline;position:relative;left:-2px;"> </div> <div class="realTimeMap_overlay realTimeMap_datetime"></div> </div> <div id="RealTimeMap_meta"> <span class="loadingPiwik"> - <img src="{{ piwikUrl }}plugins/Zeitgeist/theme/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}... + <img src="{{ piwikUrl }}plugins/Zeitgeist/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}... </span> </div> diff --git a/plugins/UserCountryMap/templates/visitor-map.twig b/plugins/UserCountryMap/templates/visitor-map.twig index 08ade75dfb..0a95b574bd 100644 --- a/plugins/UserCountryMap/templates/visitor-map.twig +++ b/plugins/UserCountryMap/templates/visitor-map.twig @@ -22,7 +22,7 @@ <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div> {% else %} <span class="loadingPiwik"> - <img src="{{ piwikUrl }}plugins/Zeitgeist/theme/images/loading-blue.gif" /> + <img src="{{ piwikUrl }}plugins/Zeitgeist/images/loading-blue.gif" /> {{ 'General_LoadingData'|translate }}... </span> {% endif %} @@ -30,12 +30,12 @@ <div class="dataTableFeatures" style="padding-top:0px;"> <div class="dataTableFooterIcons"> <div class="dataTableFooterWrap" var="graphVerticalBar"> - <img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="{{ piwikUrl }}plugins/Zeitgeist/theme/images/data_table_footer_active_item.png" style="left: 25px;" /> + <img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="{{ piwikUrl }}plugins/Zeitgeist/images/data_table_footer_active_item.png" style="left: 25px;" /> <div class="tableIconsGroup"> <span class="tableAllColumnsSwitch"> <a class="UserCountryMap-btn-zoom tableIcon" format="table"> - <img src="{{ piwikUrl }}plugins/UserCountryMap/img/zoom-out.png" title="Zoom to world" /> + <img src="{{ piwikUrl }}plugins/UserCountryMap/images/zoom-out.png" title="Zoom to world" /> </a> </span> </div> @@ -43,11 +43,11 @@ <span class="tableAllColumnsSwitch"> <a var="tableAllColumns" class="UserCountryMap-btn-region tableIcon activeIcon" format="tableAllColumns" data-region="{{ 'UserCountryMap_Regions'|translate }}" data-country="{{ 'UserCountryMap_Countries'|translate }}"> - <img src="{{ piwikUrl }}plugins/UserCountryMap/img/regions.png" title="Show vistors per region/country" /> + <img src="{{ piwikUrl }}plugins/UserCountryMap/images/regions.png" title="Show vistors per region/country" /> <span style="margin:0">{{ 'UserCountryMap_Countries'|translate }}</span> </a> <a var="tableGoals" class="UserCountryMap-btn-city tableIcon inactiveIco" format="tableGoals"> - <img src="{{ piwikUrl }}plugins/UserCountryMap/img/cities.png" title="Show visitors per city" /> + <img src="{{ piwikUrl }}plugins/UserCountryMap/images/cities.png" title="Show visitors per city" /> <span style="margin:0">{{ 'UserCountryMap_Cities'|translate }}</span> </a> </span> diff --git a/plugins/Zeitgeist/theme/images/affix-arrow.png b/plugins/Zeitgeist/images/affix-arrow.png Binary files differindex bc45f553a4..bc45f553a4 100644 --- a/plugins/Zeitgeist/theme/images/affix-arrow.png +++ b/plugins/Zeitgeist/images/affix-arrow.png diff --git a/plugins/Zeitgeist/theme/images/arr_r.png b/plugins/Zeitgeist/images/arr_r.png Binary files differindex 4a244a89e9..4a244a89e9 100644 --- a/plugins/Zeitgeist/theme/images/arr_r.png +++ b/plugins/Zeitgeist/images/arr_r.png diff --git a/plugins/Zeitgeist/theme/images/background-submit.png b/plugins/Zeitgeist/images/background-submit.png Binary files differindex 033a47ad9a..033a47ad9a 100644 --- a/plugins/Zeitgeist/theme/images/background-submit.png +++ b/plugins/Zeitgeist/images/background-submit.png diff --git a/plugins/Zeitgeist/theme/images/chart_bar.png b/plugins/Zeitgeist/images/chart_bar.png Binary files differindex 6c96e7bd57..6c96e7bd57 100644 --- a/plugins/Zeitgeist/theme/images/chart_bar.png +++ b/plugins/Zeitgeist/images/chart_bar.png diff --git a/plugins/Zeitgeist/theme/images/chart_line_edit.png b/plugins/Zeitgeist/images/chart_line_edit.png Binary files differindex e437801b3d..e437801b3d 100755 --- a/plugins/Zeitgeist/theme/images/chart_line_edit.png +++ b/plugins/Zeitgeist/images/chart_line_edit.png diff --git a/plugins/Zeitgeist/theme/images/chart_line_edit_bg.png b/plugins/Zeitgeist/images/chart_line_edit_bg.png Binary files differindex b474a161ad..b474a161ad 100755 --- a/plugins/Zeitgeist/theme/images/chart_line_edit_bg.png +++ b/plugins/Zeitgeist/images/chart_line_edit_bg.png diff --git a/plugins/Zeitgeist/theme/images/chart_pie.png b/plugins/Zeitgeist/images/chart_pie.png Binary files differindex 610f857890..610f857890 100644 --- a/plugins/Zeitgeist/theme/images/chart_pie.png +++ b/plugins/Zeitgeist/images/chart_pie.png diff --git a/plugins/Zeitgeist/theme/images/close.png b/plugins/Zeitgeist/images/close.png Binary files differindex 44b591bd03..44b591bd03 100644 --- a/plugins/Zeitgeist/theme/images/close.png +++ b/plugins/Zeitgeist/images/close.png diff --git a/plugins/Zeitgeist/theme/images/collapsed_arrows.gif b/plugins/Zeitgeist/images/collapsed_arrows.gif Binary files differindex 458728fdec..458728fdec 100644 --- a/plugins/Zeitgeist/theme/images/collapsed_arrows.gif +++ b/plugins/Zeitgeist/images/collapsed_arrows.gif diff --git a/plugins/Zeitgeist/theme/images/configure-highlight.png b/plugins/Zeitgeist/images/configure-highlight.png Binary files differindex dd37fc14de..dd37fc14de 100755 --- a/plugins/Zeitgeist/theme/images/configure-highlight.png +++ b/plugins/Zeitgeist/images/configure-highlight.png diff --git a/plugins/Zeitgeist/theme/images/configure.png b/plugins/Zeitgeist/images/configure.png Binary files differindex 5a0ec4a785..5a0ec4a785 100755 --- a/plugins/Zeitgeist/theme/images/configure.png +++ b/plugins/Zeitgeist/images/configure.png diff --git a/plugins/Zeitgeist/theme/images/dashboard_h_bg.png b/plugins/Zeitgeist/images/dashboard_h_bg.png Binary files differindex 279a94949d..279a94949d 100644 --- a/plugins/Zeitgeist/theme/images/dashboard_h_bg.png +++ b/plugins/Zeitgeist/images/dashboard_h_bg.png diff --git a/plugins/Zeitgeist/theme/images/dashboard_h_bg_hover.png b/plugins/Zeitgeist/images/dashboard_h_bg_hover.png Binary files differindex 37e4bd54e8..37e4bd54e8 100644 --- a/plugins/Zeitgeist/theme/images/dashboard_h_bg_hover.png +++ b/plugins/Zeitgeist/images/dashboard_h_bg_hover.png diff --git a/plugins/Zeitgeist/theme/images/data_table_footer_active_item.png b/plugins/Zeitgeist/images/data_table_footer_active_item.png Binary files differindex 343591f6bf..343591f6bf 100644 --- a/plugins/Zeitgeist/theme/images/data_table_footer_active_item.png +++ b/plugins/Zeitgeist/images/data_table_footer_active_item.png diff --git a/plugins/Zeitgeist/theme/images/datepicker_arr_l.png b/plugins/Zeitgeist/images/datepicker_arr_l.png Binary files differindex aa73d36239..aa73d36239 100644 --- a/plugins/Zeitgeist/theme/images/datepicker_arr_l.png +++ b/plugins/Zeitgeist/images/datepicker_arr_l.png diff --git a/plugins/Zeitgeist/theme/images/datepicker_arr_r.png b/plugins/Zeitgeist/images/datepicker_arr_r.png Binary files differindex 7bd04bc236..7bd04bc236 100644 --- a/plugins/Zeitgeist/theme/images/datepicker_arr_r.png +++ b/plugins/Zeitgeist/images/datepicker_arr_r.png diff --git a/plugins/Zeitgeist/theme/images/delete.png b/plugins/Zeitgeist/images/delete.png Binary files differindex f2a3c2a20d..f2a3c2a20d 100644 --- a/plugins/Zeitgeist/theme/images/delete.png +++ b/plugins/Zeitgeist/images/delete.png diff --git a/plugins/Zeitgeist/theme/images/download.png b/plugins/Zeitgeist/images/download.png Binary files differindex 1920b1bb22..1920b1bb22 100644 --- a/plugins/Zeitgeist/theme/images/download.png +++ b/plugins/Zeitgeist/images/download.png diff --git a/plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif b/plugins/Zeitgeist/images/ecommerceAbandonedCart.gif Binary files differindex b4ec1d75f7..b4ec1d75f7 100644 --- a/plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif +++ b/plugins/Zeitgeist/images/ecommerceAbandonedCart.gif diff --git a/plugins/Zeitgeist/theme/images/ecommerceOrder.gif b/plugins/Zeitgeist/images/ecommerceOrder.gif Binary files differindex 664e035509..664e035509 100644 --- a/plugins/Zeitgeist/theme/images/ecommerceOrder.gif +++ b/plugins/Zeitgeist/images/ecommerceOrder.gif diff --git a/plugins/Zeitgeist/theme/images/email.png b/plugins/Zeitgeist/images/email.png Binary files differindex 4a6c5d396a..4a6c5d396a 100644 --- a/plugins/Zeitgeist/theme/images/email.png +++ b/plugins/Zeitgeist/images/email.png diff --git a/plugins/Zeitgeist/theme/images/error.png b/plugins/Zeitgeist/images/error.png Binary files differindex 2997461b21..2997461b21 100644 --- a/plugins/Zeitgeist/theme/images/error.png +++ b/plugins/Zeitgeist/images/error.png diff --git a/plugins/Zeitgeist/theme/images/error_medium.png b/plugins/Zeitgeist/images/error_medium.png Binary files differindex 538cb9039f..538cb9039f 100644 --- a/plugins/Zeitgeist/theme/images/error_medium.png +++ b/plugins/Zeitgeist/images/error_medium.png diff --git a/plugins/Zeitgeist/theme/images/expanded_arrows.gif b/plugins/Zeitgeist/images/expanded_arrows.gif Binary files differindex ed33959206..ed33959206 100644 --- a/plugins/Zeitgeist/theme/images/expanded_arrows.gif +++ b/plugins/Zeitgeist/images/expanded_arrows.gif diff --git a/plugins/Zeitgeist/theme/images/export.png b/plugins/Zeitgeist/images/export.png Binary files differindex 110af8c431..110af8c431 100644 --- a/plugins/Zeitgeist/theme/images/export.png +++ b/plugins/Zeitgeist/images/export.png diff --git a/plugins/Zeitgeist/theme/images/feed.png b/plugins/Zeitgeist/images/feed.png Binary files differindex 315c4f4fa6..315c4f4fa6 100644 --- a/plugins/Zeitgeist/theme/images/feed.png +++ b/plugins/Zeitgeist/images/feed.png diff --git a/plugins/Zeitgeist/theme/images/fullscreen.png b/plugins/Zeitgeist/images/fullscreen.png Binary files differindex 3c3273ba9d..3c3273ba9d 100755 --- a/plugins/Zeitgeist/theme/images/fullscreen.png +++ b/plugins/Zeitgeist/images/fullscreen.png diff --git a/plugins/Zeitgeist/theme/images/goal.png b/plugins/Zeitgeist/images/goal.png Binary files differindex 69db019e5e..69db019e5e 100644 --- a/plugins/Zeitgeist/theme/images/goal.png +++ b/plugins/Zeitgeist/images/goal.png diff --git a/plugins/Zeitgeist/theme/images/grey_marker.png b/plugins/Zeitgeist/images/grey_marker.png Binary files differindex b0e3e3e6ae..b0e3e3e6ae 100755 --- a/plugins/Zeitgeist/theme/images/grey_marker.png +++ b/plugins/Zeitgeist/images/grey_marker.png diff --git a/plugins/Zeitgeist/theme/images/help.png b/plugins/Zeitgeist/images/help.png Binary files differindex 5c870176d4..5c870176d4 100644 --- a/plugins/Zeitgeist/theme/images/help.png +++ b/plugins/Zeitgeist/images/help.png diff --git a/plugins/Zeitgeist/theme/images/help_grey.png b/plugins/Zeitgeist/images/help_grey.png Binary files differindex 8f3df97e9c..8f3df97e9c 100644 --- a/plugins/Zeitgeist/theme/images/help_grey.png +++ b/plugins/Zeitgeist/images/help_grey.png diff --git a/plugins/Zeitgeist/theme/images/html_icon.png b/plugins/Zeitgeist/images/html_icon.png Binary files differindex 7b4308d885..7b4308d885 100644 --- a/plugins/Zeitgeist/theme/images/html_icon.png +++ b/plugins/Zeitgeist/images/html_icon.png diff --git a/plugins/Zeitgeist/theme/images/ico_alert.png b/plugins/Zeitgeist/images/ico_alert.png Binary files differindex b8087eba9c..b8087eba9c 100644 --- a/plugins/Zeitgeist/theme/images/ico_alert.png +++ b/plugins/Zeitgeist/images/ico_alert.png diff --git a/plugins/Zeitgeist/theme/images/ico_delete.png b/plugins/Zeitgeist/images/ico_delete.png Binary files differindex eb6cbc030b..eb6cbc030b 100644 --- a/plugins/Zeitgeist/theme/images/ico_delete.png +++ b/plugins/Zeitgeist/images/ico_delete.png diff --git a/plugins/Zeitgeist/theme/images/ico_edit.png b/plugins/Zeitgeist/images/ico_edit.png Binary files differindex 0d1a0fa16f..0d1a0fa16f 100644 --- a/plugins/Zeitgeist/theme/images/ico_edit.png +++ b/plugins/Zeitgeist/images/ico_edit.png diff --git a/plugins/Zeitgeist/theme/images/ico_info.png b/plugins/Zeitgeist/images/ico_info.png Binary files differindex 1278cef852..1278cef852 100644 --- a/plugins/Zeitgeist/theme/images/ico_info.png +++ b/plugins/Zeitgeist/images/ico_info.png diff --git a/plugins/Zeitgeist/theme/images/icon-calendar.gif b/plugins/Zeitgeist/images/icon-calendar.gif Binary files differindex 132350e783..132350e783 100644 --- a/plugins/Zeitgeist/theme/images/icon-calendar.gif +++ b/plugins/Zeitgeist/images/icon-calendar.gif diff --git a/plugins/Zeitgeist/theme/images/image.png b/plugins/Zeitgeist/images/image.png Binary files differindex 546ebcdec7..546ebcdec7 100644 --- a/plugins/Zeitgeist/theme/images/image.png +++ b/plugins/Zeitgeist/images/image.png diff --git a/plugins/Zeitgeist/theme/images/inp_bg.png b/plugins/Zeitgeist/images/inp_bg.png Binary files differindex 6bd9674743..6bd9674743 100644 --- a/plugins/Zeitgeist/theme/images/inp_bg.png +++ b/plugins/Zeitgeist/images/inp_bg.png diff --git a/plugins/Zeitgeist/theme/images/li_dbl_gray.gif b/plugins/Zeitgeist/images/li_dbl_gray.gif Binary files differindex 42fe8b3b89..42fe8b3b89 100644 --- a/plugins/Zeitgeist/theme/images/li_dbl_gray.gif +++ b/plugins/Zeitgeist/images/li_dbl_gray.gif diff --git a/plugins/Zeitgeist/theme/images/link.gif b/plugins/Zeitgeist/images/link.gif Binary files differindex e160f23b63..e160f23b63 100644 --- a/plugins/Zeitgeist/theme/images/link.gif +++ b/plugins/Zeitgeist/images/link.gif diff --git a/plugins/Zeitgeist/theme/images/loading-blue.gif b/plugins/Zeitgeist/images/loading-blue.gif Binary files differindex 4df2f1fde6..4df2f1fde6 100644 --- a/plugins/Zeitgeist/theme/images/loading-blue.gif +++ b/plugins/Zeitgeist/images/loading-blue.gif diff --git a/plugins/Zeitgeist/theme/images/login-sprite.png b/plugins/Zeitgeist/images/login-sprite.png Binary files differindex 1692e4b09b..1692e4b09b 100644 --- a/plugins/Zeitgeist/theme/images/login-sprite.png +++ b/plugins/Zeitgeist/images/login-sprite.png diff --git a/plugins/Zeitgeist/theme/images/logo-header.png b/plugins/Zeitgeist/images/logo-header.png Binary files differindex d10293eaef..d10293eaef 100644 --- a/plugins/Zeitgeist/theme/images/logo-header.png +++ b/plugins/Zeitgeist/images/logo-header.png diff --git a/plugins/Zeitgeist/theme/images/logo.png b/plugins/Zeitgeist/images/logo.png Binary files differindex 00421e4497..00421e4497 100644 --- a/plugins/Zeitgeist/theme/images/logo.png +++ b/plugins/Zeitgeist/images/logo.png diff --git a/plugins/Zeitgeist/theme/images/logo.svg b/plugins/Zeitgeist/images/logo.svg index d83f657687..d83f657687 100644 --- a/plugins/Zeitgeist/theme/images/logo.svg +++ b/plugins/Zeitgeist/images/logo.svg diff --git a/plugins/Zeitgeist/theme/images/maximise.png b/plugins/Zeitgeist/images/maximise.png Binary files differindex 143dfa5c89..143dfa5c89 100644 --- a/plugins/Zeitgeist/theme/images/maximise.png +++ b/plugins/Zeitgeist/images/maximise.png diff --git a/plugins/Zeitgeist/theme/images/minimise.png b/plugins/Zeitgeist/images/minimise.png Binary files differindex 73c82a3cee..73c82a3cee 100644 --- a/plugins/Zeitgeist/theme/images/minimise.png +++ b/plugins/Zeitgeist/images/minimise.png diff --git a/plugins/Zeitgeist/theme/images/minus.png b/plugins/Zeitgeist/images/minus.png Binary files differindex 48a507df9b..48a507df9b 100644 --- a/plugins/Zeitgeist/theme/images/minus.png +++ b/plugins/Zeitgeist/images/minus.png diff --git a/plugins/Zeitgeist/theme/images/newtab.png b/plugins/Zeitgeist/images/newtab.png Binary files differindex 1e50c59200..1e50c59200 100755 --- a/plugins/Zeitgeist/theme/images/newtab.png +++ b/plugins/Zeitgeist/images/newtab.png diff --git a/plugins/Zeitgeist/theme/images/ok.png b/plugins/Zeitgeist/images/ok.png Binary files differindex 148319419d..148319419d 100644 --- a/plugins/Zeitgeist/theme/images/ok.png +++ b/plugins/Zeitgeist/images/ok.png diff --git a/plugins/Zeitgeist/theme/images/page_border_grad.png b/plugins/Zeitgeist/images/page_border_grad.png Binary files differindex 9e7e86903b..9e7e86903b 100644 --- a/plugins/Zeitgeist/theme/images/page_border_grad.png +++ b/plugins/Zeitgeist/images/page_border_grad.png diff --git a/plugins/Zeitgeist/theme/images/paypal_subscribe.gif b/plugins/Zeitgeist/images/paypal_subscribe.gif Binary files differindex 50d8ee52e9..50d8ee52e9 100755 --- a/plugins/Zeitgeist/theme/images/paypal_subscribe.gif +++ b/plugins/Zeitgeist/images/paypal_subscribe.gif diff --git a/plugins/Zeitgeist/theme/images/plus.png b/plugins/Zeitgeist/images/plus.png Binary files differindex 7216c7d7a9..7216c7d7a9 100644 --- a/plugins/Zeitgeist/theme/images/plus.png +++ b/plugins/Zeitgeist/images/plus.png diff --git a/plugins/Zeitgeist/theme/images/plus_blue.png b/plugins/Zeitgeist/images/plus_blue.png Binary files differindex bf16b7512a..bf16b7512a 100755 --- a/plugins/Zeitgeist/theme/images/plus_blue.png +++ b/plugins/Zeitgeist/images/plus_blue.png diff --git a/plugins/Zeitgeist/theme/images/refresh.png b/plugins/Zeitgeist/images/refresh.png Binary files differindex 8e99a5f0ab..8e99a5f0ab 100644 --- a/plugins/Zeitgeist/theme/images/refresh.png +++ b/plugins/Zeitgeist/images/refresh.png diff --git a/plugins/Zeitgeist/theme/images/reload.png b/plugins/Zeitgeist/images/reload.png Binary files differindex a77ffe7c64..a77ffe7c64 100755 --- a/plugins/Zeitgeist/theme/images/reload.png +++ b/plugins/Zeitgeist/images/reload.png diff --git a/plugins/Zeitgeist/theme/images/row_evolution.png b/plugins/Zeitgeist/images/row_evolution.png Binary files differindex 7423c473cc..7423c473cc 100644 --- a/plugins/Zeitgeist/theme/images/row_evolution.png +++ b/plugins/Zeitgeist/images/row_evolution.png diff --git a/plugins/Zeitgeist/theme/images/row_evolution_hover.png b/plugins/Zeitgeist/images/row_evolution_hover.png Binary files differindex 53827ae4df..53827ae4df 100755 --- a/plugins/Zeitgeist/theme/images/row_evolution_hover.png +++ b/plugins/Zeitgeist/images/row_evolution_hover.png diff --git a/plugins/Zeitgeist/theme/images/search_bg.png b/plugins/Zeitgeist/images/search_bg.png Binary files differindex 7688b8080b..7688b8080b 100644 --- a/plugins/Zeitgeist/theme/images/search_bg.png +++ b/plugins/Zeitgeist/images/search_bg.png diff --git a/plugins/Zeitgeist/theme/images/search_ico.png b/plugins/Zeitgeist/images/search_ico.png Binary files differindex dba240f91f..dba240f91f 100644 --- a/plugins/Zeitgeist/theme/images/search_ico.png +++ b/plugins/Zeitgeist/images/search_ico.png diff --git a/plugins/Zeitgeist/theme/images/sites_selection.png b/plugins/Zeitgeist/images/sites_selection.png Binary files differindex 15750a63d8..15750a63d8 100644 --- a/plugins/Zeitgeist/theme/images/sites_selection.png +++ b/plugins/Zeitgeist/images/sites_selection.png diff --git a/plugins/Zeitgeist/theme/images/smileyprog_0.png b/plugins/Zeitgeist/images/smileyprog_0.png Binary files differindex 8a4627eea3..8a4627eea3 100755 --- a/plugins/Zeitgeist/theme/images/smileyprog_0.png +++ b/plugins/Zeitgeist/images/smileyprog_0.png diff --git a/plugins/Zeitgeist/theme/images/smileyprog_1.png b/plugins/Zeitgeist/images/smileyprog_1.png Binary files differindex 5b16b257ae..5b16b257ae 100755 --- a/plugins/Zeitgeist/theme/images/smileyprog_1.png +++ b/plugins/Zeitgeist/images/smileyprog_1.png diff --git a/plugins/Zeitgeist/theme/images/smileyprog_2.png b/plugins/Zeitgeist/images/smileyprog_2.png Binary files differindex 55537fb732..55537fb732 100755 --- a/plugins/Zeitgeist/theme/images/smileyprog_2.png +++ b/plugins/Zeitgeist/images/smileyprog_2.png diff --git a/plugins/Zeitgeist/theme/images/smileyprog_3.png b/plugins/Zeitgeist/images/smileyprog_3.png Binary files differindex 3410a344be..3410a344be 100755 --- a/plugins/Zeitgeist/theme/images/smileyprog_3.png +++ b/plugins/Zeitgeist/images/smileyprog_3.png diff --git a/plugins/Zeitgeist/theme/images/smileyprog_4.png b/plugins/Zeitgeist/images/smileyprog_4.png Binary files differindex 0facd94f85..0facd94f85 100755 --- a/plugins/Zeitgeist/theme/images/smileyprog_4.png +++ b/plugins/Zeitgeist/images/smileyprog_4.png diff --git a/plugins/Zeitgeist/theme/images/sort_subtable_asc.png b/plugins/Zeitgeist/images/sort_subtable_asc.png Binary files differindex e402026efe..e402026efe 100644 --- a/plugins/Zeitgeist/theme/images/sort_subtable_asc.png +++ b/plugins/Zeitgeist/images/sort_subtable_asc.png diff --git a/plugins/Zeitgeist/theme/images/sort_subtable_asc_light.png b/plugins/Zeitgeist/images/sort_subtable_asc_light.png Binary files differindex cad89bd570..cad89bd570 100755 --- a/plugins/Zeitgeist/theme/images/sort_subtable_asc_light.png +++ b/plugins/Zeitgeist/images/sort_subtable_asc_light.png diff --git a/plugins/Zeitgeist/theme/images/sort_subtable_desc.png b/plugins/Zeitgeist/images/sort_subtable_desc.png Binary files differindex a3d7a5dfd4..a3d7a5dfd4 100644 --- a/plugins/Zeitgeist/theme/images/sort_subtable_desc.png +++ b/plugins/Zeitgeist/images/sort_subtable_desc.png diff --git a/plugins/Zeitgeist/theme/images/sort_subtable_desc_light.png b/plugins/Zeitgeist/images/sort_subtable_desc_light.png Binary files differindex 5091fe6841..5091fe6841 100644 --- a/plugins/Zeitgeist/theme/images/sort_subtable_desc_light.png +++ b/plugins/Zeitgeist/images/sort_subtable_desc_light.png diff --git a/plugins/Zeitgeist/theme/images/sortasc.png b/plugins/Zeitgeist/images/sortasc.png Binary files differindex 29a06dad88..29a06dad88 100644 --- a/plugins/Zeitgeist/theme/images/sortasc.png +++ b/plugins/Zeitgeist/images/sortasc.png diff --git a/plugins/Zeitgeist/theme/images/sortdesc.png b/plugins/Zeitgeist/images/sortdesc.png Binary files differindex 91d2618d26..91d2618d26 100644 --- a/plugins/Zeitgeist/theme/images/sortdesc.png +++ b/plugins/Zeitgeist/images/sortdesc.png diff --git a/plugins/Zeitgeist/theme/images/star.png b/plugins/Zeitgeist/images/star.png Binary files differindex 52d161eab4..52d161eab4 100755 --- a/plugins/Zeitgeist/theme/images/star.png +++ b/plugins/Zeitgeist/images/star.png diff --git a/plugins/Zeitgeist/theme/images/star_empty.png b/plugins/Zeitgeist/images/star_empty.png Binary files differindex 965f4bacb8..965f4bacb8 100755 --- a/plugins/Zeitgeist/theme/images/star_empty.png +++ b/plugins/Zeitgeist/images/star_empty.png diff --git a/plugins/Zeitgeist/theme/images/success_medium.png b/plugins/Zeitgeist/images/success_medium.png Binary files differindex 05a3a06be4..05a3a06be4 100644 --- a/plugins/Zeitgeist/theme/images/success_medium.png +++ b/plugins/Zeitgeist/images/success_medium.png diff --git a/plugins/Zeitgeist/theme/images/table.png b/plugins/Zeitgeist/images/table.png Binary files differindex ab0814775d..ab0814775d 100644 --- a/plugins/Zeitgeist/theme/images/table.png +++ b/plugins/Zeitgeist/images/table.png diff --git a/plugins/Zeitgeist/theme/images/table_more.png b/plugins/Zeitgeist/images/table_more.png Binary files differindex d438326d83..d438326d83 100644 --- a/plugins/Zeitgeist/theme/images/table_more.png +++ b/plugins/Zeitgeist/images/table_more.png diff --git a/plugins/Zeitgeist/theme/images/tagcloud.png b/plugins/Zeitgeist/images/tagcloud.png Binary files differindex 47e9d166fc..47e9d166fc 100644 --- a/plugins/Zeitgeist/theme/images/tagcloud.png +++ b/plugins/Zeitgeist/images/tagcloud.png diff --git a/plugins/Zeitgeist/theme/images/video_play.png b/plugins/Zeitgeist/images/video_play.png Binary files differindex 7ca28d991f..7ca28d991f 100755 --- a/plugins/Zeitgeist/theme/images/video_play.png +++ b/plugins/Zeitgeist/images/video_play.png diff --git a/plugins/Zeitgeist/theme/images/warning.png b/plugins/Zeitgeist/images/warning.png Binary files differindex fd49f31f29..fd49f31f29 100644 --- a/plugins/Zeitgeist/theme/images/warning.png +++ b/plugins/Zeitgeist/images/warning.png diff --git a/plugins/Zeitgeist/theme/images/warning_medium.png b/plugins/Zeitgeist/images/warning_medium.png Binary files differindex 62bd22dc5c..62bd22dc5c 100644 --- a/plugins/Zeitgeist/theme/images/warning_medium.png +++ b/plugins/Zeitgeist/images/warning_medium.png diff --git a/plugins/Zeitgeist/theme/images/warning_small.png b/plugins/Zeitgeist/images/warning_small.png Binary files differindex 1242b4f180..1242b4f180 100644 --- a/plugins/Zeitgeist/theme/images/warning_small.png +++ b/plugins/Zeitgeist/images/warning_small.png diff --git a/plugins/Zeitgeist/theme/images/yellow_marker.png b/plugins/Zeitgeist/images/yellow_marker.png Binary files differindex a2506a2a7d..a2506a2a7d 100755 --- a/plugins/Zeitgeist/theme/images/yellow_marker.png +++ b/plugins/Zeitgeist/images/yellow_marker.png diff --git a/plugins/Zeitgeist/theme/admin.twig b/plugins/Zeitgeist/theme/admin.twig index 0466d3a472..003da84420 100644 --- a/plugins/Zeitgeist/theme/admin.twig +++ b/plugins/Zeitgeist/theme/admin.twig @@ -8,7 +8,7 @@ <title>{% if not isCustomLogo %}Piwik › {% endif %}{{ 'CoreAdminHome_Administration'|translate }}</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta name="generator" content="Piwik - Open Source Web Analytics"/> - <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/> + <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> {{ loadJavascriptTranslations(['CoreAdminHome','CoreHome'])|raw }} diff --git a/plugins/Zeitgeist/theme/ajaxMacros.twig b/plugins/Zeitgeist/theme/ajaxMacros.twig index 3c839e56ef..059892706b 100644 --- a/plugins/Zeitgeist/theme/ajaxMacros.twig +++ b/plugins/Zeitgeist/theme/ajaxMacros.twig @@ -5,7 +5,7 @@ {% macro loadingDiv(id='ajaxLoadingDiv') %} <div id="{{ id }}" style="display:none"> <div class="loadingPiwik"> - <img src="plugins/Zeitgeist/theme/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />{{ 'General_LoadingData'|translate }} + <img src="plugins/Zeitgeist/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />{{ 'General_LoadingData'|translate }} </div> </div> {% endmacro %} diff --git a/plugins/Zeitgeist/theme/common.css b/plugins/Zeitgeist/theme/common.css index c32f4d8a56..2d8db49e8b 100644 --- a/plugins/Zeitgeist/theme/common.css +++ b/plugins/Zeitgeist/theme/common.css @@ -117,7 +117,7 @@ a { margin-right:12px; z-index:999; position:absolute; - background: url("images/icon-calendar.gif") no-repeat scroll right 9px center #F7F7F7; + background: url("../images/icon-calendar.gif") no-repeat scroll right 9px center #F7F7F7; } #periodString:hover { background-color:#f1f0eb; @@ -205,7 +205,7 @@ a { } /* Orange alerts box */ .header_alert { - background:#FFFDF7 url(images/ico_alert.png) no-repeat 7px 4px; + background:#FFFDF7 url(../images/ico_alert.png) no-repeat 7px 4px; border: 1px solid #FF7F00 ; font-weight:bold; } @@ -215,7 +215,7 @@ a { /* Blue info box */ .header_info { - background:#FAFAFA url(images/ico_info.png) no-repeat 7px 4px; + background:#FAFAFA url(../images/ico_info.png) no-repeat 7px 4px; border: 1px solid #CBD9EB ; } .header_info , .header_info a { @@ -261,7 +261,7 @@ a { position:relative; z-index:19; padding:6px 6px 5px 6px; - background:#fff url(images/sites_selection.png) repeat-x 0 0; + background:#fff url(../images/sites_selection.png) repeat-x 0 0; border: 1px solid #d4d4d4; color:#255792; border-radius:4px; @@ -274,7 +274,7 @@ a { padding:0 20px 0 4px; display:block; text-decoration:none; - background: url(images/sort_subtable_desc.png) no-repeat right 0; + background: url(../images/sort_subtable_desc.png) no-repeat right 0; } .sites_autocomplete .custom_select_main_link.noselect{ @@ -285,7 +285,7 @@ a { } .sites_autocomplete .custom_select_loading{ - background: url(images/loading-blue.gif) no-repeat right 3px; + background: url(../images/loading-blue.gif) no-repeat right 3px; } .sites_autocomplete .custom_select_ul_list,.sites_autocomplete ul.ui-autocomplete{ @@ -315,7 +315,7 @@ a { height:26px; display: block; white-space: nowrap; - background: url(images/search_bg.png) no-repeat 0 0; + background: url(../images/search_bg.png) no-repeat 0 0; } .sites_autocomplete .custom_select_search .inp { @@ -486,7 +486,7 @@ div.ui-state-highlight { } .ui-datepicker-header{ - background:#847b6d url(images/dashboard_h_bg_hover.png) repeat-x 0 0!important; + background:#847b6d url(../images/dashboard_h_bg_hover.png) repeat-x 0 0!important; color:#fff!important; border-radius:0!important; -moz-border-radius:0!important; @@ -497,11 +497,11 @@ div.ui-state-highlight { } .ui-datepicker-header .ui-icon-circle-triangle-w{ - background: url(images/datepicker_arr_l.png) no-repeat 5px 4px!important; + background: url(../images/datepicker_arr_l.png) no-repeat 5px 4px!important; } .ui-datepicker-header .ui-icon-circle-triangle-e{ - background: url(images/datepicker_arr_r.png) no-repeat 6px 4px!important; + background: url(../images/datepicker_arr_r.png) no-repeat 6px 4px!important; } .ui-datepicker .ui-datepicker-next-hover, @@ -591,7 +591,7 @@ input, select, textarea { -moz-border-radius:4px; -webkit-border-radius:4px; border:1px solid #d4d4d4; - background:#fff url(images/inp_bg.png) repeat-x 0 0; + background:#fff url(../images/inp_bg.png) repeat-x 0 0; padding:3px 10px; color:#255792; margin-bottom:3px; @@ -616,7 +616,7 @@ select { -moz-border-radius:4px; -webkit-border-radius:4px; border:0; - background:#847b6d url(images/dashboard_h_bg_hover.png) repeat-x 0 0; + background:#847b6d url(../images/dashboard_h_bg_hover.png) repeat-x 0 0; float:right; margin:12px 0 10px 0; cursor:pointer; @@ -706,7 +706,7 @@ table.entityTable tr td a { padding:4px 0; } .entityList ul li{ - background:#fff url(images/li_dbl_gray.gif) no-repeat 6px 10px; + background:#fff url(../images/li_dbl_gray.gif) no-repeat 6px 10px; padding:0 0 0 21px; line-height:22px; } @@ -787,7 +787,7 @@ body .ui-tooltip.small { margin: -8px 0 0 0; padding: 0; height: 16px; - background: url(images/help.png); + background: url(../images/help.png); overflow: hidden; } diff --git a/plugins/Zeitgeist/theme/dashboard.twig b/plugins/Zeitgeist/theme/dashboard.twig index 63f95d5576..31c8a2703a 100644 --- a/plugins/Zeitgeist/theme/dashboard.twig +++ b/plugins/Zeitgeist/theme/dashboard.twig @@ -9,7 +9,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta name="generator" content="Piwik - Open Source Web Analytics"/> <meta name="description" content="Web Analytics report for '{{ siteName }}' - Piwik"/> - <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/> + <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/> {{ loadJavascriptTranslations(['CoreHome','Annotations'])|raw }} {% include "@CoreHome/js_global_variables.twig" %} <!--[if lt IE 9]> diff --git a/plugins/Zeitgeist/theme/genericForm.twig b/plugins/Zeitgeist/theme/genericForm.twig index b47319e475..1c509a9ae5 100644 --- a/plugins/Zeitgeist/theme/genericForm.twig +++ b/plugins/Zeitgeist/theme/genericForm.twig @@ -1,6 +1,6 @@ {% if form_data.errors %} <div class="warning"> - <img src="plugins/Zeitgeist/theme/images/warning_medium.png"> + <img src="plugins/Zeitgeist/images/warning_medium.png"> <strong>{{ 'Installation_PleaseFixTheFollowingErrors'|translate }}:</strong> <ul> {% for data in form_data.errors %} diff --git a/plugins/Zeitgeist/theme/ieonly.css b/plugins/Zeitgeist/theme/ieonly.css index 08ad7295ae..125a78b665 100644 --- a/plugins/Zeitgeist/theme/ieonly.css +++ b/plugins/Zeitgeist/theme/ieonly.css @@ -32,7 +32,7 @@ input[type=checkbox], input[type=radio] { } .jqplot-seriespicker { - background: url(images/chart_line_edit_bg.png) no-repeat center center; + background: url(../images/chart_line_edit_bg.png) no-repeat center center; } .jqplock-seriespicker-popover p input { diff --git a/plugins/Zeitgeist/theme/simple_structure_header.tpl b/plugins/Zeitgeist/theme/simple_structure_header.tpl index f3a0cbcf9f..4d6252bd26 100644 --- a/plugins/Zeitgeist/theme/simple_structure_header.tpl +++ b/plugins/Zeitgeist/theme/simple_structure_header.tpl @@ -4,7 +4,7 @@ <head> <title>{$HTML_TITLE}</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico" /> + <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico" /> <link rel="stylesheet" type="text/css" href="themes/default/simple_structure.css" /> </head> <body id="simple"> diff --git a/plugins/Zeitgeist/theme/styles.css b/plugins/Zeitgeist/theme/styles.css index f922f1a310..ec12ea6528 100644 --- a/plugins/Zeitgeist/theme/styles.css +++ b/plugins/Zeitgeist/theme/styles.css @@ -12,7 +12,7 @@ } #languageSelection .ui-autocomplete-input { - background:#FFF url(images/sortdesc.png) no-repeat right center!important; + background:#FFF url(../images/sortdesc.png) no-repeat right center!important; padding: 2px 18px 2px 4px; color:#255792!important; text-decoration: none; diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml index f4fb13bd4d..9c3a7655b0 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml @@ -56,7 +56,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/flags/us.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>not a city</city> @@ -109,7 +109,7 @@ <visitIp>1.2.4.8</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -194,7 +194,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/flags/xx.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -247,7 +247,7 @@ <visitIp>1.2.4.8</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -315,7 +315,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/flags/xx.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -368,7 +368,7 @@ <visitIp>1.2.4.7</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -436,7 +436,7 @@ <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/flags/mk.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -489,7 +489,7 @@ <visitIp>1.2.4.7</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -557,7 +557,7 @@ <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/flags/mk.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -610,7 +610,7 @@ <visitIp>1.2.4.6</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -695,7 +695,7 @@ <continentCode>eur</continentCode> <country>Russian Federation</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -748,7 +748,7 @@ <visitIp>1.2.4.6</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -816,7 +816,7 @@ <continentCode>eur</continentCode> <country>Russian Federation</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -869,7 +869,7 @@ <visitIp>1.2.4.5</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -937,7 +937,7 @@ <continentCode>eur</continentCode> <country>Russian Federation</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -990,7 +990,7 @@ <visitIp>1.2.4.5</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -1058,7 +1058,7 @@ <continentCode>eur</continentCode> <country>Russian Federation</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -1111,7 +1111,7 @@ <visitIp>1.2.4.4</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -1196,7 +1196,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/flags/gb.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> <region>Kent</region> <regionCode>G5</regionCode> <city>Stratford-upon-Avon</city> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml index 5bfd591f8f..1f6e380d6b 100755 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -23,7 +23,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> <row> <label>Ashburn, Virginia, United States</label> @@ -49,6 +49,6 @@ <country>us</country> <country_name>United States</country_name> <region_name>Virginia</region_name> - <logo>plugins/UserCountry/flags/us.png</logo> + <logo>plugins/UserCountry/images/flags/us.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 14c64c3f03..f0caed4f4a 100755 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -18,7 +18,7 @@ <revenue>50</revenue> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <code>jp</code> - <logo>plugins/UserCountry/flags/jp.png</logo> + <logo>plugins/UserCountry/images/flags/jp.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -40,7 +40,7 @@ <revenue>35</revenue> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <code>xx</code> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -62,7 +62,7 @@ <revenue>20</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <code>us</code> - <logo>plugins/UserCountry/flags/us.png</logo> + <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -84,7 +84,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <code>br</code> - <logo>plugins/UserCountry/flags/br.png</logo> + <logo>plugins/UserCountry/images/flags/br.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -98,7 +98,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>au</code> - <logo>plugins/UserCountry/flags/au.png</logo> + <logo>plugins/UserCountry/images/flags/au.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml index 345541d0ce..3ff8f54d91 100755 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -21,7 +21,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> <row> <label>Virginia, United States</label> @@ -44,6 +44,6 @@ <country>us</country> <country_name>United States</country_name> <region_name>Virginia</region_name> - <logo>plugins/UserCountry/flags/us.png</logo> + <logo>plugins/UserCountry/images/flags/us.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index f4fb13bd4d..9c3a7655b0 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,7 @@ <continentCode>amn</continentCode> <country>United States</country> <countryCode>us</countryCode> - <countryFlag>plugins/UserCountry/flags/us.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag> <region>California</region> <regionCode>CA</regionCode> <city>not a city</city> @@ -109,7 +109,7 @@ <visitIp>1.2.4.8</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -194,7 +194,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/flags/xx.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -247,7 +247,7 @@ <visitIp>1.2.4.8</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -315,7 +315,7 @@ <continentCode>unk</continentCode> <country>Unknown</country> <countryCode>xx</countryCode> - <countryFlag>plugins/UserCountry/flags/xx.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag> <region /> <regionCode /> <city /> @@ -368,7 +368,7 @@ <visitIp>1.2.4.7</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -436,7 +436,7 @@ <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/flags/mk.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -489,7 +489,7 @@ <visitIp>1.2.4.7</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -557,7 +557,7 @@ <continentCode>eur</continentCode> <country>Macedonia, the Former Yugoslav Republic of</country> <countryCode>mk</countryCode> - <countryFlag>plugins/UserCountry/flags/mk.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag> <region>Miravci</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -610,7 +610,7 @@ <visitIp>1.2.4.6</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -695,7 +695,7 @@ <continentCode>eur</continentCode> <country>Russian Federation</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -748,7 +748,7 @@ <visitIp>1.2.4.6</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -816,7 +816,7 @@ <continentCode>eur</continentCode> <country>Russian Federation</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Hluboká nad Vltavou</city> @@ -869,7 +869,7 @@ <visitIp>1.2.4.5</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -937,7 +937,7 @@ <continentCode>eur</continentCode> <country>Russian Federation</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -990,7 +990,7 @@ <visitIp>1.2.4.5</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -1058,7 +1058,7 @@ <continentCode>eur</continentCode> <country>Russian Federation</country> <countryCode>ru</countryCode> - <countryFlag>plugins/UserCountry/flags/ru.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag> <region>Saint Petersburg City</region> <regionCode>66</regionCode> <city>Stratford-upon-Avon</city> @@ -1111,7 +1111,7 @@ <visitIp>1.2.4.4</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -1196,7 +1196,7 @@ <continentCode>eur</continentCode> <country>United Kingdom</country> <countryCode>gb</countryCode> - <countryFlag>plugins/UserCountry/flags/gb.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag> <region>Kent</region> <regionCode>G5</regionCode> <city>Stratford-upon-Avon</city> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index 29f5758280..ac96197b86 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -28,7 +28,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> <row> <label>Stratford-upon-Avon, Warwickshire, United Kingdom</label> @@ -59,7 +59,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> <label>Vancouver, British Columbia, Canada</label> @@ -90,7 +90,7 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/flags/ca.png</logo> + <logo>plugins/UserCountry/images/flags/ca.png</logo> </row> <row> <label>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</label> @@ -119,7 +119,7 @@ <country>ru</country> <country_name>Russian Federation</country_name> <region_name>Saint Petersburg City</region_name> - <logo>plugins/UserCountry/flags/ru.png</logo> + <logo>plugins/UserCountry/images/flags/ru.png</logo> </row> <row> <label>London, London, City of, United Kingdom</label> @@ -148,7 +148,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>London, City of</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> <label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label> @@ -177,7 +177,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> <label>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</label> @@ -206,7 +206,7 @@ <country>mk</country> <country_name>Macedonia, the Former Yugoslav Republic of</country_name> <region_name>Miravci</region_name> - <logo>plugins/UserCountry/flags/mk.png</logo> + <logo>plugins/UserCountry/images/flags/mk.png</logo> </row> <row> <label>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</label> @@ -235,7 +235,7 @@ <country>ru</country> <country_name>Russian Federation</country_name> <region_name>Saint Petersburg City</region_name> - <logo>plugins/UserCountry/flags/ru.png</logo> + <logo>plugins/UserCountry/images/flags/ru.png</logo> </row> <row> <label>Stratford-upon-Avon, Kent, United Kingdom</label> @@ -264,7 +264,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Kent</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> <label>Besançon, Franche-Comte, France</label> @@ -295,7 +295,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Franche-Comte</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> </row> <row> <label>Lhasa, Unknown, Tibet</label> @@ -326,7 +326,7 @@ <country>ti</country> <country_name>Tibet</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/ti.png</logo> + <logo>plugins/UserCountry/images/flags/ti.png</logo> </row> <row> <label>not a city, California, United States</label> @@ -352,6 +352,6 @@ <country>us</country> <country_name>United States</country_name> <region_name>California</region_name> - <logo>plugins/UserCountry/flags/us.png</logo> + <logo>plugins/UserCountry/images/flags/us.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index 55bc1f2f57..d2c1f86e6a 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -23,7 +23,7 @@ <revenue>75</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <code>gb</code> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -50,7 +50,7 @@ <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <code>ru</code> - <logo>plugins/UserCountry/flags/ru.png</logo> + <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -77,7 +77,7 @@ <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <code>ca</code> - <logo>plugins/UserCountry/flags/ca.png</logo> + <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -104,7 +104,7 @@ <revenue>20</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -131,7 +131,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>mk</code> - <logo>plugins/UserCountry/flags/mk.png</logo> + <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -158,7 +158,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>xx</code> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -185,7 +185,7 @@ <revenue>10</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>id</code> - <logo>plugins/UserCountry/flags/id.png</logo> + <logo>plugins/UserCountry/images/flags/id.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -212,7 +212,7 @@ <revenue>10</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>it</code> - <logo>plugins/UserCountry/flags/it.png</logo> + <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -239,7 +239,7 @@ <revenue>10</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>ti</code> - <logo>plugins/UserCountry/flags/ti.png</logo> + <logo>plugins/UserCountry/images/flags/ti.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -261,7 +261,7 @@ <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>us</code> - <logo>plugins/UserCountry/flags/us.png</logo> + <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index f879c9d3e5..85cd065211 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -26,7 +26,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> <label>Unknown</label> @@ -54,7 +54,7 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> <row> <label>Saint Petersburg City, Russian Federation</label> @@ -82,7 +82,7 @@ <country>ru</country> <country_name>Russian Federation</country_name> <region_name>Saint Petersburg City</region_name> - <logo>plugins/UserCountry/flags/ru.png</logo> + <logo>plugins/UserCountry/images/flags/ru.png</logo> </row> <row> <label>British Columbia, Canada</label> @@ -110,7 +110,7 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/flags/ca.png</logo> + <logo>plugins/UserCountry/images/flags/ca.png</logo> </row> <row> <label>Miravci, Macedonia, the Former Yugoslav Republic of</label> @@ -138,7 +138,7 @@ <country>mk</country> <country_name>Macedonia, the Former Yugoslav Republic of</country_name> <region_name>Miravci</region_name> - <logo>plugins/UserCountry/flags/mk.png</logo> + <logo>plugins/UserCountry/images/flags/mk.png</logo> </row> <row> <label>Kent, United Kingdom</label> @@ -166,7 +166,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Kent</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> <label>London, City of, United Kingdom</label> @@ -194,7 +194,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>London, City of</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> <label>Unknown, Tibet</label> @@ -222,7 +222,7 @@ <country>ti</country> <country_name>Tibet</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/ti.png</logo> + <logo>plugins/UserCountry/images/flags/ti.png</logo> </row> <row> <label>Franche-Comte, France</label> @@ -250,7 +250,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Franche-Comte</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> </row> <row> <label>California, United States</label> @@ -273,6 +273,6 @@ <country>us</country> <country_name>United States</country_name> <region_name>California</region_name> - <logo>plugins/UserCountry/flags/us.png</logo> + <logo>plugins/UserCountry/images/flags/us.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml index f07a79dad9..60dfef99f2 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml @@ -29,6 +29,6 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml index 003f6b0af1..a548f9004f 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml @@ -23,7 +23,7 @@ <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <code>gb</code> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml index 51f7a0efb4..0a0ca3339d 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml @@ -26,6 +26,6 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index edc146a42e..589404867b 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -23,7 +23,7 @@ <revenue>75</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <code>gb</code> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -50,7 +50,7 @@ <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <code>ru</code> - <logo>plugins/UserCountry/flags/ru.png</logo> + <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -77,7 +77,7 @@ <revenue>20</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -104,7 +104,7 @@ <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>mk</code> - <logo>plugins/UserCountry/flags/mk.png</logo> + <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> @@ -131,7 +131,7 @@ <revenue>10</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <code>it</code> - <logo>plugins/UserCountry/flags/it.png</logo> + <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index 15277712f8..5f006ed230 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -29,6 +29,6 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/flags/ca.png</logo> + <logo>plugins/UserCountry/images/flags/ca.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index 33e6aefbdf..b22a9a99af 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -23,7 +23,7 @@ <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <code>ca</code> - <logo>plugins/UserCountry/flags/ca.png</logo> + <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index 6c790beddb..589f609d5e 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -26,6 +26,6 @@ <country>ca</country> <country_name>Canada</country_name> <region_name>British Columbia</region_name> - <logo>plugins/UserCountry/flags/ca.png</logo> + <logo>plugins/UserCountry/images/flags/ca.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index f39b1e6c27..72e6b3fd49 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -29,7 +29,7 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> <row> <label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label> @@ -58,6 +58,6 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index 7ea54f11f5..1ff7e1644c 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -23,7 +23,7 @@ <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <code>gb</code> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index 3f59ad407d..4209f553ae 100755 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -26,6 +26,6 @@ <country>gb</country> <country_name>United Kingdom</country_name> <region_name>Warwickshire</region_name> - <logo>plugins/UserCountry/flags/gb.png</logo> + <logo>plugins/UserCountry/images/flags/gb.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml index 4592d291b9..e2562def53 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml @@ -28,6 +28,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml index 0ddbedd976..86f61ceeba 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml @@ -23,7 +23,7 @@ <nb_conversions>2</nb_conversions> <revenue>43</revenue> <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml index cccafaa0f2..a32f142d6e 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml @@ -26,6 +26,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index b052ae38fa..84165383dd 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -6,7 +6,7 @@ <visitIp>156.5.3.2</visitIp> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -57,7 +57,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -241,7 +241,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml index 4e23dbf45b..4de55a5ecd 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml @@ -28,6 +28,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml index bfc75b9891..06f10725ef 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml @@ -23,7 +23,7 @@ <nb_conversions>2</nb_conversions> <revenue>43</revenue> <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml index 7994ac8c81..8698ce8960 100755 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml @@ -26,6 +26,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 0d99dbf939..d7aa0fa4d9 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -46,7 +46,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -149,7 +149,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html index 58e6f19d5a..0f14630b1b 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html @@ -2774,7 +2774,7 @@ width="700"/> <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/fr.png'> +<img src='plugins/UserCountry/images/flags/fr.png'> France </td> @@ -2904,7 +2904,7 @@ width="700"/> <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/xx.png'> +<img src='plugins/UserCountry/images/flags/xx.png'> Unknown </td> @@ -2970,7 +2970,7 @@ width="700"/> <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/xx.png'> +<img src='plugins/UserCountry/images/flags/xx.png'> Unknown </td> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html index f2b131a8b4..7d014c7303 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html @@ -2655,7 +2655,7 @@ Country <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/fr.png'> +<img src='plugins/UserCountry/images/flags/fr.png'> France </td> @@ -2771,7 +2771,7 @@ Region <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/xx.png'> +<img src='plugins/UserCountry/images/flags/xx.png'> Unknown </td> @@ -2830,7 +2830,7 @@ City <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/xx.png'> +<img src='plugins/UserCountry/images/flags/xx.png'> Unknown </td> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index 220726e647..0dddbe1d5d 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -66,7 +66,7 @@ <reportMetadata> <row> <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index 3d7f33e9df..8912617c44 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -77,7 +77,7 @@ <reportMetadata> <row> <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 944ebbc5c0..fae2d87e22 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -6,7 +6,7 @@ <visitIp>156.5.3.2</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>ordered</visitEcommerceStatus> @@ -84,7 +84,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -137,7 +137,7 @@ <visitIp>156.5.3.2</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> @@ -291,7 +291,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml index 8917a3b21a..df300323a7 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -66,7 +66,7 @@ <reportMetadata> <row> <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index debade25ce..2a60c21ab0 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -6,7 +6,7 @@ <visitIp>156.5.3.2</visitIp> <visitorType>returningCustomer</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitEcommerceStatus>abandonedCart</visitEcommerceStatus> @@ -160,7 +160,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -213,7 +213,7 @@ <visitIp>156.5.3.2</visitIp> <visitorType>returning</visitorType> - <visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> @@ -486,7 +486,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -694,7 +694,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml index 2fcc10ad53..9d30c24026 100755 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml @@ -39,6 +39,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml index 5dd203bb0a..fdf9642178 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml @@ -34,7 +34,7 @@ <nb_conversions>3</nb_conversions> <revenue>3121.11</revenue> <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml index fd669cef97..17d816f7e9 100755 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml @@ -37,6 +37,6 @@ <country>xx</country> <country_name>Unknown</country_name> <region_name>Unknown</region_name> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html index efceb0b8a9..f174d5f124 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html @@ -4656,7 +4656,7 @@ width="700"/> <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/fr.png'> +<img src='plugins/UserCountry/images/flags/fr.png'> France </td> @@ -4786,7 +4786,7 @@ width="700"/> <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/xx.png'> +<img src='plugins/UserCountry/images/flags/xx.png'> Unknown </td> @@ -4852,7 +4852,7 @@ width="700"/> <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/xx.png'> +<img src='plugins/UserCountry/images/flags/xx.png'> Unknown </td> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html index 3fd190fc25..e02c135ae8 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html @@ -4453,7 +4453,7 @@ Country <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/fr.png'> +<img src='plugins/UserCountry/images/flags/fr.png'> France </td> @@ -4569,7 +4569,7 @@ Region <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/xx.png'> +<img src='plugins/UserCountry/images/flags/xx.png'> Unknown </td> @@ -4628,7 +4628,7 @@ City <tbody> <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> -<img src='plugins/UserCountry/flags/xx.png'> +<img src='plugins/UserCountry/images/flags/xx.png'> Unknown </td> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index 0e29369c84..12bdc93a73 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -63,7 +63,7 @@ <reportMetadata> <row> <code>fr</code> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> <logoHeight>11</logoHeight> </row> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 901922fe8e..091eb38ae4 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -54,7 +54,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -165,7 +165,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> @@ -336,7 +336,7 @@ <continentCode>eur</continentCode> <country>France</country> <countryCode>fr</countryCode> - <countryFlag>plugins/UserCountry/flags/fr.png</countryFlag> + <countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag> <region /> <regionCode /> <city /> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml index 91995c68b7..3025935cb2 100755 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml @@ -14,7 +14,7 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/flags/au.png</logo> + <logo>plugins/UserCountry/images/flags/au.png</logo> </row> <row> <label>Nice, Provence-Alpes-Cote d&#039;Azur, France</label> @@ -30,7 +30,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> </row> <row> <label>Others</label> @@ -41,6 +41,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml index c570fbd4bc..fe34824621 100755 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml @@ -13,7 +13,7 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/flags/au.png</logo> + <logo>plugins/UserCountry/images/flags/au.png</logo> </row> <row> <label>Provence-Alpes-Cote d&#039;Azur, France</label> @@ -28,7 +28,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> </row> <row> <label>Others</label> @@ -39,6 +39,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml index 91995c68b7..3025935cb2 100755 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml @@ -14,7 +14,7 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/flags/au.png</logo> + <logo>plugins/UserCountry/images/flags/au.png</logo> </row> <row> <label>Nice, Provence-Alpes-Cote d&#039;Azur, France</label> @@ -30,7 +30,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> </row> <row> <label>Others</label> @@ -41,6 +41,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml index c570fbd4bc..fe34824621 100755 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml @@ -13,7 +13,7 @@ <country>au</country> <country_name>Australia</country_name> <region_name>Victoria</region_name> - <logo>plugins/UserCountry/flags/au.png</logo> + <logo>plugins/UserCountry/images/flags/au.png</logo> </row> <row> <label>Provence-Alpes-Cote d&#039;Azur, France</label> @@ -28,7 +28,7 @@ <country>fr</country> <country_name>France</country_name> <region_name>Provence-Alpes-Cote d'Azur</region_name> - <logo>plugins/UserCountry/flags/fr.png</logo> + <logo>plugins/UserCountry/images/flags/fr.png</logo> </row> <row> <label>Others</label> @@ -39,6 +39,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>35</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/UserCountry/flags/xx.png</logo> + <logo>plugins/UserCountry/images/flags/xx.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php index dbf4168eaa..6206ab5054 100644 --- a/tests/PHPUnit/Plugins/UserCountryTest.php +++ b/tests/PHPUnit/Plugins/UserCountryTest.php @@ -46,7 +46,7 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase $countries = array_merge($GLOBALS['Piwik_CountryList'], $GLOBALS['Piwik_CountryList_Extras']); // Get list of existing flag icons - $flags = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/UserCountry/flags/'); + $flags = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/UserCountry/images/flags/'); // Get list of countries foreach ($countries as $country => $continent) { diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index 0cf18f0826..acdbf24ad5 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -71,7 +71,7 @@ Try again. } catch (Exception $e) { $fetched = "ERROR fetching: " . $e->getMessage(); } - $expectedString = 'plugins/CoreHome/templates/images/favicon.ico'; + $expectedString = 'plugins/CoreHome/images/favicon.ico'; if (strpos($fetched, $expectedString) === false) { echo "\nPiwik should be running at: " . $piwikServerUrl |