diff --git a/rest_framework/static/rest_framework/docs/css/base.css b/rest_framework/static/rest_framework/docs/css/base.css index b7ae6375e..259af31f5 100644 --- a/rest_framework/static/rest_framework/docs/css/base.css +++ b/rest_framework/static/rest_framework/docs/css/base.css @@ -115,6 +115,13 @@ pre.highlight code { background-color: #020203; } +.sidebar .menu-list li.collapsed + ul.menu-content { + height: 0; +} + +.sidebar .menu-list li.collapsed + ul.menu-content li { + display: none; +} .sidebar .menu-list ul .sub-menu li a, .sidebar .menu-list li .sub-menu li a { diff --git a/rest_framework/templates/rest_framework/docs/_recursive_document.html b/rest_framework/templates/rest_framework/docs/_recursive_document.html new file mode 100644 index 000000000..b001193a4 --- /dev/null +++ b/rest_framework/templates/rest_framework/docs/_recursive_document.html @@ -0,0 +1,16 @@ +{% load rest_framework %} +{% for section_key, section in items %} + {% if section_key %} + + {{ section_key }} + + + {% endif %} + + {% if section.links|items %} + {% for link_key, link in section.links|items %} + {% include "rest_framework/docs/link.html" with path=path %} + {% endfor %} + {% endif %} + {% include 'rest_framework/docs/_recursive_document.html' with items=section.data|items path=path|list_add:section_key level=level|add:1 %} +{% endfor %} diff --git a/rest_framework/templates/rest_framework/docs/_recursive_menu.html b/rest_framework/templates/rest_framework/docs/_recursive_menu.html new file mode 100644 index 000000000..cebf30717 --- /dev/null +++ b/rest_framework/templates/rest_framework/docs/_recursive_menu.html @@ -0,0 +1,18 @@ +{% load rest_framework %} +{% if items %} + +{% endif %} diff --git a/rest_framework/templates/rest_framework/docs/document.html b/rest_framework/templates/rest_framework/docs/document.html index ef5f5966b..2faf375e2 100644 --- a/rest_framework/templates/rest_framework/docs/document.html +++ b/rest_framework/templates/rest_framework/docs/document.html @@ -14,17 +14,8 @@ -{% for section_key, section in document.data|items %} -{% if section_key %} -

{{ section_key }} -

-{% endif %} - - {% for link_key, link in section.links|items %} - {% include "rest_framework/docs/link.html" %} - {% endfor %} -{% endfor %} +{% include "rest_framework/docs/_recursive_document.html" with items=document.data|items path=""|make_list level=2 %} {% for link_key, link in document.links|items %} - {% include "rest_framework/docs/link.html" %} + {% include "rest_framework/docs/link.html" with path=""|make_list %} {% endfor %} diff --git a/rest_framework/templates/rest_framework/docs/interact.html b/rest_framework/templates/rest_framework/docs/interact.html index 3703301c2..c7211c6c9 100644 --- a/rest_framework/templates/rest_framework/docs/interact.html +++ b/rest_framework/templates/rest_framework/docs/interact.html @@ -16,7 +16,7 @@ -
+
diff --git a/rest_framework/templates/rest_framework/docs/langs/javascript.html b/rest_framework/templates/rest_framework/docs/langs/javascript.html index 4a51a32fd..c4b304ea5 100644 --- a/rest_framework/templates/rest_framework/docs/langs/javascript.html +++ b/rest_framework/templates/rest_framework/docs/langs/javascript.html @@ -6,7 +6,7 @@ var schema = window.schema // Loaded by `schema.js` var client = new coreapi.Client() // Interact with the API endpoint -var action = [{% if section_key %}"{{ section_key }}", {% endif %}"{{ link_key }}"] +var action = [{% for p in path %}"{{ p }}", {% endfor %}{% if section_key %}"{{ section_key }}", {% endif %}"{{ link_key }}"] {% if link.fields %}var params = { {% for field in link.fields %} {{ field.name }}: ...{% if not loop.last %},{% endif %} {% endfor %}} diff --git a/rest_framework/templates/rest_framework/docs/langs/python.html b/rest_framework/templates/rest_framework/docs/langs/python.html index f944daaff..62ba42e05 100644 --- a/rest_framework/templates/rest_framework/docs/langs/python.html +++ b/rest_framework/templates/rest_framework/docs/langs/python.html @@ -6,7 +6,7 @@ client = coreapi.Client() schema = client.get("{{ document.url }}"{% if schema_format %}, format="{{ schema_format }}"{% endif %}) # Interact with the API endpoint -action = [{% if section_key %}"{{ section_key }}", {% endif %}"{{ link_key }}"] +action = [{% for p in path %}"{{ p }}", {% endfor %}{% if section_key %}"{{ section_key }}", {% endif %}"{{ link_key }}"] {% if link.fields %}params = { {% for field in link.fields %} "{{ field.name }}": ...{% if not loop.last %},{% endif %} {% endfor %}} diff --git a/rest_framework/templates/rest_framework/docs/langs/shell.html b/rest_framework/templates/rest_framework/docs/langs/shell.html index d2744920c..a3b95d63d 100644 --- a/rest_framework/templates/rest_framework/docs/langs/shell.html +++ b/rest_framework/templates/rest_framework/docs/langs/shell.html @@ -3,4 +3,4 @@ $ coreapi get {{ document.url }}{% if schema_format %} --format {{ schema_format }}{% endif %} # Interact with the API endpoint -$ coreapi action {% if section_key %}{{ section_key }} {% endif %}{{ link_key }}{% for field in link.fields %} -p {{ field.name }}=...{% endfor %}{% endcode %} +$ coreapi action {% for p in path %}{{ p }} {% endfor %}{% if section_key %}{{ section_key }} {% endif %}{{ link_key }}{% for field in link.fields %} -p {{ field.name }}=...{% endfor %}{% endcode %} diff --git a/rest_framework/templates/rest_framework/docs/link.html b/rest_framework/templates/rest_framework/docs/link.html index ae8c7b700..d27dc6adc 100644 --- a/rest_framework/templates/rest_framework/docs/link.html +++ b/rest_framework/templates/rest_framework/docs/link.html @@ -10,8 +10,10 @@ Interact - +
{{ link.action|upper }} diff --git a/rest_framework/templates/rest_framework/docs/sidebar.html b/rest_framework/templates/rest_framework/docs/sidebar.html index c6ac26f66..0bc25e385 100644 --- a/rest_framework/templates/rest_framework/docs/sidebar.html +++ b/rest_framework/templates/rest_framework/docs/sidebar.html @@ -4,18 +4,7 @@
- + {% include "rest_framework/docs/_recursive_menu.html" with items=document.data|items path=""|make_list %}