etoh cherry merge correction

[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 550d346..fa09780 100644 (file)
--- a/django_simple/todo/templates/details.html
+++ b/django_simple/todo/templates/details.html
@@ -115,14 +115,23 @@ Created {{ task.created_date  }}
                            <div class="col-xs-10"> thermostat </div>
                            <div class="col-xs-10">{{ task.md_lang}}</div>
                        </li>           
+                       
+                       {% if task.md_lang == "berendsen" %}
+                       
                        <li class="list-group-item task-item">
                            <div class="col-xs-10"> tau </div>
                            <div class="col-xs-10">{{ task.md_tau}}</div>
                        </li>           
+                       
+                       {% else %}
+                       
                        <li class="list-group-item task-item">
                            <div class="col-xs-10"> scal_fric </div>
                            <div class="col-xs-10">{{ task.md_scal_fric}}</div>
-                       </li>           
+                       </li>   
+                       
+                       {% endif %}
+                               
                        <li class="list-group-item task-item">
                            <div class="col-xs-10"> mdpdb </div>
                            <div class="col-xs-10">{{ task.md_mdpdb}}</div>
@@ -172,14 +181,23 @@ Created {{ task.created_date  }}
                            <div class="col-xs-10"> thermostat </div>
                            <div class="col-xs-10">{{ task.md_lang}}</div>
                        </li>           
+                       
+                       {% if task.md_lang == "berendsen" %}
+                       
                        <li class="list-group-item task-item">
                            <div class="col-xs-10"> tau </div>
                            <div class="col-xs-10">{{ task.md_tau}}</div>
                        </li>           
+                       
+                       {% else %}
+                       
                        <li class="list-group-item task-item">
                            <div class="col-xs-10"> scal_fric </div>
                            <div class="col-xs-10">{{ task.md_scal_fric}}</div>
-                       </li>           
+                       </li>   
+                       
+                       {% endif %}
+                               
                        <li class="list-group-item task-item">
                            <div class="col-xs-10"> temperatures </div>
                            <div class="col-xs-10">{{ task.remd_multi_t}}</div>
@@ -330,7 +348,9 @@ Created {{ task.created_date  }}
 
                        <li class="list-group-item task-item">
                          <div class="col-xs-10"> model1 after conversion
-                         to allatom with PULCHRA and SCWRL</div>
+                         to allatom with PULCHRA and SCWRL
+                         {{ task.remd_model1|linebreaks }}
+                         </div>
                          <div class="col-xs-10"> 
                          <a
                          href="/myfiles/download-file/{{task.jobdirname}}/MODEL1.pdb">
@@ -340,7 +360,9 @@ Created {{ task.created_date  }}
                        </li>
                        <li class="list-group-item task-item">
                          <div class="col-xs-10"> model2 after conversion
-                         to allatom with PULCHRA and SCWRL</div>
+                         to allatom with PULCHRA and SCWRL
+                         {{ task.remd_model2|linebreaks }}
+                         </div>
                          <div class="col-xs-10"> 
                          <a
                          href="/myfiles/download-file/{{task.jobdirname}}/MODEL2.pdb">
@@ -350,7 +372,9 @@ Created {{ task.created_date  }}
                        </li>
                        <li class="list-group-item task-item">
                          <div class="col-xs-10"> model3 after conversion
-                         to allatom with PULCHRA and SCWRL</div>
+                         to allatom with PULCHRA and SCWRL
+                         {{ task.remd_model3|linebreaks }}
+                         </div>
                          <div class="col-xs-10"> 
                          <a
                          href="/myfiles/download-file/{{task.jobdirname}}/MODEL3.pdb">
@@ -360,7 +384,9 @@ Created {{ task.created_date  }}
                        </li>
                        <li class="list-group-item task-item">
                          <div class="col-xs-10"> model4 after conversion
-                         to allatom with PULCHRA and SCWRL</div>
+                         to allatom with PULCHRA and SCWRL
+                         {{ task.remd_model4|linebreaks }}
+                         </div>
                          <div class="col-xs-10"> 
                          <a
                          href="/myfiles/download-file/{{task.jobdirname}}/MODEL4.pdb">
@@ -370,7 +396,9 @@ Created {{ task.created_date  }}
                        </li>
                        <li class="list-group-item task-item">
                          <div class="col-xs-10"> model5 after conversion
-                         to allatom with PULCHRA and SCWRL</div>
+                         to allatom with PULCHRA and SCWRL
+                         {{ task.remd_model5|linebreaks }}
+                         </div>
                          <div class="col-xs-10"> 
                          <a
                          href="/myfiles/download-file/{{task.jobdirname}}/MODEL5.pdb">