move input file selection to settings

animesh · Feb 7, 2019 · d74c8d8 · d74c8d8
1 parent 97f7814
commit d74c8d8
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 45 deletions.
diff --git a/resources/app.css b/resources/app.css
@@ -194,15 +194,15 @@ https://codepen.io/TrasherDK/pen/XRzgOR
   padding: 10px;
 }
 
-#shiny-tab-import .import-header {
+.import-header {
   display: flex;
   flex-direction: row;
   align-items: center;
   margin-bottom: 10px;
   margin-top: 15px;
 }
 
-#shiny-tab-import .import-header span.num {
+.import-header span.num {
   font-size: 2em;
   /* padding: 10px; */
   background-color: #3c8dbc;
@@ -214,7 +214,7 @@ https://codepen.io/TrasherDK/pen/XRzgOR
   font-weight: bold;
 }
 
-#shiny-tab-import .import-header h2 {
+.import-header h2 {
   margin: 0px;
   margin-left: 10px;
 }
@@ -278,11 +278,11 @@ https://codepen.io/TrasherDK/pen/XRzgOR
   margin-bottom: 5px;
 }
 
-#shiny-tab-import .input-file-select-well {
+.input-file-select-well {
   max-width: 300px;
 }
 
-#shiny-tab-import .files_check_all, #shiny-tab-import .files_check_none {
+.files_check_all, .files_check_none {
   border: none;
   border-radius: 20px;
   background-color: #3c8dbc;
@@ -292,21 +292,21 @@ https://codepen.io/TrasherDK/pen/XRzgOR
   margin-right: 5px;
   transition: 0.1s all ease-in-out;
 }
-#shiny-tab-import .files_check_all:hover, #shiny-tab-import .files_check_none:hover {
+.files_check_all:hover, .files_check_none:hover {
   border: none;
   background-color: #65a9d1;
   color: #FFF;
 }
-#shiny-tab-import #input_files {
+#input_files {
   margin-top: 30px;
 }
-#shiny-tab-import #input_files label.control-label {
+#input_files label.control-label {
   display: none;
 }
-#shiny-tab-import #input_files .checkbox {
-  
+#input_files .checkbox {
+
 }
-#shiny-tab-import #input_files .checkbox .btn.tooltip-btn {
+#input_files .checkbox .btn.tooltip-btn {
   padding: 0px 3px;
   margin: 0px;
   margin-left: 3px;

diff --git a/ui/import_tab.R b/ui/import_tab.R
@@ -21,10 +21,9 @@ import_tab <- tabItem(tabName='import', fluidPage(
 
   tags$ol(class='breadcrumb',
     tags$li(tags$a(href='#folder-select', '1. Select Folder(s)')),
-    tags$li(tags$a(href='#file-select', '2. Select File(s)')),
-    tags$li(tags$a(href='#load-data', '3. Load Data')),
-    tags$li(tags$a(href='#upload-optional-data', '4. Upload Optional Data')),
-    tags$li(tags$a(href='#rename-files', '5. Rename Files'))
+    tags$li(tags$a(href='#load-data', '2. Load Data')),
+    tags$li(tags$a(href='#upload-optional-data', '3. Upload Optional Data')),
+    tags$li(tags$a(href='#rename-files', '4. Rename Files'))
   ),
 
   ################################
@@ -57,36 +56,14 @@ import_tab <- tabItem(tabName='import', fluidPage(
     ))
   ),
 
-
-  ##############################
-  ###  STEP 2: SELECT FILES  ###
-  ##############################
-
-  a(name='file-select'),
-  div(class='import-header', span(class='num', '2'), 
-      h2('Select Files to Load')),
-  p(class='import-help', 'The text files to load from each folder selected. Unselect large files, such as "allPeptides.txt", if you are not analyzing unidentified ions and want to speed up load times.'),
-  fixedRow(column(12,
-    div(class='well input-file-select-well',
-      div(class='well-header', h4('Input File Selection')),
-      div(class='exp_check_btn_row',
-          tags$button(id='files_check_all', class='btn files_check_all', 'Select All'),
-          tags$button(id='files_check_none', class='btn files_check_none', 'Select None')
-      ),
-      checkboxGroupInput('input_files', '', choiceNames=file_names,
-                         selected=default_selected_files, choiceValues=file_vals)
-    )
-  )),
-
-
   ###########################
-  ###  STEP 3: LOAD DATA  ###
+  ###  STEP 2: LOAD DATA  ###
   ###########################
 
   a(name='load-data'),
-  div(class='import-header', span(class='num', '3'), 
+  div(class='import-header', span(class='num', '2'), 
       h2('Load Data')),
-  p(class='import-help', 'Once folders and files are selected, click "Load Data" to import the files and begin the analysis. The status panel below to the right will update when the data is imported.'),
+  p(class='import-help', 'Once folders are selected, click "Load Data" to import the files and begin the analysis. The status panel below to the right will update when the data is imported.'),
   fluidRow(
     column(6,
       div(class='upload-button-container',
@@ -105,23 +82,23 @@ import_tab <- tabItem(tabName='import', fluidPage(
 
 
   ##############################################
-  ###  STEP 4: UPLOAD OTHER DATA (optional)  ###
+  ###  STEP 3: UPLOAD OTHER DATA (optional)  ###
   ##############################################
 
   a(name='upload-optional-data'),
-  div(class='import-header', span(class='num', '4'), 
+  div(class='import-header', span(class='num', '3'), 
       h2('Upload Other Data (optional)')),
   p(class='import-help', 'Upload other miscellaneous files, such as inclusion lists, individually.'),
   fixedRow(column(12,
     uiOutput('misc_input_forms')
   )),
 
   ###############################################
-  ###  STEP 5: RENAME EXPERIMENTS (optional)  ###
+  ###  STEP 4: RENAME EXPERIMENTS (optional)  ###
   ###############################################
 
   a(name='rename-files'),
-  div(class='import-header', span(class='num', '5'), 
+  div(class='import-header', span(class='num', '4'), 
       h2('Rename Experiments (optional)')),
   p('Rename raw file names to more readable or sensible names, for easier interpretation of figures'),
   wellPanel(

diff --git a/ui/settings_tab.R b/ui/settings_tab.R
@@ -1,7 +1,24 @@
 # load settings tab
 
 settings_tab <- tabItem(tabName='settings', fluidPage(
-  h1('Plotting Options'),
+  h2('Import Options'),
+  panel(
+    div(class='import-header', 
+        h3('Select Files to Load')),
+    p(class='import-help', 'The text files to load from each folder selected. Unselect large files, such as "allPeptides.txt", if you are not analyzing unidentified ions and want to speed up load times.'),
+    fixedRow(column(12,
+      div(class='well input-file-select-well',
+        div(class='well-header', h4('Input File Selection')),
+        div(class='exp_check_btn_row',
+          tags$button(id='files_check_all', class='btn files_check_all', 'Select All'),
+          tags$button(id='files_check_none', class='btn files_check_none', 'Select None')
+        ),
+        checkboxGroupInput('input_files', '', choiceNames=file_names,
+          selected=default_selected_files, choiceValues=file_vals)
+      )
+    ))
+  ),
+  h2('Plotting Options'),
   panel(
     h3('Global Display Options'),
     fluidRow(