5 Commits

4 changed files with 19 additions and 11 deletions

View File

@@ -66,5 +66,5 @@ def generate_parent_navs(path):
with app.open_instance_resource(resolved_path, 'r') as entry_file: with app.open_instance_resource(resolved_path, 'r') as entry_file:
entry = entry_file.read() entry = entry_file.read()
_ = Markup(md.convert(entry)) _ = Markup(md.convert(entry))
page_name = " ".join(md.Meta.get('title')) if md.Meta.get('title') else path page_name = " ".join(md.Meta.get('title')) if md.Meta.get('title') else f'/{path}'
return generate_parent_navs(parent_path) + [(page_name, path)] return generate_parent_navs(parent_path) + [(page_name, f'/{path}')]

View File

@@ -90,6 +90,7 @@ footer {
font-size: 75%; font-size: 75%;
color: #999; color: #999;
padding: 0 1em; padding: 0 1em;
margin-top: 15px;
} }
table { table {
@@ -98,10 +99,15 @@ table {
table, th, td { table, th, td {
padding: 5px; padding: 5px;
border: 1px solid #222; border: 1px solid #ccc;
margin-bottom: 15px; margin-bottom: 15px;
} }
th { th {
background: #eee; background: #eee;
} }
blockquote {
background-color: rgba(120, 120, 120, 0.1);
padding: 1px 10px;
}

View File

@@ -8,8 +8,8 @@ HERE = os.path.dirname(os.path.abspath(__file__))
def extract_requires(): def extract_requires():
"""Get pinned requirements from requirements.in.""" """Get pinned requirements from requirements.txt."""
with open(os.path.join(HERE, 'requirements/requirements.in'), 'r') as reqs: with open(os.path.join(HERE, 'requirements/requirements.txt'), 'r') as reqs:
return [line.split(' ')[0] for line in reqs if not line[0] in ('-', '#')] return [line.split(' ')[0] for line in reqs if not line[0] in ('-', '#')]

View File

@@ -58,17 +58,19 @@ def test_generate_page_navs_alternate_index(app):
def test_generate_page_navs_subdir_index(app): def test_generate_page_navs_subdir_index(app):
with app.app_context(): with app.app_context():
assert generate_parent_navs('/subdir/') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/')] assert generate_parent_navs('subdir/') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/')]
def test_generate_page_navs_subdir_real_page(app): def test_generate_page_navs_subdir_real_page(app):
with app.app_context(): with app.app_context():
assert generate_parent_navs('/subdir/page') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/'), assert generate_parent_navs('subdir/page') == [('incorporeal.org', '/'), ('/subdir/', '/subdir/'),
('Page', '/subdir/page')] ('Page', '/subdir/page')]
def test_generate_page_navs_subdir_with_title_parsing_real_page(app): def test_generate_page_navs_subdir_with_title_parsing_real_page(app):
with app.app_context(): with app.app_context():
assert generate_parent_navs('/subdir-with-title/page') == [('incorporeal.org', '/'), assert generate_parent_navs('subdir-with-title/page') == [
('SUB!', '/subdir-with-title/'), ('incorporeal.org', '/'),
('/subdir-with-title/page', '/subdir-with-title/page')] ('SUB!', '/subdir-with-title/'),
('/subdir-with-title/page', '/subdir-with-title/page')
]