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

Merge branch 'feature-refactor-webapp-styles' into 'develop'

Browse Source 
Feature refactor webapp styles

See merge request vtmk/web2.0!93
This commit is contained in:
Henri Varjotie
2017-10-31 20:08:56 +02:00
parent 0e3e117f25 20dc626fcb
commit 752f3a6e39
15 changed files with 198 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/css/footer.css
+3 -13
View File
@@ -1,18 +1,8 @@
#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;
background-color: #f5f5f5;
}
footer .container .col .nav .nav-item {
/*footer .container .col .nav .nav-item {
display: inline-block;
margin-right: 3vh;
}
@@ -31,4 +21,4 @@ footer .container .col .nav .nav-item {
footer .lang-form {
margin: 1rem auto 0;
}
}*/
templates/footer.html
+63 -29
View File
@@ -3,35 +3,69 @@
{% load staticfiles %}
<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 %}
<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>
<div>
<span class="nav-item">
<a href="/members"><i class="fa fa-group"></i></a>
</span>
<span class="nav-item">
<a href="/infoscreen"><i class="fa fa-info"></i></a>
</span>
<span class="nav-item">
<a href="/admin"><i class="fa fa-gears"></i></a>
</span>
<footer class="footer">
<div class="container">
<div class="d-flex align-items-center justify-content-end">
<div class="p-2">
<span>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %} {% now 'Y' %}</span>
</div>
<div class="p-2">
<form class="lang-form form" action="{% url 'set_language' %}" method="post">{% csrf_token %}
<span class="form-group">
<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>
</div>
<div class="ml-auto p-2">
<span class="nav-item">
<a href="/members"><i class="fa fa-group"></i></a>
</span>
<span class="nav-item">
<a href="/infoscreen"><i class="fa fa-info"></i></a>
</span>
<span class="nav-item">
<a href="/admin"><i class="fa fa-gears"></i></a>
</span>
</div>
</div>
</div>
</footer>
<!-- <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>
-->
<!-- <span class="nav-item">
<a href="/members"><i class="fa fa-group"></i></a>
</span>
<span class="nav-item">
<a href="/infoscreen"><i class="fa fa-info"></i></a>
</span>
<span class="nav-item">
<a href="/admin"><i class="fa fa-gears"></i></a>
</span> -->
webapp/static/css/main_nav.css
+2 -2
View File
@@ -1,3 +1,3 @@
.main_navigation .navbar-border .navbar-nav .nav-item {
/*.main_navigation .navbar-border .navbar-nav .nav-item {
display: block;
}
}*/
webapp/static/css/sik_header.css
-24
View File
@@ -11,27 +11,3 @@
height: auto;
margin: auto;
}
.kaehmy-banner {
max-width: 1000px;
margin-left: auto;
margin-right: auto;
}
@media screen and (min-width: 1000px) {
.kaehmy_header-content {
position: absolute;
left: 0;
top: 0;
background-color: #052f5f;
width: 100%;
}
.kaehmy_header {
margin-bottom: 331px;
}
}
.kaehmy-banner-image {
width: 100%;
}
webapp/static/css/webapp.css
+5 -22
View File
@@ -1,26 +1,9 @@
.page-content {
margin-top: 1vh;
width: 90%;
margin-left: auto;
margin-right: auto;
html {
position: relative;
min-height: 100%;
}
body {
max-width: 1000px;
margin-left: auto !important;
margin-right: auto !important;
/*Margin bottom by footer hight*/
margin-bottom: 60px;
}
div.tooltip-inner {
max-width: 25rem;
}
.tooltip {
margin-left: 1rem;
}
.role-filter-form {
max-width: 30rem;
width: auto;
margin-bottom: 1rem;
}
webapp/templates/base.html
+34 -21
View File
@@ -15,11 +15,14 @@
<title>{% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %}</title>
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/css/bootstrap.min.css" integrity="sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd" crossorigin="anonymous">
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<!-- <script src="{% static "js/lib/jquery-3.1.0.min.js" %}"></script> -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js" integrity="sha384-A7FZj7v+d/sdmMqp/nOQwliLvUsJfDHW+k9Omg/a/EheAdgtzNs3hpfag6Ed950n" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
<script src="{% static "js/lib/underscore-min.js" %}"></script>
<!-- <link href="https://fonts.googleapis.com/css?family=Didact+Gothic" rel="stylesheet"> -->
<script>
$(function () {
@@ -29,24 +32,34 @@
</head>
<body>
{% block header %}
<div class="header">
{% include "sik_header.html" %}
</div>
{% endblock %}
<div class="page-content">
{% block navigation %}
{% include "navigation.html" %}
{% endblock %}
{% block content %}
{% endblock %}
</div>
<div class="footer">
{% block footer %}
{% include "footer.html" %}
{% endblock footer %}
<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>
</body>
</html>
webapp/templates/contact.html
+7 -1
View File
@@ -4,7 +4,13 @@
{% load i18n %}
<div class="contact_div">
<h2>{% trans "Contact" %}</h2>
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Contact" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
webapp/templates/event_calendar.html
+7 -1
View File
@@ -4,7 +4,13 @@
{% load i18n %}
<div class="event_calendar_div">
<h2>{% trans "Event calendar" %}</h2>
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Event calendar" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
webapp/templates/freshmen.html
+7 -1
View File
@@ -4,7 +4,13 @@
{% load i18n %}
<div class="freshmen_div">
<h2>{% trans "Freshmen" %}</h2>
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Freshmen" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
webapp/templates/guild.html
+7 -1
View File
@@ -4,7 +4,13 @@
{% load i18n %}
<div class="guild_div">
<h2>{% trans "Kilta" %}</h2>
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Kilta" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
webapp/templates/international.html
+7 -1
View File
@@ -4,7 +4,13 @@
{% load i18n %}
<div class="international_div">
<h2>{% trans "International" %}</h2>
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "International" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
webapp/templates/jobs.html
+7 -1
View File
@@ -4,7 +4,13 @@
{% load i18n %}
<div class="jobs_div">
<h2>{% trans "Jobs" %}</h2>
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Jobs" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}
webapp/templates/main_index.html
+11 -5
View File
@@ -2,10 +2,16 @@
{% load i18n %}
{% block content %}
<h3>HURDURR DUMMY SITE</h3>
<div>
<a href="/members">{% trans "Members" %}</a>
<a href="/infoscreen">{% trans "Infoscreen" %}</a>
<a href="/admin">{% trans "Admin tools" %}</a>
<div class="main_page">
<div class="container">
<div class="row">
<div class="col">
<h3>{% trans "Copyright Aalto-yliopiston Sähköinsinöörikilta ry" %}</h3>
</div>
</div>
<div class="row">
<h5>Lisää vain vesi</h5>
</div>
</div>
</div>
{% endblock %}
webapp/templates/navigation.html
+31 -33
View File
@@ -1,36 +1,34 @@
{% load i18n %}
<link rel="stylesheet" href="/static/css/main_nav.css">
<div class="main_navigation">
<nav class="navbar-border navbar navbar-toggleable-md navbar-light bg-faded">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="/guild">{% trans "Guild" %}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/freshmen">{% trans "Freshmen" %}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/event_calendar">{% trans "Event calendar" %}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/international">{% trans "International" %}</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/sosso">{% trans "Sössö" %}</a>
</li>
<li class="nav-item">
<a class="nav-item nav-link" href="/contact">{% trans "Contact" %}</a>
</li>
<li class="nav-item btn-group">
<a class="dropdown-toggle nav-link" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
<ul class="navbar-nav mx-auto">
<li class="nav-item text-center">
<a class="nav-link" href="/guild">{% trans "Guild" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-link" href="/freshmen">{% trans "Freshmen" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-link" href="/event_calendar">{% trans "Event calendar" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-link" href="/international">{% trans "International" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-link" href="/sosso">{% trans "Sössö" %}</a>
</li>
<li class="nav-item text-center">
<a class="nav-item nav-link" href="/contact">{% trans "Contact" %}</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" id="corpDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% trans "Corporate" %}
</a>
<div class="dropdown-menu" aria-labelledby="corpDropdown">
<a class="dropdown-item" href="/jobs">{% trans "Jobs" %}</a>
<a class="dropdown-item" href="/">Yritysdadaa</a>
<a class="dropdown-item" href="/">Something else here</a>
</div>
</li>
</ul>
</nav>
</div>
</a>
<div class="dropdown-menu" aria-labelledby="corpDropdown">
<a class="dropdown-item" href="/jobs">{% trans "Jobs" %}</a>
<a class="dropdown-item" href="/">Yritysdadaa</a>
<a class="dropdown-item" href="/">Something else here</a>
</div>
</li>
</ul>
</nav>
webapp/templates/sosso.html
+7 -1
View File
@@ -4,7 +4,13 @@
{% load i18n %}
<div class="sosso_div">
<h2>{% trans "Sössö" %}</h2>
<div class="container">
<div class="row">
<div class="col">
<h2>{% trans "Sössö" %}</h2>
</div>
</div>
</div>
</div>
{% endblock %}