Merge pull request #596 from Sage-Bionetworks/FDS-1747-sage-logo

Fds 1747 sage logo
Sage-Bionetworks · Mar 15, 2024 · 552a65b · 552a65b
2 parents 27f2560 + fdf118b
commit 552a65b
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 21 deletions.
diff --git a/functions/dcWaiter.R b/functions/dcWaiter.R
@@ -32,15 +32,15 @@ dcWaiter <- function(stage = c("show", "update", "hide"),
     if (stage == "show") {
       waiter_show_on_load(
         html = tagList(
-          img(src = "img/Logo_Sage_Logomark.png"),
+          img(src = "img/sage_logo_mark_only.png"),
           h4("Logging into Data Curator App")
         ),
         color = col2rgba("#2a668d", 255*0.9)
       )
     } else if (!isCertified) {
       # when user is not certified synapse user
       waiter_update(html = tagList(
-        img(src = "img/Logo_Sage_Logomark.png", height = "120px"),
+        img(src = "img/sage_logo_mark_only.png", height = "120px"),
         h3("Looks like you're not a synapse certified user!"),
         span(
           "Please follow the ",
@@ -54,15 +54,15 @@ dcWaiter <- function(stage = c("show", "update", "hide"),
     } else if (!isPermission) {
       # when user is not certified synapse user
       waiter_update(html = tagList(
-        img(src = "img/Logo_Sage_Logomark.png", height = "120px"),
+        img(src = "img/sage_logo_mark_only.png", height = "120px"),
         h3("Fileview/Project Access Denied!"),
         span("You may not have sufficient permissions for curation.
          Please contact your team and project administrators.")
       ))
     } else {
       # success loading page; userName needed to provide
       waiter_update(html = tagList(
-        img(src = "img/Logo_Sage_Logomark.png", height = "120px"),
+        img(src = "img/sage_logo_mark_only.png", height = "120px"),
         h3(sprintf("Welcome, %s!", userName))
       ))
       Sys.sleep(sleep)

diff --git a/server.R b/server.R
@@ -218,7 +218,7 @@ shinyServer(function(input, output, session) {
 
     logo_img <- ifelse(!is.na(dcc_config_react()$dcc$logo_location),
       dcc_config_react()$dcc$logo_location,
-      "https://raw.githubusercontent.com/Sage-Bionetworks/data_curator_config/main/demo/Logo_Sage_Logomark.png"
+      "https://raw.githubusercontent.com/Sage-Bionetworks/data_curator_config/prod/demo/sage_logo_mark_only.png"
     )
 
     logo_link <- ifelse(!is.na(dcc_config_react()$dcc$logo_link),

diff --git a/www/img/ADKnowledgePortal.png b/www/img/ADKnowledgePortal.png
diff --git a/www/img/HTAN_text_logo.png b/www/img/HTAN_text_logo.png
diff --git a/www/img/INCLUDE DCC Logo-01.png b/www/img/INCLUDE DCC Logo-01.png
diff --git a/www/img/Logo_Sage_Logomark.png b/www/img/Logo_Sage_Logomark.png
diff --git a/www/img/loading.gif b/www/img/loading.gif
diff --git a/www/img/logo.svg b/www/img/logo.svg
diff --git a/www/img/sage-loader.svg b/www/img/sage-loader.svg
diff --git a/www/img/sage_logo_mark_only.png b/www/img/sage_logo_mark_only.png
diff --git a/www/img/synapse_logo.png b/www/img/synapse_logo.png
diff --git a/www/img/synapse_logo_blk.png b/www/img/synapse_logo_blk.png