--- a/src/cm/templates/site/user_list.html	Thu Dec 10 13:44:01 2009 +0100
+++ b/src/cm/templates/site/user_list.html	Thu Dec 10 14:27:12 2009 +0100
@@ -28,8 +28,6 @@
 
 <div id="user" class="tab-meta">
 
-<form id="user_form" action="." method="post">
-
 <ul class="sub_list">
     <li class="active_sub">{% blocktrans %}People' list{% endblocktrans %}</li>
     <li> / </li>
@@ -38,8 +36,40 @@
     <li><a href="{% url user-mass-add %}">{% blocktrans %}Add users in bulk{% endblocktrans %}</a></li>    
 </ul>
 
+<form id="filter_form" action="." method="get">
+<table summary="{% blocktrans %}People' list{% endblocktrans %}" class="large_table">
+	<tr>
+		<td>
+		{% if display_suspended_users %}<a href="?{% newparams 'display' '0' %}" title="{% blocktrans %}Hide suspended users{% endblocktrans %}">{% blocktrans %}Hide suspended users{% endblocktrans %}</a>{% else %}<a href="?{% newparams 'display' '1' %}" title="{% blocktrans %}Display suspended users{% endblocktrans %}">{% blocktrans %}Display suspended users{% endblocktrans %}</a>{% endif %}
+		&#183;
+		{% blocktrans %}Filter by tag:{% endblocktrans %} 
+		<select id="tag_selected" name="tag_selected">
+		<option {% if not tag_selected %}selected="selected"{% endif %} value="0">- {% blocktrans %}All{% endblocktrans %} -</option>
+		
+		{% for tag in tag_list %}
+		<option  {% ifequal tag_selected tag.name %}selected="selected"{% endifequal %} value="{{ tag.name }}">{{ tag.name }}</option>
+		{% endfor %}
+		</select>
+		</td>
+		
+	</tr>
+</table>
+</form>
+
+<script type="text/javascript">
+<!--
+$(function() {
+    $("#tag_selected").change(function () {
+    	$("#filter_form").submit();
+      });
+}) ;
+-->
+</script>
+
+<form id="user_form" action="." method="post">
+
 <select id="bulk_actions" name="action">
-<option selected="selected" value="-1">{% blocktrans %}Bulk Actions{% endblocktrans %}</option>
+<option selected="selected" value="-1">- {% blocktrans %}Bulk Actions{% endblocktrans %} -</option>
 <option value="disable">{% blocktrans %}Suspend access{% endblocktrans %}</option>
 <option value="enable">{% blocktrans %}Enable access{% endblocktrans %}</option>
 {% for bulk_role in all_roles %}
@@ -50,8 +80,6 @@
 <input name="apply" type="hidden" value="apply"/>
 <input name="apply_action" id="apply" type="button" value="{% blocktrans %}Apply{% endblocktrans %}" disabled="disabled"/>
 
-&nbsp;{% if display_suspended_users %}<a href="?{% newparams 'display' '0' %}" title="{% blocktrans %}Hide suspended users{% endblocktrans %}">{% blocktrans %}Hide suspended users{% endblocktrans %}</a>{% else %}<a href="?{% newparams 'display' '1' %}" title="{% blocktrans %}Display suspended users{% endblocktrans %}">{% blocktrans %}Display suspended users{% endblocktrans %}</a>{% endif %}
-
 <script type="text/javascript">
 <!--
 function check_activate_apply() {