Merge branch 'staging' of https://github.com/USDAForestService/ForestVegetationSimulator-Interface into open-main

Author: wagnerds

fvsOL/DESCRIPTION

@@ -1,7 +1,6 @@
 Package: fvsOL
 Title: Forest Vegetation Simulator
-Version: 2025.01.01
-
+Version: 2025.04.01
 Authors@R: c(person("Nicholas", "Crookston", email = "ncrookston.fs@gmail.com",
                   role = c("aut")),
              person("FVS", "Staff", email = "sm.fs.fvs-support@usda.gov",

fvsOL/R/ui.R

@@ -26,7 +26,7 @@ FVSOnlineUI <- fixedPage(
       'Shiny.addCustomMessageHandler("jsCode",function(message) {eval(message.code);});'))),
   tags$style(type="text/css", paste0(".shiny-progress .progress-text {", 
              "background-color: #eef8ff; color: black; ",
-             "position: absolute; left: 30px;",            
+             "position: absolute; left: 30px;",
              "opacity: .8; height: 35px; width: 50%;}")),
   fixedRow(column(width=4,offset=0,
       HTML(paste0('<div class="FVS_logo"><img src="FVSlogo.png" 
@@ -47,12 +47,12 @@ FVSOnlineUI <- fixedPage(
           tags$div(id="SelectRun", class="tb_padding",
           selectInput("runSel","Selected run", NULL, NULL, multiple=FALSE,
                       selectize=FALSE),
-          actionButton("newRun", alt="New","New"),
-          actionButton("reload",alt="Reload","Reload"),
-          actionButton("saveRun", "Save",alt="Save"),
-          actionButton("dupRun",alt="Duplicate","Duplicate"),
-          modalTriggerButton("deleteRun", "#deleteRunDlg","Delete"),
-          modalDialog(id="deleteRunDlg", footer=list(
+          actionButton("newRun", `aria-label` = "New Run", "New"),
+          actionButton("reload", `aria-label` = "Reload Run", "Reload"),
+          actionButton("saveRun", `aria-label` = "Save Run", "Save"),
+          actionButton("dupRun", `aria-label` = "Duplicate Run", "Duplicate"),
+          modalTriggerButton("deleteRun", "#deleteRunDlg", "Delete"),
+          modalDialog(id = "deleteRunDlg", footer = list(
             modalTriggerButton("deleteRunDlgBtn", "#deleteRunDlg", "Yes"),
               tags$button(type = "button", class = "btn btn-primary",
                'data-dismiss' = "modal", "Cancel")))),

fvsOL/R/writeKeyFile.R

@@ -607,10 +607,11 @@ writeKeyFile <- function (globals,dbIcon,keyFileName=NULL,verbose=TRUE)
             kwdlist <- strsplit(cmp$kwds,"\n")[[1]]  
             cmpkwds <- length(kwdlist)
             for(i in 1:cmpkwds){
-              space <- strsplit(kwdlist[i],"")[[1]][length(strsplit(kwdlist[i],"")[[1]])-1]==" "
+              space <- strsplit(kwdlist[i],"")[[1]][length(strsplit(kwdlist[i],"")[[1]])]==" "
+              space <- if(length(space)==0) FALSE else space
               if(space){
                 keyrec <- strsplit(kwdlist[i],"")[[1]]
-                keyrec <- keyrec[-(length(keyrec)-1)]
+                keyrec <- keyrec[-(length(keyrec))]
                 keyrec <- paste0(keyrec, collapse="")
                 kwdlist[i] <- keyrec
               }