From 5b44d2e4c759d96ca0ddf5a02e1dbf42fa51452b Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Mon, 10 Sep 2018 21:08:37 +0300
Subject: [PATCH] Fix favicon

---
 coffee_scale/urls.py                         | 4 ----
 members/templates/application_form_base.html | 1 +
 members/templates/base.html                  | 1 +
 members/urls.py                              | 8 --------
 sikweb/urls.py                               | 8 ++++++++
 templates/about.html                         | 1 +
 templates/admin/base_site.html               | 5 +++--
 templates/project.html                       | 1 +
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/coffee_scale/urls.py b/coffee_scale/urls.py
index acaa103..d409288 100644
--- a/coffee_scale/urls.py
+++ b/coffee_scale/urls.py
@@ -1,11 +1,7 @@
 from django.conf.urls import url
 from django.conf import settings
-from django.views.generic.base import RedirectView
-
 from .views import coffee_view
 
-favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True)
-
 urlpatterns = [
     # landing page
     url(r'^$', coffee_view),
diff --git a/members/templates/application_form_base.html b/members/templates/application_form_base.html
index 83570de..ee02499 100644
--- a/members/templates/application_form_base.html
+++ b/members/templates/application_form_base.html
@@ -8,6 +8,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
         <meta name="author" content="veedeeämkoo">
+        <link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.ico"/>
 
         <title>Jäsenhakemus</title>
         <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
diff --git a/members/templates/base.html b/members/templates/base.html
index f8086eb..e9f376f 100644
--- a/members/templates/base.html
+++ b/members/templates/base.html
@@ -11,6 +11,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="description" content="Member register">
         <meta name="author" content="SIK ry">
+        <link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.ico"/>
 
         <title>{% trans "Member register" %}</title>
 
diff --git a/members/urls.py b/members/urls.py
index 80e0466..2f3a1c6 100644
--- a/members/urls.py
+++ b/members/urls.py
@@ -3,7 +3,6 @@
 from django.conf.urls import url
 from django.conf import settings
 from django.contrib.auth.decorators import login_required, permission_required
-from django.views.generic.base import RedirectView
 
 # members
 from members.views import member_list, payment_add, payment_submit
@@ -41,10 +40,6 @@ from members.views import application_submit
 # email validation
 # from members.views import validateEmail, validate_success, validate_fail
 
-
-favicon_view = RedirectView.as_view(
-    url='static/img/favicon.ico', permanent=True)
-
 urlpatterns = [
 
     # landing page
@@ -113,9 +108,6 @@ urlpatterns = [
     url(r'export_payments', export_payments_excel),
     url(r'export_applications', export_applications_excel),
 
-    # favourite icon
-    url(r'^favicon\.ico$', favicon_view),
-
     # rest api url
     url(r'^api/members/(?P<pk>\d+)$', MemberDetail.as_view()),
 
diff --git a/sikweb/urls.py b/sikweb/urls.py
index 3bc3919..93e5266 100644
--- a/sikweb/urls.py
+++ b/sikweb/urls.py
@@ -21,12 +21,17 @@ from django.conf.urls import include
 from django.conf.urls.static import static
 from django.conf import settings
 from django.contrib.staticfiles import views as static_views
+from django.views.generic.base import RedirectView
 
 import webapp.urls
 import infoscreen.urls
 import members.urls
 import coffee_scale.urls
 
+favicon_view = RedirectView.as_view(
+    url='static/img/favicon.ico', permanent=True)
+
+
 urlpatterns = [
     url(r'', include('webapp.urls')),
     url(r'^members/', include('members.urls')),
@@ -35,6 +40,9 @@ urlpatterns = [
     url(r'^kaehmy/', include('kaehmy.urls')),
     url(r'^ohlhafv/', include('ohlhafv.urls')),
 
+    # favourite icon
+    url(r'^favicon\.ico$', favicon_view),
+
     # admin
     url(r'^admin/', admin.site.urls),
 
diff --git a/templates/about.html b/templates/about.html
index ecb1a17..146bafd 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -3,6 +3,7 @@
 {% load static %}
 <html>
 <head>
+  <link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.ico"/>
   <link rel="stylesheet" href="{% static "css/about.css" %}">
 </head>
 <body>
diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html
index ee05b40..4cba2fa 100644
--- a/templates/admin/base_site.html
+++ b/templates/admin/base_site.html
@@ -3,8 +3,9 @@
 
 {% load i18n %}
 {# Additional <head> content here, some extra meta tags or favicon #}
-{#{% block extrahead %}#}
-{#{% endblock %}#}
+{% block extrahead %}
+    <link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.ico"/>
+{% endblock %}
 
 
 {# Additional CSS includes #}
diff --git a/templates/project.html b/templates/project.html
index 21a056d..bbff6ef 100644
--- a/templates/project.html
+++ b/templates/project.html
@@ -8,6 +8,7 @@
     <head>
         {% block head %}
         <meta charset="utf-8">
+        <link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.ico"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
         <meta name="author" content="Aalto-yliopiston Sähköinsinöörikilta ry">