Skip to content
Snippets Groups Projects
Commit 12ecc1d7 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Laravel Session Cookie entfernt 

CSRF Protection deaktiviert
Englische Version etwas funktionaler gemacht
parent 4e2cabb2
No related branches found
No related tags found
1 merge request!98Laravel Session Cookie entfernt
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 21 deletions
app/Http/Kernel.php
+ 1
− 1
View file @ 12ecc1d7
......@@ -29,7 +29,7 @@ class Kernel extends HttpKernel
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
#\App\Http\Middleware\VerifyCsrfToken::class,
],
'api' => [
......
resources/lang/de/index.php
+ 1
− 0
View file @ 12ecc1d7
......@@ -6,6 +6,7 @@ return [
'foki.wissenschaft' => 'Wissenschaft',
'foki.produkte' => 'Produkte',
'foki.anpassen' => 'anpassen',
'foki.angepasst' => 'angepasst',
'conveyor' => 'Einkaufen bei MetaGer-Fördershops',
......
resources/lang/de/settings.php
+ 5
− 1
View file @ 12ecc1d7
......@@ -20,7 +20,7 @@ return [
'suchmaschinen.1' => 'Suchmaschinen',
'suchmaschinen.2' => 'Web-Suche',
'suchmaschinen.3' => 'alle an-/abwählen',
'suchmaschinen.3' => '(alle an-/abwählen)',
'suchmaschinen.4' => 'Video',
'suchmaschinen.5' => 'Deutschland',
'suchmaschinen.6' => 'Nachrichten',
......@@ -34,4 +34,8 @@ return [
'suchmaschinen.14' => 'Börse & Finanzen',
'suchmaschinen.15' => 'mit Archiv',
'suchmaschinen.16' => 'Deutschland, mit Archiv',
'speichern.1' => 'Startseite für einmalige Nutzung generieren',
'speichern.2' => 'Einstellungen dauerhaft speichern',
'speichern.3' => 'Plugin mit diesen Einstellungen generieren',
];
\ No newline at end of file
resources/lang/en/index.php
+ 1
− 0
View file @ 12ecc1d7
......@@ -6,6 +6,7 @@ return [
'foki.wissenschaft' => 'Science',
'foki.produkte' => 'Shopping',
'foki.anpassen' => 'customize',
'foki.angepasst' => 'customized',
'conveyor' => 'Purchase at affiliate shops',
......
resources/lang/en/settings.php
+ 5
− 1
View file @ 12ecc1d7
......@@ -20,7 +20,7 @@ return [
'suchmaschinen.1' => 'search engines',
'suchmaschinen.2' => 'web-search',
'suchmaschinen.3' => 'select / deselect all',
'suchmaschinen.3' => '(select / deselect all)',
'suchmaschinen.4' => 'video',
'suchmaschinen.5' => 'germany',
'suchmaschinen.6' => 'news',
......@@ -34,4 +34,8 @@ return [
'suchmaschinen.14' => 'stocks & finances',
'suchmaschinen.15' => 'with archive',
'suchmaschinen.16' => 'germany, with archive',
'speichern.1' => 'Create a startpage for one-time use',
'speichern.2' => 'Save settings permanently',
'speichern.3' => 'Generate plugin with these settings',
];
resources/views/index.blade.php
+ 7
− 2
View file @ 12ecc1d7
......@@ -124,13 +124,18 @@
<span class="glyphicon glyphicon-cog">
</span>
<span class="content">
<a href="/settings/">{{ trans('index.foki.anpassen') }}
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/settings") }}">
@if ($focus === 'angepasst')
{{ trans('index.foki.angepasst') }}
@else
{{ trans('index.foki.anpassen') }}
@endif
</a>
</span>
</label>
</fieldset>
<fieldset>
<form id="searchForm" method="GET" action="/meta/meta.ger3" accept-charset="UTF-8">
<form id="searchForm" method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3") }}" accept-charset="UTF-8">
<div class="input-group">
<div class="input-group-addon">
<button type="button" data-toggle="popover" data-html="true" data-container="body" title="Pers&ouml;nliches Design ausw&auml;hlen" data-content=' &lt;ul id="color-chooser" class="list-inline list-unstyled"&gt;
......
resources/views/layouts/researchandtabs.blade.php
+ 11
− 11
View file @ 12ecc1d7
......@@ -3,11 +3,11 @@
<nav>
<ul class="list-inline">
<li class="hidden-xs hidden-sm pull-left">
<div class="logo"><a href="/"><h1>MetaGer</h1></a>
<div class="logo"><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>MetaGer</h1></a>
</div>
</li>
<li class="visible-xs visible-sm pull-left">
<div class="logo"><a href="/"><h1>MG</h1></a>
<div class="logo"><a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>MG</h1></a>
</div>
</li>
<li class="pull-right">
......@@ -52,14 +52,14 @@
<li id="bilderTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="bilder" data-href="#bilder" href="#bilder">
<span class='glyphicon glyphicon-picture'></span>
<span class="hidden-xs">Bilder</span>
<span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="bilderTabSelector" role="presentation">
<a aria-controls="bilder" data-href="{{ $metager->generateSearchLink('bilder') }}" href="{{ $metager->generateSearchLink('bilder') }}">
<span class='glyphicon glyphicon-picture'></span>
<span class="hidden-xs">Bilder</span>
<span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
</a>
</li>
@endif
......@@ -68,14 +68,14 @@
<li id="nachrichtenTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="nachrichten" data-href="#nachrichten" href="#nachrichten">
<span class='glyphicon glyphicon-bullhorn'></span>
<span class="hidden-xs">Nachrichten</span>
<span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="nachrichtenTabSelector" role="presentation" >
<a aria-controls="nachrichten" data-href="{{ $metager->generateSearchLink('nachrichten') }}" href="{{ $metager->generateSearchLink('nachrichten') }}">
<span class='glyphicon glyphicon-bullhorn'></span>
<span class="hidden-xs">Nachrichten</span>
<span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
</a>
</li>
@endif
......@@ -84,14 +84,14 @@
<li id="wissenschaftTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="wissenschaft" data-href="#wissenschaft" href="#wissenschaft">
<span class='glyphicon glyphicon-file'></span>
<span class="hidden-xs">Wissenschaft</span>
<span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="wissenschaftTabSelector" role="presentation">
<a aria-controls="wissenschaft" data-href="{{ $metager->generateSearchLink('wissenschaft') }}" href="{{ $metager->generateSearchLink('wissenschaft') }}">
<span class='glyphicon glyphicon-file'></span>
<span class="hidden-xs">Wissenschaft</span>
<span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
</a>
</li>
@endif
......@@ -100,14 +100,14 @@
<li id="produktsucheTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="produktsuche" data-href="#produktsuche" href="#produktsuche">
<span class='glyphicon glyphicon-shopping-cart'></span>
<span class="hidden-xs">Produktsuche</span>
<span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
</a>
</li>
@else
<li data-loaded="0" id="produktsucheTabSelector" role="presentation" >
<a aria-controls="produktsuche" data-href="{{ $metager->generateSearchLink('produktsuche') }}" href="{{ $metager->generateSearchLink('produktsuche') }}">
<span class='glyphicon glyphicon-shopping-cart'></span>
<span class="hidden-xs">Produktsuche</span>
<span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
</a>
</li>
@endif
......@@ -116,7 +116,7 @@
<li id="angepasstTabSelector" role="presentation" data-loaded="1" class="active">
<a aria-controls="angepasst" data-href="#angepasst" href="#angepasst">
<span class='glyphicon glyphicon-cog'></span>
<span class="hidden-xs">angepasst</span>
<span class="hidden-xs">{{ trans('index.foki.angepasst') }}</span>
</a>
</li>
@endif
......
resources/views/settings1.blade.php
+ 5
− 5
View file @ 12ecc1d7
......@@ -3,7 +3,7 @@
@section('title', $title )
@section('content')
<form action="/" method="get">
<form action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" method="get">
<h1>{{ trans('settings.head.1') }}</h1>
<p id="lead">{{ trans('settings.head.2') }} <a href="#unten">{{ trans('settings.head.3') }}</a> {{ trans('settings.head.4') }}</p>
<h2>{{ trans('settings.allgemein.1') }}</h2>
......@@ -38,7 +38,7 @@
<h3>
{{ ucfirst($fokus) }}
<small>
<a class="checker" data-type="{{ $fokus }}">(alle an-/abwählen)</a>
<a class="checker" data-type="{{ $fokus }}">{{ trans('settings.suchmaschinen.3') }}</a>
</small>
</h3>
<div class="row">
......@@ -55,9 +55,9 @@
</div>
</div>
@endforeach
<input id="unten" type="submit" class="btn btn-primary" value="Startseite f&uuml;r einmalige Nutzung generieren">
<input type="button" class="btn btn-primary hidden" id="save" value="Einstellungen dauerhaft speichern">
<input id="plugin" type="submit" class="btn btn-primary" value="Plugin mit diesen Einstellungen generieren.">
<input id="unten" type="submit" class="btn btn-primary" value="{{ trans('settings.speichern.1') }}">
<input type="button" class="btn btn-primary hidden" id="save" value="{{ trans('settings.speichern.2') }}">
<input id="plugin" type="submit" class="btn btn-primary" value="{{ trans('settings.speichern.3') }}">
<input type="button" class="btn btn-danger hidden" id="reset" value="Einstellungen Zur&uuml;cksetzen">
</form>
@endsection
\ No newline at end of file
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