Make milestones visible in draft search results, and add notices to

the draft state edit form for WG chairs, as reminders for the WG
chairs to keep the milestones updated
 - Legacy-Id: 4559

ietf/idrfc/views_doc.py

@@ -439,6 +439,7 @@ def document_main_idrfc(request, name, tab):
                                'doc':doc, 'info':info, 'tab':tab,
 			       'include_text':include_text(request),
                                'stream_info': get_full_info_for_draft(id),
+                               'milestones': id.groupmilestone_set.filter(state="active"),
                                'versions':versions, 'history':history},
                               context_instance=RequestContext(request));
 

ietf/ietfworkflows/templatetags/ietf_streams.py

@@ -40,7 +40,9 @@ def stream_state(context, doc):
 
     data.update({'workflow': workflow,
                  'draft': draft,
-                 'state': state})
+                 'state': state,
+                 'milestones': draft.groupmilestone_set.filter(state="active")
+                 })
 
     return data
 

ietf/ietfworkflows/views.py

@@ -83,6 +83,7 @@ def _edit_draft_stream(request, draft, form_class=DraftTagsStateForm):
     stream = get_stream_from_draft(draft)
     history = get_workflow_history_for_draft(draft, 'objectworkflowhistoryentry')
     tags = get_annotation_tags_for_draft(draft)
+    milestones = draft.groupmilestone_set.all()
     return render_to_response('ietfworkflows/state_edit.html',
                               {'draft': draft,
                                'state': state,
@@ -91,6 +92,7 @@ def _edit_draft_stream(request, draft, form_class=DraftTagsStateForm):
                                'history': history,
                                'tags': tags,
                                'form': form,
+                               'milestones': milestones,
                               },
                               context_instance=RequestContext(request))
 

ietf/templates/idrfc/doc_tab_document_id.html

@@ -71,9 +71,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 {% ifequal stream_info.stream.name "IETF" %}
   <tr>
      <td>IETF State:</td>
-     <td>{{ stream_info.state.name }} ({{ stream_info.streamed.get_group }}) 
-	{% if stream_info.tags %}<br /><i>{% for tag in stream_info.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}
-     </td>
+     <td class="stream-state">{{ stream_info.state.name }} ({{ stream_info.streamed.get_group }})
+	{% if stream_info.tags %}<br /><i>{% for tag in stream_info.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}</i>{% endif %}
+        {% if milestones %}{% for m in milestones %}<span title="In {{ m.group.acronym }} milestone: {{ m.desc }}" class="milestone">{{ m.due|date:"M Y" }}</span>{% endfor %}{% endif %}
+      </td>
   </tr>
 {% else %}
    {% if stream_info.stream %}
@@ -81,7 +82,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       <td>{{ stream_info.stream.name }} status:</td>
       <td>
 	 {{ stream_info.state.name }} {% if stream_info.streamed.get_group %}({{ stream_info.streamed.get_group }}) {% endif %}
-	 {% if stream_info.tags %}<br /><i>{% for tag in stream_info.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}
+	 {% if stream_info.tags %}<br /><i>{% for tag in stream_info.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}</i>{% endif %}
       </td>
    </tr>
    {% endif %}

ietf/templates/ietfworkflows/state_edit.html

@@ -29,6 +29,19 @@ table.edit-form-tags ul li { padding: 0px; }
 <a href="{% url doc_view draft.filename %}">Return to document view</a>
 </p>
 </div>
+
+{% if state and state.slug == "wg-doc" and not milestones %}
+<p>This document is not part of any milestone. You may wish to <a href="{% url wg_edit_milestones acronym=draft.group.acronym %}">add it to one</a>.</p>
+{% endif %}
+
+{% if state and state.slug == "sub-pub" and milestones %}
+<p>This document is part of {% if milestones|length > 1 %}{{ milestones|length }}
+milestones{% else %}a milestone{% endif %}. Now that the draft is
+submitted to IESG for publication, you may wish to
+<a href="{% url wg_edit_milestones acronym=draft.group.acronym %}">update the
+milestone{{ milestones|pluralize }}</a>.</p>
+{% endif %}
+
 <table class="ietf-table" style="width: 100%;">
 <tr>
 <th>Current stream</th>

ietf/templates/ietfworkflows/stream_state.html

@@ -1,8 +1,9 @@
 {% if draft %}
-<div class="stream_state">
-<div class="stream_state_more" style="float: left; margin: 1px 0.5em 0 0;"><a href="{% url stream_history draft.filename %}" class="show_stream_info" title="Stream information for {{ draft.filename }}" style="text-decoration: none; color:transparent; margin: 0; padding: 0; border: 0;"><img src="/images/plus.png" style="margin: 0; padding: 0; border:0;"><img></a></div>
+<div class="stream-state">
+<div class="stream_state_more" style="float: left; margin: 1px 0.5em 0 0;"><a href="{% url stream_history draft.filename %}" class="show_stream_info" title="Stream information for {{ draft.filename }}" style="text-decoration: none; color:transparent; margin: 0; padding: 0; border: 0;"><img src="/images/plus.png" style="margin: 0; padding: 0; border:0;"></a></div>
 {% if stream %}
 {% if state %}{{ state.name }}{% else %}{{ stream }}{% endif %}
+{% if milestones %}{% for m in milestones %}<span title="Included in milestone: {{ m.desc }}" class="milestone">{{ m.due|date:"M Y" }}</span>{% endfor %}{% endif %}
 {% else %}
   No stream assigned
 {% endif %}

static/css/base2.css

@@ -193,3 +193,5 @@ form table .help {
 
 table.milestones td.due { vertical-align: top; width: 80px; }
 table.milestones .doc { display: block; padding-left: 1em; }
+
+.stream-state .milestone { display: inline-block; font-size: smaller; background-color: #d5dde6; padding: 0 0.2em; margin-left: 0.3em; }