damned-lies r1230 - in trunk: . templates templates/people templates/teams

[claudep svn gnome org]

Author: claudep
Date: Fri Dec 19 21:51:20 2008
New Revision: 1230
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1230&view=rev

Log:
2008-12-19  Claude Paroz  <claude 2xlibre net>

	* templates/people/person_detail.html:
	* templates/person_base.html: Role display moved from base to detail.
	* templates/module_detail.html:
	* templates/teams/team_base.html: printroles variable no more useful.
	* templates/teams/team_detail.html: Temporarily deactivated team
	membership listing.

Modified:
   trunk/ChangeLog
   trunk/templates/module_detail.html
   trunk/templates/people/person_detail.html
   trunk/templates/person_base.html
   trunk/templates/teams/team_base.html
   trunk/templates/teams/team_detail.html

Modified: trunk/templates/module_detail.html
==============================================================================
--- trunk/templates/module_detail.html	(original)
+++ trunk/templates/module_detail.html	Fri Dec 19 21:51:20 2008
@@ -28,9 +28,7 @@
       {% if module.maintainers.all %}
       <h2>{% trans "Maintainers" %}</h2>
       {% for person in module.maintainers.all %}
-        {% with 0 as printroles %}
         {% include "person_base.html" %}
-        {% endwith %}
       {% endfor %}
       {% endif %}
     </td>

Modified: trunk/templates/people/person_detail.html
==============================================================================
--- trunk/templates/people/person_detail.html	(original)
+++ trunk/templates/people/person_detail.html	Fri Dec 19 21:51:20 2008
@@ -13,11 +13,18 @@
     {% endifequal %}
   {% endif %}
 
-  {% with 1 as printroles %}
   {% include "person_base.html" %}
-  {% endwith %}
-
+  
   <div class="maintainer">
+  {% if person.maintains_modules.all %}
+      <h2>{% trans "Maintains:" %}</h2>
+      <ul>
+        {% for module in person.maintains_modules.all %}
+        <li><a href="{{ module.get_absolute_url }} ">{{ module.description }}</a></li>
+        {% endfor %}
+      </ul>
+  {% endif %}
+
   {% if person.role_set.all %}
     <h2>{% trans "Team membership" %}</h2>
     <ul>

Modified: trunk/templates/person_base.html
==============================================================================
--- trunk/templates/person_base.html	(original)
+++ trunk/templates/person_base.html	Fri Dec 19 21:51:20 2008
@@ -35,26 +35,4 @@
   <strong>{% trans "SVN account:" %}</strong> <a href="http://cia.vc/stats/author/{{ person.svn_account }}">{{ person.svn_account}}</a><br />
   {% endif %}
 
-  {% if printroles %}
-      {% if person.maintains_modules.all %}
-      <h2>{% trans "Maintains:" %}</h2>
-      <ul>
-        {% for module in person.maintains_modules.all %}
-        <li><a href="{{ module.get_absolute_url }} ">{{ module.description }}</a></li>
-        {% endfor %}
-      </ul>
-      {% endif %}
-
-      {% if person.coordinates_teams.all %}
-      <h2>{% trans "Coordinates:" %}</h2>
-      <ul>
-        {% for team in person.coordinates_teams.all %}
-          <li>
-            {% blocktrans with team.get_absolute_url as team_url and team.description as team_desc %}Coordinates <a href="{{ team_url }}">{{ team_desc }}</a>{% endblocktrans %}
-          </li>
-        {% endfor %}
-      </ul>
-      {% endif %}
-  {% endif %}
-
 </div>

Modified: trunk/templates/teams/team_base.html
==============================================================================
--- trunk/templates/teams/team_base.html	(original)
+++ trunk/templates/teams/team_base.html	Fri Dec 19 21:51:20 2008
@@ -30,10 +30,8 @@
   {% if team.get_coordinator %}
     <h2>{% trans "Coordinator" %}</h2>
     {% with team.get_coordinator as person %}
-    {% with 0 as printroles %}
     {% include "person_base.html" %}
     {% endwith %}
-    {% endwith %}
   {% endif %}
 </td></tr></table>
 {% endwith %}

Modified: trunk/templates/teams/team_detail.html
==============================================================================
--- trunk/templates/teams/team_detail.html	(original)
+++ trunk/templates/teams/team_detail.html	Fri Dec 19 21:51:20 2008
@@ -55,6 +55,7 @@
 </table>
 {% endfor %}
 
+<!-- Temporarily deactivated
 <h2>{% trans "Team membership" %}</h2>
 {% for group in mem_groups %}
     <h3>{{ group.title }}</h3>
@@ -80,6 +81,6 @@
       {% endif %}
     {% endif %}
 {% endfor %}
-
+-->
 </div>
 {% endblock %}