diff --git a/R/modules/scheme_generator.R b/R/modules/scheme_generator.R index b8593a3..16b420d 100644 --- a/R/modules/scheme_generator.R +++ b/R/modules/scheme_generator.R @@ -168,16 +168,3 @@ scheme_R6 <- R6::R6Class( } ) ) - -# object.size(schm) -# schm$get_key_id("main") -# schm$get_forms_ids("main") -# schm$get_all_ids("main") - -# schm$get_scheme("main") - -# schm$get_id_type_list("allergo_anamnesis") - -# # active -# schm$get_main_key_id -# schm$all_tables_names \ No newline at end of file diff --git a/R/modules/utils.R b/R/modules/utils.R index 6e53b1f..c390d9d 100644 --- a/R/modules/utils.R +++ b/R/modules/utils.R @@ -108,7 +108,11 @@ render_forms = function( } else { shiny::tagList( if (!is.na(form_label)) { - shiny::span(form_label, style = "color: #444444; font-weight: 550; line-height: 1.4;") + if (form_type == "description_header") { + shiny::span(form_label, class = "description-header", style = "color: #444444; font-weight: 550; line-height: 1.4;") + } else { + shiny::span(form_label, style = "color: #444444; font-weight: 550; line-height: 1.4;") + } # если в схеме есть поле с описанием - добавляем его следующей строчкой }, if (!is.na(description) && !is.na(form_label)) shiny::br(), diff --git a/app.R b/app.R index 69eeefb..62540de 100644 --- a/app.R +++ b/app.R @@ -42,15 +42,18 @@ if (!rmarkdown::pandoc_available()) warning("Can't find pandoc!") # web resources ------ shiny::addResourcePath("www", "www") - +shiny::resourcePaths() # UI ======================= ui <- page_sidebar( title = config::get("form_name"), theme = bs_theme(version = 5, preset = "bootstrap"), - header = tags$head( + + tags$head( + tags$link(rel = "stylesheet", type = "text/css", href = "www/styles.css"), tags$link(rel = "icon", href = "www/favicon.ico") ), + sidebar = sidebar( actionButton("add_new_main_key_button", "Добавить новую запись", icon("plus", lib = "font-awesome")), actionButton("save_data_button", "Сохранить данные", icon("floppy-disk", lib = "font-awesome")), diff --git a/appinfo.json b/appinfo.json index 22d491f..adcdda5 100644 --- a/appinfo.json +++ b/appinfo.json @@ -1,5 +1,5 @@ { "app_id": "formy", "app_title": "FORMY", - "formy_version": "0.18.3" + "formy_version": "0.18.4" } \ No newline at end of file diff --git a/www/favicon.ico b/www/favicon.ico index 844ac1d..619f89e 100644 Binary files a/www/favicon.ico and b/www/favicon.ico differ diff --git a/www/styles.css b/www/styles.css new file mode 100644 index 0000000..97ac71b --- /dev/null +++ b/www/styles.css @@ -0,0 +1,10 @@ +.description-header { + /* 1. Add the border around the whole box */ + border-bottom: 2px solid #777777; + + /* 2. Forces border inside the total width/height (prevents breaking layouts) */ + box-sizing: border-box; + + /* 3. Ensures the div encloses any internal floated elements */ + overflow: auto; +} \ No newline at end of file