From 16dffb456eae335983aacf79317178614c6ee492 Mon Sep 17 00:00:00 2001
From: Thomas ZILLIOX <thomas@zilliox.me>
Date: Wed, 8 May 2013 16:51:57 +0200
Subject: [PATCH] Reorganizing the images folders for every plugins
---
core/DataTable.php | 4 +-
plugins/API/API.php | 2 +-
plugins/Annotations/templates/annotation.twig | 4 +-
.../templates/annotationManager.twig | 2 +-
.../templates/evolutionAnnotations.twig | 2 +-
.../templates/generalSettings.twig | 2 +-
.../{templates => }/images/bg_header.jpg | Bin
.../{templates => }/images/bullet1.gif | Bin
.../{templates => }/images/bullet2.gif | Bin
.../CoreHome/{templates => }/images/more.png | Bin
.../{templates => }/images/more_date.gif | Bin
.../{templates => }/images/more_period.gif | Bin
.../{templates => }/images/promo_splash.png | Bin
.../{templates => }/images/reset_search.png | Bin
.../{templates => }/images/search.png | Bin
plugins/CoreHome/templates/datatable.css | 4 +-
plugins/CoreHome/templates/datatable.js | 2 +-
.../CoreHome/templates/datatable_cell.twig | 2 +-
.../CoreHome/templates/datatable_footer.twig | 32 +++++++--------
plugins/CoreHome/templates/donate.js | 2 +-
plugins/CoreHome/templates/donate.twig | 14 +++----
.../CoreHome/templates/header_message.twig | 4 +-
plugins/CoreHome/templates/images/favicon.ico | Bin 3294 -> 0 bytes
plugins/CoreHome/templates/promo_video.twig | 4 +-
.../templates/reports_by_dimension.twig | 2 +-
.../CoreHome/templates/sites_selection.twig | 2 +-
.../templates/warning_invalid_host.twig | 2 +-
plugins/CoreUpdater/templates/layout.twig | 4 +-
.../templates/update_database_done.twig | 8 ++--
.../templates/update_one_click_results.twig | 4 +-
.../CoreUpdater/templates/update_welcome.twig | 2 +-
plugins/DBStats/templates/index.twig | 4 +-
plugins/Dashboard/javascripts/widgetMenu.js | 8 ++--
plugins/Goals/templates/list_goal_edit.twig | 4 +-
.../templates/title_and_evolution_graph.twig | 2 +-
.../Installation/templates/databaseSetup.twig | 2 +-
.../templates/displayJavascriptCode.twig | 2 +-
.../templates/firstWebsiteSetup.twig | 4 +-
plugins/Installation/templates/structure.twig | 4 +-
.../Installation/templates/systemCheck.twig | 2 +-
.../templates/systemCheckPage.twig | 6 +--
.../templates/systemCheckSection.twig | 8 ++--
.../templates/systemCheck_legend.twig | 6 +--
.../templates/tablesCreation.twig | 6 +--
plugins/Live/Visitor.php | 2 +-
plugins/Live/{templates => }/images/file0.png | Bin
plugins/Live/{templates => }/images/file1.png | Bin
plugins/Live/{templates => }/images/file2.png | Bin
plugins/Live/{templates => }/images/file3.png | Bin
plugins/Live/{templates => }/images/file4.png | Bin
plugins/Live/{templates => }/images/file5.png | Bin
plugins/Live/{templates => }/images/file6.png | Bin
plugins/Live/{templates => }/images/file7.png | Bin
plugins/Live/{templates => }/images/file8.png | Bin
plugins/Live/{templates => }/images/file9.png | Bin
plugins/Live/{templates => }/images/pause.gif | Bin
.../{templates => }/images/pause_disabled.gif | Bin
plugins/Live/{templates => }/images/play.gif | Bin
.../{templates => }/images/play_disabled.gif | Bin
.../images/returningVisitor.gif | Bin
plugins/Live/templates/index.twig | 4 +-
plugins/Live/templates/lastVisits.twig | 2 +-
plugins/Live/templates/live.css | 2 +-
plugins/Live/templates/scripts/live.js | 8 ++--
plugins/Login/templates/login.twig | 6 +--
.../Overlay/{templates => images}/info.png | Bin
.../{templates => images}/overlay_icon.png | Bin
.../overlay_icon_hover.png | Bin
.../Overlay/templates/error_wrong_domain.twig | 2 +-
plugins/Overlay/templates/index.css | 4 +-
plugins/Overlay/templates/index.twig | 2 +-
plugins/Overlay/templates/rowaction.js | 4 +-
plugins/PDFReports/templates/list.twig | 4 +-
plugins/SitesManager/templates/index.twig | 6 +--
.../transitions_icon.png | Bin
.../transitions_icon_hover.png | Bin
plugins/Transitions/templates/transitions.js | 4 +-
plugins/UserCountry/functions.php | 2 +-
plugins/UserCountry/{ => images}/flags/a1.png | Bin
plugins/UserCountry/{ => images}/flags/a2.png | Bin
plugins/UserCountry/{ => images}/flags/ac.png | Bin
plugins/UserCountry/{ => images}/flags/ad.png | Bin
plugins/UserCountry/{ => images}/flags/ae.png | Bin
plugins/UserCountry/{ => images}/flags/af.png | Bin
plugins/UserCountry/{ => images}/flags/ag.png | Bin
plugins/UserCountry/{ => images}/flags/ai.png | Bin
plugins/UserCountry/{ => images}/flags/al.png | Bin
plugins/UserCountry/{ => images}/flags/am.png | Bin
plugins/UserCountry/{ => images}/flags/an.png | Bin
plugins/UserCountry/{ => images}/flags/ao.png | Bin
plugins/UserCountry/{ => images}/flags/ap.png | Bin
plugins/UserCountry/{ => images}/flags/aq.png | Bin
plugins/UserCountry/{ => images}/flags/ar.png | Bin
plugins/UserCountry/{ => images}/flags/as.png | Bin
plugins/UserCountry/{ => images}/flags/at.png | Bin
plugins/UserCountry/{ => images}/flags/au.png | Bin
plugins/UserCountry/{ => images}/flags/aw.png | Bin
plugins/UserCountry/{ => images}/flags/ax.png | Bin
plugins/UserCountry/{ => images}/flags/az.png | Bin
plugins/UserCountry/{ => images}/flags/ba.png | Bin
plugins/UserCountry/{ => images}/flags/bb.png | Bin
plugins/UserCountry/{ => images}/flags/bd.png | Bin
plugins/UserCountry/{ => images}/flags/be.png | Bin
plugins/UserCountry/{ => images}/flags/bf.png | Bin
plugins/UserCountry/{ => images}/flags/bg.png | Bin
plugins/UserCountry/{ => images}/flags/bh.png | Bin
plugins/UserCountry/{ => images}/flags/bi.png | Bin
plugins/UserCountry/{ => images}/flags/bj.png | Bin
plugins/UserCountry/{ => images}/flags/bl.png | Bin
plugins/UserCountry/{ => images}/flags/bm.png | Bin
plugins/UserCountry/{ => images}/flags/bn.png | Bin
plugins/UserCountry/{ => images}/flags/bo.png | Bin
plugins/UserCountry/{ => images}/flags/bq.png | Bin
plugins/UserCountry/{ => images}/flags/br.png | Bin
plugins/UserCountry/{ => images}/flags/bs.png | Bin
plugins/UserCountry/{ => images}/flags/bt.png | Bin
plugins/UserCountry/{ => images}/flags/bu.png | Bin
plugins/UserCountry/{ => images}/flags/bv.png | Bin
plugins/UserCountry/{ => images}/flags/bw.png | Bin
plugins/UserCountry/{ => images}/flags/by.png | Bin
plugins/UserCountry/{ => images}/flags/bz.png | Bin
plugins/UserCountry/{ => images}/flags/ca.png | Bin
.../UserCountry/{ => images}/flags/cat.png | Bin
plugins/UserCountry/{ => images}/flags/cc.png | Bin
plugins/UserCountry/{ => images}/flags/cd.png | Bin
plugins/UserCountry/{ => images}/flags/cf.png | Bin
plugins/UserCountry/{ => images}/flags/cg.png | Bin
plugins/UserCountry/{ => images}/flags/ch.png | Bin
plugins/UserCountry/{ => images}/flags/ci.png | Bin
plugins/UserCountry/{ => images}/flags/ck.png | Bin
plugins/UserCountry/{ => images}/flags/cl.png | Bin
plugins/UserCountry/{ => images}/flags/cm.png | Bin
plugins/UserCountry/{ => images}/flags/cn.png | Bin
plugins/UserCountry/{ => images}/flags/co.png | Bin
plugins/UserCountry/{ => images}/flags/cp.png | Bin
plugins/UserCountry/{ => images}/flags/cr.png | Bin
plugins/UserCountry/{ => images}/flags/cs.png | Bin
plugins/UserCountry/{ => images}/flags/cu.png | Bin
plugins/UserCountry/{ => images}/flags/cv.png | Bin
plugins/UserCountry/{ => images}/flags/cw.png | Bin
plugins/UserCountry/{ => images}/flags/cx.png | Bin
plugins/UserCountry/{ => images}/flags/cy.png | Bin
plugins/UserCountry/{ => images}/flags/cz.png | Bin
plugins/UserCountry/{ => images}/flags/de.png | Bin
plugins/UserCountry/{ => images}/flags/dg.png | Bin
plugins/UserCountry/{ => images}/flags/dj.png | Bin
plugins/UserCountry/{ => images}/flags/dk.png | Bin
plugins/UserCountry/{ => images}/flags/dm.png | Bin
plugins/UserCountry/{ => images}/flags/do.png | Bin
plugins/UserCountry/{ => images}/flags/dz.png | Bin
plugins/UserCountry/{ => images}/flags/ea.png | Bin
plugins/UserCountry/{ => images}/flags/ec.png | Bin
plugins/UserCountry/{ => images}/flags/ee.png | Bin
plugins/UserCountry/{ => images}/flags/eg.png | Bin
plugins/UserCountry/{ => images}/flags/eh.png | Bin
plugins/UserCountry/{ => images}/flags/er.png | Bin
plugins/UserCountry/{ => images}/flags/es.png | Bin
plugins/UserCountry/{ => images}/flags/et.png | Bin
plugins/UserCountry/{ => images}/flags/eu.png | Bin
plugins/UserCountry/{ => images}/flags/fi.png | Bin
plugins/UserCountry/{ => images}/flags/fj.png | Bin
plugins/UserCountry/{ => images}/flags/fk.png | Bin
plugins/UserCountry/{ => images}/flags/fm.png | Bin
plugins/UserCountry/{ => images}/flags/fo.png | Bin
plugins/UserCountry/{ => images}/flags/fr.png | Bin
plugins/UserCountry/{ => images}/flags/fx.png | Bin
plugins/UserCountry/{ => images}/flags/ga.png | Bin
plugins/UserCountry/{ => images}/flags/gb.png | Bin
plugins/UserCountry/{ => images}/flags/gd.png | Bin
plugins/UserCountry/{ => images}/flags/ge.png | Bin
plugins/UserCountry/{ => images}/flags/gf.png | Bin
plugins/UserCountry/{ => images}/flags/gg.png | Bin
plugins/UserCountry/{ => images}/flags/gh.png | Bin
plugins/UserCountry/{ => images}/flags/gi.png | Bin
plugins/UserCountry/{ => images}/flags/gl.png | Bin
plugins/UserCountry/{ => images}/flags/gm.png | Bin
plugins/UserCountry/{ => images}/flags/gn.png | Bin
plugins/UserCountry/{ => images}/flags/gp.png | Bin
plugins/UserCountry/{ => images}/flags/gq.png | Bin
plugins/UserCountry/{ => images}/flags/gr.png | Bin
plugins/UserCountry/{ => images}/flags/gs.png | Bin
plugins/UserCountry/{ => images}/flags/gt.png | Bin
plugins/UserCountry/{ => images}/flags/gu.png | Bin
plugins/UserCountry/{ => images}/flags/gw.png | Bin
plugins/UserCountry/{ => images}/flags/gy.png | Bin
plugins/UserCountry/{ => images}/flags/hk.png | Bin
plugins/UserCountry/{ => images}/flags/hm.png | Bin
plugins/UserCountry/{ => images}/flags/hn.png | Bin
plugins/UserCountry/{ => images}/flags/hr.png | Bin
plugins/UserCountry/{ => images}/flags/ht.png | Bin
plugins/UserCountry/{ => images}/flags/hu.png | Bin
plugins/UserCountry/{ => images}/flags/ic.png | Bin
plugins/UserCountry/{ => images}/flags/id.png | Bin
plugins/UserCountry/{ => images}/flags/ie.png | Bin
plugins/UserCountry/{ => images}/flags/il.png | Bin
plugins/UserCountry/{ => images}/flags/im.png | Bin
plugins/UserCountry/{ => images}/flags/in.png | Bin
plugins/UserCountry/{ => images}/flags/io.png | Bin
plugins/UserCountry/{ => images}/flags/iq.png | Bin
plugins/UserCountry/{ => images}/flags/ir.png | Bin
plugins/UserCountry/{ => images}/flags/is.png | Bin
plugins/UserCountry/{ => images}/flags/it.png | Bin
plugins/UserCountry/{ => images}/flags/je.png | Bin
plugins/UserCountry/{ => images}/flags/jm.png | Bin
plugins/UserCountry/{ => images}/flags/jo.png | Bin
plugins/UserCountry/{ => images}/flags/jp.png | Bin
plugins/UserCountry/{ => images}/flags/ke.png | Bin
plugins/UserCountry/{ => images}/flags/kg.png | Bin
plugins/UserCountry/{ => images}/flags/kh.png | Bin
plugins/UserCountry/{ => images}/flags/ki.png | Bin
plugins/UserCountry/{ => images}/flags/km.png | Bin
plugins/UserCountry/{ => images}/flags/kn.png | Bin
plugins/UserCountry/{ => images}/flags/kp.png | Bin
plugins/UserCountry/{ => images}/flags/kr.png | Bin
plugins/UserCountry/{ => images}/flags/kw.png | Bin
plugins/UserCountry/{ => images}/flags/ky.png | Bin
plugins/UserCountry/{ => images}/flags/kz.png | Bin
plugins/UserCountry/{ => images}/flags/la.png | Bin
plugins/UserCountry/{ => images}/flags/lb.png | Bin
plugins/UserCountry/{ => images}/flags/lc.png | Bin
plugins/UserCountry/{ => images}/flags/li.png | Bin
plugins/UserCountry/{ => images}/flags/lk.png | Bin
plugins/UserCountry/{ => images}/flags/lr.png | Bin
plugins/UserCountry/{ => images}/flags/ls.png | Bin
plugins/UserCountry/{ => images}/flags/lt.png | Bin
plugins/UserCountry/{ => images}/flags/lu.png | Bin
plugins/UserCountry/{ => images}/flags/lv.png | Bin
plugins/UserCountry/{ => images}/flags/ly.png | Bin
plugins/UserCountry/{ => images}/flags/ma.png | Bin
plugins/UserCountry/{ => images}/flags/mc.png | Bin
plugins/UserCountry/{ => images}/flags/md.png | Bin
plugins/UserCountry/{ => images}/flags/me.png | Bin
plugins/UserCountry/{ => images}/flags/mf.png | Bin
plugins/UserCountry/{ => images}/flags/mg.png | Bin
plugins/UserCountry/{ => images}/flags/mh.png | Bin
plugins/UserCountry/{ => images}/flags/mk.png | Bin
plugins/UserCountry/{ => images}/flags/ml.png | Bin
plugins/UserCountry/{ => images}/flags/mm.png | Bin
plugins/UserCountry/{ => images}/flags/mn.png | Bin
plugins/UserCountry/{ => images}/flags/mo.png | Bin
plugins/UserCountry/{ => images}/flags/mp.png | Bin
plugins/UserCountry/{ => images}/flags/mq.png | Bin
plugins/UserCountry/{ => images}/flags/mr.png | Bin
plugins/UserCountry/{ => images}/flags/ms.png | Bin
plugins/UserCountry/{ => images}/flags/mt.png | Bin
plugins/UserCountry/{ => images}/flags/mu.png | Bin
plugins/UserCountry/{ => images}/flags/mv.png | Bin
plugins/UserCountry/{ => images}/flags/mw.png | Bin
plugins/UserCountry/{ => images}/flags/mx.png | Bin
plugins/UserCountry/{ => images}/flags/my.png | Bin
plugins/UserCountry/{ => images}/flags/mz.png | Bin
plugins/UserCountry/{ => images}/flags/na.png | Bin
plugins/UserCountry/{ => images}/flags/nc.png | Bin
plugins/UserCountry/{ => images}/flags/ne.png | Bin
plugins/UserCountry/{ => images}/flags/nf.png | Bin
plugins/UserCountry/{ => images}/flags/ng.png | Bin
plugins/UserCountry/{ => images}/flags/ni.png | Bin
plugins/UserCountry/{ => images}/flags/nl.png | Bin
plugins/UserCountry/{ => images}/flags/no.png | Bin
plugins/UserCountry/{ => images}/flags/np.png | Bin
plugins/UserCountry/{ => images}/flags/nr.png | Bin
plugins/UserCountry/{ => images}/flags/nt.png | Bin
plugins/UserCountry/{ => images}/flags/nu.png | Bin
plugins/UserCountry/{ => images}/flags/nz.png | Bin
plugins/UserCountry/{ => images}/flags/o1.png | Bin
plugins/UserCountry/{ => images}/flags/om.png | Bin
plugins/UserCountry/{ => images}/flags/pa.png | Bin
plugins/UserCountry/{ => images}/flags/pe.png | Bin
plugins/UserCountry/{ => images}/flags/pf.png | Bin
plugins/UserCountry/{ => images}/flags/pg.png | Bin
plugins/UserCountry/{ => images}/flags/ph.png | Bin
plugins/UserCountry/{ => images}/flags/pk.png | Bin
plugins/UserCountry/{ => images}/flags/pl.png | Bin
plugins/UserCountry/{ => images}/flags/pm.png | Bin
plugins/UserCountry/{ => images}/flags/pn.png | Bin
plugins/UserCountry/{ => images}/flags/pr.png | Bin
plugins/UserCountry/{ => images}/flags/ps.png | Bin
plugins/UserCountry/{ => images}/flags/pt.png | Bin
plugins/UserCountry/{ => images}/flags/pw.png | Bin
plugins/UserCountry/{ => images}/flags/py.png | Bin
plugins/UserCountry/{ => images}/flags/qa.png | Bin
plugins/UserCountry/{ => images}/flags/re.png | Bin
plugins/UserCountry/{ => images}/flags/ro.png | Bin
plugins/UserCountry/{ => images}/flags/rs.png | Bin
plugins/UserCountry/{ => images}/flags/ru.png | Bin
plugins/UserCountry/{ => images}/flags/rw.png | Bin
plugins/UserCountry/{ => images}/flags/sa.png | Bin
plugins/UserCountry/{ => images}/flags/sb.png | Bin
plugins/UserCountry/{ => images}/flags/sc.png | Bin
plugins/UserCountry/{ => images}/flags/sd.png | Bin
plugins/UserCountry/{ => images}/flags/se.png | Bin
plugins/UserCountry/{ => images}/flags/sf.png | Bin
plugins/UserCountry/{ => images}/flags/sg.png | Bin
plugins/UserCountry/{ => images}/flags/sh.png | Bin
plugins/UserCountry/{ => images}/flags/si.png | Bin
plugins/UserCountry/{ => images}/flags/sj.png | Bin
plugins/UserCountry/{ => images}/flags/sk.png | Bin
plugins/UserCountry/{ => images}/flags/sl.png | Bin
plugins/UserCountry/{ => images}/flags/sm.png | Bin
plugins/UserCountry/{ => images}/flags/sn.png | Bin
plugins/UserCountry/{ => images}/flags/so.png | Bin
plugins/UserCountry/{ => images}/flags/sr.png | Bin
plugins/UserCountry/{ => images}/flags/ss.png | Bin
plugins/UserCountry/{ => images}/flags/st.png | Bin
plugins/UserCountry/{ => images}/flags/su.png | Bin
plugins/UserCountry/{ => images}/flags/sv.png | Bin
plugins/UserCountry/{ => images}/flags/sx.png | Bin
plugins/UserCountry/{ => images}/flags/sy.png | Bin
plugins/UserCountry/{ => images}/flags/sz.png | Bin
plugins/UserCountry/{ => images}/flags/ta.png | Bin
plugins/UserCountry/{ => images}/flags/tc.png | Bin
plugins/UserCountry/{ => images}/flags/td.png | Bin
plugins/UserCountry/{ => images}/flags/tf.png | Bin
plugins/UserCountry/{ => images}/flags/tg.png | Bin
plugins/UserCountry/{ => images}/flags/th.png | Bin
plugins/UserCountry/{ => images}/flags/ti.png | Bin
plugins/UserCountry/{ => images}/flags/tj.png | Bin
plugins/UserCountry/{ => images}/flags/tk.png | Bin
plugins/UserCountry/{ => images}/flags/tl.png | Bin
plugins/UserCountry/{ => images}/flags/tm.png | Bin
plugins/UserCountry/{ => images}/flags/tn.png | Bin
plugins/UserCountry/{ => images}/flags/to.png | Bin
plugins/UserCountry/{ => images}/flags/tp.png | Bin
plugins/UserCountry/{ => images}/flags/tr.png | Bin
plugins/UserCountry/{ => images}/flags/tt.png | Bin
plugins/UserCountry/{ => images}/flags/tv.png | Bin
plugins/UserCountry/{ => images}/flags/tw.png | Bin
plugins/UserCountry/{ => images}/flags/tz.png | Bin
plugins/UserCountry/{ => images}/flags/ua.png | Bin
plugins/UserCountry/{ => images}/flags/ug.png | Bin
plugins/UserCountry/{ => images}/flags/uk.png | Bin
plugins/UserCountry/{ => images}/flags/um.png | Bin
plugins/UserCountry/{ => images}/flags/us.png | Bin
plugins/UserCountry/{ => images}/flags/uy.png | Bin
plugins/UserCountry/{ => images}/flags/uz.png | Bin
plugins/UserCountry/{ => images}/flags/va.png | Bin
plugins/UserCountry/{ => images}/flags/vc.png | Bin
plugins/UserCountry/{ => images}/flags/ve.png | Bin
plugins/UserCountry/{ => images}/flags/vg.png | Bin
plugins/UserCountry/{ => images}/flags/vi.png | Bin
plugins/UserCountry/{ => images}/flags/vn.png | Bin
plugins/UserCountry/{ => images}/flags/vu.png | Bin
plugins/UserCountry/{ => images}/flags/wf.png | Bin
plugins/UserCountry/{ => images}/flags/ws.png | Bin
plugins/UserCountry/{ => images}/flags/xx.png | Bin
plugins/UserCountry/{ => images}/flags/ye.png | Bin
plugins/UserCountry/{ => images}/flags/yt.png | Bin
plugins/UserCountry/{ => images}/flags/yu.png | Bin
plugins/UserCountry/{ => images}/flags/za.png | Bin
plugins/UserCountry/{ => images}/flags/zm.png | Bin
plugins/UserCountry/{ => images}/flags/zr.png | Bin
plugins/UserCountry/{ => images}/flags/zw.png | Bin
.../UserCountryMap/{img => images}/cities.png | Bin
.../{img => images}/realtimemap-loading.gif | Bin
.../{img => images}/regions.png | Bin
.../{img => images}/zoom-out-disabled.png | Bin
.../{img => images}/zoom-out.png | Bin
plugins/UserCountryMap/img/info.png | Bin 372 -> 0 bytes
plugins/UserCountryMap/img/world.png | Bin 384 -> 0 bytes
.../templates/realtime-map.twig | 4 +-
.../UserCountryMap/templates/visitor-map.twig | 10 ++---
.../{theme => }/images/affix-arrow.png | Bin
.../Zeitgeist/{theme => }/images/arr_r.png | Bin
.../{theme => }/images/background-submit.png | Bin
.../{theme => }/images/chart_bar.png | Bin
.../{theme => }/images/chart_line_edit.png | Bin
.../{theme => }/images/chart_line_edit_bg.png | Bin
.../{theme => }/images/chart_pie.png | Bin
.../Zeitgeist/{theme => }/images/close.png | Bin
.../{theme => }/images/collapsed_arrows.gif | Bin
.../images/configure-highlight.png | Bin
.../{theme => }/images/configure.png | Bin
.../{theme => }/images/dashboard_h_bg.png | Bin
.../images/dashboard_h_bg_hover.png | Bin
.../images/data_table_footer_active_item.png | Bin
.../{theme => }/images/datepicker_arr_l.png | Bin
.../{theme => }/images/datepicker_arr_r.png | Bin
.../Zeitgeist/{theme => }/images/delete.png | Bin
.../Zeitgeist/{theme => }/images/download.png | Bin
.../images/ecommerceAbandonedCart.gif | Bin
.../{theme => }/images/ecommerceOrder.gif | Bin
.../Zeitgeist/{theme => }/images/email.png | Bin
.../Zeitgeist/{theme => }/images/error.png | Bin
.../{theme => }/images/error_medium.png | Bin
.../{theme => }/images/expanded_arrows.gif | Bin
.../Zeitgeist/{theme => }/images/export.png | Bin
plugins/Zeitgeist/{theme => }/images/feed.png | Bin
.../{theme => }/images/fullscreen.png | Bin
plugins/Zeitgeist/{theme => }/images/goal.png | Bin
.../{theme => }/images/grey_marker.png | Bin
plugins/Zeitgeist/{theme => }/images/help.png | Bin
.../{theme => }/images/help_grey.png | Bin
.../{theme => }/images/html_icon.png | Bin
.../{theme => }/images/ico_alert.png | Bin
.../{theme => }/images/ico_delete.png | Bin
.../Zeitgeist/{theme => }/images/ico_edit.png | Bin
.../Zeitgeist/{theme => }/images/ico_info.png | Bin
.../{theme => }/images/icon-calendar.gif | Bin
.../Zeitgeist/{theme => }/images/image.png | Bin
.../Zeitgeist/{theme => }/images/inp_bg.png | Bin
.../{theme => }/images/li_dbl_gray.gif | Bin
plugins/Zeitgeist/{theme => }/images/link.gif | Bin
.../{theme => }/images/loading-blue.gif | Bin
.../{theme => }/images/login-sprite.png | Bin
.../{theme => }/images/logo-header.png | Bin
plugins/Zeitgeist/{theme => }/images/logo.png | Bin
plugins/Zeitgeist/{theme => }/images/logo.svg | 0
.../Zeitgeist/{theme => }/images/maximise.png | Bin
.../Zeitgeist/{theme => }/images/minimise.png | Bin
.../Zeitgeist/{theme => }/images/minus.png | Bin
.../Zeitgeist/{theme => }/images/newtab.png | Bin
plugins/Zeitgeist/{theme => }/images/ok.png | Bin
.../{theme => }/images/page_border_grad.png | Bin
.../{theme => }/images/paypal_subscribe.gif | Bin
plugins/Zeitgeist/{theme => }/images/plus.png | Bin
.../{theme => }/images/plus_blue.png | Bin
.../Zeitgeist/{theme => }/images/refresh.png | Bin
.../Zeitgeist/{theme => }/images/reload.png | Bin
.../{theme => }/images/row_evolution.png | Bin
.../images/row_evolution_hover.png | Bin
.../{theme => }/images/search_bg.png | Bin
.../{theme => }/images/search_ico.png | Bin
.../{theme => }/images/sites_selection.png | Bin
.../{theme => }/images/smileyprog_0.png | Bin
.../{theme => }/images/smileyprog_1.png | Bin
.../{theme => }/images/smileyprog_2.png | Bin
.../{theme => }/images/smileyprog_3.png | Bin
.../{theme => }/images/smileyprog_4.png | Bin
.../{theme => }/images/sort_subtable_asc.png | Bin
.../images/sort_subtable_asc_light.png | Bin
.../{theme => }/images/sort_subtable_desc.png | Bin
.../images/sort_subtable_desc_light.png | Bin
.../Zeitgeist/{theme => }/images/sortasc.png | Bin
.../Zeitgeist/{theme => }/images/sortdesc.png | Bin
plugins/Zeitgeist/{theme => }/images/star.png | Bin
.../{theme => }/images/star_empty.png | Bin
.../{theme => }/images/success_medium.png | Bin
.../Zeitgeist/{theme => }/images/table.png | Bin
.../{theme => }/images/table_more.png | Bin
.../Zeitgeist/{theme => }/images/tagcloud.png | Bin
.../{theme => }/images/video_play.png | Bin
.../Zeitgeist/{theme => }/images/warning.png | Bin
.../{theme => }/images/warning_medium.png | Bin
.../{theme => }/images/warning_small.png | Bin
.../{theme => }/images/yellow_marker.png | Bin
plugins/Zeitgeist/theme/admin.twig | 2 +-
plugins/Zeitgeist/theme/ajaxMacros.twig | 2 +-
plugins/Zeitgeist/theme/common.css | 28 ++++++-------
plugins/Zeitgeist/theme/dashboard.twig | 2 +-
plugins/Zeitgeist/theme/genericForm.twig | 2 +-
plugins/Zeitgeist/theme/ieonly.css | 2 +-
.../theme/simple_structure_header.tpl | 2 +-
plugins/Zeitgeist/theme/styles.css | 2 +-
...PITest__Live.getLastVisitsDetails_year.xml | 38 +++++++++---------
..._ImportLogs__UserCountry.getCity_month.xml | 4 +-
...portLogs__UserCountry.getCountry_month.xml | 10 ++---
...mportLogs__UserCountry.getRegion_month.xml | 4 +-
...eTest__Live.getLastVisitsDetails_month.xml | 38 +++++++++---------
...WebsiteTest__UserCountry.getCity_month.xml | 24 +++++------
...siteTest__UserCountry.getCountry_month.xml | 20 ++++-----
...bsiteTest__UserCountry.getRegion_month.xml | 20 ++++-----
...egment_city__UserCountry.getCity_month.xml | 2 +-
...ent_city__UserCountry.getCountry_month.xml | 2 +-
...ment_city__UserCountry.getRegion_month.xml | 2 +-
...ontinent__UserCountry.getCountry_month.xml | 10 ++---
...nt_lat_long__UserCountry.getCity_month.xml | 2 +-
...lat_long__UserCountry.getCountry_month.xml | 2 +-
..._lat_long__UserCountry.getRegion_month.xml | 2 +-
...ment_region__UserCountry.getCity_month.xml | 4 +-
...t_region__UserCountry.getCountry_month.xml | 2 +-
...nt_region__UserCountry.getRegion_month.xml | 2 +-
...itorTwoVisits__UserCountry.getCity_day.xml | 2 +-
...rTwoVisits__UserCountry.getCountry_day.xml | 2 +-
...orTwoVisits__UserCountry.getRegion_day.xml | 2 +-
...Support__Live.getLastVisitsDetails_day.xml | 6 +--
...CookieSupport__UserCountry.getCity_day.xml | 2 +-
...kieSupport__UserCountry.getCountry_day.xml | 2 +-
...okieSupport__UserCountry.getRegion_day.xml | 2 +-
...ecified__Live.getLastVisitsDetails_day.xml | 4 +-
...Reports.generateReport_month.original.html | 6 +--
...Reports.generateReport_month.original.html | 6 +--
...rtMetadata__API.getProcessedReport_day.xml | 2 +-
...RawMetrics__API.getProcessedReport_day.xml | 2 +-
...Ordered__Live.getLastVisitsDetails_day.xml | 8 ++--
...rWithItems__API.getProcessedReport_day.xml | 2 +-
...thItems__Live.getLastVisitsDetails_day.xml | 10 ++---
...rderWithItems__UserCountry.getCity_day.xml | 2 +-
...rWithItems__UserCountry.getCountry_day.xml | 2 +-
...erWithItems__UserCountry.getRegion_day.xml | 2 +-
...FReports.generateReport_week.original.html | 6 +--
...FReports.generateReport_week.original.html | 6 +--
...ormalAPI__API.getProcessedReport_range.xml | 2 +-
...alAPI__Live.getLastVisitsDetails_range.xml | 6 +--
...eportLimiting__UserCountry.getCity_day.xml | 6 +--
...ortLimiting__UserCountry.getRegion_day.xml | 6 +--
..._rankingQuery__UserCountry.getCity_day.xml | 6 +--
...ankingQuery__UserCountry.getRegion_day.xml | 6 +--
tests/PHPUnit/Plugins/UserCountryTest.php | 2 +-
tests/PHPUnit/bootstrap.php | 2 +-
499 files changed, 285 insertions(+), 285 deletions(-)
rename plugins/CoreHome/{templates => }/images/bg_header.jpg (100%)
rename plugins/CoreHome/{templates => }/images/bullet1.gif (100%)
rename plugins/CoreHome/{templates => }/images/bullet2.gif (100%)
rename plugins/CoreHome/{templates => }/images/more.png (100%)
rename plugins/CoreHome/{templates => }/images/more_date.gif (100%)
rename plugins/CoreHome/{templates => }/images/more_period.gif (100%)
rename plugins/CoreHome/{templates => }/images/promo_splash.png (100%)
rename plugins/CoreHome/{templates => }/images/reset_search.png (100%)
rename plugins/CoreHome/{templates => }/images/search.png (100%)
delete mode 100644 plugins/CoreHome/templates/images/favicon.ico
rename plugins/Live/{templates => }/images/file0.png (100%)
rename plugins/Live/{templates => }/images/file1.png (100%)
rename plugins/Live/{templates => }/images/file2.png (100%)
rename plugins/Live/{templates => }/images/file3.png (100%)
rename plugins/Live/{templates => }/images/file4.png (100%)
rename plugins/Live/{templates => }/images/file5.png (100%)
rename plugins/Live/{templates => }/images/file6.png (100%)
rename plugins/Live/{templates => }/images/file7.png (100%)
rename plugins/Live/{templates => }/images/file8.png (100%)
rename plugins/Live/{templates => }/images/file9.png (100%)
rename plugins/Live/{templates => }/images/pause.gif (100%)
rename plugins/Live/{templates => }/images/pause_disabled.gif (100%)
rename plugins/Live/{templates => }/images/play.gif (100%)
rename plugins/Live/{templates => }/images/play_disabled.gif (100%)
rename plugins/Live/{templates => }/images/returningVisitor.gif (100%)
rename plugins/Overlay/{templates => images}/info.png (100%)
rename plugins/Overlay/{templates => images}/overlay_icon.png (100%)
rename plugins/Overlay/{templates => images}/overlay_icon_hover.png (100%)
rename plugins/Transitions/{templates => images}/transitions_icon.png (100%)
rename plugins/Transitions/{templates => images}/transitions_icon_hover.png (100%)
rename plugins/UserCountry/{ => images}/flags/a1.png (100%)
rename plugins/UserCountry/{ => images}/flags/a2.png (100%)
rename plugins/UserCountry/{ => images}/flags/ac.png (100%)
rename plugins/UserCountry/{ => images}/flags/ad.png (100%)
rename plugins/UserCountry/{ => images}/flags/ae.png (100%)
rename plugins/UserCountry/{ => images}/flags/af.png (100%)
rename plugins/UserCountry/{ => images}/flags/ag.png (100%)
rename plugins/UserCountry/{ => images}/flags/ai.png (100%)
rename plugins/UserCountry/{ => images}/flags/al.png (100%)
rename plugins/UserCountry/{ => images}/flags/am.png (100%)
rename plugins/UserCountry/{ => images}/flags/an.png (100%)
rename plugins/UserCountry/{ => images}/flags/ao.png (100%)
rename plugins/UserCountry/{ => images}/flags/ap.png (100%)
rename plugins/UserCountry/{ => images}/flags/aq.png (100%)
rename plugins/UserCountry/{ => images}/flags/ar.png (100%)
rename plugins/UserCountry/{ => images}/flags/as.png (100%)
rename plugins/UserCountry/{ => images}/flags/at.png (100%)
rename plugins/UserCountry/{ => images}/flags/au.png (100%)
rename plugins/UserCountry/{ => images}/flags/aw.png (100%)
rename plugins/UserCountry/{ => images}/flags/ax.png (100%)
rename plugins/UserCountry/{ => images}/flags/az.png (100%)
rename plugins/UserCountry/{ => images}/flags/ba.png (100%)
rename plugins/UserCountry/{ => images}/flags/bb.png (100%)
rename plugins/UserCountry/{ => images}/flags/bd.png (100%)
rename plugins/UserCountry/{ => images}/flags/be.png (100%)
rename plugins/UserCountry/{ => images}/flags/bf.png (100%)
rename plugins/UserCountry/{ => images}/flags/bg.png (100%)
rename plugins/UserCountry/{ => images}/flags/bh.png (100%)
rename plugins/UserCountry/{ => images}/flags/bi.png (100%)
rename plugins/UserCountry/{ => images}/flags/bj.png (100%)
rename plugins/UserCountry/{ => images}/flags/bl.png (100%)
rename plugins/UserCountry/{ => images}/flags/bm.png (100%)
rename plugins/UserCountry/{ => images}/flags/bn.png (100%)
rename plugins/UserCountry/{ => images}/flags/bo.png (100%)
rename plugins/UserCountry/{ => images}/flags/bq.png (100%)
rename plugins/UserCountry/{ => images}/flags/br.png (100%)
rename plugins/UserCountry/{ => images}/flags/bs.png (100%)
rename plugins/UserCountry/{ => images}/flags/bt.png (100%)
rename plugins/UserCountry/{ => images}/flags/bu.png (100%)
rename plugins/UserCountry/{ => images}/flags/bv.png (100%)
rename plugins/UserCountry/{ => images}/flags/bw.png (100%)
rename plugins/UserCountry/{ => images}/flags/by.png (100%)
rename plugins/UserCountry/{ => images}/flags/bz.png (100%)
rename plugins/UserCountry/{ => images}/flags/ca.png (100%)
rename plugins/UserCountry/{ => images}/flags/cat.png (100%)
rename plugins/UserCountry/{ => images}/flags/cc.png (100%)
rename plugins/UserCountry/{ => images}/flags/cd.png (100%)
rename plugins/UserCountry/{ => images}/flags/cf.png (100%)
rename plugins/UserCountry/{ => images}/flags/cg.png (100%)
rename plugins/UserCountry/{ => images}/flags/ch.png (100%)
rename plugins/UserCountry/{ => images}/flags/ci.png (100%)
rename plugins/UserCountry/{ => images}/flags/ck.png (100%)
rename plugins/UserCountry/{ => images}/flags/cl.png (100%)
rename plugins/UserCountry/{ => images}/flags/cm.png (100%)
rename plugins/UserCountry/{ => images}/flags/cn.png (100%)
rename plugins/UserCountry/{ => images}/flags/co.png (100%)
rename plugins/UserCountry/{ => images}/flags/cp.png (100%)
rename plugins/UserCountry/{ => images}/flags/cr.png (100%)
rename plugins/UserCountry/{ => images}/flags/cs.png (100%)
rename plugins/UserCountry/{ => images}/flags/cu.png (100%)
rename plugins/UserCountry/{ => images}/flags/cv.png (100%)
rename plugins/UserCountry/{ => images}/flags/cw.png (100%)
rename plugins/UserCountry/{ => images}/flags/cx.png (100%)
rename plugins/UserCountry/{ => images}/flags/cy.png (100%)
rename plugins/UserCountry/{ => images}/flags/cz.png (100%)
rename plugins/UserCountry/{ => images}/flags/de.png (100%)
rename plugins/UserCountry/{ => images}/flags/dg.png (100%)
rename plugins/UserCountry/{ => images}/flags/dj.png (100%)
rename plugins/UserCountry/{ => images}/flags/dk.png (100%)
rename plugins/UserCountry/{ => images}/flags/dm.png (100%)
rename plugins/UserCountry/{ => images}/flags/do.png (100%)
rename plugins/UserCountry/{ => images}/flags/dz.png (100%)
rename plugins/UserCountry/{ => images}/flags/ea.png (100%)
rename plugins/UserCountry/{ => images}/flags/ec.png (100%)
rename plugins/UserCountry/{ => images}/flags/ee.png (100%)
rename plugins/UserCountry/{ => images}/flags/eg.png (100%)
rename plugins/UserCountry/{ => images}/flags/eh.png (100%)
rename plugins/UserCountry/{ => images}/flags/er.png (100%)
rename plugins/UserCountry/{ => images}/flags/es.png (100%)
rename plugins/UserCountry/{ => images}/flags/et.png (100%)
rename plugins/UserCountry/{ => images}/flags/eu.png (100%)
rename plugins/UserCountry/{ => images}/flags/fi.png (100%)
rename plugins/UserCountry/{ => images}/flags/fj.png (100%)
rename plugins/UserCountry/{ => images}/flags/fk.png (100%)
rename plugins/UserCountry/{ => images}/flags/fm.png (100%)
rename plugins/UserCountry/{ => images}/flags/fo.png (100%)
rename plugins/UserCountry/{ => images}/flags/fr.png (100%)
rename plugins/UserCountry/{ => images}/flags/fx.png (100%)
rename plugins/UserCountry/{ => images}/flags/ga.png (100%)
rename plugins/UserCountry/{ => images}/flags/gb.png (100%)
rename plugins/UserCountry/{ => images}/flags/gd.png (100%)
rename plugins/UserCountry/{ => images}/flags/ge.png (100%)
rename plugins/UserCountry/{ => images}/flags/gf.png (100%)
rename plugins/UserCountry/{ => images}/flags/gg.png (100%)
rename plugins/UserCountry/{ => images}/flags/gh.png (100%)
rename plugins/UserCountry/{ => images}/flags/gi.png (100%)
rename plugins/UserCountry/{ => images}/flags/gl.png (100%)
rename plugins/UserCountry/{ => images}/flags/gm.png (100%)
rename plugins/UserCountry/{ => images}/flags/gn.png (100%)
rename plugins/UserCountry/{ => images}/flags/gp.png (100%)
rename plugins/UserCountry/{ => images}/flags/gq.png (100%)
rename plugins/UserCountry/{ => images}/flags/gr.png (100%)
rename plugins/UserCountry/{ => images}/flags/gs.png (100%)
rename plugins/UserCountry/{ => images}/flags/gt.png (100%)
rename plugins/UserCountry/{ => images}/flags/gu.png (100%)
rename plugins/UserCountry/{ => images}/flags/gw.png (100%)
rename plugins/UserCountry/{ => images}/flags/gy.png (100%)
rename plugins/UserCountry/{ => images}/flags/hk.png (100%)
rename plugins/UserCountry/{ => images}/flags/hm.png (100%)
rename plugins/UserCountry/{ => images}/flags/hn.png (100%)
rename plugins/UserCountry/{ => images}/flags/hr.png (100%)
rename plugins/UserCountry/{ => images}/flags/ht.png (100%)
rename plugins/UserCountry/{ => images}/flags/hu.png (100%)
rename plugins/UserCountry/{ => images}/flags/ic.png (100%)
rename plugins/UserCountry/{ => images}/flags/id.png (100%)
rename plugins/UserCountry/{ => images}/flags/ie.png (100%)
rename plugins/UserCountry/{ => images}/flags/il.png (100%)
rename plugins/UserCountry/{ => images}/flags/im.png (100%)
rename plugins/UserCountry/{ => images}/flags/in.png (100%)
rename plugins/UserCountry/{ => images}/flags/io.png (100%)
rename plugins/UserCountry/{ => images}/flags/iq.png (100%)
rename plugins/UserCountry/{ => images}/flags/ir.png (100%)
rename plugins/UserCountry/{ => images}/flags/is.png (100%)
rename plugins/UserCountry/{ => images}/flags/it.png (100%)
rename plugins/UserCountry/{ => images}/flags/je.png (100%)
rename plugins/UserCountry/{ => images}/flags/jm.png (100%)
rename plugins/UserCountry/{ => images}/flags/jo.png (100%)
rename plugins/UserCountry/{ => images}/flags/jp.png (100%)
rename plugins/UserCountry/{ => images}/flags/ke.png (100%)
rename plugins/UserCountry/{ => images}/flags/kg.png (100%)
rename plugins/UserCountry/{ => images}/flags/kh.png (100%)
rename plugins/UserCountry/{ => images}/flags/ki.png (100%)
rename plugins/UserCountry/{ => images}/flags/km.png (100%)
rename plugins/UserCountry/{ => images}/flags/kn.png (100%)
rename plugins/UserCountry/{ => images}/flags/kp.png (100%)
rename plugins/UserCountry/{ => images}/flags/kr.png (100%)
rename plugins/UserCountry/{ => images}/flags/kw.png (100%)
rename plugins/UserCountry/{ => images}/flags/ky.png (100%)
rename plugins/UserCountry/{ => images}/flags/kz.png (100%)
rename plugins/UserCountry/{ => images}/flags/la.png (100%)
rename plugins/UserCountry/{ => images}/flags/lb.png (100%)
rename plugins/UserCountry/{ => images}/flags/lc.png (100%)
rename plugins/UserCountry/{ => images}/flags/li.png (100%)
rename plugins/UserCountry/{ => images}/flags/lk.png (100%)
rename plugins/UserCountry/{ => images}/flags/lr.png (100%)
rename plugins/UserCountry/{ => images}/flags/ls.png (100%)
rename plugins/UserCountry/{ => images}/flags/lt.png (100%)
rename plugins/UserCountry/{ => images}/flags/lu.png (100%)
rename plugins/UserCountry/{ => images}/flags/lv.png (100%)
rename plugins/UserCountry/{ => images}/flags/ly.png (100%)
rename plugins/UserCountry/{ => images}/flags/ma.png (100%)
rename plugins/UserCountry/{ => images}/flags/mc.png (100%)
rename plugins/UserCountry/{ => images}/flags/md.png (100%)
rename plugins/UserCountry/{ => images}/flags/me.png (100%)
rename plugins/UserCountry/{ => images}/flags/mf.png (100%)
rename plugins/UserCountry/{ => images}/flags/mg.png (100%)
rename plugins/UserCountry/{ => images}/flags/mh.png (100%)
rename plugins/UserCountry/{ => images}/flags/mk.png (100%)
rename plugins/UserCountry/{ => images}/flags/ml.png (100%)
rename plugins/UserCountry/{ => images}/flags/mm.png (100%)
rename plugins/UserCountry/{ => images}/flags/mn.png (100%)
rename plugins/UserCountry/{ => images}/flags/mo.png (100%)
rename plugins/UserCountry/{ => images}/flags/mp.png (100%)
rename plugins/UserCountry/{ => images}/flags/mq.png (100%)
rename plugins/UserCountry/{ => images}/flags/mr.png (100%)
rename plugins/UserCountry/{ => images}/flags/ms.png (100%)
rename plugins/UserCountry/{ => images}/flags/mt.png (100%)
rename plugins/UserCountry/{ => images}/flags/mu.png (100%)
rename plugins/UserCountry/{ => images}/flags/mv.png (100%)
rename plugins/UserCountry/{ => images}/flags/mw.png (100%)
rename plugins/UserCountry/{ => images}/flags/mx.png (100%)
rename plugins/UserCountry/{ => images}/flags/my.png (100%)
rename plugins/UserCountry/{ => images}/flags/mz.png (100%)
rename plugins/UserCountry/{ => images}/flags/na.png (100%)
rename plugins/UserCountry/{ => images}/flags/nc.png (100%)
rename plugins/UserCountry/{ => images}/flags/ne.png (100%)
rename plugins/UserCountry/{ => images}/flags/nf.png (100%)
rename plugins/UserCountry/{ => images}/flags/ng.png (100%)
rename plugins/UserCountry/{ => images}/flags/ni.png (100%)
rename plugins/UserCountry/{ => images}/flags/nl.png (100%)
rename plugins/UserCountry/{ => images}/flags/no.png (100%)
rename plugins/UserCountry/{ => images}/flags/np.png (100%)
rename plugins/UserCountry/{ => images}/flags/nr.png (100%)
rename plugins/UserCountry/{ => images}/flags/nt.png (100%)
rename plugins/UserCountry/{ => images}/flags/nu.png (100%)
rename plugins/UserCountry/{ => images}/flags/nz.png (100%)
rename plugins/UserCountry/{ => images}/flags/o1.png (100%)
rename plugins/UserCountry/{ => images}/flags/om.png (100%)
rename plugins/UserCountry/{ => images}/flags/pa.png (100%)
rename plugins/UserCountry/{ => images}/flags/pe.png (100%)
rename plugins/UserCountry/{ => images}/flags/pf.png (100%)
rename plugins/UserCountry/{ => images}/flags/pg.png (100%)
rename plugins/UserCountry/{ => images}/flags/ph.png (100%)
rename plugins/UserCountry/{ => images}/flags/pk.png (100%)
rename plugins/UserCountry/{ => images}/flags/pl.png (100%)
rename plugins/UserCountry/{ => images}/flags/pm.png (100%)
rename plugins/UserCountry/{ => images}/flags/pn.png (100%)
rename plugins/UserCountry/{ => images}/flags/pr.png (100%)
rename plugins/UserCountry/{ => images}/flags/ps.png (100%)
rename plugins/UserCountry/{ => images}/flags/pt.png (100%)
rename plugins/UserCountry/{ => images}/flags/pw.png (100%)
rename plugins/UserCountry/{ => images}/flags/py.png (100%)
rename plugins/UserCountry/{ => images}/flags/qa.png (100%)
rename plugins/UserCountry/{ => images}/flags/re.png (100%)
rename plugins/UserCountry/{ => images}/flags/ro.png (100%)
rename plugins/UserCountry/{ => images}/flags/rs.png (100%)
rename plugins/UserCountry/{ => images}/flags/ru.png (100%)
rename plugins/UserCountry/{ => images}/flags/rw.png (100%)
rename plugins/UserCountry/{ => images}/flags/sa.png (100%)
rename plugins/UserCountry/{ => images}/flags/sb.png (100%)
rename plugins/UserCountry/{ => images}/flags/sc.png (100%)
rename plugins/UserCountry/{ => images}/flags/sd.png (100%)
rename plugins/UserCountry/{ => images}/flags/se.png (100%)
rename plugins/UserCountry/{ => images}/flags/sf.png (100%)
rename plugins/UserCountry/{ => images}/flags/sg.png (100%)
rename plugins/UserCountry/{ => images}/flags/sh.png (100%)
rename plugins/UserCountry/{ => images}/flags/si.png (100%)
rename plugins/UserCountry/{ => images}/flags/sj.png (100%)
rename plugins/UserCountry/{ => images}/flags/sk.png (100%)
rename plugins/UserCountry/{ => images}/flags/sl.png (100%)
rename plugins/UserCountry/{ => images}/flags/sm.png (100%)
rename plugins/UserCountry/{ => images}/flags/sn.png (100%)
rename plugins/UserCountry/{ => images}/flags/so.png (100%)
rename plugins/UserCountry/{ => images}/flags/sr.png (100%)
rename plugins/UserCountry/{ => images}/flags/ss.png (100%)
rename plugins/UserCountry/{ => images}/flags/st.png (100%)
rename plugins/UserCountry/{ => images}/flags/su.png (100%)
rename plugins/UserCountry/{ => images}/flags/sv.png (100%)
rename plugins/UserCountry/{ => images}/flags/sx.png (100%)
rename plugins/UserCountry/{ => images}/flags/sy.png (100%)
rename plugins/UserCountry/{ => images}/flags/sz.png (100%)
rename plugins/UserCountry/{ => images}/flags/ta.png (100%)
rename plugins/UserCountry/{ => images}/flags/tc.png (100%)
rename plugins/UserCountry/{ => images}/flags/td.png (100%)
rename plugins/UserCountry/{ => images}/flags/tf.png (100%)
rename plugins/UserCountry/{ => images}/flags/tg.png (100%)
rename plugins/UserCountry/{ => images}/flags/th.png (100%)
rename plugins/UserCountry/{ => images}/flags/ti.png (100%)
rename plugins/UserCountry/{ => images}/flags/tj.png (100%)
rename plugins/UserCountry/{ => images}/flags/tk.png (100%)
rename plugins/UserCountry/{ => images}/flags/tl.png (100%)
rename plugins/UserCountry/{ => images}/flags/tm.png (100%)
rename plugins/UserCountry/{ => images}/flags/tn.png (100%)
rename plugins/UserCountry/{ => images}/flags/to.png (100%)
rename plugins/UserCountry/{ => images}/flags/tp.png (100%)
rename plugins/UserCountry/{ => images}/flags/tr.png (100%)
rename plugins/UserCountry/{ => images}/flags/tt.png (100%)
rename plugins/UserCountry/{ => images}/flags/tv.png (100%)
rename plugins/UserCountry/{ => images}/flags/tw.png (100%)
rename plugins/UserCountry/{ => images}/flags/tz.png (100%)
rename plugins/UserCountry/{ => images}/flags/ua.png (100%)
rename plugins/UserCountry/{ => images}/flags/ug.png (100%)
rename plugins/UserCountry/{ => images}/flags/uk.png (100%)
rename plugins/UserCountry/{ => images}/flags/um.png (100%)
rename plugins/UserCountry/{ => images}/flags/us.png (100%)
rename plugins/UserCountry/{ => images}/flags/uy.png (100%)
rename plugins/UserCountry/{ => images}/flags/uz.png (100%)
rename plugins/UserCountry/{ => images}/flags/va.png (100%)
rename plugins/UserCountry/{ => images}/flags/vc.png (100%)
rename plugins/UserCountry/{ => images}/flags/ve.png (100%)
rename plugins/UserCountry/{ => images}/flags/vg.png (100%)
rename plugins/UserCountry/{ => images}/flags/vi.png (100%)
rename plugins/UserCountry/{ => images}/flags/vn.png (100%)
rename plugins/UserCountry/{ => images}/flags/vu.png (100%)
rename plugins/UserCountry/{ => images}/flags/wf.png (100%)
rename plugins/UserCountry/{ => images}/flags/ws.png (100%)
rename plugins/UserCountry/{ => images}/flags/xx.png (100%)
rename plugins/UserCountry/{ => images}/flags/ye.png (100%)
rename plugins/UserCountry/{ => images}/flags/yt.png (100%)
rename plugins/UserCountry/{ => images}/flags/yu.png (100%)
rename plugins/UserCountry/{ => images}/flags/za.png (100%)
rename plugins/UserCountry/{ => images}/flags/zm.png (100%)
rename plugins/UserCountry/{ => images}/flags/zr.png (100%)
rename plugins/UserCountry/{ => images}/flags/zw.png (100%)
rename plugins/UserCountryMap/{img => images}/cities.png (100%)
rename plugins/UserCountryMap/{img => images}/realtimemap-loading.gif (100%)
rename plugins/UserCountryMap/{img => images}/regions.png (100%)
rename plugins/UserCountryMap/{img => images}/zoom-out-disabled.png (100%)
rename plugins/UserCountryMap/{img => images}/zoom-out.png (100%)
delete mode 100644 plugins/UserCountryMap/img/info.png
delete mode 100644 plugins/UserCountryMap/img/world.png
rename plugins/Zeitgeist/{theme => }/images/affix-arrow.png (100%)
rename plugins/Zeitgeist/{theme => }/images/arr_r.png (100%)
rename plugins/Zeitgeist/{theme => }/images/background-submit.png (100%)
rename plugins/Zeitgeist/{theme => }/images/chart_bar.png (100%)
rename plugins/Zeitgeist/{theme => }/images/chart_line_edit.png (100%)
rename plugins/Zeitgeist/{theme => }/images/chart_line_edit_bg.png (100%)
rename plugins/Zeitgeist/{theme => }/images/chart_pie.png (100%)
rename plugins/Zeitgeist/{theme => }/images/close.png (100%)
rename plugins/Zeitgeist/{theme => }/images/collapsed_arrows.gif (100%)
rename plugins/Zeitgeist/{theme => }/images/configure-highlight.png (100%)
rename plugins/Zeitgeist/{theme => }/images/configure.png (100%)
rename plugins/Zeitgeist/{theme => }/images/dashboard_h_bg.png (100%)
rename plugins/Zeitgeist/{theme => }/images/dashboard_h_bg_hover.png (100%)
rename plugins/Zeitgeist/{theme => }/images/data_table_footer_active_item.png (100%)
rename plugins/Zeitgeist/{theme => }/images/datepicker_arr_l.png (100%)
rename plugins/Zeitgeist/{theme => }/images/datepicker_arr_r.png (100%)
rename plugins/Zeitgeist/{theme => }/images/delete.png (100%)
rename plugins/Zeitgeist/{theme => }/images/download.png (100%)
rename plugins/Zeitgeist/{theme => }/images/ecommerceAbandonedCart.gif (100%)
rename plugins/Zeitgeist/{theme => }/images/ecommerceOrder.gif (100%)
rename plugins/Zeitgeist/{theme => }/images/email.png (100%)
rename plugins/Zeitgeist/{theme => }/images/error.png (100%)
rename plugins/Zeitgeist/{theme => }/images/error_medium.png (100%)
rename plugins/Zeitgeist/{theme => }/images/expanded_arrows.gif (100%)
rename plugins/Zeitgeist/{theme => }/images/export.png (100%)
rename plugins/Zeitgeist/{theme => }/images/feed.png (100%)
rename plugins/Zeitgeist/{theme => }/images/fullscreen.png (100%)
rename plugins/Zeitgeist/{theme => }/images/goal.png (100%)
rename plugins/Zeitgeist/{theme => }/images/grey_marker.png (100%)
rename plugins/Zeitgeist/{theme => }/images/help.png (100%)
rename plugins/Zeitgeist/{theme => }/images/help_grey.png (100%)
rename plugins/Zeitgeist/{theme => }/images/html_icon.png (100%)
rename plugins/Zeitgeist/{theme => }/images/ico_alert.png (100%)
rename plugins/Zeitgeist/{theme => }/images/ico_delete.png (100%)
rename plugins/Zeitgeist/{theme => }/images/ico_edit.png (100%)
rename plugins/Zeitgeist/{theme => }/images/ico_info.png (100%)
rename plugins/Zeitgeist/{theme => }/images/icon-calendar.gif (100%)
rename plugins/Zeitgeist/{theme => }/images/image.png (100%)
rename plugins/Zeitgeist/{theme => }/images/inp_bg.png (100%)
rename plugins/Zeitgeist/{theme => }/images/li_dbl_gray.gif (100%)
rename plugins/Zeitgeist/{theme => }/images/link.gif (100%)
rename plugins/Zeitgeist/{theme => }/images/loading-blue.gif (100%)
rename plugins/Zeitgeist/{theme => }/images/login-sprite.png (100%)
rename plugins/Zeitgeist/{theme => }/images/logo-header.png (100%)
rename plugins/Zeitgeist/{theme => }/images/logo.png (100%)
rename plugins/Zeitgeist/{theme => }/images/logo.svg (100%)
rename plugins/Zeitgeist/{theme => }/images/maximise.png (100%)
rename plugins/Zeitgeist/{theme => }/images/minimise.png (100%)
rename plugins/Zeitgeist/{theme => }/images/minus.png (100%)
rename plugins/Zeitgeist/{theme => }/images/newtab.png (100%)
rename plugins/Zeitgeist/{theme => }/images/ok.png (100%)
rename plugins/Zeitgeist/{theme => }/images/page_border_grad.png (100%)
rename plugins/Zeitgeist/{theme => }/images/paypal_subscribe.gif (100%)
rename plugins/Zeitgeist/{theme => }/images/plus.png (100%)
rename plugins/Zeitgeist/{theme => }/images/plus_blue.png (100%)
rename plugins/Zeitgeist/{theme => }/images/refresh.png (100%)
rename plugins/Zeitgeist/{theme => }/images/reload.png (100%)
rename plugins/Zeitgeist/{theme => }/images/row_evolution.png (100%)
rename plugins/Zeitgeist/{theme => }/images/row_evolution_hover.png (100%)
rename plugins/Zeitgeist/{theme => }/images/search_bg.png (100%)
rename plugins/Zeitgeist/{theme => }/images/search_ico.png (100%)
rename plugins/Zeitgeist/{theme => }/images/sites_selection.png (100%)
rename plugins/Zeitgeist/{theme => }/images/smileyprog_0.png (100%)
rename plugins/Zeitgeist/{theme => }/images/smileyprog_1.png (100%)
rename plugins/Zeitgeist/{theme => }/images/smileyprog_2.png (100%)
rename plugins/Zeitgeist/{theme => }/images/smileyprog_3.png (100%)
rename plugins/Zeitgeist/{theme => }/images/smileyprog_4.png (100%)
rename plugins/Zeitgeist/{theme => }/images/sort_subtable_asc.png (100%)
rename plugins/Zeitgeist/{theme => }/images/sort_subtable_asc_light.png (100%)
rename plugins/Zeitgeist/{theme => }/images/sort_subtable_desc.png (100%)
rename plugins/Zeitgeist/{theme => }/images/sort_subtable_desc_light.png (100%)
rename plugins/Zeitgeist/{theme => }/images/sortasc.png (100%)
rename plugins/Zeitgeist/{theme => }/images/sortdesc.png (100%)
rename plugins/Zeitgeist/{theme => }/images/star.png (100%)
rename plugins/Zeitgeist/{theme => }/images/star_empty.png (100%)
rename plugins/Zeitgeist/{theme => }/images/success_medium.png (100%)
rename plugins/Zeitgeist/{theme => }/images/table.png (100%)
rename plugins/Zeitgeist/{theme => }/images/table_more.png (100%)
rename plugins/Zeitgeist/{theme => }/images/tagcloud.png (100%)
rename plugins/Zeitgeist/{theme => }/images/video_play.png (100%)
rename plugins/Zeitgeist/{theme => }/images/warning.png (100%)
rename plugins/Zeitgeist/{theme => }/images/warning_medium.png (100%)
rename plugins/Zeitgeist/{theme => }/images/warning_small.png (100%)
rename plugins/Zeitgeist/{theme => }/images/yellow_marker.png (100%)
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
similarity index 100%
rename from plugins/CoreHome/templates/images/bg_header.jpg
rename to plugins/CoreHome/images/bg_header.jpg
diff --git a/plugins/CoreHome/templates/images/bullet1.gif b/plugins/CoreHome/images/bullet1.gif
similarity index 100%
rename from plugins/CoreHome/templates/images/bullet1.gif
rename to plugins/CoreHome/images/bullet1.gif
diff --git a/plugins/CoreHome/templates/images/bullet2.gif b/plugins/CoreHome/images/bullet2.gif
similarity index 100%
rename from plugins/CoreHome/templates/images/bullet2.gif
rename to plugins/CoreHome/images/bullet2.gif
diff --git a/plugins/CoreHome/templates/images/more.png b/plugins/CoreHome/images/more.png
similarity index 100%
rename from plugins/CoreHome/templates/images/more.png
rename to plugins/CoreHome/images/more.png
diff --git a/plugins/CoreHome/templates/images/more_date.gif b/plugins/CoreHome/images/more_date.gif
similarity index 100%
rename from plugins/CoreHome/templates/images/more_date.gif
rename to plugins/CoreHome/images/more_date.gif
diff --git a/plugins/CoreHome/templates/images/more_period.gif b/plugins/CoreHome/images/more_period.gif
similarity index 100%
rename from plugins/CoreHome/templates/images/more_period.gif
rename to plugins/CoreHome/images/more_period.gif
diff --git a/plugins/CoreHome/templates/images/promo_splash.png b/plugins/CoreHome/images/promo_splash.png
similarity index 100%
rename from plugins/CoreHome/templates/images/promo_splash.png
rename to plugins/CoreHome/images/promo_splash.png
diff --git a/plugins/CoreHome/templates/images/reset_search.png b/plugins/CoreHome/images/reset_search.png
similarity index 100%
rename from plugins/CoreHome/templates/images/reset_search.png
rename to plugins/CoreHome/images/reset_search.png
diff --git a/plugins/CoreHome/templates/images/search.png b/plugins/CoreHome/images/search.png
similarity index 100%
rename from plugins/CoreHome/templates/images/search.png
rename to 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
deleted file mode 100644
index ebb2412eab0f63c591979ca9013d0723fc958dba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3294
zcmV<43?cK0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm0002^
z0002^0nfqaWdHyQIcY;fP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-ozocT`l@7KhKh
zcY2}CFalDB-n+m6(tDF$MPZm3U?>9)Gc>Uwq5=^`M4BQ<P{e@IP$X7Fu@Dqgum>av
zC@~mCR4i{s){CyJy!Z0*`{S%{?X&l}`|Q2XS{DG4r!SY621@~u$`kN|Je=tfkx_K)
z0Du7=V1OwAOjbs^U$A=!5XsBUg`OdD0$&6H@OoIh0&vsNGk{J9|DU8;>3o6cm;e!*
zvpE?o5f_L!B}<Slw$F-~8ka0)7$s)DC_xd+i8*1B4L<uUvZI*UsXVrb#W|<5Q`utf
z74f!AAxFfBuZRmXxtuH!-x9G#iZGQc;y2>hR1Px(02E1V7jRgKA~q2*i60W=BI4x$
z;7AEyaokrd;A9KLmvTu<&*5_u5(RV}mM-1Y+L}T4<Yc9A1OmeVCM%iAXVYEMQq!5d
z8~_&Y{8=*M+R{ZuwluZ2v@|p`GX1Jh|8?_kO5EE;dKvh+XArIbi|w!c(i#9@%!z8V
z^NTI63V_Zn0Lb0@V$(PPfTXBz9oN6Q4^2ETi2^~ojj?f7R+bT$!!i;V^bh?{hrgk(
zzGoyp?vL`&T{-bgVTyn*t{W>YB~8euXQVS(9J=A3hxi`{{&gM(L7aFFpTiSHgo&n%
z%S#Zoo5$t~xM@5(m-nBV_z%PWq{X=wiPHEHP-BdM)O9LAe(eV+3K1aD`^8=Vqi??W
zFd%+;;VP4hbN}x*{b#|Y;w6Kd@Hx&UD1^=u@-r9r#Lp6-0Rcz?Dv$@tKpp4+LtqB1
zfGuzYZonJ(gAfo2Rs$AD1gU@zvOpf#1PVbh*a`N4YETCnK{IFt$3Z7J1<r#@;2O9A
zZiD+^6ik3;U>3Xv3lIchAu>dP<RKME6VivwAO>U)xk0{A5EKc;LJ1HL5<+><W~dk{
zgQ}r=s2TbmItiVJu0Vs(U1$uNhJJ_M!3a!(sjw2P1slT**a`N5L*P|#0=x#!g$v*v
za3$OTAB8*M^YAtJHarSHgXa){5D^-piWnjc#0Bw3qL6rmkE}<EkP4&$X+^q`KIA4c
zip(HyQ5X~jMMoK;Y*C)5P!tQb2DKhlf~rOxMs=WiQ8!Uzs9DrUG#Rak)<@f*z0eWp
z1aua<5M6<8LbszYqHm)o(62EV3=N}=vBG#_A~8vrwU`pjK1>_t9A*$Rj+w(^vGQ1b
ztR2=L%ft$>h1e?WQS4dl5OxCl21mrH;LLFDxF{SCmyfH!9l@Q!4dEtn3wSBKCf)|`
zk7wg^@TK@hd^i3&egeNhkS1so><A%*B*G>_C83pYk??@<l1L<~5v_@VL@se7v66U<
zc$qjxd`prc>5*JW(Ig>h2k8*$9O*9UC7DdtB0G|!$O7^Xax?h?`4Rbz1VzF~!b^fJ
zu|c9nqC;Xx;<+SVQd81Na<ycxWQF7j$?K9cQg|sXDHkcG)Ox8JsgqJ8QghN2X;W!`
z=~U?w=_Artq^D%CGFmcjGHjUwnS(MHWX357MV;b8VNo_y8Yvek6I2XUo9abPq83xX
zqYhAKWo2ZS$%e^h%ht%AmK~)bG%cDJErnJ}J5C#>y<4KR#Ayj<$@V3!ONN%r%Pp02
zl;g-1$+gMdmU|~pmv@s-mft1cDgRIbrJ$z}sF0<wU*V#{%u?!7+oi0fMN5w_y{8B(
z>L~^(u2np!*snOJq^#tjl&(~zbU|rGnWpThoTOZ?d`5X%g`#4w!c{3(Iji!NE=zZ!
zr_d|uz4TdCMO9B#p=!PAfa-#pwpyrKzFM2wLv?~WLp@%-T)jtqRzpR@Pa{vGMdO|(
zUX!7jsJU0OPjg;NTPs{^t5&Dhl(w9<mv*jpi}nK@vW|n!8l486Te=ushHkR%KHVF7
zu%3lpqF#;Ob$wXhQlG28Pk+z=ZD4J{GiWdvF(er}8D<)`7>*gyjC_sqjXI5<8*3Ox
z8SgUgGyZ5|VUl9fXma0F#?;$1-?ZEGcQZXRmRXJ2EpxKDyZHw5F7p@5^p|m#?O%4s
zf@0xkvDKo-;)A7?CEv2ua@tD6D%PsjYJ@>$1Tab%m#xv(&ej{OPg%dUv9uA`9Jl$+
z*3dTD_K5A&a_!}u<&De7?bPg;cJ+3n_H_GL`vdl)4yq1JhX#koj_QtV$0o-~Ctar`
zr=w2KolTti&h5_gE;cUfT+X>7t{$#Mt^;l|ZlP|~Zjap6+!Nee+-E&3Jl1-g^F(|4
zc<%BX@lx_)c{O{@dRuv~^X~N_`2_n^`#kp5^X2<?`@w$Re!Kl1tk7J+ThZwc{Js2l
z`#%iO4p<ZLV<09lAh0IzNswt!UQk~!B{(MdNbu_r=aABn`=L6a!qA>D$*}0K=CJv2
z*YL9N(Fo&+brIJh6(YHjT~XMmu&Ab}xs`4!_pF?Vwuml_9$uxrDtpzH)e5UqR-cZM
zjA6!{h(*VS#~z7&&-7<DFz4dD;%eh&SuU)-tY>UTb~$^RW5+4uOvc;Am&H#d*d^>v
zm`-#^tVo>Ux^SzxFOocy>XPP@{gV$Re@Y2YX-mbW#-^U+$?%eSy=ls6*=d96`ssz~
zqibx|>{&C*_u)5XKpCqtx&&0w&s4uqN4P~emT8|^lldkqEbBzJbT%)$KSwWTd(LF8
zd+xVuQEORid-7ECHsy`2b6Quw9$Fu_zGs8_hJp<f8$C82-bC1xyy>TWll-#$SDV8(
zcNZuXY%Cbx;<2TrP@<4uII`7tYuz@~Htx28?dIF7wtp;Q7hNqjDXu7fU&1Q6`i<!~
zmEU~Y5x--g)UtH{PRvf;&f#4SyAGF0m*tj?@Ali>QBE%}Du1;nX3v$1WfgUM344Wm
zM=O0RyQ(y*c2>QwPOQFN<6P5Lt600ec77jw-_U-?{jGIMb;Wh>4sZ|LsrRVwXwYh?
zIEXozdGJYNSYzL}jBlHp6q<^gJ{;m58a*6zxVPD=x%r6Vk<u2pMc6WZH2Ua`?_9s@
zYBg-FZ=<yp9|OmP$DV#4`~C27pW{6z7$;hP(EOpcozh;^0d?eb%yuSrj&?<M4W9Hq
z+0$*?-TtG|kB3gFo~k)5d%E-t;Y`7qPiJ$_&Yep?H*-GW{CH1H&;1J#7jE?i_6}V1
zxp?`K`=twgPJL%D+g(0&#pcS%tBk9i*DSAf^jq|||77t~`+(&@$91dgT{o<6bPp~c
zJTv4lbpEF6%}ckuZe6>*;`ZQh=<uD9=#kMo>^oC;Q|`XFmw9jD{>BIB2SpF19#%Y3
zeAMu>?$2$bmZPV~T*vw!2S2_)&KiIAOU5tnCkmdBpHxh$Og2xMO`V!{pT6;Q<<p60
z>CYBs3V)UUwf4Er^B;b5{H=dBVs_#M|HY@@OJ2&qJoIYWtDd=lxks;4UoXrTy^()&
z_$}jY-@EX4lM7kzvF|HC=zi$_==1Txr_@iM{sjY=^Zb#(TH62s00d`2O+f$vv5tKE
zQIh}w03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C0uM<<
zK~#9!V*LOAKLaHIAb?mv#Q)QrI8FJ>E;x~qiF*+vpUXuix#@q=<pBbS1)1}o&+IV+
zv%m$$zh8d*W%%=(>G!J$=I;;k|1*DdXZZiG7N}$m!~N}S|4uY4X88U6JyYDJ41fSa
zF@TX%ujBvkr!yFs*#0xHNHH+{e)Z-*r(y!*_xl?EzwBxL_h{N)hMT+N{=YdD2Gx=Q
z5I`sfFub15%4GcKAClAZ|6S4i2Q<W=@!NfkKOfrl8NMqpF>@(C1<D-(DF6r{R0ID0
zWkPlk$X5_1(>D;w%*-Y9&!BO_|5tlo{8LZb4N?pcK&WBBA@`LLi3`;n$N2rO5G0Iz
zt}|boumA7U@hIj`kA5<^E?x%^K&UR@P;&nNAd!LL?ef12%xpjZvq;Zp{QiLD|NkEh
z{}qcmnMHfAGi+ciVBlr&`Typw56}QcfB-@b#E&O{fdj%ocl`U!!1((C!+%bNi~sl>
zXE2MTEQGj{;UBUdfB-^u0gplZf6=6w|9{;1$;2$m@Sn@zKf~)8?^)!g{er7uMl}E+
zfKUzi|Me-8Na{o6P-NhDK}|Uv%nS^_5a|gZfS6Duzg%V^H7NrG5Q+i+*<}c7`2Qcp
z2MhoKgld3r7%Q>)2L=EF2*Tktjs5?h&6bJFX(u7wjF$a77+xMx`Y-LZ8N>$&AVx~F
cGeCd=0Q;4<r8Umg0{{R307*qoM6N<$f@3*BHUIzs
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
similarity index 100%
rename from plugins/Live/templates/images/file0.png
rename to plugins/Live/images/file0.png
diff --git a/plugins/Live/templates/images/file1.png b/plugins/Live/images/file1.png
similarity index 100%
rename from plugins/Live/templates/images/file1.png
rename to plugins/Live/images/file1.png
diff --git a/plugins/Live/templates/images/file2.png b/plugins/Live/images/file2.png
similarity index 100%
rename from plugins/Live/templates/images/file2.png
rename to plugins/Live/images/file2.png
diff --git a/plugins/Live/templates/images/file3.png b/plugins/Live/images/file3.png
similarity index 100%
rename from plugins/Live/templates/images/file3.png
rename to plugins/Live/images/file3.png
diff --git a/plugins/Live/templates/images/file4.png b/plugins/Live/images/file4.png
similarity index 100%
rename from plugins/Live/templates/images/file4.png
rename to plugins/Live/images/file4.png
diff --git a/plugins/Live/templates/images/file5.png b/plugins/Live/images/file5.png
similarity index 100%
rename from plugins/Live/templates/images/file5.png
rename to plugins/Live/images/file5.png
diff --git a/plugins/Live/templates/images/file6.png b/plugins/Live/images/file6.png
similarity index 100%
rename from plugins/Live/templates/images/file6.png
rename to plugins/Live/images/file6.png
diff --git a/plugins/Live/templates/images/file7.png b/plugins/Live/images/file7.png
similarity index 100%
rename from plugins/Live/templates/images/file7.png
rename to plugins/Live/images/file7.png
diff --git a/plugins/Live/templates/images/file8.png b/plugins/Live/images/file8.png
similarity index 100%
rename from plugins/Live/templates/images/file8.png
rename to plugins/Live/images/file8.png
diff --git a/plugins/Live/templates/images/file9.png b/plugins/Live/images/file9.png
similarity index 100%
rename from plugins/Live/templates/images/file9.png
rename to plugins/Live/images/file9.png
diff --git a/plugins/Live/templates/images/pause.gif b/plugins/Live/images/pause.gif
similarity index 100%
rename from plugins/Live/templates/images/pause.gif
rename to plugins/Live/images/pause.gif
diff --git a/plugins/Live/templates/images/pause_disabled.gif b/plugins/Live/images/pause_disabled.gif
similarity index 100%
rename from plugins/Live/templates/images/pause_disabled.gif
rename to plugins/Live/images/pause_disabled.gif
diff --git a/plugins/Live/templates/images/play.gif b/plugins/Live/images/play.gif
similarity index 100%
rename from plugins/Live/templates/images/play.gif
rename to plugins/Live/images/play.gif
diff --git a/plugins/Live/templates/images/play_disabled.gif b/plugins/Live/images/play_disabled.gif
similarity index 100%
rename from plugins/Live/templates/images/play_disabled.gif
rename to plugins/Live/images/play_disabled.gif
diff --git a/plugins/Live/templates/images/returningVisitor.gif b/plugins/Live/images/returningVisitor.gif
similarity index 100%
rename from plugins/Live/templates/images/returningVisitor.gif
rename to 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
similarity index 100%
rename from plugins/Overlay/templates/info.png
rename to plugins/Overlay/images/info.png
diff --git a/plugins/Overlay/templates/overlay_icon.png b/plugins/Overlay/images/overlay_icon.png
similarity index 100%
rename from plugins/Overlay/templates/overlay_icon.png
rename to plugins/Overlay/images/overlay_icon.png
diff --git a/plugins/Overlay/templates/overlay_icon_hover.png b/plugins/Overlay/images/overlay_icon_hover.png
similarity index 100%
rename from plugins/Overlay/templates/overlay_icon_hover.png
rename to 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
similarity index 100%
rename from plugins/Transitions/templates/transitions_icon.png
rename to plugins/Transitions/images/transitions_icon.png
diff --git a/plugins/Transitions/templates/transitions_icon_hover.png b/plugins/Transitions/images/transitions_icon_hover.png
similarity index 100%
rename from plugins/Transitions/templates/transitions_icon_hover.png
rename to 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
similarity index 100%
rename from plugins/UserCountry/flags/a1.png
rename to plugins/UserCountry/images/flags/a1.png
diff --git a/plugins/UserCountry/flags/a2.png b/plugins/UserCountry/images/flags/a2.png
similarity index 100%
rename from plugins/UserCountry/flags/a2.png
rename to plugins/UserCountry/images/flags/a2.png
diff --git a/plugins/UserCountry/flags/ac.png b/plugins/UserCountry/images/flags/ac.png
similarity index 100%
rename from plugins/UserCountry/flags/ac.png
rename to plugins/UserCountry/images/flags/ac.png
diff --git a/plugins/UserCountry/flags/ad.png b/plugins/UserCountry/images/flags/ad.png
similarity index 100%
rename from plugins/UserCountry/flags/ad.png
rename to plugins/UserCountry/images/flags/ad.png
diff --git a/plugins/UserCountry/flags/ae.png b/plugins/UserCountry/images/flags/ae.png
similarity index 100%
rename from plugins/UserCountry/flags/ae.png
rename to plugins/UserCountry/images/flags/ae.png
diff --git a/plugins/UserCountry/flags/af.png b/plugins/UserCountry/images/flags/af.png
similarity index 100%
rename from plugins/UserCountry/flags/af.png
rename to plugins/UserCountry/images/flags/af.png
diff --git a/plugins/UserCountry/flags/ag.png b/plugins/UserCountry/images/flags/ag.png
similarity index 100%
rename from plugins/UserCountry/flags/ag.png
rename to plugins/UserCountry/images/flags/ag.png
diff --git a/plugins/UserCountry/flags/ai.png b/plugins/UserCountry/images/flags/ai.png
similarity index 100%
rename from plugins/UserCountry/flags/ai.png
rename to plugins/UserCountry/images/flags/ai.png
diff --git a/plugins/UserCountry/flags/al.png b/plugins/UserCountry/images/flags/al.png
similarity index 100%
rename from plugins/UserCountry/flags/al.png
rename to plugins/UserCountry/images/flags/al.png
diff --git a/plugins/UserCountry/flags/am.png b/plugins/UserCountry/images/flags/am.png
similarity index 100%
rename from plugins/UserCountry/flags/am.png
rename to plugins/UserCountry/images/flags/am.png
diff --git a/plugins/UserCountry/flags/an.png b/plugins/UserCountry/images/flags/an.png
similarity index 100%
rename from plugins/UserCountry/flags/an.png
rename to plugins/UserCountry/images/flags/an.png
diff --git a/plugins/UserCountry/flags/ao.png b/plugins/UserCountry/images/flags/ao.png
similarity index 100%
rename from plugins/UserCountry/flags/ao.png
rename to plugins/UserCountry/images/flags/ao.png
diff --git a/plugins/UserCountry/flags/ap.png b/plugins/UserCountry/images/flags/ap.png
similarity index 100%
rename from plugins/UserCountry/flags/ap.png
rename to plugins/UserCountry/images/flags/ap.png
diff --git a/plugins/UserCountry/flags/aq.png b/plugins/UserCountry/images/flags/aq.png
similarity index 100%
rename from plugins/UserCountry/flags/aq.png
rename to plugins/UserCountry/images/flags/aq.png
diff --git a/plugins/UserCountry/flags/ar.png b/plugins/UserCountry/images/flags/ar.png
similarity index 100%
rename from plugins/UserCountry/flags/ar.png
rename to plugins/UserCountry/images/flags/ar.png
diff --git a/plugins/UserCountry/flags/as.png b/plugins/UserCountry/images/flags/as.png
similarity index 100%
rename from plugins/UserCountry/flags/as.png
rename to plugins/UserCountry/images/flags/as.png
diff --git a/plugins/UserCountry/flags/at.png b/plugins/UserCountry/images/flags/at.png
similarity index 100%
rename from plugins/UserCountry/flags/at.png
rename to plugins/UserCountry/images/flags/at.png
diff --git a/plugins/UserCountry/flags/au.png b/plugins/UserCountry/images/flags/au.png
similarity index 100%
rename from plugins/UserCountry/flags/au.png
rename to plugins/UserCountry/images/flags/au.png
diff --git a/plugins/UserCountry/flags/aw.png b/plugins/UserCountry/images/flags/aw.png
similarity index 100%
rename from plugins/UserCountry/flags/aw.png
rename to plugins/UserCountry/images/flags/aw.png
diff --git a/plugins/UserCountry/flags/ax.png b/plugins/UserCountry/images/flags/ax.png
similarity index 100%
rename from plugins/UserCountry/flags/ax.png
rename to plugins/UserCountry/images/flags/ax.png
diff --git a/plugins/UserCountry/flags/az.png b/plugins/UserCountry/images/flags/az.png
similarity index 100%
rename from plugins/UserCountry/flags/az.png
rename to plugins/UserCountry/images/flags/az.png
diff --git a/plugins/UserCountry/flags/ba.png b/plugins/UserCountry/images/flags/ba.png
similarity index 100%
rename from plugins/UserCountry/flags/ba.png
rename to plugins/UserCountry/images/flags/ba.png
diff --git a/plugins/UserCountry/flags/bb.png b/plugins/UserCountry/images/flags/bb.png
similarity index 100%
rename from plugins/UserCountry/flags/bb.png
rename to plugins/UserCountry/images/flags/bb.png
diff --git a/plugins/UserCountry/flags/bd.png b/plugins/UserCountry/images/flags/bd.png
similarity index 100%
rename from plugins/UserCountry/flags/bd.png
rename to plugins/UserCountry/images/flags/bd.png
diff --git a/plugins/UserCountry/flags/be.png b/plugins/UserCountry/images/flags/be.png
similarity index 100%
rename from plugins/UserCountry/flags/be.png
rename to plugins/UserCountry/images/flags/be.png
diff --git a/plugins/UserCountry/flags/bf.png b/plugins/UserCountry/images/flags/bf.png
similarity index 100%
rename from plugins/UserCountry/flags/bf.png
rename to plugins/UserCountry/images/flags/bf.png
diff --git a/plugins/UserCountry/flags/bg.png b/plugins/UserCountry/images/flags/bg.png
similarity index 100%
rename from plugins/UserCountry/flags/bg.png
rename to plugins/UserCountry/images/flags/bg.png
diff --git a/plugins/UserCountry/flags/bh.png b/plugins/UserCountry/images/flags/bh.png
similarity index 100%
rename from plugins/UserCountry/flags/bh.png
rename to plugins/UserCountry/images/flags/bh.png
diff --git a/plugins/UserCountry/flags/bi.png b/plugins/UserCountry/images/flags/bi.png
similarity index 100%
rename from plugins/UserCountry/flags/bi.png
rename to plugins/UserCountry/images/flags/bi.png
diff --git a/plugins/UserCountry/flags/bj.png b/plugins/UserCountry/images/flags/bj.png
similarity index 100%
rename from plugins/UserCountry/flags/bj.png
rename to plugins/UserCountry/images/flags/bj.png
diff --git a/plugins/UserCountry/flags/bl.png b/plugins/UserCountry/images/flags/bl.png
similarity index 100%
rename from plugins/UserCountry/flags/bl.png
rename to plugins/UserCountry/images/flags/bl.png
diff --git a/plugins/UserCountry/flags/bm.png b/plugins/UserCountry/images/flags/bm.png
similarity index 100%
rename from plugins/UserCountry/flags/bm.png
rename to plugins/UserCountry/images/flags/bm.png
diff --git a/plugins/UserCountry/flags/bn.png b/plugins/UserCountry/images/flags/bn.png
similarity index 100%
rename from plugins/UserCountry/flags/bn.png
rename to plugins/UserCountry/images/flags/bn.png
diff --git a/plugins/UserCountry/flags/bo.png b/plugins/UserCountry/images/flags/bo.png
similarity index 100%
rename from plugins/UserCountry/flags/bo.png
rename to plugins/UserCountry/images/flags/bo.png
diff --git a/plugins/UserCountry/flags/bq.png b/plugins/UserCountry/images/flags/bq.png
similarity index 100%
rename from plugins/UserCountry/flags/bq.png
rename to plugins/UserCountry/images/flags/bq.png
diff --git a/plugins/UserCountry/flags/br.png b/plugins/UserCountry/images/flags/br.png
similarity index 100%
rename from plugins/UserCountry/flags/br.png
rename to plugins/UserCountry/images/flags/br.png
diff --git a/plugins/UserCountry/flags/bs.png b/plugins/UserCountry/images/flags/bs.png
similarity index 100%
rename from plugins/UserCountry/flags/bs.png
rename to plugins/UserCountry/images/flags/bs.png
diff --git a/plugins/UserCountry/flags/bt.png b/plugins/UserCountry/images/flags/bt.png
similarity index 100%
rename from plugins/UserCountry/flags/bt.png
rename to plugins/UserCountry/images/flags/bt.png
diff --git a/plugins/UserCountry/flags/bu.png b/plugins/UserCountry/images/flags/bu.png
similarity index 100%
rename from plugins/UserCountry/flags/bu.png
rename to plugins/UserCountry/images/flags/bu.png
diff --git a/plugins/UserCountry/flags/bv.png b/plugins/UserCountry/images/flags/bv.png
similarity index 100%
rename from plugins/UserCountry/flags/bv.png
rename to plugins/UserCountry/images/flags/bv.png
diff --git a/plugins/UserCountry/flags/bw.png b/plugins/UserCountry/images/flags/bw.png
similarity index 100%
rename from plugins/UserCountry/flags/bw.png
rename to plugins/UserCountry/images/flags/bw.png
diff --git a/plugins/UserCountry/flags/by.png b/plugins/UserCountry/images/flags/by.png
similarity index 100%
rename from plugins/UserCountry/flags/by.png
rename to plugins/UserCountry/images/flags/by.png
diff --git a/plugins/UserCountry/flags/bz.png b/plugins/UserCountry/images/flags/bz.png
similarity index 100%
rename from plugins/UserCountry/flags/bz.png
rename to plugins/UserCountry/images/flags/bz.png
diff --git a/plugins/UserCountry/flags/ca.png b/plugins/UserCountry/images/flags/ca.png
similarity index 100%
rename from plugins/UserCountry/flags/ca.png
rename to plugins/UserCountry/images/flags/ca.png
diff --git a/plugins/UserCountry/flags/cat.png b/plugins/UserCountry/images/flags/cat.png
similarity index 100%
rename from plugins/UserCountry/flags/cat.png
rename to plugins/UserCountry/images/flags/cat.png
diff --git a/plugins/UserCountry/flags/cc.png b/plugins/UserCountry/images/flags/cc.png
similarity index 100%
rename from plugins/UserCountry/flags/cc.png
rename to plugins/UserCountry/images/flags/cc.png
diff --git a/plugins/UserCountry/flags/cd.png b/plugins/UserCountry/images/flags/cd.png
similarity index 100%
rename from plugins/UserCountry/flags/cd.png
rename to plugins/UserCountry/images/flags/cd.png
diff --git a/plugins/UserCountry/flags/cf.png b/plugins/UserCountry/images/flags/cf.png
similarity index 100%
rename from plugins/UserCountry/flags/cf.png
rename to plugins/UserCountry/images/flags/cf.png
diff --git a/plugins/UserCountry/flags/cg.png b/plugins/UserCountry/images/flags/cg.png
similarity index 100%
rename from plugins/UserCountry/flags/cg.png
rename to plugins/UserCountry/images/flags/cg.png
diff --git a/plugins/UserCountry/flags/ch.png b/plugins/UserCountry/images/flags/ch.png
similarity index 100%
rename from plugins/UserCountry/flags/ch.png
rename to plugins/UserCountry/images/flags/ch.png
diff --git a/plugins/UserCountry/flags/ci.png b/plugins/UserCountry/images/flags/ci.png
similarity index 100%
rename from plugins/UserCountry/flags/ci.png
rename to plugins/UserCountry/images/flags/ci.png
diff --git a/plugins/UserCountry/flags/ck.png b/plugins/UserCountry/images/flags/ck.png
similarity index 100%
rename from plugins/UserCountry/flags/ck.png
rename to plugins/UserCountry/images/flags/ck.png
diff --git a/plugins/UserCountry/flags/cl.png b/plugins/UserCountry/images/flags/cl.png
similarity index 100%
rename from plugins/UserCountry/flags/cl.png
rename to plugins/UserCountry/images/flags/cl.png
diff --git a/plugins/UserCountry/flags/cm.png b/plugins/UserCountry/images/flags/cm.png
similarity index 100%
rename from plugins/UserCountry/flags/cm.png
rename to plugins/UserCountry/images/flags/cm.png
diff --git a/plugins/UserCountry/flags/cn.png b/plugins/UserCountry/images/flags/cn.png
similarity index 100%
rename from plugins/UserCountry/flags/cn.png
rename to plugins/UserCountry/images/flags/cn.png
diff --git a/plugins/UserCountry/flags/co.png b/plugins/UserCountry/images/flags/co.png
similarity index 100%
rename from plugins/UserCountry/flags/co.png
rename to plugins/UserCountry/images/flags/co.png
diff --git a/plugins/UserCountry/flags/cp.png b/plugins/UserCountry/images/flags/cp.png
similarity index 100%
rename from plugins/UserCountry/flags/cp.png
rename to plugins/UserCountry/images/flags/cp.png
diff --git a/plugins/UserCountry/flags/cr.png b/plugins/UserCountry/images/flags/cr.png
similarity index 100%
rename from plugins/UserCountry/flags/cr.png
rename to plugins/UserCountry/images/flags/cr.png
diff --git a/plugins/UserCountry/flags/cs.png b/plugins/UserCountry/images/flags/cs.png
similarity index 100%
rename from plugins/UserCountry/flags/cs.png
rename to plugins/UserCountry/images/flags/cs.png
diff --git a/plugins/UserCountry/flags/cu.png b/plugins/UserCountry/images/flags/cu.png
similarity index 100%
rename from plugins/UserCountry/flags/cu.png
rename to plugins/UserCountry/images/flags/cu.png
diff --git a/plugins/UserCountry/flags/cv.png b/plugins/UserCountry/images/flags/cv.png
similarity index 100%
rename from plugins/UserCountry/flags/cv.png
rename to plugins/UserCountry/images/flags/cv.png
diff --git a/plugins/UserCountry/flags/cw.png b/plugins/UserCountry/images/flags/cw.png
similarity index 100%
rename from plugins/UserCountry/flags/cw.png
rename to plugins/UserCountry/images/flags/cw.png
diff --git a/plugins/UserCountry/flags/cx.png b/plugins/UserCountry/images/flags/cx.png
similarity index 100%
rename from plugins/UserCountry/flags/cx.png
rename to plugins/UserCountry/images/flags/cx.png
diff --git a/plugins/UserCountry/flags/cy.png b/plugins/UserCountry/images/flags/cy.png
similarity index 100%
rename from plugins/UserCountry/flags/cy.png
rename to plugins/UserCountry/images/flags/cy.png
diff --git a/plugins/UserCountry/flags/cz.png b/plugins/UserCountry/images/flags/cz.png
similarity index 100%
rename from plugins/UserCountry/flags/cz.png
rename to plugins/UserCountry/images/flags/cz.png
diff --git a/plugins/UserCountry/flags/de.png b/plugins/UserCountry/images/flags/de.png
similarity index 100%
rename from plugins/UserCountry/flags/de.png
rename to plugins/UserCountry/images/flags/de.png
diff --git a/plugins/UserCountry/flags/dg.png b/plugins/UserCountry/images/flags/dg.png
similarity index 100%
rename from plugins/UserCountry/flags/dg.png
rename to plugins/UserCountry/images/flags/dg.png
diff --git a/plugins/UserCountry/flags/dj.png b/plugins/UserCountry/images/flags/dj.png
similarity index 100%
rename from plugins/UserCountry/flags/dj.png
rename to plugins/UserCountry/images/flags/dj.png
diff --git a/plugins/UserCountry/flags/dk.png b/plugins/UserCountry/images/flags/dk.png
similarity index 100%
rename from plugins/UserCountry/flags/dk.png
rename to plugins/UserCountry/images/flags/dk.png
diff --git a/plugins/UserCountry/flags/dm.png b/plugins/UserCountry/images/flags/dm.png
similarity index 100%
rename from plugins/UserCountry/flags/dm.png
rename to plugins/UserCountry/images/flags/dm.png
diff --git a/plugins/UserCountry/flags/do.png b/plugins/UserCountry/images/flags/do.png
similarity index 100%
rename from plugins/UserCountry/flags/do.png
rename to plugins/UserCountry/images/flags/do.png
diff --git a/plugins/UserCountry/flags/dz.png b/plugins/UserCountry/images/flags/dz.png
similarity index 100%
rename from plugins/UserCountry/flags/dz.png
rename to plugins/UserCountry/images/flags/dz.png
diff --git a/plugins/UserCountry/flags/ea.png b/plugins/UserCountry/images/flags/ea.png
similarity index 100%
rename from plugins/UserCountry/flags/ea.png
rename to plugins/UserCountry/images/flags/ea.png
diff --git a/plugins/UserCountry/flags/ec.png b/plugins/UserCountry/images/flags/ec.png
similarity index 100%
rename from plugins/UserCountry/flags/ec.png
rename to plugins/UserCountry/images/flags/ec.png
diff --git a/plugins/UserCountry/flags/ee.png b/plugins/UserCountry/images/flags/ee.png
similarity index 100%
rename from plugins/UserCountry/flags/ee.png
rename to plugins/UserCountry/images/flags/ee.png
diff --git a/plugins/UserCountry/flags/eg.png b/plugins/UserCountry/images/flags/eg.png
similarity index 100%
rename from plugins/UserCountry/flags/eg.png
rename to plugins/UserCountry/images/flags/eg.png
diff --git a/plugins/UserCountry/flags/eh.png b/plugins/UserCountry/images/flags/eh.png
similarity index 100%
rename from plugins/UserCountry/flags/eh.png
rename to plugins/UserCountry/images/flags/eh.png
diff --git a/plugins/UserCountry/flags/er.png b/plugins/UserCountry/images/flags/er.png
similarity index 100%
rename from plugins/UserCountry/flags/er.png
rename to plugins/UserCountry/images/flags/er.png
diff --git a/plugins/UserCountry/flags/es.png b/plugins/UserCountry/images/flags/es.png
similarity index 100%
rename from plugins/UserCountry/flags/es.png
rename to plugins/UserCountry/images/flags/es.png
diff --git a/plugins/UserCountry/flags/et.png b/plugins/UserCountry/images/flags/et.png
similarity index 100%
rename from plugins/UserCountry/flags/et.png
rename to plugins/UserCountry/images/flags/et.png
diff --git a/plugins/UserCountry/flags/eu.png b/plugins/UserCountry/images/flags/eu.png
similarity index 100%
rename from plugins/UserCountry/flags/eu.png
rename to plugins/UserCountry/images/flags/eu.png
diff --git a/plugins/UserCountry/flags/fi.png b/plugins/UserCountry/images/flags/fi.png
similarity index 100%
rename from plugins/UserCountry/flags/fi.png
rename to plugins/UserCountry/images/flags/fi.png
diff --git a/plugins/UserCountry/flags/fj.png b/plugins/UserCountry/images/flags/fj.png
similarity index 100%
rename from plugins/UserCountry/flags/fj.png
rename to plugins/UserCountry/images/flags/fj.png
diff --git a/plugins/UserCountry/flags/fk.png b/plugins/UserCountry/images/flags/fk.png
similarity index 100%
rename from plugins/UserCountry/flags/fk.png
rename to plugins/UserCountry/images/flags/fk.png
diff --git a/plugins/UserCountry/flags/fm.png b/plugins/UserCountry/images/flags/fm.png
similarity index 100%
rename from plugins/UserCountry/flags/fm.png
rename to plugins/UserCountry/images/flags/fm.png
diff --git a/plugins/UserCountry/flags/fo.png b/plugins/UserCountry/images/flags/fo.png
similarity index 100%
rename from plugins/UserCountry/flags/fo.png
rename to plugins/UserCountry/images/flags/fo.png
diff --git a/plugins/UserCountry/flags/fr.png b/plugins/UserCountry/images/flags/fr.png
similarity index 100%
rename from plugins/UserCountry/flags/fr.png
rename to plugins/UserCountry/images/flags/fr.png
diff --git a/plugins/UserCountry/flags/fx.png b/plugins/UserCountry/images/flags/fx.png
similarity index 100%
rename from plugins/UserCountry/flags/fx.png
rename to plugins/UserCountry/images/flags/fx.png
diff --git a/plugins/UserCountry/flags/ga.png b/plugins/UserCountry/images/flags/ga.png
similarity index 100%
rename from plugins/UserCountry/flags/ga.png
rename to plugins/UserCountry/images/flags/ga.png
diff --git a/plugins/UserCountry/flags/gb.png b/plugins/UserCountry/images/flags/gb.png
similarity index 100%
rename from plugins/UserCountry/flags/gb.png
rename to plugins/UserCountry/images/flags/gb.png
diff --git a/plugins/UserCountry/flags/gd.png b/plugins/UserCountry/images/flags/gd.png
similarity index 100%
rename from plugins/UserCountry/flags/gd.png
rename to plugins/UserCountry/images/flags/gd.png
diff --git a/plugins/UserCountry/flags/ge.png b/plugins/UserCountry/images/flags/ge.png
similarity index 100%
rename from plugins/UserCountry/flags/ge.png
rename to plugins/UserCountry/images/flags/ge.png
diff --git a/plugins/UserCountry/flags/gf.png b/plugins/UserCountry/images/flags/gf.png
similarity index 100%
rename from plugins/UserCountry/flags/gf.png
rename to plugins/UserCountry/images/flags/gf.png
diff --git a/plugins/UserCountry/flags/gg.png b/plugins/UserCountry/images/flags/gg.png
similarity index 100%
rename from plugins/UserCountry/flags/gg.png
rename to plugins/UserCountry/images/flags/gg.png
diff --git a/plugins/UserCountry/flags/gh.png b/plugins/UserCountry/images/flags/gh.png
similarity index 100%
rename from plugins/UserCountry/flags/gh.png
rename to plugins/UserCountry/images/flags/gh.png
diff --git a/plugins/UserCountry/flags/gi.png b/plugins/UserCountry/images/flags/gi.png
similarity index 100%
rename from plugins/UserCountry/flags/gi.png
rename to plugins/UserCountry/images/flags/gi.png
diff --git a/plugins/UserCountry/flags/gl.png b/plugins/UserCountry/images/flags/gl.png
similarity index 100%
rename from plugins/UserCountry/flags/gl.png
rename to plugins/UserCountry/images/flags/gl.png
diff --git a/plugins/UserCountry/flags/gm.png b/plugins/UserCountry/images/flags/gm.png
similarity index 100%
rename from plugins/UserCountry/flags/gm.png
rename to plugins/UserCountry/images/flags/gm.png
diff --git a/plugins/UserCountry/flags/gn.png b/plugins/UserCountry/images/flags/gn.png
similarity index 100%
rename from plugins/UserCountry/flags/gn.png
rename to plugins/UserCountry/images/flags/gn.png
diff --git a/plugins/UserCountry/flags/gp.png b/plugins/UserCountry/images/flags/gp.png
similarity index 100%
rename from plugins/UserCountry/flags/gp.png
rename to plugins/UserCountry/images/flags/gp.png
diff --git a/plugins/UserCountry/flags/gq.png b/plugins/UserCountry/images/flags/gq.png
similarity index 100%
rename from plugins/UserCountry/flags/gq.png
rename to plugins/UserCountry/images/flags/gq.png
diff --git a/plugins/UserCountry/flags/gr.png b/plugins/UserCountry/images/flags/gr.png
similarity index 100%
rename from plugins/UserCountry/flags/gr.png
rename to plugins/UserCountry/images/flags/gr.png
diff --git a/plugins/UserCountry/flags/gs.png b/plugins/UserCountry/images/flags/gs.png
similarity index 100%
rename from plugins/UserCountry/flags/gs.png
rename to plugins/UserCountry/images/flags/gs.png
diff --git a/plugins/UserCountry/flags/gt.png b/plugins/UserCountry/images/flags/gt.png
similarity index 100%
rename from plugins/UserCountry/flags/gt.png
rename to plugins/UserCountry/images/flags/gt.png
diff --git a/plugins/UserCountry/flags/gu.png b/plugins/UserCountry/images/flags/gu.png
similarity index 100%
rename from plugins/UserCountry/flags/gu.png
rename to plugins/UserCountry/images/flags/gu.png
diff --git a/plugins/UserCountry/flags/gw.png b/plugins/UserCountry/images/flags/gw.png
similarity index 100%
rename from plugins/UserCountry/flags/gw.png
rename to plugins/UserCountry/images/flags/gw.png
diff --git a/plugins/UserCountry/flags/gy.png b/plugins/UserCountry/images/flags/gy.png
similarity index 100%
rename from plugins/UserCountry/flags/gy.png
rename to plugins/UserCountry/images/flags/gy.png
diff --git a/plugins/UserCountry/flags/hk.png b/plugins/UserCountry/images/flags/hk.png
similarity index 100%
rename from plugins/UserCountry/flags/hk.png
rename to plugins/UserCountry/images/flags/hk.png
diff --git a/plugins/UserCountry/flags/hm.png b/plugins/UserCountry/images/flags/hm.png
similarity index 100%
rename from plugins/UserCountry/flags/hm.png
rename to plugins/UserCountry/images/flags/hm.png
diff --git a/plugins/UserCountry/flags/hn.png b/plugins/UserCountry/images/flags/hn.png
similarity index 100%
rename from plugins/UserCountry/flags/hn.png
rename to plugins/UserCountry/images/flags/hn.png
diff --git a/plugins/UserCountry/flags/hr.png b/plugins/UserCountry/images/flags/hr.png
similarity index 100%
rename from plugins/UserCountry/flags/hr.png
rename to plugins/UserCountry/images/flags/hr.png
diff --git a/plugins/UserCountry/flags/ht.png b/plugins/UserCountry/images/flags/ht.png
similarity index 100%
rename from plugins/UserCountry/flags/ht.png
rename to plugins/UserCountry/images/flags/ht.png
diff --git a/plugins/UserCountry/flags/hu.png b/plugins/UserCountry/images/flags/hu.png
similarity index 100%
rename from plugins/UserCountry/flags/hu.png
rename to plugins/UserCountry/images/flags/hu.png
diff --git a/plugins/UserCountry/flags/ic.png b/plugins/UserCountry/images/flags/ic.png
similarity index 100%
rename from plugins/UserCountry/flags/ic.png
rename to plugins/UserCountry/images/flags/ic.png
diff --git a/plugins/UserCountry/flags/id.png b/plugins/UserCountry/images/flags/id.png
similarity index 100%
rename from plugins/UserCountry/flags/id.png
rename to plugins/UserCountry/images/flags/id.png
diff --git a/plugins/UserCountry/flags/ie.png b/plugins/UserCountry/images/flags/ie.png
similarity index 100%
rename from plugins/UserCountry/flags/ie.png
rename to plugins/UserCountry/images/flags/ie.png
diff --git a/plugins/UserCountry/flags/il.png b/plugins/UserCountry/images/flags/il.png
similarity index 100%
rename from plugins/UserCountry/flags/il.png
rename to plugins/UserCountry/images/flags/il.png
diff --git a/plugins/UserCountry/flags/im.png b/plugins/UserCountry/images/flags/im.png
similarity index 100%
rename from plugins/UserCountry/flags/im.png
rename to plugins/UserCountry/images/flags/im.png
diff --git a/plugins/UserCountry/flags/in.png b/plugins/UserCountry/images/flags/in.png
similarity index 100%
rename from plugins/UserCountry/flags/in.png
rename to plugins/UserCountry/images/flags/in.png
diff --git a/plugins/UserCountry/flags/io.png b/plugins/UserCountry/images/flags/io.png
similarity index 100%
rename from plugins/UserCountry/flags/io.png
rename to plugins/UserCountry/images/flags/io.png
diff --git a/plugins/UserCountry/flags/iq.png b/plugins/UserCountry/images/flags/iq.png
similarity index 100%
rename from plugins/UserCountry/flags/iq.png
rename to plugins/UserCountry/images/flags/iq.png
diff --git a/plugins/UserCountry/flags/ir.png b/plugins/UserCountry/images/flags/ir.png
similarity index 100%
rename from plugins/UserCountry/flags/ir.png
rename to plugins/UserCountry/images/flags/ir.png
diff --git a/plugins/UserCountry/flags/is.png b/plugins/UserCountry/images/flags/is.png
similarity index 100%
rename from plugins/UserCountry/flags/is.png
rename to plugins/UserCountry/images/flags/is.png
diff --git a/plugins/UserCountry/flags/it.png b/plugins/UserCountry/images/flags/it.png
similarity index 100%
rename from plugins/UserCountry/flags/it.png
rename to plugins/UserCountry/images/flags/it.png
diff --git a/plugins/UserCountry/flags/je.png b/plugins/UserCountry/images/flags/je.png
similarity index 100%
rename from plugins/UserCountry/flags/je.png
rename to plugins/UserCountry/images/flags/je.png
diff --git a/plugins/UserCountry/flags/jm.png b/plugins/UserCountry/images/flags/jm.png
similarity index 100%
rename from plugins/UserCountry/flags/jm.png
rename to plugins/UserCountry/images/flags/jm.png
diff --git a/plugins/UserCountry/flags/jo.png b/plugins/UserCountry/images/flags/jo.png
similarity index 100%
rename from plugins/UserCountry/flags/jo.png
rename to plugins/UserCountry/images/flags/jo.png
diff --git a/plugins/UserCountry/flags/jp.png b/plugins/UserCountry/images/flags/jp.png
similarity index 100%
rename from plugins/UserCountry/flags/jp.png
rename to plugins/UserCountry/images/flags/jp.png
diff --git a/plugins/UserCountry/flags/ke.png b/plugins/UserCountry/images/flags/ke.png
similarity index 100%
rename from plugins/UserCountry/flags/ke.png
rename to plugins/UserCountry/images/flags/ke.png
diff --git a/plugins/UserCountry/flags/kg.png b/plugins/UserCountry/images/flags/kg.png
similarity index 100%
rename from plugins/UserCountry/flags/kg.png
rename to plugins/UserCountry/images/flags/kg.png
diff --git a/plugins/UserCountry/flags/kh.png b/plugins/UserCountry/images/flags/kh.png
similarity index 100%
rename from plugins/UserCountry/flags/kh.png
rename to plugins/UserCountry/images/flags/kh.png
diff --git a/plugins/UserCountry/flags/ki.png b/plugins/UserCountry/images/flags/ki.png
similarity index 100%
rename from plugins/UserCountry/flags/ki.png
rename to plugins/UserCountry/images/flags/ki.png
diff --git a/plugins/UserCountry/flags/km.png b/plugins/UserCountry/images/flags/km.png
similarity index 100%
rename from plugins/UserCountry/flags/km.png
rename to plugins/UserCountry/images/flags/km.png
diff --git a/plugins/UserCountry/flags/kn.png b/plugins/UserCountry/images/flags/kn.png
similarity index 100%
rename from plugins/UserCountry/flags/kn.png
rename to plugins/UserCountry/images/flags/kn.png
diff --git a/plugins/UserCountry/flags/kp.png b/plugins/UserCountry/images/flags/kp.png
similarity index 100%
rename from plugins/UserCountry/flags/kp.png
rename to plugins/UserCountry/images/flags/kp.png
diff --git a/plugins/UserCountry/flags/kr.png b/plugins/UserCountry/images/flags/kr.png
similarity index 100%
rename from plugins/UserCountry/flags/kr.png
rename to plugins/UserCountry/images/flags/kr.png
diff --git a/plugins/UserCountry/flags/kw.png b/plugins/UserCountry/images/flags/kw.png
similarity index 100%
rename from plugins/UserCountry/flags/kw.png
rename to plugins/UserCountry/images/flags/kw.png
diff --git a/plugins/UserCountry/flags/ky.png b/plugins/UserCountry/images/flags/ky.png
similarity index 100%
rename from plugins/UserCountry/flags/ky.png
rename to plugins/UserCountry/images/flags/ky.png
diff --git a/plugins/UserCountry/flags/kz.png b/plugins/UserCountry/images/flags/kz.png
similarity index 100%
rename from plugins/UserCountry/flags/kz.png
rename to plugins/UserCountry/images/flags/kz.png
diff --git a/plugins/UserCountry/flags/la.png b/plugins/UserCountry/images/flags/la.png
similarity index 100%
rename from plugins/UserCountry/flags/la.png
rename to plugins/UserCountry/images/flags/la.png
diff --git a/plugins/UserCountry/flags/lb.png b/plugins/UserCountry/images/flags/lb.png
similarity index 100%
rename from plugins/UserCountry/flags/lb.png
rename to plugins/UserCountry/images/flags/lb.png
diff --git a/plugins/UserCountry/flags/lc.png b/plugins/UserCountry/images/flags/lc.png
similarity index 100%
rename from plugins/UserCountry/flags/lc.png
rename to plugins/UserCountry/images/flags/lc.png
diff --git a/plugins/UserCountry/flags/li.png b/plugins/UserCountry/images/flags/li.png
similarity index 100%
rename from plugins/UserCountry/flags/li.png
rename to plugins/UserCountry/images/flags/li.png
diff --git a/plugins/UserCountry/flags/lk.png b/plugins/UserCountry/images/flags/lk.png
similarity index 100%
rename from plugins/UserCountry/flags/lk.png
rename to plugins/UserCountry/images/flags/lk.png
diff --git a/plugins/UserCountry/flags/lr.png b/plugins/UserCountry/images/flags/lr.png
similarity index 100%
rename from plugins/UserCountry/flags/lr.png
rename to plugins/UserCountry/images/flags/lr.png
diff --git a/plugins/UserCountry/flags/ls.png b/plugins/UserCountry/images/flags/ls.png
similarity index 100%
rename from plugins/UserCountry/flags/ls.png
rename to plugins/UserCountry/images/flags/ls.png
diff --git a/plugins/UserCountry/flags/lt.png b/plugins/UserCountry/images/flags/lt.png
similarity index 100%
rename from plugins/UserCountry/flags/lt.png
rename to plugins/UserCountry/images/flags/lt.png
diff --git a/plugins/UserCountry/flags/lu.png b/plugins/UserCountry/images/flags/lu.png
similarity index 100%
rename from plugins/UserCountry/flags/lu.png
rename to plugins/UserCountry/images/flags/lu.png
diff --git a/plugins/UserCountry/flags/lv.png b/plugins/UserCountry/images/flags/lv.png
similarity index 100%
rename from plugins/UserCountry/flags/lv.png
rename to plugins/UserCountry/images/flags/lv.png
diff --git a/plugins/UserCountry/flags/ly.png b/plugins/UserCountry/images/flags/ly.png
similarity index 100%
rename from plugins/UserCountry/flags/ly.png
rename to plugins/UserCountry/images/flags/ly.png
diff --git a/plugins/UserCountry/flags/ma.png b/plugins/UserCountry/images/flags/ma.png
similarity index 100%
rename from plugins/UserCountry/flags/ma.png
rename to plugins/UserCountry/images/flags/ma.png
diff --git a/plugins/UserCountry/flags/mc.png b/plugins/UserCountry/images/flags/mc.png
similarity index 100%
rename from plugins/UserCountry/flags/mc.png
rename to plugins/UserCountry/images/flags/mc.png
diff --git a/plugins/UserCountry/flags/md.png b/plugins/UserCountry/images/flags/md.png
similarity index 100%
rename from plugins/UserCountry/flags/md.png
rename to plugins/UserCountry/images/flags/md.png
diff --git a/plugins/UserCountry/flags/me.png b/plugins/UserCountry/images/flags/me.png
similarity index 100%
rename from plugins/UserCountry/flags/me.png
rename to plugins/UserCountry/images/flags/me.png
diff --git a/plugins/UserCountry/flags/mf.png b/plugins/UserCountry/images/flags/mf.png
similarity index 100%
rename from plugins/UserCountry/flags/mf.png
rename to plugins/UserCountry/images/flags/mf.png
diff --git a/plugins/UserCountry/flags/mg.png b/plugins/UserCountry/images/flags/mg.png
similarity index 100%
rename from plugins/UserCountry/flags/mg.png
rename to plugins/UserCountry/images/flags/mg.png
diff --git a/plugins/UserCountry/flags/mh.png b/plugins/UserCountry/images/flags/mh.png
similarity index 100%
rename from plugins/UserCountry/flags/mh.png
rename to plugins/UserCountry/images/flags/mh.png
diff --git a/plugins/UserCountry/flags/mk.png b/plugins/UserCountry/images/flags/mk.png
similarity index 100%
rename from plugins/UserCountry/flags/mk.png
rename to plugins/UserCountry/images/flags/mk.png
diff --git a/plugins/UserCountry/flags/ml.png b/plugins/UserCountry/images/flags/ml.png
similarity index 100%
rename from plugins/UserCountry/flags/ml.png
rename to plugins/UserCountry/images/flags/ml.png
diff --git a/plugins/UserCountry/flags/mm.png b/plugins/UserCountry/images/flags/mm.png
similarity index 100%
rename from plugins/UserCountry/flags/mm.png
rename to plugins/UserCountry/images/flags/mm.png
diff --git a/plugins/UserCountry/flags/mn.png b/plugins/UserCountry/images/flags/mn.png
similarity index 100%
rename from plugins/UserCountry/flags/mn.png
rename to plugins/UserCountry/images/flags/mn.png
diff --git a/plugins/UserCountry/flags/mo.png b/plugins/UserCountry/images/flags/mo.png
similarity index 100%
rename from plugins/UserCountry/flags/mo.png
rename to plugins/UserCountry/images/flags/mo.png
diff --git a/plugins/UserCountry/flags/mp.png b/plugins/UserCountry/images/flags/mp.png
similarity index 100%
rename from plugins/UserCountry/flags/mp.png
rename to plugins/UserCountry/images/flags/mp.png
diff --git a/plugins/UserCountry/flags/mq.png b/plugins/UserCountry/images/flags/mq.png
similarity index 100%
rename from plugins/UserCountry/flags/mq.png
rename to plugins/UserCountry/images/flags/mq.png
diff --git a/plugins/UserCountry/flags/mr.png b/plugins/UserCountry/images/flags/mr.png
similarity index 100%
rename from plugins/UserCountry/flags/mr.png
rename to plugins/UserCountry/images/flags/mr.png
diff --git a/plugins/UserCountry/flags/ms.png b/plugins/UserCountry/images/flags/ms.png
similarity index 100%
rename from plugins/UserCountry/flags/ms.png
rename to plugins/UserCountry/images/flags/ms.png
diff --git a/plugins/UserCountry/flags/mt.png b/plugins/UserCountry/images/flags/mt.png
similarity index 100%
rename from plugins/UserCountry/flags/mt.png
rename to plugins/UserCountry/images/flags/mt.png
diff --git a/plugins/UserCountry/flags/mu.png b/plugins/UserCountry/images/flags/mu.png
similarity index 100%
rename from plugins/UserCountry/flags/mu.png
rename to plugins/UserCountry/images/flags/mu.png
diff --git a/plugins/UserCountry/flags/mv.png b/plugins/UserCountry/images/flags/mv.png
similarity index 100%
rename from plugins/UserCountry/flags/mv.png
rename to plugins/UserCountry/images/flags/mv.png
diff --git a/plugins/UserCountry/flags/mw.png b/plugins/UserCountry/images/flags/mw.png
similarity index 100%
rename from plugins/UserCountry/flags/mw.png
rename to plugins/UserCountry/images/flags/mw.png
diff --git a/plugins/UserCountry/flags/mx.png b/plugins/UserCountry/images/flags/mx.png
similarity index 100%
rename from plugins/UserCountry/flags/mx.png
rename to plugins/UserCountry/images/flags/mx.png
diff --git a/plugins/UserCountry/flags/my.png b/plugins/UserCountry/images/flags/my.png
similarity index 100%
rename from plugins/UserCountry/flags/my.png
rename to plugins/UserCountry/images/flags/my.png
diff --git a/plugins/UserCountry/flags/mz.png b/plugins/UserCountry/images/flags/mz.png
similarity index 100%
rename from plugins/UserCountry/flags/mz.png
rename to plugins/UserCountry/images/flags/mz.png
diff --git a/plugins/UserCountry/flags/na.png b/plugins/UserCountry/images/flags/na.png
similarity index 100%
rename from plugins/UserCountry/flags/na.png
rename to plugins/UserCountry/images/flags/na.png
diff --git a/plugins/UserCountry/flags/nc.png b/plugins/UserCountry/images/flags/nc.png
similarity index 100%
rename from plugins/UserCountry/flags/nc.png
rename to plugins/UserCountry/images/flags/nc.png
diff --git a/plugins/UserCountry/flags/ne.png b/plugins/UserCountry/images/flags/ne.png
similarity index 100%
rename from plugins/UserCountry/flags/ne.png
rename to plugins/UserCountry/images/flags/ne.png
diff --git a/plugins/UserCountry/flags/nf.png b/plugins/UserCountry/images/flags/nf.png
similarity index 100%
rename from plugins/UserCountry/flags/nf.png
rename to plugins/UserCountry/images/flags/nf.png
diff --git a/plugins/UserCountry/flags/ng.png b/plugins/UserCountry/images/flags/ng.png
similarity index 100%
rename from plugins/UserCountry/flags/ng.png
rename to plugins/UserCountry/images/flags/ng.png
diff --git a/plugins/UserCountry/flags/ni.png b/plugins/UserCountry/images/flags/ni.png
similarity index 100%
rename from plugins/UserCountry/flags/ni.png
rename to plugins/UserCountry/images/flags/ni.png
diff --git a/plugins/UserCountry/flags/nl.png b/plugins/UserCountry/images/flags/nl.png
similarity index 100%
rename from plugins/UserCountry/flags/nl.png
rename to plugins/UserCountry/images/flags/nl.png
diff --git a/plugins/UserCountry/flags/no.png b/plugins/UserCountry/images/flags/no.png
similarity index 100%
rename from plugins/UserCountry/flags/no.png
rename to plugins/UserCountry/images/flags/no.png
diff --git a/plugins/UserCountry/flags/np.png b/plugins/UserCountry/images/flags/np.png
similarity index 100%
rename from plugins/UserCountry/flags/np.png
rename to plugins/UserCountry/images/flags/np.png
diff --git a/plugins/UserCountry/flags/nr.png b/plugins/UserCountry/images/flags/nr.png
similarity index 100%
rename from plugins/UserCountry/flags/nr.png
rename to plugins/UserCountry/images/flags/nr.png
diff --git a/plugins/UserCountry/flags/nt.png b/plugins/UserCountry/images/flags/nt.png
similarity index 100%
rename from plugins/UserCountry/flags/nt.png
rename to plugins/UserCountry/images/flags/nt.png
diff --git a/plugins/UserCountry/flags/nu.png b/plugins/UserCountry/images/flags/nu.png
similarity index 100%
rename from plugins/UserCountry/flags/nu.png
rename to plugins/UserCountry/images/flags/nu.png
diff --git a/plugins/UserCountry/flags/nz.png b/plugins/UserCountry/images/flags/nz.png
similarity index 100%
rename from plugins/UserCountry/flags/nz.png
rename to plugins/UserCountry/images/flags/nz.png
diff --git a/plugins/UserCountry/flags/o1.png b/plugins/UserCountry/images/flags/o1.png
similarity index 100%
rename from plugins/UserCountry/flags/o1.png
rename to plugins/UserCountry/images/flags/o1.png
diff --git a/plugins/UserCountry/flags/om.png b/plugins/UserCountry/images/flags/om.png
similarity index 100%
rename from plugins/UserCountry/flags/om.png
rename to plugins/UserCountry/images/flags/om.png
diff --git a/plugins/UserCountry/flags/pa.png b/plugins/UserCountry/images/flags/pa.png
similarity index 100%
rename from plugins/UserCountry/flags/pa.png
rename to plugins/UserCountry/images/flags/pa.png
diff --git a/plugins/UserCountry/flags/pe.png b/plugins/UserCountry/images/flags/pe.png
similarity index 100%
rename from plugins/UserCountry/flags/pe.png
rename to plugins/UserCountry/images/flags/pe.png
diff --git a/plugins/UserCountry/flags/pf.png b/plugins/UserCountry/images/flags/pf.png
similarity index 100%
rename from plugins/UserCountry/flags/pf.png
rename to plugins/UserCountry/images/flags/pf.png
diff --git a/plugins/UserCountry/flags/pg.png b/plugins/UserCountry/images/flags/pg.png
similarity index 100%
rename from plugins/UserCountry/flags/pg.png
rename to plugins/UserCountry/images/flags/pg.png
diff --git a/plugins/UserCountry/flags/ph.png b/plugins/UserCountry/images/flags/ph.png
similarity index 100%
rename from plugins/UserCountry/flags/ph.png
rename to plugins/UserCountry/images/flags/ph.png
diff --git a/plugins/UserCountry/flags/pk.png b/plugins/UserCountry/images/flags/pk.png
similarity index 100%
rename from plugins/UserCountry/flags/pk.png
rename to plugins/UserCountry/images/flags/pk.png
diff --git a/plugins/UserCountry/flags/pl.png b/plugins/UserCountry/images/flags/pl.png
similarity index 100%
rename from plugins/UserCountry/flags/pl.png
rename to plugins/UserCountry/images/flags/pl.png
diff --git a/plugins/UserCountry/flags/pm.png b/plugins/UserCountry/images/flags/pm.png
similarity index 100%
rename from plugins/UserCountry/flags/pm.png
rename to plugins/UserCountry/images/flags/pm.png
diff --git a/plugins/UserCountry/flags/pn.png b/plugins/UserCountry/images/flags/pn.png
similarity index 100%
rename from plugins/UserCountry/flags/pn.png
rename to plugins/UserCountry/images/flags/pn.png
diff --git a/plugins/UserCountry/flags/pr.png b/plugins/UserCountry/images/flags/pr.png
similarity index 100%
rename from plugins/UserCountry/flags/pr.png
rename to plugins/UserCountry/images/flags/pr.png
diff --git a/plugins/UserCountry/flags/ps.png b/plugins/UserCountry/images/flags/ps.png
similarity index 100%
rename from plugins/UserCountry/flags/ps.png
rename to plugins/UserCountry/images/flags/ps.png
diff --git a/plugins/UserCountry/flags/pt.png b/plugins/UserCountry/images/flags/pt.png
similarity index 100%
rename from plugins/UserCountry/flags/pt.png
rename to plugins/UserCountry/images/flags/pt.png
diff --git a/plugins/UserCountry/flags/pw.png b/plugins/UserCountry/images/flags/pw.png
similarity index 100%
rename from plugins/UserCountry/flags/pw.png
rename to plugins/UserCountry/images/flags/pw.png
diff --git a/plugins/UserCountry/flags/py.png b/plugins/UserCountry/images/flags/py.png
similarity index 100%
rename from plugins/UserCountry/flags/py.png
rename to plugins/UserCountry/images/flags/py.png
diff --git a/plugins/UserCountry/flags/qa.png b/plugins/UserCountry/images/flags/qa.png
similarity index 100%
rename from plugins/UserCountry/flags/qa.png
rename to plugins/UserCountry/images/flags/qa.png
diff --git a/plugins/UserCountry/flags/re.png b/plugins/UserCountry/images/flags/re.png
similarity index 100%
rename from plugins/UserCountry/flags/re.png
rename to plugins/UserCountry/images/flags/re.png
diff --git a/plugins/UserCountry/flags/ro.png b/plugins/UserCountry/images/flags/ro.png
similarity index 100%
rename from plugins/UserCountry/flags/ro.png
rename to plugins/UserCountry/images/flags/ro.png
diff --git a/plugins/UserCountry/flags/rs.png b/plugins/UserCountry/images/flags/rs.png
similarity index 100%
rename from plugins/UserCountry/flags/rs.png
rename to plugins/UserCountry/images/flags/rs.png
diff --git a/plugins/UserCountry/flags/ru.png b/plugins/UserCountry/images/flags/ru.png
similarity index 100%
rename from plugins/UserCountry/flags/ru.png
rename to plugins/UserCountry/images/flags/ru.png
diff --git a/plugins/UserCountry/flags/rw.png b/plugins/UserCountry/images/flags/rw.png
similarity index 100%
rename from plugins/UserCountry/flags/rw.png
rename to plugins/UserCountry/images/flags/rw.png
diff --git a/plugins/UserCountry/flags/sa.png b/plugins/UserCountry/images/flags/sa.png
similarity index 100%
rename from plugins/UserCountry/flags/sa.png
rename to plugins/UserCountry/images/flags/sa.png
diff --git a/plugins/UserCountry/flags/sb.png b/plugins/UserCountry/images/flags/sb.png
similarity index 100%
rename from plugins/UserCountry/flags/sb.png
rename to plugins/UserCountry/images/flags/sb.png
diff --git a/plugins/UserCountry/flags/sc.png b/plugins/UserCountry/images/flags/sc.png
similarity index 100%
rename from plugins/UserCountry/flags/sc.png
rename to plugins/UserCountry/images/flags/sc.png
diff --git a/plugins/UserCountry/flags/sd.png b/plugins/UserCountry/images/flags/sd.png
similarity index 100%
rename from plugins/UserCountry/flags/sd.png
rename to plugins/UserCountry/images/flags/sd.png
diff --git a/plugins/UserCountry/flags/se.png b/plugins/UserCountry/images/flags/se.png
similarity index 100%
rename from plugins/UserCountry/flags/se.png
rename to plugins/UserCountry/images/flags/se.png
diff --git a/plugins/UserCountry/flags/sf.png b/plugins/UserCountry/images/flags/sf.png
similarity index 100%
rename from plugins/UserCountry/flags/sf.png
rename to plugins/UserCountry/images/flags/sf.png
diff --git a/plugins/UserCountry/flags/sg.png b/plugins/UserCountry/images/flags/sg.png
similarity index 100%
rename from plugins/UserCountry/flags/sg.png
rename to plugins/UserCountry/images/flags/sg.png
diff --git a/plugins/UserCountry/flags/sh.png b/plugins/UserCountry/images/flags/sh.png
similarity index 100%
rename from plugins/UserCountry/flags/sh.png
rename to plugins/UserCountry/images/flags/sh.png
diff --git a/plugins/UserCountry/flags/si.png b/plugins/UserCountry/images/flags/si.png
similarity index 100%
rename from plugins/UserCountry/flags/si.png
rename to plugins/UserCountry/images/flags/si.png
diff --git a/plugins/UserCountry/flags/sj.png b/plugins/UserCountry/images/flags/sj.png
similarity index 100%
rename from plugins/UserCountry/flags/sj.png
rename to plugins/UserCountry/images/flags/sj.png
diff --git a/plugins/UserCountry/flags/sk.png b/plugins/UserCountry/images/flags/sk.png
similarity index 100%
rename from plugins/UserCountry/flags/sk.png
rename to plugins/UserCountry/images/flags/sk.png
diff --git a/plugins/UserCountry/flags/sl.png b/plugins/UserCountry/images/flags/sl.png
similarity index 100%
rename from plugins/UserCountry/flags/sl.png
rename to plugins/UserCountry/images/flags/sl.png
diff --git a/plugins/UserCountry/flags/sm.png b/plugins/UserCountry/images/flags/sm.png
similarity index 100%
rename from plugins/UserCountry/flags/sm.png
rename to plugins/UserCountry/images/flags/sm.png
diff --git a/plugins/UserCountry/flags/sn.png b/plugins/UserCountry/images/flags/sn.png
similarity index 100%
rename from plugins/UserCountry/flags/sn.png
rename to plugins/UserCountry/images/flags/sn.png
diff --git a/plugins/UserCountry/flags/so.png b/plugins/UserCountry/images/flags/so.png
similarity index 100%
rename from plugins/UserCountry/flags/so.png
rename to plugins/UserCountry/images/flags/so.png
diff --git a/plugins/UserCountry/flags/sr.png b/plugins/UserCountry/images/flags/sr.png
similarity index 100%
rename from plugins/UserCountry/flags/sr.png
rename to plugins/UserCountry/images/flags/sr.png
diff --git a/plugins/UserCountry/flags/ss.png b/plugins/UserCountry/images/flags/ss.png
similarity index 100%
rename from plugins/UserCountry/flags/ss.png
rename to plugins/UserCountry/images/flags/ss.png
diff --git a/plugins/UserCountry/flags/st.png b/plugins/UserCountry/images/flags/st.png
similarity index 100%
rename from plugins/UserCountry/flags/st.png
rename to plugins/UserCountry/images/flags/st.png
diff --git a/plugins/UserCountry/flags/su.png b/plugins/UserCountry/images/flags/su.png
similarity index 100%
rename from plugins/UserCountry/flags/su.png
rename to plugins/UserCountry/images/flags/su.png
diff --git a/plugins/UserCountry/flags/sv.png b/plugins/UserCountry/images/flags/sv.png
similarity index 100%
rename from plugins/UserCountry/flags/sv.png
rename to plugins/UserCountry/images/flags/sv.png
diff --git a/plugins/UserCountry/flags/sx.png b/plugins/UserCountry/images/flags/sx.png
similarity index 100%
rename from plugins/UserCountry/flags/sx.png
rename to plugins/UserCountry/images/flags/sx.png
diff --git a/plugins/UserCountry/flags/sy.png b/plugins/UserCountry/images/flags/sy.png
similarity index 100%
rename from plugins/UserCountry/flags/sy.png
rename to plugins/UserCountry/images/flags/sy.png
diff --git a/plugins/UserCountry/flags/sz.png b/plugins/UserCountry/images/flags/sz.png
similarity index 100%
rename from plugins/UserCountry/flags/sz.png
rename to plugins/UserCountry/images/flags/sz.png
diff --git a/plugins/UserCountry/flags/ta.png b/plugins/UserCountry/images/flags/ta.png
similarity index 100%
rename from plugins/UserCountry/flags/ta.png
rename to plugins/UserCountry/images/flags/ta.png
diff --git a/plugins/UserCountry/flags/tc.png b/plugins/UserCountry/images/flags/tc.png
similarity index 100%
rename from plugins/UserCountry/flags/tc.png
rename to plugins/UserCountry/images/flags/tc.png
diff --git a/plugins/UserCountry/flags/td.png b/plugins/UserCountry/images/flags/td.png
similarity index 100%
rename from plugins/UserCountry/flags/td.png
rename to plugins/UserCountry/images/flags/td.png
diff --git a/plugins/UserCountry/flags/tf.png b/plugins/UserCountry/images/flags/tf.png
similarity index 100%
rename from plugins/UserCountry/flags/tf.png
rename to plugins/UserCountry/images/flags/tf.png
diff --git a/plugins/UserCountry/flags/tg.png b/plugins/UserCountry/images/flags/tg.png
similarity index 100%
rename from plugins/UserCountry/flags/tg.png
rename to plugins/UserCountry/images/flags/tg.png
diff --git a/plugins/UserCountry/flags/th.png b/plugins/UserCountry/images/flags/th.png
similarity index 100%
rename from plugins/UserCountry/flags/th.png
rename to plugins/UserCountry/images/flags/th.png
diff --git a/plugins/UserCountry/flags/ti.png b/plugins/UserCountry/images/flags/ti.png
similarity index 100%
rename from plugins/UserCountry/flags/ti.png
rename to plugins/UserCountry/images/flags/ti.png
diff --git a/plugins/UserCountry/flags/tj.png b/plugins/UserCountry/images/flags/tj.png
similarity index 100%
rename from plugins/UserCountry/flags/tj.png
rename to plugins/UserCountry/images/flags/tj.png
diff --git a/plugins/UserCountry/flags/tk.png b/plugins/UserCountry/images/flags/tk.png
similarity index 100%
rename from plugins/UserCountry/flags/tk.png
rename to plugins/UserCountry/images/flags/tk.png
diff --git a/plugins/UserCountry/flags/tl.png b/plugins/UserCountry/images/flags/tl.png
similarity index 100%
rename from plugins/UserCountry/flags/tl.png
rename to plugins/UserCountry/images/flags/tl.png
diff --git a/plugins/UserCountry/flags/tm.png b/plugins/UserCountry/images/flags/tm.png
similarity index 100%
rename from plugins/UserCountry/flags/tm.png
rename to plugins/UserCountry/images/flags/tm.png
diff --git a/plugins/UserCountry/flags/tn.png b/plugins/UserCountry/images/flags/tn.png
similarity index 100%
rename from plugins/UserCountry/flags/tn.png
rename to plugins/UserCountry/images/flags/tn.png
diff --git a/plugins/UserCountry/flags/to.png b/plugins/UserCountry/images/flags/to.png
similarity index 100%
rename from plugins/UserCountry/flags/to.png
rename to plugins/UserCountry/images/flags/to.png
diff --git a/plugins/UserCountry/flags/tp.png b/plugins/UserCountry/images/flags/tp.png
similarity index 100%
rename from plugins/UserCountry/flags/tp.png
rename to plugins/UserCountry/images/flags/tp.png
diff --git a/plugins/UserCountry/flags/tr.png b/plugins/UserCountry/images/flags/tr.png
similarity index 100%
rename from plugins/UserCountry/flags/tr.png
rename to plugins/UserCountry/images/flags/tr.png
diff --git a/plugins/UserCountry/flags/tt.png b/plugins/UserCountry/images/flags/tt.png
similarity index 100%
rename from plugins/UserCountry/flags/tt.png
rename to plugins/UserCountry/images/flags/tt.png
diff --git a/plugins/UserCountry/flags/tv.png b/plugins/UserCountry/images/flags/tv.png
similarity index 100%
rename from plugins/UserCountry/flags/tv.png
rename to plugins/UserCountry/images/flags/tv.png
diff --git a/plugins/UserCountry/flags/tw.png b/plugins/UserCountry/images/flags/tw.png
similarity index 100%
rename from plugins/UserCountry/flags/tw.png
rename to plugins/UserCountry/images/flags/tw.png
diff --git a/plugins/UserCountry/flags/tz.png b/plugins/UserCountry/images/flags/tz.png
similarity index 100%
rename from plugins/UserCountry/flags/tz.png
rename to plugins/UserCountry/images/flags/tz.png
diff --git a/plugins/UserCountry/flags/ua.png b/plugins/UserCountry/images/flags/ua.png
similarity index 100%
rename from plugins/UserCountry/flags/ua.png
rename to plugins/UserCountry/images/flags/ua.png
diff --git a/plugins/UserCountry/flags/ug.png b/plugins/UserCountry/images/flags/ug.png
similarity index 100%
rename from plugins/UserCountry/flags/ug.png
rename to plugins/UserCountry/images/flags/ug.png
diff --git a/plugins/UserCountry/flags/uk.png b/plugins/UserCountry/images/flags/uk.png
similarity index 100%
rename from plugins/UserCountry/flags/uk.png
rename to plugins/UserCountry/images/flags/uk.png
diff --git a/plugins/UserCountry/flags/um.png b/plugins/UserCountry/images/flags/um.png
similarity index 100%
rename from plugins/UserCountry/flags/um.png
rename to plugins/UserCountry/images/flags/um.png
diff --git a/plugins/UserCountry/flags/us.png b/plugins/UserCountry/images/flags/us.png
similarity index 100%
rename from plugins/UserCountry/flags/us.png
rename to plugins/UserCountry/images/flags/us.png
diff --git a/plugins/UserCountry/flags/uy.png b/plugins/UserCountry/images/flags/uy.png
similarity index 100%
rename from plugins/UserCountry/flags/uy.png
rename to plugins/UserCountry/images/flags/uy.png
diff --git a/plugins/UserCountry/flags/uz.png b/plugins/UserCountry/images/flags/uz.png
similarity index 100%
rename from plugins/UserCountry/flags/uz.png
rename to plugins/UserCountry/images/flags/uz.png
diff --git a/plugins/UserCountry/flags/va.png b/plugins/UserCountry/images/flags/va.png
similarity index 100%
rename from plugins/UserCountry/flags/va.png
rename to plugins/UserCountry/images/flags/va.png
diff --git a/plugins/UserCountry/flags/vc.png b/plugins/UserCountry/images/flags/vc.png
similarity index 100%
rename from plugins/UserCountry/flags/vc.png
rename to plugins/UserCountry/images/flags/vc.png
diff --git a/plugins/UserCountry/flags/ve.png b/plugins/UserCountry/images/flags/ve.png
similarity index 100%
rename from plugins/UserCountry/flags/ve.png
rename to plugins/UserCountry/images/flags/ve.png
diff --git a/plugins/UserCountry/flags/vg.png b/plugins/UserCountry/images/flags/vg.png
similarity index 100%
rename from plugins/UserCountry/flags/vg.png
rename to plugins/UserCountry/images/flags/vg.png
diff --git a/plugins/UserCountry/flags/vi.png b/plugins/UserCountry/images/flags/vi.png
similarity index 100%
rename from plugins/UserCountry/flags/vi.png
rename to plugins/UserCountry/images/flags/vi.png
diff --git a/plugins/UserCountry/flags/vn.png b/plugins/UserCountry/images/flags/vn.png
similarity index 100%
rename from plugins/UserCountry/flags/vn.png
rename to plugins/UserCountry/images/flags/vn.png
diff --git a/plugins/UserCountry/flags/vu.png b/plugins/UserCountry/images/flags/vu.png
similarity index 100%
rename from plugins/UserCountry/flags/vu.png
rename to plugins/UserCountry/images/flags/vu.png
diff --git a/plugins/UserCountry/flags/wf.png b/plugins/UserCountry/images/flags/wf.png
similarity index 100%
rename from plugins/UserCountry/flags/wf.png
rename to plugins/UserCountry/images/flags/wf.png
diff --git a/plugins/UserCountry/flags/ws.png b/plugins/UserCountry/images/flags/ws.png
similarity index 100%
rename from plugins/UserCountry/flags/ws.png
rename to plugins/UserCountry/images/flags/ws.png
diff --git a/plugins/UserCountry/flags/xx.png b/plugins/UserCountry/images/flags/xx.png
similarity index 100%
rename from plugins/UserCountry/flags/xx.png
rename to plugins/UserCountry/images/flags/xx.png
diff --git a/plugins/UserCountry/flags/ye.png b/plugins/UserCountry/images/flags/ye.png
similarity index 100%
rename from plugins/UserCountry/flags/ye.png
rename to plugins/UserCountry/images/flags/ye.png
diff --git a/plugins/UserCountry/flags/yt.png b/plugins/UserCountry/images/flags/yt.png
similarity index 100%
rename from plugins/UserCountry/flags/yt.png
rename to plugins/UserCountry/images/flags/yt.png
diff --git a/plugins/UserCountry/flags/yu.png b/plugins/UserCountry/images/flags/yu.png
similarity index 100%
rename from plugins/UserCountry/flags/yu.png
rename to plugins/UserCountry/images/flags/yu.png
diff --git a/plugins/UserCountry/flags/za.png b/plugins/UserCountry/images/flags/za.png
similarity index 100%
rename from plugins/UserCountry/flags/za.png
rename to plugins/UserCountry/images/flags/za.png
diff --git a/plugins/UserCountry/flags/zm.png b/plugins/UserCountry/images/flags/zm.png
similarity index 100%
rename from plugins/UserCountry/flags/zm.png
rename to plugins/UserCountry/images/flags/zm.png
diff --git a/plugins/UserCountry/flags/zr.png b/plugins/UserCountry/images/flags/zr.png
similarity index 100%
rename from plugins/UserCountry/flags/zr.png
rename to plugins/UserCountry/images/flags/zr.png
diff --git a/plugins/UserCountry/flags/zw.png b/plugins/UserCountry/images/flags/zw.png
similarity index 100%
rename from plugins/UserCountry/flags/zw.png
rename to plugins/UserCountry/images/flags/zw.png
diff --git a/plugins/UserCountryMap/img/cities.png b/plugins/UserCountryMap/images/cities.png
similarity index 100%
rename from plugins/UserCountryMap/img/cities.png
rename to plugins/UserCountryMap/images/cities.png
diff --git a/plugins/UserCountryMap/img/realtimemap-loading.gif b/plugins/UserCountryMap/images/realtimemap-loading.gif
similarity index 100%
rename from plugins/UserCountryMap/img/realtimemap-loading.gif
rename to plugins/UserCountryMap/images/realtimemap-loading.gif
diff --git a/plugins/UserCountryMap/img/regions.png b/plugins/UserCountryMap/images/regions.png
similarity index 100%
rename from plugins/UserCountryMap/img/regions.png
rename to plugins/UserCountryMap/images/regions.png
diff --git a/plugins/UserCountryMap/img/zoom-out-disabled.png b/plugins/UserCountryMap/images/zoom-out-disabled.png
similarity index 100%
rename from plugins/UserCountryMap/img/zoom-out-disabled.png
rename to plugins/UserCountryMap/images/zoom-out-disabled.png
diff --git a/plugins/UserCountryMap/img/zoom-out.png b/plugins/UserCountryMap/images/zoom-out.png
similarity index 100%
rename from plugins/UserCountryMap/img/zoom-out.png
rename to plugins/UserCountryMap/images/zoom-out.png
diff --git a/plugins/UserCountryMap/img/info.png b/plugins/UserCountryMap/img/info.png
deleted file mode 100644
index 23b8095c7ff04ec8411fa6dd52e6336a1e3c1403..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzM}pAgso
z|NjG-KoA}t9uyR`X3d%-M~>XRd-v+qt1n-^1Tui+=g*&i|Ni~``*)z?^(*JCSTuD?
zPi?o|%P^oe;gTS~U<N@YW8<{)nKM_d+I{!kJD{@vfgZwfKxxhbkH}&M25un`X1sK_
z?hjB<ro=U(Bsf2<q&%@GmBBG3KPgqgEwd=KJijQrSiw2iv~cTVGoU&NkUHn0)Wnj^
z{5*w_%-mE417ke{Lp>t{L*r9dE9`-4(mh=qLnNlQ_MaAOP~dQpyfjbj<^TGerix9W
z<qM7E*xEWc5||a3_jGPFh^p-<X3g09`uDl2Wt=S;^KY_5I_5VQ8EvfTh}Bqn_w#yz
z-7C4TUOB!i;P|g3-q@UwpbrKYYc8F!eJAmsvBaOtI-)Ei7icAer>mdKI;Vst0F^qF
AjsO4v
diff --git a/plugins/UserCountryMap/img/world.png b/plugins/UserCountryMap/img/world.png
deleted file mode 100644
index 00b7b215fecd13874ea513f941bbee34ea0f84d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 384
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzxApAgso
z|Nnpa`RB^LHz&^BJ$mZ;-c$Fs@4L8l>(;efj&51IWbLv!GiT16HMy;)r>C)VR!d7u
zaqE(zmRW5zxz*Lxb;Zerg$0R;iRXVBW&#ZqFA4GsW&oOq1#IXpz7JHwS>O>_%)r1c
z1j3A$?$-SQ3QCl?MwB=gr6!hS=I1GdWag$a7#QmrnCTfA7#c0OULgonBLh+soS#-w
zo>-L1;Fyx1l&avCS(I9yUzA;};2dmPxb?9aP+hX8i(`ny)ZV_+Vhsu$E=$YPG=;zZ
zpD&fAUw-fI9cJcZAwpA>CVg5d!nxs(aM+Y+7Ri?)`b;UCcTPQ#`0|$GcA55dYj)57
zrN-UYtF-*Z!tGb86KaY?m}TxYewk5P{8QU_wwK;~PnK`fy(%97tz+<X^>bP0l+XkK
DsB@$d
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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/affix-arrow.png
rename to plugins/Zeitgeist/images/affix-arrow.png
diff --git a/plugins/Zeitgeist/theme/images/arr_r.png b/plugins/Zeitgeist/images/arr_r.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/arr_r.png
rename to plugins/Zeitgeist/images/arr_r.png
diff --git a/plugins/Zeitgeist/theme/images/background-submit.png b/plugins/Zeitgeist/images/background-submit.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/background-submit.png
rename to plugins/Zeitgeist/images/background-submit.png
diff --git a/plugins/Zeitgeist/theme/images/chart_bar.png b/plugins/Zeitgeist/images/chart_bar.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/chart_bar.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/chart_line_edit.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/chart_line_edit_bg.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/chart_pie.png
rename to plugins/Zeitgeist/images/chart_pie.png
diff --git a/plugins/Zeitgeist/theme/images/close.png b/plugins/Zeitgeist/images/close.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/close.png
rename to plugins/Zeitgeist/images/close.png
diff --git a/plugins/Zeitgeist/theme/images/collapsed_arrows.gif b/plugins/Zeitgeist/images/collapsed_arrows.gif
similarity index 100%
rename from plugins/Zeitgeist/theme/images/collapsed_arrows.gif
rename to plugins/Zeitgeist/images/collapsed_arrows.gif
diff --git a/plugins/Zeitgeist/theme/images/configure-highlight.png b/plugins/Zeitgeist/images/configure-highlight.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/configure-highlight.png
rename to plugins/Zeitgeist/images/configure-highlight.png
diff --git a/plugins/Zeitgeist/theme/images/configure.png b/plugins/Zeitgeist/images/configure.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/configure.png
rename to plugins/Zeitgeist/images/configure.png
diff --git a/plugins/Zeitgeist/theme/images/dashboard_h_bg.png b/plugins/Zeitgeist/images/dashboard_h_bg.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/dashboard_h_bg.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/dashboard_h_bg_hover.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/data_table_footer_active_item.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/datepicker_arr_l.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/datepicker_arr_r.png
rename to plugins/Zeitgeist/images/datepicker_arr_r.png
diff --git a/plugins/Zeitgeist/theme/images/delete.png b/plugins/Zeitgeist/images/delete.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/delete.png
rename to plugins/Zeitgeist/images/delete.png
diff --git a/plugins/Zeitgeist/theme/images/download.png b/plugins/Zeitgeist/images/download.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/download.png
rename to plugins/Zeitgeist/images/download.png
diff --git a/plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif b/plugins/Zeitgeist/images/ecommerceAbandonedCart.gif
similarity index 100%
rename from plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif
rename to plugins/Zeitgeist/images/ecommerceAbandonedCart.gif
diff --git a/plugins/Zeitgeist/theme/images/ecommerceOrder.gif b/plugins/Zeitgeist/images/ecommerceOrder.gif
similarity index 100%
rename from plugins/Zeitgeist/theme/images/ecommerceOrder.gif
rename to plugins/Zeitgeist/images/ecommerceOrder.gif
diff --git a/plugins/Zeitgeist/theme/images/email.png b/plugins/Zeitgeist/images/email.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/email.png
rename to plugins/Zeitgeist/images/email.png
diff --git a/plugins/Zeitgeist/theme/images/error.png b/plugins/Zeitgeist/images/error.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/error.png
rename to plugins/Zeitgeist/images/error.png
diff --git a/plugins/Zeitgeist/theme/images/error_medium.png b/plugins/Zeitgeist/images/error_medium.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/error_medium.png
rename to plugins/Zeitgeist/images/error_medium.png
diff --git a/plugins/Zeitgeist/theme/images/expanded_arrows.gif b/plugins/Zeitgeist/images/expanded_arrows.gif
similarity index 100%
rename from plugins/Zeitgeist/theme/images/expanded_arrows.gif
rename to plugins/Zeitgeist/images/expanded_arrows.gif
diff --git a/plugins/Zeitgeist/theme/images/export.png b/plugins/Zeitgeist/images/export.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/export.png
rename to plugins/Zeitgeist/images/export.png
diff --git a/plugins/Zeitgeist/theme/images/feed.png b/plugins/Zeitgeist/images/feed.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/feed.png
rename to plugins/Zeitgeist/images/feed.png
diff --git a/plugins/Zeitgeist/theme/images/fullscreen.png b/plugins/Zeitgeist/images/fullscreen.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/fullscreen.png
rename to plugins/Zeitgeist/images/fullscreen.png
diff --git a/plugins/Zeitgeist/theme/images/goal.png b/plugins/Zeitgeist/images/goal.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/goal.png
rename to plugins/Zeitgeist/images/goal.png
diff --git a/plugins/Zeitgeist/theme/images/grey_marker.png b/plugins/Zeitgeist/images/grey_marker.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/grey_marker.png
rename to plugins/Zeitgeist/images/grey_marker.png
diff --git a/plugins/Zeitgeist/theme/images/help.png b/plugins/Zeitgeist/images/help.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/help.png
rename to plugins/Zeitgeist/images/help.png
diff --git a/plugins/Zeitgeist/theme/images/help_grey.png b/plugins/Zeitgeist/images/help_grey.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/help_grey.png
rename to plugins/Zeitgeist/images/help_grey.png
diff --git a/plugins/Zeitgeist/theme/images/html_icon.png b/plugins/Zeitgeist/images/html_icon.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/html_icon.png
rename to plugins/Zeitgeist/images/html_icon.png
diff --git a/plugins/Zeitgeist/theme/images/ico_alert.png b/plugins/Zeitgeist/images/ico_alert.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/ico_alert.png
rename to plugins/Zeitgeist/images/ico_alert.png
diff --git a/plugins/Zeitgeist/theme/images/ico_delete.png b/plugins/Zeitgeist/images/ico_delete.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/ico_delete.png
rename to plugins/Zeitgeist/images/ico_delete.png
diff --git a/plugins/Zeitgeist/theme/images/ico_edit.png b/plugins/Zeitgeist/images/ico_edit.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/ico_edit.png
rename to plugins/Zeitgeist/images/ico_edit.png
diff --git a/plugins/Zeitgeist/theme/images/ico_info.png b/plugins/Zeitgeist/images/ico_info.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/ico_info.png
rename to plugins/Zeitgeist/images/ico_info.png
diff --git a/plugins/Zeitgeist/theme/images/icon-calendar.gif b/plugins/Zeitgeist/images/icon-calendar.gif
similarity index 100%
rename from plugins/Zeitgeist/theme/images/icon-calendar.gif
rename to plugins/Zeitgeist/images/icon-calendar.gif
diff --git a/plugins/Zeitgeist/theme/images/image.png b/plugins/Zeitgeist/images/image.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/image.png
rename to plugins/Zeitgeist/images/image.png
diff --git a/plugins/Zeitgeist/theme/images/inp_bg.png b/plugins/Zeitgeist/images/inp_bg.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/inp_bg.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/li_dbl_gray.gif
rename to plugins/Zeitgeist/images/li_dbl_gray.gif
diff --git a/plugins/Zeitgeist/theme/images/link.gif b/plugins/Zeitgeist/images/link.gif
similarity index 100%
rename from plugins/Zeitgeist/theme/images/link.gif
rename to plugins/Zeitgeist/images/link.gif
diff --git a/plugins/Zeitgeist/theme/images/loading-blue.gif b/plugins/Zeitgeist/images/loading-blue.gif
similarity index 100%
rename from plugins/Zeitgeist/theme/images/loading-blue.gif
rename to plugins/Zeitgeist/images/loading-blue.gif
diff --git a/plugins/Zeitgeist/theme/images/login-sprite.png b/plugins/Zeitgeist/images/login-sprite.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/login-sprite.png
rename to plugins/Zeitgeist/images/login-sprite.png
diff --git a/plugins/Zeitgeist/theme/images/logo-header.png b/plugins/Zeitgeist/images/logo-header.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/logo-header.png
rename to plugins/Zeitgeist/images/logo-header.png
diff --git a/plugins/Zeitgeist/theme/images/logo.png b/plugins/Zeitgeist/images/logo.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/logo.png
rename to plugins/Zeitgeist/images/logo.png
diff --git a/plugins/Zeitgeist/theme/images/logo.svg b/plugins/Zeitgeist/images/logo.svg
similarity index 100%
rename from plugins/Zeitgeist/theme/images/logo.svg
rename to plugins/Zeitgeist/images/logo.svg
diff --git a/plugins/Zeitgeist/theme/images/maximise.png b/plugins/Zeitgeist/images/maximise.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/maximise.png
rename to plugins/Zeitgeist/images/maximise.png
diff --git a/plugins/Zeitgeist/theme/images/minimise.png b/plugins/Zeitgeist/images/minimise.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/minimise.png
rename to plugins/Zeitgeist/images/minimise.png
diff --git a/plugins/Zeitgeist/theme/images/minus.png b/plugins/Zeitgeist/images/minus.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/minus.png
rename to plugins/Zeitgeist/images/minus.png
diff --git a/plugins/Zeitgeist/theme/images/newtab.png b/plugins/Zeitgeist/images/newtab.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/newtab.png
rename to plugins/Zeitgeist/images/newtab.png
diff --git a/plugins/Zeitgeist/theme/images/ok.png b/plugins/Zeitgeist/images/ok.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/ok.png
rename to plugins/Zeitgeist/images/ok.png
diff --git a/plugins/Zeitgeist/theme/images/page_border_grad.png b/plugins/Zeitgeist/images/page_border_grad.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/page_border_grad.png
rename to plugins/Zeitgeist/images/page_border_grad.png
diff --git a/plugins/Zeitgeist/theme/images/paypal_subscribe.gif b/plugins/Zeitgeist/images/paypal_subscribe.gif
similarity index 100%
rename from plugins/Zeitgeist/theme/images/paypal_subscribe.gif
rename to plugins/Zeitgeist/images/paypal_subscribe.gif
diff --git a/plugins/Zeitgeist/theme/images/plus.png b/plugins/Zeitgeist/images/plus.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/plus.png
rename to plugins/Zeitgeist/images/plus.png
diff --git a/plugins/Zeitgeist/theme/images/plus_blue.png b/plugins/Zeitgeist/images/plus_blue.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/plus_blue.png
rename to plugins/Zeitgeist/images/plus_blue.png
diff --git a/plugins/Zeitgeist/theme/images/refresh.png b/plugins/Zeitgeist/images/refresh.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/refresh.png
rename to plugins/Zeitgeist/images/refresh.png
diff --git a/plugins/Zeitgeist/theme/images/reload.png b/plugins/Zeitgeist/images/reload.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/reload.png
rename to plugins/Zeitgeist/images/reload.png
diff --git a/plugins/Zeitgeist/theme/images/row_evolution.png b/plugins/Zeitgeist/images/row_evolution.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/row_evolution.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/row_evolution_hover.png
rename to plugins/Zeitgeist/images/row_evolution_hover.png
diff --git a/plugins/Zeitgeist/theme/images/search_bg.png b/plugins/Zeitgeist/images/search_bg.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/search_bg.png
rename to plugins/Zeitgeist/images/search_bg.png
diff --git a/plugins/Zeitgeist/theme/images/search_ico.png b/plugins/Zeitgeist/images/search_ico.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/search_ico.png
rename to plugins/Zeitgeist/images/search_ico.png
diff --git a/plugins/Zeitgeist/theme/images/sites_selection.png b/plugins/Zeitgeist/images/sites_selection.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/sites_selection.png
rename to plugins/Zeitgeist/images/sites_selection.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_0.png b/plugins/Zeitgeist/images/smileyprog_0.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/smileyprog_0.png
rename to plugins/Zeitgeist/images/smileyprog_0.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_1.png b/plugins/Zeitgeist/images/smileyprog_1.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/smileyprog_1.png
rename to plugins/Zeitgeist/images/smileyprog_1.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_2.png b/plugins/Zeitgeist/images/smileyprog_2.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/smileyprog_2.png
rename to plugins/Zeitgeist/images/smileyprog_2.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_3.png b/plugins/Zeitgeist/images/smileyprog_3.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/smileyprog_3.png
rename to plugins/Zeitgeist/images/smileyprog_3.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_4.png b/plugins/Zeitgeist/images/smileyprog_4.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/smileyprog_4.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/sort_subtable_asc.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/sort_subtable_asc_light.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/sort_subtable_desc.png
rename to 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
similarity index 100%
rename from plugins/Zeitgeist/theme/images/sort_subtable_desc_light.png
rename to plugins/Zeitgeist/images/sort_subtable_desc_light.png
diff --git a/plugins/Zeitgeist/theme/images/sortasc.png b/plugins/Zeitgeist/images/sortasc.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/sortasc.png
rename to plugins/Zeitgeist/images/sortasc.png
diff --git a/plugins/Zeitgeist/theme/images/sortdesc.png b/plugins/Zeitgeist/images/sortdesc.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/sortdesc.png
rename to plugins/Zeitgeist/images/sortdesc.png
diff --git a/plugins/Zeitgeist/theme/images/star.png b/plugins/Zeitgeist/images/star.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/star.png
rename to plugins/Zeitgeist/images/star.png
diff --git a/plugins/Zeitgeist/theme/images/star_empty.png b/plugins/Zeitgeist/images/star_empty.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/star_empty.png
rename to plugins/Zeitgeist/images/star_empty.png
diff --git a/plugins/Zeitgeist/theme/images/success_medium.png b/plugins/Zeitgeist/images/success_medium.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/success_medium.png
rename to plugins/Zeitgeist/images/success_medium.png
diff --git a/plugins/Zeitgeist/theme/images/table.png b/plugins/Zeitgeist/images/table.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/table.png
rename to plugins/Zeitgeist/images/table.png
diff --git a/plugins/Zeitgeist/theme/images/table_more.png b/plugins/Zeitgeist/images/table_more.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/table_more.png
rename to plugins/Zeitgeist/images/table_more.png
diff --git a/plugins/Zeitgeist/theme/images/tagcloud.png b/plugins/Zeitgeist/images/tagcloud.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/tagcloud.png
rename to plugins/Zeitgeist/images/tagcloud.png
diff --git a/plugins/Zeitgeist/theme/images/video_play.png b/plugins/Zeitgeist/images/video_play.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/video_play.png
rename to plugins/Zeitgeist/images/video_play.png
diff --git a/plugins/Zeitgeist/theme/images/warning.png b/plugins/Zeitgeist/images/warning.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/warning.png
rename to plugins/Zeitgeist/images/warning.png
diff --git a/plugins/Zeitgeist/theme/images/warning_medium.png b/plugins/Zeitgeist/images/warning_medium.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/warning_medium.png
rename to plugins/Zeitgeist/images/warning_medium.png
diff --git a/plugins/Zeitgeist/theme/images/warning_small.png b/plugins/Zeitgeist/images/warning_small.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/warning_small.png
rename to plugins/Zeitgeist/images/warning_small.png
diff --git a/plugins/Zeitgeist/theme/images/yellow_marker.png b/plugins/Zeitgeist/images/yellow_marker.png
similarity index 100%
rename from plugins/Zeitgeist/theme/images/yellow_marker.png
rename to 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
--
GitLab