Renamed some files under ietf/group/ which contained views but didn't have 'views' in the name.
- Legacy-Id: 11190
This commit is contained in:
Henrik Levkowetz
parent
21b2330b6a
commit
92214726fd
|
|
@ -68,8 +68,8 @@ class GroupDocDependencyGraphTests(TestCase):
|
|||
make_test_data()
|
||||
for group in Group.objects.filter(Q(type="wg") | Q(type="rg")):
|
||||
client = Client(Accept='text/plain')
|
||||
for url in [ urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,output_type="dot")),
|
||||
urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="dot")),
|
||||
for url in [ urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,output_type="dot")),
|
||||
urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="dot")),
|
||||
]:
|
||||
r = client.get(url)
|
||||
self.assertTrue(r.status_code == 200, "Failed to receive "
|
||||
|
|
@ -81,8 +81,8 @@ class GroupDocDependencyGraphTests(TestCase):
|
|||
make_test_data()
|
||||
for group in Group.objects.filter(Q(type="wg") | Q(type="rg")):
|
||||
client = Client(Accept='application/pdf')
|
||||
for url in [ urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,output_type="pdf")),
|
||||
urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="pdf")),
|
||||
for url in [ urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,output_type="pdf")),
|
||||
urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="pdf")),
|
||||
]:
|
||||
r = client.get(url)
|
||||
self.assertTrue(r.status_code == 200, "Failed to receive "
|
||||
|
|
@ -94,8 +94,8 @@ class GroupDocDependencyGraphTests(TestCase):
|
|||
make_test_data()
|
||||
for group in Group.objects.filter(Q(type="wg") | Q(type="rg")):
|
||||
client = Client(Accept='image/svg+xml')
|
||||
for url in [ urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,output_type="svg")),
|
||||
urlreverse("ietf.group.info.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="svg")),
|
||||
for url in [ urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,output_type="svg")),
|
||||
urlreverse("ietf.group.views.dependencies",kwargs=dict(acronym=group.acronym,group_type=group.type_id,output_type="svg")),
|
||||
]:
|
||||
r = client.get(url)
|
||||
self.assertTrue(r.status_code == 200, "Failed to receive "
|
||||
|
|
@ -141,7 +141,7 @@ class GroupDerivedArchiveTests(TestCase):
|
|||
group = GroupFactory()
|
||||
group.list_archive = 'https://mailarchive.ietf.org/arch/browse/%s/'%group.acronym
|
||||
group.save()
|
||||
url = urlreverse("ietf.group.info.derived_archives",kwargs=dict(acronym=group.acronym))
|
||||
url = urlreverse("ietf.group.views.derived_archives",kwargs=dict(acronym=group.acronym))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
q = PyQuery(r.content)
|
||||
|
|
@ -153,7 +153,7 @@ class GroupDerivedArchiveTests(TestCase):
|
|||
group = GroupFactory()
|
||||
group.list_archive = 'https://alienarchive.example.com'
|
||||
group.save()
|
||||
url = urlreverse("ietf.group.info.derived_archives",kwargs=dict(acronym=group.acronym))
|
||||
url = urlreverse("ietf.group.views.derived_archives",kwargs=dict(acronym=group.acronym))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
q = PyQuery(r.content)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class GroupPagesTests(TestCase):
|
|||
draft = make_test_data()
|
||||
group = draft.group
|
||||
|
||||
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="wg"))
|
||||
url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="wg"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(group.parent.name in unicontent(r))
|
||||
|
|
@ -51,32 +51,32 @@ class GroupPagesTests(TestCase):
|
|||
self.assertTrue(group.name in unicontent(r))
|
||||
self.assertTrue(group.ad_role().person.plain_name() in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="rg"))
|
||||
url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="rg"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue('Active research groups' in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="area"))
|
||||
url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="area"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue("Far Future (farfut)" in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="ag"))
|
||||
url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="ag"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue("Active area groups" in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="dir"))
|
||||
url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="dir"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue("Active directorates" in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type="team"))
|
||||
url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="team"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue("Active teams" in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.active_groups', kwargs=dict())
|
||||
url = urlreverse('ietf.group.views.active_groups', kwargs=dict())
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue("Directorate" in unicontent(r))
|
||||
|
|
@ -84,7 +84,7 @@ class GroupPagesTests(TestCase):
|
|||
|
||||
for slug in GroupTypeName.objects.exclude(slug__in=['wg','rg','ag','area','dir','team']).values_list('slug',flat=True):
|
||||
with self.assertRaises(NoReverseMatch):
|
||||
url=urlreverse('ietf.group.info.active_groups', kwargs=dict(group_type=slug))
|
||||
url=urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type=slug))
|
||||
|
||||
def test_wg_summaries(self):
|
||||
draft = make_test_data()
|
||||
|
|
@ -95,7 +95,7 @@ class GroupPagesTests(TestCase):
|
|||
with open(os.path.join(self.charter_dir, "%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev)), "w") as f:
|
||||
f.write("This is a charter.")
|
||||
|
||||
url = urlreverse('ietf.group.info.wg_summary_area', kwargs=dict(group_type="wg"))
|
||||
url = urlreverse('ietf.group.views.wg_summary_area', kwargs=dict(group_type="wg"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(group.parent.name in unicontent(r))
|
||||
|
|
@ -103,14 +103,14 @@ class GroupPagesTests(TestCase):
|
|||
self.assertTrue(group.name in unicontent(r))
|
||||
self.assertTrue(chair.address in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.wg_summary_acronym', kwargs=dict(group_type="wg"))
|
||||
url = urlreverse('ietf.group.views.wg_summary_acronym', kwargs=dict(group_type="wg"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(group.acronym in unicontent(r))
|
||||
self.assertTrue(group.name in unicontent(r))
|
||||
self.assertTrue(chair.address in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.wg_charters', kwargs=dict(group_type="wg"))
|
||||
url = urlreverse('ietf.group.views.wg_charters', kwargs=dict(group_type="wg"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(group.acronym in unicontent(r))
|
||||
|
|
@ -119,7 +119,7 @@ class GroupPagesTests(TestCase):
|
|||
self.assertTrue(chair.address in unicontent(r))
|
||||
self.assertTrue("This is a charter." in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.wg_charters_by_acronym', kwargs=dict(group_type="wg"))
|
||||
url = urlreverse('ietf.group.views.wg_charters_by_acronym', kwargs=dict(group_type="wg"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(group.acronym in unicontent(r))
|
||||
|
|
@ -133,7 +133,7 @@ class GroupPagesTests(TestCase):
|
|||
group = draft.group
|
||||
group.charter.set_state(State.objects.get(used=True, type="charter", slug="intrev"))
|
||||
|
||||
url = urlreverse('ietf.group.info.chartering_groups')
|
||||
url = urlreverse('ietf.group.views.chartering_groups')
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
q = PyQuery(r.content)
|
||||
|
|
@ -145,7 +145,7 @@ class GroupPagesTests(TestCase):
|
|||
group.state = GroupStateName.objects.get(used=True, slug="conclude")
|
||||
group.save()
|
||||
|
||||
url = urlreverse('ietf.group.info.concluded_groups')
|
||||
url = urlreverse('ietf.group.views.concluded_groups')
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
q = PyQuery(r.content)
|
||||
|
|
@ -157,7 +157,7 @@ class GroupPagesTests(TestCase):
|
|||
group.state_id = "bof"
|
||||
group.save()
|
||||
|
||||
url = urlreverse('ietf.group.info.bofs', kwargs=dict(group_type="wg"))
|
||||
url = urlreverse('ietf.group.views.bofs', kwargs=dict(group_type="wg"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
q = PyQuery(r.content)
|
||||
|
|
@ -193,7 +193,7 @@ class GroupPagesTests(TestCase):
|
|||
|
||||
setup_default_community_list_for_group(group)
|
||||
|
||||
url = urlreverse('ietf.group.info.group_documents', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
url = urlreverse('ietf.group.views.group_documents', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(draft.name in unicontent(r))
|
||||
|
|
@ -208,7 +208,7 @@ class GroupPagesTests(TestCase):
|
|||
self.assertTrue(any([draft2.name in x.attrib['href'] for x in q('table td a.track-untrack-doc')]))
|
||||
|
||||
# test the txt version too while we're at it
|
||||
url = urlreverse('ietf.group.info.group_documents_txt', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
url = urlreverse('ietf.group.views.group_documents_txt', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(draft.name in unicontent(r))
|
||||
|
|
@ -229,8 +229,8 @@ class GroupPagesTests(TestCase):
|
|||
milestone.docs.add(draft)
|
||||
|
||||
for url in [group.about_url(),
|
||||
urlreverse('ietf.group.info.group_about',kwargs=dict(acronym=group.acronym)),
|
||||
urlreverse('ietf.group.info.group_about',kwargs=dict(acronym=group.acronym,group_type=group.type_id)),
|
||||
urlreverse('ietf.group.views.group_about',kwargs=dict(acronym=group.acronym)),
|
||||
urlreverse('ietf.group.views.group_about',kwargs=dict(acronym=group.acronym,group_type=group.type_id)),
|
||||
]:
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
|
|
@ -264,8 +264,8 @@ class GroupPagesTests(TestCase):
|
|||
create_person(group, "chair", name="Testteam Chairman", username="teamchairman")
|
||||
|
||||
for url in [group.about_url(),
|
||||
urlreverse('ietf.group.info.group_about',kwargs=dict(acronym=group.acronym)),
|
||||
urlreverse('ietf.group.info.group_about',kwargs=dict(acronym=group.acronym,group_type=group.type_id)),
|
||||
urlreverse('ietf.group.views.group_about',kwargs=dict(acronym=group.acronym)),
|
||||
urlreverse('ietf.group.views.group_about',kwargs=dict(acronym=group.acronym,group_type=group.type_id)),
|
||||
]:
|
||||
url = group.about_url()
|
||||
r = self.client.get(url)
|
||||
|
|
@ -274,7 +274,7 @@ class GroupPagesTests(TestCase):
|
|||
self.assertTrue(group.acronym in unicontent(r))
|
||||
self.assertTrue(group.description in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.edit.edit', kwargs=dict(acronym=group.acronym))
|
||||
url = urlreverse('ietf.group.views_edit.edit', kwargs=dict(acronym=group.acronym))
|
||||
|
||||
for username in ['plain','iana','iab chair','irtf chair','marschairman']:
|
||||
verify_cannot_edit_group(username)
|
||||
|
|
@ -323,7 +323,7 @@ class GroupPagesTests(TestCase):
|
|||
type="added_comment",
|
||||
by=Person.objects.get(name="(System)"))
|
||||
|
||||
url = urlreverse('ietf.group.info.history', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
url = urlreverse('ietf.group.views.history', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
self.assertTrue(e.desc in unicontent(r))
|
||||
|
|
@ -548,8 +548,8 @@ class GroupEditTests(TestCase):
|
|||
def test_initial_charter(self):
|
||||
make_test_data()
|
||||
group = Group.objects.get(acronym="mars")
|
||||
for url in [ urlreverse('ietf.group.edit.submit_initial_charter', kwargs={'acronym':group.acronym}),
|
||||
urlreverse('ietf.group.edit.submit_initial_charter', kwargs={'acronym':group.acronym,'group_type':group.type_id}),
|
||||
for url in [ urlreverse('ietf.group.views_edit.submit_initial_charter', kwargs={'acronym':group.acronym}),
|
||||
urlreverse('ietf.group.views_edit.submit_initial_charter', kwargs={'acronym':group.acronym,'group_type':group.type_id}),
|
||||
]:
|
||||
login_testing_unauthorized(self, "secretary", url)
|
||||
r = self.client.get(url,follow=True)
|
||||
|
|
@ -563,7 +563,7 @@ class GroupEditTests(TestCase):
|
|||
|
||||
group = Group.objects.get(acronym="mars")
|
||||
|
||||
url = urlreverse('ietf.group.edit.conclude', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
url = urlreverse('ietf.group.views_edit.conclude', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
login_testing_unauthorized(self, "secretary", url)
|
||||
|
||||
# normal get
|
||||
|
|
@ -870,7 +870,7 @@ class CustomizeWorkflowTests(TestCase):
|
|||
|
||||
group = Group.objects.get(acronym="mars")
|
||||
|
||||
url = urlreverse('ietf.group.edit.customize_workflow', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
url = urlreverse('ietf.group.views_edit.customize_workflow', kwargs=dict(group_type=group.type_id, acronym=group.acronym))
|
||||
login_testing_unauthorized(self, "secretary", url)
|
||||
|
||||
state = State.objects.get(used=True, type="draft-stream-ietf", slug="wg-lc")
|
||||
|
|
@ -969,24 +969,24 @@ expand-ames-chairs@virtual.ietf.org mars_chair@ietf
|
|||
self.assertTrue(all([x in unicontent(r) for x in ['mars-ads@','mars-chairs@']]))
|
||||
self.assertFalse(any([x in unicontent(r) for x in ['ames-ads@','ames-chairs@']]))
|
||||
|
||||
url = urlreverse('ietf.group.info.email_aliases', kwargs=dict())
|
||||
url = urlreverse('ietf.group.views.email_aliases', kwargs=dict())
|
||||
login_testing_unauthorized(self, "plain", url)
|
||||
r = self.client.get(url)
|
||||
self.assertTrue(r.status_code,200)
|
||||
self.assertTrue(all([x in unicontent(r) for x in ['mars-ads@','mars-chairs@','ames-ads@','ames-chairs@']]))
|
||||
|
||||
url = urlreverse('ietf.group.info.email_aliases', kwargs=dict(group_type="wg"))
|
||||
url = urlreverse('ietf.group.views.email_aliases', kwargs=dict(group_type="wg"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code,200)
|
||||
self.assertTrue('mars-ads@' in unicontent(r))
|
||||
|
||||
url = urlreverse('ietf.group.info.email_aliases', kwargs=dict(group_type="rg"))
|
||||
url = urlreverse('ietf.group.views.email_aliases', kwargs=dict(group_type="rg"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code,200)
|
||||
self.assertFalse('mars-ads@' in unicontent(r))
|
||||
|
||||
def testExpansions(self):
|
||||
url = urlreverse('ietf.group.info.email', kwargs=dict(acronym="mars"))
|
||||
url = urlreverse('ietf.group.views.email', kwargs=dict(acronym="mars"))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code,200)
|
||||
self.assertTrue('Email aliases' in unicontent(r))
|
||||
|
|
@ -1029,7 +1029,7 @@ class MeetingInfoTests(TestCase):
|
|||
|
||||
|
||||
def test_meeting_info(self):
|
||||
url = urlreverse('ietf.group.info.meetings',kwargs={'acronym':self.group.acronym})
|
||||
url = urlreverse('ietf.group.views.meetings',kwargs={'acronym':self.group.acronym})
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
q = PyQuery(response.content)
|
||||
|
|
@ -1049,7 +1049,7 @@ class StatusUpdateTests(TestCase):
|
|||
def test_unsupported_group_types(self):
|
||||
|
||||
def ensure_updates_dont_show(group,user):
|
||||
url = urlreverse('ietf.group.info.group_about',kwargs={'acronym':group.acronym})
|
||||
url = urlreverse('ietf.group.views.group_about',kwargs={'acronym':group.acronym})
|
||||
if user:
|
||||
self.client.login(username=user.username,password='%s+password'%user.username)
|
||||
response = self.client.get(url)
|
||||
|
|
@ -1059,7 +1059,7 @@ class StatusUpdateTests(TestCase):
|
|||
self.client.logout()
|
||||
|
||||
def ensure_cant_edit(group,user):
|
||||
url = urlreverse('ietf.group.info.group_about_status_edit',kwargs={'acronym':group.acronym})
|
||||
url = urlreverse('ietf.group.views.group_about_status_edit',kwargs={'acronym':group.acronym})
|
||||
if user:
|
||||
self.client.login(username=user.username,password='%s+password'%user.username)
|
||||
response = self.client.get(url)
|
||||
|
|
@ -1075,7 +1075,7 @@ class StatusUpdateTests(TestCase):
|
|||
def test_see_status_update(self):
|
||||
chair = RoleFactory(name_id='chair',group__type_id='wg')
|
||||
GroupEventFactory(type='status_update',group=chair.group)
|
||||
url = urlreverse('ietf.group.info.group_about',kwargs={'acronym':chair.group.acronym})
|
||||
url = urlreverse('ietf.group.views.group_about',kwargs={'acronym':chair.group.acronym})
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code,200)
|
||||
q=PyQuery(response.content)
|
||||
|
|
@ -1092,7 +1092,7 @@ class StatusUpdateTests(TestCase):
|
|||
def test_view_status_update(self):
|
||||
chair = RoleFactory(name_id='chair',group__type_id='wg')
|
||||
event = GroupEventFactory(type='status_update',group=chair.group)
|
||||
url = urlreverse('ietf.group.info.group_about_status',kwargs={'acronym':chair.group.acronym})
|
||||
url = urlreverse('ietf.group.views.group_about_status',kwargs={'acronym':chair.group.acronym})
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code,200)
|
||||
q=PyQuery(response.content)
|
||||
|
|
@ -1107,7 +1107,7 @@ class StatusUpdateTests(TestCase):
|
|||
def test_edit_status_update(self):
|
||||
chair = RoleFactory(name_id='chair',group__type_id='wg')
|
||||
event = GroupEventFactory(type='status_update',group=chair.group)
|
||||
url = urlreverse('ietf.group.info.group_about_status_edit',kwargs={'acronym':chair.group.acronym})
|
||||
url = urlreverse('ietf.group.views.group_about_status_edit',kwargs={'acronym':chair.group.acronym})
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code,404)
|
||||
self.client.login(username=chair.person.user.username,password='%s+password'%chair.person.user.username)
|
||||
|
|
@ -1129,7 +1129,7 @@ class StatusUpdateTests(TestCase):
|
|||
def test_view_all_status_updates(self):
|
||||
GroupEventFactory(type='status_update',desc='blah blah blah',group__type_id='wg')
|
||||
GroupEventFactory(type='status_update',desc='blah blah blah',group__type_id='rg')
|
||||
url = urlreverse('ietf.group.info.all_status')
|
||||
url = urlreverse('ietf.group.views.all_status')
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code,200)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,15 @@
|
|||
from django.conf.urls import patterns, include
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(r'^$', 'ietf.group.info.active_groups'),
|
||||
(r'^groupmenu.json', 'ietf.group.ajax.group_menu_data', None, "group_menu_data"),
|
||||
(r'^(?P<acronym>[a-z0-9]+).json$', 'ietf.group.ajax.group_json'),
|
||||
(r'^chartering/$', 'ietf.group.info.chartering_groups'),
|
||||
(r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.edit.edit', {'action': "charter"}, "group_create"),
|
||||
(r'^concluded/$', 'ietf.group.info.concluded_groups'),
|
||||
(r'^email-aliases/$', 'ietf.group.info.email_aliases'),
|
||||
(r'^all-status/$', 'ietf.group.info.all_status'),
|
||||
(r'^(?P<acronym>[a-zA-Z0-9-._]+)/$', 'ietf.group.info.group_home', None, "group_home"),
|
||||
(r'^$', 'ietf.group.views.active_groups'),
|
||||
(r'^groupmenu.json', 'ietf.group.views_ajax.group_menu_data', None, "group_menu_data"),
|
||||
(r'^(?P<acronym>[a-z0-9]+).json$', 'ietf.group.views_ajax.group_json'),
|
||||
(r'^chartering/$', 'ietf.group.views.chartering_groups'),
|
||||
(r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.views_edit.edit', {'action': "charter"}, "group_create"),
|
||||
(r'^concluded/$', 'ietf.group.views.concluded_groups'),
|
||||
(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
|
||||
(r'^all-status/$', 'ietf.group.views.all_status'),
|
||||
(r'^(?P<acronym>[a-zA-Z0-9-._]+)/$', 'ietf.group.views.group_home', None, "group_home"),
|
||||
(r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,21 +3,21 @@
|
|||
from django.conf.urls import patterns, include
|
||||
from django.views.generic import RedirectView
|
||||
|
||||
from ietf.group import info, edit
|
||||
from ietf.group import views, views_edit
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(r'^$', info.active_groups),
|
||||
(r'^$', views.active_groups),
|
||||
(r'^summary.txt', RedirectView.as_view(url='/wg/1wg-summary.txt')),
|
||||
(r'^summary-by-area.txt', RedirectView.as_view(url='/wg/1wg-summary.txt')),
|
||||
(r'^summary-by-acronym.txt', RedirectView.as_view(url='/wg/1wg-summary-by-acronym.txt')),
|
||||
(r'^1wg-summary.txt', info.wg_summary_area),
|
||||
(r'^1wg-summary-by-acronym.txt', info.wg_summary_acronym),
|
||||
(r'^1wg-charters.txt', info.wg_charters),
|
||||
(r'^1wg-charters-by-acronym.txt', info.wg_charters_by_acronym),
|
||||
(r'^1wg-summary.txt', views.wg_summary_area),
|
||||
(r'^1wg-summary-by-acronym.txt', views.wg_summary_acronym),
|
||||
(r'^1wg-charters.txt', views.wg_charters),
|
||||
(r'^1wg-charters-by-acronym.txt', views.wg_charters_by_acronym),
|
||||
(r'^chartering/$', RedirectView.as_view(url='/group/chartering/')),
|
||||
(r'^chartering/create/$', RedirectView.as_view(url='/group/chartering/create/%(group_type)s/')),
|
||||
(r'^bofs/$', info.bofs),
|
||||
(r'^email-aliases/$', 'ietf.group.info.email_aliases'),
|
||||
(r'^bofs/create/$', edit.edit, {'action': "create"}, "bof_create"),
|
||||
(r'^bofs/$', views.bofs),
|
||||
(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
|
||||
(r'^bofs/create/$', views_edit.edit, {'action': "create"}, "bof_create"),
|
||||
(r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,31 +2,31 @@ from django.conf.urls import patterns, url
|
|||
from django.views.generic import RedirectView
|
||||
|
||||
urlpatterns = patterns('',
|
||||
(r'^$', 'ietf.group.info.group_home', None, "group_home"),
|
||||
(r'^documents/txt/$', 'ietf.group.info.group_documents_txt'),
|
||||
(r'^documents/$', 'ietf.group.info.group_documents', None, "group_docs"),
|
||||
(r'^$', 'ietf.group.views.group_home', None, "group_home"),
|
||||
(r'^documents/txt/$', 'ietf.group.views.group_documents_txt'),
|
||||
(r'^documents/$', 'ietf.group.views.group_documents', None, "group_docs"),
|
||||
(r'^documents/manage/$', 'ietf.community.views.manage_list'),
|
||||
(r'^documents/csv/$', 'ietf.community.views.export_to_csv'),
|
||||
(r'^documents/feed/$', 'ietf.community.views.feed'),
|
||||
(r'^documents/subscription/$', 'ietf.community.views.subscription'),
|
||||
(r'^charter/$', 'ietf.group.info.group_about', None, 'group_charter'),
|
||||
(r'^about/$', 'ietf.group.info.group_about', None, 'group_about'),
|
||||
(r'^about/status/$', 'ietf.group.info.group_about_status'),
|
||||
(r'^about/status/edit/$', 'ietf.group.info.group_about_status_edit'),
|
||||
(r'^history/$','ietf.group.info.history'),
|
||||
(r'^email/$', 'ietf.group.info.email'),
|
||||
(r'^deps/(?P<output_type>[\w-]+)/$', 'ietf.group.info.dependencies'),
|
||||
(r'^meetings/$', 'ietf.group.info.meetings'),
|
||||
(r'^init-charter/', 'ietf.group.edit.submit_initial_charter'),
|
||||
(r'^edit/$', 'ietf.group.edit.edit', {'action': "edit"}, "group_edit"),
|
||||
(r'^conclude/$', 'ietf.group.edit.conclude'),
|
||||
(r'^charter/$', 'ietf.group.views.group_about', None, 'group_charter'),
|
||||
(r'^about/$', 'ietf.group.views.group_about', None, 'group_about'),
|
||||
(r'^about/status/$', 'ietf.group.views.group_about_status'),
|
||||
(r'^about/status/edit/$', 'ietf.group.views.group_about_status_edit'),
|
||||
(r'^history/$','ietf.group.views.history'),
|
||||
(r'^email/$', 'ietf.group.views.email'),
|
||||
(r'^deps/(?P<output_type>[\w-]+)/$', 'ietf.group.views.dependencies'),
|
||||
(r'^meetings/$', 'ietf.group.views.meetings'),
|
||||
(r'^init-charter/', 'ietf.group.views_edit.submit_initial_charter'),
|
||||
(r'^edit/$', 'ietf.group.views_edit.edit', {'action': "edit"}, "group_edit"),
|
||||
(r'^conclude/$', 'ietf.group.views_edit.conclude'),
|
||||
(r'^milestones/$', 'ietf.group.milestones.edit_milestones', {'milestone_set': "current"}, "group_edit_milestones"),
|
||||
(r'^milestones/charter/$', 'ietf.group.milestones.edit_milestones', {'milestone_set': "charter"}, "group_edit_charter_milestones"),
|
||||
(r'^milestones/charter/reset/$', 'ietf.group.milestones.reset_charter_milestones', None, "group_reset_charter_milestones"),
|
||||
(r'^workflow/$', 'ietf.group.edit.customize_workflow'),
|
||||
(r'^materials/$', 'ietf.group.info.materials', None, "group_materials"),
|
||||
(r'^workflow/$', 'ietf.group.views_edit.customize_workflow'),
|
||||
(r'^materials/$', 'ietf.group.views.materials', None, "group_materials"),
|
||||
(r'^materials/new/$', 'ietf.doc.views_material.choose_material_type'),
|
||||
(r'^materials/new/(?P<doc_type>[\w-]+)/$', 'ietf.doc.views_material.edit_material', { 'action': "new" }, "group_new_material"),
|
||||
(r'^archives/$', 'ietf.group.info.derived_archives'),
|
||||
url(r'^email-aliases/$', RedirectView.as_view(pattern_name='ietf.group.info.email',permanent=False),name='old_group_email_aliases'),
|
||||
(r'^archives/$', 'ietf.group.views.derived_archives'),
|
||||
url(r'^email-aliases/$', RedirectView.as_view(pattern_name='ietf.group.views.email',permanent=False),name='old_group_email_aliases'),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -338,27 +338,27 @@ def construct_group_menu_context(request, group, selected, group_type, others):
|
|||
# menu entries
|
||||
entries = []
|
||||
if group.features.has_documents:
|
||||
entries.append(("Documents", urlreverse("ietf.group.info.group_documents", kwargs=kwargs)))
|
||||
entries.append(("Documents", urlreverse("ietf.group.views.group_documents", kwargs=kwargs)))
|
||||
if group.features.has_chartering_process:
|
||||
entries.append(("Charter", urlreverse("group_charter", kwargs=kwargs)))
|
||||
else:
|
||||
entries.append(("About", urlreverse("group_about", kwargs=kwargs)))
|
||||
if group.features.has_materials and get_group_materials(group).exists():
|
||||
entries.append(("Materials", urlreverse("ietf.group.info.materials", kwargs=kwargs)))
|
||||
entries.append(("Materials", urlreverse("ietf.group.views.materials", kwargs=kwargs)))
|
||||
if group.type_id in ('rg','wg','team'):
|
||||
entries.append(("Meetings", urlreverse("ietf.group.info.meetings", kwargs=kwargs)))
|
||||
entries.append(("Email expansions", urlreverse("ietf.group.info.email", kwargs=kwargs)))
|
||||
entries.append(("History", urlreverse("ietf.group.info.history", kwargs=kwargs)))
|
||||
entries.append(("Meetings", urlreverse("ietf.group.views.meetings", kwargs=kwargs)))
|
||||
entries.append(("Email expansions", urlreverse("ietf.group.views.email", kwargs=kwargs)))
|
||||
entries.append(("History", urlreverse("ietf.group.views.history", kwargs=kwargs)))
|
||||
|
||||
if group.list_archive.startswith("http:") or group.list_archive.startswith("https:") or group.list_archive.startswith("ftp:"):
|
||||
if 'mailarchive.ietf.org' in group.list_archive:
|
||||
entries.append(("List archive", urlreverse("ietf.group.info.derived_archives", kwargs=kwargs)))
|
||||
entries.append(("List archive", urlreverse("ietf.group.views.derived_archives", kwargs=kwargs)))
|
||||
else:
|
||||
entries.append((mark_safe("List archive »"), group.list_archive))
|
||||
|
||||
if group.features.has_documents:
|
||||
kwargs["output_type"] = "svg"
|
||||
entries.append((mark_safe("Dependency graph »"), urlreverse("ietf.group.info.dependencies", kwargs=kwargs)))
|
||||
entries.append((mark_safe("Dependency graph »"), urlreverse("ietf.group.views.dependencies", kwargs=kwargs)))
|
||||
del kwargs["output_type"]
|
||||
|
||||
if group.has_tools_page():
|
||||
|
|
@ -388,10 +388,10 @@ def construct_group_menu_context(request, group, selected, group_type, others):
|
|||
actions.append((u"Edit group", urlreverse("group_edit", kwargs=kwargs)))
|
||||
|
||||
if group.features.customize_workflow and (is_chair or can_manage):
|
||||
actions.append((u"Customize workflow", urlreverse("ietf.group.edit.customize_workflow", kwargs=kwargs)))
|
||||
actions.append((u"Customize workflow", urlreverse("ietf.group.views_edit.customize_workflow", kwargs=kwargs)))
|
||||
|
||||
if group.state_id in ("active", "dormant") and not group.type_id in ["sdo", "rfcedtyp", "isoc", ] and can_manage:
|
||||
actions.append((u"Request closing group", urlreverse("ietf.group.edit.conclude", kwargs=kwargs)))
|
||||
actions.append((u"Request closing group", urlreverse("ietf.group.views_edit.conclude", kwargs=kwargs)))
|
||||
|
||||
d = {
|
||||
"group": group,
|
||||
|
|
@ -573,7 +573,7 @@ def group_about_status_edit(request, acronym, group_type=None):
|
|||
type='status_update',
|
||||
desc=update_text,
|
||||
)
|
||||
return redirect('ietf.group.info.group_about',acronym=group.acronym)
|
||||
return redirect('ietf.group.views.group_about',acronym=group.acronym)
|
||||
else:
|
||||
form = None
|
||||
else:
|
||||
|
|
@ -23,7 +23,7 @@ def group_menu_data(request):
|
|||
|
||||
groups_by_parent = defaultdict(list)
|
||||
for g in groups:
|
||||
url = urlreverse("ietf.group.info.group_home", kwargs={ 'group_type': g.type_id, 'acronym': g.acronym })
|
||||
url = urlreverse("ietf.group.views.group_home", kwargs={ 'group_type': g.type_id, 'acronym': g.acronym })
|
||||
groups_by_parent[g.parent_id].append({ 'acronym': g.acronym, 'name': escape(g.name), 'url': url })
|
||||
|
||||
return JsonResponse(groups_by_parent)
|
||||
|
|
@ -425,7 +425,7 @@ def customize_workflow(request, group_type, acronym):
|
|||
|
||||
# redirect so the back button works correctly, otherwise
|
||||
# repeated POSTs fills up the history
|
||||
return redirect("ietf.group.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
|
||||
return redirect("ietf.group.views_edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
|
||||
|
||||
if action == "setnextstates":
|
||||
try:
|
||||
|
|
@ -442,7 +442,7 @@ def customize_workflow(request, group_type, acronym):
|
|||
transitions, _ = GroupStateTransitions.objects.get_or_create(group=group, state=state)
|
||||
transitions.next_states = next_states
|
||||
|
||||
return redirect("ietf.group.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
|
||||
return redirect("ietf.group.views_edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
|
||||
|
||||
if action == "settagactive":
|
||||
active = request.POST.get("active") == "1"
|
||||
|
|
@ -456,7 +456,7 @@ def customize_workflow(request, group_type, acronym):
|
|||
else:
|
||||
group.unused_tags.add(tag)
|
||||
|
||||
return redirect("ietf.group.edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
|
||||
return redirect("ietf.group.views_edit.customize_workflow", group_type=group.type_id, acronym=group.acronym)
|
||||
|
||||
# put some info for the template on tags and states
|
||||
unused_tags = group.unused_tags.all().values_list('slug', flat=True)
|
||||
|
|
@ -180,7 +180,7 @@ class ApiTests(TestCase):
|
|||
make_meeting_test_data()
|
||||
group = Group.objects.get(acronym="mars")
|
||||
|
||||
url = urlreverse("ietf.group.ajax.group_json", kwargs=dict(acronym=group.acronym))
|
||||
url = urlreverse("ietf.group.views_ajax.group_json", kwargs=dict(acronym=group.acronym))
|
||||
r = self.client.get(url)
|
||||
self.assertEqual(r.status_code, 200)
|
||||
info = json.loads(r.content)
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
<ul class="dropdown-menu" role="menu">
|
||||
{% endif %}
|
||||
|
||||
<li><a href="{% url "ietf.group.info.active_groups" group_type="wg" %}">Active WGs</a></li>
|
||||
<li><a href="{% url "ietf.group.info.active_groups" group_type="rg" %}">Active RGs</a></li>
|
||||
<li class="dropdown-submenu group-menu"><a href="{% url "ietf.group.info.active_groups" %}">Other</a>{% active_groups_menu %} </li>
|
||||
<li><a href="{% url "ietf.group.views.active_groups" group_type="wg" %}">Active WGs</a></li>
|
||||
<li><a href="{% url "ietf.group.views.active_groups" group_type="rg" %}">Active RGs</a></li>
|
||||
<li class="dropdown-submenu group-menu"><a href="{% url "ietf.group.views.active_groups" %}">Other</a>{% active_groups_menu %} </li>
|
||||
|
||||
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
|
||||
<li {%if flavor == "top" %}class="dropdown-header visible-lg-block"{% else %}class="nav-header hidden-nojs"{% endif %}>By area/parent</li>
|
||||
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
|
||||
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>New work</li>
|
||||
<li><a href="{% url "ietf.group.info.chartering_groups" %}">Chartering groups</a></li>
|
||||
<li><a href="{% url "ietf.group.info.bofs" group_type="wg" %}">BOFs</a></li>
|
||||
<li><a href="{% url "ietf.group.views.chartering_groups" %}">Chartering groups</a></li>
|
||||
<li><a href="{% url "ietf.group.views.bofs" group_type="wg" %}">BOFs</a></li>
|
||||
|
||||
{% if flavor == "top" %}<li class="divider hidden-xs"></li>{% endif %}
|
||||
<li {%if flavor == "top" %}class="dropdown-header hidden-xs"{% else %}class="nav-header"{% endif %}>Other groups</li>
|
||||
<li><a href="{% url "ietf.group.info.concluded_groups" %}">Concluded groups</a></li>
|
||||
<li><a href="{% url "ietf.group.views.concluded_groups" %}">Concluded groups</a></li>
|
||||
<li><a href="https://www.ietf.org/list/nonwg.html">Non-WG lists</a></li>
|
||||
|
||||
{% if flavor == "top" %}</ul>{% endif %}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<div class="btn-group-vertical btn-block">
|
||||
{% for group in area.active_groups %}
|
||||
<div class="btn-group btn-group-xs btn-group-justified">
|
||||
<a href="{% url "ietf.group.info.group_home" group_type=group.type_id acronym=group.acronym %}" class="btn btn-default">
|
||||
<a href="{% url "ietf.group.views.group_home" group_type=group.type_id acronym=group.acronym %}" class="btn btn-default">
|
||||
{{group.acronym}}
|
||||
</a>
|
||||
</div>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
<div class="btn-group-vertical btn-block">
|
||||
{% for group in rgs %}
|
||||
<div class="btn-group btn-group-xs btn-group-justified">
|
||||
<a href="{% url "ietf.group.info.group_home" group_type=group.type_id acronym=group.acronym %}" class="btn btn-default">
|
||||
<a href="{% url "ietf.group.views.group_home" group_type=group.type_id acronym=group.acronym %}" class="btn btn-default">
|
||||
{{group.acronym}}
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<tbody>
|
||||
{% for group in groups %}
|
||||
<tr>
|
||||
<td><a href="{% url "ietf.group.info.group_home" acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td><a href="{% url "ietf.group.views.group_home" acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td>{{ group.name }}</td>
|
||||
<td>
|
||||
{% for ad in group.ads %}
|
||||
|
|
@ -49,4 +49,4 @@
|
|||
|
||||
{% block js %}
|
||||
<script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
<p>When changing the area structure, the IESG can decide which members are responsible for new and changed areas, including making one sitting AD responsible for multiple areas, but the IESG can only add new members through the <a href="https://www.ietf.org/nomcom/index.html">nomcom process</a>.</p>
|
||||
<p>The primary task of area management is handled by one or two Area Directors per area. An AD may be advised by one or more directorates, which are created, selected, chaired and if necessary disbanded by the AD. Directorates may be specific to an area, specific to a technology, or chartered in some other fashion.</p>
|
||||
<p>The ADs for an area are jointly responsible for making sure the WGs in the area are well coordinated, that there is coverage for the technologies needed in the area, and that the challenges most important to the Internet in that area are indeed being worked on.</p>
|
||||
<ul><li>A full list of active working groups, sorted by area, may be found at <a href="{% url 'ietf.group.info.active_groups' group_type='wg'%}">{% url 'ietf.group.info.active_groups' group_type='wg' %}</a>.</li></ul>
|
||||
<ul><li>A full list of active working groups, sorted by area, may be found at <a href="{% url 'ietf.group.views.active_groups' group_type='wg'%}">{% url 'ietf.group.views.active_groups' group_type='wg' %}</a>.</li></ul>
|
||||
<p>The IESG decides which areas working groups belong to. The charter of each area is listed below.</p>
|
||||
|
||||
{% for area in areas %}
|
||||
<h2><a href="{%url 'ietf.group.info.active_groups' group_type='wg'%}#{{area.acronym}}">{{area.name}} ({{area.acronym}})</a></h2>
|
||||
<h2><a href="{%url 'ietf.group.views.active_groups' group_type='wg'%}#{{area.acronym}}">{{area.name}} ({{area.acronym}})</a></h2>
|
||||
<pre class="pasted">{{area.description}}</pre>
|
||||
{% endfor %}
|
||||
<p>For more information about the role of the IESG in areas and working groups, please see <a href="https://www.ietf.org/rfc/rfc3710.txt">RFC 3710 ("An IESG charter")</a>, section 6 and <a href="https://www.ietf.org/rfc/rfc2418.txt">RFC 2418 ("IETF Working Group Guidelines and Procedures")</a>.</p>
|
||||
|
|
|
|||
|
|
@ -26,9 +26,9 @@
|
|||
<tbody>
|
||||
{% for group in dirs %}
|
||||
<tr>
|
||||
<td><a href="{% url "ietf.group.info.group_home" acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td><a href="{% url "ietf.group.views.group_home" acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td>{{ group.name }}</td>
|
||||
<td><a href="{% url "ietf.group.info.group_home" acronym=group.parent.acronym %}">{{ group.parent.acronym }}</a></td>
|
||||
<td><a href="{% url "ietf.group.views.group_home" acronym=group.parent.acronym %}">{{ group.parent.acronym }}</a></td>
|
||||
<td>
|
||||
{% for ad in group.ads %}
|
||||
<a href="mailto:{{ ad.email.address }}">{{ ad.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<tbody>
|
||||
{% for typename in grouptypes %}
|
||||
<tr>
|
||||
<td><a href="{% url "ietf.group.info.active_groups" group_type=typename.slug%}">{{ typename.name }}</a></td>
|
||||
<td><a href="{% url "ietf.group.views.active_groups" group_type=typename.slug%}">{{ typename.name }}</a></td>
|
||||
<td>{{ typename.desc }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
@ -31,4 +31,4 @@
|
|||
|
||||
{% block js %}
|
||||
<script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<p><a href="mailto:irtf-chair@irtf.org">{{ irtf.chair.person.plain_name }}</a></p>
|
||||
|
||||
<h2>Active research groups</h2>
|
||||
<a class="btn btn-default" href="{% url "ietf.group.info.all_status" %}">Status Reports</a>
|
||||
<a class="btn btn-default" href="{% url "ietf.group.views.all_status" %}">Status Reports</a>
|
||||
|
||||
<table class="table table-striped table-condensed tablesorter">
|
||||
<thead>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
<tbody>
|
||||
{% for group in groups %}
|
||||
<tr>
|
||||
<td><a href="{% url "ietf.group.info.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td><a href="{% url "ietf.group.views.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td>{{ group.name }}</td>
|
||||
<td>{% for chair in group.chairs %}<a href="mailto:{{ chair.email.address }}">{{ chair.person.plain_name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<tbody>
|
||||
{% for group in teams %}
|
||||
<tr>
|
||||
<td><a href="{% url "ietf.group.info.group_home" acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td><a href="{% url "ietf.group.views.group_home" acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td>{{ group.name }}</td>
|
||||
<td>
|
||||
{% for chair in group.chairs %}
|
||||
|
|
@ -39,4 +39,4 @@
|
|||
|
||||
{% block js %}
|
||||
<script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
|
||||
{% endblock %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
|
||||
<h1>Active IETF working groups</h1>
|
||||
|
||||
<a class="btn btn-default" href="{% url "ietf.group.info.concluded_groups" %}">Concluded WGs</a>
|
||||
<a class="btn btn-default" href="{% url "ietf.group.views.concluded_groups" %}">Concluded WGs</a>
|
||||
<a class="btn btn-default" href="https://www.ietf.org/dyn/wg/charter/history/">Historic charters</a>
|
||||
<a class="btn btn-default" href="{% url "ietf.group.info.all_status" %}">Status Reports</a>
|
||||
<a class="btn btn-default" href="{% url "ietf.group.views.all_status" %}">Status Reports</a>
|
||||
|
||||
{% for area in areas %}
|
||||
<h2 class="anchor-target" id="{{area.acronym}}">{{ area.name }} ({{ area.acronym }})</h2>
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
<tbody>
|
||||
{% for group in area.groups %}
|
||||
<tr>
|
||||
<td><a href="{% url "ietf.group.info.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td><a href="{% url "ietf.group.views.group_home" group_type=group.type_id acronym=group.acronym %}">{{ group.acronym }}</a></td>
|
||||
<td>
|
||||
<a href="mailto:{{ group.ad_role.email.address }}" title="{{ group.ad_role.person.plain_name }} <{{ group.ad_role.email.address }}>">{{ group.ad_role.person.plain_name.split.0 }}</a>
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
{% else %}
|
||||
(None)
|
||||
{% if user|has_role:"Area Director,Secretariat" %}
|
||||
<a class="btn btn-warning btn-xs" href="{% url "ietf.group.edit.submit_initial_charter" group_type=group.type_id acronym=group.acronym %}">Submit charter</a>
|
||||
<a class="btn btn-warning btn-xs" href="{% url "ietf.group.views_edit.submit_initial_charter" group_type=group.type_id acronym=group.acronym %}">Submit charter</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</td>
|
||||
|
|
@ -74,9 +74,9 @@
|
|||
{% else %}
|
||||
(None)
|
||||
{% endif %}
|
||||
<a class="btn btn-default btn-xs" href="{% url "ietf.group.info.group_about_status" acronym=group.acronym %}">Show</a>
|
||||
<a class="btn btn-default btn-xs" href="{% url "ietf.group.views.group_about_status" acronym=group.acronym %}">Show</a>
|
||||
{% if can_provide_status_update %}
|
||||
<a class="btn btn-default btn-xs" href="{% url "ietf.group.info.group_about_status_edit" acronym=group.acronym %}">Edit</a>
|
||||
<a class="btn btn-default btn-xs" href="{% url "ietf.group.views.group_about_status_edit" acronym=group.acronym %}">Edit</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
<pre class="pasted">{{ status_update.desc|default:"(none)"|escape|urlize }}</pre>
|
||||
|
||||
{% if can_provide_status_update %}
|
||||
<a id="edit_button" class="btn btn-primary" href="{% url "ietf.group.info.group_about_status_edit" acronym=group.acronym %}">Edit</a>
|
||||
<a id="edit_button" class="btn btn-primary" href="{% url "ietf.group.views.group_about_status_edit" acronym=group.acronym %}">Edit</a>
|
||||
{% endif %}
|
||||
<a class="btn btn-default pull-right" href="{% url "ietf.group.info.group_about" acronym=group.acronym %}">Back</a>
|
||||
<a class="btn btn-default pull-right" href="{% url "ietf.group.views.group_about" acronym=group.acronym %}">Back</a>
|
||||
|
||||
{% if can_provide_status_update %}
|
||||
<h2>About Status Updates</h2>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
{% buttons %}
|
||||
<button type="submit" class="btn btn-primary" name="submit_response" value="Submit">Submit</button>
|
||||
<a class="btn btn-default pull-right" href="{% url "ietf.group.info.group_about" acronym=group.acronym %}">Back</a>
|
||||
<a class="btn btn-default pull-right" href="{% url "ietf.group.views.group_about" acronym=group.acronym %}">Back</a>
|
||||
{% endbuttons %}
|
||||
</form>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
{% if session.name %}
|
||||
<div class="anchor-target" id="{{ session.name|slugify }}">{{ session.name }}</div>
|
||||
{% else %}
|
||||
<div class="anchor-target" id="{{session.group.acronym}}"><a href="{% url 'ietf.group.info.group_home' acronym=session.group.acronym %}">{{session.group.acronym}}</a></div>
|
||||
<div class="anchor-target" id="{{session.group.acronym}}"><a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{session.group.acronym}}</a></div>
|
||||
{% if session.group.state.slug == "bof" %}
|
||||
<span class="label label-success">{{ session.group.state.slug|upper }}</span>
|
||||
{% endif %}
|
||||
|
|
|
|||
Loading…
Reference in a new issue