aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2013-05-23 01:01:27 +0200
committerGravatar Tom Willemse2013-05-23 01:01:27 +0200
commit697515e0852fad2d575c89261f719c4e1da26d09 (patch)
treed78e687e1a1e5bd3c2d9411cc0bc6072ab475b13
parentc14ccf7079c8d68473e80df9c20aaac735f69447 (diff)
downloadryuslash.org-master.tar.gz
ryuslash.org-master.zip
Add profile urlHEADmaster
-rw-r--r--ryuslash/aggregator/migrations/0001_initial.py2
-rw-r--r--ryuslash/aggregator/models.py4
-rw-r--r--ryuslash/aggregator/templates/aggregator/posts.html2
3 files changed, 7 insertions, 1 deletions
diff --git a/ryuslash/aggregator/migrations/0001_initial.py b/ryuslash/aggregator/migrations/0001_initial.py
index 6bad6fb..e6bcd9f 100644
--- a/ryuslash/aggregator/migrations/0001_initial.py
+++ b/ryuslash/aggregator/migrations/0001_initial.py
@@ -14,6 +14,7 @@ class Migration(SchemaMigration):
('name', self.gf('django.db.models.fields.CharField')(max_length=300)),
('base_url', self.gf('django.db.models.fields.URLField')(max_length=200)),
('feed_url', self.gf('django.db.models.fields.CharField')(max_length=100)),
+ ('profile_url', self.gf('django.db.models.fields.CharField')(max_length=100)),
('favicon_ext', self.gf('django.db.models.fields.CharField')(default='ico', max_length=10)),
('uses_markdown', self.gf('django.db.models.fields.BooleanField')(default=False)),
('uses_titles', self.gf('django.db.models.fields.BooleanField')(default=False)),
@@ -51,6 +52,7 @@ class Migration(SchemaMigration):
'feed_url': ('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': '300'}),
+ 'profile_url': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'uses_markdown': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'uses_titles': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
},
diff --git a/ryuslash/aggregator/models.py b/ryuslash/aggregator/models.py
index 9a39600..efb6c89 100644
--- a/ryuslash/aggregator/models.py
+++ b/ryuslash/aggregator/models.py
@@ -7,6 +7,7 @@ class Feed(models.Model):
name = models.CharField(max_length=300)
base_url = models.URLField()
feed_url = models.CharField(max_length=100)
+ profile_url = models.CharField(max_length=100, blank=True)
favicon_ext = models.CharField(max_length=10, default='ico')
uses_markdown = models.BooleanField()
uses_titles = models.BooleanField()
@@ -15,6 +16,9 @@ class Feed(models.Model):
choices=[(CATEGORIES.index(c), c) for c in CATEGORIES]
)
+ def profile(self):
+ return '%s%s' % (self.base_url, self.profile_url)
+
def __unicode__(self):
return self.name
diff --git a/ryuslash/aggregator/templates/aggregator/posts.html b/ryuslash/aggregator/templates/aggregator/posts.html
index 0a97729..9f78b1d 100644
--- a/ryuslash/aggregator/templates/aggregator/posts.html
+++ b/ryuslash/aggregator/templates/aggregator/posts.html
@@ -14,7 +14,7 @@
<br />
Feeds:
{% for feed in feeds %}
- <a href="{{ feed.base_url }}" class="btn btn-block">
+ <a href="{{ feed.profile }}" class="btn btn-block">
{{ feed.name }}
</a>
{% empty %}