Skip to content

Commit e8a1e6c

Browse files
larseggertlarseggert
committed
Restructure the I-D submission page.
While there is no change in functionality, we now by default only show an option to submit XML, with other formats hidden behind a "Submit other formats" checkbox. I also simplified the text on the page. Commit ready for merge. - Legacy-Id: 19483
1 parent a2d47f0 commit e8a1e6c

1 file changed

Lines changed: 82 additions & 38 deletions

File tree

‎ietf/templates/submit/upload_submission.html‎

Lines changed: 82 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,63 +8,107 @@
88

99
{% block submit_content %}
1010
{% origin %}
11+
1112
{% if form.shutdown and user|has_role:"Secretariat" %}
12-
<p class="bg-warning">WARNING: currently in draft submission blackout period</p>
13+
<p class="alert alert-warning">
14+
<b>Warning:</b> Currently in I-D submission blackout period.
15+
</p>
1316
{% endif %}
1417

15-
<p>This page is used to submit Internet-Drafts to the Internet-Draft repository.</p>
16-
1718
{% if form.cutoff_warning %}
18-
<div class="cutoff-warning">
19+
<div class="alert alert-info">
1920
{{ form.cutoff_warning|safe }}
2021
</div>
2122
{% endif %}
2223

2324
{% if not form.shutdown or user|has_role:"Secretariat" %}
24-
<p>
25-
By submitting your I-D, you are granting some rights to the IETF Trust. Before you submit your I-D,
26-
review the information on the NOTE WELL tab and <a href="{% url 'ietf.doc.views_doc.document_html' name='rfc5378' %}">BCP 78</a>,
25+
<p class="alert alert-warning">
26+
By submitting your I-D, you are granting some rights to the IETF Trust.
27+
Before you submit your I-D, review the information on the NOTE WELL tab and
28+
<a href="{% url 'ietf.doc.views_doc.document_html' name='rfc5378' %}">BCP 78</a>,
2729
"Rights Contributors Provide to the IETF Trust".
2830
</p>
2931

3032
<p>
3133
Before you submit your I-D, it is recommended that you check it for nits
32-
using the <b><a href="{{settings.IDNITS_BASE_URL}}">idnits tool</a></b>.
34+
using the <a href="{{settings.IDNITS_BASE_URL}}">idnits</a> tool, and
35+
fix them.
3336
</p>
34-
35-
{% include "submit/problem-reports-footer.html" %}
3637

37-
<h2>Upload an Internet-Draft</h2>
38+
<div class="panel panel-default">
39+
<div class="panel-body">
40+
<form method="post" enctype="multipart/form-data">
41+
{% csrf_token %}
3842

39-
<p>
40-
<i>
41-
The best way to submit an Internet-Draft is to provide a single v3 .xml source file.
42-
The datatracker will generate the .txt and other formats from that file.
43-
<br/>
44-
Source v3 .xml which include external files must be preprocessed through xml2rfc with
45-
the <tt>--expand</tt> option, to produce a completely expanded (standalone) .xml source
46-
file for upload.
47-
<br/>
48-
The <a href="{{settings.XML2RFC_BASE_URL}}">online conversion tool</a> can be used to
49-
convert v2 .xml documents to v3.
50-
<br/>
51-
A single v3 .xml source is preferred. A single v2 .xml source will be accepted. If
52-
neither of those are available, a plain-text document may be provided. One of these
53-
three options <b>must</b> be provided.
54-
<br/>
55-
Other file types are optional.
56-
</i>
57-
</p>
43+
<div class="form-group">
44+
{% bootstrap_field form.xml label='<i class="fa fw-fw fa-file-code-o" aria-hidden="true"></i> XML source of the I-D' %}
45+
<p class="help-block">
46+
Preferably, submit a standalone
47+
<a href="{% url 'ietf.doc.views_doc.document_html' name='rfc7991' %}">xml2rfc version 3</a>
48+
source file. You can use this online
49+
<a href="https://author-tools.ietf.org/">conversion service</a>
50+
to convert your I-D to this format.
51+
(You may submit an older
52+
<a href="{% url 'ietf.doc.views_doc.document_html' name='rfc7749' %}">xml2rfc version 2</a>
53+
file if you must.)
54+
</p>
55+
</div>
5856

59-
<form method="post" enctype="multipart/form-data">
60-
{% csrf_token %}
57+
<div class="form-group">
58+
<div class="checkbox">
59+
<label data-toggle="collapse" data-target="#other-formats" aria-expanded="false" aria-controls="other-formats">
60+
<input id="checkbox" type="checkbox" /> Submit other formats
61+
</label>
62+
</div>
63+
</div>
64+
<div class="collapse" id="other-formats">
65+
<div class="form-group">
66+
{% bootstrap_field form.txt label='<i class="fa fw-fw fa-file-text-o" aria-hidden="true"></i> Plaintext rendering of the I-D'%}
67+
<p class="help-block">
68+
Optional to submit, will be auto-generated based
69+
on the submitted XML.
70+
However, if you cannot for some reason submit XML, you must
71+
submit a plaintext rendering of your I-D.
72+
</p>
73+
</div>
6174

62-
{% bootstrap_form form %}
75+
<div class="form-group">
76+
{% bootstrap_field form.pdf label='<i class="fa fw-fw fa-file-pdf-o" aria-hidden="true"></i> PDF rendering of the I-D'%}
77+
<p class="help-block">
78+
Optional to submit, will be auto-generated based
79+
on the submitted XML.
80+
</p>
81+
</div>
6382

64-
{% buttons %}
65-
<input class="btn btn-primary" type="submit" value="Upload" name="upload">
66-
{% endbuttons %}
67-
</form>
68-
{% endif %}
83+
<div class="form-group">
84+
{% bootstrap_field form.ps label='<i class="fa fw-fw fa-file-image-o" aria-hidden="true"></i> Postscript rendering of the I-D'%}
85+
<p class="help-block">
86+
Optional to submit, will be auto-generated based
87+
on the submitted XML.
88+
</p>
89+
</div>
90+
</div>
91+
92+
{% bootstrap_form_errors form %}
93+
94+
<div class="form-group">
95+
{% buttons %}
96+
<input class="btn btn-primary" type="submit" value="Upload" name="upload">
97+
{% endbuttons %}
98+
</div>
99+
</form>
100+
</div>
101+
</div>
102+
103+
{% include "submit/problem-reports-footer.html" %}{% endif %}
69104

70105
{% endblock %}
106+
107+
{% block js %}
108+
<script>
109+
$(document).ready(function() {
110+
if ($("#checkbox").is(':checked'))
111+
$("#other-formats").collapse('show')
112+
});
113+
</script>
114+
{% endblock %}

0 commit comments

Comments
 (0)