Commit 5c32e3c0 authored by Karl Hasselbring's avatar Karl Hasselbring

Merge-Folgereparaturen

parent 239a55bc
......@@ -24,3 +24,5 @@ langfiles.zip
**/*.map
/.buildpath
/.project
composer.lock
\ No newline at end of file
......@@ -690,8 +690,7 @@ class MetaGer
return
$sumaName === "qualigo"
|| $sumaName === "similar_product_ads"
|| (!$overtureEnabled && $sumaName === "overtureAds")
|| $sumaName == "rlvproduct";
|| (!$overtureEnabled && $sumaName === "overtureAds");
}
public function sumaIsDisabled($suma)
......@@ -780,7 +779,7 @@ class MetaGer
$realEngNames = [];
foreach ($enabledSearchengines as $realEng) {
$nam = $realEng["name"]->__toString();
if ($nam !== "qualigo" && $nam !== "overtureAds" && $nam !== "rlvproduct") {
if ($nam !== "qualigo" && $nam !== "overtureAds") {
$realEngNames[] = $nam;
}
}
......
This diff is collapsed.
......@@ -155,10 +155,6 @@ var isChrome = !!window.chrome && !!window.chrome.webstore;
// Blink engine detection
var isBlink = (isChrome || isOpera) && !!window.CSS;
// Prüft, ob der URL-Parameter "usage" auf "once" gesetzt ist.
alert(t('select-valid-name'));
} else if(atLeastOneChecked()) {
alert(t('select-engine'));
} else {
function loadSavedResults () {
var results = new Results();
......
......@@ -42,7 +42,7 @@
text-overflow: ellipsis;
white-space: nowrap;
font-size: @result-font-small;
width: fit-content;
width: auto;
&,
&:active,
&:hover,
......
......@@ -11,14 +11,6 @@
@include('parts.searchbar', ['class' => 'startpage-searchbar'])
<script type="text/javascript" src="{{ elixir('js/scriptStartPage.js') }}"></script>
<script type="text/javascript" src="{{ elixir('js/searchbar.js') }}"></script>
<hr>
<h4>{{ trans('index.plugin.head.8') }}</h4>
<ol>
<li>{!! trans('index.plugin.firefox-klar.1') !!}</li>
<li>{{ trans('index.plugin.firefox-klar.2')}}<img src="/img/FirefoxKlar-Settings.png" width="100%"/></li>
<li>{{ trans('index.plugin.firefox-klar.3') }}<img src="/img/FirefoxKlar-addSearchengine.png" width="100%"/></li>
<li>{{ trans('index.plugin.firefox-klar.4') }}</li>
</ol>
<script src="{{ elixir('js/translations.js') }}"></script>
@endsection
......
......@@ -35,12 +35,6 @@
<body>
<header>
@yield('homeIcon')
@if(LaravelLocalization::getCurrentLocale() == "de")
<li>
<a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">MetaGer-Fanshop</a>
</li>
@endif
</header>
@include('parts.sidebar', ['id' => 'staticPagesSideBar'])
<div class="wrapper">
......@@ -60,26 +54,6 @@
@yield('content')
</main>
@yield('optionalContent')
<div class="hidden-xs mg-img">
</div>
<div id="info">
<div class="links">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">
{{ trans('staticPages.nav5') }}
</a>
<span> - </span>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">
{{ trans('staticPages.nav8') }}
</a>
@if(LaravelLocalization::getCurrentLocale() == "de")
<span> - </span>
<a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">Fanshop</a>
@endif
</div>
<div>
{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a>
<div class="hidden-xs mg-img">
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
</div>
@if (isset($page) && $page === 'startpage')
@include('parts.footer', ['type' => 'startpage', 'id' => 'startPageFooter'])
......
......@@ -22,17 +22,13 @@
</div>
@endif
<main id="results">
{{-- Show initial products or ads --}}
@if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
@include('layouts.products', ['products' => $metager->getProducts()])
{{-- Show initial ads --}}
@if($mobile)
@include('layouts.ad', ['ad' => $metager->popAd()])
@else
@if($mobile)
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@else
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
@endfor
@endif
{{-- Show map --}}
{{-- Create results and ongoing ads --}}
......
......@@ -19,16 +19,12 @@
</div>
@endif
<div id="results">
@if( $metager->getFokus() !== "produktsuche" && !$apiAuthorized)
@include('layouts.products', ['products' => $metager->getProducts()])
@if($mobile)
@include('layouts.ad', ['ad' => $metager->popAd()])
@else
@if($mobile)
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@else
@for($i = 0; $i <= 2; $i++)
@include('layouts.ad', ['ad' => $metager->popAd()])
@endfor
@endif
@endfor
@endif
{{-- Show map --}}
{{-- Create results and ongoing ads --}}
......
@if ($type === 'startpage' || $type === 'subpage' || $type === 'resultpage')
<footer class="{{ $id }} noprint">
<div id="info">
<span><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a></span>
<span><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>@if(LaravelLocalization::getCurrentLocale() == "de") - <a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">Fanshop</a>@endif</span>
<span class="hidden-xs">{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a></span>
</div>
</footer>
......
......@@ -82,6 +82,11 @@
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/beitritt/") }}" tabindex="203">{{ trans('staticPages.nav23') }}</a>
</li>
@if(LaravelLocalization::getCurrentLocale() == "de")
<li>
<a href="https://shop.spreadshirt.de/metager/" rel="noopener" target="_blank">MetaGer-Fanshop</a>
</li>
@endif
<li>
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" tabindex="204">{{ trans('staticPages.nav17') }}</a>
</li>
......
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