Skip to content

Commit

Permalink
Adjusted main container padding
Browse files Browse the repository at this point in the history
  • Loading branch information
rmbielby committed Nov 17, 2023
1 parent 725cf67 commit d9f5c9b
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 81 deletions.
154 changes: 78 additions & 76 deletions R/dashboard_panels.R
Original file line number Diff line number Diff line change
Expand Up @@ -385,91 +385,93 @@ dashboard_panel <- function() {
tabPanel(
value = "reasons",
title = "Reasons",
fluidRow(
column(
width = 12,
conditionalPanel(
condition = "input.geography_choice == 'National'",
h4(textOutput("reasons_chart_title_nat"))
),
conditionalPanel(
condition = "input.geography_choice == 'Regional'",
h4(textOutput("reasons_chart_title_reg"))
),
conditionalPanel(
condition = "input.geography_choice == 'Local authority'",
h4(textOutput("reasons_chart_title_la"))
)
)
),
fluidRow(
column(
width = 12,
conditionalPanel(
condition = paste0("input.ts_choice == 'latestweeks'"),
p("Absence rates presented on the chart below are calculated on a daily basis. Each point on the chart shows an absence rate calculated across all sessions in the given day."),
p("Absence rates presented in the blue boxes and tables below are calculated across all sessions in the latest week."),
column(
9,
br(),
plotlyOutput("absence_reasons_daily_plot")
fluidPage(
fluidRow(
column(
width = 12,
conditionalPanel(
condition = "input.geography_choice == 'National'",
h4(textOutput("reasons_chart_title_nat"))
),
conditionalPanel(
condition = "input.geography_choice == 'Regional'",
h4(textOutput("reasons_chart_title_reg"))
),
column(
3,
fluidRow(
conditionalPanel(
condition = "input.geography_choice == 'Local authority'",
h4(textOutput("reasons_chart_title_la"))
)
)
),
fluidRow(
column(
width = 12,
conditionalPanel(
condition = paste0("input.ts_choice == 'latestweeks'"),
p("Absence rates presented on the chart below are calculated on a daily basis. Each point on the chart shows an absence rate calculated across all sessions in the given day."),
p("Absence rates presented in the blue boxes and tables below are calculated across all sessions in the latest week."),
column(
9,
br(),
p(strong(paste0("Authorised absence rate:"))),
shinydashboard::valueBoxOutput("headline_auth_rate_weekly", width = 12)
plotlyOutput("absence_reasons_daily_plot")
),
fluidRow(
br(),
p(strong(paste0("Unauthorised absence rate:"))),
shinydashboard::valueBoxOutput("headline_unauth_rate_weekly", width = 12)
column(
3,
fluidRow(
br(),
p(strong(paste0("Authorised absence rate:"))),
shinydashboard::valueBoxOutput("headline_auth_rate_weekly", width = 12)
),
fluidRow(
br(),
p(strong(paste0("Unauthorised absence rate:"))),
shinydashboard::valueBoxOutput("headline_unauth_rate_weekly", width = 12)
)
)
)
),
conditionalPanel(
condition = paste0("input.ts_choice == 'yeartodate'"),
p("Absence rates presented on the chart below are calculated on a weekly basis. Each point on the chart shows an absence rate calculated across all sessions in the given week."),
p("Absence rates presented in the blue boxes and tables below are calculated across all sessions in the year to date."),
column(
9,
br(),
plotlyOutput("absence_reasons_timeseries_plot")
),
column(
3,
fluidRow(
conditionalPanel(
condition = paste0("input.ts_choice == 'yeartodate'"),
p("Absence rates presented on the chart below are calculated on a weekly basis. Each point on the chart shows an absence rate calculated across all sessions in the given week."),
p("Absence rates presented in the blue boxes and tables below are calculated across all sessions in the year to date."),
column(
9,
br(),
p(strong(paste0("Authorised absence rate:"))),
shinydashboard::valueBoxOutput("headline_auth_rate_ytd", width = 12)
plotlyOutput("absence_reasons_timeseries_plot")
),
fluidRow(
br(),
p(strong(paste0("Unauthorised absence rate:"))),
shinydashboard::valueBoxOutput("headline_unauth_rate_ytd", width = 12)
column(
3,
fluidRow(
br(),
p(strong(paste0("Authorised absence rate:"))),
shinydashboard::valueBoxOutput("headline_auth_rate_ytd", width = 12)
),
fluidRow(
br(),
p(strong(paste0("Unauthorised absence rate:"))),
shinydashboard::valueBoxOutput("headline_unauth_rate_ytd", width = 12)
)
)
),
conditionalPanel(
condition = paste0("input.ts_choice == 'latestweeks'"),
p(strong("Reasons for absence in the latest week")),
p("Authorised absence"),
DTOutput("absence_auth_reasons_table"),
br(),
br(),
p("Unauthorised absence"),
DTOutput("absence_unauth_reasons_table")
),
conditionalPanel(
condition = paste0("input.ts_choice == 'yeartodate'"),
p(strong("Reasons for absence in the year to date")),
p("Authorised absence"),
DTOutput("absence_auth_reasons_table_ytd"),
br(),
br(),
p("Unauthorised absence"),
DTOutput("absence_unauth_reasons_table_ytd")
)
),
conditionalPanel(
condition = paste0("input.ts_choice == 'latestweeks'"),
p(strong("Reasons for absence in the latest week")),
p("Authorised absence"),
DTOutput("absence_auth_reasons_table"),
br(),
br(),
p("Unauthorised absence"),
DTOutput("absence_unauth_reasons_table")
),
conditionalPanel(
condition = paste0("input.ts_choice == 'yeartodate'"),
p(strong("Reasons for absence in the year to date")),
p("Authorised absence"),
DTOutput("absence_auth_reasons_table_ytd"),
br(),
br(),
p("Unauthorised absence"),
DTOutput("absence_unauth_reasons_table_ytd")
)
)
)
Expand Down
6 changes: 1 addition & 5 deletions www/dfe_shiny_gov_style.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,7 @@ template. 80% works well here to reduce white space on the right hand side.*/
.col-sm-8{ width: 80%}

.container-fluid {
padding: 0px;
}

.row {
margin-right: 0px;
padding: 3.2px;
}

.nav-pills > li.active > a {
Expand Down

0 comments on commit d9f5c9b

Please sign in to comment.