-
-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #37 from matagus/feature-add-feed
Allowing users to add a feed.
- Loading branch information
Showing
10 changed files
with
246 additions
and
6 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
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
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,162 @@ | ||
| # -*- coding: utf-8 -*- | ||
| from south.utils import datetime_utils as datetime | ||
| from south.db import db | ||
| from south.v2 import SchemaMigration | ||
| from django.db import models | ||
|
|
||
|
|
||
| class Migration(SchemaMigration): | ||
|
|
||
| def forwards(self, orm): | ||
| # Adding field 'Blog.owner' | ||
| db.add_column(u'planet_blog', 'owner', | ||
| self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True), | ||
| keep_default=False) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Deleting field 'Blog.owner' | ||
| db.delete_column(u'planet_blog', 'owner_id') | ||
|
|
||
|
|
||
| models = { | ||
| u'auth.group': { | ||
| 'Meta': {'object_name': 'Group'}, | ||
| u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
| }, | ||
| u'auth.permission': { | ||
| 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, | ||
| 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
| }, | ||
| u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), | ||
| u'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': '128'}), | ||
| 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), | ||
| 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
| }, | ||
| u'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'}), | ||
| u'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'}) | ||
| }, | ||
| u'planet.author': { | ||
| 'Meta': {'ordering': "(u'name', u'email')", 'object_name': 'Author'}, | ||
| 'email': ('django.db.models.fields.EmailField', [], {'db_index': 'True', 'max_length': '75', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'profile_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
| }, | ||
| u'planet.blog': { | ||
| 'Meta': {'ordering': "(u'title', u'url')", 'object_name': 'Blog'}, | ||
| 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}), | ||
| 'title': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'blank': 'True'}), | ||
| 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '200', 'db_index': 'True'}) | ||
| }, | ||
| u'planet.category': { | ||
| 'Meta': {'ordering': "(u'title', u'date_created')", 'object_name': 'Category'}, | ||
| 'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}) | ||
| }, | ||
| u'planet.enclosure': { | ||
| 'Meta': {'ordering': "(u'post', u'mime_type', u'link')", 'object_name': 'Enclosure'}, | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'length': ('django.db.models.fields.CharField', [], {'max_length': '20'}), | ||
| 'link': ('django.db.models.fields.URLField', [], {'max_length': '500', 'db_index': 'True'}), | ||
| 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), | ||
| 'post': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['planet.Post']"}) | ||
| }, | ||
| u'planet.feed': { | ||
| 'Meta': {'ordering': "(u'title',)", 'object_name': 'Feed'}, | ||
| 'blog': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['planet.Blog']", 'null': 'True', 'blank': 'True'}), | ||
| 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['planet.Category']", 'null': 'True', 'blank': 'True'}), | ||
| 'etag': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
| 'generator': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['planet.Generator']", 'null': 'True', 'blank': 'True'}), | ||
| 'guid': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
| 'icon_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'image_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
| 'info': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}), | ||
| 'language': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
| 'last_checked': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'last_modified': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), | ||
| 'rights': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'site': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['sites.Site']", 'null': 'True', 'blank': 'True'}), | ||
| 'subtitle': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'title': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'}), | ||
| 'url': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '200', 'db_index': 'True'}) | ||
| }, | ||
| u'planet.feedlink': { | ||
| 'Meta': {'ordering': "(u'feed', u'rel', u'mime_type')", 'object_name': 'FeedLink'}, | ||
| 'feed': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['planet.Feed']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'link': ('django.db.models.fields.URLField', [], {'max_length': '500', 'db_index': 'True'}), | ||
| 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), | ||
| 'rel': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}) | ||
| }, | ||
| u'planet.generator': { | ||
| 'Meta': {'ordering': "(u'name', u'version')", 'unique_together': "((u'name', u'link', u'version'),)", 'object_name': 'Generator'}, | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'link': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'version': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
| }, | ||
| u'planet.post': { | ||
| 'Meta': {'ordering': "(u'-date_created', u'-date_modified')", 'unique_together': "((u'feed', u'guid'),)", 'object_name': 'Post'}, | ||
| 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['planet.Author']", 'through': u"orm['planet.PostAuthorData']", 'symmetrical': 'False'}), | ||
| 'comments_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
| 'content': ('django.db.models.fields.TextField', [], {}), | ||
| 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| 'date_modified': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), | ||
| 'feed': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['planet.Feed']"}), | ||
| 'guid': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), | ||
| 'url': ('django.db.models.fields.URLField', [], {'max_length': '1000', 'db_index': 'True'}) | ||
| }, | ||
| u'planet.postauthordata': { | ||
| 'Meta': {'ordering': "(u'author', u'post', u'is_contributor')", 'object_name': 'PostAuthorData'}, | ||
| 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['planet.Author']"}), | ||
| 'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'is_contributor': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
| 'post': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['planet.Post']"}) | ||
| }, | ||
| u'planet.postlink': { | ||
| 'Meta': {'ordering': "(u'post', u'title', u'rel')", 'object_name': 'PostLink'}, | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'link': ('django.db.models.fields.URLField', [], {'max_length': '500', 'db_index': 'True'}), | ||
| 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), | ||
| 'post': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['planet.Post']"}), | ||
| 'rel': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}), | ||
| 'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}) | ||
| }, | ||
| u'sites.site': { | ||
| 'Meta': {'ordering': "(u'domain',)", 'object_name': 'Site', 'db_table': "u'django_site'"}, | ||
| 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['planet'] |
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
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 @@ | ||
| {% extends "planet/base.html" %} | ||
| {% load i18n %} | ||
| {% load url from future %} | ||
|
|
||
| {% block head_title %}{% trans "Add a New Feed" %}{% endblock %} | ||
|
|
||
| {% block extra_head %} | ||
| <meta name="title" content="{% trans 'Add a New Feed' %}" /> | ||
| <meta name="description" content="{% trans 'Add a New Feed' %}" /> | ||
| <meta name="robots" content="index, follow" /> | ||
| <link rel="canonical" href="http://{{ site.domain }}{{ request.path }}"/> | ||
| {% endblock %} | ||
|
|
||
| {% block breadcrumb_section %} | ||
| <li><a href="{% url 'planet.views.feeds_list' %}">{% trans 'Feeds' %}</a> <span class="divider">/</span></li> | ||
| {% endblock %} | ||
|
|
||
| {% block breadcrumb_detail %} | ||
| <li class="active">{% trans 'Add a New Feed' %}</li> | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
| <h1>{% trans "Add a New Feed" %}</h1> | ||
| <form action="" method="POST">{% csrf_token %} | ||
| {{ form.as_p }} | ||
| <input type="submit" value="{% trans 'Submit' %}" /> | ||
| <a href="javascript: history.back();">{% trans 'Cancel' %}</a> | ||
| </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
Oops, something went wrong.