diff --git a/ippisite/ippidb/forms.py b/ippisite/ippidb/forms.py
index 057191a16df6c86c1c6b3ca58895686a6b703828..c77eeae976d24267f606b879aa1ed34ba460011a 100644
--- a/ippisite/ippidb/forms.py
+++ b/ippisite/ippidb/forms.py
@@ -9,7 +9,7 @@ class IdForm(ModelForm):
fields = ['source','id_source']
widgets = {
'source' : forms.RadioSelect,
- 'id_source': forms.TextInput(attrs={'placeholder': 'PubMed ID / DOI / Patent ID'}),
+ 'id_source': forms.TextInput(attrs={'placeholder': 'ID'}),
}
class BibliographyForm(ModelForm):
diff --git a/ippisite/ippidb/static/css/ippidb.css b/ippisite/ippidb/static/css/ippidb.css
index b28f4ac7d7ab0fc18e6109a5b00b8d604e0666b3..877677d5f801b43c00c60db8fcd96e79e0c71b6d 100644
--- a/ippisite/ippidb/static/css/ippidb.css
+++ b/ippisite/ippidb/static/css/ippidb.css
@@ -533,6 +533,10 @@ font-size: 42px;
line-height: 1.4;
}
+.color-wrap {
+ width:80%;
+}
+
button {
font-family:"BrandonGrotesqueReg";
}
@@ -595,7 +599,6 @@ display:block;
/* FORMS */
#Form{
- width: 80%;
border: 1px solid;
padding: 15px;
min-height: 150px;
@@ -632,27 +635,71 @@ body {
font-family:sans-serif;
}
+.input_size{
+ width:80%;
+}
+
+.input_fields_wrap {
+ display:inline-block;
+}
+
+
+/* BUTTONS */
+
+#id_IdForm-source {
+ overflow: hidden;
+ width: 400px;
+ padding-bottom: 5px;
+}
+
+#id_IdForm-source label span{
+ display: inline-block;
+ width: 130px;
+ background-color: #E8E0E0;
+ color: #8D8888;
+ text-align: center;
+ border: 1px solid #8D8888;
+}
+
+#id_IdForm-source input {
+ display:none;
+}
+
+#id_IdForm-source input:hover+label span{
+ cursor: pointer;
+ background-color: #FFFFFF;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+#id_IdForm-source input[type="radio"]:checked+label span{
+ background-color: #FFFFFF;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
#ck-button {
margin: 4px;
- background-color: #FFFFFF;
float:left;
}
#ck-button label {
width: 80%;
- text-transform: uppercase;
}
#ck-button label span {
text-align:center;
padding:3px;
display:block;
- background-color:#FFFFFF;
- color:#2D96FA;
- border:1px solid #2D96FA;
- font-family: "Roboto";
- font-weight: bold;
-
+ background-color: #E8E0E0;
+ color: #8D8888;
+ border: 1px solid #8D8888;
}
#ck-button label input {
@@ -662,21 +709,30 @@ body {
}
#ck-button input:hover + span {
- background-color:#E3E9EB;
- color:#2D96FA;
- border:1px solid #2D96FA;
+ background-color: #FFFFFF;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
}
#ck-button input:checked + span {
- background-color:#E8E0E0;
- color:#8D8889;
- border:1px solid #8D8889;
+ background-color: #FFFFFF;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
}
#ck-button input:checked:hover + span {
- background-color:#E3E9EB;
- color:#8D8889;
- border:1px solid #8D8889;
+ background-color: #FFFFFF;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
}
button, input, select, textarea {
@@ -700,29 +756,30 @@ button, input, select, textarea {
}
#step {
- width: 80%;
-}
-
-#step ul{
- text-align: center;
+ width: 100%;
+ margin: 0 ;
+ padding: 0 ;
}
#step li {
display: inline;
}
-#step button {
- width: 156px;
- background-color: rgb(0, 0, 0);
- color: rgb(255, 255, 255);
+#step li a, #step li a:hover, #step li a:focus {
+ width: 156.656px;
+ background-color: #E3E9EB;
+ color:#8D8888;
font-family: "PlayfairDisplayReg";
font-size: 22px;
display: inline-block;
+ text-align: center;
+ text-decoration: none;
}
-#step button.no_active {
- background-color: #E3E9EB;
- color:#8D8888;
+#step li a.active {
+ text-decoration: none;
+ background-color: #000000;
+ color:#FFFFFF;
}
.step_desc {
@@ -730,6 +787,19 @@ button, input, select, textarea {
margin-bottom: 15px;
}
+
+.small_icon {
+ width:30%;
+}
+
+.add_field_button{
+ width:10%;
+}
+
+.remove_field{
+ width:10%;
+}
+
/* CONTENT */
#content{
diff --git a/ippisite/ippidb/static/images/Other/AddMore.png b/ippisite/ippidb/static/images/Other/AddMore.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bbb36d28e275c7d75751382f031085f015794c5
Binary files /dev/null and b/ippisite/ippidb/static/images/Other/AddMore.png differ
diff --git a/ippisite/ippidb/static/images/Other/Remove.png b/ippisite/ippidb/static/images/Other/Remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6b65e62e1ab64ffc7ae02012576e9ab22d5b178
Binary files /dev/null and b/ippisite/ippidb/static/images/Other/Remove.png differ
diff --git a/ippisite/ippidb/static/js/ippidb.js b/ippisite/ippidb/static/js/ippidb.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f6a8779010fc06333c20d9ee30434810d5c84314 100644
--- a/ippisite/ippidb/static/js/ippidb.js
+++ b/ippisite/ippidb/static/js/ippidb.js
@@ -0,0 +1,18 @@
+$(document).ready(function() {
+ var max_fields = 10; //maximum input boxes allowed
+ var wrapper = $(".input_fields_wrap"); //Fields wrapper
+ var add_button = $(".add_field_button"); //Add button ID
+
+ var x = 1; //initlal text box count
+ $(add_button).click(function(e){ //on add input button click
+ e.preventDefault();
+ if(x < max_fields){ //max input box allowed
+ x++; //text box increment
+ $(wrapper).append('<div class="input_size"><input type="text" name="PDBForm-pdb_id"/><div class="remove_field"><img class="small_icon" src="/static/images/Other/Remove.png"></div></div>'); //add input box
+ }
+ });
+
+ $(wrapper).on("click",".remove_field", function(e){ //user click on remove text
+ e.preventDefault(); $(this).parent('div').remove(); x--;
+ })
+});
\ No newline at end of file
diff --git a/ippisite/ippidb/templates/BibliographyForm.html b/ippisite/ippidb/templates/BibliographyForm.html
index fa4e709bf16a257b3c09b90aea600905982dca40..657704585f694deda3429576e35cb0120417e056 100644
--- a/ippisite/ippidb/templates/BibliographyForm.html
+++ b/ippisite/ippidb/templates/BibliographyForm.html
@@ -2,16 +2,16 @@
{% load i18n %}
{% block form %}
-<nav id="step">
+<div id="step">
<ul>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.first }}">{% trans "ID" %}</button></li>
- <li><button name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}">{% trans "Bibliography" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit">{% trans "PDB id" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit">{% trans "Proteins" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit">{% trans "Architecture" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit">{% trans "PPI" %}</button></li>
+ <li><a href='/admin-session/add/IdForm/'>{% trans "ID" %}</a></li>
+ <li><a class="active" href='/admin-session/add/BibliographyForm/'>{% trans "Bibliography" %}</a></li>
+ <li><a href='/admin-session/add/PDBForm/'>{% trans "PDB id" %}</a></li>
+ <li><a href='/admin-session/add/ProteinForm/'>{% trans "Proteins" %}</a></li>
+ <li><a href='/admin-session/add/ProteinDomainComplexTypeForm/'>{% trans "Architecture" %}</a></li>
+ <li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
</ul>
-</nav>
+</div>
<div id="Form">
<div class="step_desc">
<p>Based on the ID you have provided, we have identified the following information concerning your bibliographic source.
@@ -37,6 +37,7 @@ Please check that the information below is correct (Title, Authors etc. ) and an
{{ wizard.form.title }}<br/>
{{ wizard.form.journal_name }}<br/>
</div>
+ <p> This publication contains :<br/></p>
<div id="ck-button">
<label>
<input type="checkbox"><span>{{ wizard.form.cytotox.label }}</span>
diff --git a/ippisite/ippidb/templates/IdForm.html b/ippisite/ippidb/templates/IdForm.html
index 403dbe3e333b2aec7ce9a1de9bf0a3e79a929c21..d8c8ec70aeebb23cfcd428b53d9e83c2e70cadaf 100644
--- a/ippisite/ippidb/templates/IdForm.html
+++ b/ippisite/ippidb/templates/IdForm.html
@@ -2,20 +2,18 @@
{% load i18n %}
{% block form %}
-<nav id="step">
+<div id="step">
<ul>
- <li><button name="wizard_goto_step" type="submit" value="{{ wizard.steps.first }}">{% trans "ID" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit">{% trans "Bibliography" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step2 }}">{% trans "PDB id" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step3 }}">{% trans "Proteins" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step4 }}">{% trans "Architecture" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step5 }}">{% trans "PPI" %}</button></li>
+ <li><a class="active" href='/admin-session/add/IdForm/'>{% trans "ID" %}</a></li>
+ <li><a href='/admin-session/add/BibliographyForm/'>{% trans "Bibliography" %}</a></li>
+ <li><a href='/admin-session/add/PDBForm/'>{% trans "PDB id" %}</a></li>
+ <li><a href='/admin-session/add/ProteinForm/'>{% trans "Proteins" %}</a></li>
+ <li><a href='/admin-session/add/ProteinDomainComplexTypeForm/'>{% trans "Architecture" %}</a></li>
+ <li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
</ul>
-</nav>
+</div>
<div id="Form">
<div class="step_desc">
-<button name="wizard_goto_step" type="submit" value="{{ wizard.steps.first }}">{% trans "first step" %}</button>
-<p>Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }}</p>
<p> Please provide a valid ID for your bibliographic source, either a PubMed ID or WIPO ID. This ID should correspond to a bibliographic source in its final format. Therefore, PubMed articles in « Just Accepted » format should not be used as a source of data as they are not considered the official version of record. </p>
</div>
<form action="" method="post">
@@ -32,7 +30,15 @@
{{ form }}
{% endfor %}
{% else %}
- {{ wizard.form}}
+ <div id="id_IdForm-source">
+ {% for radio in wizard.form.source %}
+ {{ radio.tag }}
+ <label for="{{ radio.id_for_label }}">
+ <span>{{ radio.choice_label }}</span>
+ </label>
+ {% endfor %}
+ </div>
+ {{ wizard.form.id_source}}
{% endif %}
</table>
<input type="submit" value="{% trans "Next step" %}"/>
diff --git a/ippisite/ippidb/templates/PDBForm.html b/ippisite/ippidb/templates/PDBForm.html
index 4a3a8e6dde4932a0ba1e320079d4020aa7fca2ce..4f938db49d07f54441430917f30de1d3198cf374 100644
--- a/ippisite/ippidb/templates/PDBForm.html
+++ b/ippisite/ippidb/templates/PDBForm.html
@@ -2,16 +2,16 @@
{% load i18n %}
{% block form %}
-<nav id="step">
+<div id="step">
<ul>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.first }}">{% trans "ID" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}">{% trans "Bibliography" %}</button></li>
- <li><button name="wizard_goto_step" type="submit" value="{{ wizard.steps.step2 }}">{% trans "PDB id" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step3 }}">{% trans "Proteins" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step4 }}">{% trans "Architecture" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step5 }}">{% trans "PPI" %}</button></li>
+ <li><a href='/admin-session/add/IdForm/'>{% trans "ID" %}</a></li>
+ <li><a href='/admin-session/add/BibliographyForm/'>{% trans "Bibliography" %}</a></li>
+ <li><a class="active" href='/admin-session/add/PDBForm/'>{% trans "PDB id" %}</a></li>
+ <li><a href='/admin-session/add/ProteinForm/'>{% trans "Proteins" %}</a></li>
+ <li><a href='/admin-session/add/ProteinDomainComplexTypeForm/'>{% trans "Architecture" %}</a></li>
+ <li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
</ul>
-</nav>
+</div>
<div id="Form">
<div class="step_desc">
<p>Please provide a valid PDB code that contains the structure of the full PPI complex for which you have data. If you have several PDB codes please list them all as they may contain information about homologous protein partners. The information within the PDB file will be used to prefill information of the corresponding proteins and domains participating to the PPI.</p>
@@ -30,7 +30,10 @@
{{ form }}
{% endfor %}
{% else %}
- {{ wizard.form }}
+ <div class="input_fields_wrap">
+ <div class="input_size">{{ wizard.form.pdb_id }}
+ <div class="add_field_button"><img class="small_icon" src="/static/images/Other/AddMore.png"></div></div>
+ </div>
{% endif %}
</table>
<input type="submit" value="{% trans "Next step" %}"/>
diff --git a/ippisite/ippidb/templates/PpiForm.html b/ippisite/ippidb/templates/PpiForm.html
index 367fe5049de8c8a6fee6e7753282e07115b4c889..f377c4c11369b7e982f4634c1dac1eec44ab4cd1 100644
--- a/ippisite/ippidb/templates/PpiForm.html
+++ b/ippisite/ippidb/templates/PpiForm.html
@@ -2,16 +2,16 @@
{% load i18n %}
{% block form %}
-<nav id="step">
+<div id="step">
<ul>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.first }}">{% trans "ID" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}">{% trans "Bibliography" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step2 }}">{% trans "PDB id" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step3 }}">{% trans "Proteins" %}</button></li>
- <li><button name="wizard_goto_step" type="submit" value="{{ wizard.steps.step4 }}">{% trans "Architecture" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step5 }}">{% trans "PPI" %}</button></li>
+ <li><a href='/admin-session/add/IdForm/'>{% trans "ID" %}</a></li>
+ <li><a href='/admin-session/add/BibliographyForm/'>{% trans "Bibliography" %}</a></li>
+ <li><a href='/admin-session/add/PDBForm/'>{% trans "PDB id" %}</a></li>
+ <li><a href='/admin-session/add/ProteinForm/'>{% trans "Proteins" %}</a></li>
+ <li><a href='/admin-session/add/ProteinDomainComplexTypeForm/'>{% trans "Architecture" %}</a></li>
+ <li><a class="active" href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
</ul>
-</nav>
+</div>
<div id="Form">
<div class="step_desc">
<p>Now that you have created ALL complexes that participate to the formation of the PPI, you need to constuct your PPI by selecting your complex bound and if necessary you partner complex along with their stoichiometry in the PPI.</p>
diff --git a/ippisite/ippidb/templates/ProteinDomainComplexForm.html b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
index a0a2bc90169e59d74a3066a008bb4f09eae8a6da..3c22c48d03cd157e203b71a2253de81f3c2c7fed 100644
--- a/ippisite/ippidb/templates/ProteinDomainComplexForm.html
+++ b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
@@ -2,16 +2,16 @@
{% load i18n %}
{% block form %}
-<nav id="step">
+<div id="step">
<ul>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.first }}">{% trans "ID" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.prev }}">{% trans "Bibliography" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.step2 }}">{% trans "PDB id" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.step3 }}">{% trans "Proteins" %}</button></li>
- <li><button name="wizard_goto_step" type="button" value="{{ wizard.steps.step4 }}">{% trans "Architecture" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.step5 }}">{% trans "PPI" %}</button></li>
+ <li><a href='/admin-session/add/IdForm/'>{% trans "ID" %}</a></li>
+ <li><a href='/admin-session/add/BibliographyForm/'>{% trans "Bibliography" %}</a></li>
+ <li><a href='/admin-session/add/PDBForm/'>{% trans "PDB id" %}</a></li>
+ <li><a href='/admin-session/add/ProteinForm/'>{% trans "Proteins" %}</a></li>
+ <li><a class="active" href='/admin-session/add/ProteinDomainComplexTypeForm/'>{% trans "Architecture" %}</a></li>
+ <li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
</ul>
-</nav>
+</div>
<div id="Form">
<div class="step_desc">
diff --git a/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html b/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
index cfe89bea89acbd0f2fc6f13b70186e25ffc2c252..8a67d1dc7853ec10591aa51f93daf9bc212f5e45 100644
--- a/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
+++ b/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
@@ -2,17 +2,16 @@
{% load i18n %}
{% block form %}
-<nav id="step">
+<div id="step">
<ul>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.first }}">{% trans "ID" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.prev }}">{% trans "Bibliography" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.step2 }}">{% trans "PDB id" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.step3 }}">{% trans "Proteins" %}</button></li>
- <li><button name="wizard_goto_step" type="button" value="{{ wizard.steps.step4 }}">{% trans "Architecture" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="button" value="{{ wizard.steps.step5 }}">{% trans "PPI" %}</button></li>
+ <li><a href='/admin-session/add/IdForm/'>{% trans "ID" %}</a></li>
+ <li><a href='/admin-session/add/BibliographyForm/'>{% trans "Bibliography" %}</a></li>
+ <li><a href='/admin-session/add/PDBForm/'>{% trans "PDB id" %}</a></li>
+ <li><a href='/admin-session/add/ProteinForm/'>{% trans "Proteins" %}</a></li>
+ <li><a class="active" href='/admin-session/add/ProteinDomainComplexTypeForm/'>{% trans "Architecture" %}</a></li>
+ <li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
</ul>
-</nav>
-
+</div>
<div id="Form">
<div class="step_desc">
<p>Now that you have listed ALL proteins and PFAM domains that participate to the PPI, you need to select an architecture for this PPI complex among the proposed schematics below.</br>
diff --git a/ippisite/ippidb/templates/ProteinForm.html b/ippisite/ippidb/templates/ProteinForm.html
index bebf3dba79b1d4dc549b2fd1c06b5cfa23b2a023..e6966f9be08973aad072fc3db3a52e1215962b42 100644
--- a/ippisite/ippidb/templates/ProteinForm.html
+++ b/ippisite/ippidb/templates/ProteinForm.html
@@ -2,16 +2,16 @@
{% load i18n %}
{% block form %}
-<nav id="step">
+<div id="step">
<ul>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.first }}">{% trans "ID" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit">{% trans "Bibliography" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step2 }}">{% trans "PDB id" %}</button></li>
- <li><button name="wizard_goto_step" type="submit" value="{{ wizard.steps.step3 }}">{% trans "Proteins" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step4 }}">{% trans "Architecture" %}</button></li>
- <li><button class="no_active" name="wizard_goto_step" type="submit" value="{{ wizard.steps.step5 }}">{% trans "PPI" %}</button></li>
+ <li><a href='/admin-session/add/IdForm/'>{% trans "ID" %}</a></li>
+ <li><a href='/admin-session/add/BibliographyForm/'>{% trans "Bibliography" %}</a></li>
+ <li><a href='/admin-session/add/PDBForm/'>{% trans "PDB id" %}</a></li>
+ <li><a class="active" href='/admin-session/add/ProteinForm/'>{% trans "Proteins" %}</a></li>
+ <li><a href='/admin-session/add/ProteinDomainComplexTypeForm/'>{% trans "Architecture" %}</a></li>
+ <li><a href='/admin-session/add/PPIForm/'>{% trans "PPI" %}</a></li>
</ul>
-</nav>
+</div>
<div id="Form">
<div class="step_desc">
<p> Based on the PDB code(s) you have provided, we have identified a list of proteins and PFAM domains that may participate to the PPI. Please select ALL the proteins and PFAM domains that do participate to the formation of the full PPI complex. </p>
diff --git a/ippisite/ippidb/templates/base.html b/ippisite/ippidb/templates/base.html
index a497b809f8a22ac946a3ee26c46dabdaa4bf9749..6fd77a1ec57c962beac02e9d1d8fb361d24b529a 100644
--- a/ippisite/ippidb/templates/base.html
+++ b/ippisite/ippidb/templates/base.html
@@ -7,6 +7,7 @@
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
+ <script src="/static/js/ippidb.js" type="text/javascript"></script>
</head>
<body>
diff --git a/ippisite/ippidb/urls.py b/ippisite/ippidb/urls.py
index 874372fb824bd114111ea664dc302580b959bf21..8440d2e1e2d508a0981a50d5d825cac11184de1b 100644
--- a/ippisite/ippidb/urls.py
+++ b/ippisite/ippidb/urls.py
@@ -3,6 +3,9 @@ from . import views
from ippidb.forms import IdForm, BibliographyForm,PDBForm,ProteinDomainComplexTypeForm,ProteinDomainComplexForm,PpiForm
from ippidb.views import IppiWizard,FORMS
+ippidb_wizard = IppiWizard.as_view(FORMS,
+ url_name='ippidb_step')
+
urlpatterns = [
url(r'^$', views.index, name='index'),
@@ -10,7 +13,8 @@ urlpatterns = [
url(r'^query$', views.query, name='query'),
url(r'^tutorials$', views.tutorials, name='tutorials'),
url(r'^admin-session$', views.adminSession, name='admin-session'),
- url(r'^admin-session/add/$', IppiWizard.as_view(FORMS)),
+ url(r'^admin-session/add/(?P<step>.+)/$', ippidb_wizard, name='ippidb_step'),
+ url(r'^admin-session/add/$', ippidb_wizard, name='ippidb'),
]
from django.conf import settings
diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py
index e0c0172a534d674b60b42fe60e47210789976d47..862fe3b01350b4313b2e7508666ca7bc4808a3b4 100644
--- a/ippisite/ippidb/views.py
+++ b/ippisite/ippidb/views.py
@@ -38,7 +38,7 @@ TEMPLATES = {"IdForm": "IdForm.html",
"ProteinDomainComplexForm": "ProteinDomainComplexForm.html",
"PpiForm": "PpiForm.html"}
-class IppiWizard(SessionWizardView):
+class IppiWizard(NamedUrlSessionWizardView):
def get_template_names(self):
return [TEMPLATES[self.steps.current]]