projects
/
django_unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog added for zip button
[django_unres.git]
/
django_simple
/
todo
/
templates
/
details.html
diff --git
a/django_simple/todo/templates/details.html
b/django_simple/todo/templates/details.html
index
783ed7e
..
36e8e63
100644
(file)
--- a/
django_simple/todo/templates/details.html
+++ b/
django_simple/todo/templates/details.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>
<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
{% 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">{{ 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>
<div class="col-md-6"> ntwe </div>
<div class="col-md-6">{{ task.md_ntwe}}</div>
</li>
@@
-262,6
+278,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">{{ 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>
<div class="col-md-6"> ntwe </div>
<div class="col-md-6">{{ task.md_ntwe}}</div>
</li>
@@
-349,6
+369,12
@@
Created {{ task.created_date }}
<a href="/myfiles/list/{{task.jobdirname}}/">
{{ task.jobdirname }}
</a>
<a href="/myfiles/list/{{task.jobdirname}}/">
{{ task.jobdirname }}
</a>
+ {% if task.done %}
+
+ <a class="btn btn-default"
+ href="/{{task.id}}/all.zip">
+ Download as zip</a>
+ {% endif %}
</div>
</li>
</div>
</li>
@@
-427,7
+453,8
@@
Created {{ task.created_date }}
<div class="col-md-2"> Movie </div>
<div class="col-md-10">
<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>
<source
src="/myfiles/download-file/{{task.jobdirname}}/md.ogv"
type="video/ogg; codecs=theora"> </source>
@@
-445,7
+472,7
@@
Created {{ task.created_date }}
</li>
<li class="list-group-item task-item">
<div class="col-md-6">
</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>
</div>
<div class="col-md-6">
<button id="toggleRunMDs">run/pause MD</button>
@@
-467,7
+494,7
@@
Created {{ task.created_date }}
{% if task.md_pdbref %}
<li class="list-group-item task-item">
{% if task.md_pdbref %}
<li class="list-group-item task-item">
- <div class="col-md-2"> RMSD </div>
+ <div class="col-md-2"> C<sup>α</sup> RMSD </div>
<div class="col-md-10"> <img
src="/myfiles/download-file/{{task.jobdirname}}/md_rms.png"
width="500"> </div>
<div class="col-md-10"> <img
src="/myfiles/download-file/{{task.jobdirname}}/md_rms.png"
width="500"> </div>
@@
-543,21
+570,22
@@
Created {{ task.created_date }}
{% if task.md_pdbref %}
<li class="list-group-item task-item">
{% if task.md_pdbref %}
<li class="list-group-item task-item">
- <div class="col-md-2"> Average RMSD vs. temperature </div>
+ <div class="col-md-2"> Average C<sup>α</sup> RMSD vs. temperature </div>
<div class="col-md-10"> <img
src="/myfiles/download-file/{{task.jobdirname}}/remd_rmsd.png"
width="500"> </div>
</li>
<li class="list-group-item task-item">
<div class="col-md-10"> <img
src="/myfiles/download-file/{{task.jobdirname}}/remd_rmsd.png"
width="500"> </div>
</li>
<li class="list-group-item task-item">
- <div class="col-md-2"> potential energy vs. RMSD</div>
+ <div class="col-md-2"> potential energy vs.
+ C<sup>α</sup> RMSD</div>
<div class="col-md-10"> <img
src="/myfiles/download-file/{{task.jobdirname}}/remd_ene_rms.png"
width="500"> </div>
</li>
<li class="list-group-item task-item">
<div class="col-md-10"> <img
src="/myfiles/download-file/{{task.jobdirname}}/remd_ene_rms.png"
width="500"> </div>
</li>
<li class="list-group-item task-item">
- <div class="col-md-2"> RMSD vs. step*replica
+ <div class="col-md-2"> C<sup>α</sup> RMSD vs. step*replica
colored by bath temperature</div>
<div class="col-md-10"> <img
src="/myfiles/download-file/{{task.jobdirname}}/remd_step_rms.png"
colored by bath temperature</div>
<div class="col-md-10"> <img
src="/myfiles/download-file/{{task.jobdirname}}/remd_step_rms.png"
@@
-980,8
+1008,7
@@
$(document).ready(function() {
setTimeout(worker, 30000);
});
</script>
setTimeout(worker, 30000);
});
</script>
-{% endif %}
-
+{% endif %}
{% if task.type == "min" %}
<script>
{% if task.type == "min" %}
<script>
@@
-1193,6
+1220,7
@@
window.addEventListener("resize",
o.addRepresentation( "licorice",{ color:
"residueindex",colorScale:["blue","cyan", "green", "yellow","orange", "red"]
});
o.addRepresentation( "licorice",{ color:
"residueindex",colorScale:["blue","cyan", "green", "yellow","orange", "red"]
});
+ o.setPosition([0, 0, 100]);
o.autoView();
o.addTrajectory();
});
o.autoView();
o.addTrajectory();
});
@@
-1218,7
+1246,7
@@
window.addEventListener("resize",
isRunning = true;
trajComp.signals.frameChanged.add(function(){
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));
});
clipRange.value = fnum;
clipRange_val.innerHTML = numberWithCommas(parseInt(clipRange.value*1));
});
@@
-1233,7
+1261,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];
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));
};
clipRange_val.innerHTML = numberWithCommas(parseInt(e.target.value*1));
};