Skip to content

Commit

Permalink
Merge pull request #188 from noaa-nwfsc/update_appearance
Browse files Browse the repository at this point in the history
changed font size of app and changed size of sidebar
  • Loading branch information
anna-abelman authored Jan 8, 2025
2 parents f5d2d8e + f798b7a commit 4bf4768
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 80 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ inst/doc
/Meta/
_site
LICENSE
FishSET_RPackage.Rproj
14 changes: 8 additions & 6 deletions inst/ShinyFiles/MainApp/fleetUI.R
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ saveFleetUI <- function(id) {

tagList(
downloadLink(ns('downloadplotHIDE'), label = ''),
actionButton(ns('downloadplot'), label = 'Save plot to folder',
actionButton(ns('downloadplot'), label = HTML('Save plot to<br> folder'),
class = "btn-primary"),
downloadLink(ns('downloadTableHIDE'), label = ''),
actionButton(ns('downloadTable'), label = 'Save table to folder as csv',
actionButton(ns('downloadTable'), label = HTML("Save table to folder<br> as csv"),
class = "btn-primary")
)
}
Expand All @@ -19,19 +19,21 @@ plotSaveUI <- function(id) {

tagList(
downloadLink(ns('downloadPlotHIDE'), label = ''),
actionButton(ns('save_plot'), label = 'Save plot to folder',
actionButton(ns('save_plot'), label = HTML('Save plot to<br> folder'),
class = "btn-primary",
width = "49%"))
width = "49%"
))
}

tableSaveUI <- function(id) {
ns <- NS(id)

tagList(
downloadLink(ns('downloadTableHIDE'), label = ''),
actionButton(ns('save_table'), label = 'Save table to folder as csv',
actionButton(ns('save_table'), label = HTML("Save table to <br>folder as csv"),
class = "btn-primary",
width = "50%")
width = "49%"
)
)
}

Expand Down
1 change: 0 additions & 1 deletion inst/ShinyFiles/MainApp/fleet_helpers.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

date_select <- function(dat) {

if (any(grepl("date", colnames(dat), ignore.case = TRUE))) {
Expand Down
2 changes: 1 addition & 1 deletion inst/ShinyFiles/MainApp/map_viewer_app.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ map_viewer_serv <- function(id, dat, spatdat, project) {

output$var_select <- renderUI({
bslib::page_sidebar(
sidebar = bslib::sidebar( width = 550,
sidebar = bslib::sidebar( width = 400,

selectInput(ns("avd"), "Area ID variable (primary data)",
choices = colnames(dat$dataset), selected = "ZoneID"),
Expand Down
16 changes: 10 additions & 6 deletions inst/ShinyFiles/MainApp/server.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ source("zone_closure_Server.R", local = TRUE)
source("run_policy_UI.R", local = TRUE)
source("run_policy_server.R", local = TRUE)



# default global search value
if(!exists("default_search")) {default_search <- ""}

Expand All @@ -20,8 +22,9 @@ fs_exist <- exists("folderpath", where = ".GlobalEnv")

### SERVER SIDE
server = function(input, output, session) {
options(shiny.maxRequestSize = 8000*1024^2)

options(shiny.maxRequestSize = 8000*1024^2)


#Disable buttons
toggle_inputs <- function(input_list, enable_inputs = TRUE){
# Toggle elements
Expand Down Expand Up @@ -1108,7 +1111,8 @@ server = function(input, output, session) {

output$load_manage_proj_ui <- renderUI({
actionButton('load_manage_proj', 'Manage Projects', class = "btn-secondary",
style = "padding-left:20px; padding-right: 20px;")
#style = "padding-left:20px; padding-right: 20px;"
)
})

# Manage Projects
Expand Down Expand Up @@ -5859,9 +5863,9 @@ server = function(input, output, session) {
tags$br(),

actionButton("mod_add", "Save model and add new model",
style="color: #fff; background-color: #337ab7; border-color: #800000;"),
class = "btn-primary"),

tags$br(), tags$br(),
tags$br(),

uiOutput('mod_run_bttn')
)
Expand Down Expand Up @@ -5925,7 +5929,7 @@ server = function(input, output, session) {
uiOutput('mod_run_custom_ui'),

actionButton("mod_submit", "Run model(s)",
style = "color: #fff; background-color: #6EC479; border-color:#000000;")
class = "btn-primary")
)
}
})
Expand Down
Loading

0 comments on commit 4bf4768

Please sign in to comment.