Task #248: add title on link

diff --git a/app/organization/agenda/migrations/0013_eventlink_title.py b/app/organization/agenda/migrations/0013_eventlink_title.py
new file mode 100644 (file)
index 0000000..276cf9d
--- /dev/null
+++ b/app/organization/agenda/migrations/0013_eventlink_title.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-10-21 11:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-agenda', '0012_auto_20161020_1051'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='eventlink',
+            name='title',
+            field=models.CharField(default='', max_length=1024, verbose_name='title'),
+            preserve_default=False,
+        ),
+    ]

diff --git a/app/organization/agenda/migrations/0014_auto_20161021_1319.py b/app/organization/agenda/migrations/0014_auto_20161021_1319.py
new file mode 100644 (file)
index 0000000..c2e3c51
--- /dev/null
+++ b/app/organization/agenda/migrations/0014_auto_20161021_1319.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-10-21 11:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-agenda', '0013_eventlink_title'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='eventlink',
+            name='title',
+            field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'),
+        ),
+    ]

diff --git a/app/organization/core/models.py b/app/organization/core/models.py
index 3c821c77d6364888aed44e3f4e521e1563f7a001..d8546e02e55a83a6437c011d42026aef2168aaed 100644 (file)
--- a/app/organization/core/models.py
+++ b/app/organization/core/models.py
@@ -174,6 +174,7 @@ class LinkType(models.Model):
 class Link(URL):
     """A person can have many links."""
 
+    title = models.CharField(_('title'), max_length=1024, null=True, blank=True)
     link_type = models.ForeignKey(LinkType, verbose_name=_('link type'))
 
     class Meta:

diff --git a/app/organization/network/migrations/0042_auto_20161021_1319.py b/app/organization/network/migrations/0042_auto_20161021_1319.py
new file mode 100644 (file)
index 0000000..39acb2a
--- /dev/null
+++ b/app/organization/network/migrations/0042_auto_20161021_1319.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-10-21 11:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0041_auto_20161018_1236'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organizationlink',
+            name='title',
+            field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'),
+        ),
+        migrations.AddField(
+            model_name='personlink',
+            name='title',
+            field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'),
+        ),
+    ]

diff --git a/app/organization/pages/migrations/0011_pagelink_title.py b/app/organization/pages/migrations/0011_pagelink_title.py
new file mode 100644 (file)
index 0000000..cb4ff9c
--- /dev/null
+++ b/app/organization/pages/migrations/0011_pagelink_title.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-10-21 11:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-pages', '0010_auto_20161021_1256'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='pagelink',
+            name='title',
+            field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'),
+        ),
+    ]

diff --git a/app/organization/projects/migrations/0022_projectlink_title.py b/app/organization/projects/migrations/0022_projectlink_title.py
new file mode 100644 (file)
index 0000000..430feb0
--- /dev/null
+++ b/app/organization/projects/migrations/0022_projectlink_title.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-10-21 11:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-projects', '0021_auto_20161014_0002'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='projectlink',
+            name='title',
+            field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'),
+        ),
+    ]

diff --git a/app/organization/shop/migrations/0008_productlink_title.py b/app/organization/shop/migrations/0008_productlink_title.py
new file mode 100644 (file)
index 0000000..204dff8
--- /dev/null
+++ b/app/organization/shop/migrations/0008_productlink_title.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-10-21 11:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-shop', '0007_auto_20161020_2035'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='productlink',
+            name='title',
+            field=models.CharField(blank=True, max_length=1024, null=True, verbose_name='title'),
+        ),
+    ]

diff --git a/app/templates/core/inc/link.html b/app/templates/core/inc/link.html
index 89d5933c2749eaf07341b6f8db2ad11b64ee2e53..047eee1034a61f11a5ba60f425660386714fb1cc 100644 (file)
--- a/app/templates/core/inc/link.html
+++ b/app/templates/core/inc/link.html
@@ -4,6 +4,6 @@
 </p>
 <ul class="unstyled-list fss">
     {% for link in links %}
-      <li><a href="{{ link.url }}" title=""><i class="fa fa-{{ link.link_type.name }}"></i> {{ link.url }}</a></li>
+      <li><a href="{{ link.url }}" title=""><i class="fa fa-{{ link.link_type.name }}"></i>{% firstof link.title link.url%}</a></li>
     {% endfor %}
 </ul>

diff --git a/app/templates/network/inc/person/person_card_circle.html b/app/templates/network/inc/person/person_card_circle.html
index ed10adde73fb778e7277fb6fb47eb66abfb5b929..432ea9b87e8414b52b951b40d5a1366d31f73014 100644 (file)
--- a/app/templates/network/inc/person/person_card_circle.html
+++ b/app/templates/network/inc/person/person_card_circle.html
@@ -33,7 +33,7 @@
             {% endif %}
             {% for link in person.links.all %}
                 {% if link %}
-                    <a href="{{ link }}" title="Site Web" class="button button--small"><i class="fa fa-{{ link.link_type.name }}"></i> {{ link.link_type.name }}</a>
+                    <a href="{{ link }}" title="Site Web" class="button button--small"><i class="fa fa-{{ link.link_type.name }}"></i>{% firstof link.title link.link_type.name %}</a>
                 {% endif %}
             {% endfor %}