Skip to content

Commit 063d92b

Browse files
committed
Merged in [10530] from lars@netapp.com:
Update a number of web assets to their latest versions. - Legacy-Id: 10552 Note: SVN reference [10530] has been migrated to Git commit 808196b
2 parents 862808c + 808196b commit 063d92b

24 files changed

Lines changed: 221 additions & 3023 deletions

ietf/bower.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,20 @@
44
"ignore": [],
55
"main": [],
66
"dependencies": {
7-
"bootstrap-datepicker": "1.3.1",
8-
"font-awesome": "4.3.0",
9-
"jquery": "1.11.2",
7+
"bootstrap-datepicker": "1.5.0",
8+
"font-awesome": "4.5.0",
9+
"jquery": "1.11.3",
1010
"jquery.cookie": "1.4.1",
11-
"qunit": "1.12.0",
1211
"select2": "3.5.2",
1312
"select2-bootstrap-css": "1.4.6"
1413
},
15-
"devDependencies": {}
14+
"devDependencies": {},
15+
"overrides": {
16+
"font-awesome": {
17+
"main": [
18+
"./css/font-awesome.min.css",
19+
"./fonts/*"
20+
]
21+
}
22+
}
1623
}

ietf/doc/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
url(r'^select2search/(?P<model_name>(document|docalias))/(?P<doc_type>draft)/$', views_search.ajax_select2_search_docs, name="ajax_select2_search_docs"),
5555

5656
url(r'^(?P<name>[A-Za-z0-9._+-]+)/(?:(?P<rev>[0-9-]+)/)?$', views_doc.document_main, name="doc_view"),
57+
url(r'^(?P<name>[A-Za-z0-9._+-]+)/(?:(?P<rev>[0-9-]+)/)?bibtex/$', views_doc.document_bibtex, name="doc_bibtex"),
5758
url(r'^(?P<name>[A-Za-z0-9._+-]+)/history/$', views_doc.document_history, name="doc_history"),
5859
url(r'^(?P<name>[A-Za-z0-9._+-]+)/writeup/$', views_doc.document_writeup, name="doc_writeup"),
5960
url(r'^(?P<name>[A-Za-z0-9._+-]+)/email/$', views_doc.document_email, name="doc_email"),

ietf/doc/views_doc.py

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ def document_main(request, name, rev=None):
233233
# latest revision
234234
latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
235235

236+
# bibtex
237+
file_urls.append(("bibtex", "bibtex"))
238+
236239
# ballot
237240
ballot_summary = None
238241
if iesg_state and iesg_state.slug in IESG_BALLOT_ACTIVE_STATES:
@@ -665,6 +668,32 @@ def document_history(request, name):
665668
),
666669
context_instance=RequestContext(request))
667670

671+
672+
def document_bibtex(request, name, rev=None):
673+
doc = get_object_or_404(Document, docalias__name=name)
674+
675+
latest_revision = doc.latest_event(NewRevisionDocEvent, type="new_revision")
676+
replaced_by = [d.name for d in doc.related_that("replaces")]
677+
published = doc.latest_event(type="published_rfc")
678+
rfc = latest_revision.doc if latest_revision.doc.get_state_slug() == "rfc" else None
679+
680+
if rev != None and rev != doc.rev:
681+
# find the entry in the history
682+
for h in doc.history_set.order_by("-time"):
683+
if rev == h.rev:
684+
doc = h
685+
break
686+
687+
return render_to_response("doc/document_bibtex.bib",
688+
dict(doc=doc,
689+
replaced_by=replaced_by,
690+
published=published,
691+
rfc=rfc,
692+
latest_revision=latest_revision),
693+
content_type="text/plain; charset=utf-8",
694+
context_instance=RequestContext(request))
695+
696+
668697
def document_writeup(request, name):
669698
doc = get_object_or_404(Document, docalias__name=name)
670699
top = render_document_top(request, doc, "writeup", name)

ietf/externals/static/bootstrap-datepicker/css/bootstrap-datepicker3.min.css

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)