From d701357a0efedcc2420a570dda6aabce9fac728e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Tue, 17 Sep 2013 11:36:03 +0200 Subject: [PATCH 1/1] Support for rel="canonical" --- migdal/admin.py | 2 +- migdal/locale/pl/LC_MESSAGES/django.mo | Bin 4627 -> 4539 bytes migdal/locale/pl/LC_MESSAGES/django.po | 4 + ...007_auto__add_field_entry_canonical_url.py | 76 ++++++++++++++++++ migdal/models.py | 1 + .../templates/migdal/entry/entry_detail.html | 4 + setup.py | 2 +- 7 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 migdal/migrations/0007_auto__add_field_entry_canonical_url.py diff --git a/migdal/admin.py b/migdal/admin.py index 0df9352..8ed11ea 100644 --- a/migdal/admin.py +++ b/migdal/admin.py @@ -44,7 +44,7 @@ def filtered_entry_admin(typ): fieldsets = ( (None, { 'fields': _promo_if_necessary + ( - 'in_stream', 'author', 'author_email', 'image', + 'in_stream', 'author', 'author_email', 'canonical_url', 'image', 'date', 'first_published_at', 'changed_at') }), ) + tuple( diff --git a/migdal/locale/pl/LC_MESSAGES/django.mo b/migdal/locale/pl/LC_MESSAGES/django.mo index 1fea6059c828b17d26b8ad5519f4ad13ee3d15af..bb9c2760d1b610ab30fa7e45a53da6f566271930 100644 GIT binary patch delta 1437 zcmX}sUuex?9LMqJ?2og*Xa5YFKRa_a$C>>*Hv5NI?Sf>fA>3$*n$2;+lu45%yO7dh zN|_tn3>OYfQIjIIa-k)q$<0b5F-;Wm{`~fxr}I3o=XuWa|M~rX@v_IE{`dJQR~%s@ zaTzfs$+-^voJ>M!N_B1woAEmSLbbcPz`0C(fEoA{({S9JKtJV4Ou;GS=cY+Q_zm-% z>vx5;QiCw6LnX;VtVb{&dkZSBe zZTKv*MmLzt`D=n9DroD5Q9Hb6K0-ZI&+PxVr~y8r?)Z!O9W~BR)LrY**8f?ko#t7& z7&U$gYMe;FRn(x4vf0XQR&Gb_XfJAkhmb>YCr~>+XI?<{k6U@zyk*`&Eii%HwAZ&1 z_568Z327;@hFC;gOVkQ=9eN$Bhzc5{+{?{fiC#eky;2HVTrIJI*g}jDgG61^d{{w7 zn~G}wd@?#J-RE*53-s;^y!U@St|n@Cx(a=K6jsggKW!qX56dDV-!Rum)KSleFd2Q* z)>y?-%ygT0zpY}Wsr%v@y$8gqyrVC%!eT75d~@PR>O)^V;@=!U<}XX!^ndkb#g4|h z4s`Yed%9xXiA(7XzU;cH+UBZgV=x+Rsf{KkGEODO_XW1Z?*_^flYvN5j#>u0JH3v5 Lv6G3^ynyc?)wg`D delta 1527 zcmY+^OGs2v9LMo9X)`wIWIlRWmibIeo6#O>npqZBm_Y}m>y1wMNF-tg+UJO ziXg&WK@6>WZCVLs2rVKEf{30FK~amO?{ECO=rI5LIsY?r?s?ri4@(lI@wYkY*BzyW zSWe{4aqci?rgNd3n(N$CJdHOovXC#ja2_5-bvT85+*vMpcmXqU6r1rD25<_y@GEM7R%Wpt+c6t2U_M^OGQ5MV z#f@VIH<0`IvbhnTvab8t56S-?-%y zsGWPIcE)$_sA!-MYQS%n|FHazIgJ`HjnQQ$YGV1wSFYIdwU#%a?z`RGjq11G@@|Z4 zhGAyw9q*!M`T%qBiG4qbt>jbIzLHsVkk_I5UBWuNf_&U#E(Q1;tMDUgM{;>E zv~va7?EhXW6*RQrAlBeR)J}Xx7VEyF2AD>zz{?XWvr!LM0cyY?s^3=BQSLPNp!)Aa zo&6ze?~PN@N+Z^A26f{h)Qv7#ei^kx*DSwb`50;?_fZpgf^3d^fm-R5`5x8(i{-z} z_+P7}=giD-K63P_+3E)6gbE8!-FOx1^-|&e{jaPb({ZV2l^Spvp$X2GGAcR>?J6an z+NL12dSVSxO*9ZH+S<*8UdyFKB{5qTQz^DYD_=*fB{o`HBeoFwuTask77-Q1Y+0%I zzm_aSloFfl8y$&`VYaYIsei{U)}W)&gOx@sv9?8Kp~)YqYa-at)E}50OqJC$usz#` zi;~TA?|QsD2K%D1fy5_ot2YvhoQw`6%6+SSJ>gV6+3x%0Np{Su^JLXlhl16?^+loD z#trq!5&!u#|H0wj@R@Uc(MUMq3+(bAh=rpkhav;V!->v7xqsi;BPSxq!#(|d$ylIj KPV!!MmggTysD?=Z diff --git a/migdal/locale/pl/LC_MESSAGES/django.po b/migdal/locale/pl/LC_MESSAGES/django.po index 60433f5..2296f04 100644 --- a/migdal/locale/pl/LC_MESSAGES/django.po +++ b/migdal/locale/pl/LC_MESSAGES/django.po @@ -107,6 +107,10 @@ msgid "promoted" msgstr "promowane" #: models.py:55 +#: models.py:63 +msgid "canonical link" +msgstr "link kanoniczny" + msgid "entry" msgstr "wpis" diff --git a/migdal/migrations/0007_auto__add_field_entry_canonical_url.py b/migdal/migrations/0007_auto__add_field_entry_canonical_url.py new file mode 100644 index 0000000..54f73c0 --- /dev/null +++ b/migdal/migrations/0007_auto__add_field_entry_canonical_url.py @@ -0,0 +1,76 @@ +# -*- 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): + # Adding field 'Entry.canonical_url' + db.add_column('migdal_entry', 'canonical_url', + self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Entry.canonical_url' + db.delete_column('migdal_entry', 'canonical_url') + + + models = { + 'migdal.attachment': { + 'Meta': {'object_name': 'Attachment'}, + 'entry': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['migdal.Entry']"}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + 'migdal.category': { + 'Meta': {'object_name': 'Category'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'slug_en': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'slug_pl': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), + 'taxonomy': ('django.db.models.fields.CharField', [], {'max_length': '32'}), + 'title_en': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '64', 'db_index': 'True'}) + }, + 'migdal.entry': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Entry'}, + '_body_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_body_pl_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_en_rendered': ('django.db.models.fields.TextField', [], {}), + '_lead_pl_rendered': ('django.db.models.fields.TextField', [], {}), + 'author': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'author_email': ('django.db.models.fields.EmailField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'body_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'body_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'body_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'canonical_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['migdal.Category']", 'null': 'True', 'blank': 'True'}), + 'changed_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), + 'first_published_at': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'in_stream': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'lead_en': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_en_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'lead_pl': ('markupfield.fields.MarkupField', [], {'null': 'True', 'rendered_field': 'True', 'blank': 'True'}), + 'lead_pl_markup_type': ('django.db.models.fields.CharField', [], {'default': "'textile_pl'", 'max_length': '30', 'blank': 'True'}), + 'needed_en': ('django.db.models.fields.CharField', [], {'default': "'n'", 'max_length': '1', 'db_index': 'True'}), + 'promo': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_at_en': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'published_at_pl': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'published_en': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'published_pl': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug_en': ('migdal.fields.SlugNullField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'slug_pl': ('migdal.fields.SlugNullField', [], {'max_length': '50', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'title_en': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'title_pl': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '16', 'db_index': 'True'}) + } + } + + complete_apps = ['migdal'] \ No newline at end of file diff --git a/migdal/models.py b/migdal/models.py index 86f010c..c297c01 100644 --- a/migdal/models.py +++ b/migdal/models.py @@ -60,6 +60,7 @@ class Entry(models.Model): in_stream = models.BooleanField(_('in stream'), default=True) categories = models.ManyToManyField(Category, null=True, blank=True, verbose_name=_('categories')) first_published_at = models.DateTimeField(_('published at'), null=True, blank=True) + canonical_url = models.URLField(_('canonical link'), null = True, blank = True) objects = models.Manager() published_objects = PublishedEntryManager() diff --git a/migdal/templates/migdal/entry/entry_detail.html b/migdal/templates/migdal/entry/entry_detail.html index 58a9491..148e647 100644 --- a/migdal/templates/migdal/entry/entry_detail.html +++ b/migdal/templates/migdal/entry/entry_detail.html @@ -15,6 +15,10 @@ {% endif %} {% endspaceless %}{% endblock %} +{% block "headextra" %} + {% if entry.canonical_url %}{% endif %} +{% endblock %} + {% block "body" %} diff --git a/setup.py b/setup.py index 346e501..6fa5db0 100755 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ def whole_trees(package_dir, paths): setup( name='django-migdal', - version='0.3.1', + version='0.3.2', author='Radek Czajka', author_email='radoslaw.czajka@nowoczesnapolska.org.pl', url = '', -- 2.20.1