trajectory NGLview corrections

[django_unres.git] / django_simple / todo / templates / details1.html

diff --git a/django_simple/todo/templates/details1.html b/django_simple/todo/templates/details1.html
index e375b92..4abd64d 100644 (file)
--- a/django_simple/todo/templates/details1.html
+++ b/django_simple/todo/templates/details1.html
@@ -43,6 +43,18 @@ Created {{ task.created_date  }}
                                <div class="col-md-8">
                                        {% if task.done %}
                                                <span class="fa fa-check-square-o"></span>
+                                           {% if task.type == "md" or task.type == "remd" %}
+                                             <form action="restart/"
+                                               method="get"
+                                               style="text-align;float:right;">
+                                               {% csrf_token %}
+                                                <input type="submit" 
+                                                class="btn btn-default" 
+                                                value="Restart"
+                                                name="restartbtn">
+                                                </button>
+                                              </form>
+                                            {% endif %}  
                                        {% else %}
                                          {% if task.running > 0  %}
                                                <span class="fa fa-spinner
@@ -165,6 +177,10 @@ Created {{ task.created_date  }}
                            <div class="col-md-6">{{ task.md_nstep}}</div>
                        </li>           
                        <li class="list-group-item task-item">
+                           <div class="col-md-6"> total steps (with restarts) </div>
+                           <div class="col-md-6">{{ task.md_total_steps}}</div>
+                       </li>           
+                       <li class="list-group-item task-item">
                            <div class="col-md-6"> ntwe </div>
                            <div class="col-md-6">{{ task.md_ntwe}}</div>
                        </li>           
@@ -251,6 +267,10 @@ Created {{ task.created_date  }}
                            <div class="col-md-6">{{ task.md_nstep}}</div>
                        </li>           
                        <li class="list-group-item task-item">
+                           <div class="col-md-6"> total steps (with restarts) </div>
+                           <div class="col-md-6">{{ task.md_total_steps}}</div>
+                       </li>           
+                       <li class="list-group-item task-item">
                            <div class="col-md-6"> ntwe </div>
                            <div class="col-md-6">{{ task.md_ntwe}}</div>
                        </li>           
@@ -416,7 +436,8 @@ Created {{ task.created_date  }}
                            <div class="col-md-2"> Movie </div>
                            <div class="col-md-10"> 
 
-                            <video width="500" height="400" preload controls>
+                            <video width="500" height="400"
+                            preload="auto" controls="controls">
                             <source
                             src="/myfiles/download-file/{{task.jobdirname}}/md.ogv"
                             type="video/ogg; codecs=theora"> </source>
@@ -434,7 +455,7 @@ Created {{ task.created_date  }}
                        </li>
                         <li class="list-group-item task-item">
                <div class="col-md-6">
-<input id="clipRange" type="range" value=0 min=0 max= {% widthratio task.md_nstep task.md_ntwx 1 %} step=1 ></input><span id="clipRange_val">0</span> frame
+<input id="clipRange" type="range" value=1 min=1 max= {% widthratio task.md_total_steps task.md_ntwx 1 %} step=1 ></input><span id="clipRange_val">1</span> frame
 </div>
 <div class="col-md-6">
 <button id="toggleRunMDs">run/pause MD</button>  
@@ -1187,6 +1208,7 @@ window.addEventListener("resize",
         o.addRepresentation( "licorice",{ color:
        "residueindex",colorScale:["blue","cyan", "green", "yellow","orange", "red"]
         });        
+        o.setPosition([0, 0, 100]);
         o.autoView();
         o.addTrajectory();
       });
@@ -1212,7 +1234,7 @@ window.addEventListener("resize",
                                        isRunning = true;
 
                     trajComp.signals.frameChanged.add(function(){
-                      var fnum=trajComp.trajectory.currentFrame;                   
+                      var fnum=trajComp.trajectory.currentFrame+1;                   
                       clipRange.value = fnum;
                       clipRange_val.innerHTML = numberWithCommas(parseInt(clipRange.value*1));
                     });
@@ -1227,7 +1249,7 @@ window.addEventListener("resize",
       var clipRange_val = document.getElementById( "clipRange_val" );
       clipRange.oninput = function( e ){
                 var trajComp = stage.getComponentsByName("unres_md").list[0].trajList[0];
-                trajComp.setFrame(e.target.value)
+                trajComp.setFrame(e.target.value-1)
                 clipRange_val.innerHTML = numberWithCommas(parseInt(e.target.value*1));
       };