diff --git a/DESCRIPTION b/DESCRIPTION index 76d482c687aa83b2a59193cde3c88dbc325d880f..39d9a876553191b068386d92e7a5a56a6b0bd705 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGRteaching Type: Package Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included) -Version: 0.2.9.23 -Date: 2020-03-29 +Version: 0.2.9.24 +Date: 2020-03-30 Authors@R: c( person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), person("Laurent", "Coron", role = c("aut"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.md b/NEWS.md index 11ce8008cd44bc814699e3239aa2601da70fdf4a..90ce27fd12f74d9330656f0777997fd9ecaa3561 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 0.2.9.23 Release Notes (2020-03-29) +### 0.2.9.24 Release Notes (2020-03-30) #### New features diff --git a/inst/ShinyGR/ui.R b/inst/ShinyGR/ui.R index 283d5400ae0af3e557ad4ed50d3b93bafcfbfe39..613811153f13f7f8af061665591f6b27447960e2 100644 --- a/inst/ShinyGR/ui.R +++ b/inst/ShinyGR/ui.R @@ -204,20 +204,22 @@ navbarPage(title = div("airGRteaching", ), navbarMenu(title = "Help", icon = icon("question-circle"), - tabPanel(title = " Get started", - icon = icon("cog"), + tabPanel(title = "Get started", + icon = icon("cog", lib = "glyphicon"), fluidRow(column(width = 12, includeMarkdown("www/tab_fun.md"))) - ), - tabPanel(title = "GUI help", + ), + #! horrible code to avoid fake item when a tabpanel contains an external hyperlink + #! (cf.https://gitlab.irstea.fr/HYCAR-Hydro/airgrteaching/-/issues/11) + tabPanel(title = HTML("GUI help + </a></li><li><a href='https://CRAN.R-project.org/package=airGRteaching' , target = '_blank', rel = 'noopener noreferrer'><i class='fab fa-r-project'></i> CRAN + </a></li><li><a href='https://hydrogr.github.io/airGRteaching/' , target = '_blank', rel = 'noopener noreferrer'><i class='fas fa-at'></i> Website + </a></li><li><a href='https://gitlab.irstea.fr/HYCAR-Hydro/airgrteaching/', target = '_blank', rel = 'noopener noreferrer'><i class='fab fa-gitlab'></i> GitLab"), icon = icon("question"), fluidRow(column(width = 12, a(href = "https://hydrogr.github.io/airGRteaching/fig/airGRteaching_ShinyUi_description.png", target = "_blank", rel = "noopener noreferrer", img(src = "https://hydrogr.github.io/airGRteaching/fig/airGRteaching_ShinyUi_description.png", height = "770px", alt = "If the image does not appear, click on this link.", title = "Click to open in a new window")))), ), - tabPanel(title = a(icon("r-project"), "CRAN" , href = "https://CRAN.R-project.org/package=airGRteaching" , target = "_blank", rel = "noopener noreferrer")), - tabPanel(title = a(icon("at") , "Website", href = "https://hydrogr.github.io/airGRteaching/" , target = "_blank", rel = "noopener noreferrer")), - tabPanel(title = a(icon("gitlab") , "GitLab" , href = "https://gitlab.irstea.fr/HYCAR-Hydro/airgrteaching/", target = "_blank", rel = "noopener noreferrer")), tabPanel(title = "About", icon = icon("navicon"), fluidRow(column(width = 6, includeMarkdown("www/tab_about.md")),