diff --git a/resources/assets/less/metager/base.less b/resources/assets/less/metager/base.less
index 1dfecf33935e3b23253d324a140d98dce36e2530..41727f7011f79a63b4f115737d57a9102f18fd58 100644
--- a/resources/assets/less/metager/base.less
+++ b/resources/assets/less/metager/base.less
@@ -7,13 +7,51 @@
@aufruf-winter-aufruf-action-btn-hover-border-color: @base-aufruf-winter-border-color;
@aufruf-winter-quicktip-border-color: @base-aufruf-winter-color!important;
@new-feature-badge-background-color: @base-new-feature-badge-background-color;
+
body {
background-color: @body-background-color;
- background-attachment: fixed;
+ display: flex;
+ flex-direction: column;
+}
+
+header {
+ width: 100%;
+ padding: 5px;
+ background-color: white;
+ border-bottom: 1px grey solid;
+}
+
+.content {
+ width: 100%;
+ background-color: white;
+ flex-grow: 1;
+}
+
+a {
+ &,
+ &:link,
+ &:visited,
+ &:active,
+ &:focus,
+ &:hover {
+ text-decoration: none;
+ }
+ &,
+ &:link {
+ color: inherit;
+ }
+ &:visited {
+ color: rgb(143, 0, 172);
+ }
+ &:active,
+ &:focus,
+ &:hover {
+ color: rgb(136, 0, 0);
+ }
}
-body#resultBody {
- background-image: inherit;
+.image-box {
+ display: flex;
}
summary {
diff --git a/resources/assets/less/metager/footer.less b/resources/assets/less/metager/footer.less
index 456b611de99caa3b00293928dd36b54e1ffb831f..bad9d4dc0f21a09f5b3c7e121fa63cb269aa5232 100644
--- a/resources/assets/less/metager/footer.less
+++ b/resources/assets/less/metager/footer.less
@@ -1,11 +1,14 @@
footer {
- margin: 10px 0px 30px 0px;
+ padding: 5px;
width: 100%;
+ background-color: white;
+ border-top: 1px solid grey;
display: flex;
justify-content: space-around;
white-space: pre-line;
- align-items: flex-end;
+ align-items: center;
div {
+ display: flex;
text-align: center;
margin-left: 10px;
&:first-child {
@@ -16,8 +19,14 @@ footer {
max-width: 100%;
}
&.startPageFooter {
- position: absolute;
- bottom: 0;
+ #info {
+ display: flex;
+ flex-direction: column;
+ p {
+ margin: 0px;
+ line-height: 10px;
+ }
+ }
}
&.footer-resultpage {
justify-content: center;
diff --git a/resources/assets/less/metager/start-page.less b/resources/assets/less/metager/start-page.less
index cc84b56330c079d65cc9a463e5a06a9b519a3579..a933eebad53ce0c7d6cb55360361f42ce844d187 100644
--- a/resources/assets/less/metager/start-page.less
+++ b/resources/assets/less/metager/start-page.less
@@ -1,4 +1,6 @@
-@search-bar-width: 1000px;
+.modal {
+ display: none;
+}
.mg-panel {
@media(max-width: @search-bar-width) {
@@ -77,6 +79,7 @@
flex-grow: 1;
input {
border: none;
+ width: 100%;
height: 40px;
&:focus {
outline-color: rgb(255, 128, 0);
diff --git a/resources/assets/less/metager/static-pages.less b/resources/assets/less/metager/static-pages.less
index ef0ef84b2f4523c22469045a7469adfdb211741a..f55b929ba48d58e7eba9e457de84ec4cab158941 100644
--- a/resources/assets/less/metager/static-pages.less
+++ b/resources/assets/less/metager/static-pages.less
@@ -42,13 +42,6 @@ body {
}
}
-.wrapper {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- height: 100%;
-}
-
ul.startpage {
list-style-type: none;
}
@@ -474,14 +467,6 @@ a.content.hidden-xs {
color: @a-content-hidden-xs-color;
}
-a.navbar-brand {
- line-height: 100%!important;
- padding: 0;
- position: absolute;
- z-index: 5;
- left: 10px;
-}
-
.logo {
height: 30px!important;
&>h1 {
@@ -556,13 +541,13 @@ main ul li:not(.lslide) {
margin-top: 10px;
}
-fieldset input[type=text] {
+/*fieldset input[type=text] {
width: 100%;
padding-left: 10px;
padding-right: 10px;
border-width: 1px;
overflow: visible;
-}
+}*/
main fieldset {
border: 0;
diff --git a/resources/assets/less/variables-default.less b/resources/assets/less/variables-default.less
index dae35def288ff2768d6aa1be033066b3de478aee..3de66d597991db6f257cf6d1bbe9b0a610055cfc 100644
--- a/resources/assets/less/variables-default.less
+++ b/resources/assets/less/variables-default.less
@@ -18,9 +18,7 @@ sans-serif;
//** Link hover decoration.
@link-hover-decoration: underline;
@font-size-base: 14px;
-@screen-md: 992px;
@container-desktop: (920px + @grid-gutter-width);
-@screen-lg: 1440px;
@container-large-desktop: (1370px + @grid-gutter-width);
//** Point at which the navbar becomes uncollapsed.
@grid-float-breakpoint: 865px;
@@ -38,4 +36,8 @@ sans-serif;
@screen-xs-max: (@screen-sm-min - 1);
@screen-sm-max: (@screen-md-min - 1);
@screen-md-max: (@screen-lg-min - 1);
-@grid-gutter-width: 30px;
\ No newline at end of file
+@grid-gutter-width: 30px;
+
+/* Other sizes */
+
+@search-bar-width: 1000px;
\ No newline at end of file
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index cb8816352d1c5c68d19da66cce363e7cc3107fde..8cc2ae522ce6686f94b93eef5bd0b798b687e739 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -1,6 +1,6 @@
@extends('layouts.indexPage')
-@section('title', $title )
+@section('title', $title)
@section('content')
<div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
@@ -134,7 +134,7 @@
</div>
</div>
</div>
- <div id="create-focus-modal" class="modal fade" tab-index="-1" role="dialog">
+ <div class="modal fade" id="create-focus-modal" tab-index="-1" role="dialog">
<div class="modal-dialog modal-lg">
<div class="content modal-content">
<div class="modal-header">
@@ -203,7 +203,10 @@
</div>
</div>
</div>
- <h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
+ <div>
+ <h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
+ </div>
+ <div>
<fieldset>
<form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
<div class="search-bar">
@@ -251,6 +254,8 @@
</div>
</form>
</fieldset>
+ </div>
+ <div>
<ul class="list-inline searchform-bonus hidden">
<li id="plug"
@unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge' || $browser === 'Safari' || $browser === 'Vivaldi')
@@ -265,6 +270,7 @@
</li>
@endif
</ul>
+ </div>
<script src="{{ elixir('js/scriptStartPage.js') }}"></script>
@endsection
diff --git a/resources/views/layouts/alerts.blade.php b/resources/views/layouts/alerts.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..57e786080517f77e8be63efe1eb6c886f5a72f83
--- /dev/null
+++ b/resources/views/layouts/alerts.blade.php
@@ -0,0 +1,12 @@
+@if (isset($success))
+ <div class="alert alert-success" role="alert">{{ $success }}</div>
+@endif
+@if (isset($info))
+ <div class="alert alert-info" role="alert">{{ $info }}</div>
+@endif
+@if (isset($warning))
+ <div class="alert alert-warning" role="alert">{{ $warning }}</div>
+@endif
+@if (isset($error))
+ <div class="alert alert-danger" role="alert">{{ $error }}</div>
+@endif
\ No newline at end of file
diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php
index 6775079e500e36cf1e8ccb5a655aa703773f7c8a..b3b8bd96fa53bc3fdbd74f8766002ce318ebdd88 100644
--- a/resources/views/layouts/footer.blade.php
+++ b/resources/views/layouts/footer.blade.php
@@ -1,25 +1,27 @@
@if ($type === 'startpage' || $type === 'subpage')
-<footer class="{{ $id }} noprint">
<div>
- <a href="https://www.suma-ev.de/" >
- <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo"></a>
+ <a class="image-box" href="https://www.suma-ev.de/">
+ <img src="/img/suma_ev_logo-m1-greyscale.png" alt="SUMA-EV Logo">
+ </a>
</div>
<div id="info">
- <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
- {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
+ <p>
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
+ </p>
+ <p>
+ {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
+ </p>
</div>
<div>
- <a href="https://www.uni-hannover.de/" >
- <img src="/img/luh_metager.png" alt="LUH Logo"></a>
+ <a class="image-box" href="https://www.uni-hannover.de/">
+ <img src="/img/luh_metager.png" alt="LUH Logo">
+ </a>
</div>
-</footer>
@elseif ($type === 'resultpage')
-<footer class="footer-resultpage">
<div>
<a class="btn btn-default" href="/">{!! trans('resultPage.startseite') !!}</a>
</div>
<div>
<a class="btn btn-default" href="/impressum/">{!! trans('resultPage.impressum') !!}</a>
</div>
-</footer>
@endif
\ No newline at end of file
diff --git a/resources/views/layouts/header.blade.php b/resources/views/layouts/header.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..3667801fbef3dcec8414da05471c601d108b0493
--- /dev/null
+++ b/resources/views/layouts/header.blade.php
@@ -0,0 +1 @@
+@yield('homeIcon')
\ No newline at end of file
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 7ba67be178284ef3ff0b17a844dc75ae7fd6dd6f..abbcfb511aa004b18ee4e0ae2082dcd08c29b9b8 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -33,30 +33,25 @@
</head>
<body>
<header>
- @yield('homeIcon')
+ @include('layouts.header')
</header>
@include('layouts.sidebar', ['id' => 'staticPagesSideBar'])
- <div class="wrapper">
- <main class="mg-panel container">
- @if (isset($success))
- <div class="alert alert-success" role="alert">{{ $success }}</div>
- @endif
- @if (isset($info))
- <div class="alert alert-info" role="alert">{{ $info }}</div>
- @endif
- @if (isset($warning))
- <div class="alert alert-warning" role="alert">{{ $warning }}</div>
- @endif
- @if (isset($error))
- <div class="alert alert-danger" role="alert">{{ $error }}</div>
- @endif
+ <div class="content">
+ @include('layouts.alerts')
+ <main>
@yield('content')
</main>
@yield('optionalContent')
- @if (isset($page) && $page === 'startpage') @include('layouts.footer', ['type' => 'startpage', 'id' => 'startPageFooter'])
- @else @include('layouts.footer', ['type' => 'subpage', 'id' => 'subPageFooter'])
- @endif
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
</div>
+ @if (isset($page) && $page === 'startpage')
+ <footer class="noprint startPageFooter">
+ @include('layouts.footer', ['type' => 'startpage', 'id' => 'startPageFooter'])
+ </footer>
+ @else
+ <footer class="noprint">
+ @include('layouts.footer', ['type' => 'subpage', 'id' => 'subPageFooter'])
+ </footer>
+ @endif
</body>
</html>