Refactor templates inheritance

See #919
 - Legacy-Id: 5160

ietf/nomcom/forms.py

@@ -28,7 +28,7 @@ def get_group_or_404(year):
                              nomcom__isnull=False)
 
 
-class BaseNomcomForm(forms.ModelForm):
+class BaseNomcomForm(object):
     def __unicode__(self):
         return self.as_div()
 
@@ -172,12 +172,13 @@ class EditChairFormPreview(FormPreview):
 
 
 class EditPublicKeyForm(forms.ModelForm):
+    fieldsets = [('Edit the public key of NomCom', ('public_key',))]
+
     class Meta:
         model = NomCom
-        fields = ('public_key',)
 
 
-class NominateForm(BaseNomcomForm):
+class NominateForm(BaseNomcomForm, forms.ModelForm):
     comments = forms.CharField(label='Comments', widget=forms.Textarea())
 
     fieldsets = [('Candidate Nomination', ('position', 'candidate_name', 'candidate_email', 'candidate_phone', 'comments'))]

ietf/templates/nomcom/comments.html

@@ -1,3 +1,3 @@
-{% extends "nomcom/nomcom_base.html" %}
+{% extends "nomcom/nomcom_public_base.html" %}
 
-{% block title %} {{ nomcom }} - Provide comments{% endblock %}
+{% block subtitle %} - Provide comments {% endblock %}

ietf/templates/nomcom/index.html

@@ -1,4 +1,4 @@
-{% extends "nomcom/nomcom_base.html" %}
+{% extends "nomcom/nomcom_public_base.html" %}
 
 {% block subtitle %} - Home {% endblock %}
 

ietf/templates/nomcom/nomcom_base.html

@@ -1,19 +1,3 @@
 {% extends "base.html" %}
 
 {% block title %}Nomcom {{ year }}{% block subtitle %}{% endblock %}{% endblock %}
-
-{% block content %}
-
-<h1>Nomcom {{ year }} Pages</h1>
-
-<div class="ietf-navset">
-{% if selected == "index" %}<span class="selected">Home</span>{% else %}<a href="{% url nomcom_index year %}">Home</a>{% endif %} |
-{% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_nominate year %}">Nominate</a>{% endif %} |
-{% if selected == "requirements" %}<span class="selected">Requirements</span>{% else %}<a href="{% url nomcom_requirements year %}">Requirements</a>{% endif %} |
-{% if selected == "questionnaires" %}<span class="selected">Questionnaires</span>{% else %}<a href="{% url nomcom_questionnaires year %}">Questionnaires</a>{% endif %} |
-{% if selected == "comments" %}<span class="selected">Provide Comments</span>{% else %}<a href="{% url nomcom_comments year %}">Provide Comments</a>{% endif %}
-</div>
-
-{% block nomcom_content %}
-{% endblock %}
-{% endblock %}

ietf/templates/nomcom/nomcom_public_base.html

@@ -0,0 +1,18 @@
+{% extends "nomcom/nomcom_base.html" %}
+
+{% block content %}
+
+  <h1>Nomcom {{ year }} Pages</h1>
+
+  <div class="ietf-navset">
+    {% if selected == "index" %}<span class="selected">Home</span>{% else %}<a href="{% url nomcom_index year %}">Home</a>{% endif %} |
+    {% if selected == "nominate" %}<span class="selected">Nominate</span>{% else %}<a href="{% url nomcom_nominate year %}">Nominate</a>{% endif %} |
+    {% if selected == "requirements" %}<span class="selected">Requirements</span>{% else %}<a href="{% url nomcom_requirements year %}">Requirements</a>{% endif %} |
+    {% if selected == "questionnaires" %}<span class="selected">Questionnaires</span>{% else %}<a href="{% url nomcom_questionnaires year %}">Questionnaires</a>{% endif %} |
+    {% if selected == "comments" %}<span class="selected">Provide Comments</span>{% else %}<a href="{% url nomcom_comments year %}">Provide Comments</a>{% endif %}
+  </div>
+
+  {% block nomcom_content %}
+  {% endblock %}
+
+{% endblock %}

ietf/templates/nomcom/nominate.html

@@ -1,4 +1,4 @@
-{% extends "nomcom/nomcom_base.html" %}
+{% extends "nomcom/nomcom_public_base.html" %}
 
 {% block subtitle %} - Nominate{% endblock %}
 

ietf/templates/nomcom/questionnaires.html

@@ -1,4 +1,4 @@
-{% extends "nomcom/nomcom_base.html" %}
+{% extends "nomcom/nomcom_public_base.html" %}
 
 {% block pagehead %}
   {{ block.super }}

ietf/templates/nomcom/requirements.html

@@ -1,4 +1,4 @@
-{% extends "nomcom/nomcom_base.html" %}
+{% extends "nomcom/nomcom_public_base.html" %}
 
 {% block pagehead %}
   {{ block.super }}