From 758970738dd1dabcb1b9a5d55fe766051b138803 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@hebeler.club>
Date: Mon, 24 Jul 2023 19:33:01 +0200
Subject: [PATCH] fix partnershops
---
docker-compose.yml | 5 ++---
metager/public/img/{mark-de.svg => 100-de.svg} | 0
metager/public/img/{mark-en.svg => 100-en.svg} | 0
metager/resources/less/metager/pages/resultpage/result.less | 2 +-
metager/resources/views/layouts/ad.blade.php | 6 +++---
metager/resources/views/layouts/result.blade.php | 4 ++--
6 files changed, 8 insertions(+), 9 deletions(-)
rename metager/public/img/{mark-de.svg => 100-de.svg} (100%)
rename metager/public/img/{mark-en.svg => 100-en.svg} (100%)
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b1558bee..e486b7995 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,8 +8,7 @@ volumes:
# Services
services:
fpm:
- build:
- &fpm_build
+ build: &fpm_build
context: ./
dockerfile: build/fpm/Dockerfile
target: ${APP_ENV}
@@ -35,7 +34,7 @@ services:
volumes:
- ./metager/public:/metager/metager_app/public
ports:
- - 8080:8080
+ - 80:8080
healthcheck:
test: "curl -f http://nginx:8080/health-check/nginx"
scheduler:
diff --git a/metager/public/img/mark-de.svg b/metager/public/img/100-de.svg
similarity index 100%
rename from metager/public/img/mark-de.svg
rename to metager/public/img/100-de.svg
diff --git a/metager/public/img/mark-en.svg b/metager/public/img/100-en.svg
similarity index 100%
rename from metager/public/img/mark-en.svg
rename to metager/public/img/100-en.svg
diff --git a/metager/resources/less/metager/pages/resultpage/result.less b/metager/resources/less/metager/pages/resultpage/result.less
index 03f9c4d23..aaecf01df 100644
--- a/metager/resources/less/metager/pages/resultpage/result.less
+++ b/metager/resources/less/metager/pages/resultpage/result.less
@@ -417,7 +417,7 @@
.result-open,
.result-open-newtab,
- .result-open-metagerkey {
+ .result-open-key {
&,
&:active,
&:hover,
diff --git a/metager/resources/views/layouts/ad.blade.php b/metager/resources/views/layouts/ad.blade.php
index 4c23e5220..92c121a5a 100644
--- a/metager/resources/views/layouts/ad.blade.php
+++ b/metager/resources/views/layouts/ad.blade.php
@@ -13,9 +13,9 @@
<a class="result-link" href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}" referrerpolicy="no-referrer-when-downgrade" tabindex="-1">
<span>{{ $ad->anzeigeLink }}</span>
@if(\App\Localization::getLanguage() === "de")
- <img src="/img/mark-de.svg" alt="Mark">
+ <img src="/img/100-de.svg" alt="Mark">
@else
- <img src="/img/mark-en.svg" alt="Mark">
+ <img src="/img/100-en.svg" alt="Mark">
@endif
</a>
</div>
@@ -32,7 +32,7 @@
<a class="result-open-newtab" href="{{ $ad->link }}" target="_blank" rel="noopener" referrerpolicy="no-referrer-when-downgrade">
{!! trans('result.options.6') !!}
</a>
- <a class="result-open-metagerkey" title="@lang('result.metagerkeytext')" href="{{ app(\App\Models\Authorization\Authorization::class)->getAdfreeLink() }}" target="_blank">
+ <a class="result-open-key" title="@lang('result.metagerkeytext')" href="{{ app(\App\Models\Authorization\Authorization::class)->getAdfreeLink() }}" target="_blank">
@lang('result.options.8')
</a>
</div>
diff --git a/metager/resources/views/layouts/result.blade.php b/metager/resources/views/layouts/result.blade.php
index 6fd29a963..22ce22cc3 100644
--- a/metager/resources/views/layouts/result.blade.php
+++ b/metager/resources/views/layouts/result.blade.php
@@ -29,7 +29,7 @@
</a>
@if( isset($result->partnershop) && $result->partnershop === TRUE)
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/partnershops") }}" target="_blank" class="badge" rel="noopener">
- <span>{!! trans('result.options.4') !!}</span>
+ <div>{!! trans('result.options.4') !!}</div>
</a>
@endif
</div>
@@ -81,7 +81,7 @@
</a>
@endif
@if( isset($result->partnershop) && $result->partnershop === TRUE)
- <a class="result-open-metagerkey" title="@lang('result.metagerkeytext')" href="{{ app(\App\Models\Authorization\Authorization::class)->getAdfreeLink() }}" target="_blank">
+ <a class="result-open-key" title="@lang('result.metagerkeytext')" href="{{ app(\App\Models\Authorization\Authorization::class)->getAdfreeLink() }}" target="_blank">
@lang('result.options.8')
</a>
@else
--
GitLab