Increment version number to 0.1.1

DESCRIPTION

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

NAMESPACE

@@ -9,7 +9,6 @@ export(MNR.DB.Organisations)
 export(MNR.DB.Users)
 export(MNR.GeoPlot)
 export(attachResourcePaths)
-export(mnrNotification)
 export(resourcePrefix)
 export(use_mnr_ui)
 import(dplyr)

R/db_applications.R

@@ -278,8 +278,6 @@ MNR.DB.Applications <- R6::R6Class(
           )
           # Include user what-ifs
           | (user_match & organisation_id == -1 & state_whatif)
-          # Include organisation what-ifs
-          | (!user_match & organisation_match & app_submitter & state_whatif)
           # Admin override
           | (!!flag_admin & organisation_id == -1)
         ) %>%

R/geoPlot.R

@@ -157,7 +157,7 @@ MNR.GeoPlot <- R6::R6Class(
         "conservation_area_colours", conservation_area_colours,
         envir = mnr_geoplot_env
       )
-      assign("conservation_areas_loaded", TRUE, envir = mnr_geoplot_env)
+      assign("conservation_areas", TRUE, envir = mnr_geoplot_env)
 
       invisible(self$bootConservationAreas(db_client))
     },
@@ -181,10 +181,6 @@ MNR.GeoPlot <- R6::R6Class(
         private$addJNCCLayers(with_jncc_layers) %>%
         private$addConservationAreas(with_conservation_areas) %>%
         plotly::layout(
-          font = list(
-            family = "Roboto, \"Helvetica Neue\", Helvetica, Arial, sans-serif",
-            size = 15
-          ),
           mapbox = list(style = "carto-positron"),
           legend = list(
             groupclick = "toggleitem",

R/notification.R

@@ -1,22 +0,0 @@
-
-#' Displays a shiny notification with MNR specific settings
-#'
-#' @inheritParams shiny::showNotification
-#' @param message Character string to display in the notification
-#'
-#' @export
-mnrNotification <- function(
-	message, type = "message", session = shiny::getDefaultReactiveDomain()
-) {
-  shiny::showNotification(
-  	message,
-  	type = type,
-  	duration = ifelse(
-  	  type %in% c("warning", "error"),
-  	  getOption("mnr.error_duration", 30),
-  	  getOption("mnr.notify_duration", 15)
-  	),
-  	closeButton = TRUE,
-  	session = session
-  )
-}

R/use_mnr_ui.R

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

inst/www/css/mnr-shiny.css

@@ -9,108 +9,4 @@ input[type="text"], input[type="password"], input[type="number"] {
 
 .selectize-input input[type="text"] {
   height: 27px !important;
-}
-
-.selectize-control .selectize-input.disabled {
-  cursor: not-allowed !important;
-  opacity: 1;
-  background-color: #eee;
-}
-.selectize-input.disabled, .selectize-input.disabled * {
-  cursor: not-allowed !important;
-}
-
-
-.table.dataTable tbody tr td.actions-col, .table.dataTable thead tr th.actions-col {
-  min-width: 140px;
-}
-
-.row-header {
-  padding-bottom: 0;
-  margin-bottom: 0;
-  margin-top: 30px;
-  text-decoration: underline;
-}
-
-.form-group.has-success div div.selectize-control div.selectize-input {
-  border-color: #00a65a;
-  box-shadow: none;
-}
-
-.tab-content {
-  border-left: 1px solid #ddd;
-  padding: 8px;
-  padding-left: 15px;
-}
-
-.noise-parameter {
-  display: inline-block;
-  width: 32%;
-  padding: 0px 20px 0px 0px;
-}
-
-
-dl.parameters {
-  display: grid;
-  grid-template-columns: max-content auto;
-}
-
-dl.parameters dt {
-  grid-column-start: 1;
-}
-dl.parameters dt::after {
-  content: ":";
-  margin-right: 10px;
-}
-
-dl.parameters dd {
-  grid-column-start: 2;
-}
-
-tr.deleted-row {
-  text-decoration: line-through;
-  color: #BBB;
-}
-
-hr {
-  color: #BBB;
-}
-
-.vr {
-  color: #BBB;
-  opacity: 1.0;
-  width: 2px;
-}
-
-.shiny-notification-close {
-  font-size: 2em !important;
-}
-
-.dt-scroll-x {
-  overflow-x: auto;
-  clear: both;
-}
-.dt-scroll-x table {
-  width: 150% !important;
-}
-.dt-sticky-left-border {
-  border-right: 3px double #000000;
-}
-.dt-sticky-right-border {
-  border-left: 3px double #000000;
-}
-
-@media(max-width:1200px) {
-  .dtfc-fixed-left {
-    position: inherit !important;
-  }
-  .dtfc-fixed-right {
-    position: inherit !important;
-  }
-  .dt-sticky-left-border {
-    border-right: 0;
-  }
-  .dt-sticky-right-border {
-    border-left: 0;
-  }
 }

inst/www/css/mnr.css

@@ -87,20 +87,17 @@ h6 {
 
 .table.dataTable > tbody > td.active,
 .table.dataTable > tbody > tr.active td {
-  color: #000000 !important;
+  background-color: #3f9c35 !important;
-  background-color: #6bc961 !important;
 }
 
 table.dataTable > tbody > tr.selected > * {
-  color: #000000 !important;
+  box-shadow: inset 0 0 0 9999px #3f9c35 !important;
-  box-shadow: inset 0 0 0 9999px #6bc961 !important;
 }
 
 table.dataTable.hover > tbody > tr.even.selected:hover > *,
 table.dataTable.display > tbody > tr.even.selected:hover > *, 
 table.dataTable.hover > 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;
 }
 
@@ -441,17 +438,6 @@ a:focus {
   text-decoration: underline;
 }
 
-.form-control {
-  font-size: 12pt;
-}
-
-.form-group.has-success label {
-  color: #008549;
-}
-.form-group.has-error label {
-  color: #DA3A25;
-}
-
 .btn {
   font-size: 14pt;
   /*
@@ -494,14 +480,9 @@ input[type="text"], input[type="password"], input[type="number"] {
   overflow: hidden;
 }
 .content-jump-link:focus {
-  position: absolute;
+  position: static;
   width: auto;
   height: auto;
-  z-index: 1500;
-  background-color: #ecf0f5;
-  padding: 5px 10px;
-  left: 0;
-  color: #2D6B8F;
 }
 
 .box-header > i {
@@ -566,7 +547,7 @@ input[type="text"], input[type="password"], input[type="number"] {
   text-decoration: none;
 }
 
-.sidebar-menu > li.header {
+.skin-green .sidebar-menu > li.header {
   color: #70979E;
   font-weight: bolder;
 }
@@ -585,4 +566,4 @@ input[type="text"], input[type="password"], input[type="number"] {
 
 .badge {
   padding: 6px 9px 3px 9px;
-}
+}

man/mnrNotification.Rd

@@ -1,19 +0,0 @@
-% Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/notification.R
-\name{mnrNotification}
-\alias{mnrNotification}
-\title{Displays a shiny notification with MNR specific settings}
-\usage{
-mnrNotification(message, type, session = shiny::getDefaultReactiveDomain())
-}
-\arguments{
-\item{message}{Character string to display in the notification}
-
-\item{type}{A string which controls the color of the notification. One of
-"default" (gray), "message" (blue), "warning" (yellow), or "error" (red).}
-
-\item{session}{Session object to send notification to.}
-}
-\description{
-Displays a shiny notification with MNR specific settings
-}