diff --git a/resources/assets/less/metager/footer.less b/resources/assets/less/metager/footer.less
index 456b611de99caa3b00293928dd36b54e1ffb831f..c0ce28d1047d32c65c7ce31ba213db617b8ac272 100644
--- a/resources/assets/less/metager/footer.less
+++ b/resources/assets/less/metager/footer.less
@@ -1,6 +1,7 @@
footer {
- margin: 10px 0px 30px 0px;
+ padding: 5px 5px 15px 5px;
width: 100%;
+ background-color: white;
display: flex;
justify-content: space-around;
white-space: pre-line;
diff --git a/resources/assets/less/metager/start-page.less b/resources/assets/less/metager/start-page.less
index cc84b56330c079d65cc9a463e5a06a9b519a3579..7cb529801eb83d6d1c6b2aecc0f8f84c4e95ed29 100644
--- a/resources/assets/less/metager/start-page.less
+++ b/resources/assets/less/metager/start-page.less
@@ -1,5 +1,4 @@
@search-bar-width: 1000px;
-
.mg-panel {
@media(max-width: @search-bar-width) {
width: 100%;
@@ -14,7 +13,7 @@
align-items: stretch;
font-size: 16px;
background-color: white;
- > * {
+ >* {
border: 1px solid #aaa;
background-color: transparent;
&:not(:first-child) {
diff --git a/resources/assets/less/metager/static-pages.less b/resources/assets/less/metager/static-pages.less
index ef0ef84b2f4523c22469045a7469adfdb211741a..7c9e1b676a3b4f7033145984111434e14f4d4f02 100644
--- a/resources/assets/less/metager/static-pages.less
+++ b/resources/assets/less/metager/static-pages.less
@@ -46,7 +46,6 @@ body {
display: flex;
flex-direction: column;
justify-content: space-between;
- height: 100%;
}
ul.startpage {
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index cb8816352d1c5c68d19da66cce363e7cc3107fde..a2ebc70dea1c51c04fe1accc67934514fb65341d 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -3,206 +3,7 @@
@section('title', $title )
@section('content')
- <div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
- <div class="modal-dialog ">
- <div class="content modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
- <span aria-hidden="true">×</span>
- </button>
- <h4>
- @if ($browser === 'Firefox' || $browser === 'Mozilla')
- {{ trans('index.plugin.head.1') }}
- @elseif ($browser === 'Chrome')
- {{ trans('index.plugin.head.2') }}
- @elseif ($browser === 'Opera')
- {{ trans('index.plugin.head.3') }}
- @elseif ($browser === 'IE')
- {{ trans('index.plugin.head.4') }}
- @elseif ($browser === 'Edge')
- {{ trans('index.plugin.head.5') }}
- @elseif ($browser === 'Safari')
- {{ trans('index.plugin.head.6') }}
- @elseif ($browser === 'Vivaldi')
- {{ trans('index.plugin.head.6') }}
- @else
- $(".seperator").addClass("hidden");
- @endif
- </h4>
- <p class="text-muted">{{ trans('index.plugin.head.info') }}</p>
- </div>
- <div class="modal-body">
- @if ($browser === 'Firefox' || $browser === 'Mozilla')
- <ol>
- <li>{{ trans('index.plugin.firefox.1') }}<img src="/img/Firefox.png" width="100%" /></li>
- <li>{{ trans('index.plugin.firefox.2') }}<img src="/img/Firefox_Standard.png" width="100%" /></li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.firefox.3', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.firefox.4') !!}</li>
- <li>{!! trans('index.plugin.firefox.5') !!}</li>
- </ol>
- @elseif ($browser === 'Chrome')
- <ol>
- <li>{!! trans('index.plugin.chrome.1') !!}</li>
- <li>{!! trans('index.plugin.chrome.2') !!}</li>
- <li>{{ trans('index.plugin.chrome.3') }}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.chrome.4', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.chrome.5') !!}</li>
- <li>{!! trans('index.plugin.chrome.6') !!}</li>
- <li>{!! trans('index.plugin.chrome.7') !!}</li>
- <li>{!! trans('index.plugin.chrome.8') !!}</li>
- </ol>
- @elseif ($browser === 'Opera')
- <ol>
- <li>{!! trans('index.plugin.opera.1') !!}</li>
- <li>{!! trans('index.plugin.opera.2') !!}</li>
- <li>{!! trans('index.plugin.opera.3') !!}</li>
- <li>{!! trans('index.plugin.opera.4') !!}</li>
- <li><small>{!! trans('index.plugin.opera.5') !!}</small>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.opera.6', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.opera.7') !!}</li>
- <li>{!! trans('index.plugin.opera.8') !!}</li>
- <li>{!! trans('index.plugin.opera.9') !!}</li>
- <li>{!! trans('index.plugin.opera.10') !!}</li>
- </ol>
- @elseif ($browser === 'IE')
- <ol>
- <li>{!! trans('index.plugin.IE.1') !!}</li>
- <li>{!! trans('index.plugin.IE.4') !!} (<i class="fa fa-cog" aria-hidden="true"></i>)</li>
- <li>{!! trans('index.plugin.IE.5') !!}</li>
- <li>{!! trans('index.plugin.IE.6') !!}</li>
- <li>{!! trans('index.plugin.IE.7') !!}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.IE.8', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.IE.9') !!}</li>
- <li>{!! trans('index.plugin.IE.10') !!}</li>
- <li>{!! trans('index.plugin.IE.11') !!}</li>
- </ol>
- @elseif ($browser === 'Edge')
- <ol>
- <li>{!! trans('index.plugin.edge.1') !!}<i class="fa fa-ellipsis-h" aria-hidden="true"></i>{!! trans('index.plugin.edge.2') !!}</li>
- <li>{!! trans('index.plugin.edge.3') !!}</li>
- <li>{!! trans('index.plugin.edge.4') !!}</li>
- <li>{!! trans('index.plugin.edge.5') !!}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.edge.6', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.edge.7') !!}</li>
- <li>{!! trans('index.plugin.edge.8') !!}</li>
- <li>{!! trans('index.plugin.edge.9') !!}</li>
- <li>{!! trans('index.plugin.edge.10') !!}</li>
- <li>{!! trans('index.plugin.edge.11') !!}</li>
- </ol>
- @elseif ($browser === 'Safari')
- <ol>
- <li>{!! trans('index.plugin.safari.1') !!}</li>
- <li>{!! trans('index.plugin.safari.2') !!}</li>
- <li>{!! trans('index.plugin.safari.3') !!}</li>
- <li>{!! trans('index.plugin.safari.4') !!}</li>
- </ol>
- @elseif ($browser === 'Vivaldi')
- <ol>
- <li>{!! trans('index.plugin.vivaldi.1') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.2') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.3') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.4') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.5') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.6') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.7') !!}</li>
- </ol>
- <hr />
- <h4>{!! trans('index.plugin.vivaldi.8', ['browser' => $browser]) !!}</h4>
- <ol>
- <li>{!! trans('index.plugin.vivaldi.9') !!}</li>
- <li>{!! trans('index.plugin.vivaldi.10') !!}</li>
- </ol>
- @endif
- <hr>
- <p>@lang('index.plugin.faq.1')<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/faq#mg-plugin") }}">@lang('index.plugin.faq.2')</a></p>
- </div>
- </div>
- </div>
- </div>
- <div id="create-focus-modal" class="modal fade" tab-index="-1" role="dialog">
- <div class="modal-dialog modal-lg">
- <div class="content modal-content">
- <div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
- <span aria-hidden="true">×</span>
- </button>
- <h4>
- @lang("index.focus-creator.head")
- </h4>
- <p class="text-muted">@lang("index.focus-creator.description")</p>
- </div>
- <div class="modal-body">
- <div class="clearfix">
- <div class="pull-left">
- <label for="focus-name">@lang('index.focus-creator.focusname')</label>
- <input id="focus-name" type="text" name="focus-name" placeholder="@lang('index.focus-creator.name-placeholder')">
- <input id="original-id" type="hidden" name="original-id" value="">
- </div>
- <div class="settings-modal-buttons pull-right">
- <button class="delete-focus-btn btn btn-danger">
- @lang('index.focus-creator.delete')
- </button>
- <button class="save-focus-btn btn btn-primary">
- @lang('index.focus-creator.save')
- </button>
- </div>
- </div>
- {{--
- <h2>{!! trans('settings.suchmaschinen.1') !!} <small><button type="button" class="btn btn-link allUnchecker hide">{!! trans('settings.suchmaschinen.2') !!}</button></small></h2>
- --}}
- @foreach( $foki as $fokus => $sumas )
- <div class="headingGroup {{ $fokus }}">
- <h3 class="focus-category">
- @lang("settings.foki." . $fokus)
- {{--
- <small>
- <button type="button" class="checker btn btn-link hide" data-type="{{ $fokus }}">{!! trans('settings.suchmaschinen.3') !!}</button>
- </small>
- --}}
- </h3>
- <div class="row">
- @foreach( $sumas as $name => $data )
- <div class="col-sm-6 col-md-4 col-lg-3">
- <div class="checkbox settings-checkbox">
- <label>
- <input type="checkbox" name="engine_{{ $name }}" class="focusCheckbox" @if ($fokus == 'web') checked @endif >{{ $data['displayName'] }}
- <a class="settings-icon" target="_blank" rel="noopener" href="{{ $data['url'] }}"><i class="fa fa-link" aria-hidden="true"></i></a>
- </label>
- </div>
- </div>
- @endforeach
- </div>
- </div>
- @endforeach
- <div class="clearfix">
- <div class="settings-modal-buttons pull-right">
- <button class="delete-focus-btn btn btn-danger">
- @lang('index.focus-creator.delete')
- </button>
- <button class="save-focus-btn btn btn-primary">
- @lang('index.focus-creator.save')
- </button>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
+ @include('modals.create-focus-modal')
<h1 id="mglogo"><a class="hidden-xs" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">MetaGer</a></h1>
<fieldset>
<form id="searchForm" method={{ $request }} action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
diff --git a/resources/views/modals/create-focus-modal.blade.php b/resources/views/modals/create-focus-modal.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..ed5b3e0d64f2e5727168327c08365502741249b2
--- /dev/null
+++ b/resources/views/modals/create-focus-modal.blade.php
@@ -0,0 +1,73 @@
+<div id="create-focus-modal" class="modal fade" tab-index="-1" role="dialog">
+ <div class="modal-dialog modal-lg">
+ <div class="content modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ <h4>
+ @lang("index.focus-creator.head")
+ </h4>
+ <p class="text-muted">@lang("index.focus-creator.description")</p>
+ </div>
+ <div class="modal-body">
+ <div class="clearfix">
+ <div class="pull-left">
+ <label for="focus-name">@lang('index.focus-creator.focusname')</label>
+ <input id="focus-name" type="text" name="focus-name" placeholder="@lang('index.focus-creator.name-placeholder')">
+ <input id="original-id" type="hidden" name="original-id" value="">
+ </div>
+ <div class="settings-modal-buttons pull-right">
+ <button class="delete-focus-btn btn btn-danger">
+ @lang('index.focus-creator.delete')
+ </button>
+ <button class="save-focus-btn btn btn-primary">
+ @lang('index.focus-creator.save')
+ </button>
+ </div>
+ </div>
+ {{--
+ <h2>{!! trans('settings.suchmaschinen.1') !!}
+ <small>
+ <button type="button" class="btn btn-link allUnchecker hide">{!! trans('settings.suchmaschinen.2') !!}</button>
+ </small>
+ </h2>
+ --}} @foreach( $foki as $fokus => $sumas )
+ <div class="headingGroup {{ $fokus }}">
+ <h3 class="focus-category">
+ @lang("settings.foki." . $fokus) {{--
+ <small>
+ <button type="button" class="checker btn btn-link hide" data-type="{{ $fokus }}">{!! trans('settings.suchmaschinen.3') !!}</button>
+ </small>
+ --}}
+ </h3>
+ <div class="row">
+ @foreach( $sumas as $name => $data )
+ <div class="col-sm-6 col-md-4 col-lg-3">
+ <div class="checkbox settings-checkbox">
+ <label>
+ <input type="checkbox" name="engine_{{ $name }}" class="focusCheckbox" @if ($fokus=='web' ) checked @endif>{{ $data['displayName'] }}
+ <a class="settings-icon" target="_blank" rel="noopener" href="{{ $data['url'] }}">
+ <i class="fa fa-link" aria-hidden="true"></i>
+ </a>
+ </label>
+ </div>
+ </div>
+ @endforeach
+ </div>
+ </div>
+ @endforeach
+ <div class="clearfix">
+ <div class="settings-modal-buttons pull-right">
+ <button class="delete-focus-btn btn btn-danger">
+ @lang('index.focus-creator.delete')
+ </button>
+ <button class="save-focus-btn btn btn-primary">
+ @lang('index.focus-creator.save')
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/modals/plugin-modal.blade.php b/resources/views/modals/plugin-modal.blade.php
new file mode 100644
index 0000000000000000000000000000000000000000..9c9147899bcc92f052ccaceeebe57fa313e0f8ec
--- /dev/null
+++ b/resources/views/modals/plugin-modal.blade.php
@@ -0,0 +1,129 @@
+<div class="modal fade" id="plugin-modal" tab-index="-1" role="dialog">
+ <div class="modal-dialog ">
+ <div class="content modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ <h4>
+ @if ($browser === 'Firefox' || $browser === 'Mozilla') {{ trans('index.plugin.head.1') }} @elseif ($browser === 'Chrome')
+ {{ trans('index.plugin.head.2') }} @elseif ($browser === 'Opera') {{ trans('index.plugin.head.3') }} @elseif ($browser
+ === 'IE') {{ trans('index.plugin.head.4') }} @elseif ($browser === 'Edge') {{ trans('index.plugin.head.5') }} @elseif
+ ($browser === 'Safari') {{ trans('index.plugin.head.6') }} @elseif ($browser === 'Vivaldi') {{ trans('index.plugin.head.6')
+ }} @else $(".seperator").addClass("hidden"); @endif
+ </h4>
+ <p class="text-muted">{{ trans('index.plugin.head.info') }}</p>
+ </div>
+ <div class="modal-body">
+ @if ($browser === 'Firefox' || $browser === 'Mozilla')
+ <ol>
+ <li>{{ trans('index.plugin.firefox.1') }}
+ <img src="/img/Firefox.png" width="100%" />
+ </li>
+ <li>{{ trans('index.plugin.firefox.2') }}
+ <img src="/img/Firefox_Standard.png" width="100%" />
+ </li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.firefox.3', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.firefox.4') !!}</li>
+ <li>{!! trans('index.plugin.firefox.5') !!}</li>
+ </ol>
+ @elseif ($browser === 'Chrome')
+ <ol>
+ <li>{!! trans('index.plugin.chrome.1') !!}</li>
+ <li>{!! trans('index.plugin.chrome.2') !!}</li>
+ <li>{{ trans('index.plugin.chrome.3') }}</li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.chrome.4', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.chrome.5') !!}</li>
+ <li>{!! trans('index.plugin.chrome.6') !!}</li>
+ <li>{!! trans('index.plugin.chrome.7') !!}</li>
+ <li>{!! trans('index.plugin.chrome.8') !!}</li>
+ </ol>
+ @elseif ($browser === 'Opera')
+ <ol>
+ <li>{!! trans('index.plugin.opera.1') !!}</li>
+ <li>{!! trans('index.plugin.opera.2') !!}</li>
+ <li>{!! trans('index.plugin.opera.3') !!}</li>
+ <li>{!! trans('index.plugin.opera.4') !!}</li>
+ <li>
+ <small>{!! trans('index.plugin.opera.5') !!}</small>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.opera.6', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.opera.7') !!}</li>
+ <li>{!! trans('index.plugin.opera.8') !!}</li>
+ <li>{!! trans('index.plugin.opera.9') !!}</li>
+ <li>{!! trans('index.plugin.opera.10') !!}</li>
+ </ol>
+ @elseif ($browser === 'IE')
+ <ol>
+ <li>{!! trans('index.plugin.IE.1') !!}</li>
+ <li>{!! trans('index.plugin.IE.4') !!} (
+ <i class="fa fa-cog" aria-hidden="true"></i>)</li>
+ <li>{!! trans('index.plugin.IE.5') !!}</li>
+ <li>{!! trans('index.plugin.IE.6') !!}</li>
+ <li>{!! trans('index.plugin.IE.7') !!}</li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.IE.8', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.IE.9') !!}</li>
+ <li>{!! trans('index.plugin.IE.10') !!}</li>
+ <li>{!! trans('index.plugin.IE.11') !!}</li>
+ </ol>
+ @elseif ($browser === 'Edge')
+ <ol>
+ <li>{!! trans('index.plugin.edge.1') !!}
+ <i class="fa fa-ellipsis-h" aria-hidden="true"></i>{!! trans('index.plugin.edge.2') !!}</li>
+ <li>{!! trans('index.plugin.edge.3') !!}</li>
+ <li>{!! trans('index.plugin.edge.4') !!}</li>
+ <li>{!! trans('index.plugin.edge.5') !!}</li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.edge.6', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.edge.7') !!}</li>
+ <li>{!! trans('index.plugin.edge.8') !!}</li>
+ <li>{!! trans('index.plugin.edge.9') !!}</li>
+ <li>{!! trans('index.plugin.edge.10') !!}</li>
+ <li>{!! trans('index.plugin.edge.11') !!}</li>
+ </ol>
+ @elseif ($browser === 'Safari')
+ <ol>
+ <li>{!! trans('index.plugin.safari.1') !!}</li>
+ <li>{!! trans('index.plugin.safari.2') !!}</li>
+ <li>{!! trans('index.plugin.safari.3') !!}</li>
+ <li>{!! trans('index.plugin.safari.4') !!}</li>
+ </ol>
+ @elseif ($browser === 'Vivaldi')
+ <ol>
+ <li>{!! trans('index.plugin.vivaldi.1') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.2') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.3') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.4') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.5') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.6') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.7') !!}</li>
+ </ol>
+ <hr />
+ <h4>{!! trans('index.plugin.vivaldi.8', ['browser' => $browser]) !!}</h4>
+ <ol>
+ <li>{!! trans('index.plugin.vivaldi.9') !!}</li>
+ <li>{!! trans('index.plugin.vivaldi.10') !!}</li>
+ </ol>
+ @endif
+ <hr>
+ <p>@lang('index.plugin.faq.1')
+ <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "
+ /faq#mg-plugin ") }}">@lang('index.plugin.faq.2')</a>
+ </p>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file