diff options
42 files changed, 189 insertions, 189 deletions
diff --git a/core/Piwik.php b/core/Piwik.php index a9a4ee5908..d63af0572c 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -1043,7 +1043,7 @@ class Piwik { $output = "<style>a{color:red;}</style>\n" . "<div style='color:red;font-family:Georgia;font-size:120%'>" . - "<p><img src='themes/default/images/error_medium.png' style='vertical-align:middle; float:left;padding:20 20 20 20' />" . + "<p><img src='plugins/Zeitgeist/images/error_medium.png' style='vertical-align:middle; float:left;padding:20 20 20 20' />" . $message . "</p></div>"; print(Piwik_Log_Formatter_ScreenFormatter::getFormattedString($output)); diff --git a/plugins/API/API.php b/plugins/API/API.php index 810a01a8c2..0ea154fd6b 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -444,7 +444,7 @@ class Piwik_API_API */ public function getLogoUrl($pathOnly = false) { - $logo = 'themes/default/images/logo.png'; + $logo = 'plugins/Zeitgeist/images/logo.png'; if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1 && file_exists(Piwik_Common::getPathToPiwikRoot() . '/themes/logo.png') ) { @@ -464,7 +464,7 @@ class Piwik_API_API */ public function getHeaderLogoUrl($pathOnly = false) { - $logo = 'themes/default/images/logo-header.png'; + $logo = 'plugins/Zeitgeist/images/logo-header.png'; if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1 && file_exists(Piwik_Common::getPathToPiwikRoot() . '/themes/logo-header.png') ) { diff --git a/plugins/Annotations/templates/annotations.js b/plugins/Annotations/templates/annotations.js index 941ae4486a..9f1070b8a2 100755 --- a/plugins/Annotations/templates/annotations.js +++ b/plugins/Annotations/templates/annotations.js @@ -461,9 +461,9 @@ // modify the starred count & make sure the correct image is used var newStarCount = starredCount + starAmt; if (newStarCount > 0) { - var newImg = 'themes/default/images/yellow_marker.png'; + var newImg = 'plugins/Zeitgeist/images/yellow_marker.png'; } else { - var newImg = 'themes/default/images/grey_marker.png'; + var newImg = 'plugins/Zeitgeist/images/grey_marker.png'; } $(this).attr('data-starred', newStarCount).find('img').attr('src', newImg); diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css index 9527054647..5f62d42a40 100644 --- a/plugins/CoreHome/templates/datatable.css +++ b/plugins/CoreHome/templates/datatable.css @@ -285,7 +285,7 @@ table thead div { height: 30px; display: block !important; white-space: nowrap; - background: url(../../../themes/default/images/search_bg.png) no-repeat center 0; + background: url(../../../plugins/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(../../../themes/default/images/help.png) no-repeat; + background: url(../../../plugins/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(../../../themes/default/images/help.png) no-repeat; + background: url(../../../plugins/Zeitgeist/images/help.png) no-repeat; } h2 .reportDocumentationIcon { position: absolute; margin: 4px 0 0 0; display: none; - background: url(../../../themes/default/images/help_grey.png) no-repeat; + background: url(../../../plugins/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(../../../themes/default/images/sort_subtable_desc_light.png) no-repeat right 2px; + background: url(../../../plugins/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(../../../themes/default/images/sort_subtable_asc_light.png) + background-image: url(../../../plugins/Zeitgeist/images/sort_subtable_asc_light.png) } .limitSelection ul { @@ -728,7 +728,7 @@ a.tableConfigurationIcon { display: block; width: 30px; height: 22px; - background: url(../../../themes/default/images/configure.png) no-repeat center 2px; + background: url(../../../plugins/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(../../../themes/default/images/configure-highlight.png); + background-image: url(../../../plugins/Zeitgeist/images/configure-highlight.png); position: absolute; z-index: 9; right: 0; diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js index 219fc7e3a8..71c4da7cb8 100644 --- a/plugins/CoreHome/templates/datatable.js +++ b/plugins/CoreHome/templates/datatable.js @@ -334,15 +334,15 @@ dataTable.prototype = var imageSortSrc = false; if (currentIsSubDataTable) { if (self.param.filter_sort_order == 'asc') { - imageSortSrc = 'themes/default/images/sort_subtable_asc.png'; + imageSortSrc = 'plugins/Zeitgeist/images/sort_subtable_asc.png'; } else { - imageSortSrc = 'themes/default/images/sort_subtable_desc.png'; + imageSortSrc = 'plugins/Zeitgeist/images/sort_subtable_desc.png'; } } else { if (self.param.filter_sort_order == 'asc') { - imageSortSrc = 'themes/default/images/sortasc.png'; + imageSortSrc = 'plugins/Zeitgeist/images/sortasc.png'; } else { - imageSortSrc = 'themes/default/images/sortdesc.png'; + imageSortSrc = 'plugins/Zeitgeist/images/sortdesc.png'; } } return imageSortSrc; @@ -1178,7 +1178,7 @@ dataTable.prototype = '<tr>' + '<td colspan="' + numberOfColumns + '" class="cellSubDataTable">' + '<div id="' + divIdToReplaceWithSubTable + '">' + - '<span class="loadingPiwik" style="display:inline"><img src="themes/default/images/loading-blue.gif" />' + _pk_translate('General_Loading_js') + '</span>' + + '<span class="loadingPiwik" style="display:inline"><img src="plugins/Zeitgeist/images/loading-blue.gif" />' + _pk_translate('General_Loading_js') + '</span>' + '</div>' + '</td>' + '</tr>' @@ -1748,7 +1748,7 @@ actionDataTable.prototype = $(domElem).after('\ <tr id="' + divIdToReplaceWithSubTable + '" class="cellSubDataTable">\ <td colspan="' + numberOfColumns + '">\ - <span class="loadingPiwik" style="display:inline"><img src="themes/default/images/loading-blue.gif" /> Loading...</span>\ + <span class="loadingPiwik" style="display:inline"><img src="plugins/Zeitgeist/images/loading-blue.gif" /> Loading...</span>\ </td>\ </tr>\ '); @@ -1900,11 +1900,11 @@ function getNextLevelFromClass(style) { //helper function for actionDataTable function setImageMinus(domElem) { - $('img.plusMinus', domElem).attr('src', 'themes/default/images/minus.png'); + $('img.plusMinus', domElem).attr('src', 'plugins/Zeitgeist/images/minus.png'); } //helper function for actionDataTable function setImagePlus(domElem) { - $('img.plusMinus', domElem).attr('src', 'themes/default/images/plus.png'); + $('img.plusMinus', domElem).attr('src', 'plugins/Zeitgeist/images/plus.png'); } diff --git a/plugins/CoreHome/templates/datatable_rowactions.js b/plugins/CoreHome/templates/datatable_rowactions.js index afe31cc61b..62931dd61e 100644 --- a/plugins/CoreHome/templates/datatable_rowactions.js +++ b/plugins/CoreHome/templates/datatable_rowactions.js @@ -59,8 +59,8 @@ DataTable_RowActions_Registry.register({ name: 'RowEvolution', - dataTableIcon: 'themes/default/images/row_evolution.png', - dataTableIconHover: 'themes/default/images/row_evolution_hover.png', + dataTableIcon: 'plugins/Zeitgeist/images/row_evolution.png', + dataTableIconHover: 'plugins/Zeitgeist/images/row_evolution_hover.png', order: 50, diff --git a/plugins/CoreHome/templates/jqplot.css b/plugins/CoreHome/templates/jqplot.css index 33014a7178..be97c50926 100644 --- a/plugins/CoreHome/templates/jqplot.css +++ b/plugins/CoreHome/templates/jqplot.css @@ -1,5 +1,5 @@ .jqplot-loading { - background: url(../../../themes/default/images/loading-blue.gif) no-repeat center center white; + background: url(../../../plugins/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(../../../themes/default/images/help.png) no-repeat left center; + background: url(../../../plugins/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(../../../themes/default/images/chart_line_edit.png) no-repeat center center; + background: url(../../../plugins/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(../../../themes/default/images/chart_line_edit.png) no-repeat 7px 4px #f7f7f7; + background: url(../../../plugins/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/promo_video.twig b/plugins/CoreHome/templates/promo_video.twig index 0ae0c23ed3..e7decbb2bc 100755 --- a/plugins/CoreHome/templates/promo_video.twig +++ b/plugins/CoreHome/templates/promo_video.twig @@ -122,7 +122,7 @@ {* email *} <a href="mailto:?body={{ shareTextLong|url_encode(true) }}&subject={{ shareText|url_encode(true) }}" target="_blank"> - <img src="themes/default/images/email.png" /> + <img src="plugins/Zeitgeist/images/email.png" /> </a> </div> diff --git a/plugins/CoreHome/templates/styles.css b/plugins/CoreHome/templates/styles.css index 0b679f48b9..ead49ddb3c 100644 --- a/plugins/CoreHome/templates/styles.css +++ b/plugins/CoreHome/templates/styles.css @@ -32,7 +32,7 @@ h3 { } .page { - background: url(../../../themes/default/images/page_border_grad.png) no-repeat 0 20px; + background: url(../../../plugins/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(../../../themes/default/images/page_border_grad.png) no-repeat right 20px; + background: url(../../../plugins/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(../../../themes/default/images/loading-blue.gif) no-repeat center 20px; + background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat center 20px; } .Piwik_Popover_Loading_NameWithSubject { diff --git a/plugins/Dashboard/stylesheets/dashboard.css b/plugins/Dashboard/stylesheets/dashboard.css index c4e225f0cc..c370a252d0 100644 --- a/plugins/Dashboard/stylesheets/dashboard.css +++ b/plugins/Dashboard/stylesheets/dashboard.css @@ -78,7 +78,7 @@ .widgetContent.loading { opacity: 0.5; filter: Alpha(opacity:50); - background: url(../../../themes/default/images/loading-blue.gif) no-repeat top right; + background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat top right; } .widget h2 { @@ -88,7 +88,7 @@ } .widgetTop { - background: #b5b0a7 url(../../../themes/default/images/dashboard_h_bg.png) repeat-x 0 0; + background: #b5b0a7 url(../../../plugins/Zeitgeist/images/dashboard_h_bg.png) repeat-x 0 0; border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; -webkit-border-radius: 4px 4px 0 0; @@ -100,7 +100,7 @@ } .widgetTopHover { - background: #B0A798 url(../../../themes/default/images/dashboard_h_bg_hover.png) repeat-x 0 0; + background: #B0A798 url(../../../plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0; } .widgetName { @@ -153,7 +153,7 @@ } .ui-dialog-buttonset input[type=button], .ui-dialog-buttonset button{ - background: #B5B0A7 url(../../../themes/default/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important; + background: #B5B0A7 url(../../../plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important; color: #fff !important; border: 0 !important; font-size: 12px !important; @@ -223,7 +223,7 @@ } #dashboardSettings > span { - background: url(../../../themes/default/images/sort_subtable_desc.png) right center no-repeat; + background: url(../../../plugins/Zeitgeist/images/sort_subtable_desc.png) right center no-repeat; padding-right: 20px; display: block; } @@ -360,7 +360,7 @@ ul.widgetpreview-widgetlist li { } .widgetpreview-base li.widgetpreview-choosen { - background: #e4e2d7 url(../../../themes/default/images/arr_r.png) no-repeat right 6px; + background: #e4e2d7 url(../../../plugins/Zeitgeist/images/arr_r.png) no-repeat right 6px; color: #255792; font-weight: bold; } diff --git a/plugins/Feedback/templates/feedback.js b/plugins/Feedback/templates/feedback.js index cbf07b4863..5f7112cf8f 100644 --- a/plugins/Feedback/templates/feedback.js +++ b/plugins/Feedback/templates/feedback.js @@ -12,7 +12,7 @@ $(function () { $('a#topmenu-feedback').click(function () { if (fbDiv.html() == '') { - fbDiv.html('<div id="feedback-loading"><img alt="" src="themes/default/images/loading-blue.gif"> ' + _pk_translate('General_Loading_js') + '</div>'); + fbDiv.html('<div id="feedback-loading"><img alt="" src="plugins/Zeitgeist/images/loading-blue.gif"> ' + _pk_translate('General_Loading_js') + '</div>'); } if ($('#feedback-loading', fbDiv).length) { $.get(feedback.attr('href'), function (data) { diff --git a/plugins/Goals/templates/title_and_evolution_graph.twig b/plugins/Goals/templates/title_and_evolution_graph.twig index 5141cd73e0..3e0d8d8cbd 100644 --- a/plugins/Goals/templates/title_and_evolution_graph.twig +++ b/plugins/Goals/templates/title_and_evolution_graph.twig @@ -10,7 +10,7 @@ {if isset($ecommerce)} <strong>{$nb_conversions}</strong> {'General_EcommerceOrders'|translate} - <img src='themes/default/images/ecommerceOrder.gif'> + <img src='plugins/Zeitgeist/images/ecommerceOrder.gif'> {% else %} {{ 'Goals_Conversions'|translate("<strong>"+nb_conversions+"</strong>")|raw }} {% endif %} diff --git a/plugins/Installation/templates/databaseCheck.twig b/plugins/Installation/templates/databaseCheck.twig index 2413c43065..005f5e6198 100644 --- a/plugins/Installation/templates/databaseCheck.twig +++ b/plugins/Installation/templates/databaseCheck.twig @@ -1,10 +1,10 @@ {% extends '@Installation/structure.twig' %} {% block content %} -{% set ok %}<img src='themes/default/images/ok.png' />{% endset %} -{% set error %}<img src='themes/default/images/error.png' />{% endset %} -{% set warning %}<img src='themes/default/images/warning.png' />{% endset %} -{% set link %}<img src='themes/default/images/link.gif' />{% endset %} +{% set ok %}<img src='plugins/Zeitgeist/images/ok.png' />{% endset %} +{% set error %}<img src='plugins/Zeitgeist/images/error.png' />{% endset %} +{% set warning %}<img src='plugins/Zeitgeist/images/warning.png' />{% endset %} +{% set link %}<img src='plugins/Zeitgeist/images/link.gif' />{% endset %} <h2>{{ 'Installation_DatabaseCheck'|translate }}</h2> diff --git a/plugins/Installation/templates/install.css b/plugins/Installation/templates/install.css index ba67fc2531..3d75fb66fd 100644 --- a/plugins/Installation/templates/install.css +++ b/plugins/Installation/templates/install.css @@ -174,7 +174,7 @@ td { .submit input { margin-top: 15px; - background: transparent url(./themes/default/images/background-submit.png) repeat scroll 0; + background: transparent url(./plugins/Zeitgeist/images/background-submit.png) repeat scroll 0; font-size: 1.4em; border-color: #CCCCCC rgb(153, 153, 153) rgb(153, 153, 153) rgb(204, 204, 204); border-style: double; diff --git a/plugins/Live/API.php b/plugins/Live/API.php index d2d74a74bf..11ae82c413 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -614,23 +614,23 @@ class Piwik_Live_API foreach ($visitorDetailsArray['actionDetails'] as &$details) { switch ($details['type']) { case 'goal': - $details['icon'] = 'themes/default/images/goal.png'; + $details['icon'] = 'plugins/Zeitgeist/images/goal.png'; break; case Piwik_Archive::LABEL_ECOMMERCE_ORDER: case Piwik_Archive::LABEL_ECOMMERCE_CART: - $details['icon'] = 'themes/default/images/' . $details['type'] . '.gif'; + $details['icon'] = 'plugins/Zeitgeist/images/' . $details['type'] . '.gif'; break; case Piwik_Tracker_Action_Interface::TYPE_DOWNLOAD: $details['type'] = 'download'; - $details['icon'] = 'themes/default/images/download.png'; + $details['icon'] = 'plugins/Zeitgeist/images/download.png'; break; case Piwik_Tracker_Action_Interface::TYPE_OUTLINK: $details['type'] = 'outlink'; - $details['icon'] = 'themes/default/images/link.gif'; + $details['icon'] = 'plugins/Zeitgeist/images/link.gif'; break; case Piwik_Tracker_Action::TYPE_SITE_SEARCH: $details['type'] = 'search'; - $details['icon'] = 'themes/default/images/search_ico.png'; + $details['icon'] = 'plugins/Zeitgeist/images/search_ico.png'; break; default: $details['type'] = 'action'; diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 8e53f9f5ee..4ceb88f9fd 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -536,9 +536,9 @@ class Piwik_Live_Visitor $status = $this->getVisitEcommerceStatus(); if (in_array($status, array('ordered', 'orderedThenAbandonedCart'))) { - return "themes/default/images/ecommerceOrder.gif"; + return "plugins/Zeitgeist/images/ecommerceOrder.gif"; } elseif ($status == 'abandonedCart') { - return "themes/default/images/ecommerceAbandonedCart.gif"; + return "plugins/Zeitgeist/images/ecommerceAbandonedCart.gif"; } return null; } @@ -551,7 +551,7 @@ class Piwik_Live_Visitor function getVisitorGoalConvertedIcon() { return $this->isVisitorGoalConverted() - ? "themes/default/images/goal.png" + ? "plugins/Zeitgeist/images/goal.png" : null; } diff --git a/plugins/Login/templates/login.css b/plugins/Login/templates/login.css index 7d62cea47a..8a66711eb2 100644 --- a/plugins/Login/templates/login.css +++ b/plugins/Login/templates/login.css @@ -111,7 +111,7 @@ form { #login_form_password, #reset_form_password, #reset_form_password_bis, #login_form_login, #reset_form_login { - background: #fff url(../../../themes/default/images/login-sprite.png) no-repeat; + background: #fff url(../../../plugins/Zeitgeist/images/login-sprite.png) no-repeat; } #login_form_password, #reset_form_password, #reset_form_password_bis { @@ -192,7 +192,7 @@ a { } #logo .description .arrow { - background: url(../../../themes/default/images/affix-arrow.png); + background: url(../../../plugins/Zeitgeist/images/affix-arrow.png); width: 50px; height: 68px; position: absolute; diff --git a/plugins/MultiSites/templates/styles.css b/plugins/MultiSites/templates/styles.css index 796a2b091a..50e15c4720 100644 --- a/plugins/MultiSites/templates/styles.css +++ b/plugins/MultiSites/templates/styles.css @@ -58,14 +58,14 @@ width: 16px; height: 13px; display: inline-block; - background-image: url(../../../themes/default/images/sortdesc.png); + background-image: url(../../../plugins/Zeitgeist/images/sortdesc.png); } .multisites_asc { width: 16px; height: 13px; display: inline-block; - background-image: url(../../../themes/default/images/sortasc.png); + background-image: url(../../../plugins/Zeitgeist/images/sortasc.png); } #mt thead { diff --git a/plugins/Overlay/templates/index.css b/plugins/Overlay/templates/index.css index 1d428f834e..bf389d16f3 100644 --- a/plugins/Overlay/templates/index.css +++ b/plugins/Overlay/templates/index.css @@ -37,7 +37,7 @@ a#Overlay_Title { #Overlay_DateRangeSelection { padding: 30px 0 20px 23px; - background: url(../../../themes/default/images/icon-calendar.gif) 2px 33px no-repeat; + background: url(../../../plugins/Zeitgeist/images/icon-calendar.gif) 2px 33px no-repeat; margin-left: 5px; } @@ -49,7 +49,7 @@ a#Overlay_Title { } #Overlay_Loading { - background: url(../../../themes/default/images/loading-blue.gif) no-repeat center 10px; + background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat center 10px; width: 190px; padding-top: 30px; margin-top: 30px; @@ -83,7 +83,7 @@ a#Overlay_Transitions { a#Overlay_RowEvolution { margin-top: 20px; - background: url(../../../themes/default/images/row_evolution_hover.png) no-repeat 0 7px; + background: url(../../../plugins/Zeitgeist/images/row_evolution_hover.png) no-repeat 0 7px; } a#Overlay_Transitions { @@ -92,7 +92,7 @@ a#Overlay_Transitions { a#Overlay_FullScreen { margin-top: 20px; - background: url(../../../themes/default/images/fullscreen.png) no-repeat 3px 8px; + background: url(../../../plugins/Zeitgeist/images/fullscreen.png) no-repeat 3px 8px; } a#Overlay_FullScreen:hover, diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php index 1533a70192..99814647db 100644 --- a/plugins/PDFReports/PDFReports.php +++ b/plugins/PDFReports/PDFReports.php @@ -45,11 +45,11 @@ class Piwik_PDFReports extends Piwik_Plugin ); static private $managedReportTypes = array( - self::EMAIL_TYPE => 'themes/default/images/email.png' + self::EMAIL_TYPE => 'plugins/Zeitgeist/images/email.png' ); static private $managedReportFormats = array( - Piwik_ReportRenderer::HTML_FORMAT => 'themes/default/images/html_icon.png', + Piwik_ReportRenderer::HTML_FORMAT => 'plugins/Zeitgeist/images/html_icon.png', Piwik_ReportRenderer::PDF_FORMAT => 'plugins/UserSettings/images/plugins/pdf.gif' ); diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index 0ccd55e1b1..dce6d50416 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -183,7 +183,7 @@ <td width="500"> <div id="deleteDataEstimate"></div> <span class='loadingPiwik' style='display:none'><img - src='./themes/default/images/loading-blue.gif'/> {{ 'General_LoadingData'|translate }}</span> + src='./plugins/Zeitgeist/images/loading-blue.gif'/> {{ 'General_LoadingData'|translate }}</span> </td> <td width="200"> {% if deleteData.config.enable_auto_database_size_estimate == '0' %} @@ -220,7 +220,7 @@ <br/> <em><a id="purgeDataNowLink" href="#">{{ 'PrivacyManager_PurgeNow'|translate }}</a></em> <span class='loadingPiwik' style='display:none'><img - src='./themes/default/images/loading-blue.gif'/> {{ 'PrivacyManager_PurgingData'|translate }}</span> + src='./plugins/Zeitgeist/images/loading-blue.gif'/> {{ 'PrivacyManager_PurgingData'|translate }}</span> <span id="db-purged-message" style="display: none;"><em>{{ 'PrivacyManager_DBPurged'|translate }}</em></span> {% endset %} {{ piwik.inlineHelp(purgeStats) }} diff --git a/plugins/SegmentEditor/templates/Segmentation.css b/plugins/SegmentEditor/templates/Segmentation.css index 0f40b15474..f9d5d17c93 100644 --- a/plugins/SegmentEditor/templates/Segmentation.css +++ b/plugins/SegmentEditor/templates/Segmentation.css @@ -329,7 +329,7 @@ div.scrollable { } .segment-element .segment-top a.dropdown { padding: 0 17px 0 0; - background: url(../../../themes/default/images/sort_subtable_desc.png) 100% -2px no-repeat; + background: url(../../../plugins/Zeitgeist/images/sort_subtable_desc.png) 100% -2px no-repeat; } .segment-element .segment-footer { background: #eae8e3; @@ -453,7 +453,7 @@ div.scrollable { cursor: pointer; } span.segmentationTitle { - background: url(../../../themes/default/images/sort_subtable_desc.png) right center no-repeat !important; + background: url(../../../plugins/Zeitgeist/images/sort_subtable_desc.png) right center no-repeat !important; padding-right: 20px !important; width: 160px !important; display: block !important; @@ -521,7 +521,7 @@ a.metric_category { } #available_segments a.dropdown { - background: url("../../../themes/default/images/sort_subtable_desc.png") no-repeat scroll 100% -2px transparent !important; + background: url("../../../plugins/Zeitgeist/images/sort_subtable_desc.png") no-repeat scroll 100% -2px transparent !important; padding: 0 17px 0 0 !important; } .notification{ diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/templates/transitions.js index 696bd35fe4..14ccd28a19 100644 --- a/plugins/Transitions/templates/transitions.js +++ b/plugins/Transitions/templates/transitions.js @@ -619,7 +619,7 @@ Piwik_Transitions.prototype.renderClosedGroup = function (groupName, side, onlyB boxText: self.model.getGroupTitle(groupName), boxTextNumLines: 1, boxTextCssClass: 'SingleLine', - boxIcon: 'themes/default/images/plus_blue.png', + boxIcon: 'plugins/Zeitgeist/images/plus_blue.png', smallBox: true, onClick: function () { self.unHighlightGroup(groupName, side); diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig index 9805bb983d..2ba90d02e7 100755 --- a/plugins/UserCountry/templates/adminIndex.twig +++ b/plugins/UserCountry/templates/adminIndex.twig @@ -35,7 +35,7 @@ <input class="location-provider" name="location-provider" value="{$id}" type="radio" {% if currentProviderId == id %}checked="checked"{% endif %} id="provider_input_{$id}" {% if provider.status != 1 %}disabled="disabled"{% endif %}/> <label for="provider_input_{$id}">{{ provider.title|translate }}</label><br/> - <span class='loadingPiwik' style='display:none'><img src='./themes/default/images/loading-blue.gif'/></span> + <span class='loadingPiwik' style='display:none'><img src='./plugins/Zeitgeist/images/loading-blue.gif'/></span> <span class="ajaxSuccess" style='display:none'>{{ 'General_Done'|translate }}</span> </p> @@ -65,7 +65,7 @@ <div style="text-align:left;"> <br/> <span class='loadingPiwik' style='display:none;position:absolute'> - <img src='./themes/default/images/loading-blue.gif'/> {{ 'General_Loading_js'|translate }}</span> + <img src='./plugins/Zeitgeist/images/loading-blue.gif'/> {{ 'General_Loading_js'|translate }}</span> <span class='location'><strong><em>{{ provider.location }}</em></strong></span> </div> <div style="text-align:right;"> @@ -119,7 +119,7 @@ </div> </div> <div id="geoipdb-screen2-download" style="display:none"> - <p class='loadingPiwik'><img src='./themes/default/images/loading-blue.gif'/> + <p class='loadingPiwik'><img src='./plugins/Zeitgeist/images/loading-blue.gif'/> {{ 'UserCountry_DownloadingDb'|translate('<a href="'+geoLiteUrl+'">GeoLiteCity.dat</a>') }}...</p> <div id="geoip-download-progress"></div> </div> diff --git a/plugins/UsersManager/templates/UsersManager.twig b/plugins/UsersManager/templates/UsersManager.twig index abfa4db87a..883952079d 100644 --- a/plugins/UsersManager/templates/UsersManager.twig +++ b/plugins/UsersManager/templates/UsersManager.twig @@ -147,13 +147,13 @@ <td id="token_auth">{{ user.token_auth }}</td> <td> <span class="edituser link_but" id="row{{ i }}"> - <img title="{{ 'General_Edit'|translate }}" src='themes/default/images/ico_edit.png'/> + <img title="{{ 'General_Edit'|translate }}" src='plugins/Zeitgeist/images/ico_edit.png'/> {{ 'General_Edit'|translate }} </span> </td> <td> <span class="deleteuser link_but" id="row{{ i }}"> - <img title="{{ 'General_Delete'|translate }}" src='themes/default/images/ico_delete.png'/> + <img title="{{ 'General_Delete'|translate }}" src='plugins/Zeitgeist/images/ico_delete.png'/> {{ 'General_Delete'|translate }} </span> </td> diff --git a/plugins/Zeitgeist/theme/simple_structure_header.tpl b/plugins/Zeitgeist/theme/simple_structure_header.tpl index 4d6252bd26..ee85932856 100644 --- a/plugins/Zeitgeist/theme/simple_structure_header.tpl +++ b/plugins/Zeitgeist/theme/simple_structure_header.tpl @@ -9,4 +9,4 @@ </head> <body id="simple"> <div id="contentsimple"> - <div id="title"><img title='Piwik' alt="Piwik" src='themes/default/images/logo-header.png' style='margin-left:10px' /><span id="subh1"> # <a href='http://piwik.org/'>Web Analytics</a></span></div> + <div id="title"><img title='Piwik' alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png' style='margin-left:10px' /><span id="subh1"> # <a href='http://piwik.org/'>Web Analytics</a></span></div> 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 9c3a7655b0..fb59c0afaa 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 @@ <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -22,7 +22,7 @@ <goalPageId>44</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -111,7 +111,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>1</searches> @@ -136,7 +136,7 @@ <goalPageId>22</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>search</type> @@ -151,7 +151,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> - <icon>themes/default/images/search_ico.png</icon> + <icon>plugins/Zeitgeist/images/search_ico.png</icon> </row> <row> <type>goal</type> @@ -161,7 +161,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> @@ -249,7 +249,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -263,7 +263,7 @@ <goalPageId>21</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -370,7 +370,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -393,7 +393,7 @@ <goalPageId>20</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>goal</type> @@ -403,7 +403,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> @@ -491,7 +491,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -505,7 +505,7 @@ <goalPageId>19</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -612,7 +612,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>1</searches> @@ -637,7 +637,7 @@ <goalPageId>17</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>search</type> @@ -652,7 +652,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> - <icon>themes/default/images/search_ico.png</icon> + <icon>plugins/Zeitgeist/images/search_ico.png</icon> </row> <row> <type>goal</type> @@ -662,7 +662,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> @@ -750,7 +750,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -764,7 +764,7 @@ <goalPageId>16</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -871,7 +871,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -894,7 +894,7 @@ <goalPageId>15</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>goal</type> @@ -904,7 +904,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> @@ -992,7 +992,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -1006,7 +1006,7 @@ <goalPageId>14</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -1113,7 +1113,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>1</searches> @@ -1138,7 +1138,7 @@ <goalPageId>12</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>search</type> @@ -1153,7 +1153,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> - <icon>themes/default/images/search_ico.png</icon> + <icon>plugins/Zeitgeist/images/search_ico.png</icon> </row> <row> <type>goal</type> @@ -1163,7 +1163,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> 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 9c3a7655b0..fb59c0afaa 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 @@ <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -22,7 +22,7 @@ <goalPageId>44</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -111,7 +111,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>1</searches> @@ -136,7 +136,7 @@ <goalPageId>22</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>search</type> @@ -151,7 +151,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> - <icon>themes/default/images/search_ico.png</icon> + <icon>plugins/Zeitgeist/images/search_ico.png</icon> </row> <row> <type>goal</type> @@ -161,7 +161,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> @@ -249,7 +249,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -263,7 +263,7 @@ <goalPageId>21</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -370,7 +370,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -393,7 +393,7 @@ <goalPageId>20</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>goal</type> @@ -403,7 +403,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> @@ -491,7 +491,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -505,7 +505,7 @@ <goalPageId>19</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -612,7 +612,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>1</searches> @@ -637,7 +637,7 @@ <goalPageId>17</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>search</type> @@ -652,7 +652,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> - <icon>themes/default/images/search_ico.png</icon> + <icon>plugins/Zeitgeist/images/search_ico.png</icon> </row> <row> <type>goal</type> @@ -662,7 +662,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> @@ -750,7 +750,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -764,7 +764,7 @@ <goalPageId>16</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -871,7 +871,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -894,7 +894,7 @@ <goalPageId>15</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>goal</type> @@ -904,7 +904,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> @@ -992,7 +992,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -1006,7 +1006,7 @@ <goalPageId>14</goalPageId> <url>http://piwik.net/grue/lair</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -1113,7 +1113,7 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>1</searches> @@ -1138,7 +1138,7 @@ <goalPageId>12</goalPageId> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>search</type> @@ -1153,7 +1153,7 @@ </row> </customVariables> <siteSearchKeyword>Bring on the party</siteSearchKeyword> - <icon>themes/default/images/search_ico.png</icon> + <icon>plugins/Zeitgeist/images/search_ico.png</icon> </row> <row> <type>goal</type> @@ -1163,7 +1163,7 @@ <goalPageId /> <url>http://piwik.net/space/quest/iv</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> 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 84165383dd..03d74fc49c 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 @@ <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -22,7 +22,7 @@ <goalPageId>9</goalPageId> <url>http://example.org/store/purchase.htm</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -112,7 +112,7 @@ <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>1</searches> @@ -151,7 +151,7 @@ <timeSpent>360</timeSpent> <timeSpentPretty>6 min 0s</timeSpentPretty> - <icon>themes/default/images/link.gif</icon> + <icon>plugins/Zeitgeist/images/link.gif</icon> </row> <row> <type>download</type> @@ -162,7 +162,7 @@ <timeSpent>72</timeSpent> <timeSpentPretty>1 min 12s</timeSpentPretty> - <icon>themes/default/images/download.png</icon> + <icon>plugins/Zeitgeist/images/download.png</icon> </row> <row> <type>outlink</type> @@ -173,7 +173,7 @@ <timeSpent>108</timeSpent> <timeSpentPretty>1 min 48s</timeSpentPretty> - <icon>themes/default/images/link.gif</icon> + <icon>plugins/Zeitgeist/images/link.gif</icon> </row> <row> <type>outlink</type> @@ -184,7 +184,7 @@ <timeSpent>72</timeSpent> <timeSpentPretty>1 min 12s</timeSpentPretty> - <icon>themes/default/images/link.gif</icon> + <icon>plugins/Zeitgeist/images/link.gif</icon> </row> <row> <type>goal</type> @@ -194,7 +194,7 @@ <goalPageId /> <url>http://example.org/</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>search</type> @@ -206,7 +206,7 @@ <timeSpentPretty>1 min 48s</timeSpentPretty> <generationTime>0.81s</generationTime> <siteSearchKeyword>Banks Own The World</siteSearchKeyword> - <icon>themes/default/images/search_ico.png</icon> + <icon>plugins/Zeitgeist/images/search_ico.png</icon> </row> <row> <type>action</type> 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 d7aa0fa4d9..432d4682c2 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 @@ <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -124,7 +124,7 @@ <goalPageId /> <url>http://example.org/this%20is%20cool!</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> </actionDetails> <customVariables> 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 e4cd94f488..5f4ae74a2d 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 @@ </head> <body style="color: rgb(68,68,68);"> <a name="reportTop"/> -<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='themes/default/images/logo-header.png'/></a> +<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> Website Site 1 </h1> 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 0f14630b1b..b90f33cff5 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 @@ </head> <body style="color: rgb(68,68,68);"> <a name="reportTop"/> -<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='themes/default/images/logo-header.png'/></a> +<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> Website Site 1 </h1> 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 7d014c7303..2cf1b9b009 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 @@ </head> <body style="color: rgb(68,68,68);"> <a name="reportTop"/> -<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='themes/default/images/logo-header.png'/></a> +<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> Website Site 1 </h1> 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 fae2d87e22..0142c9f17f 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 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>ordered</visitEcommerceStatus> - <visitEcommerceStatusIcon>themes/default/images/ecommerceOrder.gif</visitEcommerceStatusIcon> + <visitEcommerceStatusIcon>plugins/Zeitgeist/images/ecommerceOrder.gif</visitEcommerceStatusIcon> <searches>0</searches> <actions>0</actions> <actionDetails> @@ -33,7 +33,7 @@ <quantity>2</quantity> </row> </itemDetails> - <icon>themes/default/images/ecommerceOrder.gif</icon> + <icon>plugins/Zeitgeist/images/ecommerceOrder.gif</icon> </row> <row> <type>ecommerceOrder</type> @@ -47,7 +47,7 @@ <itemDetails> </itemDetails> - <icon>themes/default/images/ecommerceOrder.gif</icon> + <icon>plugins/Zeitgeist/images/ecommerceOrder.gif</icon> </row> </actionDetails> <customVariables> @@ -139,9 +139,9 @@ <visitorType>returningCustomer</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> - <visitEcommerceStatusIcon>themes/default/images/ecommerceOrder.gif</visitEcommerceStatusIcon> + <visitEcommerceStatusIcon>plugins/Zeitgeist/images/ecommerceOrder.gif</visitEcommerceStatusIcon> <searches>0</searches> <actions>3</actions> <actionDetails> @@ -254,7 +254,7 @@ <quantity>2</quantity> </row> </itemDetails> - <icon>themes/default/images/ecommerceAbandonedCart.gif</icon> + <icon>plugins/Zeitgeist/images/ecommerceAbandonedCart.gif</icon> </row> </actionDetails> <customVariables> 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 2a60c21ab0..81bc20e620 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 @@ <visitConverted>0</visitConverted> <visitConvertedIcon /> <visitEcommerceStatus>abandonedCart</visitEcommerceStatus> - <visitEcommerceStatusIcon>themes/default/images/ecommerceAbandonedCart.gif</visitEcommerceStatusIcon> + <visitEcommerceStatusIcon>plugins/Zeitgeist/images/ecommerceAbandonedCart.gif</visitEcommerceStatusIcon> <searches>0</searches> <actions>3</actions> <actionDetails> @@ -123,7 +123,7 @@ <quantity>2</quantity> </row> </itemDetails> - <icon>themes/default/images/ecommerceAbandonedCart.gif</icon> + <icon>plugins/Zeitgeist/images/ecommerceAbandonedCart.gif</icon> </row> </actionDetails> <customVariables> @@ -215,9 +215,9 @@ <visitorType>returning</visitorType> <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus> - <visitEcommerceStatusIcon>themes/default/images/ecommerceOrder.gif</visitEcommerceStatusIcon> + <visitEcommerceStatusIcon>plugins/Zeitgeist/images/ecommerceOrder.gif</visitEcommerceStatusIcon> <searches>0</searches> <actions>6</actions> <actionDetails> @@ -310,7 +310,7 @@ <quantity>6</quantity> </row> </itemDetails> - <icon>themes/default/images/ecommerceOrder.gif</icon> + <icon>plugins/Zeitgeist/images/ecommerceOrder.gif</icon> </row> <row> <type>ecommerceOrder</type> @@ -338,7 +338,7 @@ <quantity>1</quantity> </row> </itemDetails> - <icon>themes/default/images/ecommerceOrder.gif</icon> + <icon>plugins/Zeitgeist/images/ecommerceOrder.gif</icon> </row> <row> <type>action</type> @@ -449,7 +449,7 @@ <quantity>2</quantity> </row> </itemDetails> - <icon>themes/default/images/ecommerceAbandonedCart.gif</icon> + <icon>plugins/Zeitgeist/images/ecommerceAbandonedCart.gif</icon> </row> </actionDetails> <customVariables> @@ -541,7 +541,7 @@ <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -555,7 +555,7 @@ <goalPageId>1</goalPageId> <url>http://example.org/index.htm</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> 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 1535909d2e..7be9c6ddd3 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 @@ </head> <body style="color: rgb(68,68,68);"> <a name="reportTop"/> -<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='themes/default/images/logo-header.png'/></a> +<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> Website Piwik test </h1> 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 f174d5f124..7e8fdcda88 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 @@ </head> <body style="color: rgb(68,68,68);"> <a name="reportTop"/> -<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='themes/default/images/logo-header.png'/></a> +<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> Website Piwik test </h1> 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 e02c135ae8..46dc871185 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 @@ </head> <body style="color: rgb(68,68,68);"> <a name="reportTop"/> -<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='themes/default/images/logo-header.png'/></a> +<a target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> Website Piwik test </h1> 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 091eb38ae4..77fd7a3cdd 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 @@ <pageIdAction>6</pageIdAction> <pageId>5</pageId> - <icon>themes/default/images/link.gif</icon> + <icon>plugins/Zeitgeist/images/link.gif</icon> </row> </actionDetails> <customVariables> @@ -109,7 +109,7 @@ <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -123,7 +123,7 @@ <goalPageId /> <url>http://example.org/homepage</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -220,7 +220,7 @@ <visitorType>new</visitorType> <visitorTypeIcon /> <visitConverted>1</visitConverted> - <visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon> + <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> <visitEcommerceStatusIcon /> <searches>0</searches> @@ -234,7 +234,7 @@ <goalPageId /> <url>http://example.org/homepage</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> @@ -255,7 +255,7 @@ <goalPageId /> <url>http://example.org/user/profile</url> - <icon>themes/default/images/goal.png</icon> + <icon>plugins/Zeitgeist/images/goal.png</icon> </row> <row> <type>action</type> diff --git a/tests/webtest/testcases/level0/1.1-install.disabled b/tests/webtest/testcases/level0/1.1-install.disabled index f826c27cd6..b75a929b40 100644 --- a/tests/webtest/testcases/level0/1.1-install.disabled +++ b/tests/webtest/testcases/level0/1.1-install.disabled @@ -63,10 +63,10 @@ &verifyLinksAndImages; <not description="check if system check passed"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error.png']" /> </not> - <verifyXPath description="looking for ok image" xpath="//img[@src='themes/default/images/ok.png']" /> + <verifyXPath description="looking for ok image" xpath="//img[@src='plugins/Zeitgeist/images/ok.png']" /> <clickLink description="click 'Next'" label="Next »" /> @@ -102,17 +102,17 @@ <!-- 5. tablesCreation --> <not description="check if no error"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error_medium.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error_medium.png']" /> </not> <not description="check if no warning"> - <verifyXPath description="looking for warning image" xpath="//img[@src='themes/default/images/warning_medium.png']" /> + <verifyXPath description="looking for warning image" xpath="//img[@src='plugins/Zeitgeist/images/warning_medium.png']" /> </not> <verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" /> <verifyText description="check page text" text="Piwik" /> <verifyText description="check page text" text="Tables created with success!" /> - <verifyXPath description="looking for success image" xpath="//img[@src='themes/default/images/success_medium.png']" /> + <verifyXPath description="looking for success image" xpath="//img[@src='plugins/Zeitgeist/images/success_medium.png']" /> &checkForErrors; &verifyLinksAndImages; @@ -138,11 +138,11 @@ <!-- 7. firstWebsiteSetup --> <not description="check if no error"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error_medium.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error_medium.png']" /> </not> <not description="check if no warning"> - <verifyXPath description="looking for warning image" xpath="//img[@src='themes/default/images/warning_medium.png']" /> + <verifyXPath description="looking for warning image" xpath="//img[@src='plugins/Zeitgeist/images/warning_medium.png']" /> </not> <verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" /> @@ -161,11 +161,11 @@ <!-- 8. displayJavascriptCode --> <not description="check if no error"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error_medium.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error_medium.png']" /> </not> <not description="check if no warning"> - <verifyXPath description="looking for warning image" xpath="//img[@src='themes/default/images/warning_medium.png']" /> + <verifyXPath description="looking for warning image" xpath="//img[@src='plugins/Zeitgeist/images/warning_medium.png']" /> </not> <verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" /> diff --git a/tests/webtest/testcases/level1/1.5-install.xml b/tests/webtest/testcases/level1/1.5-install.xml index 91f87b5a5a..affa55960b 100644 --- a/tests/webtest/testcases/level1/1.5-install.xml +++ b/tests/webtest/testcases/level1/1.5-install.xml @@ -63,10 +63,10 @@ &verifyLinksAndImages; <not description="check if system check passed"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error.png']" /> </not> - <verifyXPath description="looking for ok image" xpath="//img[@src='themes/default/images/ok.png']" /> + <verifyXPath description="looking for ok image" xpath="//img[@src='plugins/Zeitgeist/images/ok.png']" /> <clickLink description="click 'Next'" label="Next »" /> @@ -102,17 +102,17 @@ <!-- 5. tablesCreation --> <not description="check if no error"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error_medium.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error_medium.png']" /> </not> <not description="check if no warning"> - <verifyXPath description="looking for warning image" xpath="//img[@src='themes/default/images/warning_medium.png']" /> + <verifyXPath description="looking for warning image" xpath="//img[@src='plugins/Zeitgeist/images/warning_medium.png']" /> </not> <verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" /> <verifyText description="check page text" text="Piwik" /> <verifyText description="check page text" text="Tables created with success!" /> - <verifyXPath description="looking for success image" xpath="//img[@src='themes/default/images/success_medium.png']" /> + <verifyXPath description="looking for success image" xpath="//img[@src='plugins/Zeitgeist/images/success_medium.png']" /> &checkForErrors; &verifyLinksAndImages; @@ -138,11 +138,11 @@ <!-- 7. firstWebsiteSetup --> <not description="check if no error"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error_medium.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error_medium.png']" /> </not> <not description="check if no warning"> - <verifyXPath description="looking for warning image" xpath="//img[@src='themes/default/images/warning_medium.png']" /> + <verifyXPath description="looking for warning image" xpath="//img[@src='plugins/Zeitgeist/images/warning_medium.png']" /> </not> <verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" /> @@ -161,11 +161,11 @@ <!-- 8. displayJavascriptCode --> <not description="check if no error"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error_medium.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error_medium.png']" /> </not> <not description="check if no warning"> - <verifyXPath description="looking for warning image" xpath="//img[@src='themes/default/images/warning_medium.png']" /> + <verifyXPath description="looking for warning image" xpath="//img[@src='plugins/Zeitgeist/images/warning_medium.png']" /> </not> <verifyTitle description="check the title is parsed correctly" text="Piwik › Installation" /> diff --git a/tests/webtest/testcases/modules/macros.xml b/tests/webtest/testcases/modules/macros.xml index 88c60af20e..9236d7825b 100644 --- a/tests/webtest/testcases/modules/macros.xml +++ b/tests/webtest/testcases/modules/macros.xml @@ -147,7 +147,7 @@ <clickButton description="simulate auto-post form" label="Continue" /> <not description="check for errors"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error_medium.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error_medium.png']" /> </not> <not description="check if zip archive passed"> @@ -169,7 +169,7 @@ <!-- db update done --> <not description="check for errors"> - <verifyXPath description="looking for error image" xpath="//img[@src='themes/default/images/error_medium.png']" /> + <verifyXPath description="looking for error image" xpath="//img[@src='plugins/Zeitgeist/images/error_medium.png']" /> </not> <verifyText description="check page text" text="Piwik has been successfully updated!" /> |