diff options
| author | luxagraf <sng@luxagraf.net> | 2011-05-19 10:31:33 -0500 |
|---|---|---|
| committer | luxagraf <sng@luxagraf.net> | 2011-05-19 10:31:33 -0500 |
| commit | d393c88c21805502f5fd69a02b9a4592eaf0d735 (patch) | |
| tree | 15ce026158e54b0163a9942b0dc3942b7ae756b1 | |
| parent | 9dd8a4d79627a94f8f54cf15609e2841deae1166 (diff) | |
fixed bug in link syncing script and added new lens info to flickr import scripts and templates
| -rw-r--r-- | cron/sync_links.py | 2 | ||||
| -rw-r--r-- | cron/sync_photo_sets.py | 1 | ||||
| -rw-r--r-- | cron/sync_photos.py | 1 | ||||
| -rw-r--r-- | templates/details/photo_galleries.html | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/cron/sync_links.py b/cron/sync_links.py index 51422ce..4bec6d2 100644 --- a/cron/sync_links.py +++ b/cron/sync_links.py @@ -7,7 +7,7 @@ sys.path.append(PROJECT_ROOT) sys.path.append(PROJECT_ROOT+'/apps') sys.path.append(PROJECT_ROOT+'/lib') sys.path.append(PROJECT_ROOT+'/lib/utils') -sys.path.append('/home/luxagraf/webapps/django1_3/lib/python2.7/') +sys.path.append('/home/luxagraf/webapps/django/lib/python2.7/') os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' from links import retriever retriever.sync_pinboard_links()
\ No newline at end of file diff --git a/cron/sync_photo_sets.py b/cron/sync_photo_sets.py index 8ce8bb5..8c18a9a 100644 --- a/cron/sync_photo_sets.py +++ b/cron/sync_photo_sets.py @@ -1,3 +1,4 @@ +import sys, os from os.path import dirname, abspath PROJECT_ROOT = abspath(dirname(dirname(__file__))) diff --git a/cron/sync_photos.py b/cron/sync_photos.py index 916057f..3dc7552 100644 --- a/cron/sync_photos.py +++ b/cron/sync_photos.py @@ -1,3 +1,4 @@ +import sys, os from os.path import dirname, abspath PROJECT_ROOT = abspath(dirname(dirname(__file__))) diff --git a/templates/details/photo_galleries.html b/templates/details/photo_galleries.html index 5fa09c5..bb137b6 100644 --- a/templates/details/photo_galleries.html +++ b/templates/details/photo_galleries.html @@ -33,7 +33,7 @@ {%if photo.description %}<p>{{photo.description|safe}}</p> {%endif%} </div> <div class="photo-options"> - <p>{% if photo.exif_make == 'Canon'%}{{photo.exif_model}}{%endif%}{% if photo.exif_model == 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endif%}{%if photo.exif_model == 'DMC-GF1' %}Panasonic GF1 w/{%endif%} {%if photo.exif_lens == 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">Lumix 14-45mm lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">Lumix 20mm prime lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G VARIO 45-200/F4.0-5.6' %}<a href="http://amzn.to/a9DfV7" title="buy the {{photo.exif_lens}} on Amazon">Lumix 45-200mm lens</a>{%endif%}{%if photo.exif_lens == None %}{%endif%}</p> + <p>{% if photo.exif_make == 'Canon'%}{{photo.exif_model}}{%endif%}{% if photo.exif_model == 'DMC-LX2'%}{{photo.exif_make}} {{photo.exif_model}}{%endif%}{%if photo.exif_model == 'DMC-GF1' %}Panasonic GF1 w/{%endif%} {%if photo.exif_lens == 'LUMIX G VARIO 14-45/F3.5-5.6' %}<a href="http://amzn.to/azIr5w" title="buy the {{photo.exif_lens}} on Amazon">Lumix 14-45mm lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G 20/F1.7' %}<a href="http://amzn.to/daMYOm" title="buy the {{photo.exif_lens}} on Amazon">Lumix 20mm prime lens</a>{%endif%}{%if photo.exif_lens == 'LUMIX G VARIO 45-200/F4.0-5.6' %}<a href="http://amzn.to/a9DfV7" title="buy the {{photo.exif_lens}} on Amazon">Lumix 45-200mm lens</a>{%endif%}{%if photo.exif_lens == 'OLYMPUS M.9-18mm F4.0-5.6' %}<a href="http://amzn.to/mGNVkl" title="buy the {{photo.exif_lens}} on Amazon">Olympus 9-18mm lens</a>{%endif%}{%if photo.exif_lens == None %}{%endif%}</p> <p>{{photo.exif_exposure}} sec @ {{photo.exif_aperture}}, ISO {{photo.exif_iso}} </p> <!--<p><a href="{{photo.flickr_link}}" title="View this Photo on Flickr.com">View on Flickr</a></p>--> <!--<a href="#" class="exif-link" title="{{photo.id}}">Camera</a>--> |