diff --git a/app/controllers/web_resources_controller.rb b/app/controllers/web_resources_controller.rb
index 8ee4d69..8adfea4 100644
--- a/app/controllers/web_resources_controller.rb
+++ b/app/controllers/web_resources_controller.rb
@@ -35,7 +35,7 @@ class WebResourcesController < ApplicationController
       "category" => link.category.title,
       "link_to_show" => link.url,
       "target" => target,
-      "onclick" => "if(navigator.sendBeacon){navigator.sendBeacon('/web_resources/track_click/#{link.id}');}"
+      "track_click_url" => "/web_resources/track_click/#{link.id}"
     }
     end
     {
@@ -82,7 +82,7 @@ class WebResourcesController < ApplicationController
         "statuses" => statuses,
         "link_to_show" => link.url,
         "target" => target,
-        "onclick" => "if(navigator.sendBeacon){navigator.sendBeacon('/web_resources/track_click/#{link.id}');}"
+        "track_click_url" => "/web_resources/track_click/#{link.id}"
       }
     end
     {
diff --git a/modules/web_resource/_web_res_widget1.html.erb b/modules/web_resource/_web_res_widget1.html.erb
index f0effd0..5eb4a2d 100644
--- a/modules/web_resource/_web_res_widget1.html.erb
+++ b/modules/web_resource/_web_res_widget1.html.erb
@@ -7,7 +7,7 @@
       <div class="link-img-wrap{{display_image}}">
         <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
       </div>
-      <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" onclick="{{onclick}}">{{title}}</a>
+      <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" data-track-click-url="{{track_click_url}}">{{title}}</a>
       <span data-list="statuses" data-level="1">
         <span class="label status {{status-class}}">{{status}}</span>
       </span>
diff --git a/modules/web_resource/_web_res_widget2.html.erb b/modules/web_resource/_web_res_widget2.html.erb
index 52bf9b0..339d1ac 100644
--- a/modules/web_resource/_web_res_widget2.html.erb
+++ b/modules/web_resource/_web_res_widget2.html.erb
@@ -7,7 +7,7 @@
       <div class="link-img-wrap{{display_image}}">
         <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
       </div>
-      <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" onclick="{{onclick}}">{{title}}</a>
+      <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" data-track-click-url="{{track_click_url}}">{{title}}</a>
       <span data-list="statuses" data-level="1">
         <span class="label status {{status-class}}">{{status}}</span>
       </span>
diff --git a/modules/web_resource/_web_res_widget4.html.erb b/modules/web_resource/_web_res_widget4.html.erb
index aef760c..ffabafa 100644
--- a/modules/web_resource/_web_res_widget4.html.erb
+++ b/modules/web_resource/_web_res_widget4.html.erb
@@ -12,7 +12,7 @@
       data-cycle-pause-on-hover="true" data-cycle-log="false" data-cycle-carousel-fluid="true">
 	    <li class="widget-link__item">
 	      <div class="liWrapper">
-          <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" onclick="{{onclick}}">
+          <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" data-track-click-url="{{track_click_url}}">
             <img class="widget-link__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
           </a>
 	      </div>
diff --git a/modules/web_resource/_web_res_widget5.html.erb b/modules/web_resource/_web_res_widget5.html.erb
index 2aaebfa..6d7ce33 100644
--- a/modules/web_resource/_web_res_widget5.html.erb
+++ b/modules/web_resource/_web_res_widget5.html.erb
@@ -12,7 +12,7 @@
       data-cycle-pause-on-hover="true" data-cycle-log="false" data-cycle-carousel-fluid="true">
 	    <li class="widget-link__item">
 	      <div class="liWrapper">
-          <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" onclick="{{onclick}}">
+          <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" data-track-click-url="{{track_click_url}}">
             <img class="widget-link__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}"><br />
             {{title}}
           </a>
diff --git a/modules/web_resource/_web_res_widget6.html.erb b/modules/web_resource/_web_res_widget6.html.erb
index f9a48aa..869ba67 100644
--- a/modules/web_resource/_web_res_widget6.html.erb
+++ b/modules/web_resource/_web_res_widget6.html.erb
@@ -12,7 +12,7 @@
       data-cycle-pause-on-hover="true" data-cycle-log="false" data-cycle-carousel-fluid="true">
 	    <li class="widget-link__item">
 	      <div class="liWrapper">
-          <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" onclick="{{onclick}}">
+          <a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" data-track-click-url="{{track_click_url}}">
             <img class="widget-link__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}"><br />
           </a>
 	      </div>
diff --git a/modules/web_resource/_web_res_widget7.html.erb b/modules/web_resource/_web_res_widget7.html.erb
index c54c78b..09a3c7b 100644
--- a/modules/web_resource/_web_res_widget7.html.erb
+++ b/modules/web_resource/_web_res_widget7.html.erb
@@ -14,9 +14,9 @@
         <div class="liWrapper">
             <img class="widget-link__img" src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
         </div>
-        <h4 class="widget-content-title"><a href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" onclick="{{onclick}}">{{title}}</a></h4>
+        <h4 class="widget-content-title"><a href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" data-track-click-url="{{track_click_url}}">{{title}}</a></h4>
         <br>
-        <div class="widget-content-context"><a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" onclick="{{onclick}}">{{context}}</a></div>
+        <div class="widget-content-context"><a class="widget-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" data-track-click-url="{{track_click_url}}">{{context}}</a></div>
       </li>
     </div>
     <ul class="button-mid">
diff --git a/modules/web_resource/web_res_index1.html.erb b/modules/web_resource/web_res_index1.html.erb
index 92ecef3..2a092eb 100644
--- a/modules/web_resource/web_res_index1.html.erb
+++ b/modules/web_resource/web_res_index1.html.erb
@@ -4,7 +4,7 @@
   </h1>
   <ul class="list-unstyled" data-list="web_link" data-level="0">
     <li class="index-content">
-      <a class="index-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" onclick="{{onclick}}">
+      <a class="index-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" data-track-click-url="{{track_click_url}}">
         <h4>
           <div class="link-img-wrap{{display_image}}">
             <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
diff --git a/modules/web_resource/web_res_index2.html.erb b/modules/web_resource/web_res_index2.html.erb
index 52c89c3..85cc374 100644
--- a/modules/web_resource/web_res_index2.html.erb
+++ b/modules/web_resource/web_res_index2.html.erb
@@ -4,7 +4,7 @@
   </h1>
   <ul class="list-unstyled" data-list="web_link" data-level="0">
     <li class="index-content col-md-4 col-sm-4">
-      <a class="index-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" onclick="{{onclick}}">
+      <a class="index-content-title" href="{{link_to_show}}" target="{{target}}" title="{{title_text}}" data-track-click-url="{{track_click_url}}">
         <div class="link-img-wrap{{display_image}}">
           <img src="{{img_src}}" alt="{{img_description}}" title="{{img_description}}">
         </div>