Commit e54888f2 authored by Robin Sonnabend's avatar Robin Sonnabend

Added bootstrap as CSS

parent b5e133fc
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
body {
font-family: sans-serif;
}
.header {
border-bottom: 1px solid black;
padding: 4px;
font-size: 16pt;
margin-bottom: 1pc;
}
.header > p {
display: inline;
}
.header-title {
font-weight: bold;
}
.header-link {
}
.footer {
border-top: 1px solid black;
padding: 4px;
font-size: 10pt;
margin-top: 1pc;
width: 100%;
}
.footer > p {
display: inline;
}
.footer-text {
}
.footer-link {
}
.main {
max-width: 940px;
margin: 0px auto;
}
.main > p {
margin: 0px;
padding: 0.5ex;
display: inline-block;
}
.title {
font-size: 16pt;
}
.form {
background-color: #eee;
padding: 1ex;
border: 1px dashed gray;
}
.form-title {
font-size: 16pt;
margin-bottom: 3pt;
border-bottom: 1px solid black;
}
.form-field {
font-size: 12pt;
margin: 2pt;
}
.form-label {
font-size: 12pt;
display: inline-block;
min-width: 100px;
}
.form-textareafield > textarea {
width: 50%;
min-width: 350px;
max-width: 100%;
height: 150px;
}
.form-errors {
font-size: 10pt;
color: darkred;
}
.form-errors-entry {
margin: 0px;
}
.section {
margin-top: 1ex;
margin-bottom: 1ex;
background-color: #eee;
padding: 1ex;
border: 1px dashed gray;
}
.section > p {
display: inline;
}
.section-title {
font-weight: bold;
font-size: 14pt;
}
.table {
border-spacing: 0px;
border-collapse: collapse;
text-align: center;
}
.table-header {
font-size: 13pt;
}
.table-body > tr > td {
border-right: 1px solid gray;
border-left: 1px solid gray;
padding-left: 5px;
padding-right: 5px;
}
.table-body > tr:first-child {
border-top: 1px solid gray;
}
.table-body > tr:last-child {
border-bottom: 1px solid gray;
}
.table-body > tr:nth-child(odd) {
background-color: #fefefe;
}
.table-body > tr:nth-child(even) {
background-color: #f0f0f0;
padding-top: 65px;
}
.alert {
......@@ -160,27 +19,4 @@ body {
color: #808000;
}
.mail-content {
white-space: pre;
}
.imprint-header {
font-weight: bold;
}
.imprint > div {
}
.privacy-title {
font-weight: bold;
font-size: 14pt;
}
.privacy-content {
}
.pad-content {
width: 100%;
}
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
require('../../js/transition.js')
require('../../js/alert.js')
require('../../js/button.js')
require('../../js/carousel.js')
require('../../js/collapse.js')
require('../../js/dropdown.js')
require('../../js/modal.js')
require('../../js/tooltip.js')
require('../../js/popover.js')
require('../../js/scrollspy.js')
require('../../js/tab.js')
require('../../js/affix.js')
\ No newline at end of file
......@@ -88,7 +88,7 @@ def parse_protocol_async(protocol_id, encoded_kwargs):
db.session.commit()
return
old_todos = list(protocol.todos)
for todo in old_todos
for todo in old_todos:
protocol.todos.remove(todo)
db.session.commit()
tags = tree.get_tags()
......@@ -133,7 +133,7 @@ def parse_protocol_async(protocol_id, encoded_kwargs):
todo.tags = ";".join(todo_tags_internal)
db.session.commit()
old_decisions = list(protocol.decisions)
for decision in old_decisions
for decision in old_decisions:
protocol.decisions.remove(decision)
db.session.commit()
decision_tags = [tag for tag in tags if tag.name == "beschluss"]
......
{% extends "layout.html" %}
{% extends "layout-bootstrap.html" %}
{% block title %}Hauptseite{% endblock %}
{% block content %}
......
......@@ -3,24 +3,40 @@
<head>
{% block head %}
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Protokollsystem" />
<link rel="stylesheet" href="{{ url_for("static", filename="css/style.css") }}" />
<link rel="stylesheet" href="{{url_for("static", filename="css/bootstrap.min.css")}}">
<link rel="stylesheet" href="{{url_for("static", filename="css/style.css")}}" />
{% block additional_js %}
{% endblock %}
<title>{% block title %}Unbenannte Seite{% endblock %} - Protokollsystem</title>
{% endblock %}
</head>
<body>
<div class="header">
<p class="header-title"><a href="{{ url_for("index") }}">Protokollsystem</a></p>
{% block additional_links %}
{% endblock %}
</div>
<div class="main">
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Protokolle</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="{{url_for("index")}}">Zuhause</a></li>
{# todo: add more links #}
</ul>
</div>
</div>
</nav>
<div class="container">
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
{% for category, message in messages %}
<div class="section alert {{ category }}">
<div class="alert {{ category }}">
{{ message }}
</div>
{% endfor %}
......@@ -29,13 +45,8 @@
{% block content %}
Diese Seite ist leer.
{% endblock %}
{% block footer %}
<div class="footer">
<p class="footer-text">System zur Erstellung und Verwaltung von Sitzungsprotokollen, entwickelt von Robin Sonnabend</p>
<p class="footer-link"><a href="{{ url_for("imprint") }}">Impressum</a></p>
<p class="footer-link"><a href="{{ url_for("contact") }}">Kontakt</a></p>
<p class="footer-link"><a href="{{ url_for("privacy") }}">Datenschutzerklärung</a></p>
</div>
{% endblock %}
</div>
<script src="{{url_for("static", filename="js/jquery.min.js")}}"></script>
<script src="{{url_for("static", filename="js/bootstrap.min.js")}}"></script>
</body>
<!doctype html>
<html>
<head>
{% block head %}
<meta charset="utf-8" />
<meta name="description" content="Protokollsystem" />
<link rel="stylesheet" href="{{ url_for("static", filename="css/style.css") }}" />
{% block additional_js %}
{% endblock %}
<title>{% block title %}Unbenannte Seite{% endblock %} - Protokollsystem</title>
{% endblock %}
</head>
<body>
{#
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
{% for category, message in messages %}
<div class="section alert {{ category }}">
{{ message }}
</div>
{% endfor %}
{% endif %}
{% endwith %}
#}
{% block content %}
Diese Seite ist leer.
{% endblock %}
</body>
{% extends "layout_simple.html" %}
{% block title %}Pad - Padname?{% endblock %}
{% block additional_js %}
<script src="{{ url_for("static", filename="js/socket_io.js") }}"></script>
<script src="{{ url_for("static", filename="js/pad.js") }}"></script>
{% endblock %}
{% block content %}
<div id="padarea" class="pad-content">
</div>
{% endblock %}
Markdown is supported
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