From c8fcfe09fd5768326ab2f7e361620ced0b07a553 Mon Sep 17 00:00:00 2001 From: luxagraf Date: Wed, 14 Dec 2016 11:32:17 -0500 Subject: cleaned up some files and added admin for LuxVideos --- app/photos/admin.py | 8 +++-- config/requirements.txt | 59 ++++++++++++++-------------------- design/assets/canadaLow.svg | 47 ++++++++++++++++++++++++++++ design/assets/mexicoLow.svg | 56 +++++++++++++++++++++++++++++++++ design/assets/usaLow.svg | 73 +++++++++++++++++++++++++++++++++++++++++++ design/assets/wanderer16.png | Bin 0 -> 322 bytes design/assets/wanderer32.png | Bin 0 -> 415 bytes design/wanderer16.png | Bin 322 -> 0 bytes design/wanderer32.png | Bin 415 -> 0 bytes 9 files changed, 205 insertions(+), 38 deletions(-) create mode 100644 design/assets/canadaLow.svg create mode 100644 design/assets/mexicoLow.svg create mode 100644 design/assets/usaLow.svg create mode 100644 design/assets/wanderer16.png create mode 100644 design/assets/wanderer32.png delete mode 100644 design/wanderer16.png delete mode 100644 design/wanderer32.png diff --git a/app/photos/admin.py b/app/photos/admin.py index f0eb1c7..0e6c10d 100644 --- a/app/photos/admin.py +++ b/app/photos/admin.py @@ -3,7 +3,7 @@ from django import forms from django.contrib.gis.admin import OSMGeoAdmin from django.conf.urls import url from django.utils.translation import ungettext, ugettext_lazy as _ -from photos.models import Photo, PhotoGallery, LuxImage, LuxGallery, LuxImageSize +from photos.models import Photo, PhotoGallery, LuxImage, LuxGallery, LuxImageSize, LuxVideo from django.shortcuts import render from django.contrib.admin import helpers from django.http import HttpResponseRedirect @@ -20,8 +20,12 @@ class LuxImageSizeAdmin(OSMGeoAdmin): admin.site.register(LuxImageSize, LuxImageSizeAdmin) -class LuxImageAdmin(OSMGeoAdmin): +@admin.register(LuxVideo) +class LuxVideoAdmin(OSMGeoAdmin): + pass + +class LuxImageAdmin(OSMGeoAdmin): list_display = ('pk', 'admin_thumbnail', 'pub_date', 'location') list_filter = ('pub_date', 'location') search_fields = ['title', 'caption'] diff --git a/config/requirements.txt b/config/requirements.txt index f72de42..ad55a42 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -1,62 +1,49 @@ -bleach==1.4.1 -django-bleach==0.3.0 -django-contrib-comments==1.5 -django-extensions==1.5.2 -django-gravatar2==1.2.1 -django-taggit==0.12.3 -gunicorn==19.3.0 -html5lib==0.999 -ipython==3.0.0 -jsmin==2.1.1 -Markdown==2.6.1 -oauthlib==0.7.2 -requests==2.6.0 -requests-oauthlib==0.4.2 -six==1.9.0 -smartypants==1.8.6 -twython==3.2.0 -typogrify==2.0.7 -backports.shutil-get-terminal-size==1.0.0 -beautifulsoup4==4.4.0 +beautifulsoup4==4.5.1 bleach==1.4.3 +bs4==0.0.1 decorator==4.0.10 -Django==1.9.7 -django-autocomplete-light==2.2.10 +Django==1.9 +django-autocomplete-light==2.3.3 django-bleach==0.3.0 -django-contrib-comments==1.7.1 -django-extensions==1.6.7 +django-contrib-comments==1.7.3 +django-extensions==1.7.5 django-gravatar2==1.4.0 -django-modeladmin-reorder==0.1.3 -django-paypal==0.2.7 -django-taggit==0.20.1 +django-paypal==0.3.2 +django-taggit==0.21.3 +django-typogrify==1.3.3 EbookLib==0.15 +Facebook==0.0 facebook-sdk==1.0.0 flickrapi==2.1.2 gunicorn==19.6.0 html5lib==0.9999999 -ipython==4.2.0 +ipython==5.0.0 ipython-genutils==0.1.0 Jinja2==2.8 jsmin==2.2.1 -lxml==3.6.0 +lxml==3.6.1 Markdown==2.6.6 MarkupSafe==0.23 medium==0.3.0 oauthlib==1.1.2 paypal==1.2.5 -pexpect==4.1.0 -pickleshare==0.7.2 -Pillow==3.2.0 -psycopg2==2.6.1 +pexpect==4.2.1 +pickleshare==0.7.4 +Pillow==3.4.2 +prompt-toolkit==1.0.3 +psycopg2==2.6.2 ptyprocess==0.5.1 -e git://github.com/smarnach/pyexiftool.git@0d5ee2f590ad336426c239f47b2b0406c6f52620#egg=PyExifTool +Pygments==2.1.3 python-resize-image==1.1.3 +pytz==2016.6.1 requests==2.10.0 -requests-oauthlib==0.6.1 -requests-toolbelt==0.6.2 +requests-oauthlib==0.7.0 +requests-toolbelt==0.7.0 simplegeneric==0.8.1 six==1.10.0 smartypants==1.8.6 -traitlets==4.2.1 +traitlets==4.3.1 twython==3.4.0 typogrify==2.0.7 +wcwidth==0.1.7 diff --git a/design/assets/canadaLow.svg b/design/assets/canadaLow.svg new file mode 100644 index 0000000..7c89b23 --- /dev/null +++ b/design/assets/canadaLow.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/design/assets/mexicoLow.svg b/design/assets/mexicoLow.svg new file mode 100644 index 0000000..f025ecb --- /dev/null +++ b/design/assets/mexicoLow.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/design/assets/usaLow.svg b/design/assets/usaLow.svg new file mode 100644 index 0000000..b747d36 --- /dev/null +++ b/design/assets/usaLow.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/design/assets/wanderer16.png b/design/assets/wanderer16.png new file mode 100644 index 0000000..aff3fbf Binary files /dev/null and b/design/assets/wanderer16.png differ diff --git a/design/assets/wanderer32.png b/design/assets/wanderer32.png new file mode 100644 index 0000000..a6ca3cc Binary files /dev/null and b/design/assets/wanderer32.png differ diff --git a/design/wanderer16.png b/design/wanderer16.png deleted file mode 100644 index aff3fbf..0000000 Binary files a/design/wanderer16.png and /dev/null differ diff --git a/design/wanderer32.png b/design/wanderer32.png deleted file mode 100644 index a6ca3cc..0000000 Binary files a/design/wanderer32.png and /dev/null differ -- cgit v1.2.3-70-g09d2