Reorganizing the images folders for every plugins

21 files changed, 35 insertions, 35 deletions

diff --git a/plugins/CoreHome/templates/images/bg_header.jpg b/plugins/CoreHome/images/bg_header.jpg
index 1733b0e355..1733b0e355 100644
--- a/plugins/CoreHome/templates/images/bg_header.jpg
+++ b/plugins/CoreHome/images/bg_header.jpg
diff --git a/plugins/CoreHome/templates/images/bullet1.gif b/plugins/CoreHome/images/bullet1.gif
index f2707da68c..f2707da68c 100644
--- a/plugins/CoreHome/templates/images/bullet1.gif
+++ b/plugins/CoreHome/images/bullet1.gif
diff --git a/plugins/CoreHome/templates/images/bullet2.gif b/plugins/CoreHome/images/bullet2.gif
index 26e1b6af33..26e1b6af33 100644
--- a/plugins/CoreHome/templates/images/bullet2.gif
+++ b/plugins/CoreHome/images/bullet2.gif
diff --git a/plugins/CoreHome/templates/images/more.png b/plugins/CoreHome/images/more.png
index cba03a05f5..cba03a05f5 100644
--- a/plugins/CoreHome/templates/images/more.png
+++ b/plugins/CoreHome/images/more.png
diff --git a/plugins/CoreHome/templates/images/more_date.gif b/plugins/CoreHome/images/more_date.gif
index 87da6b4963..87da6b4963 100644
--- a/plugins/CoreHome/templates/images/more_date.gif
+++ b/plugins/CoreHome/images/more_date.gif
diff --git a/plugins/CoreHome/templates/images/more_period.gif b/plugins/CoreHome/images/more_period.gif
index b0c9787851..b0c9787851 100644
--- a/plugins/CoreHome/templates/images/more_period.gif
+++ b/plugins/CoreHome/images/more_period.gif
diff --git a/plugins/CoreHome/templates/images/promo_splash.png b/plugins/CoreHome/images/promo_splash.png
index 9a78f8e283..9a78f8e283 100755
--- a/plugins/CoreHome/templates/images/promo_splash.png
+++ b/plugins/CoreHome/images/promo_splash.png
diff --git a/plugins/CoreHome/templates/images/reset_search.png b/plugins/CoreHome/images/reset_search.png
index cb1d9e80a2..cb1d9e80a2 100644
--- a/plugins/CoreHome/templates/images/reset_search.png
+++ b/plugins/CoreHome/images/reset_search.png
diff --git a/plugins/CoreHome/templates/images/search.png b/plugins/CoreHome/images/search.png
index 6d1f037c69..6d1f037c69 100644
--- a/plugins/CoreHome/templates/images/search.png
+++ b/plugins/CoreHome/images/search.png
diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css
index daddbc86b0..9527054647 100644
--- a/plugins/CoreHome/templates/datatable.css
+++ b/plugins/CoreHome/templates/datatable.css
@@ -152,11 +152,11 @@ table.dataTable td.columnodd {
 }
 
 table.dataTable td.labeleven {
-    background: #F9FAFA url(images/bullet2.gif) no-repeat;
+    background: #F9FAFA url(../images/bullet2.gif) no-repeat;
 }
 
 table.dataTable td.labelodd {
-    background: #fff url(images/bullet1.gif) no-repeat;
+    background: #fff url(../images/bullet1.gif) no-repeat;
 }
 
 .dataTable tr.highlight td {
diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js
index 49725bead6..219fc7e3a8 100644
--- a/plugins/CoreHome/templates/datatable.js
+++ b/plugins/CoreHome/templates/datatable.js
@@ -432,7 +432,7 @@ dataTable.prototype =
                 if (currentPattern) {
                     var target = this;
                     var clearImg = $('<span style="position: relative;">\
-							<img src="plugins/CoreHome/templates/images/reset_search.png" style="position: absolute; top: 4px; left: -15px; cursor: pointer; display: inline;" title="Clear" />\
+							<img src="plugins/CoreHome/images/reset_search.png" style="position: absolute; top: 4px; left: -15px; cursor: pointer; display: inline;" title="Clear" />\
 							</span>')
                         .click(function () {
                             $('#keyword', target).val('');
diff --git a/plugins/CoreHome/templates/datatable_cell.twig b/plugins/CoreHome/templates/datatable_cell.twig
index 7ec96403c0..dab9a6401d 100644
--- a/plugins/CoreHome/templates/datatable_cell.twig
+++ b/plugins/CoreHome/templates/datatable_cell.twig
@@ -3,7 +3,7 @@
 {% if not row.idsubdatatable and column=='label' and row.metadata.url is not empty %}
     <a target="_blank" href='{% if row.metadata.url|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.metadata.url }}'>
     {% if row.metadata.logo is empty %}
-        <img class="link" width="10" height="9" src="plugins/Zeitgeist/theme/images/link.gif"/>
+        <img class="link" width="10" height="9" src="plugins/Zeitgeist/images/link.gif"/>
     {% endif %}
 {% endif %}
 {% if column=='label' %}
diff --git a/plugins/CoreHome/templates/datatable_footer.twig b/plugins/CoreHome/templates/datatable_footer.twig
index 7d6f0c0fe7..bf4e932068 100644
--- a/plugins/CoreHome/templates/datatable_footer.twig
+++ b/plugins/CoreHome/templates/datatable_footer.twig
@@ -20,38 +20,38 @@
     </span>
     {% endif %}
 
-    <span class="loadingPiwik" style='display:none'><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
+    <span class="loadingPiwik" style='display:none'><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
     {% if properties.show_footer_icons %}
         <div class="dataTableFooterIcons">
             <div class="dataTableFooterWrap" var="{{ javascriptVariablesToSet.viewDataTable }}">
                 {% if not properties.hide_all_views_icons %}
-                    <img src="plugins/Zeitgeist/theme/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/>
+                    <img src="plugins/Zeitgeist/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/>
                 {% endif %}
                 <div class="tableIconsGroup">
             	<span class="tableAllColumnsSwitch">
                     {% if properties.show_table %}
                         <a class="tableIcon" format="table" var="table">
-                            <img title="{{ 'General_DisplaySimpleTable'|translate }}" src="plugins/Zeitgeist/theme/images/table.png"/>
+                            <img title="{{ 'General_DisplaySimpleTable'|translate }}" src="plugins/Zeitgeist/images/table.png"/>
                         </a>
                     {% endif %}
                     {% if properties.show_table_all_columns %}
                         <a class="tableIcon" format="tableAllColumns" var="tableAllColumns">
-                            <img title="{{ 'General_DisplayTableWithMoreMetrics'|translate }}" src="plugins/Zeitgeist/theme/images/table_more.png"/>
+                            <img title="{{ 'General_DisplayTableWithMoreMetrics'|translate }}" src="plugins/Zeitgeist/images/table_more.png"/>
                         </a>
                     {% endif %}
                     {% if properties.show_goals %}
                         <a class="tableIcon" format="tableGoals" var="tableGoals">
                             <img title="{{ 'General_DisplayTableWithGoalMetrics'|translate }}"
-                                 src="plugins/Zeitgeist/theme/images/{% if javascriptVariablesToSet.idGoal is defined and javascriptVariablesToSet.idGoal=='ecommerceOrder' %}ecommerceOrder.gif{% else %}goal.png{% endif %}"/>
+                                 src="plugins/Zeitgeist/images/{% if javascriptVariablesToSet.idGoal is defined and javascriptVariablesToSet.idGoal=='ecommerceOrder' %}ecommerceOrder.gif{% else %}goal.png{% endif %}"/>
                         </a>
                     {% endif %}
                     {% if properties.show_ecommerce %}
                         <a class="tableIcon" format="ecommerceOrder" var="ecommerceOrder">
-                            <img title="{{ 'General_EcommerceOrders'|translate }}" src="plugins/Zeitgeist/theme/images/ecommerceOrder.gif" />
+                            <img title="{{ 'General_EcommerceOrders'|translate }}" src="plugins/Zeitgeist/images/ecommerceOrder.gif" />
                             <span>{{ 'General_EcommerceOrders'|translate }}</span>
                         </a>
                         <a class="tableIcon" format="ecommerceAbandonedCart" var="ecommerceAbandonedCart">
-                            <img title="{{ 'General_AbandonedCarts'|translate }}" src="plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif" />
+                            <img title="{{ 'General_AbandonedCarts'|translate }}" src="plugins/Zeitgeist/images/ecommerceAbandonedCart.gif" />
                             <span>{{ 'General_AbandonedCarts'|translate }}</span>
                         </a>
                     {% endif %}
@@ -62,17 +62,17 @@
             	    <span class="tableGraphViews tableGraphCollapsed">
                     {% if properties.show_bar_chart %}
                         <a class="tableIcon" format="graphVerticalBar" var="graphVerticalBar">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/>
                         </a>
                     {% endif %}
                     {% if properties.show_pie_chart %}
                         <a class="tableIcon" format="graphPie" var="graphPie">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/chart_pie.png" title="{{ 'General_Piechart'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/chart_pie.png" title="{{ 'General_Piechart'|translate }}"/>
                         </a>
                     {% endif %}
                     {% if properties.show_tag_cloud %}
                         <a class="tableIcon" format="cloud" var="cloud">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/tagcloud.png" title="{{ 'General_TagCloud'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/tagcloud.png" title="{{ 'General_TagCloud'|translate }}"/>
                         </a>
                     {% endif %}
 				    </span>
@@ -81,7 +81,7 @@
                 <div class="tableIconsGroup">
             	    <span class="tableGraphViews">
                         <a class="tableIcon" format="graphEvolution" var="graphEvolution">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/>
                         </a>
                     </span>
                 </div>
@@ -89,7 +89,7 @@
                 <div class="tableIconsGroup">
                     <span class="exportToFormatIcons">
                         <a class="tableIcon" var="export">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/>
                         </a>
                     </span>
 				    <span class="exportToFormatItems" style="display:none">
@@ -102,14 +102,14 @@
                     {% if properties.show_export_as_rss_feed %}
                         |
                         <a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.exportLimit }}" date="last10">
-                            <img border="0" src="plugins/Zeitgeist/theme/images/feed.png"/>
+                            <img border="0" src="plugins/Zeitgeist/images/feed.png"/>
                         </a>
                     {% endif %}
 				    </span>
                     {% if properties.show_export_as_image_icon %}
                         <span id="dataTableFooterExportAsImageIcon">
                             <a class="tableIcon" href="#" onclick="$(this).closest('.dataTable').find('div.jqplot-target').trigger('piwikExportAsImage'); return false;">
-                                <img title="{{ 'General_ExportAsImage_js'|translate }}" src="plugins/Zeitgeist/theme/images/image.png"/>
+                                <img title="{{ 'General_ExportAsImage_js'|translate }}" src="plugins/Zeitgeist/images/image.png"/>
                             </a>
                         </span>
                     {% endif %}
@@ -139,7 +139,7 @@
             {% if not properties.hide_annotations_view %}
                 <div class="annotationView" title="{{ 'Annotations_IconDesc_js'|translate }}">
                     <a class="tableIcon">
-                        <img width="16" height="16" src="plugins/Zeitgeist/theme/images/grey_marker.png"/>
+                        <img width="16" height="16" src="plugins/Zeitgeist/images/grey_marker.png"/>
                     </a>
                     <span>{{ 'Annotations_Annotations'|translate }}</span>
                 </div>
@@ -170,6 +170,6 @@
 
 </div>
 
-<span class="loadingPiwikBelow" style='display:none'><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
+<span class="loadingPiwikBelow" style='display:none'><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
 
 <div class="dataTableSpacer"></div>
diff --git a/plugins/CoreHome/templates/donate.js b/plugins/CoreHome/templates/donate.js
index a73f12a7c3..bd540109da 100755
--- a/plugins/CoreHome/templates/donate.js
+++ b/plugins/CoreHome/templates/donate.js
@@ -27,7 +27,7 @@
             $('.slider-donate-amount', slider).text('$' + donateAmounts[pos] + '/' + _pk_translate('General_YearShort_js'));
 
             // set the right smiley face
-            $('.slider-smiley-face').attr('src', 'plugins/Zeitgeist/theme/images/smileyprog_' + pos + '.png');
+            $('.slider-smiley-face').attr('src', 'plugins/Zeitgeist/images/smileyprog_' + pos + '.png');
 
             // set the hidden option input for paypal
             var option = Math.max(1, pos);
diff --git a/plugins/CoreHome/templates/donate.twig b/plugins/CoreHome/templates/donate.twig
index 6e51a0ea1b..c33dfffe9e 100755
--- a/plugins/CoreHome/templates/donate.twig
+++ b/plugins/CoreHome/templates/donate.twig
@@ -26,14 +26,14 @@
             <div style="display:inline-block">
                 <div class="slider-donate-amount">$30/{{ 'General_YearShort_js'|translate }}</div>
 
-                <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/theme/images/smileyprog_1.png"/>
+                <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/images/smileyprog_1.png"/>
             </div>
 
             <input type="hidden" name="os0" value="Option 1"/>
         </div>
 
         <div class="donate-submit">
-            <input type="image" src="plugins/Zeitgeist/theme/images/paypal_subscribe.gif" border="0" name="submit"
+            <input type="image" src="plugins/Zeitgeist/images/paypal_subscribe.gif" border="0" name="submit"
                 title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/>
 			<a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a>
             <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82"
@@ -41,11 +41,11 @@
         </div>
 
         <!-- to cache images -->
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_0.png"/>
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_1.png"/>
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_2.png"/>
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_3.png"/>
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_4.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_0.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_1.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_2.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_3.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_4.png"/>
     </form>
     {% if footerMessage is defined %}
         <div class="form-description">
diff --git a/plugins/CoreHome/templates/header_message.twig b/plugins/CoreHome/templates/header_message.twig
index 15411c683d..c929db3c03 100644
--- a/plugins/CoreHome/templates/header_message.twig
+++ b/plugins/CoreHome/templates/header_message.twig
@@ -32,8 +32,8 @@
         {% if hasSomeAdminAccess %}
             <br/>
             <div id="updateCheckLinkContainer">
-                <span class='loadingPiwik' style="display:none"><img src='plugins/Zeitgeist/theme/images/loading-blue.gif'/></span>
-                <img src="plugins/Zeitgeist/theme/images/reload.png"/>
+                <span class='loadingPiwik' style="display:none"><img src='plugins/Zeitgeist/images/loading-blue.gif'/></span>
+                <img src="plugins/Zeitgeist/images/reload.png"/>
                 <a href="#" id="checkForUpdates"><em>{{ 'CoreHome_CheckForUpdates'|translate }}</em></a>
             </div>
         {% endif %}
diff --git a/plugins/CoreHome/templates/images/favicon.ico b/plugins/CoreHome/templates/images/favicon.ico
deleted file mode 100644
index ebb2412eab..0000000000
--- a/plugins/CoreHome/templates/images/favicon.ico
+++ /dev/null
diff --git a/plugins/CoreHome/templates/promo_video.twig b/plugins/CoreHome/templates/promo_video.twig
index fde6d99c75..0ae0c23ed3 100755
--- a/plugins/CoreHome/templates/promo_video.twig
+++ b/plugins/CoreHome/templates/promo_video.twig
@@ -14,7 +14,7 @@
 </script>
 <style type="text/css">
     #piwik-promo-thumbnail {
-        background: #fff url(plugins/CoreHome/templates/images/promo_splash.png) no-repeat 0 0;
+        background: #fff url(plugins/CoreHome/images/promo_splash.png) no-repeat 0 0;
         background-position: center;
         width: 321px;
         margin: 0 auto 0 auto;
@@ -96,7 +96,7 @@
 <div id="piwik-promo">
     <div id="piwik-promo-video">
         <div id="piwik-promo-thumbnail">
-            <img src="plugins/Zeitgeist/theme/images/video_play.png"/>
+            <img src="plugins/Zeitgeist/images/video_play.png"/>
         </div>
 
         <div id="piwik-promo-embed" style="display:none">
diff --git a/plugins/CoreHome/templates/reports_by_dimension.twig b/plugins/CoreHome/templates/reports_by_dimension.twig
index e2bdfc380c..de23fe1053 100644
--- a/plugins/CoreHome/templates/reports_by_dimension.twig
+++ b/plugins/CoreHome/templates/reports_by_dimension.twig
@@ -18,7 +18,7 @@
 
     <div style="float:left;">
         <div class="loadingPiwik" style="display:none">
-            <img src="plugins/Zeitgeist/theme/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }}
+            <img src="plugins/Zeitgeist/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }}
         </div>
 
         <div class="dimensionReport">{{ firstReport|raw }}</div>
diff --git a/plugins/CoreHome/templates/sites_selection.twig b/plugins/CoreHome/templates/sites_selection.twig
index cd13310bbc..d7c904a6c6 100644
--- a/plugins/CoreHome/templates/sites_selection.twig
+++ b/plugins/CoreHome/templates/sites_selection.twig
@@ -53,7 +53,7 @@
                 <input type="hidden" class="max_sitename_width" value="130"/>
                 <input type="submit" value="Search" class="but"/>
                 <img title="Clear" class="reset" style="position: relative; top: 4px; left: -44px; cursor: pointer; display: none;"
-                     src="plugins/CoreHome/templates/images/reset_search.png"/>
+                     src="plugins/CoreHome/images/reset_search.png"/>
             </div>
         </div>
     </div>
diff --git a/plugins/CoreHome/templates/warning_invalid_host.twig b/plugins/CoreHome/templates/warning_invalid_host.twig
index 1076e7eed0..58ec1b397f 100644
--- a/plugins/CoreHome/templates/warning_invalid_host.twig
+++ b/plugins/CoreHome/templates/warning_invalid_host.twig
@@ -1,7 +1,7 @@
 {# untrusted host warning #}
 {% if (isValidHost and invalidHostMessage and isValidHost == false) %}
     <div class="ajaxSuccess" style='clear:both;width:800px'>
-        <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/theme/images/help_grey.png"/></a>
+        <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/images/help_grey.png"/></a>
         <strong>{{ 'General_Warning'|translate }}:&nbsp;</strong>{{ invalidHostMessage }}
     </div>
 {% endif %}