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

Create common base for all apps

Browse Source
This commit is contained in:
henu
2017-10-31 20:39:19 +02:00
parent 4221be8c64
commit fe14f7600a
14 changed files with 56 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/css/footer.css
+2
View File
@@ -1,4 +1,6 @@
footer {
position: absolute;
bottom: 0;
background-color: #f5f5f5;
}
webapp/templates/base.html → templates/base.html
+3 -37
View File
@@ -1,16 +1,10 @@
<!DOCTYPE html>
{% load i18n %}
{% load static %}
{% load staticfiles %}
<html lang="en">
<html>
<head>
<meta charset="utf-8">
<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="Aalto-yliopiston Sähköinsinöörikilta ry">
<link rel="stylesheet" href="{% static "css/webapp.css" %}">
<title>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %}</title>
@@ -30,36 +24,8 @@
})
</script>
</head>
<body>
<div class="container">
<div class="row">
<div class="col">
{% block header %}
{% include "sik_header.html" %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block navigation %}
{% include "navigation.html" %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block content %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block footer %}
{% include "footer.html" %}
{% endblock footer %}
</div>
</div>
</div>
{% block body %}
{% endblock %}
</body>
</html>
webapp/templates/admin_index.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% load i18n %}
{% block content %}
webapp/templates/contact.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/event_calendar.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/freshmen.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/guild.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/international.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/jobs.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/main_index.html
+5 -3
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% load i18n %}
{% block content %}
@@ -6,11 +6,13 @@
<div class="container">
<div class="row">
<div class="col">
<h3>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %}</h3>
<h3>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %}</h3>
</div>
</div>
<div class="row">
<h5>Lisää vain vesi</h5>
<div class="col">
<h5>Lisää vain vesi</h5>
</div>
</div>
</div>
</div>
webapp/templates/ohlhafv.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% load bootstrap3 %}
{% load i18n %}
webapp/templates/ohlhafv_list.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% load static %}
{% load i18n %}
webapp/templates/sosso.html
+1 -1
View File
@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "webapp_base.html" %}
{% block content %}
{% load i18n %}
webapp/templates/webapp_base.html
+36
View File
@@ -0,0 +1,36 @@
{% extends "base.html" %}
{% load i18n %}
{% load static %}
{% load staticfiles %}
<link rel="stylesheet" href="{% static "css/webapp.css" %}">
<div class="container">
<div class="row">
<div class="col">
{% block header %}
{% include "sik_header.html" %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block navigation %}
{% include "navigation.html" %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block content %}
{% endblock %}
</div>
</div>
<div class="row">
<div class="col">
{% block footer %}
{% include "footer.html" %}
{% endblock footer %}
</div>
</div>
</div>