Fix favicon

2018-09-10 21:08:37 +03:00
parent 8552bde245
commit 5b44d2e4c7
8 changed files with 15 additions and 14 deletions
@@ -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),
@@ -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) -->
@@ -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>

@@ -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()),

@@ -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),

@@ -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>
@@ -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 #}
@@ -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">