repaired merge-damages

app/MetaGer.php

@@ -910,12 +910,7 @@ class MetaGer
         } else {
             $this->maps = false;
         }
-<<<<<<< HEAD
-        # Neuer tab
-        $this->newtab = $request->input('tab', 'on');
-=======
         $this->newtab = $request->input('newtab', 'on');
->>>>>>> development
         if ($this->newtab === "on") {
             $this->newtab = "_blank";
         } else {
@@ -923,10 +918,10 @@ class MetaGer
         }
         # Custom Search
         $this->canCustomSearch = $request->input('canCustomSearch', 'false');
-        if ($this->maps === "true") {
-            $this->maps = true;
+        if ($this->canCustomSearch === "true") {
+            $this->canCustomSearch = true;
         } else {
-            $this->maps = false;
+            $this->canCustomSearch = false;
         }
         # Theme
         $this->theme = preg_replace("/[^[:alnum:][:space:]]/u", '', $request->input('theme', 'default'));
@@ -1242,7 +1237,7 @@ class MetaGer
         }
     }
 
-# Generators
+    # Generators
 
     public function generateSearchLink($fokus, $results = true)
     {

resources/views/index.blade.php

@@ -193,50 +193,21 @@
 						<li ><a id="black" data-rgba="238,238,238,1" href="#"></a></li>
 						<li ><a id="blackHard" data-rgba="50,50,50,1" href="#"></a></li>
 						</ul>'>
-<<<<<<< HEAD
 						<span class="glyphicon glyphicon-tint"></span>
 					</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>
 				<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 }} >
+				@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="tab" value={{ $tab }} >
+					<input type="hidden" name="newtab" value={{ $newtab }} >
 					<input type="hidden" name="maps" value={{ $maps }} >
-					<input type="hidden" name="theme" value={{ $theme }}>
 					@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

resources/views/layouts/researchandtabs.blade.php

@@ -109,13 +109,8 @@
 					</a>
 				</li>
 			@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" >
 					<a aria-controls="produktsuche" data-href="{!! $metager->generateSearchLink('produktsuche') !!}" href="{!! $metager->generateSearchLink('produktsuche') !!}">
->>>>>>> development
 						<span class='glyphicon glyphicon-shopping-cart'></span>
 						<span class="hidden-xs">{{ trans('index.foki.produkte') }}</span>
 					</a>