Skip to content

Commit 2a633c5

Browse files
committed
Update numbering of sections on the htlm pages
1 parent d925284 commit 2a633c5

File tree

4 files changed

+81
-34
lines changed

4 files changed

+81
-34
lines changed

templates/data_quality.html

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "validation_report_layout.html" %}
2-
{% from "macro.html" import insert_json_plot, write_table with context %}
2+
{% from "macro.html" import insert_json_plot, write_table, format_help with context %}
33
<!-- Template for writing data quality webpage -->
44
<!-- ganesans - Salilab - UCSF -->
55
<!-- ganesans@salilab.org -->
@@ -9,7 +9,9 @@
99
<div class="card-header" style="background-color: #FFF;">
1010
<div class="row">
1111
<div class="col-lg-12">
12-
<h4 class="ex2" align="center"><u><a name='first'>Data quality</a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href='/validation_help.html#dataquality'>?</a>
12+
<h4 class="ex2" align="center">
13+
<u><a name='first'>3. Data quality</a></u>
14+
{{ format_help("dataquality", current_task) }}
1315
</h4>
1416
</div>
1517
</div>
@@ -24,7 +26,13 @@ <h4 class="ex2" align="center"><u><a name='first'>Data quality</a></u><a class='
2426
<div class="row">
2527
<div class="col-lg-12">
2628
<h5 class= ex2 align= center>
27-
<u><a name=firstI>SAS:Scattering profile</a></u>
29+
<u><a name="dq-sas">3.1. SAS</a></u>
30+
{{ format_help("dq-sas", current_task) }}
31+
</h5>
32+
33+
<h5 class= ex2 align= center>
34+
<u><a name=firstI>3.1.1. Scattering profile</a></u>
35+
{{ format_help("scattering", current_task) }}
2836
</h5>
2937
<p align=justify>
3038
SAS data used in this integrative model could not be validated as the sascif file is currently unavailable.
@@ -43,7 +51,13 @@ <h5 class= ex2 align= center>
4351
<div class="col-lg-12">
4452
<!-- potential nesting inconsistency -->
4553
<h5 class= ex2 align= center>
46-
<u><a name=firstI>SAS:Scattering profile</a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href='/validation_help.html#scattering'>?</a>
54+
<u><a name="dq-sas">3.1 SAS</a></u>
55+
{{ format_help("dq-sas", current_task) }}
56+
</h5>
57+
58+
<h5 class= ex2 align= center>
59+
<u><a name=firstI>3.1.1. Scattering profile</a></u>
60+
{{ format_help("scattering", current_task) }}
4761
</h5>
4862
<p align=justify>
4963
SAS data used in this integrative model was obtained from {{sasdb_code_html|length|int}} deposited SASBDB entry (entries).
@@ -81,7 +95,8 @@ <h5 class= ex2 align= center>
8195
<div class="col-lg-12">
8296
<div class="card-header" style="background-color: #FFF;">
8397
<h5 class= ex2 align= center>
84-
<u><a name=firstE>Key experimental estimates</a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href='/validation_help.html#expt'>?</a>
98+
<u><a name=firstE>3.1.2. Key experimental estimates</a></u>
99+
{{ format_help("expt", current_task) }}
85100
</h5>
86101
<p class=ex2 align='justify'>
87102
<u>Molecular weight (MW) estimates from experiments and analysis</u>: true molecular weight can be compared to the Porod estimate from scattering profiles.
@@ -104,7 +119,8 @@ <h5 class= ex2 align= center>
104119
<div class="col-lg-12">
105120
{% if sas and sasdb_sascif|length > 0 %}
106121
<h5 class= ex2 align= center>
107-
<u><a name=firstF>Flexibility analysis</a> </u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href='/validation_help.html#flexibility'>?</a>
122+
<u><a name=firstF>3.1.3. Flexibility analysis</a></u>
123+
{{ format_help("flexibility", current_task) }}
108124
</h5>
109125
<p align=justify>
110126
In a Porod-Debye plot, a clear plateau is observed for globular (partial or fully folded) domains, whereas, fully unfolded domains are devoid of any discernable plateau. For details, refer to Figure 5 in <a href=https://www.ncbi.nlm.nih.gov/pmc/articles/PMC3103662/>Rambo and Tainer, 2011</a>. In a Kratky plot, a parabolic shape is observed for globular (partial or fully folded) domains and a hyperbolic shape is observed for fully unfolded domains.
@@ -143,7 +159,8 @@ <h5 class= ex2 align= center>
143159
<!-- header -->
144160
<div class="col-lg-12">
145161
<h5 align= center>
146-
<u><a name=firstP>Pair-distance distribution analysis</a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href='/validation_help.html#pofr'>?</a>
162+
<u><a name=firstP>3.1.4. Pair-distance distribution analysis</a></u>
163+
{{ format_help("pofr", current_task) }}
147164
</h5>
148165
<p class=ex2 align='justify'>
149166
<u>P(r) analysis:</u> P(r) represents the distribution of distances between all pairs of atoms within the particle weighted by the respective electron densities. P(r) is the Fourier transform of I(s) (and vice versa). R<sub>g</sub> can be estimated from integrating the P(r) function. Agreement between the P(r) and Guinier-determined R<sub>g</sub> (table below) is a good measure of the self-consistency of the SAS profile. R<sub>g</sub> is a measure for the overall size of a macromolecule; e.g. a protein with a smaller R<sub>g</sub> is more compact than a protein with a larger R<sub>g</sub>, provided both have the same molecular weight (MW). The point where P(r) is decaying to zero is called D<sub>max</sub> and represents the maximum size of the particle.
@@ -181,7 +198,9 @@ <h5 align= center>
181198
<div class="row">
182199
<!-- description -->
183200
<div class="col-lg-12">
184-
<h5 class= ex2 align= center><u><a name=firstG> Guinier analysis </a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href='/validation_help.html#guinier'>?</a>
201+
<h5 class= ex2 align= center>
202+
<u><a name=firstG>3.1.5. Guinier analysis </a></u>
203+
{{ format_help("guinier", current_task) }}
185204
</h5>
186205
<p class=ex2 align='justify'>
187206
<u> Guinier analysis:</u> agreement between the P(r) and Guinier-determined R<sub>g</sub> (table below) is a good measure of the self-consistency of the SAS profile. Molecular weight estimates can also be compared to Porod and sample molecular weights for consistency.
@@ -218,6 +237,12 @@ <h5 class= ex2 align= center><u><a name=firstG> Guinier analysis </a></u><a clas
218237
</div>
219238
{% endif %}
220239

221-
{% include 'cx_data_quality.j2' %}
222-
{% include 'em_data_quality.j2' %}
240+
<div class="card-header" style="background-color: #FFFFFF; border-color:#003366;">
241+
{% include 'cx_data_quality.j2' %}
242+
</div>
243+
244+
<div class="card-header" style="background-color: #FFFFFF; border-color:#003366;">
245+
{% include 'em_data_quality.j2' %}
246+
</div>
247+
223248
{% endblock %}

templates/formodeling.html

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "validation_report_layout.html" %}
2-
{% from "macro.html" import insert_json_plot, write_table with context %}
2+
{% from "macro.html" import insert_json_plot, write_table, format_help with context %}
33
{% block body %}
44
<!-- Template for writing fit to information webpage -->
55
<!-- ganesans - Salilab - UCSF -->
@@ -10,7 +10,8 @@
1010
<div class="row">
1111
<div class="col-lg-12">
1212
<h4 class="ex2" align="center">
13-
<u><a name='first'>Fit of model to data used for modeling</a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href='/validation_help.html#fittodata'>?</a>
13+
<u><a name='first'>5. Fit of model to data used for modeling</a></u>
14+
{{ format_help("fittodata", current_task) }}
1415
</h4>
1516
</div>
1617
</div>
@@ -23,7 +24,10 @@ <h4 class="ex2" align="center">
2324
<div class="card-header" style="background-color: #FFF; height=18rem">
2425
<div class="row">
2526
<div class="col-lg-12">
26-
<h5 class= ex2 align= center><u> Fit of model(s) to SAS data</u></h5>
27+
<h5 class= ex2 align= center>
28+
<u>5.1. SAS</u>
29+
{{ format_help("fq-sas", current_task) }}
30+
</h5>
2731
{% if sasdb_sascif|length < 1 %}
2832
<p align=justify>
2933
SAS data used in this integrative model could not be validated as the sascif file is currently unavailable.
@@ -35,20 +39,9 @@ <h5 class= ex2 align= center><u> Fit of model(s) to SAS data</u></h5>
3539
<div class="row">
3640
<div class="col-lg-6">
3741
<h5 class= ex2 align= center>
38-
<u><a name='second'>Cormap p-value analysis of fits </a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href='/validation_help.html#cormap'>?</a>
42+
<u><a name='second'>5.1.1. &#x3A7;&#178; Goodness of Fit Assessment</a></u>
43+
{{ format_help("goodness", current_task) }}
3944
</h5>
40-
{% if number_of_fits > 0 %}
41-
<p class =ex2>
42-
<i>ATSAS DATCMP was used for hypothesis testing. <i>All data sets are similar (i.e. the fit and the data collected) </i> is the null hypothesis. p-value is a measure of evidence against the null hypothesis, smaller the value, the stronger the evidence that you should reject the null hypothesis.</i>
43-
</p>
44-
{{ write_table(p_val) }}
45-
{% else %}
46-
<p class =ex2>
47-
<i>Model(s) and/or fit for this entry has not been deposited.</i>
48-
</p>
49-
{% endif %}
50-
</div>
51-
<div class="col-lg-6">
5245
<p align=justify align=center>
5346
<i>The experimental scattering curve (in blue) can be compared with the theoretical curve calculated from a model (in red). Residual value plot is a measure to assess fit to the data. Residual values should be equally and randomly spaced around the horizontal axis.</i>
5447
</p>
@@ -61,6 +54,22 @@ <h5 class= ex2 align= center>
6154
{% endfor %}
6255
</div>
6356
</div>
57+
<div class="col-lg-6">
58+
<h5 class= ex2 align= center>
59+
<u><a name='second'>5.1.2. Cormap Analysis</a></u>
60+
{{ format_help("cormap", current_task) }}
61+
</h5>
62+
{% if number_of_fits > 0 %}
63+
<p class =ex2>
64+
<i>ATSAS DATCMP was used for hypothesis testing. <i>All data sets are similar (i.e. the fit and the data collected) </i> is the null hypothesis. p-value is a measure of evidence against the null hypothesis, smaller the value, the stronger the evidence that you should reject the null hypothesis.</i>
65+
</p>
66+
{{ write_table(p_val) }}
67+
{% else %}
68+
<p class =ex2>
69+
<i>Model(s) and/or fit for this entry has not been deposited.</i>
70+
</p>
71+
{% endif %}
72+
</div>
6473
</div>
6574
{% endif %}
6675
</div>
@@ -73,8 +82,14 @@ <h5 class= ex2 align= center>
7382
<div class="card-header" style="background-color: #FFF; height=18rem">
7483
<div class="row">
7584
<div class='col-lg-12'>
76-
<h4 align=center id="crosslinking-ms"><u> Fit of model(s) to crosslinking-MS data</u></h4>
77-
<h5 align=center id="crosslinking-ms_ertypes"><u>Restraint types</u></h5>
85+
<h4 align=center id="crosslinking-ms">
86+
<u>5.2. Crosslinking-MS</u>
87+
{{ format_help("fq-crosslinking-ms", current_task) }}
88+
</h4>
89+
<h5 align=center id="crosslinking-ms_ertypes">
90+
<u>5.2.1. Restraint types</u>
91+
{{ format_help("fq-crosslinking-ms-restraints", current_task) }}
92+
</h5>
7893
{% if cx_ertypes is none %}
7994
<p>Restraint types in this entry are not supported at the moment.</p>
8095
{% else %}
@@ -142,7 +157,10 @@ <h5 align=center id="crosslinking-ms_ertypes"><u>Restraint types</u></h5>
142157
</div>
143158
{% endif %}
144159
<!-- end of cx_ertypes -->
145-
<h5 align=center id="crosslinking-ms_satisfaction"><u>Satisfaction of restraints</u></h5>
160+
<h5 align=center id="crosslinking-ms_satisfaction">
161+
<u>5.2.2. Satisfaction of restraints</u>
162+
{{ format_help("fq-crosslinking-ms-satisfaction", current_task) }}
163+
</h5>
146164
{% if cx_stats is none %}
147165
<p>Satisfaction rates for this entry are unavailable at the moment.</p>
148166
{% else %}
@@ -237,6 +255,10 @@ <h5 align=center id="crosslinking-ms_satisfaction"><u>Satisfaction of restraints
237255
</div>
238256
</div>
239257
{% endif %}
240-
{% include 'em_fit.j2' %}
258+
259+
<!-- 3DEM -->
260+
<div class="card-header" style="background-color: #FFFFFF; border-color:#003366;">
261+
{% include 'em_fit.j2' %}
262+
</div>
241263

242264
{% endblock %}

templates/main.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ <h5 align="center" style="text-align: center";>Download Summary Table</h5>
9494

9595
<div class="card-header" style="background-color: #FFFFFF; border-color:#003366;">
9696
<h4 align="center">
97-
<a name='qual'>Overall quality</a>
97+
<a name='qual'>1.2. Overall quality</a>
9898
{{ format_help("ataglance", current_task) }}
9999
</h4>
100100
<p align="justify">

templates/model_composition.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<div class="col-lg-12">
1212
<div class="card-header" style="background-color: #FFF;">
1313
<h4 align='center'>
14-
<u><a name='ensemble'>Ensemble information</a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href="/validation_help.html#ensemble">?</a>
14+
<u><a name='ensemble'>2.1. Ensemble information</a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href="/validation_help.html#ensemble">?</a>
1515
</h4>
1616
{% if num_ensembles < 2 %}
1717
<p class ="ex2"><i>This entry consists of {{num_ensembles|int}} distinct ensemble.</i></p>
@@ -40,7 +40,7 @@ <h4 align='center'>
4040
<div class="row">
4141
<div class="col-lg-12">
4242
<div class="card-header" style="background-color: #FFF;">
43-
<h4 class="ex2" align="center"><u><a name='data'>Datasets used for modeling </a></u> <a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href="/validation_help.html#datasets">?</a></h4>
43+
<h4 class="ex2" align="center"><u><a name='data'>2.3. Datasets used for modeling </a></u> <a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href="/validation_help.html#datasets">?</a></h4>
4444
{% if number_of_datasets < 2 %}
4545
<i>There is {{number_of_datasets|int}} unique dataset used to build the models in this entry.</i>
4646
{% else %}
@@ -59,7 +59,7 @@ <h4 class="ex2" align="center"><u><a name='data'>Datasets used for modeling </a>
5959
<div class="col-lg-12">
6060
<div class="card-header" style="background-color: #FFF;">
6161
<h4 class="ex2" align="center">
62-
<u><a name="methods">Methodology and software</a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href="/validation_help.html#software">?</a>
62+
<u><a name="methods">2.4. Methodology and software</a></u><a class='help' title='help' style='background-color:#228B22;color:#000000;text-decoration:none font-size=16px' href="/validation_help.html#software">?</a>
6363
</h4>
6464
<!-- Protocols summary -->
6565
{% if Protocols_number < 2 %}

0 commit comments

Comments
 (0)