Merge branch 'master' of ssh://git.wiai.de:22222/mgoetz/roofis2

This commit is contained in:
Götz 2018-06-08 22:30:45 +02:00
commit 97ed915086
7 changed files with 45 additions and 14 deletions

View File

@ -4,4 +4,6 @@ from . import views
app_name = 'roomservice'
urlpatterns = [
path('', views.home, name='home'),
path('admin', views.admin, name='admin'),
path('booking', views.booking, name='booking'),
]

View File

@ -3,4 +3,13 @@ from django.shortcuts import render
# Create your views here.
def home(request):
return render(request, 'base.jinja', {})
return render(request, 'search.jinja', {"title":"rooF(i)S is love rooF(i)S is live!!"})
def booking(request):
return render(request, 'booking.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!"})
def admin(request):
return render(request, 'admin.jinja', {"title": "rooF(i)S is love rooF(i)S is live!!"})

View File

@ -0,0 +1,10 @@
{% extends 'base.jinja' %}
{% block content %}
<h1>Ressourcenpool Bamberg</h1>
<p><strong>Impressum</strong></p>
<p>Anbieter:<br />Max Mustermann<br />Musterstraße 1<br />96049 Bamberg</p>
<p>Kontakt:<br />Telefon: 0951/12345678<br />Telefax: 0951/1234567<br />E-Mail: mail@mustermann.de<br />Website: www.mustermann.de</p>
<p> </p>
<p>Bei redaktionellen Inhalten:</p>
<p>Verantwortlich nach § 55 Abs.2 RStV<br />Moritz Schreiberling<br />Musterstraße 2<br />96049 Bamberg</p>
{% endblock %}

View File

@ -6,7 +6,7 @@
{% block css_extra %}{% endblock %}
{% block head %}
<!--<link rel="stylesheet" href="./static/style.css" />-->
<title>{% block title %}{% endblock %} Ressourcenpool Bamberg</title>
<title>{% block title %}{% endblock %}</title>
{% endblock %}
<script src="{{ static('js/script.js') }}"></script>
{% block js_extra %}{% endblock %}
@ -18,7 +18,6 @@
<script src="{{ static('libs/bootstrap-4.1.0/dist/js/bootstrap.min.js') }}"></script>
</head>
<body class="container-fluid">
{{ nav.main_nav() }}
<div class="row bg-secondary mb-2">
<div class="col-12">
<h1 class="text-center h3">
@ -26,12 +25,13 @@
</h1>
</div>
</div>
{{ nav.main_nav() }}
<div id="content" class="row">
{% block content %}{% endblock %}
</div>
<div id="footer">
{% block footer %}
&copy; 2018 Ressourcenpool Bamberg.
&copy; 2018 rooF(i)S.
{% endblock %}
</div>
</body>

View File

@ -0,0 +1,10 @@
{% extends 'base.jinja' %}
{% block content %}
<h1>Ressourcenpool Bamberg</h1>
<p><strong>Impressum</strong></p>
<p>Anbieter:<br />Max Mustermann<br />Musterstraße 1<br />96049 Bamberg</p>
<p>Kontakt:<br />Telefon: 0951/12345678<br />Telefax: 0951/1234567<br />E-Mail: mail@mustermann.de<br />Website: www.mustermann.de</p>
<p> </p>
<p>Bei redaktionellen Inhalten:</p>
<p>Verantwortlich nach § 55 Abs.2 RStV<br />Moritz Schreiberling<br />Musterstraße 2<br />96049 Bamberg</p>
{% endblock %}

View File

@ -1,10 +1,5 @@
{% macro main_nav() -%}
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="{{ url('roomservice:home') }}">Respool</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
@ -12,11 +7,6 @@
<a class="nav-link" href="{{ url('roomservice:home') }}">Home <span class="sr-only">(current)</span></a>
</li>
</ul>
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</form>
</div>
</nav>
{% endmacro %}

View File

@ -0,0 +1,10 @@
{% extends "base.jinja" %}
{% block content %}
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</form>
{% endblock %}