Merge branch 'master' of https://gitlab.pasteur.fr/odoppelt/iPPIDB

Former-commit-id: 595c34d793a74da28160ed35c4c88525ca577158

ippisite/ippidb/forms.py

@@ -68,7 +68,8 @@ class ProteinDomainComplexTypeForm(forms.Form):
     archi = forms.CharField(
     	label="PPI Architecture Type",
         widget=forms.Select(
-        choices=ARCHI_TYPE)
+        choices=ARCHI_TYPE,
+        )
     )
     inhibited = forms.ChoiceField(
         widget=forms.RadioSelect,

ippisite/ippidb/static/css/ippidb.css

@@ -783,13 +783,11 @@ body {
 }
 
 .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;
 }

ippisite/ippidb/static/js/ippidb.js

@@ -20,15 +20,15 @@ $(document).ready(function() {
 
 $(document).ready(function(){
     $('#id_ProteinDomainComplexTypeForm-archi').on('change', function() {
-      if ( this.value === "stabilized")
+      if ( this.value === "inhibited")
       {
-        $("#stabilized").show();
-        $("#inhibited").hide();
+        $("#inhibited").show();
+        $("#stabilized").hide();
       }
       else
       {
-        $("#stabilized").hide();
-        $("#inhibited").show();
+        $("#inhibited").hide();
+        $("#stabilized").show();
       }
     });
 });
\ No newline at end of file

ippisite/ippidb/templates/BibliographyForm.html

@@ -24,7 +24,7 @@ Please check that the information below is correct (Title, Authors etc. ) and an
 			{{ wizard.form.errors}}
 	    	{{ wizard.form.non_field_errors}}
 	    	{% block custom_form %}{% endblock %}
-	</form>
+
 	    	{% if wizard.form.forms %}
 				{{ wizard.form.management_form }}
 				{% for form in wizard.form.forms %}
@@ -63,9 +63,7 @@ Please check that the information below is correct (Title, Authors etc. ) and an
 			</div>
 			{% endif %}
 		</table>
-{% if wizard.steps.prev %}
-	
-{% endif %}
 		<input type="submit" value="{% trans "Next step" %}"/>
+	</form>
 </div>
 {% endblock %}
\ No newline at end of file

ippisite/ippidb/templates/IdForm.html

@@ -23,7 +23,7 @@
 		{{ wizard.form.errors}}
     	{{ wizard.form.non_field_errors}}
     	{% block custom_form %}{% endblock %}
-	</form>
+	
 		{% if wizard.form.forms %}
 			{{ wizard.form.management_form }}
 			{% for form in wizard.form.forms %}
@@ -42,5 +42,6 @@
 		{% endif %}
 		</table>
 		<input type="submit" value="{% trans "Next step" %}"/>
+	</form>
 </div>
 {% endblock %}
\ No newline at end of file

ippisite/ippidb/templates/PDBForm.html

@@ -23,7 +23,7 @@
 		{{ wizard.form.errors}}
     	{{ wizard.form.non_field_errors}}
     	{% block custom_form %}{% endblock %}
-	</form>
+	
 		{% if wizard.form.forms %}
 			{{ wizard.form.management_form }}
 			{% for form in wizard.form.forms %}
@@ -37,5 +37,6 @@
 		{% endif %}
 		</table>
 		<input type="submit" value="{% trans "Next step" %}"/>
+	</form>
 </div>
 {% endblock %}
\ No newline at end of file

ippisite/ippidb/templates/PpiForm.html

@@ -23,7 +23,7 @@
 		{{ wizard.form.errors}}
     	{{ wizard.form.non_field_errors}}
     	{% block custom_form %}{% endblock %}
-	</form>
+	
 		{% if wizard.form.forms %}
 			{{ wizard.form.management_form }}
 			{% for form in wizard.form.forms %}
@@ -38,5 +38,6 @@
 			<button name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}">{% trans "previous step" %}</button>
 		{% endif %}
 			<input type="submit" value="{% trans "submit" %}"/>
+	</form>
 </div>
 {% endblock %}
\ No newline at end of file

ippisite/ippidb/templates/ProteinDomainComplexForm.html

@@ -25,7 +25,7 @@ If your PPI complex is not among them, please select « Create you Own »</p>
 		{{ wizard.form.errors}}
     	{{ wizard.form.non_field_errors}}
     	{% block custom_form %}{% endblock %}
-	</form>
+	
 		{% if wizard.form.forms %}
 			{{ wizard.form.management_form }}
 			{% for form in wizard.form.forms %}
@@ -39,5 +39,6 @@ If your PPI complex is not among them, please select « Create you Own »</p>
 
 		{% endif %}
 			<input type="submit" value="{% trans "Next step" %}"/>
+	</form>
 </div>
 {% endblock %}
\ No newline at end of file

ippisite/ippidb/templates/ProteinDomainComplexTypeForm.html

@@ -24,7 +24,7 @@ If your PPI complex is not among them, please select « Create you Own »</p>
 		{{ wizard.form.errors}}
     	{{ wizard.form.non_field_errors}}
     	{% block custom_form %}{% endblock %}
-	</form>
+	
 		{% if wizard.form.forms %}
 			{{ wizard.form.management_form }}
 			{% for form in wizard.form.forms %}
@@ -38,7 +38,7 @@ If your PPI complex is not among them, please select « Create you Own »</p>
 				<div id="id_ProteinDomainComplexTypeForm-inhibited" class="image-inhibited">
 					{% for radio in wizard.form.inhibited %}
 			    	  	{{ radio.tag }}
-	        	<label for="{{ radio.id_for_label }}">
+			        	<label style="background-image: url('/static/images/PPITypes/Inhibited/{{radio.choice_label|cut:" "}}_Apo.png');" for="{{ radio.id_for_label }}">
 			        		<span>{{ radio.choice_label}}</span>
 			    		</label>
 					{% endfor %}
@@ -58,5 +58,6 @@ If your PPI complex is not among them, please select « Create you Own »</p>
 		{% endif %}
 		</table>
 			<input type="submit" value="{% trans "Next step" %}"/>
+	</form>
 </div>
 {% endblock %}
\ No newline at end of file

ippisite/ippidb/templates/ProteinForm.html

@@ -23,14 +23,14 @@
 		{{ wizard.form.errors}}
     	{{ wizard.form.non_field_errors}}
     	{% block custom_form %}{% endblock %}
-	</form>
+	
 		{% if wizard.form.forms %}
 			{{ wizard.form.management_form }}
 			{% for form in wizard.form.forms %}
 			    {{ form }}
 			{% endfor %}
 		{% else %}
-	{{ formset.management_form }}
+			{{ wizard.form.management_form }}
 		    {% for form in formset %}
 		        {% for field in form %}
 		            {{ field.label_tag }} {{ field }}
@@ -39,5 +39,6 @@
 		{% endif %}
 		</table>
 		<input type="submit" value="{% trans "Next step" %}"/>
+	</form>
 </div>
 {% endblock %}
\ No newline at end of file