Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • sebastian/MetaGer
  • cpietsch/MetaGer
  • kossow/MetaGer
  • jens/MetaGer
  • open-source/MetaGer
5 results
Show changes
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 583 additions and 488 deletions
resources/assets/less/metager/quicktips.less
View file @ 0b99ab10
......@@ -4,143 +4,142 @@
@quicktip-font-medium: @result-font-medium;
@quicktip-font-small: @result-font-small;
#quicktips {
display: flex;
flex-direction: column;
.quicktip {
.card-light;
position: relative;
details[open=""] .quicktip-extender {
animation-name: quicktip-extender-turn;
animation-fill-mode: forwards;
}
margin: 10px 0px;
padding: 10px 10px 10px 10px;
display: flex;
flex-direction: column;
.quicktip {
.card-light;
position: relative;
details[open=""] .quicktip-extender {
animation-name: quicktip-extender-turn;
animation-fill-mode: forwards;
}
margin: 10px 0px;
padding: 10px 10px 10px 10px;
width: 100%;
border: 1px solid #ccc;
background-color: white;
details:not([open=""]) {
.quicktip-summary p {
.overflow-ellipsis;
}
}
.quicktip-summary {
.quicktip-headline {
width: 100%;
border: 1px solid #ccc;
background-color: white;
details:not([open=""]) {
.quicktip-summary p {
.overflow-ellipsis;
}
display: flex;
justify-content: space-between;
.quicktip-title,
.quicktip-title a {
flex-grow: 0;
margin: 0px 0px 5px 0px;
font-size: 13px;
display: flex;
justify-content: space-between;
}
.quicktip-summary {
.quicktip-headline {
width: 100%;
display: flex;
justify-content: space-between;
.quicktip-title,
.quicktip-title a {
flex-grow: 0;
margin: 0px 0px 5px 0px;
font-size: 18px;
display: flex;
justify-content: space-between;
font-size: @quicktip-font-large;
}
.space-taker {
flex-grow: 1;
}
.quicktip-hoster {
flex-grow: 0;
font-size: @quicktip-font-small;
color: #808080;
white-space: nowrap;
}
.quicktip-extender {
flex-grow: 0;
color: #777;
font-size: 20px;
height: 20px;
font-size: @quicktip-font-large;
}
>* {
margin: 0px 5px;
&:first-child {
margin-left: 0px;
}
&:last-child {
margin-right: 0px;
}
}
}
.result-hoster {
font-size: @result-font-small;
margin-left: 20px;
color: #808080;
white-space: nowrap;
}
p {
font-size: 16px;
}
.space-taker {
flex-grow: 1;
}
.quicktip-detail {
border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd;
h2 {
margin: 10px 0px;
font-size: 16px;
}
p {
display: none;
font-size: 14px;
}
.quicktip-hoster {
flex-grow: 0;
font-size: @quicktip-font-small;
color: #808080;
white-space: nowrap;
}
&[type=spendenaufruf] {
order: 100;
border: none;
box-shadow: none;
background-color: inherit;
.quicktip-summary {
display: flex;
justify-content: space-between;
align-items: center;
h1 {
margin: 0px;
}
p {
margin: 5px;
.spendenaufruf-btn {
color: white;
background-color: @link-color;
font-size: 16px;
}
}
}
.quicktip-extender {
flex-grow: 0;
color: #777;
font-size: 20px;
height: 20px;
font-size: @quicktip-font-large;
}
&[type=spruch] {
order: 1;
p {
display: flex;
flex-direction: column;
text-align: justify;
.author {
color: #404040;
font-style: italic;
align-self: flex-end;
}
}
> * {
margin: 0px 5px;
&:first-child {
margin-left: 0px;
}
&:last-child {
margin-right: 0px;
}
}
&[type=duckDuckGo-bang] {
order: 2;
.bang-btn {
width: 100%;
margin-top: 5px;
color: #fff;
background-color: #286992;
font-size: 16px;
}
}
&[type=wikipedia] {
order: 3;
}
&[type=dictCC] {
order: 4;
}
.result-hoster {
font-size: @result-font-small;
margin-left: 20px;
color: #808080;
white-space: nowrap;
}
p {
font-size: 13px;
}
}
.quicktip-detail {
border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd;
h2 {
margin: 10px 0px;
font-size: 16px;
}
p {
display: none;
font-size: 14px;
}
}
&[type="spendenaufruf"] {
order: 100;
border: none;
box-shadow: none;
background-color: inherit;
.quicktip-summary {
display: flex;
justify-content: space-between;
align-items: center;
h1 {
margin: 0px;
}
&[type=tip] {
order: 5;
p {
margin: 5px;
.spendenaufruf-btn {
color: white;
background-color: @link-color;
font-size: 16px;
}
}
&[type=ad] {
order: 6;
}
}
&[type="spruch"] {
order: 1;
p {
display: flex;
flex-direction: column;
text-align: justify;
.author {
color: #404040;
font-style: italic;
align-self: flex-end;
}
}
}
&[type="duckDuckGo-bang"] {
order: 2;
.bang-btn {
width: 100%;
margin-top: 5px;
color: #fff;
background-color: #286992;
font-size: 16px;
}
}
&[type="wikipedia"] {
order: 3;
}
&[type="dictCC"] {
order: 4;
}
&[type="tip"] {
order: 5;
}
&[type="ad"] {
order: 6;
}
}
\ No newline at end of file
}
}
resources/assets/less/metager/result.less
View file @ 0b99ab10
......@@ -2,193 +2,205 @@
@result-font-large: 18px;
@result-font-medium: 16px;
@result-font-small: 14px;
@result-font-url: 14px;
@result-font-small: 12px;
.result {
.card;
margin: @resultpage-leftbox-min-dist-top-bottom 0px @resultpage-leftbox-min-dist-top-bottom 0px;
padding: 15px;
width: 100%;
.result-header {
.result-headline {
display: flex;
justify-content: space-between;
.result-title {
margin: 0px;
&>* {
font-size: @result-font-large;
}
.overflow-ellipsis;
.result-price {
padding: 0px 10px;
color: white;
background-color: #666699;
border-radius: 3px;
}
a {
&,
&:active,
&:hover,
&:focus,
&:visited {
color: black;
text-decoration: none;
}
}
}
.result-hoster {
font-size: @result-font-small;
margin-left: 20px;
color: #808080;
white-space: nowrap;
}
.card;
margin: @resultpage-leftbox-min-dist-top-bottom 0px
@resultpage-leftbox-min-dist-top-bottom 0px;
padding: 15px;
width: 100%;
.result-header {
.result-headline {
display: flex;
justify-content: space-between;
.result-title {
margin: 0px;
& > * {
font-size: @result-font-large;
}
.result-link {
.overflow-ellipsis;
display: block;
font-size: @result-font-small;
width: fit-content;
max-width: 100%;
&,
&:active,
&:hover,
&:focus,
&:visited {
color: #333;
text-decoration: none;
}
.overflow-ellipsis;
.result-price {
padding: 0px 10px;
color: white;
background-color: #666699;
border-radius: 3px;
}
}
.result-body {
margin-top: 10px;
width: 90%;
display: flex;
text-align: justify;
.result-image {
width: 180px;
padding-right: 10px;
margin-right: 10px;
& img {
display: block;
max-width: 160px;
max-height: 120px;
width: auto;
height: auto;
}
}
.result-description {
margin-bottom: 3px;
word-break: break-word;
color: @result-description-color;
font-size: @result-font-medium;
line-height: 1.3;
clear: both;
.date {
font-weight: bold;
}
p {
margin: 0;
margin-bottom: 4px;
}
img {
margin: 5px;
margin-left: 0px;
margin-right: 15px;
height: auto;
width: auto;
max-width: 120px;
max-height: 200px;
border: solid 1px @result-description-img-border-color;
}
a {
&,
&:active,
&:hover,
&:focus,
&:visited {
color: black;
text-decoration: none;
}
}
}
.result-hoster {
font-size: @result-font-small;
margin-left: 20px;
color: #808080;
white-space: nowrap;
}
}
.result-footer {
margin-top: 10px;
display: flex;
flex-wrap: wrap;
&>*:not(:first-child) {
margin-left: 20px;
}
.result-open,
.result-open-newtab {
&,
&:active,
&:hover,
&:focus,
&:visited {
color: black;
font-size: @result-font-small;
text-decoration: none;
}
}
@media (max-width: 499px) {
.result-open-newtab {
display: none;
}
}
.result-open-proxy {
&,
&:active,
&:hover,
&:focus,
&:visited {
color: black;
font-size: @result-font-small;
text-decoration: none;
}
white-space: nowrap;
margin-left: 25px;
img {
margin-bottom: 0px;
margin-right: 2px
}
}
.open-result-options {
font-weight: normal;
flex-grow: 1;
text-align: right;
@media (max-width: 499px) {
display: none;
}
}
.result-link {
.overflow-ellipsis;
display: block;
font-size: @result-font-small;
width: fit-content;
max-width: 100%;
&,
&:active,
&:hover,
&:focus,
&:visited {
font-size: @result-font-url;
text-decoration: none;
}
span.advertisement-mark {
background-color: #0d9c0d;
color: white;
padding: 3px;
border-radius: 4px;
font-weight: bold;
font-size: 10px;
margin-right: 10px;
}
}
&.ad .ad-label {
&,
& a,
& a:active,
& a:hover,
& a:focus,
& a:visited {
font-size: @result-font-small;
color: #808080;
}
}
.result-body {
margin-top: 1px;
width: 90%;
display: flex;
text-align: justify;
.result-image {
width: 180px;
padding-right: 10px;
margin-right: 10px;
& img {
display: block;
max-width: 160px;
max-height: 120px;
width: auto;
height: auto;
}
}
&>.remover {
cursor: pointer;
text-align: right;
color: #777;
.result-description {
margin-bottom: 3px;
word-break: break-word;
color: @result-description-color;
font-size: 13px;
line-height: 1.3;
clear: both;
.date {
font-weight: bold;
}
p {
margin: 0;
margin-bottom: 4px;
}
img {
margin: 5px;
margin-left: 0px;
margin-right: 15px;
height: auto;
width: auto;
max-width: 120px;
max-height: 200px;
border: solid 1px @result-description-img-border-color;
}
}
&>.result-options {
&>.options {
width: 100%;
text-align: right;
overflow: hidden;
max-height: 0px;
transition: all 1.0s;
-webkit-transition: all 1.0s;
opacity: 0;
}
&>.result-toggle:checked+.options {
max-height: 150px;
overflow: initial;
opacity: 1;
}
li {
font-size: 14px;
text-transform: uppercase;
margin: 10px 0;
}
li>a {
color: black;
}
}
.result-footer {
margin-top: 10px;
display: flex;
flex-wrap: wrap;
& > *:not(:first-child) {
margin-left: 20px;
}
.result-open,
.result-open-newtab {
&,
&:active,
&:hover,
&:focus,
&:visited {
color: black;
font-size: @result-font-small;
text-decoration: none;
}
}
@media (max-width: 499px) {
.result-open-newtab {
display: none;
}
}
.result-open-proxy {
&,
&:active,
&:hover,
&:focus,
&:visited {
color: black;
font-size: @result-font-small;
text-decoration: none;
}
white-space: nowrap;
margin-left: 25px;
img {
margin-bottom: 0px;
margin-right: 2px;
}
}
.open-result-options {
font-weight: normal;
font-size: @result-font-small;
flex-grow: 1;
text-align: right;
@media (max-width: 499px) {
display: none;
}
}
}
&.ad .ad-label {
&,
& a,
& a:active,
& a:hover,
& a:focus,
& a:visited {
font-size: @result-font-small;
color: #808080;
}
}
& > .remover {
cursor: pointer;
text-align: right;
color: #777;
}
& > .result-options {
& > .options {
width: 100%;
text-align: right;
overflow: hidden;
max-height: 0px;
transition: all 1s;
-webkit-transition: all 1s;
opacity: 0;
}
& > .result-toggle:checked + .options {
max-height: 150px;
overflow: initial;
opacity: 1;
}
li {
font-size: 14px;
text-transform: uppercase;
margin: 10px 0;
}
li > a {
color: black;
}
}
\ No newline at end of file
}
}
resources/assets/less/metager/searchbar.less
View file @ 0b99ab10
......@@ -182,6 +182,9 @@
display: none;
}
}
.search-input input {
padding-right: 35px; // Makes it so the overlayed delete button does not hide the text belowF
}
}
}
......
resources/lang/de/index.php
View file @ 0b99ab10
This diff is collapsed.
resources/lang/de/titles.php
View file @ 0b99ab10
......@@ -20,5 +20,6 @@ return [
'languages.edit' => 'Sprachdateien bearbeiten - MetaGer',
'app' => 'Apps - MetaGer',
'faktencheck' => 'Fakten-Prüfung contra Fake-News',
'jugendschutz' => 'Jugendschutz'
'jugendschutz' => 'Jugendschutz',
'ad-info' => 'Werbung bei MetaGer',
];
resources/views/ad-info.blade.php 0 → 100644
View file @ 0b99ab10
@extends('layouts.subPages')
@section('title', $title )
@section('content')
<h1 class="page-title">Werbung bei MetaGer</h1>
<div class="card-heavy">
<h2>Warum wir Werbung zeigen</h2>
<p>MetaGer ist nicht einfach nur eine Webseite, sondern ein ganzer Service der gepflegt, gewartet und ständig verbessert werden muss. Dabei entstehen laufende Kosten, die sich derzeit nicht alleine durch Mitgliedsbeiträge und Spenden decken lassen. Deshalb zeigen wir zusätzlich zu unseren Suchergebnissen auch Werbeergebnisse an, die möglichst gut zur Suche passen. Zusätzlich finden sich auf unserer Startseite Sponsorenlinks von ausgewählten Firmen.</p>
<p>MetaGer wird betrieben und stetig weiterentwickelt vom SUMA-EV - Verein für freien Wissenszugang. Der SUMA-EV ist ein als gemeinnützig anerkannter Verein und erhält keine öffentlichen Fördergelder. Deshalb sind wir auf ihre Mithilfe angewiesen.</p>
{{-- <span>~ Hier grafik mit benötigten Mitgliedern / Spenden für Werbefreiheit einfügen ~</span> --}}
{{-- <p>Helfen Sie uns jetzt dieses Ziel zu erreichen:<p> --}}
<ul>
<li><a href="http://www.suma-ev.de/unterstuetzung/beitrittsformular.html">Mitglied im SUMA-EV werden</a> (<a href="http://www.suma-ev.de/mitglieder/index.html">Liste der Mitglieder</a>)</li>
<li><a href="http://www.suma-ev.de/unterstuetzung/index.html">MetaGer fördern</a></li>
</ul>
</div>
<div class="card-heavy">
<h2>Online-Einkauf - MetaGer nebenbei unterstützen</h2>
<p>Sie können MetaGer einfach nebenbei unterstützen, indem Sie bei Ihrem nächsten Online-Einkauf folgendes tun:</p>
<p>Statt wie bisher direkt zum Online-Shop zu surfen, gehen Sie zunächst auf: <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl">MetaGer-Fördershops</a>.</p>
<p>Dieser Klick führt Sie in die Shop-Auswahl des Boost-Projectes. Dort suchen Sie sich Ihren Shop aus und machen wie gewohnt Ihren Einkauf. Das ist alles. Wenn genug Menschen dies tun, dann brauchen wir keine Werbung mehr. Nur zwei Mausklicks für Sie - für alle eine Chance für den freien Wissenszugang in der digitalen Welt.</p>
<p>Damit wir auf diesem Weg unterstützt werden können, haben wir uns in das Netzwerk zur Förderung gemeinnützig anerkannter Organisationen eingebracht, das Projekt <a href="http://www.boost-project.com/">www.boost-project.com</a>. Unter dem Dach dieses Projektes sind ca. 400 Online-Shops (von Amazon bis Zooplus) vereint, die sich bereit erklärt haben, von allen Verkäufen 6% an das Projekt zu spenden.</p>
</div>
@endsection
resources/views/captcha.blade.php → resources/views/humanverification/captcha.blade.php
View file @ 0b99ab10
......@@ -4,21 +4,20 @@
@section('content')
<h1>Entschuldigen Sie die Störung</h1>
<p>Wir haben Grund zur Annahme, dass von Ihrem Anschluss verstärkt automatisierte Abfragen abgeschickt wurden.
Deshalb bitten wir Sie, die nachfolgende Captcha Abfrage zu beantworten.</p>
<p>Sollten Sie diese Nachricht häufiger sehen oder handelt es sich dabei um einen Irrtum, schicken Sie uns gerne eine Nachricht über unser <a href="/kontakt">Kontaktformular</a>.</p>
<p>Nennen Sie uns in diesem Fall bitte unbedingt folgende Vorgangsnummer: {{ $id }}
<p>Wir schauen uns den Vorgang dann gerne im Detail an.</p>
<form method="post">
{{ csrf_field() }}
<p>Sie befinden sich in einem Netzwerk aus dem wir verstärkt automatisierte Anfragen erhalten. Keine Sorge: Das bedeutet nicht unbedingt, dass diese Anfragen von Ihrem PC kommen.</p>
<p>Allerdings können wir Ihre Anfragen nicht von denen des "Robots" unterscheiden. Zum Schutz der von uns abgefragten Suchmaschinen müssen wir aber sicherstellen, dass diese nicht mit (automatisierten) Abfragen überflutet werden.</p>
<p>Bitte geben Sie deshalb die Zeichen aus dem Bild in die Eingabebox ein und bestätigen Sie mit "OK" um zur Ergebnisseite zu gelangen.</p>
<form method="post" action="{{ route('verification', ['id' => $id]) }}">
<input type="hidden" name="url" value="{!! $url !!}">
<input type="hidden" name="id" value="{{ $id }}">
<p>{!! captcha_img() !!}</p>
<p><img src="{{ $image }}" /></p>
@if(isset($errorMessage))
<p><font color="red">{{$errorMessage}}</font></p>
@endif
<p><input type="text" name="captcha"></p>
<p><button type="submit" name="check">OK</button></p>
<p><input type="text" class="form-control" name="captcha" placeholder="Captcha eingeben" autofocus></p>
<p><button type="submit" class="btn btn-success" name="check">OK</button></p>
</form>
<p>Hinweis: Zum Zwecke der Autorisierung wird auf dieser Seite ein Session Cookie gesetzt.
@endsection
\ No newline at end of file
<p>Sollten Sie diese Nachricht häufiger sehen oder handelt es sich dabei um einen Irrtum, schicken Sie uns gerne eine Nachricht über unser <a href="/kontakt">Kontaktformular</a>.</p>
<p>Nennen Sie uns in diesem Fall bitte unbedingt folgende Vorgangsnummer: {{ $id }}
@endsection
resources/views/index.blade.php
View file @ 0b99ab10
......@@ -11,8 +11,8 @@
<div id="show-plugin-modal">
<label for="plugin-modal-checkbox" class="btn btn-default open-plugin-modal" title="{{ trans('index.plugin.open-modal.title') }}"><i class="fa fa-plug" aria-hidden="true"></i> {{ trans('index.plugin.open-modal') }}</label>
</div>
<script src="{{ mix('js/scriptStartPage.js') }}"></script>
<script src="{{ mix('js/searchbar.js') }}"></script>
<script src="{{ mix('js/scriptStartPage.js') }}" defer></script>
<script src="{{ mix('js/searchbar.js') }}" defer></script>
@endsection
@section('optionalContent')
......@@ -25,15 +25,11 @@
<div id="sponsors">
<h2>{{ trans('index.sponsors.head.2') }}</h2>
<ul class="startpage">
@foreach(DB::table('sponsorenlinks')->where('langcode', 'de')->orderByRaw('LENGTH(linktext)', 'ASC')->get() as $link)
<li class="sponsor">
<a href="https://b-ceed.de/weihnachtsfeiern-ideen/ " target="_blank" rel="noopener"><p>@lang('index.sponsors.woxikon')</p> <i class="fa fa-external-link"></i></a>
</li>
<li class="sponsor">
<a href="http://www.gutschein-magazin.de/" target="_blank" rel="noopener"><p>@lang('index.sponsors.seo')</p> <i class="fa fa-external-link"></i></a>
</li>
<li class="sponsor">
<a href="https://www.semtrix.de/suchmaschinenoptimierung/" target="_blank" rel="noopener"><p>@lang('index.sponsors.gutscheine')</p> <i class="fa fa-external-link"></i></a>
<a href="{{ $link->link }}" target="_blank" rel="noopener"><p>{{ $link->linktext }}</p> <i class="fa fa-external-link"></i></a>
</li>
@endforeach
</ul>
</div>
</div>
......
resources/views/layouts/ad.blade.php
View file @ 0b99ab10
......@@ -8,9 +8,10 @@
{{ $ad->titel }}
</a>
</h2>
<a class="ad-label" href="{{ $ad->gefVonLink }}" target="_blank" rel="noopener">Werbung von {!! $ad->gefVon !!}</a>
<a class="ad-label" href="{{ $ad->gefVonLink }}" target="_blank" rel="noopener">{!! $ad->gefVon !!}</a>
</div>
<a class="result-link" href="{{ $ad->link }}" target="{{ $metager->getNewtab() }}">
<span class="advertisement-mark">Anzeige</span>
{{ $ad->anzeigeLink }}
</a>
</div>
......
resources/views/layouts/result.blade.php
View file @ 0b99ab10
......@@ -9,7 +9,7 @@
<span class="result-price">{!! $result->price_text !!}</span>
@endif
<a href="{{ $result->link }}" target="{{ $metager->getNewtab() }}" rel="noopener">
{{ $result->number }}. {!! $result->titel !!}
{!! $result->titel !!}
</a>
</h2>
<a class="result-hoster" href="{{ $result->gefVonLink }}" target="{{ $metager->getNewtab() }}" rel="noopener">{{ $result->gefVon }}</a>
......
resources/views/layouts/resultPage.blade.php
View file @ 0b99ab10
......@@ -9,11 +9,10 @@
<meta name="p" content="{{ getmypid() }}" />
<meta name="q" content="{{ $eingabe }}" />
<meta name="l" content="{{ LaravelLocalization::getCurrentLocale() }}" />
<meta name="mm" content="{{ Request::input('verification_id') }}" />
<meta name="mn" content="{{ Request::input('verification_count') }}" />
<meta name="mm" content="{{ $metager->getVerificationId() }}" />
<meta name="mn" content="{{ $metager->getVerificationCount() }}" />
<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
<link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" href="/fonts/liberation-fonts/liberation-fonts.css" />
<link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
<meta name="referrer" content="origin">
......@@ -43,8 +42,8 @@
@include('parts.footer', ['type' => 'resultpage', 'id' => 'resultPageFooter'])
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" alt=""/>
<script src="{{ mix('js/lib.js') }}"></script>
<script src="{{ mix('js/scriptResultPage.js') }}"></script>
<script src="{{ mix('js/focus-creator.js') }}"></script>
<script src="{{ mix('js/searchbar.js') }}"></script>
<script src="{{ mix('js/scriptResultPage.js') }}" defer></script>
<script src="{{ mix('js/focus-creator.js') }}" defer></script>
<script src="{{ mix('js/searchbar.js') }}" defer></script>
</body>
</html>
resources/views/parts/foki.blade.php
View file @ 0b99ab10
@if( array_has($metager->getAvailableFoki(), "web"))
<div id="web" @if($metager->getFokus() === "web")class="active"@endif>
<a href="@if($metager->getFokus() === "web")#@else{!!$metager->generateSearchLink('web')!!}@endif" target="_self" tabindex="2">@lang('index.foki.web')</a>
</div>
@endif
@if( array_has($metager->getAvailableFoki(), "nachrichten"))
<div id="nachrichten" @if($metager->getFokus() === "nachrichten")class="active"@endif>
<a href="@if($metager->getFokus() === "nachrichten")#@else{!!$metager->generateSearchLink('nachrichten')!!}@endif" target="_self" tabindex="3">@lang('index.foki.nachrichten')</a>
</div>
@endif
@if( array_has($metager->getAvailableFoki(), "wissenschaft"))
<div id="wissenschaft" @if($metager->getFokus() === "wissenschaft")class="active"@endif>
<a href="@if($metager->getFokus() === "wissenschaft")#@else{!!$metager->generateSearchLink('wissenschaft')!!}@endif" target="_self" tabindex="4">@lang('index.foki.wissenschaft')</a>
</div>
@endif
@if( array_has($metager->getAvailableFoki(), "produktsuche"))
<div id="produkte" @if($metager->getFokus() === "produktsuche")class="active"@endif>
<a href="@if($metager->getFokus() === "produktsuche")#@else{!!$metager->generateSearchLink('produktsuche')!!}@endif" target="_self" tabindex="5">@lang('index.foki.produkte')</a>
</div>
@endif
<div id="maps">
<a href="https://maps.metager.de/map/{{ $metager->getQ() }}/9.7380161,52.37119740000003,12" target="_self" tabindex="6">@lang('index.foki.maps')</a>
</div>
......
resources/views/parts/searchbar.blade.php
View file @ 0b99ab10
......@@ -23,7 +23,7 @@
</label>
</div>
<div class="search-input">
<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="2">
<input type="text" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif" required="" @if(\Request::is('/')) autofocus @endif autocomplete="{{$autocomplete or 'off'}}" class="form-control" placeholder="{{ trans('index.placeholder') }}" tabindex="2">
<button class="hidden" id="search-delete-btn" type="button">
&#xd7;
</button>
......@@ -45,7 +45,7 @@
<input type="hidden" name="time" value={{ $time }}>
@endif
@if (isset($focusPages) && !empty($focusPages))
<input type="hidden" name="focus" value="focus_custom">
<input type="hidden" name="focus" value="focus_custom">
@foreach ($focusPages as $fp)
<input type="hidden" name={{ $fp }} value="on">
@endforeach
......@@ -60,4 +60,4 @@
<div class="search-custom-hidden"></div>
</div>
</form>
</fieldset>
\ No newline at end of file
</fieldset>
routes/session.php
View file @ 0b99ab10
<?php
# In this File we collect all routes which require a session or other cookies to be active
Route::get('captcha/api/{config?}', '\Mews\Captcha\CaptchaController@getCaptchaApi')->middleware('session');
Route::get('captcha/{config?}', '\Mews\Captcha\CaptchaController@getCaptcha')->middleware('session');
Route::match(['get', 'post'], 'meta/verification/{id}/{url}', 'HumanVerification@captcha');
\ No newline at end of file
Route::match(['get', 'post'], 'meta/verification/{id}/{url?}', 'HumanVerification@captcha')->name('verification');
routes/web.php
View file @ 0b99ab10
......@@ -102,7 +102,7 @@ Route::group(
->with('navbarFocus', 'hilfe');
});
Route::get('hilfe/faktencheck', function(){
Route::get('hilfe/faktencheck', function () {
return view('faktencheck')
->with('title', trans('titles.faktencheck'))
->with('navbarFocus', 'hilfe');
......@@ -135,6 +135,11 @@ Route::group(
->with('title', trans('titles.jugendschutz'));
});
Route::get('ad-info', function () {
return view('ad-info')
->with('title', trans('titles.ad-info'));
});
Route::get('age.xml', function () {
$response = Response::make(file_get_contents(resource_path('age/age.xml')));
$response->header('Content-Type', "application/xml");
......@@ -147,9 +152,9 @@ Route::group(
return $response;
});
Route::group([/*'middleware' => ['referer.check'],*/ 'prefix' => 'admin'], function () {
Route::group([/*'middleware' => ['referer.check'],*/'prefix' => 'admin'], function () {
Route::get('/', 'AdminInterface@index');
Route::match(['get','post'], 'count', 'AdminInterface@count');
Route::match(['get', 'post'], 'count', 'AdminInterface@count');
Route::get('check', 'AdminInterface@check');
Route::get('engines', 'AdminInterface@engines');
});
......@@ -159,7 +164,8 @@ Route::group(
Route::match(['get', 'post'], 'meta/meta.ger3', 'MetaGerSearch@search')->middleware('humanverification');
Route::post('img/cat.jpg', 'HumanVerification@remove');
Route::get('r/metager/{mm}/{pw}/{url}', ['as' => 'humanverification', 'uses' => 'HumanVerification@removeGet']);
Route::post('img/dog.jpg', 'HumanVerification@whitelist');
Route::get('meta/picture', 'Pictureproxy@get');
Route::get('clickstats', 'LogController@clicklog');
Route::get('pluginClose', 'LogController@pluginClose');
......@@ -195,7 +201,7 @@ Route::group(
return response()->download($filePath, "MetaGer-release.apk");
});
Route::get('maps', function () {
$filePath = env('maps_app');
$filePath = env('maps_app');
$fileContents = file_get_contents($filePath);
return response($fileContents, 200)
->header('Cache-Control', 'public')
......@@ -205,7 +211,7 @@ Route::group(
});
Route::get('maps/version', function () {
$filePath = env('maps_version');
$filePath = env('maps_version');
$fileContents = file_get_contents($filePath);
return response($fileContents, 200)
->header('Content-Type', 'text/plain');
......
webpack.mix.js
View file @ 0b99ab10
let mix = require('laravel-mix');
let mix = require("laravel-mix");
/*
|--------------------------------------------------------------------------
......@@ -13,31 +13,57 @@ let mix = require('laravel-mix');
mix
// css
.less('resources/assets/less/default.less', 'public/css/themes/default.css', {
.less("resources/assets/less/default.less", "public/css/themes/default.css", {
strictMath: true
})
.less('resources/assets/less/metager/beitritt.less', 'public/css/beitritt.css', {
strictMath: true
})
.less('resources/assets/less/utility.less', 'public/css/utility.css', {
.less(
"resources/assets/less/metager/beitritt.less",
"public/css/beitritt.css",
{
strictMath: true
}
)
.less("resources/assets/less/utility.less", "public/css/utility.css", {
strictMath: true
})
// js
.babel(['resources/assets/js/lib/jquery.js', 'resources/assets/js/lib/jquery-ui.min.js', 'resources/assets/js/lib/bootstrap.js',
'resources/assets/js/lib/masonry.js', 'resources/assets/js/lib/imagesloaded.js', 'resources/assets/js/lib/openpgp.min.js', 'resources/assets/js/lib/iframeResizer.min.js',
'resources/assets/js/lib/md5.js'
], 'public/js/lib.js')
.babel(['resources/assets/js/scriptStartPage.js', 'resources/assets/js/result-saver.js'], 'public/js/scriptStartPage.js')
.babel(['resources/assets/js/scriptResultPage.js', 'resources/assets/js/result-saver.js', 'resources/assets/js/translations.js'], 'public/js/scriptResultPage.js')
.babel('resources/assets/js/searchbar.js', 'public/js/searchbar.js')
.babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js')
.babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js')
.babel('resources/assets/js/editLanguage.js', 'public/js/editLanguage.js')
.babel(
[
"resources/assets/js/lib/jquery.js",
"resources/assets/js/lib/jquery-ui.min.js",
"resources/assets/js/lib/bootstrap.js",
"resources/assets/js/lib/iframeResizer.min.js",
"resources/assets/js/lib/md5.js"
],
"public/js/lib.js"
)
.babel(
[
"resources/assets/js/scriptStartPage.js",
"resources/assets/js/result-saver.js"
],
"public/js/scriptStartPage.js"
)
.babel(
[
"resources/assets/js/scriptResultPage.js",
"resources/assets/js/result-saver.js",
"resources/assets/js/translations.js"
],
"public/js/scriptResultPage.js"
)
.babel("resources/assets/js/searchbar.js", "public/js/searchbar.js")
.babel("resources/assets/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/assets/js/focus-creator.js", "public/js/focus-creator.js")
.babel("resources/assets/js/editLanguage.js", "public/js/editLanguage.js")
// utility
.babel(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js')
.babel('resources/assets/js/widgets.js', 'public/js/widgets.js')
.babel('resources/assets/js/scriptJoinPage.js', 'public/js/scriptJoinPage.js')
.babel(
["resources/assets/js/utility.js", "resources/assets/js/translations.js"],
"public/js/utility.js"
)
.babel("resources/assets/js/widgets.js", "public/js/widgets.js")
.babel("resources/assets/js/scriptJoinPage.js", "public/js/scriptJoinPage.js")
// source maps
.sourceMaps(false, 'inline-source-map')
.sourceMaps(false, "inline-source-map")
// versioning
.version();