Improved history tab in "new tracker UI"; per-document page now works better without JavaScript; internal refactoring/cleaning of per-document page

 - Legacy-Id: 1906

Author: pasieronen

ietf/idrfc/testurl.list

@@ -4,29 +4,24 @@
 # draft that's now RFC
 200	/doc/draft-ietf-avt-rtp-atrac-family/
 200	/doc/draft-ietf-avt-rtp-atrac-family/_debug.data
-200	/doc/draft-ietf-avt-rtp-atrac-family/_comments.data
 200	/doc/draft-ietf-avt-rtp-atrac-family/_ballot.data
-200	/doc/draft-ietf-avt-rtp-atrac-family/_versions.data
 
 # replaced draft, never went to IESG
 200	/doc/draft-eronen-mobike-mopo/
-404	/doc/draft-eronen-mobike-mopo/_comments.data
 404	/doc/draft-eronen-mobike-mopo/_ballot.data
-200	/doc/draft-eronen-mobike-mopo/_versions.data
+
+# expired draft
+200 	/doc/draft-eronen-eap-sim-aka-80211/
 
 # Normal RFC 
 200	/doc/rfc4739/
 200	/doc/rfc4739/_debug.data
-404	/doc/rfc4739/_comments.data
 404	/doc/rfc4739/_ballot.data
-404	/doc/rfc4739/_versions.data
 
 # RFC that's evaluated in IESG
 200	/doc/rfc3852/
 200	/doc/rfc3852/_debug.data
-200	/doc/rfc3852/_comments.data
 200	/doc/rfc3852/_ballot.data
-404	/doc/rfc3852/_versions.data
 
 404	/doc/draft-no-such-draft/
 404	/doc/rfc4637/

ietf/idrfc/urls.py

@@ -39,8 +39,6 @@
     (r'^search/$', views_search.search_results),
     (r'^(?P<name>[^/]+)/$', views_doc.document_main),
     (r'^(?P<name>[^/]+)/_debug.data$', views_doc.document_debug),
-    (r'^(?P<name>[^/]+)/_comments.data$', views_doc.document_comments),
     (r'^(?P<name>[^/]+)/_ballot.data$', views_doc.document_ballot),
-    (r'^(?P<name>[^/]+)/_versions.data$', views_doc.document_versions),
     (r'^ad/(?P<name>[^/]+)/$', views_search.by_ad)
 )

ietf/idrfc/views_doc.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import re
+import re, os
+from datetime import datetime, time
 from django.http import HttpResponse, Http404
 from django.shortcuts import render_to_response, get_object_or_404
 from ietf.idtracker.models import InternetDraft, IDInternal, BallotInfo
@@ -42,6 +43,7 @@
 from django.template.defaultfilters import truncatewords_html
 from ietf.idtracker.templatetags.ietf_filters import format_textarea, fill
 
+
 def document_debug(request, name):
     r = re.compile("^rfc([0-9]+)$")
     m = r.match(name)
@@ -54,29 +56,40 @@ def document_debug(request, name):
         doc = IdWrapper(draft=id)
     return HttpResponse(doc.to_json(), mimetype='text/plain')
 
-def document_main_rfc(request, rfc_number):
-    rfci = get_object_or_404(RfcIndex, rfc_number=rfc_number)
-    doc = RfcWrapper(rfci)
-
-    info = {}
-    content1 = None
-    content2 = None
+def _get_html(key, filename):
     f = None
     try:
-        try:
-            f = open(settings.RFC_PATH+"rfc"+str(rfc_number)+".txt")
-            content = f.read()
-            (content1, content2) = markup_txt.markup(content)
-        except IOError:
-            content1 = "Error - can't find"+"rfc"+str(rfc_number)+".txt"
-            content2 = ""
+        f = open(filename, 'rb')
+        raw_content = f.read()
+    except IOError:
+        return ("Error; cannot read "+key, "")
     finally:
         if f:
             f.close()
+    (c1,c2) = markup_txt.markup(raw_content)
+    return (c1,c2)
+
+def document_main_rfc(request, rfc_number):
+    rfci = get_object_or_404(RfcIndex, rfc_number=rfc_number)
+    doc = RfcWrapper(rfci)
+
+    info = {}
+    info['is_rfc'] = True
+    (content1, content2) = _get_html(
+        "rfc"+str(rfc_number)+",html", 
+        os.path.join(settings.RFC_PATH, "rfc"+str(rfc_number)+".txt"))
+
+    if doc.in_ietf_process() and doc.ietf_process.has_iesg_ballot():
+        ballot = doc.ietf_process.iesg_ballot()
+    else:
+        ballot = None
+        
+    history = _get_history(doc)
 
     return render_to_response('idrfc/doc_main_rfc.html',
                               {'content1':content1, 'content2':content2,
-                               'doc':doc, 'info':info},
+                               'doc':doc, 'info':info, 'ballot':ballot,
+                               'history':history},
                               context_instance=RequestContext(request));
 
 def document_main(request, name):
@@ -108,53 +121,71 @@ def document_main(request, name):
         info['type'] = "Old Internet-Draft"+stream
 
     info['has_pdf'] = (".pdf" in doc.file_types())
+    info['is_rfc'] = False
 
-    content1 = None
-    content2 = None
-    if info['is_active_draft']:
-        f = None
-        try:
-            try:
-                f = open(settings.INTERNET_DRAFT_PATH+name+"-"+id.revision+".txt")
-                content = f.read()
-                (content1, content2) = markup_txt.markup(content)
-            except IOError:
-                content1 = "Error - can't find "+name+"-"+id.revision+".txt"
-                content2 = ""
-        finally:
-            if f:
-                f.close()
+    (content1, content2) = _get_html(
+        str(name)+","+str(id.revision)+",html",
+        os.path.join(settings.INTERNET_DRAFT_PATH, name+"-"+id.revision+".txt"))
+
+    if doc.in_ietf_process() and doc.ietf_process.has_iesg_ballot():
+        ballot = doc.ietf_process.iesg_ballot()
+    else:
+        ballot = None
+
+    versions = _get_versions(id)
+    history = _get_history(doc)
 
     return render_to_response('idrfc/doc_main_id.html',
                               {'content1':content1, 'content2':content2,
-                               'doc':doc, 'info':info},
+                               'doc':doc, 'info':info, 'ballot':ballot,
+                               'versions':versions, 'history':history},
                               context_instance=RequestContext(request));
 
-def document_comments(request, name):
-    r = re.compile("^rfc([0-9]+)$")
-    m = r.match(name)
-    if m:
-        id = get_object_or_404(IDInternal, rfc_flag=1, draft=int(m.group(1)))
-    else:
-        id = get_object_or_404(IDInternal, rfc_flag=0, draft__filename=name)
+# doc is either IdWrapper or RfcWrapper
+def _get_history(doc):
     results = []
-    commentNumber = 0
-    for comment in id.public_comments():
-        info = {}
-        r = re.compile(r'^(.*) by (?:<b>)?([A-Z]\w+ [A-Z]\w+)(?:</b>)?$')
-        m = r.match(comment.comment_text)
-        if m:
-            info['text'] = m.group(1)
-            info['by'] = m.group(2)
-        else:
+    if doc._idinternal:
+        for comment in doc._idinternal.public_comments():
+            info = {}
             info['text'] = comment.comment_text
             info['by'] = comment.get_fullname()
-        info['textSnippet'] = truncatewords_html(format_textarea(fill(info['text'], 80)), 25)
-        info['snipped'] = info['textSnippet'][-3:] == "..."
-        info['commentNumber'] = commentNumber
-        commentNumber = commentNumber + 1
-        results.append({'comment':comment, 'info':info})
-    return render_to_response('idrfc/doc_comments.html', {'comments':results}, context_instance=RequestContext(request))
+            info['textSnippet'] = truncatewords_html(format_textarea(fill(info['text'], 80)), 25)
+            info['snipped'] = info['textSnippet'][-3:] == "..."
+            results.append({'comment':comment, 'info':info, 'date':comment.datetime(), 'is_com':True})
+    if doc.is_id_wrapper:
+        versions = _get_versions(doc._draft, False)
+        versions.reverse()
+        for v in versions:
+            v['is_rev'] = True
+            results.append(v)
+    if doc.is_id_wrapper and doc.draft_status == "Expired" and doc._draft.expiration_date:
+        results.append({'is_text':True, 'date':doc._draft.expiration_date, 'text':'Draft expired'})
+    if doc.is_rfc_wrapper:
+        results.append({'is_text':True, 'date':doc.publication_date, 'text':'RFC Published'})
+
+    # convert plain dates to datetimes (required for sorting)
+    for x in results:
+        if not isinstance(x['date'], datetime):
+            x['date'] = datetime.combine(x['date'], time(0,0,0))
+
+    results.sort(key=lambda x: x['date'])
+    results.reverse()
+    return results
+
+# takes InternetDraft instance
+def _get_versions(draft, include_replaced=True):
+    ov = []
+    ov.append({"draft_name":draft.filename, "revision":draft.revision_display(), "date":draft.revision_date})
+    if include_replaced:
+        draft_list = [draft]+list(draft.replaces_set.all())
+    else:
+        draft_list = [draft]
+    for d in draft_list:
+        for v in DraftVersions.objects.filter(filename=d.filename).order_by('-revision'):
+            if (d.filename == draft.filename) and (draft.revision_display() == v.revision):
+                continue
+            ov.append({"draft_name":d.filename, "revision":v.revision, "date":v.revision_date})
+    return ov
 
 def document_ballot(request, name):
     r = re.compile("^rfc([0-9]+)$")
@@ -172,15 +203,3 @@ def document_ballot(request, name):
     ballot = BallotWrapper(id)
     return render_to_response('idrfc/doc_ballot.html', {'ballot':ballot}, context_instance=RequestContext(request))
 
-def document_versions(request, name):
-    draft = get_object_or_404(InternetDraft, filename=name)
-    ov = []
-    ov.append({"draft_name":draft.filename, "revision":draft.revision, "revision_date":draft.revision_date})
-    for d in [draft]+list(draft.replaces_set.all()):
-        for v in DraftVersions.objects.filter(filename=d.filename).order_by('-revision'):
-            if (d.filename == draft.filename) and (draft.revision == v.revision):
-                continue
-            ov.append({"draft_name":d.filename, "revision":v.revision, "revision_date":v.revision_date})
-    
-    return render_to_response('idrfc/doc_versions.html', {'versions':ov}, context_instance=RequestContext(request))
-

ietf/templates/idrfc/doc_versions.html ietf/templates/idrfc/doc_diffs.htmlietf/templates/idrfc/doc_versions.html renamed to ietf/templates/idrfc/doc_diffs.html

@@ -1,5 +1,5 @@
 {% comment %}
-Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com> 
 
 Redistribution and use in source and binary forms, with or without
@@ -32,38 +32,37 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {% endcomment %}
 
-<h2 style="margin-top:0;">Old versions and diffs</h2>
-
 <div class="diffTool">
-<form action="http://tools.ietf.org/rfcdiff" method="get" target="_blank">
-
+<h2 style="margin-top:0;margin-bottom:4px;">Diffs</h2>
+<form action="http://tools.ietf.org/rfcdiff" method="get" target="_blank" style="margin:0;">
+<table>
+<tr><td>
 <label>From:</label> <select name="url1">
 {% for id in versions %}
-<option value="{{id.draft_name}}-{{id.revision}}" {% ifequal forloop.counter 2 %} selected="selected" {% endifequal %}>{{id.draft_name}}-{{id.revision}} ({{id.revision_date}})</option>
+<option value="{{id.draft_name}}-{{id.revision}}" {% ifequal forloop.counter 2 %} selected="selected" {% endifequal %}>{{id.draft_name}}-{{id.revision}} ({{id.date}})</option>
 {% endfor %}
-</select><br/>
-<label>To</label>
+</select>
+</td>
+<td rowspan="2" valign="top">
+Format:
+<select name="difftype">
+<option value="--html" selected="selected">Side-by-side</option>
+<option value="--abdiff">Before-after</option>
+<option value="--chbars">Change bars</option>
+<option value="--hwdiff">Wdiff</option>
+</select> <input name="submit" value="Go!" type="submit" />
+</td>
+</tr>
+<tr>
+<td>
+<label>To:</label>
 <select name="url2">
 {% for id in versions %}
-<option value="{{id.draft_name}}-{{id.revision}}" {% ifequal forloop.counter 1 %} selected="selected" {% endifequal %}>{{id.draft_name}}-{{id.revision}} ({{id.revision_date}})</option>
+<option value="{{id.draft_name}}-{{id.revision}}" {% ifequal forloop.counter 1 %} selected="selected" {% endifequal %}>{{id.draft_name}}-{{id.revision}} ({{id.date}})</option>
 {% endfor %}
-</select><br/>
-
-<label>Format:</label>
-
-<input name="difftype" value="--html" checked="checked" type="radio">Side-by-side 
-<input name="difftype" value="--abdiff" type="radio">Before-after
-<input name="difftype" value="--chbars" type="radio">Change bars
-<input name="difftype" value="--hwdiff" type="radio">Wdiff<br />
-
-<input name="submit" value="Generate diff" type="submit" />
-
+</select>
+</td>
+</tr>
+</table>
 </form>
 </div>
-
-<table class="ietfTable">
-<tr><th>Date</th><th>Document</th></tr>
-{% for id in versions %}
-<tr><td>{{id.revision_date}}</td><td><a href="http://tools.ietf.org/id/{{id.draft_name}}-{{id.revision}}.txt">{{id.draft_name}}-{{id.revision}}.txt</a></td></tr>
-{% endfor %}
-</table>

ietf/templates/idrfc/doc_comments.html ietf/templates/idrfc/doc_history.htmlietf/templates/idrfc/doc_comments.html renamed to ietf/templates/idrfc/doc_history.html

@@ -1,5 +1,5 @@
 {% comment %}
-Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com> 
 
 Redistribution and use in source and binary forms, with or without
@@ -33,30 +33,44 @@
 {% endcomment %}
 
 {% load ietf_filters %} 
-
-<h2 style="margin-top:0;">Document history</h2>
 <table class="ietfTable">
 <tr><th class="comment_date">Date</th><th class="comment_version">Version</th><th class="comment_by">By</th><th class="comment_text">Text</th></tr>
 
-{% for c in comments %}
-
+{% for c in history %}
 <tr class="{% cycle oddrow,evenrow %}">
-<td class="comment_date">{{ c.comment.date }}</td>
+<td class="comment_date">{{ c.date|date:"Y-m-d" }}</td>
+
+{% if c.is_rev %}
+<td class="comment_version">{{ c.revision }}</td>
+<td class="comment_by">(System)</td>
+<td class="comment_text">New version available: <a href="http://tools.ietf.org/id/{{c.draft_name}}-{{c.revision}}.txt">{{c.draft_name}}-{{c.revision}}</a> {% ifnotequal c.revision "00" %}(<a href="http://tools.ietf.org/rfcdiff?url2={{c.draft_name}}-{{c.revision}}">diff from -{{c.revision|add:"-1"|stringformat:"02d"}}</a>){% endifnotequal %}</td>
+{% endif %}
+
+{% if c.is_text %}
+<td class="comment_version">&nbsp;</td>
+<td class="comment_by">(System)</td>
+<td class="comment_text">{{ c.text }}</td>
+{% endif %}
+
+{% if c.is_com %}
 <td class="comment_version">{{ c.comment.version }}</td>
 <td class="comment_by">{{ c.info.by|escape }}</td>
 <td class="comment_text">{% if c.comment.ballot %}
 [Ballot {{ c.comment.get_ballot_display }}]<br /> 
 {% endif %} 
 {% if c.info.snipped %}
-<div class="commentSnippet" id="commentS{{c.info.commentNumber}}">{{ c.info.textSnippet|safe }}</div>
-<span class="commentToggle" onClick="toggleComment({{c.info.commentNumber}})" id="commentT{{c.info.commentNumber}}">[show all]</span>
-<div class="commentFull" id="commentF{{c.info.commentNumber}}" style="display:none;">
+<div class="commentSnippet" id="commentS{{forloop.counter}}">{{ c.info.textSnippet|safe }}</div>
+<span class="commentToggle" onclick="toggleComment({{forloop.counter}})" id="commentT{{forloop.counter}}">[show all]</span>
+<div class="commentFull" id="commentF{{forloop.counter}}" style="display:none;">
 {{c.info.text|fill:"80"|format_textarea|safe}}
 </div>
 {% else %}
 {{ c.info.text|fill:"80"|format_textarea|safe}}
 {% endif %}
 </td>
+{% endif %}
+
+</tr>
 {% endfor %}
 
-</table>
+</table>