From b1c118ad2a160d52b99e18fbf35e727e8471fe31 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Mon, 12 Aug 2024 14:40:20 +0100 Subject: [PATCH 01/10] adds underline text to standard reports landing page --- app/assets/stylesheets/application.scss | 4 ++++ app/views/landing/index.html.haml | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 472fcc4..0e5a1e3 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -24,3 +24,7 @@ "lr_common_styles/lr-common", "leaflet", "standard-reports"; + + .text-link { + text-decoration: underline; + } diff --git a/app/views/landing/index.html.haml b/app/views/landing/index.html.haml index d3f908b..4fe612f 100644 --- a/app/views/landing/index.html.haml +++ b/app/views/landing/index.html.haml @@ -19,11 +19,12 @@ %p Note: standard reports contain aggregated prices by geographical area. If you are looking for details of individual property sales, please use the - %a{ href: "/app/ppd" } + %a{ href: "/app/ppd", class: "text-link" } PPD report builder instead. %p You can read more information = succeed "." do - = link_to "about this service", "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data" + = link_to "about this service", "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data", class: "text-link" + From 9218397984bd5050e79faa7b37f536cf86484c29 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Mon, 12 Aug 2024 14:49:21 +0100 Subject: [PATCH 02/10] adds underline to help link --- CHANGELOG.md | 4 ++++ app/views/report_design/_help.html.haml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b05aad..541eb42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 1.5.2 - 2023-11-27 +- (Dan) Adds underline text to laning page of standard reports and to help link[114](https://github.com/epimorphics/standard-reports-ui/issues/114) + +## 1.5.2 - 2023-11-27 + - (Jon) Updated the `lr_common_styles` gem to the latest 1.9.3 patch release. ## 1.5.1 - 2023-11-23 diff --git a/app/views/report_design/_help.html.haml b/app/views/report_design/_help.html.haml index 6497bd3..4930f7d 100644 --- a/app/views/report_design/_help.html.haml +++ b/app/views/report_design/_help.html.haml @@ -1,2 +1,2 @@ .o-help-link - = link_to( "help", "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data" ) + = link_to( "help", "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data", class: "text-link" ) From a6fdce58c9ec0792b045291bf7f13e63168572da Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Mon, 12 Aug 2024 15:04:34 +0100 Subject: [PATCH 03/10] updates version cadence --- CHANGELOG.md | 2 +- app/lib/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 541eb42..efaf662 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Standard Reports UI: change log -## 1.5.2 - 2023-11-27 +## 1.5.3 - 2024-08 - (Dan) Adds underline text to laning page of standard reports and to help link[114](https://github.com/epimorphics/standard-reports-ui/issues/114) diff --git a/app/lib/version.rb b/app/lib/version.rb index 3fc1fa7..79e1666 100644 --- a/app/lib/version.rb +++ b/app/lib/version.rb @@ -3,7 +3,7 @@ module Version MAJOR = 1 MINOR = 5 - PATCH = 2 + PATCH = 3 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}" end From 020a583a08d8fec80744595052996c705447005a Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Mon, 12 Aug 2024 16:42:45 +0100 Subject: [PATCH 04/10] updates dockerfile gem update --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09cf215..6946d6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apk add --update \ nodejs \ tzdata \ && rm -rf /var/cache/apk/* \ - && gem update --system \ + && gem install rubygems-update -v 3.4.22 \ && gem install bundler:$BUNDLER_VERSION \ && bundle config --global frozen 1 From 9709952b86210b25ea77f3063fa1fe2c90b10d4b Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Mon, 12 Aug 2024 16:46:25 +0100 Subject: [PATCH 05/10] updates dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6946d6e..8f3e5ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,7 @@ RUN apk add --update \ tzdata \ && rm -rf /var/cache/apk/* \ && gem install rubygems-update -v 3.4.22 \ + && update_rubygems \ && gem install bundler:$BUNDLER_VERSION \ && bundle config --global frozen 1 From f9a8c68572ff18c20659bd795ca06d06692762f3 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Tue, 13 Aug 2024 14:49:08 +0100 Subject: [PATCH 06/10] removes extra line --- app/views/report_design/_help.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/report_design/_help.html.haml b/app/views/report_design/_help.html.haml index f639ca1..f4dfb6d 100644 --- a/app/views/report_design/_help.html.haml +++ b/app/views/report_design/_help.html.haml @@ -1,4 +1,4 @@ .o-help-link = link_to "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data", class: "button button--secondary", alt: "Help and tips", title: "Help and tips" do %i.fa.fa-question-circle - help + help \ No newline at end of file From ccfa1db7dc80f768a88319d807bb09d84cff995d Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Tue, 13 Aug 2024 16:23:46 +0100 Subject: [PATCH 07/10] adds new line --- app/views/report_design/_help.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/report_design/_help.html.haml b/app/views/report_design/_help.html.haml index f4dfb6d..f639ca1 100644 --- a/app/views/report_design/_help.html.haml +++ b/app/views/report_design/_help.html.haml @@ -1,4 +1,4 @@ .o-help-link = link_to "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data", class: "button button--secondary", alt: "Help and tips", title: "Help and tips" do %i.fa.fa-question-circle - help \ No newline at end of file + help From 4b87b15499178b4be3bc3908d7bb6e002d137bc7 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Tue, 13 Aug 2024 16:24:13 +0100 Subject: [PATCH 08/10] adds another new line --- app/views/report_design/_help.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/report_design/_help.html.haml b/app/views/report_design/_help.html.haml index f639ca1..768af30 100644 --- a/app/views/report_design/_help.html.haml +++ b/app/views/report_design/_help.html.haml @@ -2,3 +2,4 @@ = link_to "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data", class: "button button--secondary", alt: "Help and tips", title: "Help and tips" do %i.fa.fa-question-circle help + From a00694fc7b970e5dfb949b363075cc7a51c46f60 Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Tue, 13 Aug 2024 16:24:55 +0100 Subject: [PATCH 09/10] removes new line --- app/views/report_design/_help.html.haml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/report_design/_help.html.haml b/app/views/report_design/_help.html.haml index 768af30..f639ca1 100644 --- a/app/views/report_design/_help.html.haml +++ b/app/views/report_design/_help.html.haml @@ -2,4 +2,3 @@ = link_to "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data", class: "button button--secondary", alt: "Help and tips", title: "Help and tips" do %i.fa.fa-question-circle help - From 0f9daff4275571fb5b7725d25b7b5463e2a0e14b Mon Sep 17 00:00:00 2001 From: Daniel Couzens Date: Wed, 14 Aug 2024 11:30:00 +0100 Subject: [PATCH 10/10] updates lr common styles version in gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 8528736..9879116 100644 --- a/Gemfile +++ b/Gemfile @@ -80,5 +80,5 @@ end # TODO: In production you want to set this to the gem from the epimorphics package repo source 'https://rubygems.pkg.github.com/epimorphics' do gem 'json_rails_logger', '~> 1.0.0' - gem 'lr_common_styles', '~> 1.9.3' + gem 'lr_common_styles', '~> 1.9', '>= 1.9.4' end