Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

<!-- insertion marker -->
## [1.1.1](https://github.com/nomike/scms/releases/tag/1.1.1) - 2025-05-11

<small>[Compare with v1.1.0](https://github.com/nomike/scms/compare/v1.1.0...1.1.1)</small>

### Fixed

- Fix detection and rendering of plain 'index' files ([3a3edd6](https://github.com/nomike/scms/commit/3a3edd6122d3a0ba5e92a270fb3f887b1fd180ce) by nomike).

## [1.1.0](https://github.com/nomike/scms/releases/tag/1.1.0) - 2025-05-11

<small>[Compare with 1.0.0](https://github.com/nomike/scms/compare/1.0.0...1.1.0)</small>
Expand Down
4 changes: 2 additions & 2 deletions templatehelper.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def listdir(path):
If a file named "index" is present, it is supposed to be rendered as the main content of the
page and thus it will be ommited from the list as well.
"""
ignorelist = ['index', 'index.md', 'index.org', '*.scmsfasicon', '*.scmstarget']
ignorelist = ['index', 'index.html', 'index.md', 'index.org', '*.scmsfasicon', '*.scmstarget']
if os.path.exists(os.path.join(pathprefix, path, '.scmsignore')):
with open(
os.path.join(pathprefix, path, '.scmsignore'),
Expand Down Expand Up @@ -115,7 +115,7 @@ def listchildren(path):
If a file named "index" is present, it is supposed to be rendered as the main content of the
page and thus it will be ommited from the list as well.
"""
ignorelist = ['index', 'index.md', 'index.org', '*.scmsfasicon', '*.scmstarget']
ignorelist = ['index', 'index.html', 'index.md', 'index.org', '*.scmsfasicon', '*.scmstarget']
if os.path.exists(os.path.join(pathprefix, path, '.scmsignore')):
with open(
os.path.join(pathprefix, path, '.scmsignore'),
Expand Down
4 changes: 3 additions & 1 deletion templates/nomike.com/directory.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
</div>
{% endif -%} {% endblock -%} {% block content -%} {% if templatehelper.os.path.isfile(templatehelper.os.path.join(pathprefix, path,'index.org')) -%} {{ templatehelper.orgpython.to_html(templatehelper.readfile(templatehelper.os.path.join(pathprefix,path,'index.org')))
| safe }} {% elif templatehelper.os.path.isfile(templatehelper.os.path.join(pathprefix, path,'index.md')) -%} {{ templatehelper.markdown.markdown(templatehelper.readfile(templatehelper.os.path.join(pathprefix,path,'index.md')),extensions=['fenced_code','toc','tables'])
| safe }} {% else -%}
| safe }} {% elif templatehelper.os.path.isfile(templatehelper.os.path.join(pathprefix, path, 'index.html')) -%} {{ templatehelper.readfile(templatehelper.os.path.join(pathprefix, path, 'index.html'))
| safe -}} {% elif templatehelper.os.path.isfile(templatehelper.os.path.join(pathprefix, path, 'index')) -%} {{ templatehelper.readfile(templatehelper.os.path.join(pathprefix, path, 'index'))
| safe -}} {% else -%}
<h1>/{{ path }}</h1>
{% endif -%} {% if templatehelper.os.path.isdir(templatehelper.os.path.join(pathprefix, path, 'image')) %} {% include templatehelper.os.path.join(templatehelper.config['template'], 'gallery.html') %} {% endif %} {% endblock %}