diff --git a/ippisite/ippidb/forms.py b/ippisite/ippidb/forms.py
index 70e8abd9982acb4d51cf5862ffd7248537081b4e..43322b75d0db67d511f0779a555d408a051fa6f0 100644
--- a/ippisite/ippidb/forms.py
+++ b/ippisite/ippidb/forms.py
@@ -27,16 +27,17 @@ class PDBForm(forms.Form):
pdb_id = forms.CharField(label="PDB ID",max_length=4, widget=forms.TextInput(attrs={'placeholder': 'e.g 4HHB'}))
PDBFormSet = formset_factory(PDBForm)
-
+formset=PDBFormSet()
class ProteinForm(ModelForm):
class Meta:
model = Protein
exclude = ['recommended_name_long', 'short_name']
widgets = {
- 'uniprot_id' : forms.TextInput(attrs={'placeholder': 'e.g Q03164'}),
- 'gene_name' : forms.TextInput(attrs={'placeholder':'e.g KMT2A'}),
- 'entry_name' : forms.TextInput(attrs={'placeholder':'e.g KMT2A_HUMAN'}),
+ 'uniprot_id' : forms.TextInput(attrs={'readonly':'readonly','class':'readonly'}),
+ 'gene_name' : forms.TextInput(attrs={'readonly':'readonly','class':'readonly'}),
+ 'entry_name' : forms.TextInput(attrs={'readonly':'readonly','class':'readonly'}),
+ 'organism': forms.TextInput(attrs={'readonly':'readonly','class':'readonly'}),
}
ProteinFormSet = modelformset_factory(Protein, exclude=('recommended_name_long', 'short_name'), extra=0)
diff --git a/ippisite/ippidb/static/css/ippidb.css b/ippisite/ippidb/static/css/ippidb.css
index e8be82936ad08625336a4ec3ae67dc63f39f017b..022b5e443e27b5be5a8baa98ddc7d42b4f84eb2a 100644
--- a/ippisite/ippidb/static/css/ippidb.css
+++ b/ippisite/ippidb/static/css/ippidb.css
@@ -659,7 +659,6 @@ body {
background-color: #E8E0E0;
color: #8D8888;
text-align: center;
- border: 1px solid #8D8888;
}
#id_IdForm-source input {
@@ -702,7 +701,6 @@ body {
display:block;
background-color: #E8E0E0;
color: #8D8888;
- border: 1px solid #8D8888;
}
#ck-button label input {
@@ -756,7 +754,6 @@ body {
display: inline-block;
width: 180px;
text-align: center;
- border: 1px solid #8D8888;
background-color: #FFFFFF;
background-image: url('/static/images/PPITypes/Inhibited/Hetero2-merAB_Apo.png');
background-position: center;
@@ -800,7 +797,6 @@ body {
display: inline-block;
width: 180px;
text-align: center;
- border: 1px solid #8D8888;
background-color: #FFFFFF;
background-image: url('/static/images/PPITypes/Inhibited/Homo2-merA2_Apo.png');
background-position: center;
@@ -842,7 +838,6 @@ body {
display: inline-block;
width: 180px;
text-align: center;
- border: 1px solid #8D8888;
background-color: #FFFFFF;
background-image: url('/static/images/PPITypes/Inhibited/Customyourown_Apo.png');
background-position: center;
@@ -890,6 +885,343 @@ body {
flex-wrap: wrap;
}
+.imageBack_Stab_Hetero2-merAB input {
+ display:none;
+}
+
+.imageBack_Stab_Hetero2-merAB label span{
+ display: inline-block;
+ width: 180px;
+ text-align: center;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Hetero2-merAB_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ height: 180px;
+ font-size: 12px;
+
+}
+
+.imageBack_Stab_Hetero2-merAB input:hover+label span{
+ cursor: pointer;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Hetero2-merAB_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Hetero2-merAB input[type="radio"]:checked+label span{
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Hetero2-merAB_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo2-merA2 input {
+ display:none;
+}
+
+.imageBack_Stab_Homo2-merA2 label span{
+ display: inline-block;
+ width: 180px;
+ text-align: center;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo2-merA2_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ height: 180px;
+ font-size: 12px;
+
+}
+
+.imageBack_Stab_Homo2-merA2 input:hover+label span{
+ cursor: pointer;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo2-merA2_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo2-merA2 input[type="radio"]:checked+label span{
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo2-merA2_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo-Like2-merA2 input {
+ display:none;
+}
+
+.imageBack_Stab_Homo-Like2-merA2 label span{
+ display: inline-block;
+ width: 180px;
+ text-align: center;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo-Like2-merA2_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ height: 180px;
+ font-size: 12px;
+
+}
+
+.imageBack_Stab_Homo-Like2-merA2 input:hover+label span{
+ cursor: pointer;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo-Like2-merA2_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo-Like2-merA2 input[type="radio"]:checked+label span{
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo-Like2-merA2_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo3-merA3 input {
+ display:none;
+}
+
+.imageBack_Stab_Homo3-merA3 label span{
+ display: inline-block;
+ width: 180px;
+ text-align: center;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo3-merA3_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ height: 180px;
+ font-size: 12px;
+
+}
+
+.imageBack_Stab_Homo3-merA3 input:hover+label span{
+ cursor: pointer;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo3-merA3_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo3-merA3 input[type="radio"]:checked+label span{
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo3-merA3_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo3-merA3inhibitedA2-dimer input {
+ display:none;
+}
+
+.imageBack_Stab_Homo3-merA3inhibitedA2-dimer label span{
+ display: inline-block;
+ width: 180px;
+ text-align: center;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo3-merA3inhibitedA2-dimer_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ height: 180px;
+ font-size: 12px;
+
+}
+
+.imageBack_Stab_Homo3-merA3inhibitedA2-dimer input:hover+label span{
+ cursor: pointer;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo3-merA3inhibitedA2-dimer_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo3-merA3inhibitedA2-dimer input[type="radio"]:checked+label span{
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo3-merA3inhibitedA2-dimer_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo4-merA4 input {
+ display:none;
+}
+
+.imageBack_Stab_Homo4-merA4 label span{
+ display: inline-block;
+ width: 180px;
+ text-align: center;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo4-merA4_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ height: 180px;
+ font-size: 12px;
+
+}
+
+.imageBack_Stab_Homo4-merA4 input:hover+label span{
+ cursor: pointer;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo4-merA4_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Homo4-merA4 input[type="radio"]:checked+label span{
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Homo4-merA4_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Ring-Like3-merA3 input {
+ display:none;
+}
+
+.imageBack_Stab_Ring-Like3-merA3 label span{
+ display: inline-block;
+ width: 180px;
+ text-align: center;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Ring-Like3-merA3_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ height: 180px;
+ font-size: 12px;
+
+}
+
+.imageBack_Stab_Ring-Like3-merA3 input:hover+label span{
+ cursor: pointer;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Ring-Like3-merA3_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Ring-Like3-merA3 input[type="radio"]:checked+label span{
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Ring-Like3-merA3_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Ring-Like5-merA5 input {
+ display:none;
+}
+
+.imageBack_Stab_Ring-Like5-merA5 label span{
+ display: inline-block;
+ width: 180px;
+ text-align: center;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Ring-Like5-merA5_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ height: 180px;
+ font-size: 12px;
+
+}
+
+.imageBack_Stab_Ring-Like5-merA5 input:hover+label span{
+ cursor: pointer;
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Ring-Like5-merA5_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+.imageBack_Stab_Ring-Like5-merA5 input[type="radio"]:checked+label span{
+ background-color: #FFFFFF;
+ background-image: url('/static/images/PPITypes/Stabilized/Ring-Like5-merA5_Holo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+ color: #000000;
+ border-bottom: 1px solid #2D96FA;
+ border-top: 1px solid #E3E9EB;
+ border-left: 1px solid #E3E9EB;
+ border-right: 1px solid #E3E9EB;
+}
+
+
.imageBack_Stab_Customyourown input {
display:none;
}
@@ -898,7 +1230,6 @@ body {
display: inline-block;
width: 180px;
text-align: center;
- border: 1px solid #8D8888;
background-color: #FFFFFF;
background-image: url('/static/images/PPITypes/Stabilized/Customyourown_Apo.png');
background-position: center;
@@ -934,9 +1265,49 @@ body {
}
+/* Proteins form */
+
+.proteins_form {
+ width: 100%;
+}
+
+.inline_prot {
+ display: inline-flex;
+ width: 100%;
+}
+
+.inline_label {
+ font-weight: 700;
+ padding-right: 5px;
+}
+
+.inline_field {
+ padding-right: 5px;
+}
+.inline_field input {
+ width: 130px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ padding-right: 5px;
+}
+.inline_field select {
+ width: 150px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ padding-right: 5px;
+}
+.inline_field_multiple select {
+ width: 210px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ padding-right: 5px;
+}
button, input, select, textarea {
line-height: inherit;
@@ -1170,3 +1541,5 @@ line-height: 21px;
width: 19px;
height: 16px;
}
+
+
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2-merAB_Apo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2-merAB_Apo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e8454bb488976a8f8093b7b233eb245fa40736e
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2-merAB_Apo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2-merAB_Holo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2-merAB_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d24922087ba4e714eaa96656c1695af9d35e9c97
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2-merAB_Holo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo-Like2-merA2_Apo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo-Like2-merA2_Apo.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c95fbb5c993e3d78956f9760b90a6ffc5ada633
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo-Like2-merA2_Apo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo-Like2-merA2_Holo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo-Like2-merA2_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..eaa01b41c1401a229036aac2f239922e452a60f5
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo-Like2-merA2_Holo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2-merA2_Apo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2-merA2_Apo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0b992316412241a28696b75fb31e8f514cbd2d6
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2-merA2_Apo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2-merA2_Holo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2-merA2_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..919817912121536f241c89a1190d6be7cc6b36ab
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2-merA2_Holo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3_Apo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3_Apo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b957ce83fe617338433c17f070bd2800729ffb3e
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3_Apo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3_Holo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..710b9d4c3b4fed30914a2e5a4e27057d366358c2
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3_Holo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3inhibitedA2-dimer_Apo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3inhibitedA2-dimer_Apo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6713ab6587fb0cf8cb064ca81da2e23401d8c96
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3inhibitedA2-dimer_Apo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3inhibitedA2-dimer_Holo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3inhibitedA2-dimer_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..896b9af2ac0832ae0f4bf10ac3a24bb9e457065b
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3-merA3inhibitedA2-dimer_Holo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4-merA4_Apo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4-merA4_Apo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3f702b9b8f43fab3c7708cb11962da2ff6b7b51
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4-merA4_Apo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4-merA4_Holo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4-merA4_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d8abdbf6cbb7e7421d2a400a65d3653c07c98f6
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4-merA4_Holo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like3-merA3_Apo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like3-merA3_Apo.png
new file mode 100644
index 0000000000000000000000000000000000000000..295811d10b67733590499f8b6b4262af85885c15
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like3-merA3_Apo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like3-merA3_Holo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like3-merA3_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..09b2f10afbc8dbddcc037936f97313f59575772f
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like3-merA3_Holo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like5-merA5_Apo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like5-merA5_Apo.png
new file mode 100644
index 0000000000000000000000000000000000000000..785840de1de4592ea995f8ebdcbc078d62f606af
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like5-merA5_Apo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like5-merA5_Holo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like5-merA5_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..af15684b19504a7a3bc57aab2964da43d477983b
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Ring-Like5-merA5_Holo.png differ
diff --git a/ippisite/ippidb/static/js/ippidb.js b/ippisite/ippidb/static/js/ippidb.js
index dbb17171e64716ca2d63cba80e19c7d6a26a114a..4072273c28279a7e8873719dfe1d26a51d2cabf7 100644
--- a/ippisite/ippidb/static/js/ippidb.js
+++ b/ippisite/ippidb/static/js/ippidb.js
@@ -31,4 +31,6 @@ $(document).ready(function(){
$("#stabilized").show();
}
});
-});
\ No newline at end of file
+});
+
+
diff --git a/ippisite/ippidb/templates/PDBForm.html b/ippisite/ippidb/templates/PDBForm.html
index d4dd716e562f2074f160f14456bb4601f258b325..a146e696219ff5fb2bfa91a7d563d332eabe98df 100644
--- a/ippisite/ippidb/templates/PDBForm.html
+++ b/ippisite/ippidb/templates/PDBForm.html
@@ -30,14 +30,6 @@
{% for form in wizard.form.forms %}
{{ form }}
{% endfor %}
- {% else %}
- {{ wizard.form.management_form }}
- {{ formset.management_form }}
- {% for form in formset %}
- {% for field in form %}
- {{ field.label_tag }} {{ field }}
- {% endfor %}
- {% endfor %}
{% endif %}
</table>
<input type="submit" value="{% trans "Next step" %}"/>
diff --git a/ippisite/ippidb/templates/ProteinDomainComplexForm.html b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
index 49d2af5963e5eff665f01788a7b085cd3661263e..4c00a21d633c22fcc29a8757645ef99838316c16 100644
--- a/ippisite/ippidb/templates/ProteinDomainComplexForm.html
+++ b/ippisite/ippidb/templates/ProteinDomainComplexForm.html
@@ -20,7 +20,6 @@ If your PPI complex is not among them, please select « Create you Own »</p>
</div>
<form action="" method="post">
{% csrf_token %}
- <table>
{{ wizard.management_form }}
{{ wizard.form.errors}}
{{ wizard.form.non_field_errors}}
@@ -29,14 +28,14 @@ If your PPI complex is not among them, please select « Create you Own »</p>
{% if wizard.form.forms %}
{{ wizard.form.management_form }}
{% for form in wizard.form.forms %}
- {{ form }}
+ <div class="inline_prot">
+ <div class="inline_field"> {{ form.protein }}</div>
+ <div class="inline_field"> {{ form.domain }}</div>
+ <div class="inline_field"> {{ form.ppc_copy_nb }}</div>
+ </div>
{% endfor %}
{% else %}
{{ wizard.form }}
- {% endif %}
- </table>
- {% if wizard.steps.prev %}
-
{% endif %}
<input type="submit" value="{% trans "Next step" %}"/>
</form>
diff --git a/ippisite/ippidb/templates/ProteinForm.html b/ippisite/ippidb/templates/ProteinForm.html
index 1664265c92b630dada2485edae66585381f96975..9eb42be3b1712f02f96a58050c4ef4dabc29b7de 100644
--- a/ippisite/ippidb/templates/ProteinForm.html
+++ b/ippisite/ippidb/templates/ProteinForm.html
@@ -16,28 +16,35 @@
<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>
</div>
- <form action="" method="post">
+ <form class="proteins_form" action="" method="post">
{% csrf_token %}
- <table>
{{ wizard.management_form }}
{{ wizard.form.errors}}
{{ wizard.form.non_field_errors}}
{% block custom_form %}{% endblock %}
{% if wizard.form.forms %}
- {{ formset.management_form }}
- {% for form in wizard.form.forms %}
- {{ form }}
- {% endfor %}
- {% else %}
- {{ formset.management_form }}
- {% for form in formset %}
- {% for field in form %}
- {{ field.label_tag }} {{ field }}
- {% endfor %}
- {% endfor %}
+ {{ wizard.form.management_form }}
+ {{ formset.management_form }}
+ {% for form in wizard.form.forms %}
+ <div class="inline_prot">
+ <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>
+ {% endfor %}
+ {% else %}
+ <div class="readonlyfields">
+ {{ wizard.form.uniprot_id }}<br/>
+ {{ wizard.form.gene_name }}<br/>
+ {{ wizard.form.entry_name}}<br/>
+ {{ wizard.form.organism }}<br/>
+ {{ wizard.form.molecular_functions }}<br/>
+ </div>
{% endif %}
- </table>
<input type="submit" value="{% trans "Next step" %}"/>
</form>
</div>