jeff/siglican
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'Spindel-master'

Browse source 
update to make this Python3 friendly
This commit is contained in:
Scott Boone (github signing key) 2015-09-02 18:16:50 -05:00
commit 6ebca5751c
2 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/siglican_gallery.html
View file

@ -4,7 +4,7 @@
{% block content %} {% block content %}
<h2>albums</h2> <h2>albums</h2>
<ul> <ul>
{% for aname,album in ALBUMS.iteritems() %} {% for aname,album in ALBUMS.items() %}
<li>{{ aname }}<a href="{{ SITEURL }}/{{ SIGLICAN_DESTINATION }}/{{ album.url }}"><img src="{{ SITEURL }}/{{ SIGLICAN_DESTINATION }}/{{ album.thumbnail }}"></a> <li>{{ aname }}<a href="{{ SITEURL }}/{{ SIGLICAN_DESTINATION }}/{{ album.url }}"><img src="{{ SITEURL }}/{{ SIGLICAN_DESTINATION }}/{{ album.thumbnail }}"></a>
{% endfor %} {% endfor %}
</ul> </ul>

6
siglican.py
View file

@ -94,7 +94,7 @@ class SigalGalleryGenerator(Generator):
# this needs to be first to establish pelican settings: # this needs to be first to establish pelican settings:
super(SigalGalleryGenerator, self).__init__(*args, **kwargs) super(SigalGalleryGenerator, self).__init__(*args, **kwargs)
# add default sigal settings to generator settings: # add default sigal settings to generator settings:
for k in _DEFAULT_SIGLICAN_SETTINGS.keys()[:]: for k in list(_DEFAULT_SIGLICAN_SETTINGS.keys()):
self.settings[k] = self.settings.get(k, _DEFAULT_SIGLICAN_SETTINGS[k]) self.settings[k] = self.settings.get(k, _DEFAULT_SIGLICAN_SETTINGS[k])
#logger.debug("sigal.pelican: setting %s: %s",k,self.settings[k]) #logger.debug("sigal.pelican: setting %s: %s",k,self.settings[k])
self._clean_settings() self._clean_settings()
@ -189,7 +189,7 @@ class SigalGalleryGenerator(Generator):
self.context['ALBUMS'] = self.albums # ** change to SIGLICAN_ALBUMS? self.context['ALBUMS'] = self.albums # ** change to SIGLICAN_ALBUMS?
# update the jinja context with the default sigal settings: # update the jinja context with the default sigal settings:
for k,v in _DEFAULT_SIGLICAN_SETTINGS.iteritems(): for k,v in _DEFAULT_SIGLICAN_SETTINGS.items():
if not k in self.context: if not k in self.context:
self.context[k] = v self.context[k] = v
@ -265,8 +265,10 @@ class SigalGalleryGenerator(Generator):
## - bring back Writer options that Sigal had? ## - bring back Writer options that Sigal had?
## - make sure thumbnails don't break in some cases [fixed?] ## - make sure thumbnails don't break in some cases [fixed?]
def get_generators(generators): def get_generators(generators):
return SigalGalleryGenerator return SigalGalleryGenerator
def register(): def register():
signals.get_generators.connect(get_generators) signals.get_generators.connect(get_generators)