diff --git a/ippisite/ippidb/forms.py b/ippisite/ippidb/forms.py
index 5e9e6ffd835b914d564c3c88a04437d59d380aac..2d8b7442e3626766c08d52f16766d6f3273a7eff 100644
--- a/ippisite/ippidb/forms.py
+++ b/ippisite/ippidb/forms.py
@@ -16,6 +16,12 @@ class BibliographyForm(ModelForm):
class Meta:
model = Bibliography
exclude = ['authors_list', 'biblio_year']
+ widgets = {
+ 'source': forms.Select(attrs={'disabled':'disabled', 'class':'readonly'}),
+ 'id_source': forms.TextInput(attrs={'readonly':'readonly', 'class':'readonly'}),
+ 'title': forms.TextInput(attrs={'readonly':'readonly', 'class':'readonly'}),
+ 'journal_name': forms.TextInput(attrs={'readonly':'readonly', 'class':'readonly'}),
+ }
class PDBForm(forms.Form):
pdb_id = forms.CharField(label="PDB ID",max_length=100, widget=forms.TextInput(attrs={'placeholder': 'e.g 4HHB'}))
diff --git a/ippisite/ippidb/models.py b/ippisite/ippidb/models.py
index 86fafb6e96ee5490dfab0dfdb97e6df1c4ef1e0c..d2d8ddfc601472d70ff485072de37fc00e58da74 100644
--- a/ippisite/ippidb/models.py
+++ b/ippisite/ippidb/models.py
@@ -37,12 +37,12 @@ class Bibliography(AutoFillableModel):
authors_list = models.CharField('Authors list', max_length=500)
biblio_year = models.PositiveSmallIntegerField('Year')
cytotox = models.BooleanField('Cytotoxicity data', default=False)
- in_silico = models.BooleanField('in silico study performed', default=False)
- in_vitro = models.BooleanField('in vitro study performed', default=False)
- in_vivo = models.BooleanField('in vivo study performed', default=False)
- in_cellulo = models.BooleanField('in cellulo study performed', default=False)
- pharmacokinetic = models.BooleanField('pharmacokinetic study performed', default=False)
- xray = models.BooleanField('contains xray data', default=False)
+ in_silico = models.BooleanField('in silico study', default=False)
+ in_vitro = models.BooleanField('in vitro study', default=False)
+ in_vivo = models.BooleanField('in vivo study', default=False)
+ in_cellulo = models.BooleanField('in cellulo study', default=False)
+ pharmacokinetic = models.BooleanField('pharmacokinetic study', default=False)
+ xray = models.BooleanField('X-Ray data', default=False)
def autofill(self):
if self.source == 'PM':
diff --git a/ippisite/ippidb/static/css/ippidb.css b/ippisite/ippidb/static/css/ippidb.css
index 96c4f2abb6bc02b969170c62499494b2f16f3f58..82e5995661e2ac715314b8036942641c283055d6 100644
--- a/ippisite/ippidb/static/css/ippidb.css
+++ b/ippisite/ippidb/static/css/ippidb.css
@@ -607,6 +607,91 @@ form {
width : 80%;
}
+.readonly {
+ background-color: #E8E0E0;
+ color: #8D8889;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ padding: 5px;
+}
+
+
+div label input {
+ margin-right:100px;
+ display:none;
+}
+
+#id_IdForm-source{
+ list-style: none;
+}
+
+ul#id_IdForm-source li{
+ display:inline;
+}
+
+ul#id_IdForm-source li label{
+ text-align: center;
+ padding: 5px;
+ background-color: rgb(255, 255, 255);
+ color: rgb(45, 150, 250);
+ border: 1px solid rgb(45, 150, 250);
+ font-family: "Roboto";
+ font-weight: bold;
+ width: 33%;
+ margin: 5px;
+}
+
+body {
+ font-family:sans-serif;
+}
+
+#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;
+
+}
+
+#ck-button label input {
+ position:absolute;
+ top:-20px;
+}
+
+#ck-button input:hover + span {
+ background-color:#E3E9EB;
+ color:#2D96FA;
+ border:1px solid #2D96FA;
+}
+
+#ck-button input:checked + span {
+ background-color:#E8E0E0;
+ color:#8D8889;
+ border:1px solid #8D8889;
+}
+
+#ck-button input:checked:hover + span {
+ background-color:#E3E9EB;
+ color:#8D8889;
+ border:1px solid #8D8889;
+}
+
button, input, select, textarea {
line-height: inherit;
font-family: "BrandonGrotesqueReg";
diff --git a/ippisite/ippidb/static/images/Buttons/CytotoxButtOff.png b/ippisite/ippidb/static/images/Buttons/CytotoxButtOff.png
new file mode 100644
index 0000000000000000000000000000000000000000..20426f0212befb0bf780c23be4a1f409708d4aad
Binary files /dev/null and b/ippisite/ippidb/static/images/Buttons/CytotoxButtOff.png differ
diff --git a/ippisite/ippidb/static/images/Buttons/CytotoxButtOn.png b/ippisite/ippidb/static/images/Buttons/CytotoxButtOn.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8032587b61b488b718da89371b5cc050bff5d06
Binary files /dev/null and b/ippisite/ippidb/static/images/Buttons/CytotoxButtOn.png differ
diff --git a/ippisite/ippidb/static/images/Buttons/InSilicoButtOff.png b/ippisite/ippidb/static/images/Buttons/InSilicoButtOff.png
new file mode 100644
index 0000000000000000000000000000000000000000..835692e281e4c629320765f01324435c7bafe838
Binary files /dev/null and b/ippisite/ippidb/static/images/Buttons/InSilicoButtOff.png differ
diff --git a/ippisite/ippidb/static/images/Buttons/InSilicoButtOn.png b/ippisite/ippidb/static/images/Buttons/InSilicoButtOn.png
new file mode 100644
index 0000000000000000000000000000000000000000..3de25222340f2dba0c55c346f340fdc6198c0c96
Binary files /dev/null and b/ippisite/ippidb/static/images/Buttons/InSilicoButtOn.png differ
diff --git a/ippisite/ippidb/templates/BibliographyForm.html b/ippisite/ippidb/templates/BibliographyForm.html
index dd0877ef142133cf4b71ba942926c7a5c271b0e3..0186c9733693eefb12953ce87a4b4fdd807f1b21 100644
--- a/ippisite/ippidb/templates/BibliographyForm.html
+++ b/ippisite/ippidb/templates/BibliographyForm.html
@@ -31,7 +31,33 @@ Please check that the information below is correct (Title, Authors etc. ) and an
{{ form }}
{% endfor %}
{% else %}
- {{ wizard.form }}
+ <div id="ck-button">{{ wizard.form.source.label }} {{ wizard.form.source }}</div>
+ <div id="ck-button">{{ wizard.form.id_source.label }} {{ wizard.form.id_source }}</div>
+ <div id="ck-button">{{ wizard.form.title.label }} {{ wizard.form.title }}</div>
+ <div id="ck-button">{{ wizard.form.journal_name.label }} {{ wizard.form.journal_name }}</div>
+ <div id="ck-button">
+ <label>
+ <input type="checkbox" value="True"><span>{{ wizard.form.cytotox.label }}</span>
+ </label>
+ <label>
+ <input type="checkbox"><span>{{ wizard.form.in_silico.label }}</span>
+ </label>
+ <label>
+ <input type="checkbox"><span>{{ wizard.form.in_vitro.label }}</span>
+ </label>
+ <label>
+ <input type="checkbox"><span>{{ wizard.form.in_vivo.label }}</span>
+ </label>
+ <label>
+ <input type="checkbox"><span>{{ wizard.form.in_cellulo.label }}</span>
+ </label>
+ <label>
+ <input type="checkbox"><span>{{ wizard.form.pharmacokinetic.label }}</span>
+ </label>
+ <label>
+ <input type="checkbox"><span>{{ wizard.form.xray.label }}</span>
+ </label>
+</div>
{% endif %}
</table>
{% if wizard.steps.prev %}
diff --git a/ippisite/ippidb/templates/IdForm.html b/ippisite/ippidb/templates/IdForm.html
index 33019cd7a989a531fe0bcab2ce8a6f5d2cf02703..c5d4397413da0c5900b8c8de471a208fb6707b7e 100644
--- a/ippisite/ippidb/templates/IdForm.html
+++ b/ippisite/ippidb/templates/IdForm.html
@@ -14,6 +14,8 @@
</nav>
<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">
@@ -30,7 +32,7 @@
{{ form }}
{% endfor %}
{% else %}
- {{ wizard.form }}
+ {{ wizard.form}}
{% endif %}
</table>
<input type="submit" value="{% trans "Next step" %}"/>
diff --git a/ippisite/ippidb/urls.py b/ippisite/ippidb/urls.py
index 076c66c281f07fd0c6e750317fb37e51f6f31c6f..874372fb824bd114111ea664dc302580b959bf21 100644
--- a/ippisite/ippidb/urls.py
+++ b/ippisite/ippidb/urls.py
@@ -3,6 +3,7 @@ from . import views
from ippidb.forms import IdForm, BibliographyForm,PDBForm,ProteinDomainComplexTypeForm,ProteinDomainComplexForm,PpiForm
from ippidb.views import IppiWizard,FORMS
+
urlpatterns = [
url(r'^$', views.index, name='index'),
url(r'^about$', views.about, name='about'),
diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py
index e52129df79cc5d0c3a892a96e4596f74b7181a5b..e4b4b049d9cc5f99848b34f08a5fb5297cc71b7e 100644
--- a/ippisite/ippidb/views.py
+++ b/ippisite/ippidb/views.py
@@ -1,7 +1,7 @@
import ippidb
from django.shortcuts import render
from django.http import HttpResponseRedirect
-from formtools.wizard.views import SessionWizardView
+from formtools.wizard.views import SessionWizardView,NamedUrlSessionWizardView
from .forms import IdForm, BibliographyForm, PDBForm, ProteinForm, ProteinDomainComplexTypeForm, ProteinDomainComplexForm, PpiForm
def index(request):