altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [9766] from lars@netapp.com:

Browse source 
More HTML fixes.
 - Legacy-Id: 9787
Note: SVN reference [9766] has been migrated to Git commit 77f555bdbdfa653e4b5a0589ead9eda6632f10d7
This commit is contained in:
Henrik Levkowetz 2015-07-18 12:42:38 +00:00
parent 8612ce92c0
commit 942352c50b
25 changed files with 74 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/submit/templatetags/submit_tags.py
View file

@ -30,12 +30,6 @@ def two_pages_decorated_with_errors(submission, errors):
return mark_safe('<pre>%s</pre>' % escape(pages))
result = '<pre>\n'
for line in pages.split('\n'):
if line.find('%s-%s' % (submission.name, submission.rev)) > -1:
result += '<div class="bg-danger"><b>'
result += escape(line)
result += '\n'
result += '</b></div>\n'
else:
result += escape(line)
result += '\n'
result += '</pre>pre>\n'

2
ietf/templates/admin/group/group/send_sdo_reminder.html
View file

@ -38,7 +38,7 @@
<p>By clicking the 'Send' button you will send a request to <b>all</b> the SDO Liaison Managers. In order to send the request to one SDO Liaison Manager go to the SDO edit page.</p>
{% endif %}
<form action="" method="post">{% csrf_token %}
<form method="post">{% csrf_token %}
<input type="submit" name="send" value="Send reminder" />
</form>
{% endif %}

3
ietf/templates/bootstrap3/field_help_text_and_errors.html
View file

@ -1,2 +1 @@
<div>{% for item in help_text_and_errors %} {{ item }}<br/> {% endfor %}</div>
{% for item in help_text_and_errors %} {{ item }}<br> {% endfor %}

4
ietf/templates/doc/ballot/edit_position.html
View file

@ -26,9 +26,9 @@
{% if field.name == "discuss" %}<div id="div_id_discuss">{% endif %}
{% bootstrap_field field %}
{% if field.name == "discuss" and old_pos and old_pos.discuss_time %}
<span class="help-block">Last edited {{ old_pos.discuss_time }}</span>
<div class="help-block">Last edited {{ old_pos.discuss_time }}</div>
{% elif field.name == "comment" and old_pos and old_pos.comment_time %}
<span class="help-block">Last edited {{ old_pos.comment_time }}</span>
<div class="help-block">Last edited {{ old_pos.comment_time }}</div>
{% endif %}
{% if field.name == "discuss" %}</div>{% endif %}
{% endfor %}

4
ietf/templates/doc/ballot/lastcalltext.html
View file

@ -18,9 +18,9 @@
{% bootstrap_form last_call_form %}
{% if can_request_last_call and need_intended_status %}
<span class="help-block">
<div class="help-block">
You need to select intended status of {{ need_intended_status }} and regenerate last call text to request last call.
</span>
</div>
{% endif %}
{% buttons %}

2
ietf/templates/doc/ballot/send_ballot_comment.html
View file

@ -28,7 +28,7 @@
<div class="form-group">
<label>Cc</label>
<input class="form-control" type="email" name="cc">
<span class="help-block">Separate email addresses with commas.</span>
<div class="help-block">Separate email addresses with commas.</div>
</div>
{% if doc.notify %}

4
ietf/templates/doc/ballot/writeupnotes.html
View file

@ -17,9 +17,9 @@
{% csrf_token %}
{% bootstrap_form ballot_writeup_form %}
<span class="help-block">
<div class="help-block">
Technical summary, Working Group summary, document quality, personnel, RFC Editor note, IRTF note, IESG note, IANA note. This text will be appended to all announcements and messages to the IRTF or RFC Editor.
</span>
</div>
{% buttons %}
<button type="submit" class="btn btn-primary" name="save_ballot_writeup" value="Save Ballot Writeup">Save</button>

4
ietf/templates/doc/charter/ballot_writeupnotes.html
View file

@ -17,9 +17,9 @@
{% csrf_token %}
{% bootstrap_form ballot_writeup_form %}
<span class="help-block">
<div class="help-block">
Working group summary, personnel, IAB note, IESG note, IANA note.
</span>
</div>
{% buttons %}
<button type="submit" class="btn btn-primary" name="save_ballot_writeup" value="Save Ballot Writeup">Save</button>

2
ietf/templates/doc/charter/change_state.html
View file

@ -50,7 +50,7 @@
<h3>Or revert to previous state</h3>
<div class="prev-state">
<form action="" method="post">{% csrf_token %}
<form method="post">{% csrf_token %}
<input type="hidden" name="charter_state" value="{{ prev_charter_state.pk }}" />
<input type="hidden" name="state" value="{{ prev_state.slug }}" />
<input type="submit" value="Back to {{ prev_charter_state.name }}" />

15
ietf/templates/doc/document_ballot_content.html
View file

@ -6,16 +6,7 @@
<h4><span class="label label-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
{% for p in positions|dictsort:"ad.last_name" %}
<div>
{% if p.old_ad %}<span class="text-muted">({% endif %}
{% if p.comment or p.discuss %}
<a href="#{{ p.ad.plain_name|slugify }}">
{% endif %}
{{ p.ad.plain_name }}
{% if p.comment or p.discuss %}
</a>
{% endif %}
{% if user|has_role:"Secretariat" %}</a>{% endif %}
{% if p.old_ad %})</span>{% endif %}
{% if p.old_ad %}<span class="text-muted">({% endif %}{% if p.comment or p.discuss %}<a href="#{{ p.ad.plain_name|slugify }}">{% endif %}{{ p.ad.plain_name }}{% if p.comment or p.discuss %}</a>{% endif %}{% if p.old_ad %})</span>{% endif %}
</div>
{% empty %}
(None)
@ -77,9 +68,7 @@
{% for n, positions in position_groups %}
{% for p in positions|dictsort:"ad.last_name" %}
<h4 class="anchor-target" id="{{ p.ad.plain_name|slugify }}">
{% if p.old_ad %}<span class="text-muted">({% endif %}
{{ p.ad.plain_name }}
{% if p.old_ad %})</span>{% endif %}
{% if p.old_ad %}<span class="text-muted">({% endif %}{{ p.ad.plain_name }}{% if p.old_ad %})</span>{% endif %}
<span class="pull-right">
{% if p.old_positions %}
<span class="text-muted small">(was {{ p.old_positions|join:", " }})</span>

15
ietf/templates/doc/document_status_change.html
View file

@ -25,10 +25,7 @@
<tbody>
<tr>
<th rowspan="{{table_rows.doc}}">Document</th>
</tr>
<tr>
<th>Document</th>
<th>
{% if doc.get_state_slug not in approved_states %}
Proposed status change
@ -50,6 +47,7 @@
</tr>
<tr>
<th class="plain"></th>
<th>Last updated</th>
<td class="edit"></td>
<td>{{ doc.time|date:"Y-m-d" }}</td>
@ -59,6 +57,7 @@
{% regroup sorted_relations by relationship.name as relation_groups %}
{% for relation_group in relation_groups %}
<tr>
<th class="plain"></th>
<th>{{relation_group.grouper}}</th>
<td class="edit"></td>
<td>{% for rel in relation_group.list %}{{rel.target.document.canonical_name|upper|urlize_ietf_docs}}{% if not forloop.last %}, {% endif %}{% endfor %}</td>
@ -66,6 +65,7 @@
{% endfor %}
<tr>
<th class="plain"></th>
<th><a href="{% url "state_help" type="status-change" %}">State</a></th>
<td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" %}
@ -80,10 +80,7 @@
</tbody>
<tbody>
<tr>
<th rowspan="4">IESG</th>
</tr>
<tr>
<th>IESG</th>
<th>Telechat date</th>
<td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
@ -105,6 +102,7 @@
</tr>
<tr>
<th class="plain"></th>
<th>Shepherding AD</th>
<td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
@ -117,6 +115,7 @@
</tr>
<tr>
<th class="plain"></th>
<th>Send notices to</th>
<td class="edit">
{% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}

4
ietf/templates/doc/draft/change_state.html
View file

@ -21,11 +21,11 @@
{% bootstrap_form form %}
{% if state and state.slug == "rfcqueue" %}
<span class="help-block">
<div class="help-block">
<b>Note:</b> If you pull the draft out of the
<i>{{ state.name }}</i> state, the RFC Editor and IANA will be notified
by email with this comment, so they can update their queues.
</span>
</div>
{% endif %}
{% buttons %}

2
ietf/templates/doc/status_change/make_last_call.html
View file

@ -5,7 +5,7 @@
{% load bootstrap3 %}
{% block pagehead %}
<link rel="stylesheet" href="/css/lib/datepicker3.css"></link>
<link rel="stylesheet" href="/css/lib/datepicker3.css">
{% endblock %}
{% block title %}Make last call for {{ doc.name }}{% endblock %}

2
ietf/templates/doc/status_change/status_changes.html
View file

@ -27,7 +27,7 @@
<tr class="info"><th colspan="2">{{state.grouper}}</th></tr>
{% for doc in state.list %}
<tr">
<tr>
<td>{{ doc.displayname_with_link|safe }}</td>
<td><b>{{ doc.title }}</b></td>
</tr>

3
ietf/templates/group/customize_workflow.html
View file

@ -53,7 +53,7 @@
</button>
</div>
</div>
<form id="nexts{{ state.pk }}" class="set-next-states collapse out" method="post" action="">{% csrf_token %}
<form id="nexts{{ state.pk }}" class="set-next-states collapse out" method="post">{% csrf_token %}
<div>Select the next states:</div>
{% for checked, default, s in state.next_states_checkboxes %}
@ -112,4 +112,5 @@
{% endfor %}
</tbody>
</table>
</div>
{% endblock content %}

2
ietf/templates/group/stream_edit.html
View file

@ -32,7 +32,7 @@
datatracker account. New accounts can be <a href="{% url "create_account" %}">created here</a>.
</p>
<form action="" method="post">
<form method="post">
{% csrf_token %}
{% bootstrap_form form %}

2
ietf/templates/ipr/details_edit.html
View file

@ -155,7 +155,7 @@
<div class="form-group">
<label class="col-md-2 control-label"></label>
<div class="col-md-10"><a class="draft-add-row btn btn-default"><span class="glyphicon glyphicon-plus" aira-hidden="true"></span> Add more</a></div>
<div class="col-md-10"><a class="draft-add-row btn btn-default"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add more</a></div>
</div>
{% bootstrap_field form.other_designations layout='horizontal' %}

2
ietf/templates/ipr/email.html
View file

@ -7,7 +7,7 @@
{% block title %}Email submitter of {{ ipr.title }}{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="/css/lib/datepicker3.css"></link>
<link rel="stylesheet" href="/css/lib/datepicker3.css">
{% endblock %}
{% block content %}

2
ietf/templates/ipr/search_form.html
View file

@ -95,7 +95,7 @@
<button class="btn btn-primary" type="submit" name="submit" value="patent"><span class="fa fa-search"></span> Search</button>
</span>
</div>
<span class="help-block">This search string must contain at least three characters, including at least one digit, and include punctuation marks. For best results, please enter the entire string, or as much of it as possible.</span>
<div class="help-block">This search string must contain at least three characters, including at least one digit, and include punctuation marks. For best results, please enter the entire string, or as much of it as possible.</div>
</div>
</div>

2
ietf/templates/liaisons/edit.html
View file

@ -7,7 +7,7 @@
{% block title %}{% if liaison %}Edit liaison: {{ liaison }}{% else %}Send Liaison Statement{% endif %}{% endblock %}
{% block pagehead %}
<link rel="stylesheet" href="/css/lib/datepicker3.css"></link>
<link rel="stylesheet" href="/css/lib/datepicker3.css">
<link rel="stylesheet" href="/css/lib/select2.css">
<link rel="stylesheet" href="/css/lib/select2-bootstrap.css">
{% endblock %}

2
ietf/templates/nomcom/delete_nomcom.html
View file

@ -8,7 +8,7 @@
{% origin %}
<p class="alert alert-warning">Are you sure you want to delete all data about {{ nomcom.group.name }}?</p>
<form action="" method="post">
<form method="post">
{% csrf_token %}
<input type="hidden" name="post" value="yes">
<input class="btn btn-danger" type="submit" value="Yes, I'm sure">

2
ietf/templates/nomcom/edit_nomcom.html
View file

@ -5,7 +5,7 @@
{% load bootstrap3 %}
{% block pagehead %}
<link rel="stylesheet" href="/css/lib/datepicker3.css"></link>
<link rel="stylesheet" href="/css/lib/datepicker3.css">
{% endblock %}
{% block subtitle %} - Settings{% endblock %}

16
ietf/templates/registration/edit_profile.html
View file

@ -39,7 +39,7 @@
</select>
</div>
<div class="col-sm-7">
<span class="help-block">Email to use for <i>{{ role.name|lower }}</i> role in {{ role.group.acronym|upper }} ({{ role.group.type }}).</span>
<div class="help-block">Email to use for <i>{{ role.name|lower }}</i> role in {{ role.group.acronym|upper }} ({{ role.group.type }}).</div>
</div>
</div>
{% endfor %}
@ -61,7 +61,7 @@
{% endfor %}
</div>
<div class="col-sm-7">
<span class="help-block">Note: Email addresses cannot be deleted, only deactivated.</span>
<div class="help-block">Note: Email addresses cannot be deleted, only deactivated.</div>
</div>
</div>
</div>
@ -81,7 +81,7 @@
{{person_form.name|add_class:"form-control"}}
</div>
<div class="col-sm-7">
<span class="help-block">The preferred form of your name.</span>
<div class="help-block">The preferred form of your name.</div>
</div>
</div>
</div>
@ -95,7 +95,7 @@
{{person_form.ascii|add_class:"form-control"}}
</div>
<div class="col-sm-7">
<span class="help-block">Your name as rendered in ASCII (Latin, unaccented) characters.</span>
<div class="help-block">Your name as rendered in ASCII (Latin, unaccented) characters.</div>
</div>
</div>
</div>
@ -109,11 +109,11 @@
{{person_form.ascii_short|add_class:"form-control"}}
</div>
<div class="col-sm-7">
<span class="help-block">
<div class="help-block">
Example: A. Nonymous. Fill in this with initials and surname only if
taking the initials and surname of your ASCII name above produces an incorrect
initials-only form. (Blank is ok).
</span>
</div>
</div>
</div>
</div>
@ -127,7 +127,7 @@
{{person_form.affiliation|add_class:"form-control"}}
</div>
<div class="col-sm-7">
<span class="help-block">Employer, university, sponsor, etc.</span>
<div class="help-block">Employer, university, sponsor, etc.</div>
</div>
</div>
</div>
@ -141,7 +141,7 @@
{{person_form.address|add_class:"form-control"}}
</div>
<div class="col-sm-7">
<span class="help-block">Postal mailing address.</span>
<div class="help-block">Postal mailing address.</div>
</div>
</div>
</div>

16
ietf/templates/submit/submission_status.html
View file

@ -203,13 +203,12 @@
</table>
{% if can_edit %}
<p>
<p></p>
<form method="post">
{% csrf_token %}
<input type="hidden" name="action" value="edit">
<button class="btn btn-warning" type="submit" value="adjust">Adjust meta-data</button>
</form>
</p>
<p>Leads to manual post by the secretariat.</p>
{% if passes_idnits and not errors %}
@ -247,35 +246,29 @@
{% if can_cancel %}
<h2>Cancel submission</h2>
<p>
<form id="cancel-submission" method="post">
{% csrf_token %}
<input type="hidden" name="action" value="cancel">
<button class="btn btn-danger" type="submit">Cancel submission</button>
<button class="btn btn-danger" type="submit" data-toggle="tooltip" title="Deletes the uploaded file{{ submission.file_types|split:","|pluralize }} permanently.">Cancel submission</button>
</form>
</p>
<p>Deletes the uploaded file{{ submission.file_types|split:","|pluralize }} permanently.</p>
{% endif %}
{% if can_group_approve %}
<h2>Approve submission</h2>
<p>
<form method="post">
{% csrf_token %}
<input type="hidden" name="action" value="approve">
<button class="btn btn-danger" type="submit">Approve this submission</button>
</form>
</p>
{% endif %}
{% if can_force_post %}
<p>
<p></p>
<form method="post">
{% csrf_token %}
<input type="hidden" name="action" value="forcepost">
<button class="btn btn-danger" type="submit">Force post of submission</button>
</form>
</p>
{% endif %}
{% if show_send_full_url %}
@ -292,12 +285,11 @@
button. An email will then be sent to the authors and submitter
(if submitter email was entered): {{ confirmation_list|join:", " }}.</p>
<p>
<p></p>
<form method="post">{% csrf_token %}
<input type="hidden" name="action" value="sendfullurl">
<button class="btn btn-danger" type="submit">Request full access URL</button>
</form>
</p>
</div>
{% endif %}

5
static/css/ietf.css
View file

@ -392,10 +392,7 @@ footer {
*/
tbody.plain tr th { border-top: 0; text-align: right; max-width: 12em;}
tbody.plain tr:first-child th { border-top: 0; text-align: left; width: 6em; }
tbody.plain tr td { border-top: 0; }
table tbody td.plain, table tbody th.plain { border-top: 0; }
td.ad div { border-bottom: solid #ccc 1px; }