diff --git a/ietf/group/info.py b/ietf/group/info.py index 16922c60b..d80f5c9d2 100644 --- a/ietf/group/info.py +++ b/ietf/group/info.py @@ -52,6 +52,7 @@ from ietf.group.models import Group, Role, ChangeStateGroupEvent from ietf.name.models import GroupTypeName from ietf.group.utils import get_charter_text, can_manage_group_type, milestone_reviewer_for_group_type from ietf.utils.pipe import pipe +from ietf.settings import MAILING_LIST_INFO_URL def roles(group, role_name): return Role.objects.filter(group=group, name=role_name).select_related("email", "person") @@ -162,6 +163,13 @@ def active_wgs(request): area.urls = area.groupurl_set.all().order_by("name") for group in area.groups: group.chairs = sorted(roles(group, "chair"), key=extract_last_name) + # get the url for list subscription + if group.list_subscribe.startswith('http'): + group.list_subscribe_url = group.list_subscribe + elif group.list_email.endswith('@ietf.org'): + group.list_subscribe_url = MAILING_LIST_INFO_URL % {'list_addr':group.list_email.split('@')[0]} + else: + group.list_subscribe_url = "mailto:"+group.list_subscribe return render(request, 'group/active_wgs.html', { 'areas':areas }) diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html index d631a2405..19dc9a734 100644 --- a/ietf/templates/group/active_wgs.html +++ b/ietf/templates/group/active_wgs.html @@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. {% block title %}Active IETF Working Groups{% endblock %} {% block morecss %} -.ietf-wg-table { width: 100%; max-width:50em; } +.ietf-wg-table { width: 100%; max-width:70em; } .ietf-wg-table tr { vertical-align:top; } {% endblock morecss %} @@ -80,10 +80,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{{ group.acronym }} | +{{ group.acronym }} | {% for ad in area.ads %}{% if ad.person_id == group.ad_id %}{% endif %}{% endfor %} | -{{ group.name }} | -{% for chair in group.chairs %}{{ chair.person.plain_name }}{% if not forloop.last %}, {% endif %}{% endfor %} | +{{ group.name }} | +{{ group.list_email }} | +subscribe | +{% for chair in group.chairs %}{{ chair.person.plain_name }}{% if not forloop.last %}, {% endif %}{% endfor %} |