From 98a42c306376214dc5ea0b78f8064ce84843573c Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@bioforsk.no> Date: Tue, 12 Jul 2016 10:50:02 +0200 Subject: [PATCH] Adding ordering attribute to information elements --- information/locale/bg/LC_MESSAGES/django.mo | Bin 421 -> 421 bytes information/locale/bg/LC_MESSAGES/django.po | 18 ++++--- information/locale/bs/LC_MESSAGES/django.mo | Bin 718 -> 718 bytes information/locale/bs/LC_MESSAGES/django.po | 18 ++++--- information/locale/nb/LC_MESSAGES/django.mo | Bin 1054 -> 1089 bytes information/locale/nb/LC_MESSAGES/django.po | 18 ++++--- .../locale/zh_CN/LC_MESSAGES/django.mo | Bin 913 -> 913 bytes .../locale/zh_CN/LC_MESSAGES/django.po | 22 ++++---- information/migrations/0001_initial.py | 49 ++++++++++++++++++ .../migrations/0002_information_ordering.py | 19 +++++++ information/migrations/__init__.py | 0 information/models.py | 3 ++ .../migrations/0004_auto_20160712_1001.py | 24 +++++++++ 13 files changed, 141 insertions(+), 30 deletions(-) create mode 100644 information/migrations/0001_initial.py create mode 100644 information/migrations/0002_information_ordering.py create mode 100644 information/migrations/__init__.py create mode 100644 vips_messages/migrations/0004_auto_20160712_1001.py diff --git a/information/locale/bg/LC_MESSAGES/django.mo b/information/locale/bg/LC_MESSAGES/django.mo index 22916f5611b42f5a2586ceed818afbcd7abec322..6dec0159d88e55379b7d87fbbc9c789c305a3e8c 100644 GIT binary patch delta 24 fcmZ3=yp(xDFR!_-p^<{2ft8W5wt>;cS=@{ORDT9W delta 24 fcmZ3=yp(xDFR!t#frWyhsg;4Twt?ZsS=@{ORG<b) diff --git a/information/locale/bg/LC_MESSAGES/django.po b/information/locale/bg/LC_MESSAGES/django.po index 85660c98..4df56b0e 100644 --- a/information/locale/bg/LC_MESSAGES/django.po +++ b/information/locale/bg/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-08 15:03+0100\n" +"POT-Creation-Date: 2016-07-12 10:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -26,27 +26,31 @@ msgstr "" msgid "Main illustration" msgstr "" -#: models.py:18 +#: models.py:15 +msgid "Ordering" +msgstr "" + +#: models.py:19 msgid "Illustration" msgstr "" -#: models.py:22 +#: models.py:23 msgid "Attachment" msgstr "" -#: models.py:26 +#: models.py:27 msgid "Headline" msgstr "" -#: models.py:27 +#: models.py:28 msgid "Lead paragraph" msgstr "" -#: models.py:28 +#: models.py:29 msgid "Body text" msgstr "" -#: models.py:29 +#: models.py:30 msgid "Language code" msgstr "" diff --git a/information/locale/bs/LC_MESSAGES/django.mo b/information/locale/bs/LC_MESSAGES/django.mo index c4885b3709424da54cdb42dd8260b9cc4e679f59..cd800eb09e45818332594aeeee4019c7c7475b5d 100644 GIT binary patch delta 26 hcmX@ddX9AiJ0q{TuAz~Fp@Ef=v9^KHW)a3+i~wA+24esK delta 26 hcmX@ddX9AiJ0q{Lu7QPup{bRDv9^KXW)a3+i~wBL24(;N diff --git a/information/locale/bs/LC_MESSAGES/django.po b/information/locale/bs/LC_MESSAGES/django.po index 2ab26274..b3e644df 100644 --- a/information/locale/bs/LC_MESSAGES/django.po +++ b/information/locale/bs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-08 15:03+0100\n" +"POT-Creation-Date: 2016-07-12 10:23+0200\n" "PO-Revision-Date: 2015-02-13 11:13+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -29,29 +29,33 @@ msgstr "Informacija" msgid "Main illustration" msgstr "" -#: models.py:18 +#: models.py:15 +msgid "Ordering" +msgstr "" + +#: models.py:19 #, fuzzy #| msgid "Information" msgid "Illustration" msgstr "Informacija" -#: models.py:22 +#: models.py:23 msgid "Attachment" msgstr "" -#: models.py:26 +#: models.py:27 msgid "Headline" msgstr "" -#: models.py:27 +#: models.py:28 msgid "Lead paragraph" msgstr "" -#: models.py:28 +#: models.py:29 msgid "Body text" msgstr "" -#: models.py:29 +#: models.py:30 msgid "Language code" msgstr "" diff --git a/information/locale/nb/LC_MESSAGES/django.mo b/information/locale/nb/LC_MESSAGES/django.mo index a78a515097d42637c784810b60f459ac626f4909..9b40dc103907771ea5f23fc047b092b002d1cc1b 100644 GIT binary patch delta 309 zcmbQoagd|_o)F7a1_lNO9tH*m83qQ18U_XiK?VkfJ0L*@1_lL21_mw$1_nh&1_n+B z1_m8Q1_llW1_m=mh#q@J1_o{h1_mES1_oXR28IYm1_nL`28J|7h&iQD_3exd3_=VH z3=<d`7(y5r7#1@!Fk~|_)HD2GWME)tU|>jLhFFvXrOTNi7Bn$KEa-=d&t`_GU&aiv zU>!5WVF#e<PBAkuWHB%>Tw`WnU}S)p3GxdI1H>FA28en#u%{=!>*Vk+N=Yrs%uAnK k#<-W)T-VS@!O+0U$XMIJXtM)TIwNOreo+ZT!7}Cw0GVMV8UO$Q delta 291 zcmX@eF^{AEo)F7a1_lNOZUzPh83qQ15(WkaK?VkfGax|*1_l8}1_myW7$XA%CrAw= z0|N&G1A`hP0|O5O1A{&zM6V4a0|PGu1A_-60|Ore149@i#GF({1_mJp28MD*28Iv@ z28J$128L`#28R2L3=HfH4D}4&%n%ELp>!NG#NbS3h{0u0@g`=l28Lc{h{02#^2?bS z7_t}`7&bFAFfc+L4Wd{WAm%bLKpf5n^&~S$l7WGN6--a&W2~G!fpHJ7v95uIf}yFE Sfw8uM;pRxDbjHc2n9Bi)85tV@ diff --git a/information/locale/nb/LC_MESSAGES/django.po b/information/locale/nb/LC_MESSAGES/django.po index 181b1b15..68c8d935 100644 --- a/information/locale/nb/LC_MESSAGES/django.po +++ b/information/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-08 15:03+0100\n" +"POT-Creation-Date: 2016-07-12 10:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -26,27 +26,31 @@ msgstr "Informasjon" msgid "Main illustration" msgstr "Hovedillustrasjon" -#: models.py:18 +#: models.py:15 +msgid "Ordering" +msgstr "Sortering" + +#: models.py:19 msgid "Illustration" msgstr "Illustrasjon" -#: models.py:22 +#: models.py:23 msgid "Attachment" msgstr "Vedlegg" -#: models.py:26 +#: models.py:27 msgid "Headline" msgstr "Overskrift" -#: models.py:27 +#: models.py:28 msgid "Lead paragraph" msgstr "Ingress" -#: models.py:28 +#: models.py:29 msgid "Body text" msgstr "Brødtekst" -#: models.py:29 +#: models.py:30 msgid "Language code" msgstr "Språkkode" diff --git a/information/locale/zh_CN/LC_MESSAGES/django.mo b/information/locale/zh_CN/LC_MESSAGES/django.mo index 0ecc3de15d1c6f197e3490b0638709d0e5d63c4f..4d87537f5a3467c04bba9a30b9129cbaa91e290f 100644 GIT binary patch delta 34 qcmbQpK9PNc3KN&PuAz~Fp@Ef=@nk(FgUKhD6eh<oWles;v=RWA5(()5 delta 34 qcmbQpK9PNc3KN&9u93Ndp|O>T!DKxqgUJm{8Ixm}lqSDmS_uG_o(ZP_ diff --git a/information/locale/zh_CN/LC_MESSAGES/django.po b/information/locale/zh_CN/LC_MESSAGES/django.po index 0879e529..c6f89436 100644 --- a/information/locale/zh_CN/LC_MESSAGES/django.po +++ b/information/locale/zh_CN/LC_MESSAGES/django.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-27 13:40+0200\n" +"POT-Creation-Date: 2016-07-12 10:23+0200\n" "PO-Revision-Date: 2016-06-01 11:45+0200\n" +"Last-Translator: \n" +"Language-Team: \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Last-Translator: \n" -"Language-Team: \n" "X-Generator: Poedit 1.8.7\n" #: models.py:13 @@ -25,27 +25,31 @@ msgstr "父信息" msgid "Main illustration" msgstr "主图" -#: models.py:18 +#: models.py:15 +msgid "Ordering" +msgstr "" + +#: models.py:19 msgid "Illustration" msgstr "图" -#: models.py:22 +#: models.py:23 msgid "Attachment" msgstr "附件" -#: models.py:26 +#: models.py:27 msgid "Headline" msgstr "标题" -#: models.py:27 +#: models.py:28 msgid "Lead paragraph" msgstr "导向段落" -#: models.py:28 +#: models.py:29 msgid "Body text" msgstr "正文" -#: models.py:29 +#: models.py:30 msgid "Language code" msgstr "语言代码" diff --git a/information/migrations/0001_initial.py b/information/migrations/0001_initial.py new file mode 100644 index 00000000..997a0015 --- /dev/null +++ b/information/migrations/0001_initial.py @@ -0,0 +1,49 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import tinymce.models + + +class Migration(migrations.Migration): + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Information', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('main_illustration', models.ImageField(upload_to=b'images/information', verbose_name='Hovedillustrasjon', blank=True)), + ('parent_information', models.ForeignKey(related_name='children', verbose_name='Informasjon', blank=True, to='information.Information', null=True)), + ], + ), + migrations.CreateModel( + name='InformationAttachment', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('attachment', models.FileField(upload_to=b'attachments/information', verbose_name='Vedlegg', blank=True)), + ('information', models.ForeignKey(to='information.Information')), + ], + ), + migrations.CreateModel( + name='InformationIllustration', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('illustration', models.ImageField(upload_to=b'images/information', verbose_name='Illustrasjon', blank=True)), + ('information', models.ForeignKey(to='information.Information')), + ], + ), + migrations.CreateModel( + name='InformationLocale', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('headline', models.CharField(max_length=200, verbose_name='Overskrift')), + ('lead_paragraph', models.TextField(verbose_name='Ingress')), + ('body', tinymce.models.HTMLField(verbose_name='Br\xf8dtekst')), + ('language_code', models.CharField(max_length=2, verbose_name='Spr\xe5kkode')), + ('information', models.ForeignKey(to='information.Information')), + ], + ), + ] diff --git a/information/migrations/0002_information_ordering.py b/information/migrations/0002_information_ordering.py new file mode 100644 index 00000000..8512a1f4 --- /dev/null +++ b/information/migrations/0002_information_ordering.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('information', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='information', + name='ordering', + field=models.IntegerField(default=0), + ), + ] diff --git a/information/migrations/__init__.py b/information/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/information/models.py b/information/models.py index b99dc628..fb4b4211 100644 --- a/information/models.py +++ b/information/models.py @@ -12,6 +12,9 @@ class Information(models.Model): return InformationLocale.get_heading_with_fallback(self.id) parent_information = models.ForeignKey('self', blank=True, null=True, related_name='children', verbose_name=_("Parent information")) main_illustration = models.ImageField(upload_to='images/information', blank=True, verbose_name=_("Main illustration") ) + ordering = models.IntegerField(default=0, verbose_name=_("Ordering")) + class Meta: + ordering = ["ordering"] class InformationIllustration(models.Model): information = models.ForeignKey(Information) diff --git a/vips_messages/migrations/0004_auto_20160712_1001.py b/vips_messages/migrations/0004_auto_20160712_1001.py new file mode 100644 index 00000000..47baf265 --- /dev/null +++ b/vips_messages/migrations/0004_auto_20160712_1001.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('vips_messages', '0003_auto_20160331_1121'), + ] + + operations = [ + migrations.AlterField( + model_name='advertisement', + name='exp_date', + field=models.DateField(verbose_name='Dato utl\xf8pt'), + ), + migrations.AlterField( + model_name='advertisement', + name='pub_date', + field=models.DateField(verbose_name='Dato publisert'), + ), + ] -- GitLab