Skip to content
Snippets Groups Projects
Commit 70467679 authored by Karl's avatar Karl
Browse files

repaired merge-damages

parent 3e1f03ee
No related branches found
No related tags found
2 merge requests!749Development,!725Resolve "Angepasst Einstellungen falsch übernommen"
Hide whitespace changes
Inline Side-by-side
app/MetaGer.php
+ 4
− 9
View file @ 70467679
...@@ -910,12 +910,7 @@ class MetaGer ...@@ -910,12 +910,7 @@ class MetaGer
} else { } else {
$this->maps = false; $this->maps = false;
} }
<<<<<<< HEAD
# Neuer tab
$this->newtab = $request->input('tab', 'on');
=======
$this->newtab = $request->input('newtab', 'on'); $this->newtab = $request->input('newtab', 'on');
>>>>>>> development
if ($this->newtab === "on") { if ($this->newtab === "on") {
$this->newtab = "_blank"; $this->newtab = "_blank";
} else { } else {
...@@ -923,10 +918,10 @@ class MetaGer ...@@ -923,10 +918,10 @@ class MetaGer
} }
# Custom Search # Custom Search
$this->canCustomSearch = $request->input('canCustomSearch', 'false'); $this->canCustomSearch = $request->input('canCustomSearch', 'false');
if ($this->maps === "true") { if ($this->canCustomSearch === "true") {
$this->maps = true; $this->canCustomSearch = true;
} else { } else {
$this->maps = false; $this->canCustomSearch = false;
} }
# Theme # Theme
$this->theme = preg_replace("/[^[:alnum:][:space:]]/u", '', $request->input('theme', 'default')); $this->theme = preg_replace("/[^[:alnum:][:space:]]/u", '', $request->input('theme', 'default'));
...@@ -1242,7 +1237,7 @@ class MetaGer ...@@ -1242,7 +1237,7 @@ class MetaGer
} }
} }
# Generators # Generators
public function generateSearchLink($fokus, $results = true) public function generateSearchLink($fokus, $results = true)
{ {
......
resources/views/index.blade.php
+ 3
− 32
View file @ 70467679
...@@ -193,50 +193,21 @@ ...@@ -193,50 +193,21 @@
&lt;li &gt;&lt;a id="black" data-rgba="238,238,238,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt; &lt;li &gt;&lt;a id="black" data-rgba="238,238,238,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
&lt;li &gt;&lt;a id="blackHard" data-rgba="50,50,50,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt; &lt;li &gt;&lt;a id="blackHard" data-rgba="50,50,50,1" href="#"&gt;&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt;'> &lt;/ul&gt;'>
<<<<<<< HEAD
<span class="glyphicon glyphicon-tint"></span> <span class="glyphicon glyphicon-tint"></span>
</button> </button>
=======
<span class="glyphicon glyphicon-tint"></span>
</button>
</div>
<input type="text" name="eingabe" required="" autofocus="" autocomplete="{{$autocomplete}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
<input type="hidden" name="encoding" value="utf8">
@if ($focus === 'angepasst') <input type="hidden" name="lang" value={{ $lang }} >
<input type="hidden" name="resultCount" value={{ $resultCount }} >
<input type="hidden" name="time" value={{ $time }} >
<input type="hidden" name="sprueche" value={{ $sprueche }} >
<input type="hidden" name="newtab" value={{ $newtab }} >
<input type="hidden" name="maps" value={{ $maps }} >
@foreach ($focusPages as $fp)
<input type="hidden" name={{ $fp }} value="on">
@endforeach
<input type="hidden" name="theme" value={{ $theme }}>
@elseif( !App::isLocale('de') )
<input type="hidden" name="lang" value="{{ App::getLocale() }}">
@else
<input type="hidden" name="lang" value="all">
@endif
<div class="input-group-addon">
<button type="submit">
<span class="glyphicon glyphicon-search"></span>
</button>
</div>
>>>>>>> development
</div> </div>
<input type="text" name="eingabe" required="" autofocus="" autocomplete="{{$autocomplete}}" class="form-control" placeholder="{{ trans('index.placeholder') }}"> <input type="text" name="eingabe" required="" autofocus="" autocomplete="{{$autocomplete}}" class="form-control" placeholder="{{ trans('index.placeholder') }}">
<input type="hidden" name="encoding" value="utf8"> <input type="hidden" name="encoding" value="utf8">
@if ($focus === 'angepasst') @if ($focus === 'angepasst') <input type="hidden" name="lang" value={{ $lang }} >
<input type="hidden" name="lang" value={{ $lang }} >
<input type="hidden" name="resultCount" value={{ $resultCount }} > <input type="hidden" name="resultCount" value={{ $resultCount }} >
<input type="hidden" name="time" value={{ $time }} > <input type="hidden" name="time" value={{ $time }} >
<input type="hidden" name="sprueche" value={{ $sprueche }} > <input type="hidden" name="sprueche" value={{ $sprueche }} >
<input type="hidden" name="tab" value={{ $tab }} > <input type="hidden" name="newtab" value={{ $newtab }} >
<input type="hidden" name="maps" value={{ $maps }} > <input type="hidden" name="maps" value={{ $maps }} >
<input type="hidden" name="theme" value={{ $theme }}>
@foreach ($focusPages as $fp) @foreach ($focusPages as $fp)
<input type="hidden" name={{ $fp }} value="on"> <input type="hidden" name={{ $fp }} value="on">
@endforeach @endforeach
<input type="hidden" name="theme" value={{ $theme }}>
@elseif( !App::isLocale('de') ) @elseif( !App::isLocale('de') )
<input type="hidden" name="lang" value="{{ App::getLocale() }}"> <input type="hidden" name="lang" value="{{ App::getLocale() }}">
@else @else
......
resources/views/layouts/researchandtabs.blade.php
+ 0
− 5
View file @ 70467679
...@@ -109,13 +109,8 @@ ...@@ -109,13 +109,8 @@
</a> </a>
</li> </li>
@else @else
<<<<<<< HEAD
<li data-loaded="0" id="produktsucheTabSelector" class="tab-selector" role="presentation">
<a aria-controls="produktsuche" data-href="{{ $metager->generateSearchLink('produktsuche') }}" href="{{ $metager->generateSearchLink('produktsuche') }}">
=======
<li data-loaded="0" id="produktsucheTabSelector" class="tab-selector" role="presentation" > <li data-loaded="0" id="produktsucheTabSelector" class="tab-selector" role="presentation" >
<a aria-controls="produktsuche" data-href="{!! $metager->generateSearchLink('produktsuche') !!}" href="{!! $metager->generateSearchLink('produktsuche') !!}"> <a aria-controls="produktsuche" data-href="{!! $metager->generateSearchLink('produktsuche') !!}" href="{!! $metager->generateSearchLink('produktsuche') !!}">
>>>>>>> development
<span class='glyphicon glyphicon-shopping-cart'></span> <span class='glyphicon glyphicon-shopping-cart'></span>
<span class="hidden-xs">{{ trans('index.foki.produkte') }}</span> <span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
</a> </a>
......
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