From 34cd15018e5c73bbb30dd7c515bb958198894426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Jim=C3=A9nez?= <jimenezmoral@gmail.com>
Date: Fri, 28 Dec 2012 07:33:44 +0000
Subject: [PATCH] Refactor templates inheritance See #919  - Legacy-Id: 5160

---
 ietf/nomcom/forms.py                          |  7 ++++---
 ietf/templates/nomcom/comments.html           |  4 ++--
 ietf/templates/nomcom/index.html              |  2 +-
 ietf/templates/nomcom/nomcom_base.html        | 16 ----------------
 ietf/templates/nomcom/nomcom_public_base.html | 18 ++++++++++++++++++
 ietf/templates/nomcom/nominate.html           |  2 +-
 ietf/templates/nomcom/questionnaires.html     |  2 +-
 ietf/templates/nomcom/requirements.html       |  2 +-
 8 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 ietf/templates/nomcom/nomcom_public_base.html

diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py
index cbcdd5d27..83a31c09b 100644
--- a/ietf/nomcom/forms.py
+++ b/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'))]
diff --git a/ietf/templates/nomcom/comments.html b/ietf/templates/nomcom/comments.html
index f92a60d71..ffd976e4e 100644
--- a/ietf/templates/nomcom/comments.html
+++ b/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 %}
diff --git a/ietf/templates/nomcom/index.html b/ietf/templates/nomcom/index.html
index e4904ae69..e6d2487a6 100644
--- a/ietf/templates/nomcom/index.html
+++ b/ietf/templates/nomcom/index.html
@@ -1,4 +1,4 @@
-{% extends "nomcom/nomcom_base.html" %}
+{% extends "nomcom/nomcom_public_base.html" %}
 
 {% block subtitle %} - Home {% endblock %}
 
diff --git a/ietf/templates/nomcom/nomcom_base.html b/ietf/templates/nomcom/nomcom_base.html
index a60e4da12..c28ade67d 100644
--- a/ietf/templates/nomcom/nomcom_base.html
+++ b/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 %}
diff --git a/ietf/templates/nomcom/nomcom_public_base.html b/ietf/templates/nomcom/nomcom_public_base.html
new file mode 100644
index 000000000..acbea0acb
--- /dev/null
+++ b/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 %}
diff --git a/ietf/templates/nomcom/nominate.html b/ietf/templates/nomcom/nominate.html
index 72db214b3..2310f9cf5 100644
--- a/ietf/templates/nomcom/nominate.html
+++ b/ietf/templates/nomcom/nominate.html
@@ -1,4 +1,4 @@
-{% extends "nomcom/nomcom_base.html" %}
+{% extends "nomcom/nomcom_public_base.html" %}
 
 {% block subtitle %} - Nominate{% endblock %}
 
diff --git a/ietf/templates/nomcom/questionnaires.html b/ietf/templates/nomcom/questionnaires.html
index a8f4b2e3e..9942966ea 100644
--- a/ietf/templates/nomcom/questionnaires.html
+++ b/ietf/templates/nomcom/questionnaires.html
@@ -1,4 +1,4 @@
-{% extends "nomcom/nomcom_base.html" %}
+{% extends "nomcom/nomcom_public_base.html" %}
 
 {% block pagehead %}
   {{ block.super }}
diff --git a/ietf/templates/nomcom/requirements.html b/ietf/templates/nomcom/requirements.html
index 6de27be6b..e151799f9 100644
--- a/ietf/templates/nomcom/requirements.html
+++ b/ietf/templates/nomcom/requirements.html
@@ -1,4 +1,4 @@
-{% extends "nomcom/nomcom_base.html" %}
+{% extends "nomcom/nomcom_public_base.html" %}
 
 {% block pagehead %}
   {{ block.super }}