Huge merge! Lets see how the tests run..

Merge branch 'master' into 2.x-twig

Conflicts:
	core/ReportRenderer/Html.php
	core/SmartyPlugins/function.ajaxLoadingDiv.php
	plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
	plugins/CoreHome/templates/donate.tpl
	plugins/CoreHome/templates/html_report_header.tpl
	plugins/CoreHome/templates/menu.tpl
	plugins/CoreHome/templates/period_select.tpl
	plugins/CoreHome/templates/reports_by_dimension.tpl
	plugins/Feedback/templates/index.tpl
	plugins/Goals/Controller.php
	plugins/Goals/templates/overview.tpl
	plugins/Live/API.php
	plugins/Live/templates/lastVisits.tpl
	plugins/Live/templates/visitorLog.tpl
	plugins/MobileMessaging/templates/SMSReport.tpl
	plugins/PDFReports/templates/add.tpl
	plugins/PDFReports/templates/list.tpl
	plugins/PDFReports/templates/report_parameters.tpl
	plugins/SEO/templates/index.tpl
	plugins/SegmentEditor/templates/selector.twig
	plugins/UserCountry/javascripts/userCountry.js
	plugins/Zeitgeist/stylesheets/common.css
	tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
	tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
	tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
	tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml

2 files changed, 15 insertions, 18 deletions

diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php
index 26ac00c5bd..bc94a2663d 100644
--- a/plugins/SEO/API.php
+++ b/plugins/SEO/API.php
@@ -100,8 +100,6 @@ class Piwik_SEO_API
             $data[Piwik_Translate('SEO_Dmoz')] = $dmozRank;
         }
 
-        $dataTable = new Piwik_DataTable();
-        $dataTable->addRowsFromArrayWithIndexLabel($data);
-        return $dataTable;
+        return Piwik_DataTable::makeFromIndexedArray($data);
     }
 }
diff --git a/plugins/SEO/templates/index.twig b/plugins/SEO/templates/index.twig
index 1d6e9deb22..0a147b4f62 100644
--- a/plugins/SEO/templates/index.twig
+++ b/plugins/SEO/templates/index.twig
@@ -1,5 +1,5 @@
 <div id='SeoRanks'>
-    <script type="text/javascript" src="plugins/SEO/javascripts/rank.js"></script>
+    <script type="text/javascript" src="plugins/SEO/templates/rank.js"></script>
 
     <form method="post" style="padding: 8px;">
         <div align="left" class="mediumtext">
@@ -10,8 +10,8 @@
 		  </span>
         </div>
 
-        {% import 'ajaxMacros.twig' as ajax %}
-        {{ ajax.loadingDiv('ajaxLoadingSEO') }}
+        {% import "ajaxMacros.twig" as ajax %}
+        {{ ajax.LoadingDiv('ajaxLoadingSEO') }}
 
         <div id="rankStats" align="left" style='margin-top:10px'>
             {% if ranks is empty %}
@@ -24,27 +24,26 @@
                 <table cellspacing='2' style='margin:auto;line-height:1.5em;padding-top:10px'>
                     {% for rank in ranks %}
                         <tr>
-                            {% set seoLink %}<a class="linkContent" href="?module=Proxy&action=redirect&url={{ rank.logo_link|url_encode }}" target="_blank"
-                                     {% if rank.logo_tooltip is not empty %}title="{{ rank.logo_tooltip }}"{% endif %}>
-                            {% endset %}
+{% set seoLink %}{% if rank.logo_link is not empty %}<a class="linkContent" href="?module=Proxy&action=redirect&url={{ rank.logo_link|url_encode }}" target="_blank"
+                         {% if rank.logo_tooltip is not empty %}title="{{ rank.logo_tooltip }}"{% endif %}>{% endif %}{% endset %}
                             {% set majesticLink %}{{ seoLink }}Majestic</a>{% endset %}
-                            <td>
-                                {% if rank.logo_link is not empty %}{{ seoLink }}{% endif %}
-                                <img style='vertical-align:middle;margin-right:6px;' src='{{ rank.logo }}' border='0'
-                                    alt="{{ rank.label }}">{% if rank.logo_link is not empty %}</a>{% endif %} {{ rank.label|replace({"Majestic":majesticLink}) }}
+                            <td>{% if rank.logo_link is not empty %}{{ seoLink }}{% endif %}<img
+                                            style='vertical-align:middle;margin-right:6px;' src='{{ rank.logo }}' border='0'
+                                            alt="{{ rank.label }}">{% if rank.logo_link is not empty %}</a>{% endif %} {{ rank.label|replace({"Majestic": majesticLink}) }}
                             </td>
                             <td>
                                 <div style='margin-left:15px'>
-                                {% if rank.logo_link is not empty %}{{ seoLink }}{% endif %}
-                                {% if rank.rank is defined %}{{ rank.rank }}{% else %}-{% endif %}
-                                {% if rank.id=='pagerank' %} /10
-                                {% elseif rank.id=='google-index' or rank.id=='bing-index' %} {{ 'SEO_Pages'|translate }}
-                                {% endif %}
+                                {% if rank.logo_link is not empty }{{ seoLink }}{% endif %}
+                                    {% if rank.rank %}{{ rank.rank }}{% else% }-{% endif %}
+                                    {% if rank.id=='pagerank' %} /10
+                                    {% elseif rank.id=='google-index' or rank.id=='bing-index' %} {{ 'SEO_Pages'|translate }}
+                                    {% endif %}
                                 {% if rank.logo_link is not empty %}</a>{% endif %}
                                 </div>
                             </td>
                         </tr>
                     {% endfor %}
+
                 </table>
             {% endif %}
         </div>