summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2011-05-07 07:42:34 -0400
committerJason A. Donenfeld <Jason@zx2c4.com>2011-05-07 07:42:34 -0400
commit68a1f42e34c4bdddf87853b346e10e592d38e237 (patch)
tree15280ed1522d4ef7f683ce29b2d5ac0dcf4f5e29
parentMeta data consolidation. (diff)
downloadPhotoFloat-68a1f42e34c4bdddf87853b346e10e592d38e237.tar.xz
PhotoFloat-68a1f42e34c4bdddf87853b346e10e592d38e237.zip
Final tweeks.
-rw-r--r--scanner/PhotoAlbum.py4
-rw-r--r--web/css/000-controls.css3
-rw-r--r--web/js/010-control.js2
3 files changed, 6 insertions, 3 deletions
diff --git a/scanner/PhotoAlbum.py b/scanner/PhotoAlbum.py
index 7147fc1..6e209e7 100644
--- a/scanner/PhotoAlbum.py
+++ b/scanner/PhotoAlbum.py
@@ -1,6 +1,7 @@
from CachePath import *
from datetime import datetime
import json
+import os
import os.path
from PIL import Image
from PIL.ExifTags import TAGS
@@ -224,7 +225,8 @@ class Photo(object):
try:
image.save(thumb_path, "JPEG")
except:
- os.path.unlink(thumb_path)
+ print "Could not thumbnail %s" % thumb_path
+ os.unlink(thumb_path)
def _thumbnails(self, image, thumb_path):
mirror = image
diff --git a/web/css/000-controls.css b/web/css/000-controls.css
index 8148c2b..435346b 100644
--- a/web/css/000-controls.css
+++ b/web/css/000-controls.css
@@ -62,6 +62,7 @@ a:hover {
font-size: 2.5em;
line-height: 0;
top: 40%;
+ font-weight: bold;
}
#back {
left: .5em;
@@ -105,7 +106,7 @@ a:hover {
}
#metadata {
background-color: #000000;
- width: 270px;
+ width: 340px;
font-size: 12px;
line-height: 12px;
padding-top: 3px;
diff --git a/web/js/010-control.js b/web/js/010-control.js
index add9760..b78ce80 100644
--- a/web/js/010-control.js
+++ b/web/js/010-control.js
@@ -281,7 +281,7 @@ $(document).ready(function() {
.css("padding-top", 0)
.css("padding-bottom", 0)
.show()
- .animate({ height: 16 * 11, paddingTop: 3, paddingBottom: 3 }, "slow", function() {
+ .animate({ height: 16.3 * 11, paddingTop: 3, paddingBottom: 3 }, "slow", function() {
$("#metadata-link").text($("#metadata-link").text().replace("show", "hide"));
});
else