diff options
| author | bnewbold <bnewbold@ziggy.(none)> | 2009-10-04 21:03:25 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@ziggy.(none)> | 2009-10-04 21:03:25 -0400 |
| commit | 47fac31e910fd90ce869da60dacd645425a41d79 (patch) | |
| tree | 871a634429b30836495e64867be2c6c5091ee43d | |
| parent | 7675ccf36cf0faa5ac7f2aec733f16e4d8e26270 (diff) | |
| parent | 197c0c4496a269ee2063fb6c33afbe2e939d5a52 (diff) | |
| download | bnewnet-47fac31e910fd90ce869da60dacd645425a41d79.tar.gz bnewnet-47fac31e910fd90ce869da60dacd645425a41d79.zip | |
Merge branch 'master' of ssh://animus.robocracy.org/srv/django/bnewnet
| -rw-r--r-- | bn_django/photos/models.py | 4 | ||||
| -rw-r--r-- | bn_django/photos/views.py | 8 | ||||
| -rw-r--r-- | bn_django/templates/base.html | 2 | ||||
| -rw-r--r-- | bn_django/templates/frontpage.html | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/bn_django/photos/models.py b/bn_django/photos/models.py index d6f9261..8ca4f13 100644 --- a/bn_django/photos/models.py +++ b/bn_django/photos/models.py @@ -292,6 +292,6 @@ signals.pre_delete.connect(delete_thumbnails, sender=Photo) from django.contrib import admin -#admin.site.register(Photo) -#admin.site.register(Gallery) +admin.site.register(Photo) +admin.site.register(Gallery) diff --git a/bn_django/photos/views.py b/bn_django/photos/views.py index 993c116..a6459f6 100644 --- a/bn_django/photos/views.py +++ b/bn_django/photos/views.py @@ -117,7 +117,7 @@ def import_photos(request, thegallery): if tags.has_key('Image DateTime'): exifdate = tags['Image DateTime'].printable photo.date = apply(datetime, map(int, exifdate.split(' ')[0].split(':'))) - except Exception as E: + except Exception, E: print E pass try: @@ -126,7 +126,7 @@ def import_photos(request, thegallery): if not exiftitle == []: photo.title = exiftitle - except Exception as E: + except Exception, E: print E pass try: @@ -135,10 +135,10 @@ def import_photos(request, thegallery): if exifrot == 'Rotated 90 CCW': #DO ROTATION pass - except Exception as E: + except Exception, E: print E pass - except Exception as E: + except Exception, E: print E pass finally: diff --git a/bn_django/templates/base.html b/bn_django/templates/base.html index 8fb9564..0459655 100644 --- a/bn_django/templates/base.html +++ b/bn_django/templates/base.html @@ -29,7 +29,7 @@ <div id="top_bar"> <div id="top_bar_content"> <span class="righty"> - <a href="/journal/">journal</a> + {% comment %}<a href="/journal/">journal</a> {% endcomment %} <a href="/photos/">photos</a> <a href="http://git.bnewbold.net/">code</a> <a href="/knowledge/">knowledge</a></span> diff --git a/bn_django/templates/frontpage.html b/bn_django/templates/frontpage.html index cea5534..17250f4 100644 --- a/bn_django/templates/frontpage.html +++ b/bn_django/templates/frontpage.html @@ -14,7 +14,7 @@ {% block right_stuff %} <br /> RSS feeds: <br /> - - <a href="/journal/rss/latest_entries/"> journal entries</a><br /> +{% comment %} - <a href="/journal/rss/latest_entries/"> journal entries</a><br />{% endcomment %} - <a href="/journal/rss/latest_microentries/"> journal microentries</a><br /> - <a href="/journal/rss/latest_links/"> links</a><br /> <br /><br /> |