Browse Source

Merge pull request #524 from KaibutsuX/displayTimestamp

Added support for display_timestamp setting
pull/527/head
Simon Conseil 2 years ago committed by GitHub
parent
commit
1a78820113
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      src/sigal/settings.py
  2. 3
      src/sigal/templates/sigal.conf.py
  3. 3
      src/sigal/themes/default/templates/footer.html
  4. 2
      src/sigal/writer.py

1
src/sigal/settings.py

@ -33,6 +33,7 @@ _DEFAULT_CONFIG = {
"colorbox_column_size": 3, "colorbox_column_size": 3,
"copy_exif_data": False, "copy_exif_data": False,
"datetime_format": "%c", "datetime_format": "%c",
"display_timestamp": False,
"destination": "_build", "destination": "_build",
"files_to_copy": (), "files_to_copy": (),
"galleria_theme": "classic", "galleria_theme": "classic",

3
src/sigal/templates/sigal.conf.py

@ -86,6 +86,9 @@ img_size = (800, 600)
# https://docs.python.org/3/library/datetime.html#strftime-strptime-behavior # https://docs.python.org/3/library/datetime.html#strftime-strptime-behavior
# datetime_format = '%c' # datetime_format = '%c'
# Display generated datetime in the resulting output
# display_timestamp = False
# Jpeg options # Jpeg options
# jpg_options = {'quality': 85, # jpg_options = {'quality': 85,
# 'optimize': True, # 'optimize': True,

3
src/sigal/themes/default/templates/footer.html

@ -12,5 +12,8 @@
<span><a href={{ settings.atom_feed.feed_url }}>Atom Feed</a></span> <span><a href={{ settings.atom_feed.feed_url }}>Atom Feed</a></span>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if settings.display_timestamp %}
@ {{ generated_timestamp }}
{% endif %}
</p> </p>
</footer> </footer>

2
src/sigal/writer.py

@ -27,6 +27,7 @@ import shutil
import stat import stat
import sys import sys
import types import types
from datetime import datetime
from jinja2 import ChoiceLoader, Environment, FileSystemLoader, PrefixLoader from jinja2 import ChoiceLoader, Environment, FileSystemLoader, PrefixLoader
from jinja2.exceptions import TemplateNotFound from jinja2.exceptions import TemplateNotFound
@ -138,6 +139,7 @@ class AbstractWriter:
"index_title": self.index_title, "index_title": self.index_title,
"settings": self.settings, "settings": self.settings,
"sigal_link": sigal_link, "sigal_link": sigal_link,
"generated_timestamp": datetime.now().strftime(self.settings['datetime_format']),
"theme": { "theme": {
"name": os.path.basename(self.theme), "name": os.path.basename(self.theme),
"url": url_from_path(os.path.relpath(self.theme_path, album.dst_path)), "url": url_from_path(os.path.relpath(self.theme_path, album.dst_path)),

Loading…
Cancel
Save