Commit c147a4c8 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Revert "Merge branch...

Revert "Merge branch '449-einmalige-eigene-suche-ohne-ausgewahlte-suchmaschinen' into 'development'"

This reverts merge request !806
parent e8933105
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</li> </li>
@else @else
<li data-loaded="0" id="webTabSelector" class="tab-selector" role="presentation"> <li data-loaded="0" id="webTabSelector" class="tab-selector" role="presentation">
<a aria-controls="web" data-href="{!! $metager->generateSearchLink('web') !!}" href="{!! $metager->generateSearchLink('web', false) !!}"> <a aria-controls="web" data-href="{!! $metager->generateSearchLink('web') !!}" href="{!! $metager->generateSearchLink('web') !!}">
<span class='glyphicon glyphicon-globe'></span> <span class='glyphicon glyphicon-globe'></span>
<span class="hidden-xs">{{ trans('index.foki.web') }}</span> <span class="hidden-xs">{{ trans('index.foki.web') }}</span>
</a> </a>
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
</li> </li>
@else @else
<li data-loaded="0" id="bilderTabSelector" class="tab-selector" role="presentation"> <li data-loaded="0" id="bilderTabSelector" class="tab-selector" role="presentation">
<a aria-controls="bilder" data-href="{!! $metager->generateSearchLink('bilder') !!}" href="{!! $metager->generateSearchLink('bilder', false) !!}"> <a aria-controls="bilder" data-href="{!! $metager->generateSearchLink('bilder') !!}" href="{!! $metager->generateSearchLink('bilder') !!}">
<span class='glyphicon glyphicon-picture'></span> <span class='glyphicon glyphicon-picture'></span>
<span class="hidden-xs">{{ trans('index.foki.bilder') }}</span> <span class="hidden-xs">{{ trans('index.foki.bilder') }}</span>
</a> </a>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
</li> </li>
@else @else
<li data-loaded="0" id="nachrichtenTabSelector" class="tab-selector" role="presentation" > <li data-loaded="0" id="nachrichtenTabSelector" class="tab-selector" role="presentation" >
<a aria-controls="nachrichten" data-href="{!! $metager->generateSearchLink('nachrichten') !!}" href="{!! $metager->generateSearchLink('nachrichten', false) !!}"> <a aria-controls="nachrichten" data-href="{!! $metager->generateSearchLink('nachrichten') !!}" href="{!! $metager->generateSearchLink('nachrichten') !!}">
<span class='glyphicon glyphicon-bullhorn'></span> <span class='glyphicon glyphicon-bullhorn'></span>
<span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span> <span class="hidden-xs">{{ trans('index.foki.nachrichten') }}</span>
</a> </a>
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
</li> </li>
@else @else
<li data-loaded="0" id="wissenschaftTabSelector" class="tab-selector" role="presentation"> <li data-loaded="0" id="wissenschaftTabSelector" class="tab-selector" role="presentation">
<a aria-controls="wissenschaft" data-href="{!! $metager->generateSearchLink('wissenschaft') !!}" href="{!! $metager->generateSearchLink('wissenschaft', false) !!}"> <a aria-controls="wissenschaft" data-href="{!! $metager->generateSearchLink('wissenschaft') !!}" href="{!! $metager->generateSearchLink('wissenschaft') !!}">
<span class='glyphicon glyphicon-file'></span> <span class='glyphicon glyphicon-file'></span>
<span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span> <span class="hidden-xs">{{ trans('index.foki.wissenschaft') }}</span>
</a> </a>
...@@ -110,14 +110,13 @@ ...@@ -110,14 +110,13 @@
</li> </li>
@else @else
<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', false) !!}"> <a aria-controls="produktsuche" data-href="{!! $metager->generateSearchLink('produktsuche') !!}" href="{!! $metager->generateSearchLink('produktsuche') !!}">
<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>
</li> </li>
@endif @endif
{{-- Fix for older Versions --}}
@if( $metager->getFokus() === "angepasst" ) @if( $metager->getFokus() === "angepasst" )
<li id="angepasstTabSelector" role="presentation" data-loaded="1" class="active tab-selector"> <li id="angepasstTabSelector" role="presentation" data-loaded="1" class="active tab-selector">
<a aria-controls="angepasst" data-href="#angepasst" href="#angepasst"> <a aria-controls="angepasst" data-href="#angepasst" href="#angepasst">
...@@ -135,7 +134,7 @@ ...@@ -135,7 +134,7 @@
</li> </li>
</ul> </ul>
</header> </header>
<main id="main-content-tabs" class="tab-content row"> <main class="tab-content row">
@if( $metager->getFokus() === "web" ) @if( $metager->getFokus() === "web" )
<div role="tabpanel" class="tab-pane active" id="web"> <div role="tabpanel" class="tab-pane active" id="web">
...@@ -210,7 +209,7 @@ ...@@ -210,7 +209,7 @@
@if( $metager->getFokus() === "angepasst" ) @if( $metager->getFokus() === "angepasst" )
<div role="tabpanel" class="tab-pane active" id="angepasst"> <div role="tabpanel" class="tab-pane active" id="angepasst">
<div class="row"> <div class="row">
@yield('results') @yield('results')
</div> </div>
</div> </div>
@endif @endif
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
</div> </div>
</footer> </footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
<script type="text/javascript" src="{{ elixir('js/lib.js') }}"></script> <script type="text/javascript" src="{{ elixir('js/all.js') }}"></script>
<script type="text/javascript" src="{{ elixir('js/scriptResultPage.js') }}"></script>
</body> </body>
</html> </html>
...@@ -192,12 +192,6 @@ ...@@ -192,12 +192,6 @@
@if (isset($success)) @if (isset($success))
<div class="alert alert-success" role="alert">{{ $success }}</div> <div class="alert alert-success" role="alert">{{ $success }}</div>
@endif @endif
@if (isset($info))
<div class="alert alert-info" role="alert">{{ $info }}</div>
@endif
@if (isset($warning))
<div class="alert alert-warning" role="alert">{{ $warning }}</div>
@endif
@if (isset($error)) @if (isset($error))
<div class="alert alert-danger" role="alert">{{ $error }}</div> <div class="alert alert-danger" role="alert">{{ $error }}</div>
@endif @endif
...@@ -212,7 +206,7 @@ ...@@ -212,7 +206,7 @@
</li> </li>
<li id="info"> <li id="info">
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a> <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "kontakt") }}">{{ trans('staticPages.nav5') }}</a> - <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "impressum") }}">{{ trans('staticPages.nav8') }}</a>
{{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/">{{ trans('staticPages.sumaev.2') }}</a> {{ trans('staticPages.sumaev.1') }}<a href="https://www.suma-ev.de/" >{{ trans('staticPages.sumaev.2') }}</a>
</li> </li>
<li> <li>
<a href="https://www.uni-hannover.de/" > <a href="https://www.uni-hannover.de/" >
...@@ -221,6 +215,7 @@ ...@@ -221,6 +215,7 @@
</ul> </ul>
</footer> </footer>
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
<script type="text/javascript" src="{{ elixir('js/all.js') }}"></script>
</div> </div>
</body> </body>
</html> </html>
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<h1>{!! trans('settings.head.1') !!}</h1> <h1>{!! trans('settings.head.1') !!}</h1>
<p id="lead">{!! trans('settings.head.2') !!}</p> <p id="lead">{!! trans('settings.head.2') !!}</p>
<h2>{!! trans('settings.allgemein.1') !!}</h2> <h2>{!! trans('settings.allgemein.1') !!}</h2>
<input type="hidden" name="focus" value="angepasst">
<container> <container>
<div class="row"> <div class="row">
<div class="col-sm-6 col-md-4 col-lg-3"> <div class="col-sm-6 col-md-4 col-lg-3">
...@@ -54,13 +55,32 @@ ...@@ -54,13 +55,32 @@
</div> </div>
</div> </div>
</container> </container>
<div id="settingsButtons"> <h2>{!! trans('settings.suchmaschinen.1') !!} <small><button type="button" class="btn btn-link allUnchecker">{!! trans('settings.suchmaschinen.2') !!}</button></small></h2>
<a id="settings-abort-btn" class="btn btn-danger mutelink" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">@lang('settings.abort') <span class="glyphicon glyphicon-remove"></span></a> @foreach( $foki as $fokus => $sumas )
<input id="unten" class="btn btn-primary settings-btn" type="submit" value="{!! trans('settings.speichern.1') !!}"> <div class="headingGroup {{ $fokus }}">
<input id="save" class="btn btn-primary settings-btn hidden" type="button" data-href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" value="{!! trans('settings.speichern.2') !!}"> <h3 class="fokus-category">
<input id="plugin" class="btn btn-primary settings-btn" type="submit" value="{!! trans('settings.speichern.3') !!}"> @lang("settings.foki." . $fokus)
</div> <small>
<button type="button" class="checker btn btn-link" data-type="{{ $fokus }}">{!! trans('settings.suchmaschinen.3') !!}</button>
</small>
</h3>
<div class="row">
@foreach( $sumas as $name => $data )
<div class="col-sm-6 col-md-4 col-lg-3">
<div class="checkbox settings-checkbox">
<label>
<input name="param_{{ $name }}" class="focusCheckbox" type="checkbox" />{{ $data['displayName'] }}
</label>
<a class="glyphicon settings-glyphicon glyphicon-link" target="_blank" rel="noopener" href="{{ $data['url'] }}"></a>
</div>
</div>
@endforeach
</div>
</div>
@endforeach
<input id="unten" type="submit" class="btn btn-primary settings-btn" value="{!! trans('settings.speichern.1') !!}">
<input type="button" class="btn btn-primary settings-btn hidden" id="save" data-href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" value="{!! trans('settings.speichern.2') !!}">
<input id="plugin" type="submit" class="btn btn-primary settings-btn" value="{!! trans('settings.speichern.3') !!}">
<input type="button" class="btn btn-danger settings-btn hidden" id="reset" value="{!! trans('settings.speichern.4') !!}">
</form> </form>
<script src="{{ elixir('js/lib.js') }}"></script>
<script src="{{ elixir('js/settings.js') }}"></script>
@endsection @endsection
...@@ -77,6 +77,4 @@ ...@@ -77,6 +77,4 @@
</form>; </form>;
</textarea> </textarea>
@endif @endif
<script src="{{ elixir('js/lib.js') }}"></script>
<script src="{{ elixir('js/widgets.js') }}"></script>
@endsection @endsection
...@@ -65,6 +65,4 @@ ...@@ -65,6 +65,4 @@
<input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}"> <input type="hidden" name="lang" value="{{ trans('websearch.head.6') }}">
</form> </form>
</textarea> </textarea>
<script src="{{ elixir('js/lib.js') }}"></script>
<script src="{{ elixir('js/widgets.js') }}"></script>
@endsection @endsection
Markdown is supported
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