diff options
Diffstat (limited to 'frontend/views.py')
| -rwxr-xr-x | frontend/views.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/frontend/views.py b/frontend/views.py index ab69045..9a97402 100755 --- a/frontend/views.py +++ b/frontend/views.py @@ -117,7 +117,7 @@ def directory(request): return response def get_thumbnail(user): - STOCK_THUMBNAIL = 'http://scannerjammer.com/img/runner.gif' + STOCK_THUMBNAIL = 'http://scannerjammer.com/static/img/runner.gif' """ FIXME if user.access and 'http' in user.access: # what was those fields? @@ -151,7 +151,7 @@ def profile(request, username): topz = SJContent.objects.filter(user__id=userprofile.user.id, content_type='video').annotate(likes=Count('sjlike')).order_by('-likes')[:50] likez = SJContent.objects.filter(content_type='video', sjlike__user_id = userprofile.user.id ).order_by('-sjlike__datetime')[:50] tvidz = SJContent.objects.filter(user__id=userprofile.user.id, content_type='video').order_by('-datetime')[:50] - profile = [ userprofile.id, userprofile.nickname, userprofile.score, 3, 4, 5, userprofile.bio, json.loads(userprofile.settings_text) ] + profile = [ userprofile.user.id, userprofile.nickname, userprofile.score, 3, 4, 5, userprofile.bio, json.loads(userprofile.settings_text), userprofile.user.email ] vidz = [] for a in tvidz: vidz.insert(0,a) @@ -176,6 +176,8 @@ def profile(request, username): ) response['Pragma'] = 'no-cache' return response +# looks good to me ok awesome...lets continue this tomorrow? alright hey thanks a lot, don't want this to go too late, +#but thanks so much for this help, I'll test it no problems def profile_img(request, username): """ Directory view @@ -185,7 +187,7 @@ def profile_img(request, username): thumbnail = get_thumbnail(userprofile) likez = SJContent.objects.filter(content_type='text', sjlike__user_id = userprofile.user.id ).order_by('-datetime')[:50] - profile = [ userprofile.id, userprofile.nickname, userprofile.score, 3, 4, 5, userprofile.bio, json.loads(userprofile.settings_text) ] + profile = [ userprofile.user.id, userprofile.nickname, userprofile.score, 3, 4, 5, userprofile.bio, json.loads(userprofile.settings_text), userprofile.user.email ] response = render_to_response( 'profile_img.html', @@ -236,11 +238,11 @@ def room(request, roomname): jsPath = "/js/sj_compiled.js" title = sjroom.name.capitalize() + " room on ScannerJammer" - thumbnail = "http://scannerjammer.com/img/plant.gif" + thumbnail = "http://scannerjammer.com/static/img/plant.gif" if sjroom.name == "glitter": - thumbnail = "http://scannerjammer.com/img/glitter_flower.gif" + thumbnail = "http://scannerjammer.com/static/img/glitter_flower.gif" elif sjroom.name == "glasspopcorn": - thumbnail = "http://scannerjammer.com/img/glasspopthumb.gif" + thumbnail = "http://scannerjammer.com/static/img/glasspopthumb.gif" title = "GlassPopcorn TV" elif room == "adult": #serverPort = 6969 |