Merge pull request #52 from dfe-analytical-services/support-panel-ext…

…ernal-links

Replaced all tags links in support panel with dfeshiny::external_link()

.gitignore

@@ -6,3 +6,4 @@ google-analytics.html
 tests/testthat/google-analytics.html
 docs
 inst/doc
+www

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: dfeshiny
 Title: DfE R Shiny Standards
-Version: 0.4.1.9000
+Version: 0.4.2
 Authors@R: c(
     person("Rich", "Bielby", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-9070-9969")),

NEWS.md

@@ -1,4 +1,6 @@
-# dfeshiny (development version)
+# dfeshiny 0.4.2
+
+* Applied use of `external_link()` to `support_panel()`
 
 # dfeshiny 0.4.1
 

R/support_panel.R

@@ -103,11 +103,11 @@ support_panel <- function(
         "This dashboard is a new service that we are developing. If you
               have any feedback or suggestions for improvements, please submit
               them using our ",
-        shiny::tags$a(
+        dfeshiny::external_link(
           href = form_url,
-          "feedback form",
-          .noWS = c("after")
-        )
+          link_text = "feedback form"
+        ),
+        "."
       )
     } else {
       shiny::tags$p(
@@ -124,79 +124,78 @@ support_panel <- function(
         "f you spot any errors or bugs while using this dashboard, please
               screenshot and email them to "
       ),
-      shiny::tags$a(
+      dfeshiny::external_link(
         href = paste0("mailto:", team_email),
-        team_email,
-        .noWS = c("after")
+        link_text = team_email,
+        add_warning = FALSE
       ), "."
     ),
     shiny::tags$h2("Find more information on the data"),
     if (ees_publication) {
       shiny::tags$p(
         "The parent statistical release of this dashboard, along with
               methodological information,
-              is available at the following link: ",
-        shiny::tags$a(
+              is available at ",
+        dfeshiny::external_link(
           href = paste0(
             "https://explore-education-statistics.service.gov.uk/find-statistics/", # nolint: [line_length_linter]
             publication_slug
           ),
-          ifelse(
+          link_text = ifelse(
             !is.null(publication_name),
             publication_name,
-            "Explore Education Statistics"
-          ),
-          .noWS = c("after")
+            "explore education statistics"
+          )
         ),
         ". The statistical release provides additional ",
-        shiny::tags$a(
+        dfeshiny::external_link(
           href = paste0(
             "https://explore-education-statistics.service.gov.uk/find-statistics/", # nolint: [line_length_linter]
             publication_slug, "/data-guidance"
           ),
-          "data guidance",
-          .noWS = c("after")
+          link_text = "data guidance"
         ),
         " and ",
-        shiny::tags$a(
+        dfeshiny::external_link(
           href = paste0(
             "https://explore-education-statistics.service.gov.uk/find-statistics/", # nolint: [line_length_linter]
             publication_slug, "#explore-data-and-files"
           ),
-          "tools to access and interogate the underling data",
-          .noWS = c("after")
+          link_text = "tools to access and interrogate the underlying data"
         ),
         " contained in this dashboard."
       )
     } else {
       shiny::tags$p(
         "The parent statistical release of this dashboard, along with
               methodological information,
-              is available at the following link: ",
-        shiny::tags$a(
+              is available at ",
+        dfeshiny::external_link(
           href = alt_href,
-          publication_name,
-          .noWS = c("after")
-        )
+          link_text = publication_name
+        ),
+        "."
       )
     },
     shiny::tags$h2("Contact us"),
     shiny::tags$p(
       "If you have questions about the dashboard or data within it,
             please contact us at ",
-      shiny::tags$a(
+      dfeshiny::external_link(
         href = paste0("mailto:", team_email),
-        team_email, .noWS = c("after")
-      )
+        link_text = team_email,
+        add_warning = FALSE
+      ),
+      "."
     ),
     shiny::tags$h2("See the source code"),
     shiny::tags$p(
       "The source code for this dashboard is available in our ",
-      shiny::tags$a(
+      dfeshiny::external_link(
         href = paste0(
           repo_name
         ),
-        "GitHub repository", .noWS = c("after")
+        link_text = "GitHub repository"
       ),
       "."
     )