Merge branch 'qrcode' into dev

Merged qrcode branch into main dev branch.

README.md

@@ -6,6 +6,9 @@ Go is a drop-in URL shortening service. It aims to provide an easily
 branded service for institutions that wish to widely disseminate
 information without unnecessarily outsourcing branding.
 
+## To D0
+* qr codes on links view-- need to save the pictures somewhere, render inline as well as in different formats and sizes for download, and be deleted along with the links
+
 ## Configuration
 
 ### settings.py

go/go/models.py

 from django.db import models
 from django.contrib.auth.models import User
 from django.utils import timezone
+from django.conf import settings
 import random, string
 
 
@@ -25,6 +26,9 @@ class URL( models.Model ):
     class Meta:
         ordering = ['short']
 
+    def get_absolute_url(self):
+        return "%s/%s" % (settings.SERVERURL, self.short)
+
     @staticmethod
     def generate_valid_short():
         selection = string.ascii_lowercase + string.digits

go/go/views.py

@@ -54,7 +54,6 @@ def error_500(request):
     },
     )
 
-
 ##############################################################################
 """
 Define user views here.
@@ -137,6 +136,7 @@ def view(request, short):
     """
 
     url = get_object_or_404(URL, short__iexact = short)
+
     return render(request, 'view.html', {
         'url': url,
     },

go/settings/secret.py.template

@@ -7,3 +7,6 @@ DB_HOST =
 
 PIWIK_SITE_ID =
 PIWIK_URL =
+
+# Do not include a final slash!
+SERVERURL =

go/settings/settings.py

@@ -130,6 +130,7 @@ INSTALLED_APPS = (
     'piwik',
     # Uncomment the next line to enable the admin:
     'django.contrib.admin',
+    'qrcode',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
 )
@@ -219,3 +220,6 @@ AUTH_LDAP_ALWAYS_UPDATE_USER = True
 # Piwik settings.
 PIWIK_SITE_ID = secret.PIWIK_SITE_ID
 PIWIK_URL = secret.PIWIK_URL
+
+
+SERVERURL = secret.SERVERURL

go/templates/link_box.html

 {% load go_extras %}
+{% load qr_tags %}
 
 <div class="link-box">
-  <p>
+
+  <p class="link">
     <strong>Long:</strong> <a href="{{url.target}}">{{url.target}}</a>
     <br />
 
@@ -23,4 +25,9 @@
     </strong>
     {% endif %}
   </p>
+
+  <p class="qr">
+    {% qr_from_text url.get_absolute_url 100 %}
+  </p>
+
 </div>