Merge pull request #130 from epimorphics/spike/underline-links-correc…

…tion Adds underline link to report file page
epimorphics · Aug 19, 2024 · d4d9da4 · d4d9da4
2 parents 6affed9 + 3ff5aaa
commit d4d9da4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 1.5.3 - 2024-08
 
+- (Dan) Updates report page styles so links are underlined and gives download report page a seperate page title
 - (Dan) Updates gemfile to use v1.9.5 lr_common_styles
 - (Dan) Updates the page titles throughout the app [116](https://github.com/epimorphics/standard-reports-ui/issues/116)
 - (Dan) Updates the button text on reports page to be dynamic and adds aria labels to help screen readers [119](https://github.com/epimorphics/standard-reports-ui/issues/119)

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -364,7 +364,7 @@ GEM
       json
       lograge
       railties
-    lr_common_styles (1.9.4)
+    lr_common_styles (1.9.5)
       bootstrap-sass (~> 3.4.0)
       font-awesome-rails (~> 4.7.0.1)
       govuk_elements_rails (~> 2.0.0)
@@ -402,7 +402,7 @@ DEPENDENCIES
   json_rails_logger (~> 1.0.0)!
   leaflet-rails
   libv8-node (>= 16.10.0.0)
-  lr_common_styles (~> 1.9, >= 1.9.4)!
+  lr_common_styles (~> 1.9, >= 1.9.5)!
   minitest-rails-capybara
   minitest-reporters
   minitest-spec-rails

diff --git a/app/helpers/download_request_helper.rb b/app/helpers/download_request_helper.rb
@@ -46,12 +46,12 @@ def render_completed_request(request) # rubocop:disable Metrics/MethodLength
       concat('Ready: ')
       concat(tag(:br))
       concat(
-        link_to("Microsoft Excel format <i class='fa fa-external-link'></i>".html_safe,
+        link_to("Microsoft Excel format <i class='fa fa-external-link text-link'></i>".html_safe,
                 request.url(:xlsx))
       )
       concat(tag(:br))
       concat(
-        link_to("open-data (csv) format <i class='fa fa-external-link'></i>".html_safe,
+        link_to("open-data (csv) format <i class='fa fa-external-link text-link'></i>".html_safe,
                 request.url(:csv))
       )
     end

diff --git a/app/views/download_report/show.html.haml b/app/views/download_report/show.html.haml
@@ -1,3 +1,5 @@
+= content_for(:title, "Download your report file")
+
 - n = @report_manager.requests.length
 
 .download-report
@@ -28,7 +30,7 @@
 
   %p.text-muted
     To create additional reports, you can
-    = link_to( "return to the start", controller: :report_design, action: :show)
+    = link_to( "return to the start", controller: :report_design, action: :show, class: "text-link")
     of this application.