Skip to content

Commit

Permalink
Seperate widget from its documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
authmillenon committed Mar 17, 2012
1 parent 6429a33 commit f77a77a
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 10 deletions.
1 change: 1 addition & 0 deletions give/urls.py
Expand Up @@ -54,6 +54,7 @@
name='history'
),
url(r'^widget/?$','widget',name='widget'),
url(r'^widget/doc/?$','widget_doc',name='widget_doc'),
url(
r'^widget/give_(?P<username>[^?$/\\#%\s]+)_datalove/?$',
'widget_give_datalove',
Expand Down
22 changes: 15 additions & 7 deletions give/views/__init__.py
Expand Up @@ -4,7 +4,7 @@
from django.contrib.auth.views import login
from django.core.urlresolvers import reverse
from django.db import IntegrityError
from django.http import HttpResponse, Http404
from django.http import HttpResponse, Http404, HttpResponseBadRequest
from django.shortcuts import get_object_or_404, redirect
from django.views.decorators.csrf import csrf_protect
from urllib import urlencode
Expand Down Expand Up @@ -139,20 +139,28 @@ def give_datalove(request, username, from_users=False):

def widget(request):
vars = {'error': request.GET['error']} if 'error' in request.GET else {}
if 'random' in request.GET:
if 'random' in request.GET and 'user' not in request.GET:
vars['profile'] = DataloveProfile.get_random_profile()
elif 'user' in request.GET:
elif 'user' in request.GET and 'random' not in request.GET:
try:
vars['profile'] = DataloveProfile.objects.get(
user__username=request.GET['user']
)
except DataloveProfile.DoesNotExist:
vars['error'] = "User '%s' does not exist" % request.GET['user']
else:
if request.user.is_authenticated():
vars['profile'] = request.user.get_profile()
return common.render_to_response2(request, 'give/widgetpage.html', vars)
return common.render_to_response2(request, 'give/widget.html', vars)
return HttpResponseBadRequest(
"GET request must have eather query parameter 'user' or "
"'random'."
)
return common.render_to_response2(request, 'give/widget.html', context)

def widget_doc(request):
context = {}
if request.user.is_authenticated():
context['profile'] = request.user.get_profile()
return common.render_to_response2(request, 'give/widget_doc.html', context)


def widget_give_datalove(request, username):
query = common.give_datalove(request, username, query={'user': username})
Expand Down
2 changes: 1 addition & 1 deletion templates/give/index.html
Expand Up @@ -23,7 +23,7 @@
<li><a href="{% url manage_account %}">Manage account</a></li>
<li><a href="{% url history userprofile.username %}">History</a></li>
{% endif %}
<li><a href="{% url widget %}">Widget for website</a></li>
<li><a href="{% url widget_doc %}">Widget for website</a></li>
<li><a href="http://datalove.me/give/about.html">About give.datalove.me</a>
<li><a href="{% url users %}">Loverz</a></li>
<li><a href="http://datalove.me/give/faq.html">FAQ</a></li>
Expand Down
2 changes: 2 additions & 0 deletions templates/give/widget_doc.html
@@ -0,0 +1,2 @@
{% extends "give/index.html" %}
{% block content %}{% include 'give/widget_doc_raw.html' %}{% endblock %}
File renamed without changes.
2 changes: 0 additions & 2 deletions templates/give/widgetpage.html

This file was deleted.

0 comments on commit f77a77a

Please sign in to comment.