X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=quotes%2Fviews.py;h=642cb433581d953dcd1fced549bd7a784ebd394d;hb=09e61e917b545fa8c39105285d4b82e95307151c;hp=2aca193501b703c79ac77177000fbfc92102ae05;hpb=e08dcd0cd0d71f65cb6fad387cbe2956ed55f0e4;p=djsite.git

diff --git a/quotes/views.py b/quotes/views.py
index 2aca193..642cb43 100644
--- a/quotes/views.py
+++ b/quotes/views.py
@@ -3,18 +3,26 @@ from django.shortcuts import render
 from random import randint
 
 from quotes.models import Author, Work, Quote, QuoteTag
-import quotes.search as search
+from quotes import search
+from quotes import tagcloud
+
+# create your views here.
+def index(request):
+    return render(request, 'quotes/index.html')
 
-# Create your views here.
 def onequote(request, quote_id):
     q = Quote.objects.get(id=quote_id)
-    q.incr_display()
-    context = { 'quote' : q }
-    return render(request, 'quotes/onequote.html', context)
+    return _onequote(request, q)
 
 def random(request):
     count = Quote.objects.count()
-    return onequote(request, randint(1, count))
+    q = Quote.objects.all()[randint(0, count-1)]
+    return _onequote(request, q)
+
+def _onequote(request, q):
+    q.incr_display()
+    context = { 'quote' : q }
+    return render(request, 'quotes/onequote.html', context)
 
 def tags(request, tag_id):
     tag = QuoteTag.objects.get(id=tag_id)
@@ -43,3 +51,7 @@ def searchpage(request):
     if 'q' in request.POST:
         results = search.search(request.POST['q'])
     return render(request, 'quotes/search.html', results)
+
+def cloud(request):
+    clouddata = tagcloud.build_cloud()
+    return render(request, 'quotes/cloud.html', clouddata)