# HG changeset patch # User Tero Marttila # Date 1373849314 -10800 # Node ID 7605af83cb149561590d441083566e35b428aef2 # Parent b975f79734025287402bee5c8b4ff9a82ee39f81 add qrurls index diff -r b975f7973402 -r 7605af83cb14 cmpuqrct/urls.py --- a/cmpuqrct/urls.py Mon Jul 15 03:21:26 2013 +0300 +++ b/cmpuqrct/urls.py Mon Jul 15 03:48:34 2013 +0300 @@ -6,7 +6,7 @@ import qrurls.views urlpatterns = patterns('', - # Examples: + url(r'^$', qrurls.views.index, name='shorturls'), url(r'^urls/(?P\w+)', qrurls.views.shorturl, name='shorturl'), # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), diff -r b975f7973402 -r 7605af83cb14 qrurls/models.py --- a/qrurls/models.py Mon Jul 15 03:21:26 2013 +0300 +++ b/qrurls/models.py Mon Jul 15 03:48:34 2013 +0300 @@ -10,8 +10,8 @@ shorturl = models.SlugField(unique=True) class Meta: - verbose_name = u"URL" - verbose_name_plural = u"URLs" + verbose_name = u"URL Feed" + verbose_name_plural = u"URL Feeds" def qrcode_img (self, size=512) : return QRCODE_API.format( diff -r b975f7973402 -r 7605af83cb14 qrurls/static/qrurls/qrurls.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qrurls/static/qrurls/qrurls.css Mon Jul 15 03:48:34 2013 +0300 @@ -0,0 +1,13 @@ +div.qrurls-wrapper { + width: 50%; + text-align: center; + margin: 1em auto; +} + +ul.qrurls { + list-style-type: none; +} + +img.qrcode { + border: none; +} diff -r b975f7973402 -r 7605af83cb14 qrurls/templates/qrurls/index.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qrurls/templates/qrurls/index.html Mon Jul 15 03:48:34 2013 +0300 @@ -0,0 +1,15 @@ +{% load staticfiles %} + + + +
+
    + {% for url in urls %} +
  • + + + +
  • + {% endfor %} +
+
diff -r b975f7973402 -r 7605af83cb14 qrurls/views.py --- a/qrurls/views.py Mon Jul 15 03:21:26 2013 +0300 +++ b/qrurls/views.py Mon Jul 15 03:48:34 2013 +0300 @@ -1,7 +1,14 @@ from django.http import HttpResponse, HttpResponseRedirect, Http404 +from django.shortcuts import render from qrurls.models import URL, URLItem +def index (request) : + urls = URL.objects.all() + return render(request, 'qrurls/index.html', dict( + urls = urls, + )) + def shorturl (request, shorturl) : shorturl = shorturl.strip(' /') try :