diff --git a/ippisite/ippidb/static/css/ippidb.css b/ippisite/ippidb/static/css/ippidb.css
index a82486f9607478936643877451311826210ca9bb..204111feece247249d8f5a77fc6e485d23b7d711 100644
--- a/ippisite/ippidb/static/css/ippidb.css
+++ b/ippisite/ippidb/static/css/ippidb.css
@@ -643,7 +643,6 @@ body {
display:inline-block;
}
-
/* BUTTONS */
/* IdForm*/
@@ -745,6 +744,9 @@ body {
overflow: hidden;
width: 600px;
padding-bottom: 5px;
+ background-image: url('/static/images/PPITypes/Inhibited/{{radio.choice_label|cut:" "}}_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
}
#id_ProteinDomainComplexTypeForm-inhibited label span{
@@ -754,6 +756,7 @@ body {
border: 1px solid #8D8888;
height: 180px;
font-size: 12px;
+
}
#id_ProteinDomainComplexTypeForm-inhibited input {
@@ -779,8 +782,24 @@ body {
border-right: 1px solid #E3E9EB;
}
+.image-inhibited label span{
+ background-image: url('/static/images/PPITypes/Inhibited/{{radio.choice_label|cut:" "}}_Apo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+}
+
+.image-inhibited label span:hover {
+ background-image: url('/static/images/PPITypes/Inhibited/{{radio.choice_label|cut:" "}}_Halo.png');
+ background-position: center;
+ background-repeat: no-repeat;
+}
+
/* Stabilized */
+#stabilized{
+ display:none;
+}
+
#id_ProteinDomainComplexTypeForm-stabilized {
overflow: hidden;
width: 600px;
diff --git a/ippisite/ippidb/static/images/Other/Plus.png b/ippisite/ippidb/static/images/PPITypes/Inhibited/Customyourown_Apo.png
similarity index 100%
rename from ippisite/ippidb/static/images/Other/Plus.png
rename to ippisite/ippidb/static/images/PPITypes/Inhibited/Customyourown_Apo.png
diff --git a/ippisite/ippidb/static/images/PPITypes/Inhibited/Customyourown_Holo.png b/ippisite/ippidb/static/images/PPITypes/Inhibited/Customyourown_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3726d3e314ccb7c3e948171be5bd96293090c455
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Inhibited/Customyourown_Holo.png differ
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Inhibited/Hetero2merAB_Apo.png b/ippisite/ippidb/static/images/PPITypes/Inhibited/Hetero2-merAB_Apo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Inhibited/Hetero2merAB_Apo.png
rename to ippisite/ippidb/static/images/PPITypes/Inhibited/Hetero2-merAB_Apo.png
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Inhibited/Hetero2merAB_Holo.png b/ippisite/ippidb/static/images/PPITypes/Inhibited/Hetero2-merAB_Holo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Inhibited/Hetero2merAB_Holo.png
rename to ippisite/ippidb/static/images/PPITypes/Inhibited/Hetero2-merAB_Holo.png
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Inhibited/Homo2merApo.png b/ippisite/ippidb/static/images/PPITypes/Inhibited/Homo2-merA2_Apo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Inhibited/Homo2merApo.png
rename to ippisite/ippidb/static/images/PPITypes/Inhibited/Homo2-merA2_Apo.png
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Inhibited/Homo2merHolo.png b/ippisite/ippidb/static/images/PPITypes/Inhibited/Homo2-merA2_Holo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Inhibited/Homo2merHolo.png
rename to ippisite/ippidb/static/images/PPITypes/Inhibited/Homo2-merA2_Holo.png
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Customyourown_Apo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Customyourown_Apo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3726d3e314ccb7c3e948171be5bd96293090c455
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Customyourown_Apo.png differ
diff --git a/ippisite/ippidb/static/images/PPITypes/Stabilized/Customyourown_Holo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Customyourown_Holo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3726d3e314ccb7c3e948171be5bd96293090c455
Binary files /dev/null and b/ippisite/ippidb/static/images/PPITypes/Stabilized/Customyourown_Holo.png differ
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Stabilized/Hetero2merApo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2merApo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Stabilized/Hetero2merApo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2merApo.png
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Stabilized/Hetero2merHolo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2merHolo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Stabilized/Hetero2merHolo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Hetero2merHolo.png
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Stabilized/Homo2merApo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2merApo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Stabilized/Homo2merApo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2merApo.png
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Stabilized/Homo2merHolo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2merHolo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Stabilized/Homo2merHolo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Homo2merHolo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo3merApo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3merApo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo3merApo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3merApo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo3merHolo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3merHolo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo3merHolo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3merHolo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo3merInhibitedApo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3merInhibitedApo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo3merInhibitedApo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3merInhibitedApo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo3merInhibitedHolo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3merInhibitedHolo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo3merInhibitedHolo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Homo3merInhibitedHolo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo4merApo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4merApo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo4merApo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4merApo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo4merHolo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4merHolo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/Homo4merHolo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/Homo4merHolo.png
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Stabilized/HomoLike2merApo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/HomoLike2merApo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Stabilized/HomoLike2merApo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/HomoLike2merApo.png
diff --git a/ippisite/ippidb/static/images/DimericsPPI/Stabilized/HomoLike2merHolo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/HomoLike2merHolo.png
similarity index 100%
rename from ippisite/ippidb/static/images/DimericsPPI/Stabilized/HomoLike2merHolo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/HomoLike2merHolo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/RingLikeHomo3merApo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/RingLikeHomo3merApo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/RingLikeHomo3merApo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/RingLikeHomo3merApo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/RingLikeHomo3merHolo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/RingLikeHomo3merHolo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/RingLikeHomo3merHolo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/RingLikeHomo3merHolo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/RingLikeHomo5merApo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/RingLikeHomo5merApo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/RingLikeHomo5merApo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/RingLikeHomo5merApo.png
diff --git a/ippisite/ippidb/static/images/MultimericPPI/Stabilized/RingLikeHomo5merHolo.png b/ippisite/ippidb/static/images/PPITypes/Stabilized/RingLikeHomo5merHolo.png
similarity index 100%
rename from ippisite/ippidb/static/images/MultimericPPI/Stabilized/RingLikeHomo5merHolo.png
rename to ippisite/ippidb/static/images/PPITypes/Stabilized/RingLikeHomo5merHolo.png
diff --git a/ippisite/ippidb/static/js/ippidb.js b/ippisite/ippidb/static/js/ippidb.js
index f6a8779010fc06333c20d9ee30434810d5c84314..084b2751c1eca9b78161ae9c5dc3e88cd637f6c5 100644
--- a/ippisite/ippidb/static/js/ippidb.js
+++ b/ippisite/ippidb/static/js/ippidb.js
@@ -15,4 +15,20 @@ $(document).ready(function() {
$(wrapper).on("click",".remove_field", function(e){ //user click on remove text
e.preventDefault(); $(this).parent('div').remove(); x--;
})
+});
+
+
+$(document).ready(function(){
+ $('#id_ProteinDomainComplexTypeForm-archi').on('change', function() {
+ if ( this.value === "stabilized")
+ {
+ $("#stabilized").show();
+ $("#inhibited").hide();
+ }
+ else
+ {
+ $("#stabilized").hide();
+ $("#inhibited").show();
+ }
+ });
});
\ No newline at end of file
diff --git a/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html b/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
index 4833ceeb21a3ac0387e664ee5ec1fcf24c20b708..6b3c93c930847681d112dd7c495cfef807c580c2 100644
--- a/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
+++ b/ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html
@@ -30,36 +30,27 @@ If your PPI complex is not among them, please select « Create you Own »</p>
{% for form in wizard.form.forms %}
{% endfor %}
{% else %}
- <div id='archi' name='archi'>{{ wizard.form.archi }}</div>
+ {{ wizard.form.archi }}
<div id='inhibited' name='inhibited' class="type_style">
- <div class="type_title"><h1>Inhibited</h1></div>
- <div id="id_ProteinDomainComplexTypeForm-inhibited">
- {{ wizard.form.inhibited.0.tag }}
- <label for="{{ wizard.form.inhibited.0.id_for_label }}">
- <span>{{ wizard.form.inhibited.0.choice_label}}</span>
- </label>
- </div>
- <div id="id_ProteinDomainComplexTypeForm-inhibited">
- {{ wizard.form.inhibited.1.tag }}
- <label for="{{ wizard.form.inhibited.1.id_for_label }}">
- <span>{{ wizard.form.inhibited.1.choice_label}}</span>
- </label>
- </div>
- <div id="id_ProteinDomainComplexTypeForm-inhibited">
- {{ wizard.form.inhibited.2.tag }}
- <label for="{{ wizard.form.inhibited.2.id_for_label }}">
- <span>{{ wizard.form.inhibited.2.choice_label}}</span>
- </label>
- </div>
-
+ <div class="type_title">
+ <h1>Inhibited</h1>
+ </div>
+ <div id="id_ProteinDomainComplexTypeForm-inhibited" class="image-inhibited">
+ {% for radio in wizard.form.inhibited %}
+ {{ radio.tag }}
+ <label for="{{ radio.id_for_label }}">
+ <span>{{ radio.choice_label}}</span>
+ </label>
+ {% endfor %}
+ </div>
</div>
- <div id='stabilized' name= 'stabilized' class="type_style">
+ <div id="stabilized" class="type_style">
<div class="type_title"><h1>Stabilized</h1></div>
<div id="id_ProteinDomainComplexTypeForm-stabilized">
{% for radio in wizard.form.stabilized %}
{{ radio.tag }}
- <label style="background-image: url('/static/images/DimericsPPI/Stabilized/{{radio.choice_value}}.png');" for="{{ radio.id_for_label }}">
- <span>{{ radio.choice_label }}</span>
+ <label style="background-image: url('/static/images/DimericsPPI/Stabilized/{{radio.choice_label|cut:" "}}.png');" for="{{ radio.id_for_label }}">
+ <span>{{ radio.choice_label}}</span>
</label>
{% endfor %}
</div>
diff --git a/ippisite/ippidb/templates/admin-session.html b/ippisite/ippidb/templates/admin-session.html
index 3b5136cc10cb5664c50228cde8558b25bf37bca9..74c5f3ade4f1a60b00c5a7c4d473fcae1f646158 100644
--- a/ippisite/ippidb/templates/admin-session.html
+++ b/ippisite/ippidb/templates/admin-session.html
@@ -12,7 +12,7 @@
<a hfref="/admin-session/view">View Content</a>
</li>
<li>
- <a href="/admin-session/add">Add New Content</a>
+ <a href="/admin-session/add/IdForm">Add New Content</a>
</li>
<li>
<a hfref="/admin-session/update">Update Content</a>