Compare commits

...

7 Commits

4 changed files with 9 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
Package: AVSDevR.MarineNoiseRegistry Package: AVSDevR.MarineNoiseRegistry
Title: Marine Noise Registry Common Code Package Title: Marine Noise Registry Common Code Package
Version: 0.1.0 Version: 1.0.0
Authors@R: Authors@R:
person("Craig", "Williams", , "craig@avsdev.uk", role = c("aut", "cre")) person("Craig", "Williams", , "craig@avsdev.uk", role = c("aut", "cre"))
Description: Comon code and assets for all of the Marine Noise Registry Description: Comon code and assets for all of the Marine Noise Registry

View File

@@ -157,9 +157,9 @@ MNR.GeoPlot <- R6::R6Class(
"conservation_area_colours", conservation_area_colours, "conservation_area_colours", conservation_area_colours,
envir = mnr_geoplot_env envir = mnr_geoplot_env
) )
assign("conservation_areas", TRUE, envir = mnr_geoplot_env) assign("conservation_areas_loaded", TRUE, envir = mnr_geoplot_env)
invisible(self$bootConservationAreas()) invisible(self$bootConservationAreas(db_client))
}, },
#' @description Generates a base plotly map with optional layers included #' @description Generates a base plotly map with optional layers included

View File

@@ -17,7 +17,7 @@ use_mnr_ui <- function() {
), ),
htmltools::singleton( htmltools::singleton(
htmltools::HTML(paste0( htmltools::HTML(paste0(
"<script src='", resourcePrefix(), "js/frameHeight.js'></script>" "<script src='", resourcePrefix(), "/js/frameHeight.js'></script>"
)) ))
) )
) )

View File

@@ -87,17 +87,20 @@ h6 {
.table.dataTable > tbody > td.active, .table.dataTable > tbody > td.active,
.table.dataTable > tbody > tr.active td { .table.dataTable > tbody > tr.active td {
background-color: #3f9c35 !important; color: #000000 !important;
background-color: #6bc961 !important;
} }
table.dataTable > tbody > tr.selected > * { table.dataTable > tbody > tr.selected > * {
box-shadow: inset 0 0 0 9999px #3f9c35 !important; color: #000000 !important;
box-shadow: inset 0 0 0 9999px #6bc961 !important;
} }
table.dataTable.hover > tbody > tr.even.selected:hover > *, table.dataTable.hover > tbody > tr.even.selected:hover > *,
table.dataTable.display > tbody > tr.even.selected:hover > *, table.dataTable.display > tbody > tr.even.selected:hover > *,
table.dataTable.hover > tbody > tr.odd.selected:hover > *, table.dataTable.hover > tbody > tr.odd.selected:hover > *,
table.dataTable.display > tbody > tr.odd.selected:hover > * { table.dataTable.display > tbody > tr.odd.selected:hover > * {
color: #FFFFFF !important;
box-shadow: inset 0 0 0 9999px #44a939 !important; box-shadow: inset 0 0 0 9999px #44a939 !important;
} }