Added IPR/dependency links and edit/add buttons for RFCs, too; some template refactoring

 - Legacy-Id: 1994

Author: pasieronen

ietf/templates/idrfc/doc_main.html

@@ -69,7 +69,26 @@ <h1>{% block doc_h1 %}{% endblock %}</h1>
 
 <div id="doc">
 <div id="metabox">
-{% block doc_meta %}{% endblock %}
+<table id="metatable">
+{% block doc_metatable %}{% endblock %}
+</table>
+
+<div style="padding-top:6px;padding-bottom:6px;padding-left:2px;">
+{% block doc_metalinks %}{% endblock %}
+</div>
+
+{% block doc_metabuttons %}
+{% if user|in_group:"Area_Director,Secretariat" %}
+<div style="padding-bottom:2px;">
+<span id="doc_edit_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child">{% if doc.in_ietf_process %}
+<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=view_id&amp;{% if info.is_rfc %}dTag={{doc.rfc_number}}&amp;rfc_flag=1{% else %}dTag={{doc.tracker_id}}{% endif %}" rel="nofollow" target="_blank">Edit state (IESG Tracker)</a>
+{% else %}
+<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=add_id_confirm&amp;{% if info.is_rfc %}dTag={{doc.rfc_number}}&amp;rfc_flag=1{% else %}dTag={{doc.tracker_id}}&amp;rfc_flag=0{% endif %}&amp;ballot_id=0" rel="nofollow" target="_blank">Add to IESG Tracker</a>
+{% endif %}
+</span></span>
+</div>
+{% endif %}{# if user in group #}
+{% endblock doc_metabuttons%}
 </div> <!-- metabox -->
 </div> <!-- doc -->
 

ietf/templates/idrfc/doc_main_id.html

@@ -37,8 +37,7 @@
 {% block title %}{{ doc.draft_name_and_revision }}{% endblock %}
 {% block doc_h1 %}{{ doc.title|escape }}<br/>{{ doc.draft_name_and_revision }}{% endblock %}
 
-{% block doc_meta %}
-<table id="metatable">
+{% block doc_metatable %}
 <tr><td style="width:18ex;">Document type:</td><td>{{ info.type|escape }}
 {% with doc.replaces as r %}{% if r %}<br />Replaces {% for rep in r %}<a href="/doc/{{rep}}/">{{rep}}</a> {% endfor %}{% endif %}{% endwith %}
 </td></tr>
@@ -67,25 +66,13 @@
 <a href="http://tools.ietf.org/html/{{doc.draft_name_and_revision}}">html</a>
 </td></tr>
 {% endifequal %}
+{% endblock doc_metatable %}
 
-</table><!-- metatable -->
-
-<div style="padding-top:6px;padding-bottom:6px;padding-left:2px;">
+{% block doc_metalinks %}
  <a href="http://datatracker.ietf.org/ipr/search/?option=document_search&amp;id_document_tag={{doc.tracker_id}}" rel="nofollow">IPR Disclosures</a>
 | <a href="http://www.fenron.net/~fenner/ietf/deps/index.cgi?dep={{doc.draft_name}}" rel="nofollow">Dependencies to this draft</a>
 | <a href="http://tools.ietf.org/idnits?url=http://tools.ietf.org/id/{{doc.draft_name_and_revision}}.txt" rel="nofollow" target="_blank">Check nits</a>
-</div>
-{% if user|in_group:"Area_Director,Secretariat" %}
-<div style="padding-bottom:2px;">
-<span id="doc_edit_button" class="yui-button yui-link-button" style="margin-left:2px;"><span class="first-child">{% if doc.in_ietf_process %}
-<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=view_id&amp;dTag={{doc.tracker_id}}" rel="nofollow" target="_blank">Edit state (IESG Tracker)</a>
-{% else %}
-<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=add_id_confirm&amp;dTag={{doc.tracker_id}}&amp;rfc_flag=0&amp;ballot_id=0" rel="nofollow" target="_blank">Add to IESG Tracker</a>
-{% endif %}
-</span></span>
-</div> <!-- tools div -->
-{% endif %}{# if user in group #}
-{% endblock doc_meta %}
+{% endblock %}
 
 {% block doc_text1 %}
 {% ifequal doc.draft_status "Active" %}

ietf/templates/idrfc/doc_main_rfc.html

@@ -37,8 +37,7 @@
 {% block title %}RFC {{ doc.rfc_number }}{% endblock %}
 {% block doc_h1 %}{{ doc.title|escape }}<br/>RFC {{ doc.rfc_number }}{% endblock %}
 
-{% block doc_meta %}
-<table id="metatable">
+{% block doc_metatable %}
 <tr><td style="width:18ex;">Document type:</td><td>RFC - {{ doc.maturity_level }}
 {% if doc.obsoleted_by %}<br />Obsoleted by {{ doc.obsoleted_by }}{%endif %}
 {% if doc.updated_by %}<br />Updated by {{ doc.updated_by }}{%endif %}
@@ -56,8 +55,12 @@
 <a href="http://www.rfc-editor.org/rfc/pdfrfc/rfc{{doc.rfc_number}}.txt.pdf">pdf</a>,
 <a href="http://tools.ietf.org/html/rfc{{doc.rfc_number}}">html</a>
 </td></tr>
-</table><!-- metatable -->
-{% endblock %}{# doc_meta #}
+{% endblock doc_metatable %}
+
+{% block doc_metalinks %}
+ <a href="http://datatracker.ietf.org/ipr/search/?option=rfc_search&amp;rfc_search={{doc.rfc_number}}" rel="nofollow">IPR Disclosures</a>
+| <a href="http://www.fenron.net/~fenner/ietf/deps/index.cgi?dep=rfc{{doc.rfc_number}}" rel="nofollow">Dependencies to this RFC</a>
+{% endblock %}
 
 {% block doc_text1 %}
 <div class="markup_draft">