Merge pull request #45 from fotochest/feature/themes

Feature/themes

apps/photo_manager/views.py

@@ -69,7 +69,7 @@ def photo_upload(request, username, location_slug, album_slug):
             context['album_slug'] = album_slug
             context['location_slug'] = location_slug
             context['domain_static'] = settings.DOMAIN_STATIC    
-            return render(request,'upload.html', context)
+            return render(request,'%s/upload.html' % settings.ACTIVE_THEME, context)
         else:
             return render(request, 'not_authorized.html')
 
@@ -88,7 +88,7 @@ def album(request, album_id, album_slug, username=None):
         albums = Album.objects.filter(parent_album=album)
         context['albums'] = albums
 
-        return render(request, "albums.html", context)
+        return render(request, "%s/albums.html" % settings.ACTIVE_THEME, context)
     else:
         photos = Photo.objects.active().filter(album__slug=album_slug, user=user)
         paginator = Paginator(photos, 12)
@@ -100,7 +100,7 @@ def album(request, album_id, album_slug, username=None):
             context['photos'] = paginator.page(1)
         except EmptyPage:
             context['photos'] = paginator.page(paginator.num_pages)
-        return render(request, "index.html", context)
+        return render(request, "%s/index.html" % settings.ACTIVE_THEME, context)
 
 def albums(request, username=None):
     context = {}
@@ -126,15 +126,17 @@ def albums(request, username=None):
         else:
             context['parent_albums'] = Album.objects.all()
 
-    return render(request, "albums.html", context)
+    return render(request, "%s/albums.html" % settings.ACTIVE_THEME, context)
 
+# Is this method needed??
+'''
 def child_albums(request, user_name, parent_album_slug):
     user = User.objects.get(username=user_name)
     parent_album = Album.objects.get(slug=parent_album_slug, user=user)
     albums = Album.objects.filter(parent_album=parent_album)
     context = {'albums':albums, 'author': user}
     return render(request, "smugmug/albums.html", context)
-
+'''    
 def homepage(request, username=None):
     context = {}
     if settings.ENABLE_MULTI_USER:
@@ -161,7 +163,7 @@ def homepage(request, username=None):
         context['photos'] = paginator.page(1)
     except EmptyPage:
         context['photos'] = paginator.page(paginator.num_pages)
-    return render(request, "index.html", context)
+    return render(request, "%s/index.html" % settings.ACTIVE_THEME, context)
 
 
 def photo(request, photo_id, album_slug, photo_slug, username=None):
@@ -182,13 +184,13 @@ def photo(request, photo_id, album_slug, photo_slug, username=None):
     context['photo'] = photo
     context['other_photos'] = photos
     context['photos_from_this_location'] = Photo.objects.active().filter(location=photo.location)[:4]
-    return render(request, "photo.html", context)
+    return render(request, "%s/photo.html" % settings.ACTIVE_THEME, context)
 
 def photo_fullscreen(request, photo_id, album_slug, photo_slug, username=None):
     context = {}
     context['photo'] = get_object_or_404(Photo, pk=photo_id, deleted=False)
 
-    return render(request, 'fullscreen.html', context)
+    return render(request, '%s/fullscreen.html' % settings.ACTIVE_THEME, context)
 
 
 def slideshow(request, location_slug=None, album_slug=None, username=None):
@@ -203,7 +205,7 @@ def slideshow(request, location_slug=None, album_slug=None, username=None):
         context['what_object'] = album.title
 
 
-    return render(request, "slideshow.html", context)
+    return render(request, "%s/slideshow.html" % settings.ACTIVE_THEME, context)
 
 ### Map/Location views
 
@@ -229,7 +231,7 @@ def locations(request, username=None):
     else:
         context['location_form'] = LocationForm()
 
-    return render(request, "map.html", context)
+    return render(request, "%s/map.html" % settings.ACTIVE_THEME, context)
 
 def location(request, location_slug, username=None):
     location = get_object_or_404(Location, slug=location_slug)
@@ -253,7 +255,7 @@ def location(request, location_slug, username=None):
         context['photos'] = paginator.page(1)
     except EmptyPage:
         context['photos'] = paginator.page(paginator.num_pages)
-    return render(request, "index.html", context)  
+    return render(request, "%s/index.html" % settings.ACTIVE_THEME, context)  
 
 ### Forms
 @login_required
@@ -262,7 +264,7 @@ def edit_photo(request, photo_id, album_slug=None, username=None, photo_slug=Non
     context['current_user'] = User.objects.get(username=username)
     photo = get_object_or_404(Photo, pk=photo_id, deleted=False)
     if request.user != photo.user:
-        return render(request, 'not_authorized.html')
+        return render(request, '%s/not_authorized.html' % settings.ACTIVE_THEME)
 
     if request.method == "POST":
         form = PhotoForm(request.POST, instance=photo)
@@ -275,17 +277,17 @@ def edit_photo(request, photo_id, album_slug=None, username=None, photo_slug=Non
     context['form'] = form
     context['photo'] = photo
     context['exif_data'] = photo.get_exif_data()
-    return render(request, 'edit_photo.html', context)
+    return render(request, '%s/edit_photo.html' % settings.ACTIVE_THEME, context)
 
 @login_required    
 def delete_photo(request, photo_id, album_slug=None, username=None, photo_slug=None):
     photo = get_object_or_404(Photo, pk=photo_id, deleted=False)
     if request.user != photo.user:
-        return render(request, 'not_authorized.html')
+        return render(request, '%s/not_authorized.html' % settings.ACTIVE_THEME)
 
     photo.deleted = True
     photo.save()
-    return render(request, 'edit_photo.html')
+    return render(request, '%s/edit_photo.html' % settings.ACTIVE_THEME)
 
 ### Jobs
 

apps/profiles/views.py

@@ -29,7 +29,7 @@ def register_part_two(request, username):
     else:
         context['form'] = ProfileForm()
 
-    return render(request, "registration_part_two.html", context)
+    return render(request, "%s/registration_part_two.html" % settings.ACTIVE_THEME, context)
 
 def register(request):
     context = {}
@@ -41,7 +41,7 @@ def register(request):
     else:
         context['form'] = UserCreationForm()
 
-    return render(request, "registration.html", context)
+    return render(request, "%s/registration.html" % settings.ACTIVE_THEME, context)
 
 # Profile
 
@@ -61,11 +61,11 @@ def edit_profile(request):
                 'last_name': request.user.last_name,
                 'email': request.user.email}
         context['form'] = ProfileForm(data)
-        return render(request, "edit_profile.html", context)
+        return render(request, "%s/edit_profile.html" % settings.ACTIVE_THEME, context)
 
 
 def view_profile(request, username):
     user = get_object_or_404(User, username=username)
     context = {'profile_user': user}
-    return render(request, 'profile.html', context)
+    return render(request, '%s/profile.html' % settings.ACTIVE_THEME, context)
 

conf/fabfile.py

@@ -1,12 +1,13 @@
+from fabric.api import *
 env.webteam_dir = '/srv/www/projects'
-env.id = PROJECT_ID
-env.user = PROJECT_USER
-env.directory = env.webteam_dir + '/%s' % PROJECT_ID
+env.id = "something"
+env.user = "something"
+env.directory = env.webteam_dir + '/%s' % ""
 env.virtual_dir = '/srv/www/.virtualenvs'
-env.static_dir = '/srv/www/static/%s' % PROJECT_ID
-env.project_virtual = '/srv/www/.virtualenvs/%s' % PROJECT_ID
-env.activate = 'source /srv/www/.virtualenvs/%s/bin/activate' % PROJECT_ID
-env.git_repo = "git@github.com:kstateome/%s.git" % PROJECT_ID
+env.static_dir = '/srv/www/static/%s' % "lksdjf"
+env.project_virtual = '/srv/www/.virtualenvs/%s' % "lkdj"
+env.activate = 'source /srv/www/.virtualenvs/%s/bin/activate' % "lksdj"
+env.git_repo = "git@github.com:kstateome/%s.git" % "lksdj"
 env.apache_bin_dir = "/etc/init.d/apache2"
 env.log_location = "/var/log/apache2/ome-error.log"
 env.git_production_branch = "production"

settings/common.py

@@ -31,9 +31,8 @@
 ENABLE_REGISTRATION = False
 ACTIVE_THEME = "default"
 AUTH_PROFILE_MODULE = "profiles.Profile"
-STATICFILES_DIRS = (
-    os.path.join(SITE_ROOT, 'static'),
-)
+
+
 
 
 STATICFILES_FINDERS = (

settings/local.py

@@ -34,6 +34,12 @@
 # Example: "/home/media/media.lawrence.com/static/"
 STATIC_ROOT = ''
 
+
+STATICFILES_DIRS = (
+    os.path.join(SITE_ROOT, 'themes/default/static'),
+    os.path.join(SITE_ROOT, 'static'),
+)
+
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/static/'
@@ -46,9 +52,8 @@
 PHOTO_DIRECTORY = os.path.join(SITE_ROOT, 'uploads/images')
 
 TEMPLATE_DIRS = (
-    #"/Users/Derek/Documents/code/personal/apps/fotochest/static/photo_manager/themes/default/templates"
-    os.path.join(SITE_ROOT, 'static/photo_manager/themes/default/templates'),
-    os.path.join(SITE_ROOT, 'templates')
+    os.path.join(SITE_ROOT, 'themes/default/templates'),
+    os.path.join(SITE_ROOT, 'templates'),
 )
 
 DOMAIN_STATIC = '/static/'

settings/production.py

@@ -9,7 +9,7 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
         'NAME': '',                      # Or path to database file if using sqlite3.
         'USER': '',                      # Not used with sqlite3.
         'PASSWORD': '',                  # Not used with sqlite3.
@@ -32,11 +32,16 @@
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = ''
+STATIC_ROOT = os.path.join(SITE_ROOT, 'static')
+
+STATICFILES_DIRS = (
+    os.path.join(SITE_ROOT, 'themes/default/static'),
+)
+
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-STATIC_URL = ''
+STATIC_URL = '/static/'
 
 DOMAIN_STATIC = ''