From 16dffb456eae335983aacf79317178614c6ee492 Mon Sep 17 00:00:00 2001 From: Thomas ZILLIOX Date: Wed, 8 May 2013 16:51:57 +0200 Subject: [PATCH 1/4] 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 b5e2064980e..3b5947bfd18 100644 --- a/core/DataTable.php +++ b/core/DataTable.php @@ -40,7 +40,7 @@ * '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 @@ * '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 1d8b92dbd6a..810a01a8c2b 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -485,7 +485,7 @@ public function getHeaderLogoUrl($pathOnly = false) */ 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 e3144413afa..e3e879c403b 100755 --- a/plugins/Annotations/templates/annotation.twig +++ b/plugins/Annotations/templates/annotation.twig @@ -3,9 +3,9 @@
{% if annotation.starred %} - + {% else %} - + {% endif %}
({{ annotation.date }})
diff --git a/plugins/Annotations/templates/annotationManager.twig b/plugins/Annotations/templates/annotationManager.twig index 6d79f1ac086..8cd93e2b10e 100755 --- a/plugins/Annotations/templates/annotationManager.twig +++ b/plugins/Annotations/templates/annotationManager.twig @@ -12,7 +12,7 @@
{% include "@Annotations/annotations.twig" %} - +
diff --git a/plugins/Annotations/templates/evolutionAnnotations.twig b/plugins/Annotations/templates/evolutionAnnotations.twig index b860d348d88..f2475c2416d 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 %}> - + {% endfor %} diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index bd82f8687d7..430dc195c96 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 %}
- + {{ 'General_Warning'|translate }}: {{ invalidHostMessage }}
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 daddbc86b0f..95270546479 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 49725bead68..219fc7e3a89 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 = $('\ - \ + \ ') .click(function () { $('#keyword', target).val(''); diff --git a/plugins/CoreHome/templates/datatable_cell.twig b/plugins/CoreHome/templates/datatable_cell.twig index 7ec96403c0e..dab9a6401d9 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 %} {% if row.metadata.logo is empty %} - + {% endif %} {% endif %} {% if column=='label' %} diff --git a/plugins/CoreHome/templates/datatable_footer.twig b/plugins/CoreHome/templates/datatable_footer.twig index 7d6f0c0fe7a..bf4e9320680 100644 --- a/plugins/CoreHome/templates/datatable_footer.twig +++ b/plugins/CoreHome/templates/datatable_footer.twig @@ -20,38 +20,38 @@ {% endif %} - + {% if properties.show_footer_icons %}
{% if not properties.hide_all_views_icons %} - + {% endif %}
{% if properties.show_table %} - + {% endif %} {% if properties.show_table_all_columns %} - + {% endif %} {% if properties.show_goals %} + src="plugins/Zeitgeist/images/{% if javascriptVariablesToSet.idGoal is defined and javascriptVariablesToSet.idGoal=='ecommerceOrder' %}ecommerceOrder.gif{% else %}goal.png{% endif %}"/> {% endif %} {% if properties.show_ecommerce %} - + {{ 'General_EcommerceOrders'|translate }} - + {{ 'General_AbandonedCarts'|translate }} {% endif %} @@ -62,17 +62,17 @@ {% if properties.show_bar_chart %} - + {% endif %} {% if properties.show_pie_chart %} - + {% endif %} {% if properties.show_tag_cloud %} - + {% endif %} @@ -81,7 +81,7 @@
- +
@@ -89,7 +89,7 @@
- + {% if properties.show_export_as_image_icon %} - + {% endif %} @@ -139,7 +139,7 @@ {% if not properties.hide_annotations_view %}
- + {{ 'Annotations_Annotations'|translate }}
@@ -170,6 +170,6 @@
- +
diff --git a/plugins/CoreHome/templates/donate.js b/plugins/CoreHome/templates/donate.js index a73f12a7c34..bd540109da6 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 6e51a0ea1ba..c33dfffe9eb 100755 --- a/plugins/CoreHome/templates/donate.twig +++ b/plugins/CoreHome/templates/donate.twig @@ -26,14 +26,14 @@
$30/{{ 'General_YearShort_js'|translate }}
- +
diff --git a/plugins/UsersManager/templates/UsersManager.twig b/plugins/UsersManager/templates/UsersManager.twig index abfa4db87a3..883952079d9 100644 --- a/plugins/UsersManager/templates/UsersManager.twig +++ b/plugins/UsersManager/templates/UsersManager.twig @@ -147,13 +147,13 @@ {{ user.token_auth }} - + {{ 'General_Edit'|translate }} - + {{ 'General_Delete'|translate }} diff --git a/plugins/Zeitgeist/theme/simple_structure_header.tpl b/plugins/Zeitgeist/theme/simple_structure_header.tpl index 4d6252bd260..ee859328567 100644 --- a/plugins/Zeitgeist/theme/simple_structure_header.tpl +++ b/plugins/Zeitgeist/theme/simple_structure_header.tpl @@ -9,4 +9,4 @@
- + 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 9c3a7655b05..fb59c0afaa7 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml @@ -8,7 +8,7 @@ new 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -22,7 +22,7 @@ 44 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -111,7 +111,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 1 @@ -136,7 +136,7 @@ 22 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png search @@ -151,7 +151,7 @@ Bring on the party - themes/default/images/search_ico.png + plugins/Zeitgeist/images/search_ico.png goal @@ -161,7 +161,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png @@ -249,7 +249,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -263,7 +263,7 @@ 21 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -370,7 +370,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -393,7 +393,7 @@ 20 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png goal @@ -403,7 +403,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png @@ -491,7 +491,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -505,7 +505,7 @@ 19 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -612,7 +612,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 1 @@ -637,7 +637,7 @@ 17 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png search @@ -652,7 +652,7 @@ Bring on the party - themes/default/images/search_ico.png + plugins/Zeitgeist/images/search_ico.png goal @@ -662,7 +662,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png @@ -750,7 +750,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -764,7 +764,7 @@ 16 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -871,7 +871,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -894,7 +894,7 @@ 15 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png goal @@ -904,7 +904,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png @@ -992,7 +992,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -1006,7 +1006,7 @@ 14 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -1113,7 +1113,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 1 @@ -1138,7 +1138,7 @@ 12 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png search @@ -1153,7 +1153,7 @@ Bring on the party - themes/default/images/search_ico.png + plugins/Zeitgeist/images/search_ico.png goal @@ -1163,7 +1163,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png 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 9c3a7655b05..fb59c0afaa7 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -8,7 +8,7 @@ new 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -22,7 +22,7 @@ 44 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -111,7 +111,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 1 @@ -136,7 +136,7 @@ 22 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png search @@ -151,7 +151,7 @@ Bring on the party - themes/default/images/search_ico.png + plugins/Zeitgeist/images/search_ico.png goal @@ -161,7 +161,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png @@ -249,7 +249,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -263,7 +263,7 @@ 21 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -370,7 +370,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -393,7 +393,7 @@ 20 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png goal @@ -403,7 +403,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png @@ -491,7 +491,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -505,7 +505,7 @@ 19 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -612,7 +612,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 1 @@ -637,7 +637,7 @@ 17 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png search @@ -652,7 +652,7 @@ Bring on the party - themes/default/images/search_ico.png + plugins/Zeitgeist/images/search_ico.png goal @@ -662,7 +662,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png @@ -750,7 +750,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -764,7 +764,7 @@ 16 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -871,7 +871,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -894,7 +894,7 @@ 15 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png goal @@ -904,7 +904,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png @@ -992,7 +992,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -1006,7 +1006,7 @@ 14 http://piwik.net/grue/lair - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -1113,7 +1113,7 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 1 @@ -1138,7 +1138,7 @@ 12 http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png search @@ -1153,7 +1153,7 @@ Bring on the party - themes/default/images/search_ico.png + plugins/Zeitgeist/images/search_ico.png goal @@ -1163,7 +1163,7 @@ http://piwik.net/space/quest/iv - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png 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 84165383dd8..03d74fc49c5 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 @@ -8,7 +8,7 @@ returning plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -22,7 +22,7 @@ 9 http://example.org/store/purchase.htm - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -112,7 +112,7 @@ new 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 1 @@ -151,7 +151,7 @@ 360 6 min 0s - themes/default/images/link.gif + plugins/Zeitgeist/images/link.gif download @@ -162,7 +162,7 @@ 72 1 min 12s - themes/default/images/download.png + plugins/Zeitgeist/images/download.png outlink @@ -173,7 +173,7 @@ 108 1 min 48s - themes/default/images/link.gif + plugins/Zeitgeist/images/link.gif outlink @@ -184,7 +184,7 @@ 72 1 min 12s - themes/default/images/link.gif + plugins/Zeitgeist/images/link.gif goal @@ -194,7 +194,7 @@ http://example.org/ - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png search @@ -206,7 +206,7 @@ 1 min 48s 0.81s Banks Own The World - themes/default/images/search_ico.png + plugins/Zeitgeist/images/search_ico.png action 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 d7aa0fa4d97..432d4682c27 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 @@ -101,7 +101,7 @@ new 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -124,7 +124,7 @@ http://example.org/this%20is%20cool! - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html index e4cd94f4889..5f4ae74a2d9 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html @@ -4,7 +4,7 @@ -Piwik +Piwik

Website Site 1

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 0f14630b1b1..b90f33cff51 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 @@ -4,7 +4,7 @@ -Piwik +Piwik

Website Site 1

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 7d014c73038..2cf1b9b0094 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 @@ -4,7 +4,7 @@ -Piwik +Piwik

Website Site 1

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 fae2d87e22b..0142c9f17f2 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 @@ -8,9 +8,9 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png ordered - themes/default/images/ecommerceOrder.gif + plugins/Zeitgeist/images/ecommerceOrder.gif 0 0 @@ -33,7 +33,7 @@ 2 - themes/default/images/ecommerceOrder.gif + plugins/Zeitgeist/images/ecommerceOrder.gif ecommerceOrder @@ -47,7 +47,7 @@ - themes/default/images/ecommerceOrder.gif + plugins/Zeitgeist/images/ecommerceOrder.gif @@ -139,9 +139,9 @@ returningCustomer plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png orderedThenAbandonedCart - themes/default/images/ecommerceOrder.gif + plugins/Zeitgeist/images/ecommerceOrder.gif 0 3 @@ -254,7 +254,7 @@ 2 - themes/default/images/ecommerceAbandonedCart.gif + plugins/Zeitgeist/images/ecommerceAbandonedCart.gif 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 2a60c21ab0e..81bc20e620c 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -10,7 +10,7 @@ 0 abandonedCart - themes/default/images/ecommerceAbandonedCart.gif + plugins/Zeitgeist/images/ecommerceAbandonedCart.gif 0 3 @@ -123,7 +123,7 @@ 2 - themes/default/images/ecommerceAbandonedCart.gif + plugins/Zeitgeist/images/ecommerceAbandonedCart.gif @@ -215,9 +215,9 @@ returning plugins/Live/images/returningVisitor.gif 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png orderedThenAbandonedCart - themes/default/images/ecommerceOrder.gif + plugins/Zeitgeist/images/ecommerceOrder.gif 0 6 @@ -310,7 +310,7 @@ 6 - themes/default/images/ecommerceOrder.gif + plugins/Zeitgeist/images/ecommerceOrder.gif ecommerceOrder @@ -338,7 +338,7 @@ 1 - themes/default/images/ecommerceOrder.gif + plugins/Zeitgeist/images/ecommerceOrder.gif action @@ -449,7 +449,7 @@ 2 - themes/default/images/ecommerceAbandonedCart.gif + plugins/Zeitgeist/images/ecommerceAbandonedCart.gif @@ -541,7 +541,7 @@ new 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -555,7 +555,7 @@ 1 http://example.org/index.htm - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html index 1535909d2ef..7be9c6ddd31 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html @@ -4,7 +4,7 @@ -Piwik +Piwik

Website Piwik test

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 f174d5f124e..7e8fdcda884 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 @@ -4,7 +4,7 @@ -Piwik +Piwik

Website Piwik test

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 e02c135ae85..46dc8711852 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 @@ -4,7 +4,7 @@ -Piwik +Piwik

Website Piwik test

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 091eb38ae43..77fd7a3cdde 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 @@ -21,7 +21,7 @@ 6 5 - themes/default/images/link.gif + plugins/Zeitgeist/images/link.gif @@ -109,7 +109,7 @@ new 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -123,7 +123,7 @@ http://example.org/homepage - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -220,7 +220,7 @@ new 1 - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png none 0 @@ -234,7 +234,7 @@ http://example.org/homepage - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action @@ -255,7 +255,7 @@ http://example.org/user/profile - themes/default/images/goal.png + plugins/Zeitgeist/images/goal.png action diff --git a/tests/webtest/testcases/level0/1.1-install.disabled b/tests/webtest/testcases/level0/1.1-install.disabled index f826c27cd69..b75a929b40e 100644 --- a/tests/webtest/testcases/level0/1.1-install.disabled +++ b/tests/webtest/testcases/level0/1.1-install.disabled @@ -63,10 +63,10 @@ &verifyLinksAndImages; - + - + @@ -102,17 +102,17 @@ - + - + - + &checkForErrors; &verifyLinksAndImages; @@ -138,11 +138,11 @@ - + - + @@ -161,11 +161,11 @@ - + - + diff --git a/tests/webtest/testcases/level1/1.5-install.xml b/tests/webtest/testcases/level1/1.5-install.xml index 91f87b5a5aa..affa55960bf 100644 --- a/tests/webtest/testcases/level1/1.5-install.xml +++ b/tests/webtest/testcases/level1/1.5-install.xml @@ -63,10 +63,10 @@ &verifyLinksAndImages; - + - + @@ -102,17 +102,17 @@ - + - + - + &checkForErrors; &verifyLinksAndImages; @@ -138,11 +138,11 @@ - + - + @@ -161,11 +161,11 @@ - + - + diff --git a/tests/webtest/testcases/modules/macros.xml b/tests/webtest/testcases/modules/macros.xml index 88c60af20e6..9236d7825b0 100644 --- a/tests/webtest/testcases/modules/macros.xml +++ b/tests/webtest/testcases/modules/macros.xml @@ -147,7 +147,7 @@ - + @@ -169,7 +169,7 @@ - + From b830387b839f6a1732d310e26fa81de27e19ff95 Mon Sep 17 00:00:00 2001 From: Thomas ZILLIOX Date: Wed, 8 May 2013 18:42:09 +0200 Subject: [PATCH 3/4] Reorganizing the stylesheets & javascripts folders for every plugins --- core/AssetManager.php | 10 +- core/Controller.php | 2 +- core/Piwik.php | 2 +- core/Twig.php | 2 +- core/ViewDataTable.php | 2 +- core/testMinimumPhpVersion.php | 4 +- plugins/API/API.php | 2 +- .../styles.css => stylesheets/listAllAPI.css} | 0 plugins/Annotations/Annotations.php | 4 +- .../{templates => javascripts}/annotations.js | 0 .../annotations.css} | 0 plugins/CoreAdminHome/CoreAdminHome.php | 18 +-- .../generalSettings.js | 0 .../jsTrackingGenerator.js | 0 .../generalSettings.css} | 0 .../jsTrackingGenerator.css | 0 .../{templates => stylesheets}/menu.css | 0 .../templates/jsTrackingGenerator.twig | 4 +- plugins/CoreHome/CoreHome.php | 49 ++++---- .../autocomplete.js | 0 .../{templates => javascripts}/broadcast.js | 4 +- .../{templates => javascripts}/calendar.js | 0 .../misc.js => javascripts/corehome.js} | 0 .../{templates => javascripts}/datatable.js | 0 .../datatable_manager.js | 0 .../datatable_rowactions.js | 0 .../{templates => javascripts}/date.js | 0 .../{templates => javascripts}/donate.js | 0 .../{templates => javascripts}/jqplot.js | 0 .../{templates => javascripts}/menu.js | 0 .../{templates => javascripts}/menu_init.js | 0 .../{templates => javascripts}/popover.js | 0 .../{templates => javascripts}/sparkline.js | 0 .../{templates => stylesheets}/cloud.css | 0 .../styles.css => stylesheets/corehome.css} | 6 +- .../{templates => stylesheets}/datatable.css | 16 +-- .../{templates => stylesheets}/donate.css | 0 .../{templates => stylesheets}/jqplot.css | 8 +- .../jquery.ui.autocomplete.css | 0 .../{templates => stylesheets}/menu.css | 0 .../CoreHome/templates/js_css_includes.twig | 2 +- plugins/CoreUpdater/templates/layout.twig | 12 +- plugins/Dashboard/Dashboard.php | 2 +- plugins/ExampleRssWidget/ExampleRssWidget.php | 2 +- .../styles.css => stylesheets/rss.css} | 0 plugins/Feedback/Feedback.php | 4 +- .../{templates => javascripts}/feedback.js | 0 .../styles.css => stylesheets/feedback.css} | 0 plugins/Goals/Goals.php | 4 +- .../GoalForm.js => javascripts/goalsForm.js} | 0 .../{templates => stylesheets}/goals.css | 0 plugins/Goals/templates/overview.twig | 2 +- plugins/Goals/templates/single_goal.twig | 2 +- plugins/Installation/Installation.php | 2 +- .../installation.css} | 0 .../systemCheckPage.css | 0 plugins/Installation/templates/structure.twig | 8 +- plugins/LanguagesManager/LanguagesManager.php | 8 +- .../languageSelector.js | 0 plugins/Live/Live.php | 4 +- .../scripts => javascripts}/live.js | 0 .../Live/{templates => stylesheets}/live.css | 0 .../Login/{templates => javascripts}/login.js | 0 .../{templates => stylesheets}/login.css | 4 +- plugins/Login/templates/login.twig | 6 +- plugins/MobileMessaging/MobileMessaging.php | 2 +- .../MobileMessagingSettings.js | 0 plugins/MultiSites/MultiSites.php | 4 +- .../common.js => javascripts/multiSites.js} | 0 .../styles.css => stylesheets/multiSites.css} | 4 +- plugins/Overlay/Overlay.php | 4 +- .../Overlay_Helper.js} | 0 .../index.js => javascripts/Piwik_Overlay.js} | 0 .../{templates => javascripts}/rowaction.js | 0 .../index.css => stylesheets/overlay.css} | 8 +- plugins/Overlay/templates/index.twig | 4 +- plugins/Overlay/templates/sidebar.twig | 2 +- plugins/PDFReports/PDFReports.php | 2 +- .../{templates => javascripts}/pdf.js | 0 plugins/PrivacyManager/PrivacyManager.php | 2 +- .../privacySettings.js | 0 .../SEO/{templates => javascripts}/rank.js | 0 plugins/SEO/templates/index.twig | 2 +- plugins/SegmentEditor/SegmentEditor.php | 14 +-- .../Segmentation.js | 0 .../jquery.jscrollpane.js | 0 .../jquery.mousewheel.js | 0 .../mwheelIntent.js | 0 .../jquery.jscrollpane.css | 0 .../{templates => stylesheets}/scroll.css | 0 .../segmentation.css} | 10 +- plugins/SitesManager/SitesManager.php | 4 +- .../SitesManager.js | 0 plugins/Transitions/Transitions.php | 4 +- .../{templates => javascripts}/transitions.js | 0 .../transitions.css | 0 plugins/UserCountry/UserCountry.php | 4 +- .../admin.js => javascripts/userCountry.js} | 118 +++++++++--------- .../userCountry.css} | 0 plugins/UserCountryMap/Controller.php | 2 +- plugins/UserCountryMap/UserCountryMap.php | 16 +-- .../{js => javascripts}/realtime-map.js | 0 .../{js => javascripts}/vendor/chroma.min.js | 0 .../vendor/jquery.qtip.min.js | 0 .../{js => javascripts}/vendor/kartograph.js | 0 .../vendor/kartograph.min.js | 0 .../{js => javascripts}/vendor/kmeans.js | 0 .../{js => javascripts}/vendor/raphael.min.js | 0 .../{js => javascripts}/visitor-map.js | 0 .../{css => stylesheets}/map.css | 0 .../{css => stylesheets}/realtime-map.css | 0 .../{css => stylesheets}/visitor-map.css | 0 plugins/UsersManager/UsersManager.php | 4 +- .../usersManager.js} | 0 .../usersSettings.js} | 0 plugins/Widgetize/Widgetize.php | 12 +- .../{templates => javascripts}/widgetize.js | 0 plugins/Widgetize/templates/iframe.twig | 2 +- .../{theme => javascripts}/ajaxHelper.js | 0 .../common.js => javascripts/piwikHelper.js} | 0 .../{theme => stylesheets}/common.css | 0 .../{theme => stylesheets}/ieonly.css | 0 .../Zeitgeist/{theme => stylesheets}/rtl.css | 0 .../simple_structure.css | 0 .../{theme => stylesheets}/styles.css | 0 .../Zeitgeist/{theme => templates}/admin.twig | 2 +- .../{theme => templates}/ajaxMacros.twig | 0 .../{theme => templates}/dashboard.twig | 2 +- .../{theme => templates}/genericForm.twig | 0 .../{theme => templates}/javascriptCode.tpl | 0 .../{theme => templates}/macros.twig | 0 .../simple_structure_footer.tpl | 0 .../simple_structure_header.tpl | 2 +- 133 files changed, 212 insertions(+), 213 deletions(-) rename plugins/API/{css/styles.css => stylesheets/listAllAPI.css} (100%) rename plugins/Annotations/{templates => javascripts}/annotations.js (100%) rename plugins/Annotations/{templates/styles.css => stylesheets/annotations.css} (100%) rename plugins/CoreAdminHome/{templates => javascripts}/generalSettings.js (100%) rename plugins/CoreAdminHome/{templates => javascripts}/jsTrackingGenerator.js (100%) rename plugins/CoreAdminHome/{templates/styles.css => stylesheets/generalSettings.css} (100%) rename plugins/CoreAdminHome/{templates => stylesheets}/jsTrackingGenerator.css (100%) rename plugins/CoreAdminHome/{templates => stylesheets}/menu.css (100%) rename plugins/CoreHome/{templates => javascripts}/autocomplete.js (100%) rename plugins/CoreHome/{templates => javascripts}/broadcast.js (98%) rename plugins/CoreHome/{templates => javascripts}/calendar.js (100%) rename plugins/CoreHome/{templates/misc.js => javascripts/corehome.js} (100%) rename plugins/CoreHome/{templates => javascripts}/datatable.js (100%) rename plugins/CoreHome/{templates => javascripts}/datatable_manager.js (100%) rename plugins/CoreHome/{templates => javascripts}/datatable_rowactions.js (100%) rename plugins/CoreHome/{templates => javascripts}/date.js (100%) rename plugins/CoreHome/{templates => javascripts}/donate.js (100%) rename plugins/CoreHome/{templates => javascripts}/jqplot.js (100%) rename plugins/CoreHome/{templates => javascripts}/menu.js (100%) rename plugins/CoreHome/{templates => javascripts}/menu_init.js (100%) rename plugins/CoreHome/{templates => javascripts}/popover.js (100%) rename plugins/CoreHome/{templates => javascripts}/sparkline.js (100%) rename plugins/CoreHome/{templates => stylesheets}/cloud.css (100%) rename plugins/CoreHome/{templates/styles.css => stylesheets/corehome.css} (92%) rename plugins/CoreHome/{templates => stylesheets}/datatable.css (95%) rename plugins/CoreHome/{templates => stylesheets}/donate.css (100%) rename plugins/CoreHome/{templates => stylesheets}/jqplot.css (92%) rename plugins/CoreHome/{templates => stylesheets}/jquery.ui.autocomplete.css (100%) rename plugins/CoreHome/{templates => stylesheets}/menu.css (100%) rename plugins/ExampleRssWidget/{templates/styles.css => stylesheets/rss.css} (100%) rename plugins/Feedback/{templates => javascripts}/feedback.js (100%) rename plugins/Feedback/{templates/styles.css => stylesheets/feedback.css} (100%) rename plugins/Goals/{templates/GoalForm.js => javascripts/goalsForm.js} (100%) rename plugins/Goals/{templates => stylesheets}/goals.css (100%) rename plugins/Installation/{templates/install.css => stylesheets/installation.css} (100%) rename plugins/Installation/{templates => stylesheets}/systemCheckPage.css (100%) rename plugins/LanguagesManager/{templates => javascripts}/languageSelector.js (100%) rename plugins/Live/{templates/scripts => javascripts}/live.js (100%) rename plugins/Live/{templates => stylesheets}/live.css (100%) rename plugins/Login/{templates => javascripts}/login.js (100%) rename plugins/Login/{templates => stylesheets}/login.css (96%) rename plugins/MobileMessaging/{scripts => javascripts}/MobileMessagingSettings.js (100%) rename plugins/MultiSites/{templates/common.js => javascripts/multiSites.js} (100%) rename plugins/MultiSites/{templates/styles.css => stylesheets/multiSites.css} (90%) rename plugins/Overlay/{templates/helper.js => javascripts/Overlay_Helper.js} (100%) rename plugins/Overlay/{templates/index.js => javascripts/Piwik_Overlay.js} (100%) rename plugins/Overlay/{templates => javascripts}/rowaction.js (100%) rename plugins/Overlay/{templates/index.css => stylesheets/overlay.css} (86%) rename plugins/PDFReports/{templates => javascripts}/pdf.js (100%) rename plugins/PrivacyManager/{templates => javascripts}/privacySettings.js (100%) rename plugins/SEO/{templates => javascripts}/rank.js (100%) rename plugins/SegmentEditor/{templates => javascripts}/Segmentation.js (100%) rename plugins/SegmentEditor/{templates => javascripts}/jquery.jscrollpane.js (100%) rename plugins/SegmentEditor/{templates => javascripts}/jquery.mousewheel.js (100%) rename plugins/SegmentEditor/{templates => javascripts}/mwheelIntent.js (100%) rename plugins/SegmentEditor/{templates => stylesheets}/jquery.jscrollpane.css (100%) rename plugins/SegmentEditor/{templates => stylesheets}/scroll.css (100%) rename plugins/SegmentEditor/{templates/Segmentation.css => stylesheets/segmentation.css} (97%) rename plugins/SitesManager/{templates => javascripts}/SitesManager.js (100%) rename plugins/Transitions/{templates => javascripts}/transitions.js (100%) rename plugins/Transitions/{templates => stylesheets}/transitions.css (100%) rename plugins/UserCountry/{templates/admin.js => javascripts/userCountry.js} (61%) rename plugins/UserCountry/{templates/styles.css => stylesheets/userCountry.css} (100%) rename plugins/UserCountryMap/{js => javascripts}/realtime-map.js (100%) rename plugins/UserCountryMap/{js => javascripts}/vendor/chroma.min.js (100%) rename plugins/UserCountryMap/{js => javascripts}/vendor/jquery.qtip.min.js (100%) rename plugins/UserCountryMap/{js => javascripts}/vendor/kartograph.js (100%) rename plugins/UserCountryMap/{js => javascripts}/vendor/kartograph.min.js (100%) rename plugins/UserCountryMap/{js => javascripts}/vendor/kmeans.js (100%) rename plugins/UserCountryMap/{js => javascripts}/vendor/raphael.min.js (100%) rename plugins/UserCountryMap/{js => javascripts}/visitor-map.js (100%) rename plugins/UserCountryMap/{css => stylesheets}/map.css (100%) rename plugins/UserCountryMap/{css => stylesheets}/realtime-map.css (100%) rename plugins/UserCountryMap/{css => stylesheets}/visitor-map.css (100%) rename plugins/UsersManager/{templates/UsersManager.js => javascripts/usersManager.js} (100%) rename plugins/UsersManager/{templates/userSettings.js => javascripts/usersSettings.js} (100%) rename plugins/Widgetize/{templates => javascripts}/widgetize.js (100%) rename plugins/Zeitgeist/{theme => javascripts}/ajaxHelper.js (100%) rename plugins/Zeitgeist/{theme/common.js => javascripts/piwikHelper.js} (100%) rename plugins/Zeitgeist/{theme => stylesheets}/common.css (100%) rename plugins/Zeitgeist/{theme => stylesheets}/ieonly.css (100%) rename plugins/Zeitgeist/{theme => stylesheets}/rtl.css (100%) rename plugins/Zeitgeist/{theme => stylesheets}/simple_structure.css (100%) rename plugins/Zeitgeist/{theme => stylesheets}/styles.css (100%) rename plugins/Zeitgeist/{theme => templates}/admin.twig (99%) rename plugins/Zeitgeist/{theme => templates}/ajaxMacros.twig (100%) rename plugins/Zeitgeist/{theme => templates}/dashboard.twig (97%) rename plugins/Zeitgeist/{theme => templates}/genericForm.twig (100%) rename plugins/Zeitgeist/{theme => templates}/javascriptCode.tpl (100%) rename plugins/Zeitgeist/{theme => templates}/macros.twig (100%) rename plugins/Zeitgeist/{theme => templates}/simple_structure_footer.tpl (100%) rename plugins/Zeitgeist/{theme => templates}/simple_structure_header.tpl (84%) diff --git a/core/AssetManager.php b/core/AssetManager.php index 11405b0c665..a1a1f9b14c5 100644 --- a/core/AssetManager.php +++ b/core/AssetManager.php @@ -189,8 +189,8 @@ private static function sortCssFiles($cssFiles) { $priorityCssOrdered = array( 'libs/', - 'plugins/Zeitgeist/theme/common.css', - 'plugins/Zeitgeist/theme/', + 'plugins/Zeitgeist/stylesheets/common.css', + 'plugins/Zeitgeist/stylesheets/', 'plugins/', ); @@ -284,9 +284,9 @@ private static function sortJsFiles($jsFiles) 'libs/jquery/jquery-ui.js', 'libs/jquery/jquery.browser.js', 'libs/', - 'plugins/Zeitgeist/theme/common.js', - 'plugins/Zeitgeist/theme/', - 'plugins/CoreHome/templates/broadcast.js', + 'plugins/Zeitgeist/javascripts/piwikHelper.js', + 'plugins/Zeitgeist/javascripts/', + 'plugins/CoreHome/javascripts/broadcast.js', 'plugins/', ); diff --git a/core/Controller.php b/core/Controller.php index 7619e2822e6..0ae3c333208 100644 --- a/core/Controller.php +++ b/core/Controller.php @@ -718,7 +718,7 @@ protected function getDefaultWebsiteId() */ protected function getDefaultDate() { - // NOTE: a change in this function might mean a change in plugins/UsersManager/templates/userSettings.js as well + // NOTE: a change in this function might mean a change in plugins/UsersManager/javascripts/usersSettings.js as well $userSettingsDate = Piwik_UsersManager_API::getInstance()->getUserPreference(Piwik::getCurrentUserLogin(), Piwik_UsersManager_API::PREFERENCE_DEFAULT_REPORT_DATE); if ($userSettingsDate == 'yesterday') { return $userSettingsDate; diff --git a/core/Piwik.php b/core/Piwik.php index d63af0572cb..93e4ad0afbc 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -1483,7 +1483,7 @@ static public function getPrettyNumber($value) */ static public function getJavascriptCode($idSite, $piwikUrl) { - $jsCode = file_get_contents(PIWIK_INCLUDE_PATH . "/plugins/Zeitgeist/theme/javascriptCode.tpl"); + $jsCode = file_get_contents(PIWIK_INCLUDE_PATH . "/plugins/Zeitgeist/templates/javascriptCode.tpl"); $jsCode = htmlentities($jsCode); preg_match('~^(http|https)://(.*)$~D', $piwikUrl, $matches); $piwikUrl = @$matches[2]; diff --git a/core/Twig.php b/core/Twig.php index 5cab5e82f40..a08a8a484a9 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -114,7 +114,7 @@ public function __construct($theme = self::DEFAULT_THEME) private function getDefaultThemeLoader() { $themeLoader = new Twig_Loader_Filesystem(array( - sprintf("%s/plugins/%s/theme/", PIWIK_INCLUDE_PATH, self::DEFAULT_THEME) + sprintf("%s/plugins/%s/templates/", PIWIK_INCLUDE_PATH, self::DEFAULT_THEME) )); return $themeLoader; diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php index 0a63b9f5054..99a3a40133a 100644 --- a/core/ViewDataTable.php +++ b/core/ViewDataTable.php @@ -46,7 +46,7 @@ abstract class Piwik_ViewDataTable * Template file that will be loaded for this view. * Usually set in the Piwik_ViewDataTable_* * - * @var string eg. 'CoreHome/templates/cloud.tpl' + * @var string eg. 'CoreHome/templates/cloud.twig' */ protected $dataTableTemplate = null; diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php index 48ed2d03a70..97cdeea7afd 100644 --- a/core/testMinimumPhpVersion.php +++ b/core/testMinimumPhpVersion.php @@ -77,8 +77,8 @@ function Piwik_ExitWithMessage($message, $optionalTrace = false, $optionalLinks
  • Piwik Online Demo
    • '; } - $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/theme/simple_structure_header.tpl'); - $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/theme/simple_structure_footer.tpl'); + $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_header.tpl'); + $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_footer.tpl'); $headerPage = str_replace('{$HTML_TITLE}', 'Piwik › Error', $headerPage); $content = '

    ' . $message . '

    diff --git a/plugins/API/API.php b/plugins/API/API.php index 0ea154fd6b4..df4e74e831f 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -63,7 +63,7 @@ public function getCssFiles($notification) { $cssFiles = & $notification->getNotificationObject(); - $cssFiles[] = "plugins/API/css/styles.css"; + $cssFiles[] = "plugins/API/stylesheets/listAllAPI.css"; } } diff --git a/plugins/API/css/styles.css b/plugins/API/stylesheets/listAllAPI.css similarity index 100% rename from plugins/API/css/styles.css rename to plugins/API/stylesheets/listAllAPI.css diff --git a/plugins/Annotations/Annotations.php b/plugins/Annotations/Annotations.php index 937500053ad..f8fcf713943 100755 --- a/plugins/Annotations/Annotations.php +++ b/plugins/Annotations/Annotations.php @@ -53,7 +53,7 @@ public function getListHooksRegistered() function getCssFiles($notification) { $cssFiles = & $notification->getNotificationObject(); - $cssFiles[] = "plugins/Annotations/templates/styles.css"; + $cssFiles[] = "plugins/Annotations/stylesheets/annotations.css"; } /** @@ -64,6 +64,6 @@ function getCssFiles($notification) function getJsFiles($notification) { $jsFiles = & $notification->getNotificationObject(); - $jsFiles[] = "plugins/Annotations/templates/annotations.js"; + $jsFiles[] = "plugins/Annotations/javascripts/annotations.js"; } } diff --git a/plugins/Annotations/templates/annotations.js b/plugins/Annotations/javascripts/annotations.js similarity index 100% rename from plugins/Annotations/templates/annotations.js rename to plugins/Annotations/javascripts/annotations.js diff --git a/plugins/Annotations/templates/styles.css b/plugins/Annotations/stylesheets/annotations.css similarity index 100% rename from plugins/Annotations/templates/styles.css rename to plugins/Annotations/stylesheets/annotations.css diff --git a/plugins/CoreAdminHome/CoreAdminHome.php b/plugins/CoreAdminHome/CoreAdminHome.php index c77f509e9f7..e6228d52fad 100644 --- a/plugins/CoreAdminHome/CoreAdminHome.php +++ b/plugins/CoreAdminHome/CoreAdminHome.php @@ -67,10 +67,10 @@ function getCssFiles($notification) $cssFiles = & $notification->getNotificationObject(); $cssFiles[] = "libs/jquery/themes/base/jquery-ui.css"; - $cssFiles[] = "plugins/CoreAdminHome/templates/menu.css"; - $cssFiles[] = "themes/default/common.css"; - $cssFiles[] = "plugins/CoreAdminHome/templates/styles.css"; - $cssFiles[] = "plugins/CoreHome/templates/donate.css"; + $cssFiles[] = "plugins/CoreAdminHome/stylesheets/menu.css"; + $cssFiles[] = "plugins/Zeitgeist/stylesheets/common.css"; + $cssFiles[] = "plugins/CoreAdminHome/stylesheets/generalSettings.css"; + $cssFiles[] = "plugins/CoreHome/stylesheets/donate.css"; } /** @@ -84,12 +84,12 @@ function getJsFiles($notification) $jsFiles[] = "libs/jquery/jquery-ui.js"; $jsFiles[] = "libs/jquery/jquery.browser.js"; $jsFiles[] = "libs/javascript/sprintf.js"; - $jsFiles[] = "themes/default/common.js"; - $jsFiles[] = "themes/default/ajaxHelper.js"; + $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js"; + $jsFiles[] = "plugins/Zeitgeist/javascripts/ajaxHelper.js"; $jsFiles[] = "libs/jquery/jquery.history.js"; - $jsFiles[] = "plugins/CoreHome/templates/broadcast.js"; - $jsFiles[] = "plugins/CoreAdminHome/templates/generalSettings.js"; - $jsFiles[] = "plugins/CoreHome/templates/donate.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/broadcast.js"; + $jsFiles[] = "plugins/CoreAdminHome/javascripts/generalSettings.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/donate.js"; } function addMenu() diff --git a/plugins/CoreAdminHome/templates/generalSettings.js b/plugins/CoreAdminHome/javascripts/generalSettings.js similarity index 100% rename from plugins/CoreAdminHome/templates/generalSettings.js rename to plugins/CoreAdminHome/javascripts/generalSettings.js diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.js b/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js similarity index 100% rename from plugins/CoreAdminHome/templates/jsTrackingGenerator.js rename to plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js diff --git a/plugins/CoreAdminHome/templates/styles.css b/plugins/CoreAdminHome/stylesheets/generalSettings.css similarity index 100% rename from plugins/CoreAdminHome/templates/styles.css rename to plugins/CoreAdminHome/stylesheets/generalSettings.css diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.css b/plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css similarity index 100% rename from plugins/CoreAdminHome/templates/jsTrackingGenerator.css rename to plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css diff --git a/plugins/CoreAdminHome/templates/menu.css b/plugins/CoreAdminHome/stylesheets/menu.css similarity index 100% rename from plugins/CoreAdminHome/templates/menu.css rename to plugins/CoreAdminHome/stylesheets/menu.css diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig b/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig index e9c6b279481..e50bc5c30ba 100644 --- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig +++ b/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig @@ -2,8 +2,8 @@ {% block head %} {{ parent() }} - - + + {% endblock %} {% block content %} diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index 49fb713a966..e3a1291f07a 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -52,14 +52,14 @@ function getCssFiles($notification) $cssFiles = & $notification->getNotificationObject(); $cssFiles[] = "libs/jquery/themes/base/jquery-ui.css"; - $cssFiles[] = "plugins/Zeitgeist/theme/common.css"; - $cssFiles[] = "plugins/CoreHome/templates/styles.css"; - $cssFiles[] = "plugins/CoreHome/templates/menu.css"; - $cssFiles[] = "plugins/CoreHome/templates/datatable.css"; - $cssFiles[] = "plugins/CoreHome/templates/cloud.css"; - $cssFiles[] = "plugins/CoreHome/templates/jquery.ui.autocomplete.css"; - $cssFiles[] = "plugins/CoreHome/templates/jqplot.css"; - $cssFiles[] = "plugins/CoreHome/templates/donate.css"; + $cssFiles[] = "plugins/Zeitgeist/stylesheets/common.css"; + $cssFiles[] = "plugins/CoreHome/stylesheets/corehome.css"; + $cssFiles[] = "plugins/CoreHome/stylesheets/menu.css"; + $cssFiles[] = "plugins/CoreHome/stylesheets/datatable.css"; + $cssFiles[] = "plugins/CoreHome/stylesheets/cloud.css"; + $cssFiles[] = "plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css"; + $cssFiles[] = "plugins/CoreHome/stylesheets/jqplot.css"; + $cssFiles[] = "plugins/CoreHome/stylesheets/donate.css"; } /** @@ -76,23 +76,22 @@ function getJsFiles($notification) $jsFiles[] = "libs/jquery/jquery.scrollTo.js"; $jsFiles[] = "libs/jquery/jquery.history.js"; $jsFiles[] = "libs/javascript/sprintf.js"; - $jsFiles[] = "plugins/Zeitgeist/theme/common.js"; - $jsFiles[] = "plugins/Zeitgeist/theme/ajaxHelper.js"; - $jsFiles[] = "plugins/CoreHome/templates/datatable.js"; - $jsFiles[] = "plugins/CoreHome/templates/datatable_rowactions.js"; - $jsFiles[] = "plugins/CoreHome/templates/popover.js"; - $jsFiles[] = "plugins/CoreHome/templates/broadcast.js"; - $jsFiles[] = "plugins/CoreHome/templates/menu.js"; - $jsFiles[] = "plugins/CoreHome/templates/menu_init.js"; - $jsFiles[] = "plugins/CoreHome/templates/calendar.js"; - $jsFiles[] = "plugins/CoreHome/templates/date.js"; - $jsFiles[] = "plugins/CoreHome/templates/autocomplete.js"; - $jsFiles[] = "plugins/CoreHome/templates/sparkline.js"; - $jsFiles[] = "plugins/CoreHome/templates/misc.js"; - $jsFiles[] = "plugins/CoreHome/templates/datatable_manager.js"; - $jsFiles[] = "plugins/CoreHome/templates/donate.js"; - - $jsFiles[] = "plugins/CoreHome/templates/jqplot.js"; + $jsFiles[] = "plugins/Zeitgeist/javascripts/piwikHelper.js"; + $jsFiles[] = "plugins/Zeitgeist/javascripts/ajaxHelper.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/datatable.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/datatable_rowactions.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/popover.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/broadcast.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/menu.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/menu_init.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/calendar.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/date.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/autocomplete.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/sparkline.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/corehome.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/datatable_manager.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/donate.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/jqplot.js"; $jsFiles[] = "libs/jqplot/jqplot-custom.min.js"; } diff --git a/plugins/CoreHome/templates/autocomplete.js b/plugins/CoreHome/javascripts/autocomplete.js similarity index 100% rename from plugins/CoreHome/templates/autocomplete.js rename to plugins/CoreHome/javascripts/autocomplete.js diff --git a/plugins/CoreHome/templates/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js similarity index 98% rename from plugins/CoreHome/templates/broadcast.js rename to plugins/CoreHome/javascripts/broadcast.js index 03014258751..ccfb1450336 100644 --- a/plugins/CoreHome/templates/broadcast.js +++ b/plugins/CoreHome/javascripts/broadcast.js @@ -78,7 +78,7 @@ var broadcast = { * 2. after calling $.history.load(); //look at broadcast.changeParameter(); * 3. after pushing "Go Back" button of a browser * - * * Note: the method is manipulated in Overlay/templates/index.js - keep this in mind when making changes. + * * Note: the method is manipulated in Overlay/javascripts/Piwik_Overlay.js - keep this in mind when making changes. * * @param {string} hash to load page with * @return {void} @@ -372,7 +372,7 @@ var broadcast = { /** * Loads the given url with ajax and replaces the content * - * Note: the method is replaced in Overlay/templates/index.js - keep this in mind when making changes. + * Note: the method is replaced in Overlay/javascripts/Piwik_Overlay.js - keep this in mind when making changes. * * @param {string} urlAjax url to load * @return {Boolean} diff --git a/plugins/CoreHome/templates/calendar.js b/plugins/CoreHome/javascripts/calendar.js similarity index 100% rename from plugins/CoreHome/templates/calendar.js rename to plugins/CoreHome/javascripts/calendar.js diff --git a/plugins/CoreHome/templates/misc.js b/plugins/CoreHome/javascripts/corehome.js similarity index 100% rename from plugins/CoreHome/templates/misc.js rename to plugins/CoreHome/javascripts/corehome.js diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/javascripts/datatable.js similarity index 100% rename from plugins/CoreHome/templates/datatable.js rename to plugins/CoreHome/javascripts/datatable.js diff --git a/plugins/CoreHome/templates/datatable_manager.js b/plugins/CoreHome/javascripts/datatable_manager.js similarity index 100% rename from plugins/CoreHome/templates/datatable_manager.js rename to plugins/CoreHome/javascripts/datatable_manager.js diff --git a/plugins/CoreHome/templates/datatable_rowactions.js b/plugins/CoreHome/javascripts/datatable_rowactions.js similarity index 100% rename from plugins/CoreHome/templates/datatable_rowactions.js rename to plugins/CoreHome/javascripts/datatable_rowactions.js diff --git a/plugins/CoreHome/templates/date.js b/plugins/CoreHome/javascripts/date.js similarity index 100% rename from plugins/CoreHome/templates/date.js rename to plugins/CoreHome/javascripts/date.js diff --git a/plugins/CoreHome/templates/donate.js b/plugins/CoreHome/javascripts/donate.js similarity index 100% rename from plugins/CoreHome/templates/donate.js rename to plugins/CoreHome/javascripts/donate.js diff --git a/plugins/CoreHome/templates/jqplot.js b/plugins/CoreHome/javascripts/jqplot.js similarity index 100% rename from plugins/CoreHome/templates/jqplot.js rename to plugins/CoreHome/javascripts/jqplot.js diff --git a/plugins/CoreHome/templates/menu.js b/plugins/CoreHome/javascripts/menu.js similarity index 100% rename from plugins/CoreHome/templates/menu.js rename to plugins/CoreHome/javascripts/menu.js diff --git a/plugins/CoreHome/templates/menu_init.js b/plugins/CoreHome/javascripts/menu_init.js similarity index 100% rename from plugins/CoreHome/templates/menu_init.js rename to plugins/CoreHome/javascripts/menu_init.js diff --git a/plugins/CoreHome/templates/popover.js b/plugins/CoreHome/javascripts/popover.js similarity index 100% rename from plugins/CoreHome/templates/popover.js rename to plugins/CoreHome/javascripts/popover.js diff --git a/plugins/CoreHome/templates/sparkline.js b/plugins/CoreHome/javascripts/sparkline.js similarity index 100% rename from plugins/CoreHome/templates/sparkline.js rename to plugins/CoreHome/javascripts/sparkline.js diff --git a/plugins/CoreHome/templates/cloud.css b/plugins/CoreHome/stylesheets/cloud.css similarity index 100% rename from plugins/CoreHome/templates/cloud.css rename to plugins/CoreHome/stylesheets/cloud.css diff --git a/plugins/CoreHome/templates/styles.css b/plugins/CoreHome/stylesheets/corehome.css similarity index 92% rename from plugins/CoreHome/templates/styles.css rename to plugins/CoreHome/stylesheets/corehome.css index ead49ddb3ca..732f1a9defc 100644 --- a/plugins/CoreHome/templates/styles.css +++ b/plugins/CoreHome/stylesheets/corehome.css @@ -32,7 +32,7 @@ h3 { } .page { - background: url(../../../plugins/Zeitgeist/images/page_border_grad.png) no-repeat 0 20px; + background: url(../../Zeitgeist/images/page_border_grad.png) no-repeat 0 20px; min-height: 10px; } @@ -41,7 +41,7 @@ h3 { padding: 15px 15px 0 15px; min-height: 10px; position: relative; - background: url(../../../plugins/Zeitgeist/images/page_border_grad.png) no-repeat right 20px; + background: url(../../Zeitgeist/images/page_border_grad.png) no-repeat right 20px; } @@ -166,7 +166,7 @@ div.pk-emptyGraph { line-height: 20px; font-weight: normal; text-align: center; - background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat center 20px; + background: url(../../Zeitgeist/images/loading-blue.gif) no-repeat center 20px; } .Piwik_Popover_Loading_NameWithSubject { diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/stylesheets/datatable.css similarity index 95% rename from plugins/CoreHome/templates/datatable.css rename to plugins/CoreHome/stylesheets/datatable.css index 5f62d42a40c..11757a0ac07 100644 --- a/plugins/CoreHome/templates/datatable.css +++ b/plugins/CoreHome/stylesheets/datatable.css @@ -285,7 +285,7 @@ table thead div { height: 30px; display: block !important; white-space: nowrap; - background: url(../../../plugins/Zeitgeist/images/search_bg.png) no-repeat center 0; + background: url(../../Zeitgeist/images/search_bg.png) no-repeat center 0; text-align: center; } @@ -547,7 +547,7 @@ table.dataTable th .columnDocumentation { } table.dataTable th .columnDocumentationTitle { - background: url(../../../plugins/Zeitgeist/images/help.png) no-repeat; + background: url(../../Zeitgeist/images/help.png) no-repeat; line-height: 14px; padding: 2px 0 3px 21px; font-weight: bold; @@ -579,14 +579,14 @@ table.dataTable th .columnDocumentationTitle { width: 16px; height: 16px; margin: 10px 0; - background: url(../../../plugins/Zeitgeist/images/help.png) no-repeat; + background: url(../../Zeitgeist/images/help.png) no-repeat; } h2 .reportDocumentationIcon { position: absolute; margin: 4px 0 0 0; display: none; - background: url(../../../plugins/Zeitgeist/images/help_grey.png) no-repeat; + background: url(../../Zeitgeist/images/help_grey.png) no-repeat; } h2 .reportDocumentationIcon.hidden { @@ -658,7 +658,7 @@ body .ui-tooltip.rowActionTooltip { border-radius: 4px; -moz-border-radius: 4px; -webkit-border-radius: 4px; - background: url(../../../plugins/Zeitgeist/images/sort_subtable_desc_light.png) no-repeat right 2px; + background: url(../../Zeitgeist/images/sort_subtable_desc_light.png) no-repeat right 2px; padding: 0 14px 0 4px; display: block; width: 24px; @@ -676,7 +676,7 @@ body .ui-tooltip.rowActionTooltip { border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; -webkit-border-radius: 0 0 4px 4px; - background-image: url(../../../plugins/Zeitgeist/images/sort_subtable_asc_light.png) + background-image: url(../../Zeitgeist/images/sort_subtable_asc_light.png) } .limitSelection ul { @@ -728,7 +728,7 @@ a.tableConfigurationIcon { display: block; width: 30px; height: 22px; - background: url(../../../plugins/Zeitgeist/images/configure.png) no-repeat center 2px; + background: url(../../Zeitgeist/images/configure.png) no-repeat center 2px; position: absolute; z-index: 9; right: 0; @@ -738,7 +738,7 @@ a.tableConfigurationIcon.highlighted { display: block; width: 30px; height: 22px; - background-image: url(../../../plugins/Zeitgeist/images/configure-highlight.png); + background-image: url(../../Zeitgeist/images/configure-highlight.png); position: absolute; z-index: 9; right: 0; diff --git a/plugins/CoreHome/templates/donate.css b/plugins/CoreHome/stylesheets/donate.css similarity index 100% rename from plugins/CoreHome/templates/donate.css rename to plugins/CoreHome/stylesheets/donate.css diff --git a/plugins/CoreHome/templates/jqplot.css b/plugins/CoreHome/stylesheets/jqplot.css similarity index 92% rename from plugins/CoreHome/templates/jqplot.css rename to plugins/CoreHome/stylesheets/jqplot.css index be97c509265..c832107c373 100644 --- a/plugins/CoreHome/templates/jqplot.css +++ b/plugins/CoreHome/stylesheets/jqplot.css @@ -1,5 +1,5 @@ .jqplot-loading { - background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat center center white; + background: url(../../Zeitgeist/images/loading-blue.gif) no-repeat center center white; position: absolute; z-index: 10; } @@ -169,7 +169,7 @@ margin: 2px 0 5px 0; padding: 5px 0 5px 23px; color: #888; - background: url(../../../plugins/Zeitgeist/images/help.png) no-repeat left center; + background: url(../../Zeitgeist/images/help.png) no-repeat left center; } .rowevolution .metric-selectbox, @@ -206,7 +206,7 @@ a.rowevolution-startmulti:hover { width: 24px; height: 16px; margin-top: 3px; - background: url(../../../plugins/Zeitgeist/images/chart_line_edit.png) no-repeat center center; + background: url(../../Zeitgeist/images/chart_line_edit.png) no-repeat center center; overflow: hidden; text-indent: -999px; } @@ -216,7 +216,7 @@ a.rowevolution-startmulti:hover { position: absolute; z-index: 1010; /* must be above ui dialog */ margin-top: -2px; - background: url(../../../plugins/Zeitgeist/images/chart_line_edit.png) no-repeat 7px 4px #f7f7f7; + background: url(../../Zeitgeist/images/chart_line_edit.png) no-repeat 7px 4px #f7f7f7; font-size: 11px; font-weight: normal; border: 1px solid #e4e5e4; diff --git a/plugins/CoreHome/templates/jquery.ui.autocomplete.css b/plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css similarity index 100% rename from plugins/CoreHome/templates/jquery.ui.autocomplete.css rename to plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css diff --git a/plugins/CoreHome/templates/menu.css b/plugins/CoreHome/stylesheets/menu.css similarity index 100% rename from plugins/CoreHome/templates/menu.css rename to plugins/CoreHome/stylesheets/menu.css diff --git a/plugins/CoreHome/templates/js_css_includes.twig b/plugins/CoreHome/templates/js_css_includes.twig index 64297048104..eb9a3cdbb1e 100644 --- a/plugins/CoreHome/templates/js_css_includes.twig +++ b/plugins/CoreHome/templates/js_css_includes.twig @@ -3,5 +3,5 @@ {{ includeAssets({"type":"js"}) }} {% endautoescape %} {% if 'General_LayoutDirection'|translate =='rtl' %} - + {% endif %} diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig index 500a813e8f4..e20c4a027d7 100644 --- a/plugins/CoreUpdater/templates/layout.twig +++ b/plugins/CoreUpdater/templates/layout.twig @@ -6,11 +6,11 @@ - + - - - + + +