diff options
| -rw-r--r-- | backend/views.py | 19 | ||||
| -rw-r--r-- | frontend/templates/backgrounds.html | 26 | ||||
| -rw-r--r-- | frontend/views.py | 38 | ||||
| -rw-r--r-- | scannerjammer/settings.py | 3 | ||||
| -rw-r--r-- | scannerjammer/urls.py | 6 |
5 files changed, 75 insertions, 17 deletions
diff --git a/backend/views.py b/backend/views.py index d96fabf..e610bbd 100644 --- a/backend/views.py +++ b/backend/views.py @@ -149,6 +149,25 @@ def videos_response_str(videos): ])) return strio.getvalue() +def videos_response_list(videos): + """ Return list of videos + """ + retval = [] + for v in videos: + s = v.settings + if s.get('removed', 0): + continue + l = [ + v.id, + datetime_to_timestamp(v.datetime), + v.user.id, + v.user.username, + s['url'], + s['title'], + ] + retval.append(l) + return retval + def settings_response_str(label, settings): """ Return string of settings """ diff --git a/frontend/templates/backgrounds.html b/frontend/templates/backgrounds.html index ef7ff2e..967a833 100644 --- a/frontend/templates/backgrounds.html +++ b/frontend/templates/backgrounds.html @@ -1,11 +1,13 @@ +{% load static %} +{% get_static_prefix as STATIC_PREFIX %} <html> <head> <title>SCANNERJAMMER BACKGROUNDS</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta property="og:title" content="ScannerJammer Backgrounds"/> <meta property="og:type" content="website"/> -<meta property="og:url" content="http://scannerjammer.com/bgz/"/> -<meta property="og:image" content="http://scannerjammer.com/img/bgz-icon.jpg"/> +<meta property="og:url" content="{{ STATIC_PREFIX }}bgz/"/> +<meta property="og:image" content="{{ STATIC_PREFIX }}img/bgz-icon.jpg"/> <meta property="og:site_name" content="ScannerJammer"/> <meta property="og:description" content="Every room background ever on ScannerJammer"/> <meta property="fb:admins" content="100001923956223,1709246"/> @@ -168,7 +170,7 @@ a.r {% endfor %} <a href='?start={{ lowest_id }}&limit={{backgrounds|length }}' class='nextpage'>Next page ...</a> </body> -<script type="text/javascript" src="/js/jquery-1.5.2.min.js"></script> +<script type="text/javascript" src="{{ STATIC_PREFIX }}js/jquery-1.5.2.min.js"></script> <script type="text/javascript"> var Dump = { @@ -256,14 +258,14 @@ var Main = Main.init() </script> <script type="text/javascript"> - var serverHost = "{{ server_host }}"; - var serverPort = {{ server_port }}; + var serverHost = "{{ SERVER_HOST }}"; + var serverPort = {{ SERVER_PORT }}; </script> -<script type="text/javascript" src="/js/jquery-1.5.2.min.js"></script> -<script type="text/javascript" src="/js/jquery.md5.js"></script> -<script type="text/javascript" src="/js/swfobject.js"></script> -<script type="text/javascript" src="/js/debug.js"></script> -<script type="text/javascript" src="/js/api.js"></script> -<script type="text/javascript" src="/js/auth.js"></script> -<script type="text/javascript" src="/js/poll.js"></script> +<script type="text/javascript" src="{{ STATIC_PREFIX }}js/jquery-1.5.2.min.js"></script> +<script type="text/javascript" src="{{ STATIC_PREFIX }}js/jquery.md5.js"></script> +<script type="text/javascript" src="{{ STATIC_PREFIX }}js/swfobject.js"></script> +<script type="text/javascript" src="{{ STATIC_PREFIX }}js/debug.js"></script> +<script type="text/javascript" src="{{ STATIC_PREFIX }}js/api.js"></script> +<script type="text/javascript" src="{{ STATIC_PREFIX }}js/auth.js"></script> +<script type="text/javascript" src="{{ STATIC_PREFIX }}js/poll.js"></script> </html> diff --git a/frontend/views.py b/frontend/views.py index 552f0d9..9eb8de6 100644 --- a/frontend/views.py +++ b/frontend/views.py @@ -1,4 +1,10 @@ import re +import json +import time + +from datetime import datetime +from datetime import date +from datetime import timedelta from django.conf import settings from django.http import HttpResponse @@ -12,6 +18,8 @@ from backend.models import SJUserProfile from backend.views import is_number from backend.views import is_image +from backend.views import videos_response_list +from backend.views import ROOM_VIDEO_LOG_SIZE from django.db.models import Q @@ -26,7 +34,7 @@ BLOCKED_DOMAINS = { def bg(request): - """ + """ Backgrounds view """ query = Q(content_type='background') if request.GET.get('start', None): @@ -57,10 +65,34 @@ def bg(request): return render_to_response( 'backgrounds.html', { - 'server_host': settings.SERVER_HOST, - 'server_port': settings.SERVER_PORT, + 'SERVER_HOST': settings.SERVER_HOST, + 'SERVER_PORT': settings.SERVER_PORT, 'lowest_id': backgrounds[limit - 1].id, 'backgrounds': filtered_backgrounds, 'domain': domain, } ) + +def topvideos(request): + """ Top videos view + """ + today = datetime.fromtimestamp(time.mktime(date.today().timetuple())) + tomorrow = today + timedelta(days=1) + yersterday = today - timedelta(days=1) + videos = SJContent.objects.filter(content_type='video') + top_today = videos.filter(Q(datetime__gt=today) & Q(datetime__lt=tomorrow))[0:ROOM_VIDEO_LOG_SIZE] + top_yesterday = videos.filter(Q(datetime__gt=yersterday) & Q(datetime__lt=today))[0:ROOM_VIDEO_LOG_SIZE] + top_alltime = videos[0:ROOM_VIDEO_LOG_SIZE] + + response = render_to_response( + 'topvideos.html', + { + 'SERVER_HOST': settings.SERVER_HOST, + 'SERVER_PORT': settings.SERVER_PORT, + 'top_today': json.dumps(videos_response_list(top_today)), + 'top_yesterday': json.dumps(videos_response_list(top_yesterday)), + 'top_alltime': json.dumps(videos_response_list(top_alltime)), + } + ) + response['Pragma'] = 'no-cache' + return response diff --git a/scannerjammer/settings.py b/scannerjammer/settings.py index 7052c2b..16e9bb4 100644 --- a/scannerjammer/settings.py +++ b/scannerjammer/settings.py @@ -163,5 +163,6 @@ AUTH_PROFILE_MODULE = 'backend.SJUserProfile' from datetime import datetime START_TIME = datetime.now() -SERVER_HOST = 'http://localhost' +#SERVER_HOST = 'http://localhost' +SERVER_HOST = 'http://lalalizard.com' SERVER_PORT = 8000 diff --git a/scannerjammer/urls.py b/scannerjammer/urls.py index faab874..ce6d674 100644 --- a/scannerjammer/urls.py +++ b/scannerjammer/urls.py @@ -1,4 +1,5 @@ from django.conf.urls import patterns, include, url +from django.contrib.staticfiles.urls import staticfiles_urlpatterns # Uncomment the next two lines to enable the admin: from django.contrib import admin @@ -19,7 +20,10 @@ urlpatterns = patterns('', url(r'^api/', include('backend.urls')), # Frontend - url(r'^backgrounds/', 'frontend.views.bg', name='bg'), + url(r'^backgrounds/$', 'frontend.views.bg', name='bg'), + url(r'^top/$', 'frontend.views.topvideos', name='topvideos'), #url(r'.*', 'backend.views.redirect'), ) + +urlpatterns += staticfiles_urlpatterns() |