reindent

dkilfoyle · Feb 1, 2015 · bb41532 · bb41532
1 parent e328747
commit bb41532
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 81 deletions.
diff --git a/R/dkutils.r b/R/dkutils.r
@@ -7,10 +7,10 @@ buildAccordionBootstrap2 = function(name, item, expanded=F) {
   inclass = ifelse(expanded, "in", "")
   div(
     div(class="accordion-heading", 
-        HTML(paste('<a class="accordion-toggle" data-toggle="collapse" href="#collapse',name,'">',name,'</a>', sep=""))
+      HTML(paste('<a class="accordion-toggle" data-toggle="collapse" href="#collapse',name,'">',name,'</a>', sep=""))
     ),
     div(id=paste("collapse",name,sep=""), class=paste("accordion-body collapse", inclass),
-        div(class="accordion-inner", item)
+      div(class="accordion-inner", item)
     )
   )
 }
@@ -24,17 +24,17 @@ accordionPanel = function(title, item, dataparent, expanded=F) {
   inclass = ifelse(expanded, "in", "")
   mydataparent = ifelse(missing(dataparent), "", paste0('data-parent="#', dataparent, '"'))
   myitemid = paste0("collapse", make.names(title))
-
+  
   div(class="panel panel-default", 
-      div(class="panel-heading", role="tab",
-          h4(class="panel-title", 
-             #a(datatoggle="collapse", dataparent=mydataparent, href=paste0("#", myitemid), title)
-             HTML(paste('<a class="collapsed" data-toggle="collapse" ', mydataparent, ' href="#', myitemid, '">', title,'</a>', sep=""))
-          )
-      ), # panel-heading
-      div(id=myitemid, class=paste("panel-collapse collapse", inclass), role="tabpanel",
-          div(class="panel-body", item)
-      ) # panel-collapse
+    div(class="panel-heading", role="tab",
+      h4(class="panel-title", 
+        #a(datatoggle="collapse", dataparent=mydataparent, href=paste0("#", myitemid), title)
+        HTML(paste('<a class="collapsed" data-toggle="collapse" ', mydataparent, ' href="#', myitemid, '">', title,'</a>', sep=""))
+      )
+    ), # panel-heading
+    div(id = myitemid, class=paste("panel-collapse collapse", inclass), role="tabpanel",
+      div(class="panel-body", item)
+    ) # panel-collapse
   )
 }
 

diff --git a/ui.R b/ui.R
@@ -30,57 +30,57 @@ selectizeRenderStr = "
 shinyUI(navbarPage("Shiny-Explorer", 
 
   tabPanel("Explorer", icon=icon("list"),
-
-  sidebarLayout(
-    sidebarPanel(
-
-      # header includes
-      includeCSS("www/css/dkknitr.css"),
-      includeScript("www/js/jquery-ui-1.10.3.custom.min.js"),
-      includeScript("www/js/jquery.sparkline.min.js"),
-      includeScript("www/js/highlight.pack.js"),
-      includeScript("www/js/toc.js"),
-      jsCodeHandler(), # for sending custom JS code to execute
-
-      h3("Variable Selection"),
-
-      wellPanel(
-        selectInput("dataset", "Dataframe:", choices = getDataFrames()),
-        p(helpText("Choose the desired fields in the dropdowns",
-                   "and click Analyse to show an analysis."))
-      ),
-
-      accordion("fieldsAccordion", 
-        accordionPanel("Numerics", 
-           selectizeInput("numerics", label="", choices=NULL, selected="", multiple=T, #NB: choices is filled by observing input$dataset
-                          options=list(placeholder="Select numeric(s)", dropdownParent = "body", plugins=list(remove_button="", drag_drop=""), 
-                                       labelField="label", render = I(selectizeRenderStr))), expanded=T),
-        accordionPanel("Factors", 
-           selectizeInput("factors", label="", choices=NULL, selected="", multiple=T,
-                          options=list(placeholder="Select factor(s)", dropdownParent = "body", plugins=list(remove_button="", drag_drop=""),
-                                       labelField="label", render = I(selectizeRenderStr)))),
-        accordionPanel("Dates", 
-           selectizeInput("dates", label="", choices=NULL, selected="", multiple=T, 
-                                   options=list(placeholder="Select date(s)", dropdownParent = "body", plugins=list(remove_button="", drag_drop=""),
-                                                labelField="label", render = I(selectizeRenderStr)))),
-        accordionPanel("Logicals", 
-           selectizeInput("logicals", label="", choices=NULL, selected="", multiple=T,
-                     options=list(placeholder="Select logical(s)", dropdownParent = "body", plugins=list(remove_button="", drag_drop="") )))
-      ),
-
-      p(
-        # use actionButton rather than submitButton so that changing the dataframe dropdown automatically updates the field selects
-        actionButton("go",strong("Analyse"), icon("play")), 
-        actionButton("deleteSelections", "Clear Selections", icon("trash-o"))
-      )
 
-    ), # sidebarPanel
-
-    mainPanel(
+    sidebarLayout(
+      sidebarPanel(
+
+        # header includes
+        includeCSS("www/css/dkknitr.css"),
+        includeScript("www/js/jquery-ui-1.10.3.custom.min.js"),
+        includeScript("www/js/jquery.sparkline.min.js"),
+        includeScript("www/js/highlight.pack.js"),
+        includeScript("www/js/toc.js"),
+        jsCodeHandler(), # for sending custom JS code to execute
+
+        h3("Variable Selection"),
+
+        wellPanel(
+          selectInput("dataset", "Dataframe:", choices = getDataFrames()),
+          p(helpText("Choose the desired fields in the dropdowns",
+            "and click Analyse to show an analysis."))
+        ),
+
+        accordion("fieldsAccordion", 
+          accordionPanel("Numerics", 
+            selectizeInput("numerics", label="", choices=NULL, selected="", multiple=T, #NB: choices is filled by observing input$dataset
+              options=list(placeholder="Select numeric(s)", dropdownParent = "body", plugins=list(remove_button="", drag_drop=""), 
+                labelField="label", render = I(selectizeRenderStr))), expanded=T),
+          accordionPanel("Factors", 
+            selectizeInput("factors", label="", choices=NULL, selected="", multiple=T,
+              options=list(placeholder="Select factor(s)", dropdownParent = "body", plugins=list(remove_button="", drag_drop=""),
+                labelField="label", render = I(selectizeRenderStr)))),
+          accordionPanel("Dates", 
+            selectizeInput("dates", label="", choices=NULL, selected="", multiple=T, 
+              options=list(placeholder="Select date(s)", dropdownParent = "body", plugins=list(remove_button="", drag_drop=""),
+                labelField="label", render = I(selectizeRenderStr)))),
+          accordionPanel("Logicals", 
+            selectizeInput("logicals", label="", choices=NULL, selected="", multiple=T,
+              options=list(placeholder="Select logical(s)", dropdownParent = "body", plugins=list(remove_button="", drag_drop="") )))
+        ),
+
+        p(
+          # use actionButton rather than submitButton so that changing the dataframe dropdown automatically updates the field selects
+          actionButton("go",strong("Analyse"), icon("play")), 
+          actionButton("deleteSelections", "Clear Selections", icon("trash-o"))
+        )
+
+      ), # sidebarPanel
 
-      tabsetPanel(id="mainPanelTabset",
-
-        tabPanel("Variables",  #tabsetPanel(id="summaryTabset",
+      mainPanel(
+
+        tabsetPanel(id="mainPanelTabset",
+
+          tabPanel("Variables",  #tabsetPanel(id="summaryTabset",
             h4("Numerics"),
             tableOutput("numericInfo"),
             h4("Factors"),
@@ -91,29 +91,29 @@ shinyUI(navbarPage("Shiny-Explorer",
             tableOutput("logicalInfo")
             # ,plotOutput("tabplot")
           ),
-
-        navbarMenu("Data",
-          tabPanel("TabPlot",
-            checkboxInput("limittabplot", label="Show selected variables only"),
-            plotOutput("mytabplot")
+
+          navbarMenu("Data",
+            tabPanel("TabPlot",
+              checkboxInput("limittabplot", label="Show selected variables only"),
+              plotOutput("mytabplot")
+            ),
+            tabPanel("Table", 
+              dataTableOutput("mydt")
+            )),
+          tabPanel("Analysis", 
+            htmlOutput("analysis")
           ),
-        tabPanel("Table", 
-                 dataTableOutput("mydt")
-        )),
-        tabPanel("Analysis", 
-                 htmlOutput("analysis")
-        ),
-        tabPanel("Source",
-                 aceEditor("acermd", mode="markdown"))
-      )
-    ) # mainPanel
-
-  ) # sidebarLayout
+          tabPanel("Source",
+            aceEditor("acermd", mode="markdown"))
+        )
+      ) # mainPanel
+
+    ) # sidebarLayout
   ), # tabPanel(Explorer)
-
+  
   navbarMenu("Tests", icon=icon("bar-chart"),
-     tabPanel("2 Sample"),
-     tabPanel("Correlation")
+    tabPanel("2 Sample"),
+    tabPanel("Correlation")
   ) # navbarMenu(Tests)
 
 ))