X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=django_simple%2Ftodo%2Ftemplates%2Fdetails1.html;h=8494d963286d5643a6cfe52e68c674d1ed2dc087;hb=1b9e4cd5192fafe2213b582fadd19556fb2ecf3a;hp=27b5a1f0fab2f68202f5c5a102fff13a2503b5e2;hpb=75dd8b1928bbd554b20f888599c29170001af400;p=django_unres.git

diff --git a/django_simple/todo/templates/details1.html b/django_simple/todo/templates/details1.html
index 27b5a1f..8494d96 100644
--- a/django_simple/todo/templates/details1.html
+++ b/django_simple/todo/templates/details1.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 
+{% load index %}
 {% load i18n lazysignup_tags %}
 {% block content %}
 
@@ -148,6 +149,13 @@ Created {{ task.created_date  }}
 		 	    <div class="col-md-6">{{ task.md_start}}</div>
 			</li>		
 			
+<!-- -->
+			<li class="list-group-item task-item">
+		            <div class="col-md-6"> input pdb3 </div>
+		 	    <div class="col-md-6">{{ task.myfile3 }}</div>
+			</li>		
+<!-- -->
+			
 		        <li class="list-group-item task-item">
 		            <div class="col-md-6"> input pdb </div>
 		 	    <div class="col-md-6">{{ task.myfile1 }}</div>
@@ -235,6 +243,13 @@ Created {{ task.created_date  }}
 		            <div class="col-md-6"> starting </div>
 		 	    <div class="col-md-6">{{ task.md_start}}</div>
 			</li>		
+<!-- -->
+			{% if task.type == "remd" %}
+			<li class="list-group-item task-item">
+		            <div class="col-md-6"> input pdb3 </div>
+		 	    <div class="col-md-6">{{ task.myfile3 }}</div>
+			</li>		
+<!-- -->
 			
 		        <li class="list-group-item task-item">
 		            <div class="col-md-6"> input pdb </div>
@@ -339,6 +354,11 @@ Created {{ task.created_date  }}
 		            <div class="col-md-6"> temperature for clustering</div>
 		 	    <div class="col-md-6">{{ task.remd_cluter_temp}}</div>
 			</li>		
+		        <li class="list-group-item task-item">
+		            <div class="col-md-6"> number of clusters</div>
+		 	    <div class="col-md-6">{{ task.remd_cluster_n}}</div>
+			</li>		
+
 			{% if task.saxs_data != "" %}			
 		        <li class="list-group-item task-item">
 		            <div class="col-md-6"> wsaxs </div>
@@ -627,188 +647,45 @@ Created {{ task.created_date  }}
         <button onclick="plusDivs(1)">&#10095;</button>
 	</div>
 	</li>		
-			
+	
+	        {% for iii in range %}
+
+                {% with istr=forloop.counter|stringformat:"s" %}
+                {% with MODELi="MODEL"|add:istr|add:".pdb" %}
+                {% with viewporti="viewport_M"|add:istr %}
+                {% with toggleRefi="toggleRefM"|add:istr %}
+                {% with toggleSidechainsi="toggleSidechainsM"|add:istr %}
+
                         <div class="model">
-<!--			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model1 after conversion
-			  to allatom 
-			  {{ task.remd_model1|linebreaks }}
-			  </div>
-			  <div class="col-md-10"> 
-			  <a
-			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL1.pdb">
-			  <img
-			  src="/myfiles/download-file/{{task.jobdirname}}/model1.png" width="500">
-			  </a></div>
-			</li> -->			
 			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model1 
+			  <div class="col-md-2"> model {{ iii }}
 			  {% if not task.damino %}
 			  after conversion to allatom 
 			  {% endif %}
-			  {{ task.remd_model1|linebreaks }}
+			  {{ remd_models|index:iii|linebreaks }}
 			  NGL viewer</div>
-			  <div class="col-md-10" id="viewport_M1"
+			  <div class="col-md-10" id={{viewporti}}
 			  style="width:500px;height:500px;"> 
 			  </div>
 			</li>
                         <li class="list-group-item task-item">
                <div class="col-md-12">
                {% if task.md_pdbref %}
-               <button id="toggleRefM1">Reference structure on/off</button>
+               <button id={{toggleRefi}}>Reference structure on/off</button>
                {% endif %}
-               <button id="toggleSidechainsM1">Side-chains on/off</button>
+               <button id={{toggleSidechainsi}}>Side-chains on/off</button>
                <a class="btn btn-default"
-               href="/myfiles/download-file/{{task.jobdirname}}/MODEL1.pdb">Download</a>               
+               href="/myfiles/download-file/{{task.jobdirname}}/{{MODELi}}">Download</a>               
                </div>
                         </li>
-			
-			</div>
-			<div class="model">
-<!--			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model2 after conversion
-			  to allatom 
-			  {{ task.remd_model2|linebreaks }}
-			  </div>
-			  <div class="col-md-10"> 
-			  <a
-			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL2.pdb">
-			  <img
-			  src="/myfiles/download-file/{{task.jobdirname}}/model2.png" width="500">
-			  </a></div>
-			</li> -->
-			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model2 
-			  {% if not task.damino %}
-			  after conversion to allatom
-			  {% endif %}
-			  {{ task.remd_model2|linebreaks }}
-			  NGL viewer</div>
-			  <div class="col-md-10" id="viewport_M2"
-			  style="width:500px;height:500px;"> 
-			  </div>
-			</li>
-                        <li class="list-group-item task-item">
-               <div class="col-md-12">
-               {% if task.md_pdbref %}
-               <button id="toggleRefM2">Reference structure on/off</button>
-               {% endif %}
-               <button id="toggleSidechainsM2">Side-chains on/off</button>
-               <a class="btn btn-default"
-               href="/myfiles/download-file/{{task.jobdirname}}/MODEL2.pdb">Download</a>               
-               </div>
-                        </li>
-			
-			
-			</div>
-			<div class="model">
-<!--			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model3 after conversion
-			  to allatom 
-			  {{ task.remd_model3|linebreaks }}
-			  </div>
-			  <div class="col-md-10"> 
-			  <a
-			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL3.pdb">
-			  <img
-			  src="/myfiles/download-file/{{task.jobdirname}}/model3.png" width="500">
-			  </a></div>
-			</li>-->
-			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model3 
-			  {% if not task.damino %}
-			  after conversion to allatom
-			  {% endif %}
-			  {{ task.remd_model3|linebreaks }}
-			  NGL viewer</div>
-			  <div class="col-md-10" id="viewport_M3"
-			  style="width:500px;height:500px;"> 
-			  </div>
-			</li>
-                        <li class="list-group-item task-item">
-               <div class="col-md-12">
-               {% if task.md_pdbref %}
-               <button id="toggleRefM3">Reference structure on/off</button>
-               {% endif %}
-               <button id="toggleSidechainsM3">Side-chains on/off</button>
-               <a class="btn btn-default"
-               href="/myfiles/download-file/{{task.jobdirname}}/MODEL3.pdb">Download</a>               
-               </div>
-                        </li>
-			
-			</div>
-			<div class="model">
-<!--			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model4 after conversion
-			  to allatom 
-			  {{ task.remd_model4|linebreaks }}
-			  </div>
-			  <div class="col-md-10"> 
-			  <a
-			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL4.pdb">
-			  <img
-			  src="/myfiles/download-file/{{task.jobdirname}}/model4.png" width="500">
-			  </a></div>
-			</li>-->
-			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model4 
-			  {% if not task.damino %}
-			  after conversion to allatom
-			  {% endif %}
-			  {{ task.remd_model4|linebreaks }}
-			  NGL viewer</div>
-			  <div class="col-md-10" id="viewport_M4"
-			  style="width:500px;height:500px;"> 
-			  </div>
-			</li>
-                        <li class="list-group-item task-item">
-               <div class="col-md-12">
-               {% if task.md_pdbref %}
-               <button id="toggleRefM4">Reference structure on/off</button>
-               {% endif %}
-               <button id="toggleSidechainsM4">Side-chains on/off</button>
-               <a class="btn btn-default"
-               href="/myfiles/download-file/{{task.jobdirname}}/MODEL4.pdb">Download</a>               
-               </div>
-                        </li>
-			
-			</div>
-			<div class="model">
-<!--			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model5 after conversion
-			  to allatom 
-			  {{ task.remd_model5|linebreaks }}
-			  </div>
-			  <div class="col-md-10"> 
-			  <a
-			  href="/myfiles/download-file/{{task.jobdirname}}/MODEL5.pdb">
-			  <img
-			  src="/myfiles/download-file/{{task.jobdirname}}/model5.png" width="500">
-			  </a></div>
-			</li>-->
-			<li class="list-group-item task-item">
-			  <div class="col-md-2"> model5 
-			  {% if not task.damino %}
-			  after conversion to allatom 
-			  {% endif %}
-			  {{ task.remd_model5|linebreaks }}
-			  NGL viewer</div>
-			  <div class="col-md-10" id="viewport_M5"
-			  style="width:500px;height:500px;"> 
-			  </div>
-			</li>
-                        <li class="list-group-item task-item">
-               <div class="col-md-12">
-               {% if task.md_pdbref %}
-               <button id="toggleRefM5">Reference structure on/off</button>
-               {% endif %}
-               <button id="toggleSidechainsM5">Side-chains on/off</button>
-               <a class="btn btn-default"
-               href="/myfiles/download-file/{{task.jobdirname}}/MODEL5.pdb">Download</a>               
-               </div>
-                        </li>
-			
 			</div>
+		{% endwith %}
+		{% endwith %}	
+                {% endwith %}
+                {% endwith %}
+                {% endwith %}
+                {% endfor %}   
+
 			{% endif %}
 
 	{% endif %}		
@@ -836,8 +713,9 @@ $('.majorpointslegend').click(function(){
 
 {% if task.type == "remd" or task.type == "dock" %}
 <script>
-function display_model(numstr){
+function display_model(num){
 
+ numstr=num.toString();
 {% if task.md_pdbref %}
   var stage = new NGL.Stage("viewport_M"+numstr);
   stage.setParameters( { backgroundColor: "white",fogFar: 60, fogNear: 45 } );
@@ -947,7 +825,7 @@ function (event) {
 },false);
 
 
-display_model("1")
+display_model(1)
 
 
 var slideIndex = 1;
@@ -974,20 +852,8 @@ function showDivs(n) {
   }
   x[slideIndex-1].style.display = "block";
   
-  if (lista[slideIndex-1] == 0 && slideIndex == 2) {
-    display_model("2")  
-  }
-  
-  if (lista[slideIndex-1] == 0 && slideIndex == 3) {
-     display_model("3")  
-  }
-
-  if (lista[slideIndex-1] == 0 && slideIndex == 4) {
-     display_model("4")  
-  }
-
-  if (lista[slideIndex-1] == 0 && slideIndex == 5) {
-     display_model("5")  
+  if (lista[slideIndex-1] == 0) {
+    display_model(slideIndex)  
   }