This repository has been archived by the owner on Jul 25, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add create banner and banner listing pages.
- Loading branch information
Michael Kelly
committed
Jul 27, 2012
1 parent
8b9ade4
commit 229af5c
Showing
9 changed files
with
203 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
from django.utils.functional import wraps | ||
|
||
from facebook.models import FacebookUser | ||
from shared.utils import redirect | ||
|
||
|
||
def fb_login_required(func): | ||
""" | ||
View decorator that checks to see that the user is logged in via Facebook. | ||
If the user isn't, then we redirect them to the homepage as they most likely | ||
stumbled onto this part of the site by accident. | ||
""" | ||
@wraps(func) | ||
def inner(request, *args, **kwargs): | ||
if (request.user.is_authenticated() and | ||
isinstance(request.user, FacebookUser)): | ||
return func(request, *args, **kwargs) | ||
else: | ||
return redirect('home') | ||
return inner |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
from django import forms | ||
from django.contrib.admin.widgets import FilteredSelectMultiple | ||
|
||
from facebook.models import FacebookBanner, FacebookBannerInstance | ||
from shared.forms import AdminModelForm | ||
from shared.models import ENGLISH_LANGUAGE_CHOICES | ||
|
||
|
||
class FacebookBannerInstanceForm(forms.ModelForm): | ||
class Meta: | ||
model = FacebookBannerInstance | ||
fields = ('banner', 'text', 'can_be_an_ad') | ||
|
||
|
||
class FacebookBannerAdminForm(AdminModelForm): | ||
locales = forms.MultipleChoiceField( | ||
required=False, | ||
choices=ENGLISH_LANGUAGE_CHOICES, | ||
widget=FilteredSelectMultiple('locales', is_stacked=False)) | ||
|
||
class Meta: | ||
model = FacebookBanner | ||
|
||
def __init__(self, *args, **kwargs): | ||
"""Populate locale field from instance.""" | ||
super(FacebookBannerAdminForm, self).__init__(*args, **kwargs) | ||
|
||
locales = self.instance.locale_set.all() | ||
self.fields['locales'].initial = [l.locale for l in locales] |
90 changes: 90 additions & 0 deletions
90
...migrations/0003_auto__chg_field_facebookbannerinstance_created__add_field_facebookbann.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
# -*- coding: utf-8 -*- | ||
import datetime | ||
from south.db import db | ||
from south.v2 import SchemaMigration | ||
from django.db import models | ||
|
||
|
||
class Migration(SchemaMigration): | ||
|
||
def forwards(self, orm): | ||
|
||
# Changing field 'FacebookBannerInstance.created' | ||
db.alter_column('facebook_facebookbannerinstance', 'created', self.gf('django.db.models.fields.DateTimeField')()) | ||
# Adding field 'FacebookBanner.name' | ||
db.add_column('facebook_facebookbanner', 'name', | ||
self.gf('django.db.models.fields.CharField')(default='Banner', max_length=256), | ||
keep_default=False) | ||
|
||
|
||
def backwards(self, orm): | ||
|
||
# Changing field 'FacebookBannerInstance.created' | ||
db.alter_column('facebook_facebookbannerinstance', 'created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True)) | ||
# Deleting field 'FacebookBanner.name' | ||
db.delete_column('facebook_facebookbanner', 'name') | ||
|
||
|
||
models = { | ||
'auth.group': { | ||
'Meta': {'object_name': 'Group'}, | ||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
}, | ||
'auth.permission': { | ||
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
}, | ||
'auth.user': { | ||
'Meta': {'object_name': 'User'}, | ||
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
'password': ('django.db.models.fields.CharField', [], {'max_length': '255'}), | ||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
}, | ||
'contenttypes.contenttype': { | ||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
}, | ||
'facebook.facebookbanner': { | ||
'Meta': {'object_name': 'FacebookBanner'}, | ||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '250'}), | ||
'locale': ('shared.models.LocaleField', [], {'default': "'en-US'", 'max_length': '32'}), | ||
'name': ('django.db.models.fields.CharField', [], {'default': "'Banner'", 'max_length': '256'}) | ||
}, | ||
'facebook.facebookbannerinstance': { | ||
'Meta': {'object_name': 'FacebookBannerInstance'}, | ||
'banner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['facebook.FacebookBanner']"}), | ||
'can_be_an_ad': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
'leaderboard_position': ('django.db.models.fields.IntegerField', [], {}), | ||
'text': ('django.db.models.fields.CharField', [], {'max_length': '256'}), | ||
'total_clicks': ('django.db.models.fields.IntegerField', [], {}), | ||
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'banner_instance_set'", 'to': "orm['facebook.FacebookUser']"}) | ||
}, | ||
'facebook.facebookuser': { | ||
'Meta': {'object_name': 'FacebookUser'}, | ||
'affiliates_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), | ||
'id': ('django.db.models.fields.CharField', [], {'max_length': '128', 'primary_key': 'True'}) | ||
} | ||
} | ||
|
||
complete_apps = ['facebook'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{% extends 'facebook/base.html' %} | ||
|
||
{% block content %} | ||
<h1>My Banners</h1> | ||
<ol> | ||
{% for banner_instance in banner_instances %} | ||
<li> | ||
<img src="{{ banner_instance.banner.image.url }}"> | ||
<p>{{ banner_instance.text }}</p> | ||
</li> | ||
{% endfor %} | ||
</ol> | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
{% extends 'facebook/base.html' %} | ||
|
||
{% block content %} | ||
<h1>Create a Banner</h1> | ||
<form method="post"> | ||
{{ csrf() }} | ||
<ul> | ||
{% for field_key in ['banner', 'text', 'can_be_an_ad'] %} | ||
{% set field = form[field_key] %} | ||
<li> | ||
{{ field.label_tag() }} | ||
{{ field }} | ||
{{ field.errors }} | ||
</li> | ||
{% endfor %} | ||
</ul> | ||
<button type="submit">Create Banner »</button> | ||
</form> | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
from django.conf.urls.defaults import patterns, url | ||
|
||
from facebook import views | ||
|
||
|
||
urlpatterns = patterns('facebook.views', | ||
url(r'^/?', 'load_app', name='facebook.load_app'), | ||
url(r'^/?$', views.load_app, name='facebook.load_app'), | ||
url(r'^create_banner/?$', views.create_banner, name='facebook.create_banner'), | ||
url(r'^banner_list/?$', views.banner_list, name='facebook.banner_list'), | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters