[Yuima-commits] r593 - in pkg/yuimaGUI/inst/yuimaGUI: . www

[noreply at r-forge.r-project.org]

Author: phoenix844
Date: 2017-02-24 18:07:12 +0100 (Fri, 24 Feb 2017)
New Revision: 593

Modified:
   pkg/yuimaGUI/inst/yuimaGUI/server.R
   pkg/yuimaGUI/inst/yuimaGUI/ui.R
   pkg/yuimaGUI/inst/yuimaGUI/www/black.css
   pkg/yuimaGUI/inst/yuimaGUI/www/white.css
Log:
fixed design

Modified: pkg/yuimaGUI/inst/yuimaGUI/server.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/server.R	2017-02-24 14:10:16 UTC (rev 592)
+++ pkg/yuimaGUI/inst/yuimaGUI/server.R	2017-02-24 17:07:12 UTC (rev 593)
@@ -1703,9 +1703,9 @@
           temp <- paste("X",seq(1,length(temp)),"_",make.names(input$yourFile$name),sep="")
     }
     if (class(temp)=="try-error")
-      return(selectInput("yourFileIndex",label = "Index", choices = c("Row Headers"="default","Numeric"="numeric"), selected = "default"))
+      return(selectInput("yourFileIndex",label = "Index", width = "60%", choices = c("Row Headers"="default","Numeric"="numeric"), selected = "default"))
     if (class(temp)!="try-error")
-      return(selectInput("yourFileIndex",label = "Index", choices = c("Row Headers"="default","Numeric"="numeric",temp), selected = "default"))
+      return(selectInput("yourFileIndex",label = "Index", width = "60%", choices = c("Row Headers"="default","Numeric"="numeric",temp), selected = "default"))
   })
 
 
@@ -1724,7 +1724,7 @@
           sel <- "%Y-%m-%d"
           if (input$yourFileIndex=="numeric" | !all(is.na(as.numeric(as.character(rownames(z))))) )
             sel <- "numeric"
-          selectInput("yourFileFUN", label = "Index Format", choices = c("Numeric"="numeric", "Year-Month-Day    (yyyy-mm-dd)"="%Y-%m-%d", "Month-Day-Year    (mm-dd-yyyy)"="%m-%d-%Y", "Month-Day-Year    (mm-dd-yy)"="%m-%d-%y", "Day-Month-Year    (dd-mm-yyyy)"="%d-%m-%Y", "Day-Month-Year    (dd-mm-yy)"="%d-%m-%y", "Year/Month/Day    (yyyy/mm/dd)"="%Y/%m/%d", "Month/Day/Year    (mm/dd/yyyy)"="%m/%d/%Y", "Month/Day/Year    (mm/dd/yy)"="%m/%d/%y", "Day/Month/Year    (dd/mm/yyyy)"="%d/%m/%Y", "Day/Month/Year    (dd/mm/yy)"="%d/%m/%y"), selected = sel)
+          selectInput("yourFileFUN", label = "Index Format", width = "60%", choices = c("Numeric"="numeric", "Year-Month-Day    (yyyy-mm-dd)"="%Y-%m-%d", "Month-Day-Year    (mm-dd-yyyy)"="%m-%d-%Y", "Month-Day-Year    (mm-dd-yy)"="%m-%d-%y", "Day-Month-Year    (dd-mm-yyyy)"="%d-%m-%Y", "Day-Month-Year    (dd-mm-yy)"="%d-%m-%y", "Year/Month/Day    (yyyy/mm/dd)"="%Y/%m/%d", "Month/Day/Year    (mm/dd/yyyy)"="%m/%d/%Y", "Month/Day/Year    (mm/dd/yy)"="%m/%d/%y", "Day/Month/Year    (dd/mm/yyyy)"="%d/%m/%Y", "Day/Month/Year    (dd/mm/yy)"="%d/%m/%y"), selected = sel)
         }
       })
       if(input$yourFileIndex!="default" & input$yourFileIndex!="numeric")

Modified: pkg/yuimaGUI/inst/yuimaGUI/ui.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/ui.R	2017-02-24 14:10:16 UTC (rev 592)
+++ pkg/yuimaGUI/inst/yuimaGUI/ui.R	2017-02-24 17:07:12 UTC (rev 593)
@@ -149,13 +149,13 @@
       fluidRow(column(12,bsAlert("yourDataAlert"))),
       fluidRow(
         column(5,
-          fileInput(inputId = "yourFile", label = "Choose file to upload", multiple = FALSE),
-          selectInput('yourFileHeader', 'Headers', choices = c("Auto"="Default","Only columns", "Only rows", "Both", "None"), selected = "Default"),
-          selectInput(inputId = 'yourFileSep', label = 'Field Separator', choices = c("Space"="default", "Comma"=',', "Semicolon"=';', "Tab"='\t'), selected = "default"),
+          fileInput(inputId = "yourFile", width = "60%", label = "Choose file to upload", multiple = FALSE),
+          selectInput('yourFileHeader', 'Headers',width = "60%", choices = c("Auto"="Default","Only columns", "Only rows", "Both", "None"), selected = "Default"),
+          selectInput(inputId = 'yourFileSep',width = "60%", label = 'Field Separator', choices = c("Space"="default", "Comma"=',', "Semicolon"=';', "Tab"='\t'), selected = "default"),
           uiOutput("yourFileIndex"),
           uiOutput("yourFileFUN"),
           br(),
-          div(align = "center", box(background = switch(getOption("yuimaGUItheme"), "black"="black", "white"=NULL),  title = "More Settings", collapsible = TRUE, id = "yourFileMoreSettings", collapsed = TRUE,
+          div(align = "center", style="width:55%", box(background = switch(getOption("yuimaGUItheme"), "black"="black", "white"=NULL), width = 12,  title = "More Settings", collapsible = TRUE, id = "yourFileMoreSettings", collapsed = TRUE,
               textInput('yourFileDec', 'Decimal Separator', value = "."),
               textInput('yourFileThnd', 'Thousands Separator', value = ""),
               textInput("yourFileNA", "Missing Value string", value = "NA"),

Modified: pkg/yuimaGUI/inst/yuimaGUI/www/black.css
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/www/black.css	2017-02-24 14:10:16 UTC (rev 592)
+++ pkg/yuimaGUI/inst/yuimaGUI/www/black.css	2017-02-24 17:07:12 UTC (rev 593)
@@ -1,6 +1,5 @@
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, p {
   color: #CDCECD;
-  font-family: "Times New Roman", Georgia, Serif;
 }
 
 a:link, a:visited, a:active {
@@ -227,7 +226,7 @@
   
 }
 
-#PrintModelLatex, #estimatedModelsLatex, #usr_modelClass_latex, #usr_model_saved_latex, #simulate_PrintModelLatex{
+#PrintModelLatex, #estimatedModelsLatex, #usr_modelClass_latex, #usr_model_saved_latex, #simulate_PrintModelLatex, #parametric_changepoint_info{
   font-size: 125%;
   color: #CDCECD;
 }

Modified: pkg/yuimaGUI/inst/yuimaGUI/www/white.css
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/www/white.css	2017-02-24 14:10:16 UTC (rev 592)
+++ pkg/yuimaGUI/inst/yuimaGUI/www/white.css	2017-02-24 17:07:12 UTC (rev 593)
@@ -1,6 +1,5 @@
-h1, h2, h3, h4, h5, h6 {
+h1, h2, h3, h4, h5, h6, p {
   color: black;
-  font-family: "Times New Roman", Georgia, Serif;
 }
 
 a:link, a:visited, a:active {
@@ -209,7 +208,7 @@
   
 }
 
-#PrintModelLatex, #estimatedModelsLatex, #usr_modelClass_latex, #usr_model_saved_latex, #simulate_PrintModelLatex{
+#PrintModelLatex, #estimatedModelsLatex, #usr_modelClass_latex, #usr_model_saved_latex, #simulate_PrintModelLatex, #parametric_changepoint_info{
   font-size: 125%;
   color: black;
 }