Merged in changes from Pasi. See changelog for details.

 - Legacy-Id: 1480

Author: levkowetz

changelog

@@ -1,3 +1,16 @@
+ietfdb (2.26)
+
+  * Fixed parsing of REF state in RFC Editor queue.
+
+  * Include draft version in document comment Atom feed.	
+
+  * Minor formatting bugfixes (should work better with IE6 and Safari)
+    in "new layout" (idrfc).
+
+  * Minor fixes to showing "days in state" data.
+	
+ -- Pasi Eronen <pasi.eronen@nokia.com>  28 May 2009 14:03:45 +0200
+
 ietfdb (2.25)
 
   * Refactored IdRfcWrapper and lots of improvements to ID/RFC pages.

ietf/idrfc/mirror_rfc_editor_queue.py

@@ -77,19 +77,23 @@ def getChildText(parentNode, tagName):
             for child in node.childNodes:
                 if child.nodeType == Node.ELEMENT_NODE and child.localName == "state":
                     states.append(child.firstChild.data)
-            if len(states) == 0:
-                state = "?"
-            else:
-                state = " ".join(states)
-            
-            drafts.append([draft_name, date_received, state, stream])
 
+            has_refs = False
             for child in node.childNodes:
                 if child.nodeType == Node.ELEMENT_NODE and child.localName == "normRef":
                     ref_name = getChildText(child, "ref-name")
                     ref_state = getChildText(child, "ref-state")
                     in_queue = ref_state.startswith("IN-QUEUE")
                     refs.append([draft_name, ref_name, in_queue, True])
+                    has_refs = True
+            if has_refs and not "MISSREF" in states:
+                states.append("REF")
+
+            if len(states) == 0:
+                state = "?"
+            else:
+                state = " ".join(states)
+            drafts.append([draft_name, date_received, state, stream])
 
         elif event == pulldom.START_ELEMENT and node.tagName == "section":
             name = node.getAttribute('name')

ietf/idrfc/templatetags/ballot_icon.py

@@ -162,9 +162,11 @@ def state_age_colored(doc):
         goal = 30
     elif main_state == "RFC Ed Queue":
         goal = 60
+    elif main_state == "In Last Call":
+        goal = 30
     else:
         goal = 14
     if days > goal:
-        return '<span style="padding:0 2px;font-size:85%%;background:yellow;" title="Goal is %d days">(for %d days)</span>' % (goal,days)
+        return '<span style="padding:0 2px;font-size:85%%;background:yellow;" title="Goal is %d days">(for&nbsp;%d&nbsp;day%s)</span>' % (goal,days,('','s')[days != 1])
     else:
-        return '<span style="font-size:85%%;">(for %d days)</span>' % (days,)
+        return '<span style="font-size:85%%;">(for&nbsp;%d&nbsp;day%s)</span>' % (days,('','s')[days != 1])

ietf/templates/feeds/comments_title.html

@@ -1,3 +1,4 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 [{{ obj.get_username }}] {{ obj.comment_text|removetags:"b"|truncatewords:"15" }}
 {% if obj.ballot %}[[ IESG {{ obj.get_ballot_display.upper }} ]]{% endif %}
+{% if not obj.document.rfc_flag %}[ version {{ obj.version }} ]{% endif %}

ietf/templates/idrfc/base_leftmenu.html

@@ -46,7 +46,7 @@
 <li class="sect first">Working Groups by Area</li>
 {% endif %}
 
-  <li><div id="wgs" class="yuimenu"><div class="bd">
+  <li><div id="wgs" class="yuimenu"><div class="bd" style="border:0;">
   <ul class="first-of-type" style="padding:0;">
   <!-- begin wg_menu -->
   {% wg_menu %}
@@ -58,8 +58,7 @@
 
 <li class="sect">Internet Drafts&nbsp;&amp;&nbsp;RFCs</li>
   <li><a href="/doc/">Search</a></li>
-  <li><form action="/doc/search/" method="get" style="margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name"/>
-<input type="hidden" name="activeDrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>
+  <li><form action="/doc/search/" method="get" style="padding-bottom:0;margin-bottom:0;"><input type="text" style="margin-left:10px; width:100px; border:1px solid #89d;" name="name" /><input type="hidden" name="activeDrafts" value="on"/><input type="hidden" name="rfcs" value="on"/></form></li>
   <li><a href="https://datatracker.ietf.org/idst/upload.cgi">Submit a draft</a></li> 
 
 

ietf/templates/idrfc/search_result_row.html

@@ -45,7 +45,7 @@
 {% if doc.id and doc.id.expected_expiration_date and doc.id.expected_expiration_date|timesince_days|greater_than:"-14" %}<br/><span style="padding:0 2px;font-size:85%;background:yellow;">expires soon</span>{%endif%}
 </td>
 
-<td class="status">{{ doc.friendly_state|escape }}
+<td class="status">{{ doc.friendly_state }}
 {% if not doc.rfc %}{{ doc.id|state_age_colored }}{% endif %}
 {% if doc.rfc %}
 {% if doc.rfc.obsoleted_by %}<br />Obsoleted by {{ doc.rfc.obsoleted_by }}{%endif %}

static/css/base2.css

@@ -56,11 +56,14 @@ body { margin: 0; }
 
 .leftmenu { background-color: #edf5ff; padding:0; border: 1px solid #89d;  }
 .leftmenu ul { padding: 0; margin: 0; }
-.leftmenu ul li { list-style: none; padding: 0; margin: 0; font-size: 90%; }
-.leftmenu ul li a { display:block; padding: 2px 2px 2px 10px; }
+.leftmenu ul li { list-style: none; padding: 0; margin: 0; font-size: 90%; padding: 2px 0px 2px 0px; }
+.leftmenu ul li.yuimenuitem { padding: 1px 0px 1px 0px; border: 0;} 
+.leftmenu ul li a { padding: 0px 0px 0px 10px; }
+.leftmenu ul li.sect a { padding: 2px 2px 2px 2px; }
 .leftmenu ul li.sect { font-weight:bold; color:#fff; background:#2647A0; margin-top:2px; text-indent:2px; padding: 2px 0;}
 .leftmenu ul li.first { margin-top: 0px; }
 .leftmenu ul li a:hover { color:#fff; background: #e60; }
+.leftmenu ul li.sect a { color:#fff; } 
 
 .leftmenu .yuimenuitemlabel { font-size: 12px; padding: 0 10px; }
 .leftmenu a.yuimenuitemlabel { color:#0000ee; /*text-decoration: underline;*/ }
@@ -106,6 +109,7 @@ form#search_form { padding-top: 4px; padding-bottom: 4px; }
 .search_results th.ad, .search_results td.ad { white-space:nowrap; min-width: 6em; }
 .search_results td.ballot { border-left: hidden; }
 
+td.ballot { min-width:37px;  }
 table.ballot_icon { empty-cells: show; padding: 0; border-spacing: 0; border: 1px solid black; border-collapse: collapse; table-layout:fixed; min-width:35px; background:white; }
 table.ballot_icon td { border: 1px solid black; height: 7px; width: 6px; padding: 0;}
 td.ballot_icon_green { background:#80ff80; }