Added mdi icon to external link.

django_lostplaces/docs/developer.md

@@ -24,7 +24,7 @@ user.explorer
 Currently the explorer profile is used by the abstract model 'Submittable' and has the following realated names/fiels:
 - [places](###place) A list containing all (lost) places the user has submitted  
 - [placeimages](###placeimages) A list containing all images relating a place that a user has submitted
-- [photoalbums](###photoalbums) A list of all photo albums a explorere has submitted
+- [externallinks](###externallinks) A list of all photo albums a explorere has submitted
 
 
 ### Taggable
@@ -141,15 +141,3 @@ This model represents an URL to an external website. External Link is an PlaceAs
 the URL to the target
 `label`  
 the label that is shown on the website
-
-### PhotoAlbum
-Loacation: `lostplaces.models.external_link.PhototAlbum`  
-Import From: `lostplaces.models.PhotoAlbum`
-#### Super Classes
-- django's `models.Model`
-- [lostplaces.models.Submittable](###submittable)
-- [lostplaces.models.PlaceAsset](###placeasset)
-- [lostplaces.models.ExternalLink](###externallink)
-
-A photo album is a link to an external site that is meant to contain photos of the place it is referenced in. It 
-does not have any fields, just the ones inherited from it's super class [ExternalLink](###externallink).

django_lostplaces/lostplaces/admin.py

@@ -21,8 +21,8 @@ class VoucherAdmin(admin.ModelAdmin):
     
     valid.boolean = True
 
-class PhotoAlbumsAdmin(admin.ModelAdmin):
-    list_display = ('label', 'place', 'url' )
+class ExternalLinksAdmin(admin.ModelAdmin):
+    list_display = ('label', 'place', 'url', 'linktype' )
 
 class PlacesAdmin(admin.ModelAdmin):
     list_display = ('name', 'submitted_by', 'submitted_when')
@@ -34,4 +34,4 @@ admin.site.register(Explorer)
 admin.site.register(Voucher, VoucherAdmin)
 admin.site.register(Place, PlacesAdmin)
 admin.site.register(PlaceImage, PlaceImagesAdmin)
-admin.site.register(PhotoAlbum, PhotoAlbumsAdmin)
+admin.site.register(ExternalLink, ExternalLinksAdmin)

django_lostplaces/lostplaces/migrations_release_temp/0008_photoalbum_linktype.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.7 on 2021-10-01 19:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces', '0007_auto_20211001_1925'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='photoalbum',
+            name='linktype',
+            field=models.CharField(blank=True, max_length=20, null=True, verbose_name='link type'),
+        ),
+    ]

django_lostplaces/lostplaces/migrations_release_temp/0009_photoalbum_externallink_interim.py

@@ -0,0 +1,37 @@
+# Generated by Django 3.2.7 on 2021-10-01 20:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces', '0008_photoalbum_linktype'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ExternalLink',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('submitted_when', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date')),
+                ('subclass', models.IntegerField(default=-1)),
+                ('subclassid', models.IntegerField(default=-1)),
+                ('url', models.URLField(verbose_name='URL')),
+                ('label', models.CharField(max_length=100, verbose_name='link text')),
+                ('linktype', models.CharField(blank=True, max_length=20, null=True, verbose_name='link type')),
+                ('place', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='externallinks', to='lostplaces.place')),
+                ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='externallinks', to='lostplaces.explorer', verbose_name='Submitter')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.AddField(
+            model_name='photoalbum',
+            name='externallink_ptr',
+            field=models.OneToOneField(auto_created=True, null=True, blank=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, serialize=False, to='lostplaces.externallink'),
+            preserve_default=False,
+        ),
+    ]

django_lostplaces/lostplaces/migrations_release_temp/0010_photoalbum_externallink_datamigration.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.7 on 2021-10-01 20:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces', '0009_photoalbum_externallink_interim'),
+    ]
+
+    operations = [
+        # insert data from subclass into parent class with subclass 'number' and primary key/id
+        migrations.RunSQL("""INSERT INTO lostplaces_externallink (submitted_when, url, label, place_id, submitted_by_id, subclass, subclassid)
+                        SELECT submitted_when, url, label, place_id, submitted_by_id, 1, id
+                        FROM lostplaces_photoalbum;"""
+
+        ),
+        # update subclass primary key to point to parent class (notice composite key values):
+        migrations.RunSQL("UPDATE lostplaces_photoalbum SET externallink_ptr_id=lostplaces_externallink.id FROM lostplaces_externallink WHERE lostplaces_externallink.subclassid=lostplaces_photoalbum.id AND lostplaces_externallink.subclass=1;"
+        ),
+    ]

django_lostplaces/lostplaces/migrations_release_temp/0011_remove_migrated_photoalbum_data.py

@@ -0,0 +1,56 @@
+# Generated by Django 3.2.7 on 2021-10-01 22:48
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces', '0010_photoalbum_externallink_datamigration'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='externallink',
+            name='subclass',
+        ),
+        migrations.RemoveField(
+            model_name='externallink',
+            name='subclassid',
+        ),
+        migrations.RemoveField(
+            model_name='photoalbum',
+            name='id',
+        ),
+        migrations.RemoveField(
+            model_name='photoalbum',
+            name='label',
+        ),
+        migrations.RemoveField(
+            model_name='photoalbum',
+            name='linktype',
+        ),
+        migrations.RemoveField(
+            model_name='photoalbum',
+            name='place',
+        ),
+        migrations.RemoveField(
+            model_name='photoalbum',
+            name='submitted_by',
+        ),
+        migrations.RemoveField(
+            model_name='photoalbum',
+            name='submitted_when',
+        ),
+        migrations.RemoveField(
+            model_name='photoalbum',
+            name='url',
+        ),
+        migrations.AlterField(
+            model_name='photoalbum',
+            name='externallink_ptr',
+            field=models.OneToOneField(auto_created=True, default=-1, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='lostplaces.externallink'),
+            preserve_default=False,
+        ),
+    ]

django_lostplaces/lostplaces/migrations_release_temp/0012_.remove_photoalbum,change linktype.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.7 on 2021-10-02 02:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces', '0011_remove_migrated_photoalbum_data'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='externallink',
+            name='linktype',
+            field=models.CharField(blank=True, choices=[('youtube', 'YouTube'), ('vimeo', 'Vimeo'), ('flickr', 'Flickr'), ('googlephotos', 'Google Photos'), ('photoalbum', 'Photo album')], max_length=20, null=True, verbose_name='link type'),
+        ),
+        migrations.DeleteModel(
+            name='PhotoAlbum',
+        ),
+    ]

django_lostplaces/lostplaces/models/external_links.py

@@ -3,10 +3,23 @@ from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.models.place import PlaceAsset
 
+LINK_TYPES = (
+    ('youtube', 'YouTube'),
+    ('vimeo', "Vimeo"),
+    ('flickr', 'Flickr'),
+    ('googlephotos', "Google Photos"),
+    ('photoalbum', "Photo album"),
+)
+
+LINK_DOMAINS = {
+    'youtu.be': 'youtube',
+    'y2u.be': 'youtube',
+}
+
 class ExternalLink(PlaceAsset):
-    
+
     class Meta:
-        abstract = True
+        abstract = False
 
     url = models.URLField(
         max_length=200,
@@ -16,6 +29,10 @@ class ExternalLink(PlaceAsset):
         max_length=100,
         verbose_name=_('link text')
     )
-
-class PhotoAlbum(ExternalLink):
-    pass
+    linktype = models.CharField(
+        choices=LINK_TYPES,
+        max_length=20,
+        verbose_name=_('link type'),
+        blank=True,
+        null=True
+    )

django_lostplaces/lostplaces/models/place.py

@@ -104,7 +104,7 @@ class PlaceAsset(Submittable):
     """
 
     class Meta:
-            abstract = True
+        abstract = True
 
     place = models.ForeignKey(
         Place,

django_lostplaces/lostplaces/static/fonts/MaterialDesignIcons/LICENSE-2.0.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

django_lostplaces/lostplaces/templates/explorer/profile.html

@@ -104,16 +104,16 @@
 </section>
 
 <section class=" LP-Section">
-	<h1 class="LP-Headline">{% translate 'Photo albums submitted by' %} {{explorer.user.username}}</h1>
+	<h1 class="LP-Headline">{% translate 'External links submitted by' %} {{explorer.user.username}}</h1>
 	<div class="LP-LinkList">
 		<ul class="LP-LinkList__Container">
-			{% for photo_album in assets.photoalbums.all %}
+			{% for external_link in assets.externallinks.all %}
 			<li class="LP-LinkList__Item">
-				<a target="_blank" href="{{photo_album.url}}" class="LP-Link">
-					<span class="LP-Text">{{photo_album.label}}</span>
+				<a target="_blank" href="{{external_link.url}}" class="LP-Link">
+					<span class="LP-Text">{{external_link.label}}</span>
 				</a>
-				{% if user.explorer == photo_album.submitted_by%}
-				<a href="{% url 'photo_album_delete' pk=photo_album.pk%}" class="LP-Link LP-LinkList__ItemHover" title="Delete Photo Album">
+				{% if user.explorer == external_link.submitted_by%}
+				<a href="{% url 'external_link_delete' pk=external_link.pk%}" class="LP-Link LP-LinkList__ItemHover" title="Delete Photo Album">
 					<div class="RV-Iconized__Container RV-Iconized__Container--small">
 						{% icon 'trash' className="RV-Iconized__Icon" %}
 					</div>

django_lostplaces/lostplaces/templates/external_link/external_link_create.html

@@ -1,7 +1,7 @@
 {% extends 'global.html'%}
 {% load i18n %}
 
-{% block title %}{% translate 'Submit a photo album' %}{% endblock %}
+{% block title %}{% translate 'Submit an external link' %}{% endblock %}
 
 {% block additional_menu_items %}
 <li class="LP-Menu__Item LP-Menu__Item--additional"><a href="{% url 'place_edit' pk=place.pk %}" class="LP-Link"><span
@@ -13,7 +13,7 @@
 {% block maincontent %}
 <form class="LP-Form" method="POST">
     <fieldset class="LP-Form__Fieldset">
-        <legend class="LP-Form__Legend">{% translate 'Submit a photo album for' %} {{place.name}}</legend>
+        <legend class="LP-Form__Legend">{% translate 'Submit an external link for' %} {{place.name}}</legend>
         {% csrf_token %}
         <div class="LP-Form__Composition">
             <div class="LP-Form__Field">
@@ -27,9 +27,15 @@
             </div>
         </div>
 
+        <div class="LP-Form__Composition">
+            <div class="LP-Form__Field">
+                {% include 'partials/form/inputField.html' with field=form.linktype %}
+            </div>
+        </div>
+
         <div class="LP-Form__Composition LP-Form__Composition--buttons">
             {% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER %}
         </div>
     </fieldset>
 </form>
-{% endblock maincontent %}
+{% endblock maincontent %}

django_lostplaces/lostplaces/templates/partials/placeImageGrid.html

@@ -25,7 +25,7 @@
 				<a href="#image{{forloop.counter0|add:-1}}" class="LP-ImageGrid__Previous">Previous</a>
 				{% endif %}
 				<span class="LP-ImageGrid__Close LP-ImageGrid__DeleteItem" title="Schließen">
-					<a href="#thumbnail{{forloop.counter0}}" class="LP-Link">
+					<a href="#" class="LP-Link">
 						<img class="LP-Icon" src="{% static 'icons/cancel.svg' %}"/>
 					</a>
 				</span>

django_lostplaces/lostplaces/templates/place/place_detail.html

@@ -62,16 +62,17 @@
     </section>
 
     <section class=" LP-Section">
-        <h1 class="LP-Headline">{% translate 'Photo albums' %}</h1>
+        <h2 class="LP-Headline">{% translate 'External links' %}</h2>
         <div class="LP-LinkList">
             <ul class="LP-LinkList__Container">
-                {% for photo_album in place.photoalbums.all %}
+                {% for external_link in place.externallinks.all %}
                 <li class="LP-LinkList__Item">
-                    <a target="_blank" href="{{photo_album.url}}" class="LP-Link">
-                        <span class="LP-Text">{{photo_album.label}}</span>
+                    <a target="_blank" href="{{external_link.url}}" class="LP-Link">
+                        <span class="mdi mdi-36px mdi-{{external_link.linktype}}"></span>
+                        <span class="LP-Text">{{external_link.label}}</span>
                     </a>
-                    {% if user.explorer == photo_album.submitted_by or user.explorer == place.submitted_by %}
-                    <a href="{% url 'photo_album_delete' pk=photo_album.pk%}" class="LP-Link LP-LinkList__ItemHover" title="Delete Photo Album">
+                    {% if user.explorer == external_link.submitted_by or user.explorer == place.submitted_by %}
+                    <a href="{% url 'external_link_delete' pk=external_link.pk%}" class="LP-Link LP-LinkList__ItemHover" title="Delete external link">
                         <div class="RV-Iconized__Container RV-Iconized__Container--small">
                             {% icon 'trash' className="RV-Iconized__Icon" %}
                         </div>
@@ -80,7 +81,7 @@
                 </li>
                 {% endfor %}
                 <li class="LP-LinkList__Item">
-                    <a href="{% url 'photo_album_create' place_id=place.id %}" class="LP-Link">
+                    <a href="{% url 'external_link_create' place_id=place.id %}" class="LP-Link">
                         <div class="RV-Iconized__Container RV-Iconized__Container--small">
                             <svg class="RV-Iconized__Icon" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 512 512" xml:space="preserve">
                                 <g>
@@ -88,7 +89,7 @@
 		v216c0,11.046,8.954,20,20,20s20-8.954,20-20V276h216c11.046,0,20-8.954,20-20C512,244.954,503.046,236,492,236z" />
                                 </g>
                             </svg>
-                            <span class="RV-Iconized__Text">{% translate 'Add photo album' %}</span>
+                            <span class="RV-Iconized__Text">{% translate 'Add external link' %}</span>
                         </div>
                     </a>
                 </li>

django_lostplaces/lostplaces/templates/place/place_update.html

@@ -51,7 +51,7 @@
         
         {% translate 'Update' as action %}
         <div class="LP-Form__Composition LP-Form__Composition--buttons">
-            {% include 'partials/form/submit.html' with referrer=request.META.HTTP_REFERER action=action %}
+            {% include 'partials/form/submit.html' with referer=request.META.HTTP_REFERER action=action %}
         </div>
     </fieldset>
 

django_lostplaces/lostplaces/urls.py

@@ -19,8 +19,8 @@ from lostplaces.views import (
     PlaceVisitDeleteView,
     PlaceImageCreateView,
     PlaceImageDeleteView,
-    PhotoAlbumCreateView,
-	PhotoAlbumDeleteView,
+    ExternalLinkCreateView,
+	ExternalLinkDeleteView,
     ExplorerProfileView,
     ExplorerProfileUpdateView
 )
@@ -48,6 +48,6 @@ urlpatterns = [
     path('place_image/create/<int:place_id>/', PlaceImageCreateView.as_view(), name='place_image_create'),
     path('place_image/delete/<int:pk>/', PlaceImageDeleteView.as_view(), name='place_image_delete'),
 
-	path('photo_album/create/<int:place_id>/', PhotoAlbumCreateView.as_view(), name='photo_album_create'),
-	path('photo_album/delete/<int:pk>/', PhotoAlbumDeleteView.as_view(), name='photo_album_delete')
+    path('external_link/create/<int:place_id>/', ExternalLinkCreateView.as_view(), name='external_link_create'),
+	path('external_link/delete/<int:pk>/', ExternalLinkDeleteView.as_view(), name='external_link_delete')
 ]

django_lostplaces/lostplaces/views/views.py

@@ -12,7 +12,7 @@ from django.http import HttpResponseForbidden
 from django.utils.translation import ugettext_lazy as _
 
 from lostplaces.forms import SignupVoucherForm, TagSubmitForm
-from lostplaces.models import Place, PhotoAlbum
+from lostplaces.models import Place, ExternalLink, external_links
 from lostplaces.views.base_views import IsAuthenticatedMixin
 from lostplaces.common import redirect_referer_or
 
@@ -48,17 +48,29 @@ class HomeView(IsAuthenticatedMixin, View):
         }
         return render(self.request, 'home_unauth.html', context)
 
-class PhotoAlbumCreateView(PlaceAssetCreateView):
-    model = PhotoAlbum
-    fields = ['url', 'label']
-    template_name = 'photo_album/photo_album_create.html'
-    success_message = _('Photo album link submitted')
+class ExternalLinkCreateView(PlaceAssetCreateView):
+    model = ExternalLink
+    fields = ['url', 'label', 'linktype']
+    template_name = 'external_link/external_link_create.html'
+    success_message = _('External link submitted')
 
-class PhotoAlbumDeleteView(PlaceAssetDeleteView):
-    model = PhotoAlbum
+    def post(self, request, place_id, *args, **kwargs):
+        response = super().post(request, place_id, *args, **kwargs)
+        if not self.object.linktype:
+            for domain, link_type in external_links.LINK_DOMAINS.items():
+                if domain in self.object.url:
+                    self.object.linktype = link_type
+                    self.object.save()
+                    break
+                else:
+                    self.object.linktype = None
+        return response
+
+class ExternalLinkDeleteView(PlaceAssetDeleteView):
+    model = ExternalLink
     pk_url_kwarg = 'pk'
-    success_message = _('Photo album link deleted')
-    permission_denied_messsage = _('You are not allowed to edit this photo album link')
+    success_message = _('External link deleted')
+    permission_denied_messsage = _('You are not allowed to edit this external link')
 
 class PlaceTagSubmitView(IsAuthenticatedMixin, View):
 	def post(self, request, tagged_id, *args, **kwargs):