-
Notifications
You must be signed in to change notification settings - Fork 93
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support nested pages (python.py) #163
Open
sizmailov
wants to merge
22
commits into
mosra:master
Choose a base branch
from
sizmailov:nested-pages
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
864180f
Add basic support for nested pages
sizmailov a8174d2
Patch references in nested pages
sizmailov 4006ec0
Prevent caching 'format_url' filter results
sizmailov ec4c8f9
Create breadcrumb for nested pages
sizmailov 64302c9
Patch image src too
sizmailov db97443
Add nested page test
sizmailov 004d881
Fix order of parents)
sizmailov 8686cd0
Fix double-formatting urls
sizmailov f47af6d
Add cross references to nested page test
sizmailov 0f83718
Use '/' as nested page separator, avoid `/index` suffix
sizmailov 576320d
Simplify site_root handling
sizmailov 6b38389
Augment search resuls with '../'* prefixes in nested pages
sizmailov 7d09e76
Use breadcrumb page names in search instead of path
sizmailov 8a4ac51
Avoid adding extra script line in flat sites
sizmailov 34c32ce
(?) Fix discrepancy between offset calculation and entry write
sizmailov c98516f
Fix searchdata.bin download url in nested pages
sizmailov e65d5bd
Test for missing `index.rst` in nested pages
sizmailov 887f9da
Restore old behavior for input paths with `/`
sizmailov d27d5c0
Build hierarchy for 'pages' page
sizmailov a3fb447
Mirror images location in INPUT directory in OUTPUT
sizmailov 6a9f3ad
Use stateless template filters, revert most of changes from 864180f4
sizmailov 3861776
Test pure paths links
sizmailov File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,102 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
<meta charset="UTF-8" /> | ||
<title>My Python Project</title> | ||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" /> | ||
<link rel="stylesheet" href="m-dark+documentation.compiled.css" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
</head> | ||
<body> | ||
<header><nav id="navigation"> | ||
<div class="m-container"> | ||
<div class="m-row"> | ||
<a href="index.html" id="m-navbar-brand" class="m-col-t-8 m-col-m-none m-left-m">My Python Project</a> | ||
<div class="m-col-t-4 m-hide-m m-text-right m-nopadr"> | ||
<a href="#search" class="m-doc-search-icon" title="Search" onclick="return showSearch()"><svg style="height: 0.9rem;" viewBox="0 0 16 16"> | ||
<path id="m-doc-search-icon-path" d="m6 0c-3.31 0-6 2.69-6 6 0 3.31 2.69 6 6 6 1.49 0 2.85-0.541 3.89-1.44-0.0164 0.338 0.147 0.759 0.5 1.15l3.22 3.79c0.552 0.614 1.45 0.665 2 0.115 0.55-0.55 0.499-1.45-0.115-2l-3.79-3.22c-0.392-0.353-0.812-0.515-1.15-0.5 0.895-1.05 1.44-2.41 1.44-3.89 0-3.31-2.69-6-6-6zm0 1.56a4.44 4.44 0 0 1 4.44 4.44 4.44 4.44 0 0 1-4.44 4.44 4.44 4.44 0 0 1-4.44-4.44 4.44 4.44 0 0 1 4.44-4.44z"/> | ||
</svg></a> | ||
<a id="m-navbar-show" href="#navigation" title="Show navigation"></a> | ||
<a id="m-navbar-hide" href="#" title="Hide navigation"></a> | ||
</div> | ||
<div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m"> | ||
<div class="m-row"> | ||
<ol class="m-col-t-12 m-col-m-none"> | ||
<li><a href="./custom">Custom</a></li> | ||
</ol> | ||
<ol class="m-col-t-6 m-col-m-none" start="2"> | ||
<li class="m-show-m"><a href="#search" class="m-doc-search-icon" title="Search" onclick="return showSearch()"><svg style="height: 0.9rem;" viewBox="0 0 16 16"> | ||
<use href="#m-doc-search-icon-path" /> | ||
</svg></a></li> | ||
</ol> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</nav></header> | ||
<main><article> | ||
<div class="m-container m-container-inflatable"> | ||
<div class="m-row"> | ||
<div class="m-col-l-10 m-push-l-1"> | ||
<h1>Classes</h2> | ||
<ul class="m-doc"> | ||
</ul> | ||
<script> | ||
function toggle(e) { | ||
e.parentElement.className = e.parentElement.className == 'm-doc-collapsible' ? | ||
'm-doc-expansible' : 'm-doc-collapsible'; | ||
return false; | ||
} | ||
/* Collapse all nodes marked as such. Doing it via JS instead of | ||
directly in markup so disabling it doesn't harm usability. The list | ||
is somehow regenerated on every iteration and shrinks as I change | ||
the classes. It's not documented anywhere and I'm not sure if this | ||
is the same across browsers, so I am going backwards in that list to | ||
be sure. */ | ||
var collapsed = document.getElementsByClassName("collapsed"); | ||
for(var i = collapsed.length - 1; i >= 0; --i) | ||
collapsed[i].className = 'm-doc-expansible'; | ||
</script> | ||
</div> | ||
</div> | ||
</div> | ||
</article></main> | ||
<div class="m-doc-search" id="search"> | ||
<a href="#!" onclick="return hideSearch()"></a> | ||
<div class="m-container"> | ||
<div class="m-row"> | ||
<div class="m-col-m-8 m-push-m-2"> | ||
<div class="m-doc-search-header m-text m-small"> | ||
<div><span class="m-label m-default">Tab</span> / <span class="m-label m-default">T</span> to search, <span class="m-label m-default">Esc</span> to close</div> | ||
<div id="search-symbolcount">…</div> | ||
</div> | ||
<div class="m-doc-search-content"> | ||
<form> | ||
<input type="search" name="q" id="search-input" placeholder="Loading …" disabled="disabled" autofocus="autofocus" autocomplete="off" spellcheck="false" /> | ||
</form> | ||
<noscript class="m-text m-danger m-text-center">Unlike everything else in the docs, the search functionality <em>requires</em> JavaScript.</noscript> | ||
<div id="search-help" class="m-text m-dim m-text-center"> | ||
<p class="m-noindent">Search for modules, classes, functions and other | ||
symbols. You can omit any prefix from the symbol path; adding a <code>.</code> | ||
suffix lists all members of given symbol.</p> | ||
<p class="m-noindent">Use <span class="m-label m-dim">↓</span> | ||
/ <span class="m-label m-dim">↑</span> to navigate through the list, | ||
<span class="m-label m-dim">Enter</span> to go. | ||
<span class="m-label m-dim">Tab</span> autocompletes common prefix, you can | ||
copy a link to the result using <span class="m-label m-dim">⌘</span> | ||
<span class="m-label m-dim">L</span> while <span class="m-label m-dim">⌘</span> | ||
<span class="m-label m-dim">M</span> produces a Markdown link.</p> | ||
</div> | ||
<div id="search-notfound" class="m-text m-warning m-text-center">Sorry, nothing was found.</div> | ||
<ul id="search-results"></ul> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
<script src="search-v1.js"></script> | ||
<script> | ||
Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1) + 'searchdata-v1.bin'); | ||
</script> | ||
</body> | ||
</html> |
88 changes: 88 additions & 0 deletions
88
documentation/test_python/page_nested/examples/advanced/barz.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
<meta charset="UTF-8" /> | ||
<title>Examples » Advanced » Barz | My Python Project</title> | ||
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,600,600i%7CSource+Code+Pro:400,400i,600" /> | ||
<link rel="stylesheet" href="../../m-dark+documentation.compiled.css" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
</head> | ||
<body> | ||
<header><nav id="navigation"> | ||
<div class="m-container"> | ||
<div class="m-row"> | ||
<a href="../../index.html" id="m-navbar-brand" class="m-col-t-8 m-col-m-none m-left-m">My Python Project</a> | ||
<div class="m-col-t-4 m-hide-m m-text-right m-nopadr"> | ||
<a href="#search" class="m-doc-search-icon" title="Search" onclick="return showSearch()"><svg style="height: 0.9rem;" viewBox="0 0 16 16"> | ||
<path id="m-doc-search-icon-path" d="m6 0c-3.31 0-6 2.69-6 6 0 3.31 2.69 6 6 6 1.49 0 2.85-0.541 3.89-1.44-0.0164 0.338 0.147 0.759 0.5 1.15l3.22 3.79c0.552 0.614 1.45 0.665 2 0.115 0.55-0.55 0.499-1.45-0.115-2l-3.79-3.22c-0.392-0.353-0.812-0.515-1.15-0.5 0.895-1.05 1.44-2.41 1.44-3.89 0-3.31-2.69-6-6-6zm0 1.56a4.44 4.44 0 0 1 4.44 4.44 4.44 4.44 0 0 1-4.44 4.44 4.44 4.44 0 0 1-4.44-4.44 4.44 4.44 0 0 1 4.44-4.44z"/> | ||
</svg></a> | ||
<a id="m-navbar-show" href="#navigation" title="Show navigation"></a> | ||
<a id="m-navbar-hide" href="#" title="Hide navigation"></a> | ||
</div> | ||
<div id="m-navbar-collapse" class="m-col-t-12 m-show-m m-col-m-none m-right-m"> | ||
<div class="m-row"> | ||
<ol class="m-col-t-12 m-col-m-none"> | ||
<li><a href="../.././custom">Custom</a></li> | ||
</ol> | ||
<ol class="m-col-t-6 m-col-m-none" start="2"> | ||
<li class="m-show-m"><a href="#search" class="m-doc-search-icon" title="Search" onclick="return showSearch()"><svg style="height: 0.9rem;" viewBox="0 0 16 16"> | ||
<use href="#m-doc-search-icon-path" /> | ||
</svg></a></li> | ||
</ol> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</nav></header> | ||
<main><article> | ||
<div class="m-container m-container-inflatable"> | ||
<div class="m-row"> | ||
<div class="m-col-l-10 m-push-l-1"> | ||
<h1> | ||
<span class="m-breadcrumb"><a href="../../examples/index.html">Examples</a> » <wbr/></span><span class="m-breadcrumb"><a href="../../examples/advanced/index.html">Advanced</a> » <wbr/></span>Barz | ||
</h1> | ||
<p>The <a href="#barz">barz section</a> example is shown here. It's one of <a class="m-doc" href="../../examples/advanced/index.html">advanced examples</a>,</p> | ||
</div> | ||
</div> | ||
</div> | ||
</article></main> | ||
<div class="m-doc-search" id="search"> | ||
<a href="#!" onclick="return hideSearch()"></a> | ||
<div class="m-container"> | ||
<div class="m-row"> | ||
<div class="m-col-m-8 m-push-m-2"> | ||
<div class="m-doc-search-header m-text m-small"> | ||
<div><span class="m-label m-default">Tab</span> / <span class="m-label m-default">T</span> to search, <span class="m-label m-default">Esc</span> to close</div> | ||
<div id="search-symbolcount">…</div> | ||
</div> | ||
<div class="m-doc-search-content"> | ||
<form> | ||
<input type="search" name="q" id="search-input" placeholder="Loading …" disabled="disabled" autofocus="autofocus" autocomplete="off" spellcheck="false" /> | ||
</form> | ||
<noscript class="m-text m-danger m-text-center">Unlike everything else in the docs, the search functionality <em>requires</em> JavaScript.</noscript> | ||
<div id="search-help" class="m-text m-dim m-text-center"> | ||
<p class="m-noindent">Search for modules, classes, functions and other | ||
symbols. You can omit any prefix from the symbol path; adding a <code>.</code> | ||
suffix lists all members of given symbol.</p> | ||
<p class="m-noindent">Use <span class="m-label m-dim">↓</span> | ||
/ <span class="m-label m-dim">↑</span> to navigate through the list, | ||
<span class="m-label m-dim">Enter</span> to go. | ||
<span class="m-label m-dim">Tab</span> autocompletes common prefix, you can | ||
copy a link to the result using <span class="m-label m-dim">⌘</span> | ||
<span class="m-label m-dim">L</span> while <span class="m-label m-dim">⌘</span> | ||
<span class="m-label m-dim">M</span> produces a Markdown link.</p> | ||
</div> | ||
<div id="search-notfound" class="m-text m-warning m-text-center">Sorry, nothing was found.</div> | ||
<ul id="search-results"></ul> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
<script src="../../search-v1.js"></script> | ||
<script> Search.siteRoot = "../../"; </script> | ||
<script> | ||
Search.download(window.location.pathname.substr(0, window.location.pathname.lastIndexOf('/') + 1) + '../../' + 'searchdata-v1.bin'); | ||
</script> | ||
</body> | ||
</html> |
6 changes: 6 additions & 0 deletions
6
documentation/test_python/page_nested/examples/advanced/barz.rst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
.. _Barz: | ||
|
||
Barz | ||
#### | ||
|
||
The `barz section <Barz_>`_ example is shown here. It's one of :ref:`advanced examples <std:doc:examples/advanced>`, |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change made to match above lines (250-251):
Could be it should be turned around.