Add templates to test

sdccjupyter/forms/__init__.py

@@ -1,3 +1 @@
-from .icform import ICForm
 from .omniform import OmniForm
-from .otherforms import *

sdccjupyter/spawners/condor.py

@@ -2,11 +2,12 @@
 from traitlets import Unicode
 
 from batchspawner import CondorSpawner
+from .pathoverride import PathOverrideMixin
 
 from ..formspawners import FormMixin
 
 
-class SDCCCondorSpawner(FormMixin, CondorSpawner):
+class SDCCCondorSpawner(FormMixin, PathOverrideMixin, CondorSpawner):
 
     # Maybe allow singularity-image selection logic some day too?
     req_scontainer = Unicode('')

sdccjupyter/static/sdcc.html

@@ -21,48 +21,47 @@
 
   <!-- Tab panes -->
   <div class="tab-content">
+
+    <!-- *********************** SLURM Form ************************ -->
     <div role="tabpanel" class="tab-pane" id="hpc">
       <h4>Run a notebook on the IC Cluster</h4>
       {% if partitions|length > 0 -%}
       <fieldset id="icform">
         <div class="form-group row">
-          <div class="col-sm-3">
+          <div class="col-lg-3 col-md-6">
             <label for="partition">Select Partition</label>
             <select id="partition" class="form-control" name="req_partition" onchange="updatedPartition()">
               {% for name, _ in partitions %}
               <option value="{{ name }}">{{ name }}</option>
               {% endfor %}
             </select>
           </div>
-          <div class="col-sm-3">
+          <div class="col-lg-3 col-md-6">
             <label for="account">Select Account</label>
             <select id="account" class="form-control" name="req_account" onchange="updatedAccount()">
-
             </select>
           </div>
-          <div class="col-sm-2">
+          <div class="col-lg-2 col-md-4">
             <label for="qos">QOS</label>
             <select id="qos" class="form-control" name="req_qos" onchange="">
             </select>
           </div>
-          <!-- </div> -->
-          <!-- <div class="form-group row"> -->
-          <div class="col-sm-2">
+          <div class="col-lg-2 col-md-4">
             <label for="account">GPU</label>
             <select class="form-control" id="container" name="req_gputype" />
             <option value="">any</option>
             <option value="pascal">Pascal</option>
             <option value="tesla">Tesla</option>
             <select />
           </div>
-          <div class="col-sm-2">
+          <div class="col-lg-2 col-md-4">
             <label for="runtime">Runtime (min)</label>
             <input type="number" class="form-control" max=960 min=30 step=30 value="120" id="runtime"
               name="req_runtime" />
           </div>
         </div>
         <div class="form-group row">
-          <div class="col-sm-8">
+          <div class="col-lg-6 col-md-8">
             <button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#hideextrafields"
               aria-expanded="false" aria-controls="hideextrafields">
               +
@@ -79,25 +78,34 @@ <h4>Run a notebook on the IC Cluster</h4>
         <input name="local" hidden=true value="true" />
         <p class="col-sm-12 text-danger bg-warning"> WARNING: You are not in any SLURM
           partitions, please request membership via <a
-            href="mailto:[email protected]">[email protected]</a>,
-          you can only spawn locally!
+            href="mailto:[email protected]">[email protected]</a>
         </p>
       </div>
       {% endif -%}
     </div>
+
+
+    <!-- *********************** HTCondor Form ************************ -->
     <div role="tabpanel" class="tab-pane" id="htc">
       <h4>Run a notebook on the HTCondor batch-farm requesting CPU/RAM</h4>
-      <div class="form group row">
-        <div class="col-sm-3">
+      <div class="form-group row">
+        <div class="col-sm-5 col-md-3">
           <label for="runtime">Dedicated CPUs</label>
           <input type="number" class="form-control" max=64 min=1 step=1 value="1" id="cpus" name="cpus" />
         </div>
-        <div class="col-sm-3">
+        <div class="col-sm-5 col-md-3">
           <label for="runtime">Memory (Mb)</label>
-          <input type="number" class="form-control" max=64000 min=200 step=50 value="1500" id="ram" name="ram" />
+          <input type="number" class="form-control" max=64000 min=300 step=100 value="1500" id="ram" name="ram" />
         </div>
       </div>
+      <div class="form-group row">
+        <p class="col-sm-8 text-danger bg-warning" style="margin-left: 1em">
+          WARNING: This may time-out if the condor farm is very busy and/or if you request a lot of resources
+        </p>
+      </div>
     </div>
+
+    <!-- ******************** No Form Just Spawn ******************* -->
     <div role="tabpanel" class="tab-pane active" id="lbpool">
       <h4>Run a notebook on a standard interactive HTCondor submit-node</h4>
     </div>
@@ -115,6 +123,9 @@ <h4>Run a notebook on a standard interactive HTCondor submit-node</h4>
   #tabs {
     margin-bottom: 20px;
   }
+  div.form-group > div {
+    margin-top: 10px;
+  }
 </style>
 <script type="text/javascript">
   function disableicform() {

sdccjupyter/templates/home.html

@@ -0,0 +1,4 @@
+{% extends "home.html" %}
+{% block main %}
+{{ super() }}
+{% endblock %}

setup.py

@@ -24,7 +24,7 @@ def main():
     setup(
         name             = 'sdccjupyter',
         packages         = find_packages(),
-        package_data     = {'sdccjupyter': ['conf/*.cfg', 'cron/*', 'static/*.html']},
+        package_data     = {'sdccjupyter': ['conf/*.cfg', 'cron/*', 'static/*.html', 'templates/*.html']},
         version          = VERSION,
         description      = """SDCC Jupyter Spawners""",
         long_description = "",