gallery fixes

This commit is contained in:
Andrew Davidson 2012-02-29 20:15:16 -08:00
parent 4c37591b26
commit e84d3d754c

29
crunch
View file

@ -426,14 +426,16 @@ def format_gallery_single(image):
<div class="eleven columns"> <div class="eleven columns">
<h3>%(name)s</h3> <h3>%(name)s</h3>
<p style="text-align:center;"><a href="%(full_url)s"> <p style="text-align:center;"><a href="%(full_url)s">
<img src="%(mid_url)s" /> <img class="scale-with-grid" src="%(mid_url)s" />
</a></p> </a></p>
</div> </div>
""" % { 'name': image.name(), 'full_url': image.full_url(), 'mid_url': image.mid_url() } """ % { 'name': image.name(), 'full_url': image.full_url(), 'mid_url': image.mid_url() }
def format_gallery_thumb(image): def format_gallery_thumb(image):
return """ return """
<a href="%(mid_page)s"><img src="%(thm_path)s" /></a> <div class="thumbnail">
<a href="%(mid_page)s"><img src="%(thm_path)s" /></a>
</div>
""" % { 'mid_page': image.mid_page(), 'thm_path': image.thumbnail_url() } """ % { 'mid_page': image.mid_page(), 'thm_path': image.thumbnail_url() }
########################################################################################## ##########################################################################################
@ -858,15 +860,21 @@ def crunch_email(message):
exif = dict(original._getexif().items()) exif = dict(original._getexif().items())
else: else:
exif = False exif = False
if not exif == False: if not exif == False:
if args.verbose: print 'Image is rotated, correcting.' try:
if exif[orientation] == 3: if args.verbose: print 'Image is rotated, correcting.'
original = original.rotate(180, expand=True) if exif[orientation] == 3:
elif exif[orientation] == 6: original = original.rotate(180, expand=True)
original = original.rotate(270, expand=True) elif exif[orientation] == 6:
elif exif[orientation] == 8: original = original.rotate(270, expand=True)
original = original.rotate(90, expand=True) elif exif[orientation] == 8:
original = original.rotate(90, expand=True)
except:
if args.verbose: print 'Cannot detect rotation from EXIF.'
# Create empty resized var. # Create empty resized var.
resized = False resized = False
@ -1195,6 +1203,7 @@ def crunch_gallery(name):
# Make a destination gallery. # Make a destination gallery.
if not os.path.exists(build_folder + '/' + conf['galleries_folder'] + '/' + name): if not os.path.exists(build_folder + '/' + conf['galleries_folder'] + '/' + name):
os.mkdir(build_folder + '/' + conf['galleries_folder'] + '/' + name) os.mkdir(build_folder + '/' + conf['galleries_folder'] + '/' + name)
os.chmod(build_folder + '/' + conf['galleries_folder'] + '/' + name, 0755)
images = '' images = ''