diff --git a/ippisite/ippidb/forms.py b/ippisite/ippidb/forms.py
index 93b71be5b07b45b90350a30f43dc95e58fb1818f..ce7511d45cf395682e8795a6493d0f264fe0ab98 100644
--- a/ippisite/ippidb/forms.py
+++ b/ippisite/ippidb/forms.py
@@ -23,13 +23,8 @@ class BibliographyForm(ModelForm):
class Meta:
model = Bibliography
- exclude = ['authors_list', 'biblio_year']
- widgets = {
- 'source': forms.TextInput(attrs={'readonly': 'readonly', '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'}),
- }
+ fields = ['cytotox', 'in_silico', 'in_vitro', 'in_vivo', 'in_cellulo', 'pharmacokinetic', 'xray']
+
def validate_pdb_exists(value):
diff --git a/ippisite/ippidb/static/css/ippidb.css b/ippisite/ippidb/static/css/ippidb.css
index ef3272edf90cd996331cfb3c1a4002bde288f496..ce86281464e43917335058239b00168139a375aa 100644
--- a/ippisite/ippidb/static/css/ippidb.css
+++ b/ippisite/ippidb/static/css/ippidb.css
@@ -803,6 +803,10 @@ body {
/* BibliographyForm*/
+.publi_info{
+ padding: 10px;
+}
+
#ck-button {
margin: 4px;
float:left;
@@ -818,6 +822,7 @@ body {
display:block;
background-color: #E8E0E0;
color: #8D8888;
+ border-bottom: 2px solid #fff;
}
#ck-button label input {
@@ -836,7 +841,8 @@ body {
}
#ck-button input:checked + span {
- background-color: #FFFFFF;
+ background: white url("http://localhost:8000/static/images/Buttons/CheckButton.png") no-repeat right;
+ background-size: contain;
color: #000000;
border-bottom: 1px solid #2D96FA;
border-top: 1px solid #E3E9EB;
@@ -1387,7 +1393,6 @@ body {
.inline_prot {
display: inline-flex;
- width: 100%;
}
.inline_label {
@@ -1400,7 +1405,7 @@ body {
}
.inline_field input {
- width: 130px;
+ width: 100%;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
@@ -1423,6 +1428,12 @@ body {
padding-right: 5px;
}
+.inline_box_complex {
+ margin: 5px;
+ padding: 10px;
+ display: inline-flex;
+}
+
button, input, select, textarea {
line-height: inherit;
font-family: "BrandonGrotesqueReg";
diff --git a/ippisite/ippidb/static/images/Buttons/CheckButton.png b/ippisite/ippidb/static/images/Buttons/CheckButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3eb5574e0d7fd42fda17a161ed78b55bf79ad69
Binary files /dev/null and b/ippisite/ippidb/static/images/Buttons/CheckButton.png differ
diff --git a/ippisite/ippidb/templates/BibliographyForm.html b/ippisite/ippidb/templates/BibliographyForm.html
index f7f005e54d7099ebf4c2c7796f67055fab59fd4d..6b7274119930938a2e487756141cc3ad7536737e 100644
--- a/ippisite/ippidb/templates/BibliographyForm.html
+++ b/ippisite/ippidb/templates/BibliographyForm.html
@@ -17,6 +17,13 @@
<p>Based on the ID you have provided, we have identified the following information concerning your bibliographic source.
Please check that the information below is correct (Title, Authors etc. ) and answer the few questions about the content of your bibliographic source.</p>
</div>
+ <div class="publi_info">
+ <!--{% for info in infos_publi %}
+ {% if info.id_source == "8703835" %}
+ <span>{{ info.title }}</span>
+ {% endif %}
+ {% endfor %}-->
+ </div>
<form action="" method="post">
{% csrf_token %}
<table>
@@ -31,12 +38,6 @@
{{ form }}
{% endfor %}
{% else %}
- <div class="readonlyfields">
- {{ wizard.form.source }}<br/>
- {{ wizard.form.id_source }}<br/>
- {{ wizard.form.title }}<br/>
- {{ wizard.form.journal_name }}<br/>
- </div>
<p> This publication contains :<br/></p>
<div id="ck-button">
<label>
diff --git a/ippisite/ippidb/templates/PpiForm.html b/ippisite/ippidb/templates/PpiForm.html
index ad7ec0c70ada202373716fa77a55e517a9a4bdbc..bf191d54738a2d7662ea07f749f489b374f28b58 100644
--- a/ippisite/ippidb/templates/PpiForm.html
+++ b/ippisite/ippidb/templates/PpiForm.html
@@ -33,10 +33,6 @@
{{ wizard.form }}
{% endif %}
</table>
- {% if wizard.steps.prev %}
- <button name="wizard_goto_step" type="submit" value="{{ wizard.steps.first }}">{% trans "first step" %}</button>
- <button name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}">{% trans "previous step" %}</button>
- {% endif %}
<input type="submit" value="{% trans "submit" %}"/>
</form>
</div>
diff --git a/ippisite/ippidb/templates/ProteinDomainComplexForm.html b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
index 07b1ea3d951966eee038fe006f48b5ce043a30c8..cb05b79415ca22d18aedd142acd29c02d701cb5d 100644
--- a/ippisite/ippidb/templates/ProteinDomainComplexForm.html
+++ b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
@@ -27,77 +27,46 @@
{{ form }}
{% endfor %}
{% else %}
-
-
- {{ complex_type }} - {{ complex_choice }}
- {% if complex_type == "Hetero2merAB" %}
- <div class="step_desc">
- <p>You have selected a <span style="color:#2d96fa;">Hetero 2-mer AB</span> that is <span style="color:#2d96fa;">inhibited</span> by the binding of PPI modulator.<br/>
- According to this architecture you need to specify:<br/>
- <span style="color:#2d96fa;">1</span> bound complex containing <span style="color:#2d96fa;">1</span> protein<br/>
- <span style="color:#2d96fa;">1</span> partner complex containing <span style="color:#2d96fa;">1</span> protein<br/></p>
- </div>
- <div class="">
- <div class=""> {{ form.protein }}</div>
- <div class=""> {{ form.domain }}</div>
- <div class=""> {{ form.ppc_copy_nb }}</div>
- </div>
- <div class="">
- <div class=""> {{ form.protein }}</div>
- <div class=""> {{ form.domain }}</div>
- <div class=""> {{ form.ppc_copy_nb }}</div>
- </div>
- {% elif complex_type == "Homo2merA2" %}
- <div class="step_desc">
- <p>You have selected a <span style="color:#2d96fa;">Homo 2-mer A2</span> that is <span style="color:#2d96fa;">inhibited</span> by the binding of PPI modulator.<br/>
- According to this architecture you need to specify:<br/>
- <span style="color:#2d96fa;">1</span> bound complex containing <span style="color:#2d96fa;">1</span> protein<br/>
- <span style="color:#2d96fa;">0</span> partner complex containing <span style="color:#2d96fa;">0</span> protein<br/></p>
- </div>
- <div class="">
- <div class=""> {{ form.protein }}</div>
- <div class=""> {{ form.domain }}</div>
- <div class=""> {{ form.ppc_copy_nb }}</div>
- </div>
- {% elif complex_type == "Custom" %}
- <div class="step_desc">
- <p>You have selected a <span style="color:#2d96fa;">Custom</span> that is <span style="color:#2d96fa;">...</span> by the binding of PPI modulator.<br/>
- According to this architecture you need to specify:<br/>
- <span style="color:#2d96fa;">...</span> bound complex containing <span style="color:#2d96fa;">...</span> protein<br/>
- <span style="color:#2d96fa;">...</span> partner complex containing <span style="color:#2d96fa;">...</span> protein<br/></p>
- </div>
- <div class="">
- <div class=""> {{ form.protein }}</div>
- <div class=""> {{ form.domain }}</div>
- <div class=""> {{ form.ppc_copy_nb }}</div>
- </div>
- {% elif complex_type == "Hetero2merAB" %}
- <div class="step_desc">
- <p>You have selected a <span style="color:#2d96fa;">Homo 2-mer A2</span> that is <span style="color:#2d96fa;">inhibited</span> by the binding of PPI modulator.<br/>
- According to this architecture you need to specify:<br/>
- <span style="color:#2d96fa;">1</span> bound complex containing <span style="color:#2d96fa;">1</span> protein<br/>
- <span style="color:#2d96fa;">0</span> partner complex containing <span style="color:#2d96fa;">0</span> protein<br/></p>
- </div>
- <div class="">
- <div class=""> {{ form.protein }}</div>
- <div class=""> {{ form.domain }}</div>
- <div class=""> {{ form.ppc_copy_nb }}</div>
- </div>
- {% elif complex_type == "Homo2merA2" %}
- <div class="step_desc">
- <p>You have selected a <span style="color:#2d96fa;">Homo 2-mer A2</span> that is <span style="color:#2d96fa;">inhibited</span> by the binding of PPI modulator.<br/>
- According to this architecture you need to specify:<br/>
- <span style="color:#2d96fa;">1</span> bound complex containing <span style="color:#2d96fa;">1</span> protein<br/>
- <span style="color:#2d96fa;">0</span> partner complex containing <span style="color:#2d96fa;">0</span> protein<br/></p>
- </div>
- <div class="">
- <div class=""> {{ form.protein }}</div>
- <div class=""> {{ form.domain }}</div>
- <div class=""> {{ form.ppc_copy_nb }}</div>
- </div>
- {% else %}
- {% endif %}
+ <div class="step_desc">
+ <p>You have selected a <span style="color:#2d96fa;">{{ complex_type }}</span> that is <span style="color:#2d96fa;">{{ complex_choice }}</span> by the binding of PPI modulator.<br/>
+ According to this architecture you need to specify:<br/>
+ The bound complex containing a protein<br/>
+ </p>
+ </div>
+ <div class="inline_box_complex">
+ <div class="inline_label"> Bound complex : </div>
+ <div class="inline_field"> {{ form.protein }}</div>
+ <div class="inline_field"> {{ form.domain }}</div>
+ {% if complex_type == "Hetero2merAB" %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% elif complex_type == "Homo2merA2" %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% elif complex_type == "Hetero2merAB" %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% elif complex_type == "HomoLike2mer" %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% elif complex_type == "Homo3merA3" %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% elif complex_type == "Homo3merA2" %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% elif complex_type == "Homo4merA4" %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% elif complex_type == "RingHomo3mer" %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% elif complex_type == "RingHomo5mer" %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% else %}
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ </div>
+ <div class="inline_box_complex">
+ <div class="inline_label"> Partner complex : </div>
+ <div class="inline_field"> {{ form.protein }}</div>
+ <div class="inline_field"> {{ form.domain }}</div>
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ {% endif %}
+ </div>
{% endif %}
+
<input type="submit" value="{% trans "Next step" %}"/>
</form>
</div>
diff --git a/ippisite/ippidb/templates/ProteinForm.html b/ippisite/ippidb/templates/ProteinForm.html
index 20d7c0d5e408cf531c86c24cc5677a660823c6d2..47b713fc0c806bcd0d31c71fda4111a7e6cfbea2 100644
--- a/ippisite/ippidb/templates/ProteinForm.html
+++ b/ippisite/ippidb/templates/ProteinForm.html
@@ -26,15 +26,14 @@
{{ wizard.form.management_form }}
{{ formset.management_form }}
{% for form in wizard.form.forms %}
- <div class="inline_prot">
- {{form.id}}
- <div class="inline_label">Protein :</div>
- <div class="inline_field"> {{ form.uniprot_id }}</div>
- <div class="inline_field">{{ form.gene_name }}</div>
- <div class="inline_field">{{ form.entry_name }}</div>
- <div class="inline_field">{{ form.organism }}</div>
- <div class="inline_field_multiple">{{ form.molecular_functions }}</div>
- </div>
+ <div class="inline_prot">
+ <!--{{form.id}}-->
+ <div class="inline_label">Protein</div>
+ <div class="inline_field"> {{ form.uniprot_id }}</div>
+ <div class="inline_field">{{ form.gene_name }}</div>
+ <div class="inline_field">{{ form.entry_name }}</div>
+ <div class="inline_field">{{ form.organism }}</div>
+ </div>
{% endfor %}
{% else %}
<div class="readonlyfields">