From 2a56bb1ffe6ff85a5ed9e75179755158e5fc121f Mon Sep 17 00:00:00 2001
From: Rachel TORCHET <racheltorchet@users.noreply.github.com>
Date: Tue, 20 Jun 2017 16:45:56 +0200
Subject: [PATCH] Appearance updates for IdForm - radio buttons - plus add url
form to switch between different steps. Add JS to add multiple PDBids
Former-commit-id: 94c916e4fa7a5af148641b880f0a48e6c5c82da8
---
ippisite/ippidb/forms.py | 2 +-
ippisite/ippidb/static/css/ippidb.css | 130 ++++++++++++++----
.../ippidb/static/images/Other/AddMore.png | Bin 0 -> 9609 bytes
.../ippidb/static/images/Other/Remove.png | Bin 0 -> 9447 bytes
ippisite/ippidb/static/js/ippidb.js | 18 +++
.../ippidb/templates/BibliographyForm.html | 17 +--
ippisite/ippidb/templates/IdForm.html | 28 ++--
ippisite/ippidb/templates/PDBForm.html | 21 +--
ippisite/ippidb/templates/PpiForm.html | 16 +--
.../templates/ProteinDomainComplexForm.html | 16 +--
.../ProteinDomainComplexTypeForm.html | 17 ++-
ippisite/ippidb/templates/ProteinForm.html | 16 +--
ippisite/ippidb/templates/base.html | 1 +
ippisite/ippidb/urls.py | 6 +-
ippisite/ippidb/views.py | 2 +-
15 files changed, 196 insertions(+), 94 deletions(-)
create mode 100644 ippisite/ippidb/static/images/Other/AddMore.png
create mode 100644 ippisite/ippidb/static/images/Other/Remove.png
diff --git a/ippisite/ippidb/forms.py b/ippisite/ippidb/forms.py
index 057191a1..c77eeae9 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 b28f4ac7..877677d5 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
GIT binary patch
literal 9609
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
literal 0
HcmV?d00001
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
GIT binary patch
literal 9447
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
literal 0
HcmV?d00001
diff --git a/ippisite/ippidb/static/js/ippidb.js b/ippisite/ippidb/static/js/ippidb.js
index e69de29b..f6a87790 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 fa4e709b..65770458 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 403dbe3e..d8c8ec70 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 4a3a8e6d..4f938db4 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 367fe504..f377c4c1 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 a0a2bc90..3c22c48d 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 cfe89bea..8a67d1dc 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 bebf3dba..e6966f9b 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 a497b809..6fd77a1e 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 874372fb..8440d2e1 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 e0c0172a..862fe3b0 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]]
--
GitLab