no longer include Js in twig file (#14994)

3 files changed, 53 insertions, 55 deletions

diff --git a/plugins/SEO/SEO.php b/plugins/SEO/SEO.php
index 9fbdb51def..e0f7416c47 100644
--- a/plugins/SEO/SEO.php
+++ b/plugins/SEO/SEO.php
@@ -18,10 +18,16 @@ class SEO extends \Piwik\Plugin
     public function registerEvents()
     {
         return [
-            'Widget.filterWidgets' => 'filterWidgets'
+            'Widget.filterWidgets' => 'filterWidgets',
+            'AssetManager.getJavaScriptFiles' => 'getJsFiles',
         ];
     }
 
+    public function getJsFiles(&$jsFiles)
+    {
+        $jsFiles[] = "plugins/SEO/javascripts/rank.js";
+    }
+
     /**
      * @param WidgetsList $list
      */
diff --git a/plugins/SEO/javascripts/rank.js b/plugins/SEO/javascripts/rank.js
index ef92aa8c3b..fca04d1ab0 100644
--- a/plugins/SEO/javascripts/rank.js
+++ b/plugins/SEO/javascripts/rank.js
@@ -4,9 +4,8 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-
-$(document).ready(function () {
-    function getRank() {
+var SEOWidget = {
+    getRank: function () {
         var ajaxRequest = new ajaxHelper();
         ajaxRequest.setLoadingElement('#ajaxLoadingSEO');
         ajaxRequest.addParams({
@@ -22,10 +21,4 @@ $(document).ready(function () {
         ajaxRequest.setFormat('html');
         ajaxRequest.send();
     }
-
-    // click on Rank button
-    $('#rankbutton').on('click', function () {
-        getRank();
-        return false;
-    });
-});
+}
diff --git a/plugins/SEO/templates/getRank.twig b/plugins/SEO/templates/getRank.twig
index 80aab34cdb..d399368696 100644
--- a/plugins/SEO/templates/getRank.twig
+++ b/plugins/SEO/templates/getRank.twig
@@ -1,52 +1,51 @@
 <div id='SeoRanks'>
-    <script type="text/javascript" src="plugins/SEO/javascripts/rank.js"></script>
 
-    <form method="post" style="padding: 8px;">
-        <div align="left" class="row">
-            <div class="col s8 input-field">
-                <label for="seoUrl" class="active">{{ 'Installation_SetupWebSiteURL'|translate|capitalize }}</label>
-                <input type="text" id="seoUrl" size="15" value="{{ urlToRank }}" class="textbox "/>
-            </div>
-            <div class="col s4">
-                <input type="submit" class="btn btn-small" style='margin-top: 2em' id="rankbutton" value="{{ 'SEO_Rank'|translate }}"/>
-            </div>
+    <div align="left" class="row">
+        <div class="col s8 input-field">
+            <label for="seoUrl" class="active">{{ 'Installation_SetupWebSiteURL'|translate|capitalize }}</label>
+            <input type="text" id="seoUrl" size="15" value="{{ urlToRank }}" class="textbox "/>
         </div>
+        <div class="col s4">
+            <input type="button"
+                   onclick="SEOWidget.getRank()"
+                   class="btn btn-small" style='margin-top: 2em' id="rankbutton" value="{{ 'SEO_Rank'|translate }}"/>
+        </div>
+    </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;margin-left: 5px;font-size:14px;">
-            {% if ranks is empty %}
-                {{ 'General_Error'|translate }}
-            {% else %}
-                {% set cleanUrl %}
-                    <a href="http://{{ urlToRank }}" rel="noreferrer noopener" target="_blank">{{ urlToRank }}</a>
-                {% endset %}
-                {{ 'SEO_SEORankingsFor'|translate(cleanUrl)|raw }}
-                <table cellspacing="2" style="margin:auto;line-height:3.5em !important;margin-top:20px;">
+    <div id="rankStats" align="left" style="margin-top:10px;margin-left: 5px;font-size:14px;">
+        {% if ranks is empty %}
+            {{ 'General_Error'|translate }}
+        {% else %}
+            {% set cleanUrl %}
+                <a href="http://{{ urlToRank }}" rel="noreferrer noopener" target="_blank">{{ urlToRank }}</a>
+            {% endset %}
+            {{ 'SEO_SEORankingsFor'|translate(cleanUrl)|raw }}
+            <table cellspacing="2" style="margin:auto;line-height:3.5em !important;margin-top:20px;">
 
-                    {% for rank in ranks %}
-                        <tr>
-                            {% set seoLink %}{% if rank.logo_link is not empty %}<a class="linkContent" href="{{ rank.logo_link }}"
-                                                                                    target="_blank" rel="noreferrer noopener"
-                                                                                    {% if rank.logo_tooltip is not empty %}title="{{ rank.logo_tooltip }}"{% endif %}>{% endif %}{% endset %}
-                                <td>{% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}<img width="24px" height="24px"
-                                                                                                         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|raw }}
-                            </td>
-                            <td>
-                                <div style="margin-left:15px;">
-                                    {% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}
-                                    {% if rank.rank %}{{ rank.rank|raw }}{% else %}-{% endif %}
-                                    {{ rank.rank_suffix }}
-                                    {% if rank.logo_link is not empty %}</a>{% endif %}
-                                </div>
-                            </td>
-                        </tr>
-                    {% endfor %}
+                {% for rank in ranks %}
+                    <tr>
+                        {% set seoLink %}{% if rank.logo_link is not empty %}<a class="linkContent" href="{{ rank.logo_link }}"
+                                                                                target="_blank" rel="noreferrer noopener"
+                                                                                {% if rank.logo_tooltip is not empty %}title="{{ rank.logo_tooltip }}"{% endif %}>{% endif %}{% endset %}
+                            <td>{% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}<img width="24px" height="24px"
+                                                                                                     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|raw }}
+                        </td>
+                        <td>
+                            <div style="margin-left:15px;">
+                                {% if rank.logo_link is not empty %}{{ seoLink|raw }}{% endif %}
+                                {% if rank.rank %}{{ rank.rank|raw }}{% else %}-{% endif %}
+                                {{ rank.rank_suffix }}
+                                {% if rank.logo_link is not empty %}</a>{% endif %}
+                            </div>
+                        </td>
+                    </tr>
+                {% endfor %}
 
-                </table>
-            {% endif %}
-        </div>
-    </form>
+            </table>
+        {% endif %}
+    </div>
 </div>