Some template refactoring; minor changes to IESG edit buttons

 - Legacy-Id: 1942

Author: pasieronen

ietf/templates/idrfc/base.html

@@ -80,7 +80,6 @@
 {% endblock %}
 
 <script type="text/javascript" src="/js/yui/yui.js"></script> 
-
 <script type="text/javascript">
 //<![CDATA[
 YAHOO.util.Event.onContentReady("wgs", function () {
@@ -90,12 +89,11 @@
 YAHOO.util.Event.onContentReady("search_submit_button", function () {
     var oButton = new YAHOO.widget.Button("search_submit_button", {});
 });      
+{% block scripts %}
+{% endblock %}
 //]]>
 </script>
-
 <script type="text/javascript" src="/js/base.js"></script>
-{% block scripts %}
-{% endblock %}
 
 {% block content_end %}
 {% endblock %} 

ietf/templates/idrfc/doc_ballot.html

@@ -34,6 +34,15 @@
 {% load ietf_filters %}
 <table class="ballotTable"><tr valign="top"><td class="left">
 
+{% if doc_ballot_edit_button %}
+{% if user|in_group:"Area_Director,Secretariat" %}
+<div style="margin-top:8px; margin-bottom:8px;" nostyle="position:absolute;right:0px;">
+<span id="doc_ballot_button" class="yui-button yui-link-button"><span class="first-child">
+<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=open_ballot&amp;id_document_tag={% if info.is_rfc %}{{doc.rfc_number}}{% else %}{{doc.tracker_id}}{% endif %}">Edit position</a>
+</span></span></div>
+{% endif %}{# user in_group #}
+{% endif %}
+
 <p><span class="square" style="background:#c00000;"></span><b>Discuss</b><br/>
 {% with ballot.get_discuss as positions %}{% include "idrfc/doc_ballot_list.html" %}{% endwith %}</p>
 

ietf/templates/idrfc/doc_main.html

@@ -39,7 +39,6 @@
 #metabox { width: 99%; border:1px solid #cccccc; background:#edf5ff;margin-top:8px; padding:4px; margin-bottom:1em; }
 #metatable { border: 0; border-spacing: 0; }
 #metatable tr { vertical-align:top ;}
-#metatools { padding:4px; border: 1px solid #cccccc;  }
 
 #commentLog { margin-bottom: 1.5ex; }
 .commentToggle { text-decoration: underline; color: blue; }
@@ -62,26 +61,8 @@
 {% endblock %}
 
 {% block pagehead %}
-<script type="text/javascript">
-//<![CDATA[
-function toggleComment(n) {
-    var el = document.getElementById("commentF"+n);
-    var el2 = document.getElementById("commentS"+n);
-    var el3 = document.getElementById("commentT"+n);
-    if (el.style.display == 'none') {
-        el.style.display = 'block';
-        el2.style.display = 'none';
-        el3.innerHTML = ""; //[hide]";
-    } else {
-        el.style.display = 'none';
-        el2.style.display= 'block';
-        el3.innerHTML = "[show all]";
-    }
-}
-//]]>
-</script>
 <link rel="alternate" type="application/atom+xml" href="/feed/comments/{% if info.is_rfc %}rfc{{doc.rfc_number}}{% else %}{{doc.draft_name}}{% endif %}/" />
-{%endblock %}
+{% endblock %}
 
 {% block content %}
 <h1 style="margin-top:0;">{% block doc_h1 %}{% endblock %}</h1>
@@ -104,13 +85,9 @@ <h1 style="margin-top:0;">{% block doc_h1 %}{% endblock %}</h1>
 <div id="ballot">
 <div id="ballot_content">
 {% if ballot %}
-{% if user|in_group:"Area_Director,Secretariat" %}
-<div style="position:absolute;right:0px;">
-<span id="doc_ballot_button" class="yui-button yui-link-button"><span class="first-child">
-<a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=open_ballot&amp;id_document_tag={% if info.is_rfc %}{{doc.rfc_number}}{% else %}{{doc.tracker_id}}{% endif %}">Edit position</a>
-</span></span></div>
-{% endif %}{# user in_group #}
+{% with 1 as doc_ballot_edit_button %}
 {% include "idrfc/doc_ballot.html" %}
+{% endwith %}
 {% endif %}
 </div>
 </div> 
@@ -119,7 +96,7 @@ <h1 style="margin-top:0;">{% block doc_h1 %}{% endblock %}</h1>
 <div id="writeup_content">
 {% if doc.in_ietf_process and doc.ietf_process.has_iesg_ballot %}
 {% if user|in_group:"Area_Director,Secretariat" %}
-<div style="position:absolute;right:0px;">
+<div style="margin-bottom:8px;">
 <span id="doc_writeup_edit_button" class="yui-button yui-link-button"><span class="first-child">
 <a href="https://datatracker.ietf.org/cgi-bin/idtracker.cgi?command=ballot_writeup&amp;ballot_id={{doc.ietf_process.iesg_ballot.ballot_id}}">Edit writeups</a>
 </span></span></div>
@@ -162,8 +139,6 @@ <h2 style="margin-top:1em;">Document history</h2>
 {% endblock %}{# content #}
 
 {% block scripts %}
-<script type="text/javascript">
-//<![CDATA[
 var tabView = new YAHOO.widget.TabView('mytabs');
 tabView.subscribe('activeIndexChange', function(e) {
 if (e.newValue == 0) {
@@ -173,18 +148,28 @@ <h2 style="margin-top:1em;">Document history</h2>
 document.getElementById('rfcText1').style.display = 'none';
 document.getElementById('rfcText2').style.display = 'none';
 } });
-
-
 document.getElementById('writeup_content').style.display = 'block';
 document.getElementById('ballot_content').style.display = 'block';
 document.getElementById('history_content').style.display = 'block';
-//]]>
-</script>
 
-{% endblock %}
+function toggleComment(n) {
+    var el = document.getElementById("commentF"+n);
+    var el2 = document.getElementById("commentS"+n);
+    var el3 = document.getElementById("commentT"+n);
+    if (el.style.display == 'none') {
+        el.style.display = 'block';
+        el2.style.display = 'none';
+        el3.innerHTML = ""; //[hide]";
+    } else {
+        el.style.display = 'none';
+        el2.style.display= 'block';
+        el3.innerHTML = "[show all]";
+    }
+}
+{% endblock scripts %}
 
 {% block content_end %}
 <div id="rfcText2">
 {% block doc_text2 %}{% endblock %}
 </div>
-{% endblock %}{# content_end #}
+{% endblock content_end %}

ietf/templates/iesg/discusses.html

@@ -86,8 +86,6 @@ <h1 style="margin-top:0;">IESG Discuss Positions</h1>
 {% endblock %}
 
 {% block scripts %}
-<script type="text/javascript">
-//<![CDATA[
 function show_only_mine() {
 document.getElementById("discuss_show2").style.display = 'block';
 document.getElementById("discuss_show1").style.display = 'none';
@@ -107,6 +105,4 @@ <h1 style="margin-top:0;">IESG Discuss Positions</h1>
   YAHOO.util.Dom.removeClass(els[i], "discuss_hidden");
 }
 }
-//]]>
-</script>
-{% endblock %}
+{% endblock scripts %}