TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix favicon

Browse Source
This commit is contained in:
Aarni Halinen
2018-09-10 21:08:37 +03:00
parent 8552bde245
commit 5b44d2e4c7
8 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coffee_scale/urls.py
-4
View File
@@ -1,11 +1,7 @@
from django.conf.urls import url from django.conf.urls import url
from django.conf import settings from django.conf import settings
from django.views.generic.base import RedirectView
from .views import coffee_view from .views import coffee_view
favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True)
urlpatterns = [ urlpatterns = [
# landing page # landing page
url(r'^$', coffee_view), url(r'^$', coffee_view),
members/templates/application_form_base.html
+1
View File
@@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry"> <meta name="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
<meta name="author" content="veedeeämkoo"> <meta name="author" content="veedeeämkoo">
<link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.ico"/>
<title>Jäsenhakemus</title> <title>Jäsenhakemus</title>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
members/templates/base.html
+1
View File
@@ -11,6 +11,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Member register"> <meta name="description" content="Member register">
<meta name="author" content="SIK ry"> <meta name="author" content="SIK ry">
<link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.ico"/>
<title>{% trans "Member register" %}</title> <title>{% trans "Member register" %}</title>
members/urls.py
-8
View File
@@ -3,7 +3,6 @@
from django.conf.urls import url from django.conf.urls import url
from django.conf import settings from django.conf import settings
from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.decorators import login_required, permission_required
from django.views.generic.base import RedirectView
# members # members
from members.views import member_list, payment_add, payment_submit from members.views import member_list, payment_add, payment_submit
@@ -41,10 +40,6 @@ from members.views import application_submit
# email validation # email validation
# from members.views import validateEmail, validate_success, validate_fail # from members.views import validateEmail, validate_success, validate_fail
favicon_view = RedirectView.as_view(
url='static/img/favicon.ico', permanent=True)
urlpatterns = [ urlpatterns = [
# landing page # landing page
@@ -113,9 +108,6 @@ urlpatterns = [
url(r'export_payments', export_payments_excel), url(r'export_payments', export_payments_excel),
url(r'export_applications', export_applications_excel), url(r'export_applications', export_applications_excel),
# favourite icon
url(r'^favicon\.ico$', favicon_view),
# rest api url # rest api url
url(r'^api/members/(?P<pk>\d+)$', MemberDetail.as_view()), url(r'^api/members/(?P<pk>\d+)$', MemberDetail.as_view()),
sikweb/urls.py
+8
View File
@@ -21,12 +21,17 @@ from django.conf.urls import include
from django.conf.urls.static import static from django.conf.urls.static import static
from django.conf import settings from django.conf import settings
from django.contrib.staticfiles import views as static_views from django.contrib.staticfiles import views as static_views
from django.views.generic.base import RedirectView
import webapp.urls import webapp.urls
import infoscreen.urls import infoscreen.urls
import members.urls import members.urls
import coffee_scale.urls import coffee_scale.urls
favicon_view = RedirectView.as_view(
url='static/img/favicon.ico', permanent=True)
urlpatterns = [ urlpatterns = [
url(r'', include('webapp.urls')), url(r'', include('webapp.urls')),
url(r'^members/', include('members.urls')), url(r'^members/', include('members.urls')),
@@ -35,6 +40,9 @@ urlpatterns = [
url(r'^kaehmy/', include('kaehmy.urls')), url(r'^kaehmy/', include('kaehmy.urls')),
url(r'^ohlhafv/', include('ohlhafv.urls')), url(r'^ohlhafv/', include('ohlhafv.urls')),
# favourite icon
url(r'^favicon\.ico$', favicon_view),
# admin # admin
url(r'^admin/', admin.site.urls), url(r'^admin/', admin.site.urls),
templates/about.html
+1
View File
@@ -3,6 +3,7 @@
{% load static %} {% load static %}
<html> <html>
<head> <head>
<link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.ico"/>
<link rel="stylesheet" href="{% static "css/about.css" %}"> <link rel="stylesheet" href="{% static "css/about.css" %}">
</head> </head>
<body> <body>
templates/admin/base_site.html
+3 -2
View File
@@ -3,8 +3,9 @@
{% load i18n %} {% load i18n %}
{# Additional <head> content here, some extra meta tags or favicon #} {# Additional <head> content here, some extra meta tags or favicon #}
{#{% block extrahead %}#} {% block extrahead %}
{#{% endblock %}#} <link rel="shortcut icon" type="image/x-icon" href="/static/img/favicon.ico"/>
{% endblock %}
{# Additional CSS includes #} {# Additional CSS includes #}
templates/project.html
+1
View File
@@ -8,6 +8,7 @@
<head> <head>
{% block head %} {% block head %}
<meta charset="utf-8"> <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="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="description" content="Aalto-yliopiston Sähköinsinöörikilta ry">
<meta name="author" content="Aalto-yliopiston Sähköinsinöörikilta ry"> <meta name="author" content="Aalto-yliopiston Sähköinsinöörikilta ry">