From 56e1cc2e3523e0674eb426238665500c0dd5149a Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Wed, 16 Nov 2011 04:06:56 +0000
Subject: [PATCH] Added a colour indication to the Area/WG overview page
 showing responsible AD for each WG.  Also some html reformatting for better
 readability.  - Legacy-Id: 3623

---
 ietf/templates/wginfo/wg-dir.html | 87 +++++++++++++++++--------------
 static/css/base2.css              |  9 ++++
 2 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/ietf/templates/wginfo/wg-dir.html b/ietf/templates/wginfo/wg-dir.html
index 95b2c2296..bc7a78029 100644
--- a/ietf/templates/wginfo/wg-dir.html
+++ b/ietf/templates/wginfo/wg-dir.html
@@ -44,49 +44,56 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {% block content %}
 <h1>Active IETF Working Groups</h1>
 
-<p>See also: <a href="http://www.ietf.org/wg/concluded/">Concluded
-Working Groups (www.ietf.org)</a>, <a href="http://tools.ietf.org/wg/concluded/">Concluded Working Groups (tools.ietf.org)</a>, <a href="http://www.ietf.org/dyn/wg/charter/history/">Historic Charters</a>.</p>
+   <p>See also:
+      <a href="http://www.ietf.org/wg/concluded/">Concluded Working Groups (www.ietf.org)</a>,
+      <a href="http://tools.ietf.org/wg/concluded/">Concluded Working Groups (tools.ietf.org)</a>,
+      <a href="http://www.ietf.org/dyn/wg/charter/history/">Historic Charters</a>.
+   </p>
 
-{% for area in areas|dictsort:"area_acronym.name" %}
-<h2 class="ietf-divider" id="{{area.area_acronym.name|cut:" "}}">{{ area.area_acronym.name }}</h2>
+   {% for area in areas|dictsort:"area_acronym.name" %}
+   <h2 class="ietf-divider" id="{{area.area_acronym.name|cut:" "}}">{{ area.area_acronym.name }}</h2>
 
-{% for ad in area.areadirector_set.all|dictsort:"person.last_name" %}
-{% if forloop.first %}
-<p>Area Director{{ forloop.revcounter|pluralize }}:</p>
-<p style="margin-left: 2em">
-{% endif %}
-<a href="mailto:{{ ad.person.email.1 }}">{{ ad.person }} &lt;{{ ad.person.email.1 }}&gt;</a>{% if not forloop.last %}<br/>{% endif %}
-{% if forloop.last %}
-</p>
-{% endif %}
-{% endfor %}
+   {% for ad in area.areadirector_set.all|dictsort:"person.last_name" %}
+   {% if forloop.first %}
+   <p>Area Director{{ forloop.revcounter|pluralize }}:</p>
+   <p style="margin-left: 2em">
+      {% endif %}
+      <span class="square bgcolor{{forloop.counter}}">&nbsp;</span>&nbsp;<a href="mailto:{{ ad.person.email.1 }}">{{ ad.person }} &lt;{{ ad.person.email.1 }}&gt;</a>{% if not forloop.last %}<br/>{% endif %}
+      {% if forloop.last %}
+   </p>
+   {% endif %}
+   {% endfor %}
 
-{% for url in area.additional_urls %}
-{% if forloop.first %}
-<p>Area Specific Web Page{{ forloop.revcounter|pluralize}}:</p>
-<p style="margin-left: 2em">
-{% endif %}
-<a href="{{url.url}}">{{ url.description }}</a>{% if not forloop.last %}<br/>{% endif %}
-{% if forloop.last %}
-</p>
-{% endif %}
-{% endfor %}
+   {% for url in area.additional_urls %}
+   {% if forloop.first %}
+   <p>Area Specific Web Page{{ forloop.revcounter|pluralize}}:</p>
+   <p style="margin-left: 2em">
+      {% endif %}
+      <a href="{{url.url}}">{{ url.description }}</a>{% if not forloop.last %}<br/>{% endif %}
+      {% if forloop.last %}
+   </p>
+   {% endif %}
+   {% endfor %}
 
-{% for wg in area.active_wgs %}
-{% if forloop.first %}
-<p>Active Working Groups:</p>
-<div style="margin-left:2em;">
-<table class="ietf-wg-table">
-{% endif %}
-<tr><td width="10%;"><a href="/wg/{{wg}}/">{{ wg }}</a></td><td width="50%">{{ wg.group_acronym.name }}</td>
-<td width="39%">{% for chair in wg.chairs %}<a href="mailto:{{chair.person.email.1}}">{{chair.person}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td></tr>
-{% if forloop.last %}
-</table>
-</div>
-{% endif %}
-{% empty %}
-<p>No Active Working Groups</p>
-{% endfor %}{# wg #}
+   {% for wg in area.active_wgs %}
+   {% if forloop.first %}
+   <p>Active Working Groups:</p>
+   <div style="margin-left:2em;">
+      <table class="ietf-wg-table">
+	 {% endif %}
+	 <tr>
+	    <td width="10%;"><a href="/wg/{{wg}}/">{{ wg }}</a></td>
+	    <td width="1%">{% for ad in area.areadirector_set.all|dictsort:"person.last_name" %}{% ifequal ad wg.area_director %}<span class="square bgcolor{{forloop.counter}}">&nbsp;</span>{% endifequal %}{% endfor %}</td>
+	    <td width="50%">{{ wg.group_acronym.name }}</td>
+	    <td width="39%">{% for chair in wg.chairs %}<a href="mailto:{{chair.person.email.1}}">{{chair.person}}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
+	 </tr>
+	 {% if forloop.last %}
+      </table>
+   </div>
+   {% endif %}
+   {% empty %}
+   <p>No Active Working Groups</p>
+   {% endfor %}{# wg #}
 
-{% endfor %}{# area #}
+   {% endfor %}{# area #}
 {% endblock %}
diff --git a/static/css/base2.css b/static/css/base2.css
index ea3d39208..06e53fe57 100644
--- a/static/css/base2.css
+++ b/static/css/base2.css
@@ -159,3 +159,12 @@ form table .help {
 }
 
 @media print { .noprint { display: none } }
+
+.color1 { color: #ffb000; }
+.color2 { color: #00ffff; }
+.bgcolor1 { background-color: #ffb000; }
+.bgcolor2 { background-color: #00ffff; }
+.square { width: 0.8ex; height: 0.8ex; margin: 0; padding: 0; display: inline-block; position: relative; top: 0.8ex }
+.big	{ font-size: 109.5%; margin: 0; padding: 0; }
+.large  { font-size: 120%; margin: 0; padding: 0; }
+.huge	{ font-size: 144%; margin: 0; padding: 0; }