diff --git a/.RData b/.RData
index 9e53bef..c1506d1 100644
Binary files a/.RData and b/.RData differ
diff --git a/R/app_server.R b/R/app_server.R
index f4304b1..8dd6061 100644
--- a/R/app_server.R
+++ b/R/app_server.R
@@ -54,6 +54,7 @@ server <- function(input, output, session) {
if (main.env$dev){
shinyjs::show("dev")
+ shinyjs::show("disclaimer-wip")
observeEvent(input$dev, {
if (main.env$current.tab() != "fill" &&
main.env$current.tab() != "upload")
@@ -108,7 +109,7 @@ server <- function(input, output, session) {
# Disclaimer
observe({
- invalidateLater(60*1000)
+ invalidateLater(5*60*1000)
devmsg(
tag = "DEV",
"Connected users at %s: %s",
diff --git a/R/eal_1_SelectDP.R b/R/eal_1_SelectDP.R
index a708899..39f8af7 100644
--- a/R/eal_1_SelectDP.R
+++ b/R/eal_1_SelectDP.R
@@ -36,7 +36,8 @@ SelectDPUI <- function(id) {
)
)
)
- )
+ ),
+ tags$hr()
),
fluidRow(
# Load existing DP ----
diff --git a/R/fill_module.R b/R/fill_module.R
index 5abfe8c..f5b65e1 100644
--- a/R/fill_module.R
+++ b/R/fill_module.R
@@ -5,34 +5,65 @@ fillUI <- function(id) {
tabsetPanel(
id = NS(id, "tabs"),
tabPanel(
- "EAL",
+ tags$h4("EML Assembly Line"),
fluidPage(
style = "padding-top:2.5%;",
# * Top row ----
tags$span(
fluidRow(
div(
- h4("EML Assembly Line"),
- h3(textOutput(NS(id, "current_step"))),
+ HTML(
+ ''
+ ),
+ h3(
+ textOutput(NS(id, "current_step"))
+ ),
style = "float: left"
),
div(
- actionButton(
+ shinyWidgets::actionBttn(
NS(id, "help"),
- "Help",
- icon("question-circle")
+ "Help",
+ icon("question-circle"),
+ style = "simple",
+ color = "primary"
),
- actionButton(
+ # actionButton(
+ # NS(id, "help"),
+ # "Help",
+ # icon("question-circle"),
+ # style = "background-color: #6cb5e1; color: #fff"
+ # ),
+ shinyWidgets::actionBttn(
NS(id, "save"),
"Save",
- icon("save")
- ), # fill-wizard-save
- actionButton(
+ icon("save"),
+ style = "simple",
+ color = "success"
+ ),
+ # actionButton(
+ # NS(id, "save"),
+ # "Save",
+ # icon("save"),
+ # style = "background-color: #a2d98e;"
+ # ), # fill-wizard-save
+ shinyWidgets::actionBttn(
NS(id, "quit"),
"Quit",
icon("times-circle"),
- class = "danger"
- ), # fill-wizard-quit
+ style = "simple",
+ color = "danger"
+ ),
+ # actionButton(
+ # NS(id, "quit"),
+ # "Quit",
+ # icon("times-circle"),
+ # class = "danger"
+ # ), # fill-wizard-quit
style = "float: right;"
), # fill-wizard-help
style = "width: 100%"
@@ -49,7 +80,7 @@ fillUI <- function(id) {
) # end fluidPage
),
tabPanel(
- "MetaFIN",
+ tags$h4("MetaFIN"),
MetaFINUI(
NS(id, "metafin"),
wip = base::get("metashark.args", envir = .GlobalEnv)$wip
diff --git a/R/fill_pages.R b/R/fill_pages.R
index 2963efa..3227693 100644
--- a/R/fill_pages.R
+++ b/R/fill_pages.R
@@ -196,12 +196,19 @@ pagesServer <- function(id, main.env) {
#'
#' @noRd
nextTabButton <- function(id, i) {
- actionButton(
+ shinyWidgets::actionBttn(
NS(id, paste(i, i + 1, sep = "_")),
"Next",
- icon = icon("arrow-right"),
- width = "100%"
+ icon("arrow-right"),
+ # style = "pill",
+ block = TRUE
)
+ # actionButton(
+ # NS(id, paste(i, i + 1, sep = "_")),
+ # "Next",
+ # icon = icon("arrow-right"),
+ # width = "100%"
+ # )
}
# * Previous ====
@@ -210,10 +217,17 @@ nextTabButton <- function(id, i) {
#'
#' @noRd
prevTabButton <- function(id, i) {
- actionButton(
+ shinyWidgets::actionBttn(
NS(id, paste(i, i - 1, sep = "_")),
"Previous",
- icon = icon("arrow-left"),
- width = "100%"
+ icon("arrow-left"),
+ # style = "pill",
+ block = TRUE
)
+ # actionButton(
+ # NS(id, paste(i, i - 1, sep = "_")),
+ # "Previous",
+ # icon = icon("arrow-left"),
+ # width = "100%"
+ # )
}
\ No newline at end of file
diff --git a/R/metafin.R b/R/metafin.R
index 239e5ce..f55acec 100644
--- a/R/metafin.R
+++ b/R/metafin.R
@@ -3,7 +3,6 @@ MetaFINUI <- function(id, wip) {
if(wip) {
wipRow(
- tags$h3("MetaFIN"),
fileInput(
ns("file"),
"Select a valid EML file (.xml)",
diff --git a/R/welcome_module.R b/R/welcome_module.R
index 0d862ff..5327509 100644
--- a/R/welcome_module.R
+++ b/R/welcome_module.R
@@ -10,9 +10,12 @@ welcomeUI <- function(id) {
# MetaShARK
tags$h1("Welcome in MetaShARK"),
fluidRow(
- wipRow(
- tags$p("DISCLAIMER: some features are still in development. Some parts
+ shinyjs::hidden(
+ wipRow(
+ id = "disclaimer-wip",
+ tags$p("DISCLAIMER: some features are still in development. Some parts
with this color code are not meant to be fully functional.")
+ )
),
column(
6,
@@ -60,7 +63,7 @@ welcomeUI <- function(id) {
tags$p(
HTML("The application you are currently using is a front-end
tool for any user who wants to contribute to a DataOne node
- repository, also known as metadata catalog or MetaCat.
+ repository, also known as metadata catalogue or MetaCat.
To contribute to a MetaCat, you need to login to the metacat
in which you want to upload your data package. Then, it will
be possible for MetaShARK to gather the needed informations, as
diff --git a/inst/app/www/styles.css b/inst/app/www/styles.css
index 9e5e649..53b9e82 100644
--- a/inst/app/www/styles.css
+++ b/inst/app/www/styles.css
@@ -1,11 +1,44 @@
+/* Color palette */
+
+.color1 {color: #000002;}
+.color2 {color: #172a3a;}
+.color3 {color: #325975;}
+.color4 {color: #4e91b9;}
+.color5 {color: #6bd1ff;}
+.white {color: #fff}
+
/* -- Overwrite -- */
+.content-wrapper {
+ background-color: #f4f4f4 !important;
+}
+
+.form-control {
+ background-color: #fff !important;
+}
+
img {
display: block;
margin-left: auto;
margin-right: auto;
}
+.logo {
+ background-color: #4e91b9 !important;
+}
+
+.nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover {
+ background-color: transparent;
+}
+
+.navbar {
+ background-color: #4e91b9 !important;
+}
+
+.main-sidebar {
+ background-color: #172a3a !important;
+}
+
p {
text-align: justify;
}
diff --git a/inst/media/logo_pndb.png b/inst/media/logo_pndb.png
index 35748c0..0d7302b 100644
Binary files a/inst/media/logo_pndb.png and b/inst/media/logo_pndb.png differ