Move idrfc/ templates to doc/ and subdirectories in doc/, move ported ballot_icon template tag, delete dead code

 - Legacy-Id: 6052

Author: OleLaursen

ietf/doc/expire.py

@@ -82,7 +82,7 @@ def send_expire_warning_for_draft(doc):
     if to or cc:
         send_mail(request, to, frm,
                   u"Expiration impending: %s" % doc.file_tag(),
-                  "idrfc/expire_warning_email.txt",
+                  "doc/draft/expire_warning_email.txt",
                   dict(doc=doc,
                        state=state,
                        expiration=expiration
@@ -101,7 +101,7 @@ def send_expire_notice_for_draft(doc):
     send_mail(request, to,
               "I-D Expiring System <ietf-secretariat-reply@ietf.org>",
               u"I-D was expired %s" % doc.file_tag(),
-              "idrfc/id_expired_email.txt",
+              "doc/draft/id_expired_email.txt",
               dict(doc=doc,
                    state=state,
                    ))

ietf/doc/mails.py

@@ -21,7 +21,7 @@ def email_state_changed(request, doc, text):
     text = strip_tags(text)
     send_mail(request, to, None,
               "ID Tracker State Update Notice: %s" % doc.file_tag(),
-              "idrfc/state_changed_email.txt",
+              "doc/mail/state_changed_email.txt",
               dict(text=text,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
 
@@ -44,14 +44,14 @@ def email_stream_changed(request, doc, old_stream, new_stream, text=""):
 
     send_mail(request, to, None,
               "ID Tracker Stream Change Notice: %s" % doc.file_tag(),
-              "idrfc/stream_changed_email.txt",
+              "doc/mail/stream_changed_email.txt",
               dict(text=text,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
 
 def email_pulled_from_rfc_queue(request, doc, comment, prev_state, next_state):
     send_mail(request, ["IANA <iana@iana.org>", "RFC Editor <rfc-editor@rfc-editor.org>"], None,
               "%s changed state from %s to %s" % (doc.name, prev_state.name, next_state.name),
-              "idrfc/pulled_from_rfc_queue_email.txt",
+              "doc/mail/pulled_from_rfc_queue_email.txt",
               dict(doc=doc,
                    prev_state=prev_state,
                    next_state=next_state,
@@ -78,7 +78,7 @@ def email_ad(request, doc, ad, changed_by, text, subject=None):
     send_mail(request, to,
               "DraftTracker Mail System <iesg-secretary@ietf.org>",
               "%s updated by %s" % (doc.file_tag(), changed_by.plain_name()),
-              "idrfc/change_notice.txt",
+              "doc/mail/change_notice.txt",
               dict(text=html_to_text(text),
                    doc=doc,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
@@ -93,7 +93,7 @@ def generate_ballot_writeup(request, doc):
     e.by = request.user.get_profile()
     e.doc = doc
     e.desc = u"Ballot writeup was generated"
-    e.text = unicode(render_to_string("idrfc/ballot_writeup.txt", {'iana': iana}))
+    e.text = unicode(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana}))
     e.save()
 
     return e
@@ -118,7 +118,7 @@ def generate_last_call_announcement(request, doc):
     else:
         ipr_links = None
 
-    mail = render_to_string("idrfc/last_call_announcement.txt",
+    mail = render_to_string("doc/mail/last_call_announcement.txt",
                             dict(doc=doc,
                                  doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url() + "ballot/",
                                  expiration_date=expiration_date.strftime("%Y-%m-%d"), #.strftime("%B %-d, %Y"),
@@ -196,7 +196,7 @@ def generate_approval_mail_approved(request, doc):
 
     doc_type = "RFC" if doc.get_state_slug() == "rfc" else "Internet Draft"
 
-    return render_to_string("idrfc/approval_mail.txt",
+    return render_to_string("doc/mail/approval_mail.txt",
                             dict(doc=doc,
                                  docs=[doc],
                                  doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
@@ -227,7 +227,7 @@ def generate_approval_mail_rfc_editor(request, doc):
         # include IRSG
         to.append('"Internet Research Steering Group" <irsg@irtf.org>')
 
-    return render_to_string("idrfc/approval_mail_rfc_editor.txt",
+    return render_to_string("doc/mail/approval_mail_rfc_editor.txt",
                             dict(doc=doc,
                                  doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
                                  doc_type=doc_type,
@@ -251,7 +251,7 @@ def generate_publication_request(request, doc):
         approving_body = str(doc.stream)
         consensus_body = approving_body
 
-    return render_to_string("idrfc/publication_request.txt",
+    return render_to_string("doc/mail/publication_request.txt",
                             dict(doc=doc,
                                  doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
                                  group_description=group_description,
@@ -267,7 +267,7 @@ def send_last_call_request(request, doc):
 
     send_mail(request, to, frm,
               "Last Call: %s" % doc.file_tag(),
-              "idrfc/last_call_request.txt",
+              "doc/mail/last_call_request.txt",
               dict(docs=[doc],
                    doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
 
@@ -282,7 +282,7 @@ def email_resurrect_requested(request, doc, by):
 
     send_mail(request, to, e.formatted_email(),
               "I-D Resurrection Request",
-              "idrfc/resurrect_request_email.txt",
+              "doc/mail/resurrect_request_email.txt",
               dict(doc=doc,
                    by=frm,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
@@ -297,7 +297,7 @@ def email_resurrection_completed(request, doc, requester):
     frm = "I-D Administrator <internet-drafts-reply@ietf.org>"
     send_mail(request, to, frm,
               "I-D Resurrection Completed - %s" % doc.file_tag(),
-              "idrfc/resurrect_completed_email.txt",
+              "doc/mail/resurrect_completed_email.txt",
               dict(doc=doc,
                    by=frm,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()))
@@ -307,7 +307,7 @@ def email_ballot_deferred(request, doc, by, telechat_date):
     frm = "DraftTracker Mail System <iesg-secretary@ietf.org>"
     send_mail(request, to, frm,
               "IESG Deferred Ballot notification: %s" % doc.file_tag(),
-              "idrfc/ballot_deferred_email.txt",
+              "doc/mail/ballot_deferred_email.txt",
               dict(doc=doc,
                    by=by,
                    telechat_date=telechat_date))
@@ -364,7 +364,7 @@ def formatted(val):
     e = doc.latest_event(WriteupDocEvent, type="changed_ballot_writeup_text")
     ballot_writeup = e.text if e else ""
 
-    return render_to_string("idrfc/issue_ballot_mail.txt",
+    return render_to_string("doc/mail/issue_ballot_mail.txt",
                             dict(doc=doc,
                                  doc_url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(),
                                  active_ad_positions=active_ad_positions,
@@ -408,7 +408,7 @@ def email_last_call_expired(doc):
               to,
               "DraftTracker Mail System <iesg-secretary@ietf.org>",
               "Last Call Expired: %s" % doc.file_tag(),
-              "idrfc/change_notice.txt",
+              "doc/mail/change_notice.txt",
               dict(text=text,
                    doc=doc,
                    url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url()),

…rfc/templatetags/ballot_icon_redesign.py ietf/doc/templatetags/ballot_icon.pyietf/idrfc/templatetags/ballot_icon_redesign.py renamed to ietf/doc/templatetags/ballot_icon.py ietf/idrfc/templatetags/ballot_icon_redesign.py renamed to ietf/doc/templatetags/ballot_icon.py

@@ -45,7 +45,7 @@
 
 class WgMenuNode(template.Node):
     def render(self, context):
-        x = cache.get('idrfc_wgmenu')
+        x = cache.get('base_left_wgmenu')
         if x:
             return x
 
@@ -62,7 +62,7 @@ def render(self, context):
         areas = [a for a in areas if a.active_groups]
 
         res = loader.render_to_string('base_wgmenu.html', {'areas':areas})
-        cache.set('idrfc_wgmenu', x, 30*60)
+        cache.set('base_left_wgmenu', x, 30*60)
         return res
 
 def do_wg_menu(parser, token):

ietf/doc/templatetags/wg_menu.py

@@ -246,3 +246,42 @@ def test_document_json(self):
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_json", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
+
+
+class AddCommentTestCase(django.test.TestCase):
+    fixtures = ['names']
+
+    def test_add_comment(self):
+        draft = make_test_data()
+        url = urlreverse('doc_add_comment', kwargs=dict(name=draft.name))
+        login_testing_unauthorized(self, "secretary", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('form textarea[name=comment]')), 1)
+
+        # request resurrect
+        events_before = draft.docevent_set.count()
+        mailbox_before = len(outbox)
+        
+        r = self.client.post(url, dict(comment="This is a test."))
+        self.assertEquals(r.status_code, 302)
+
+        self.assertEquals(draft.docevent_set.count(), events_before + 1)
+        self.assertEquals("This is a test.", draft.latest_event().desc)
+        self.assertEquals("added_comment", draft.latest_event().type)
+        self.assertEquals(len(outbox), mailbox_before + 1)
+        self.assertTrue("updated" in outbox[-1]['Subject'])
+        self.assertTrue(draft.name in outbox[-1]['Subject'])
+
+        # Make sure we can also do it as IANA
+        self.client.login(remote_user="iana")
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertEquals(len(q('form textarea[name=comment]')), 1)
+

ietf/doc/tests.py

@@ -493,41 +493,3 @@ def test_make_last_call(self):
         self.assertTrue("Last Call" in outbox[-3]['Subject'])
         self.assertTrue("Last Call" in draft.message_set.order_by("-time")[0].subject)
 
-class RequestPublicationTestCase(django.test.TestCase):
-    fixtures = ['names']
-
-    def test_request_publication(self):
-        draft = make_test_data()
-        draft.stream = StreamName.objects.get(slug="iab")
-        draft.group = Group.objects.get(acronym="iab")
-        draft.intended_std_level = IntendedStdLevelName.objects.get(slug="inf")
-        draft.save()
-        draft.set_state(State.objects.get(used=True, type="draft-stream-iab", slug="approved"))
-
-        url = urlreverse('doc_request_publication', kwargs=dict(name=draft.name))
-        login_testing_unauthorized(self, "iabchair", url)
-
-        # normal get
-        r = self.client.get(url)
-        self.assertEquals(r.status_code, 200)
-        q = PyQuery(r.content)
-        subject = q('input#id_subject')[0].get("value")
-        self.assertTrue("Document Action" in subject)
-        body = q('.request-publication #id_body').text()
-        self.assertTrue("Informational" in body)
-        self.assertTrue("IAB" in body)
-
-        # approve
-        mailbox_before = len(outbox)
-
-        r = self.client.post(url, dict(subject=subject, body=body, skiprfceditorpost="1"))
-        self.assertEquals(r.status_code, 302)
-
-        draft = Document.objects.get(name=draft.name)
-        self.assertEquals(draft.get_state_slug("draft-stream-iab"), "rfc-edit")
-        self.assertEquals(len(outbox), mailbox_before + 2)
-        self.assertTrue("Document Action" in outbox[-2]['Subject'])
-        self.assertTrue("Document Action" in draft.message_set.order_by("-time")[0].subject)
-        # the IANA copy
-        self.assertTrue("Document Action" in outbox[-1]['Subject'])
-        self.assertTrue(not outbox[-1]['CC'])

ietf/doc/tests_ballot.py

@@ -406,44 +406,6 @@ def test_resurrect(self):
         self.assertEquals(draft.get_state_slug(), "active")
         self.assertTrue(draft.expires >= datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE - 1))
         self.assertEquals(len(outbox), mailbox_before + 1)
-        
-class AddCommentTestCase(django.test.TestCase):
-    fixtures = ['names']
-
-    def test_add_comment(self):
-        draft = make_test_data()
-        url = urlreverse('doc_add_comment', kwargs=dict(name=draft.name))
-        login_testing_unauthorized(self, "secretary", url)
-
-        # normal get
-        r = self.client.get(url)
-        self.assertEquals(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEquals(len(q('form textarea[name=comment]')), 1)
-
-        # request resurrect
-        events_before = draft.docevent_set.count()
-        mailbox_before = len(outbox)
-        
-        r = self.client.post(url, dict(comment="This is a test."))
-        self.assertEquals(r.status_code, 302)
-
-        self.assertEquals(draft.docevent_set.count(), events_before + 1)
-        self.assertEquals("This is a test.", draft.latest_event().desc)
-        self.assertEquals("added_comment", draft.latest_event().type)
-        self.assertEquals(len(outbox), mailbox_before + 1)
-        self.assertTrue("updated" in outbox[-1]['Subject'])
-        self.assertTrue(draft.name in outbox[-1]['Subject'])
-
-        # Make sure we can also do it as IANA
-        self.client.login(remote_user="iana")
-
-        # normal get
-        r = self.client.get(url)
-        self.assertEquals(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEquals(len(q('form textarea[name=comment]')), 1)
-
 
 
 class ExpireIDsTestCase(django.test.TestCase):
@@ -905,3 +867,41 @@ def setUp(self):
         self.docname='draft-ietf-mars-test'
         self.doc = Document.objects.get(name=self.docname)
 
+class RequestPublicationTestCase(django.test.TestCase):
+    fixtures = ['names']
+
+    def test_request_publication(self):
+        draft = make_test_data()
+        draft.stream = StreamName.objects.get(slug="iab")
+        draft.group = Group.objects.get(acronym="iab")
+        draft.intended_std_level = IntendedStdLevelName.objects.get(slug="inf")
+        draft.save()
+        draft.set_state(State.objects.get(used=True, type="draft-stream-iab", slug="approved"))
+
+        url = urlreverse('doc_request_publication', kwargs=dict(name=draft.name))
+        login_testing_unauthorized(self, "iabchair", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        subject = q('input#id_subject')[0].get("value")
+        self.assertTrue("Document Action" in subject)
+        body = q('.request-publication #id_body').text()
+        self.assertTrue("Informational" in body)
+        self.assertTrue("IAB" in body)
+
+        # approve
+        mailbox_before = len(outbox)
+
+        r = self.client.post(url, dict(subject=subject, body=body, skiprfceditorpost="1"))
+        self.assertEquals(r.status_code, 302)
+
+        draft = Document.objects.get(name=draft.name)
+        self.assertEquals(draft.get_state_slug("draft-stream-iab"), "rfc-edit")
+        self.assertEquals(len(outbox), mailbox_before + 2)
+        self.assertTrue("Document Action" in outbox[-2]['Subject'])
+        self.assertTrue("Document Action" in draft.message_set.order_by("-time")[0].subject)
+        # the IANA copy
+        self.assertTrue("Document Action" in outbox[-1]['Subject'])
+        self.assertTrue(not outbox[-1]['CC'])

ietf/doc/tests_draft.py

@@ -70,7 +70,7 @@
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/info/$', views_draft.edit_info, name='doc_edit_info'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/requestresurrect/$', views_draft.request_resurrect, name='doc_request_resurrect'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/resurrect/$', views_draft.resurrect, name='doc_resurrect'),                       
-    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/addcomment/$', views_draft.add_comment, name='doc_add_comment'),
+    url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/addcomment/$', views_doc.add_comment, name='doc_add_comment'),
 
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/stream/$', views_draft.change_stream, name='doc_change_stream'),
     url(r'^(?P<name>[A-Za-z0-9._+-]+)/edit/notify/$', views_draft.edit_notices, name='doc_change_notify'),