Merge pull request #1220 from ElixirTeSS/fix-info-links

Fix "see here..." links in info boxes.

Author: fbacall

app/helpers/events_helper.rb

@@ -5,8 +5,8 @@
 module EventsHelper
   def events_info
     I18n.t('info.events.description',
-           link: link_to(I18n.t('info.events.link'),
-                         registering_resources_path(anchor: 'automatic')))
+           link: I18n.t('info.events.link'),
+           url: registering_resources_path(anchor: 'automatic'))
   end
 
   def google_calendar_export_url(event)

app/helpers/learning_paths_helper.rb

@@ -4,4 +4,16 @@ def learning_path_breadcrumb_param(topic_link, topic_item)
     { lp: [topic_link, topic_item].map(&:id).join(':') }
   end
 
+  def learning_paths_info
+    I18n.t('info.learning_paths.description',
+           link: I18n.t('info.learning_paths.link'),
+           url: registering_learning_paths_path(anchor: 'register_paths'))
+  end
+
+  def learning_path_topics_info
+    I18n.t('info.learning_path_topics.description',
+           link: I18n.t('info.learning_path_topics.link'),
+           url: registering_learning_paths_path(anchor: 'topics'))
+  end
+
 end

app/helpers/materials_helper.rb

@@ -2,32 +2,20 @@
 module MaterialsHelper
   def materials_info
     I18n.t('info.materials.description',
-           link: link_to(I18n.t('info.materials.link'),
-                         registering_resources_path(anchor: 'automatic')))
+           link: I18n.t('info.materials.link'),
+           url: registering_resources_path(anchor: 'automatic'))
   end
 
   def elearning_materials_info
     I18n.t('info.elearning_materials.description',
-           link: link_to(I18n.t('info.elearning_materials.link'),
-                         registering_resources_path(anchor: 'automatic')))
+           link: I18n.t('info.elearning_materials.link'),
+           url: registering_resources_path(anchor: 'automatic'))
   end
 
   def topics_info
     I18n.t('info.topics.description')
   end
 
-  def learning_paths_info
-    I18n.t('info.learning_paths.description',
-           link: link_to(I18n.t('info.learning_paths.link'),
-                         registering_learning_paths_path(anchor: 'register_paths')))
-  end
-
-  def learning_path_topics_info
-    I18n.t('info.learning_path_topics.description',
-           link: link_to(I18n.t('info.learning_path_topics.link'),
-                         registering_learning_paths_path(anchor: 'topics')))
-  end
-
   # Returns an array of two-element arrays of licences ready to be used in options_for_select() for generating option/select tags
   # [['Licence 1 full name','Licence 1 abbreviation'], ['Licence 2 full name','Licence 2 abbreviation'], ...]
   def licence_options_for_select

config/locales/en.yml

@@ -1058,19 +1058,19 @@ en:
       description: |
         An event in %{site_name} is a link to a single training event sourced by a provider along with description and other meta information (e.g. date, location, audience, ontological categorization, keywords, etc.).<br>
         Training events can be added manually or automatically harvested from a provider's website.<br>
-        If your website contains training events that you wish to include in %{site_name}, %{link}.
-      link : see here for details on automatic registration
+        If your website contains training events that you wish to include in %{site_name}, [%{link}](%{url}).
+      link: see here for details on automatic registration
     materials:
       description: |
         In the context of %{site_name}, a training material is a link to a single online training material sourced by a content provider (such as a text on a Web page, presentation, video, etc.).<br>
         Materials can be added manually or automatically harvested from a provider's website.<br>
-        If your website contains training materials that you wish to include in %{site_name}, %{link}.
-      link : see here for details on automatic registration
+        If your website contains training materials that you wish to include in %{site_name}, [%{link}](%{url}).
+      link: see here for details on automatic registration
     elearning_materials:
       description: |
         e-Learning materials are curated materials focused on e-Learning.
-        If your website contains e-Learning materials that you wish to include in %{site_name}, %{link}.
-      link : see here for details on automatic registration
+        If your website contains e-Learning materials that you wish to include in %{site_name}, [%{link}](%{url}).
+      link: see here for details on automatic registration
     topics:
       description: |
         %{site_name} generates a scientific topic suggestion for each resource registered. It does this by passing the description and title of the resource to the Bioportal Annotator Web service.
@@ -1084,8 +1084,8 @@ en:
         1. Register training materials.
         2. Create a learning path topic and add materials to it (repeat for each topic).
         3. Register a learning path and add learning path topics to it.<br>
-        %{link}.
-      link : See here for details on learning paths
+        [%{link}](%{url}).
+      link: See here for details on learning paths
     learning_path_topics:
       description: |
         A learning path topic is an ordered list of training materials.
@@ -1094,8 +1094,8 @@ en:
         1. Register training materials.
         2. Create a learning path topic and add materials to it (repeat for each topic).
         3. Register a learning path and add learning path topics to it.<br>
-        %{link}
-      link : See here for details on learning path topics
+        [%{link}](%{url})
+      link: See here for details on learning path topics
     trainers:
       description: |
         %{site_name} provides a facility that allows registered users to provide information about their training experience and make this publicly available via the Trainers Register.