Consolidating tabs. Addresses #666.

sandialabs · Nov 3, 2016 · 242faa6 · 242faa6
1 parent 32b1452
commit 242faa6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/web-server/plugins/slycat-timeseries-model/wizard-ui.html b/web-server/plugins/slycat-timeseries-model/wizard-ui.html
@@ -7,7 +7,6 @@ <h3 class="modal-title">New Timeseries Model</h3>
 <div class="modal-body">
   <ul class="nav nav-pills">
     <li data-bind="css:{active:tab() == 0}"><a>Choose Timeseries format</a></li>
-    <li data-bind="css:{active:tab() == 1}"><a>Connect To Remote Server</a></li>
     <li data-bind="css:{active:tab() == 2}" class="ps-tab-remote-data"><a>Select Input Data File</a></li>
     <li data-bind="css:{active:tab() == 7}" class="ps-tab-remote-data"><a>Select Timeseries File</a></li>
     <li data-bind="css:{active:tab() == 3}"><a>Input Data Parameters</a></li>
@@ -18,24 +17,29 @@ <h3 class="modal-title">New Timeseries Model</h3>
 
   <div class="tab-content">
     <div data-bind="visible:tab() == 0">
-      <div class="radio" style="margin-left: 15px;">
-        <label>
-          <input type="radio" name="timeseries-type-radios" id="csv-radio" value="csv" data-bind="checked: timeseries_type">
-          CSV file format
-        </label>
-      </div>
-      <div class="radio" style="margin-left: 15px;">
-        <label>
-          <input type="radio" name="timeseries-type-radios" id="xyce-radio" value="xyce" checked="checked" data-bind="checked: timeseries_type">
-          Xyce format
-        </label>
+
+      <div class="form-group">
+        <label for="timeseries-type-radios">What type of data will you be using?</label>
+        <div class="radio" style="margin-left: 15px;">
+          <label>
+            <input type="radio" name="timeseries-type-radios" id="csv-radio" value="csv" data-bind="checked: timeseries_type">
+            CSV file format
+          </label>
+        </div>
+        <div class="radio" style="margin-left: 15px;">
+          <label>
+            <input type="radio" name="timeseries-type-radios" id="xyce-radio" value="xyce" checked="checked" data-bind="checked: timeseries_type">
+            Xyce format
+          </label>
+        </div>
       </div>
-    </div>
 
-    <div data-bind="visible:tab() == 1">
-      <form class="form-horizontal" role="form">
-        <slycat-remote-controls params="hostname:remote.hostname,username:remote.username,password:remote.password,status:remote.status,status_type:remote.status_type,enable:remote.enable,focus:remote.focus,activate:connect,session_exists:remote.session_exists"></slycat-remote-controls>
-      </form>
+      <div class="form-group" style="margin-top: 40px;">
+        <label for="timeseries-type-radios">Where is your data located?</label>
+        <form class="form-horizontal" role="form">
+          <slycat-remote-controls params="hostname:remote.hostname,username:remote.username,password:remote.password,status:remote.status,status_type:remote.status_type,enable:remote.enable,focus:remote.focus,activate:connect,session_exists:remote.session_exists"></slycat-remote-controls>
+        </form>
+      </div>
     </div>
 
     <div data-bind="visible:tab() == 2" style="height: 400px">
@@ -125,8 +129,7 @@ <h3 class="modal-title">New Timeseries Model</h3>
 </div>
 <div class="modal-footer">
   <button class="btn btn-default pull-left" data-bind="visible: [0].indexOf(tab()) == -1, click: back">Back</button>
-  <button class="btn btn-default" data-bind="visible:tab() == 0,click:to_remote">Continue</button>
-  <button class="btn btn-default remote-browser-continue-data browser-continue" data-bind="visible:tab() == 1,click:connect"><i class="fa fa-spinner fa-pulse"></i> Continue</button>
+  <button class="btn btn-default" data-bind="visible:tab() == 0,click:connect">Continue</button>
   <button class="btn btn-default remote-browser-continue-data browser-continue" data-bind="visible:tab() == 2,click:select_input_file"><i class="fa fa-spinner fa-pulse"></i> Continue</button>
   <button class="btn btn-default remote-browser-continue-data browser-continue" data-bind="visible:tab() == 7,click:select_xyce_timeseries_file"><i class="fa fa-spinner fa-pulse"></i> Continue</button>
   <button class="btn btn-default" data-bind="visible:tab() == 3,click:to_timeseries_parameters">Continue</button>

diff --git a/web-server/plugins/slycat-timeseries-model/wizard-ui.js b/web-server/plugins/slycat-timeseries-model/wizard-ui.js
@@ -77,10 +77,6 @@ define(['slycat-server-root', 'slycat-web-client', 'slycat-dialog', 'slycat-mark
         client.delete_model({ mid: component.model._id() });
     };
 
-    component.to_remote = function() {
-      component.tab(1);
-    };
-
     component.connect = function() {
       component.remote.status_type('info');
       component.remote.status('Connecting...');
@@ -327,6 +323,8 @@ define(['slycat-server-root', 'slycat-web-client', 'slycat-dialog', 'slycat-mark
         target = 2;
       } else if (component.tab() == 3 && component.timeseries_type() === 'xyce') {
         target = 7;
+      } else if (component.tab() == 2) { 
+        target = 0;
       } else
         target--;