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

common footer template

Browse Source
This commit is contained in:
Aarni Halinen
2021-11-17 18:15:55 +02:00
parent bfa11ba4fc
commit 28cd34e973
11 changed files with 9 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.eslintignore
-1
View File
@@ -1,6 +1,5 @@
members/static/js/lib
infoscreen/static/js/lib
webapp/static/js/lib
static/js/lib
collected_static
venv
infoscreen/templates/base.html
+1 -1
View File
@@ -29,7 +29,7 @@
{% block styles %}
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="stylesheet" href="{% static "webapp/css/footer.css" %}">
<link rel="stylesheet" href="{% static "css/footer.css" %}">
{% endblock styles %}
{% block controllers %}
infoscreen/templates/header.html
-7
View File
@@ -1,7 +0,0 @@
{% load i18n %}
{% load static %}
<div class="header-content">
<div class="logo">
<a href="/"><img src="{% static "webapp/img/logo_header.png" %}" alt="Aalto-yliopiston Sähköinsinöörikilta ry"></a>
</div>
</div>
kaehmy/templates/base.html
+1 -2
View File
@@ -7,7 +7,6 @@
<link rel="stylesheet" href="{% static "kaehmy/css/base.css" %}">
<link rel="stylesheet" href="{% static "kaehmy/css/header.css" %}">
<link rel="stylesheet" href="{% static "kaehmy/css/nav.css" %}">
<link rel="stylesheet" href="{% static "kaehmy/css/footer.css" %}">
{% endblock styles %}
{% block body %}
@@ -28,7 +27,7 @@
</div>
<div class="footer">
{% block footer %}
{% include "kaehmy:footer.html" %}
{% include "footer.html" %}
{% endblock footer %}
</div>
kaehmy/templates/footer.html
-24
View File
@@ -1,24 +0,0 @@
{% load i18n %}
{% load static %}
{% load staticfiles %}
<footer style="text-align: center">
<div>
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
<span>
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select onchange="this.form.submit()" class="lang-select form-control" name="language">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }} ({{ language.code }})
</option>
{% endfor %}
</select>
</span>
</form>
<span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
</div>
</footer>
members/templates/base.html
+1 -1
View File
@@ -22,7 +22,7 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
<link rel="stylesheet" href="{% static "members/css/simple-sidebar.css" %}">
<link rel="stylesheet" href="{% static "members/css/members.css" %}">
<link rel="stylesheet" href="{% static "webapp/css/footer.css" %}">
<link rel="stylesheet" href="{% static "css/footer.css" %}">
</head>
<body>
ohlhafv/static/ohlhafv/css/footer.css
-34
View File
@@ -1,34 +0,0 @@
#footer-div {
height:10vh;
}
footer {
/* position: absolute; */
bottom: 0;
width: 100%;
height: 60px; /* Set the fixed height of the footer here */
/* line-height: 60px; /* Vertically center the text there */
margin-top: 2rem;
margin-bottom: 1rem;
}
footer .container .col .nav .nav-item {
display: inline-block;
margin-right: 3vh;
}
.lang-button {
height: 4vh;
width: 6vh;
margin-left: 1vh;
margin-right: 1vh;
}
.lang-select {
width: 10rem;
display: inline-block;
}
footer .lang-form {
margin: 1rem auto 0;
}
ohlhafv/templates/base.html
+1 -1
View File
@@ -22,7 +22,7 @@
{% endblock %}
{% block footer %}
{% include "ohlhafv:footer.html" %}
{% include "footer.html" %}
{% endblock footer %}
{% endblock body %}
ohlhafv/templates/footer.html
-25
View File
@@ -1,25 +0,0 @@
{% load i18n %}
{% load static %}
{% load staticfiles %}
<link rel="stylesheet" href="{% static "ohlhafv/css/footer.css" %}">
<footer style="text-align: center">
<div>
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
<span>
<input name="next" type="hidden" value="{{ redirect_to }}" />
<select onchange="this.form.submit()" class="lang-select form-control" name="language">
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
{% for language in languages %}
<option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
{{ language.name_local }} ({{ language.code }})
</option>
{% endfor %}
</select>
</span>
</form>
<span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
</div>
</footer>
static/css/footer.css
+3 -5
View File
@@ -3,9 +3,11 @@
}
footer {
bottom: 0;
width: 100%;
height: 5rem; /* Set the fixed height of the footer here */
height: 60px;
margin-top: 2rem;
margin-bottom: 1rem;
}
footer .container .col .nav .nav-item {
@@ -28,7 +30,3 @@ footer .container .col .nav .nav-item {
footer .lang-form {
margin: 1rem auto 0;
}
.footer-padder {
margin-top: 6rem; /* height of the footer element */
}
templates/footer.html
+2 -1
View File
@@ -2,7 +2,8 @@
{% load static %}
{% load staticfiles %}
<div class="footer-padder"></div>
<link rel="stylesheet" href="{% static "css/footer.css" %}">
<footer style="text-align: center">
<div>
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}