Skip to content
Snippets Groups Projects
Commit 7868b5d4 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge remote-tracking branch 'origin/dev' into dev

parents 31624fcf 44fd207d
No related branches found
No related tags found
1 merge request!86Merge school-apps
Hide whitespace changes
Inline Side-by-side
Showing
with 140 additions and 56 deletions
schoolapps/static/common/style.css
+ 80
− 16
View file @ 7868b5d4
......@@ -66,10 +66,51 @@ header a.sidenav-trigger {
z-index: 2;
}
header div.nav-wrapper{
z-index: -5;
}
header, main, footer {
margin-left: 300px;
}
.footer-icon {
font-size: 22px !important;
vertical-align: middle;
}
@media only screen and (min-width: 1384px) {
.footer-row-large {
display: flex;
align-items: center;
}
.footer-row-small {
display: none;
}
}
@media only screen and (max-width: 1383px) {
.footer-row-large {
display: none;
}
.footer-row-small {
display: block;
}
}
ul.footer-ul {
display: inline-block;
text-align: right;
float: right;
}
.make-it-higher {
vertical-align: middle;
line-height: 36px;
}
@media only screen and (max-width: 992px) {
header, main, footer {
margin-left: 0;
......@@ -118,10 +159,12 @@ span.badge .material-icons {
.smart-plan-badge {
margin: 5px 20px 5px 0;
}
li.active > a > .sidenav-badge{
li.active > a > .sidenav-badge {
background-color: whitesmoke !important;
color: #DA3D56 !important;
}
.timetable-plan .row, .timetable-plan .col {
display: flex;
padding: 0 .25rem;
......@@ -232,19 +275,33 @@ table.substitutions td, table.substitutions th {
.btn-timetable-quicklaunch {
margin: 1%;
width: 30%;
background-color: rgba(0,0,0,0.05) !important;
background-color: rgba(0, 0, 0, 0.05) !important;
color: black;
}
.btn-timetable-quicklaunch:hover{
.btn-timetable-quicklaunch:hover {
background-color: #da1f3d !important;
color: whitesmoke;
}
.no-margin {
margin: 0 !important;
margin-left: 0 !important;
margin-right: 0 !important;
margin-top: 0 !important;
margin-bottom: 0 !important;
}
.valign-middle {
vertical-align: middle;
}
.valign-top {
vertical-align: top;
}
.valign-bot {
vertical-align: bottom;
}
.height-inherit {
height: 100%;
}
/* Table*/
......@@ -260,6 +317,10 @@ table.striped > tbody > tr:nth-child(odd) {
display: none;
}
.print-icon {
margin-top: 1.52rem;
}
@media print {
body {
font-size: 15px;
......@@ -450,29 +511,32 @@ i.collapsible-trigger {
background-color: rgba(218, 31, 61, 0.65);
}
.no-margin{
.no-margin {
margin: 0 !important;
}
.no-pad-left{
.no-pad-left {
padding-left: 0 !important;
}
.no-pad-right{
.no-pad-right {
padding-right: 0 !important;
}
.sidenav a:not(.collapsible-header){
.sidenav a:not(.collapsible-header) {
padding: 0 16px;
}
.waves-effect.waves-primary .waves-ripple {
/* The alpha value allows the text and background color
of the button to still show through. */
.waves-effect.waves-primary .waves-ripple {
/* The alpha value allows the text and background color
of the button to still show through. */
background-color: #da1f3d;
}
.sidenav .collapsible-body > ul:not(.collapsible) > li.active a > i, .sidenav.sidenav-fixed .collapsible-body > ul:not(.collapsible) > li.active a > i{
}
.sidenav .collapsible-body > ul:not(.collapsible) > li.active a > i, .sidenav.sidenav-fixed .collapsible-body > ul:not(.collapsible) > li.active a > i {
color: #fff;
}
.sidenav .collapsible-body > ul:not(.collapsible) > li.active, .sidenav.sidenav-fixed .collapsible-body > ul:not(.collapsible) > li.active {
background-color: #DA3D56;
}
......
schoolapps/templates/partials/footer.html
+ 45
− 24
View file @ 7868b5d4
......@@ -2,33 +2,54 @@
<footer class="page-footer primary-color">
{# <div class="container">#}
{# <div class="row no-margin">#}
{# <div class="col l6 s12">#}
{# <h5 class="white-text">SchoolApps</h5>#}
{# <p class="white-text">#}
{# Version 1.0-beta "Aebli"<br>#}
{# Licensed under <a class="blue-text text-lighten-4" href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">GNU GPL 3.0</a>#}
{# </p>#}
{# </div>#}
{# <div class="col l5 offset-l1 s12">#}
{# <h5 class="white-text">Weitere Webdienste</h5>#}
{# <ul class="no-margin">#}
{# <a class="blue-text text-lighten-4 btn-flat no-pad-left" href="https://katharineum-zu-luebeck.de"><i class="material-icons footer-icon left">home</i> Homepage</a>#}
{# <a class="blue-text text-lighten-4 btn-flat" href="https://forum.katharineum.de"><i class="material-icons footer-icon left">cloud</i> Forum</a>#}
{# <a class="blue-text text-lighten-4 btn-flat no-pad-right" href="https://webmail.katharineum.de"><i class="material-icons footer-icon left">email</i> Webmail</a>#}
{# </ul>#}
{# </div>#}
{# </div>#}
{# </div>#}
<div class="container">
<div class="row no-margin footer-row-large">
<div class="col l6 s12 no-pad-left height-inherit">
{# <h5 class="white-text">SchoolApps</h5>#}
<p class="white-text valign-bot no-margin">
Version 1.0.1-dev "Aebli" &middot;
Licensed under <a class="blue-text text-lighten-4"
href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">GNU GPL 3.0</a>
</p>
</div>
<div class="col xl15 l6 offset-xl01 s12 no-pad-right">
{# <h5 class="white-text left">Weitere Webdienste</h5>#}
<ul class="no-margin right">
<a class="blue-text text-lighten-4 btn-flat no-pad-left" href="https://katharineum-zu-luebeck.de"><i
class="material-icons footer-icon left">home</i> Homepage</a>
<a class="blue-text text-lighten-4 btn-flat" href="https://forum.katharineum.de"><i
class="material-icons footer-icon left">cloud</i> Forum</a>
<a class="blue-text text-lighten-4 btn-flat no-pad-right" href="https://webmail.katharineum.de"><i
class="material-icons footer-icon left">email</i> Webmail</a>
</ul>
</div>
</div>
<div class="row no-margin footer-row-small">
<span class="white-text no-margin make-it-higher">
Version 1.0.1-dev "Aebli" &middot;
Licensed under <a class="blue-text text-lighten-4"
href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">GNU GPL 3.0</a>
</span>
<ul class="no-margin footer-ul">
<a class="blue-text text-lighten-4 btn-flat no-pad-left" href="https://katharineum-zu-luebeck.de"><i
class="material-icons footer-icon left">home</i> Homepage</a>
<a class="blue-text text-lighten-4 btn-flat" href="https://forum.katharineum.de"><i
class="material-icons footer-icon left">cloud</i> Forum</a>
<a class="blue-text text-lighten-4 btn-flat no-pad-right" href="https://webmail.katharineum.de"><i
class="material-icons footer-icon left">email</i> Webmail</a>
</ul>
</div>
</div>
<div class="footer-copyright">
<div class="container">
<span class="left">
SchoolApps · Version 1.0.1-dev "Aebli" <br>
© 2018–{% now "Y" %} Computer-AG, Katharineum zu Lübeck ·
Licensed under <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">GNU GPL 3.0</a>
</span>
{# <span class="left">#}
{# SchoolApps · Version 1.0.1-dev "Aebli" <br>#}
{# © 2018–{% now "Y" %} Computer-AG, Katharineum zu Lübeck ·#}
{# Licensed under <a href="http://www.gnu.org/licenses/gpl-3.0-standalone.html">GNU GPL 3.0</a>#}
{# </span>#}
<span class="left">© 2018–{% now "Y" %} Computer-AG, Katharineum zu Lübeck</span>
<span class="right">
<span id="doit"></span>
<a class="blue-text text-lighten-4" href="https://katharineum-zu-luebeck.de/impressum/">Impressum</a>
·
......
schoolapps/templates/partials/header.html
+ 3
− 3
View file @ 7868b5d4
......@@ -98,7 +98,7 @@
<!-- Nav bar (logged in as, logout) -->
<nav class="primary-color">
<a class="brand-logo" href="#">SchoolApps</a>
<a class="brand-logo" href="/">SchoolApps</a>
<div class="nav-wrapper">
<ul id="nav-mobile" class="right hide-on-med-and-down">
......@@ -117,7 +117,7 @@
<img src="{% static 'common/logo.png' %}">
</div>
<div class="col s6 right-align">
<strong>SchoolApps</strong><br>
<a href="/"><strong>SchoolApps</strong></a><br>
Katharineum zu Lübeck
</div>
</div>
......@@ -210,7 +210,7 @@
<i class="material-icons">grid_on</i> Alle Pläne
</a>
</li>
<li id="timetable_substitutions">
<li id="timetable_substitutions_date">
<a href="{% url 'timetable_substitutions' %}">
<i class="material-icons">update</i> Vertretungsplan
</a>
......
schoolapps/timetable/templates/timetable/hintsinplan.html
+ 5
− 7
View file @ 7868b5d4
......@@ -39,9 +39,9 @@
{% endif %}
{{ hints_b|length }}
{% if hints %}
weitere(n)
weitere{{ hints_b|pluralize:"n," }}
{% endif %}
Hinweis(e).
Hinweis{{ hints_b|pluralize:"e" }}.
<i class="material-icons right collapsible-trigger"></i>
</div>
</div>
......@@ -50,12 +50,10 @@
{% if not hint.teachers %}
<div>
<strong>
{{ hint.classes.all|join:", " }},
{{ hint.classes_formatted }},
</strong>
{{ hint.from_date|date:"D, d.m." }},
{% if hint.from_date != hint.to_date %}
bis {{ hint.to_date|date:"D, d.m." }}
{% endif %}:
{{ hint.from_date|date:"D, d.m." }}{% if hint.from_date != hint.to_date %}, bis
{{ hint.to_date|date:"D, d.m." }}{% endif %}:
{{ hint.text|safe_markdown }}
</div>
{% endif %}
......
schoolapps/timetable/templates/timetable/hintsinsub.html
+ 3
− 2
View file @ 7868b5d4
......@@ -4,7 +4,8 @@
<li>
<div class="collapsible-header " style="font-size: 16px;">
<div class="col s12">
<i class="material-icons left">announcement</i>Es gibt {{ hints|length }} Hinweis(e) für diesen Tag.
<i class="material-icons left">announcement</i>Es gibt {{ hints|length }}
Hinweis{{ hints|pluralize:"e" }} für diesen Tag.
<i class="material-icons right collapsible-trigger"></i>
</div>
</div>
......@@ -12,7 +13,7 @@
{% for hint in hints %}
<div>
<strong>
{{ hint.classes.all|join:", " }}{% if hint.teachers and hint.classes.all %},{% endif %}
{{ hint.classes_formatted }}{% if hint.teachers and hint.classes.all %},{% endif %}
</strong>
{% if hint.teachers %}
<span class="badge new green no-float no-margin">Lehrkräfte</span>
......
schoolapps/timetable/templates/timetable/substitution.html
+ 4
− 4
View file @ 7868b5d4
......@@ -7,10 +7,10 @@
<main>
<div class="row no-margin">
<div class="col s12 m6">
<div class="col s10 m6">
<h4>Vertretungen</h4>
</div>
<div class="col s12 m6 right align-right">
<div class="col s2 m6 right align-right print-icon">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right"
href="
{% if debug %}
......@@ -32,7 +32,7 @@
{% for row in header_info.rows %}
<div class="row no-margin">
<div class="col s3">
<strong>{{ row.0 }}</strong>
<strong class="truncate">{{ row.0 }}</strong>
</div>
<div class="col s9">
{{ row.1 }}
......@@ -50,7 +50,7 @@
</div>
</div>
<h5>{{ date|date:"l, j. F Y" }}</h5>
<h5 class="hide-on-small-and-down">{{ date|date:"l, j. F Y" }}</h5>
<table class="substitutions striped">
<thead>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment