Commit c873c4a2 authored by Aria Givi's avatar Aria Givi

merged development

parents d2ceb7f2 e914ca86
......@@ -51,7 +51,8 @@ class StartpageController extends Controller
->with('time', $request->input('param_time', '1500'))
->with('request', $request->input('request', 'GET'))
->with('option_values', $option_values)
->with('autocomplete', $autocomplete);
->with('autocomplete', $autocomplete)
->with('pluginmodal', $request->input('plugin-modal', 'off'));
}
public function loadPage($subpage)
......@@ -115,6 +116,7 @@ class StartpageController extends Controller
view('plugin')
->with('link', $link)
->with('params', $params)
->with('hostname', gethostname())
->with('request', $request), "200");
$response->header('Content-Type', "application/xml");
return $response;
......
......@@ -198,7 +198,8 @@ class MetaGer
->with('metager', $this)
->with('browser', (new Agent())->browser())
->with('quicktips', $quicktipResults)
->with('resultcount', count($this->results));
->with('resultcount', count($this->results))
->with('focus', $this->fokus);
break;
}
}
......
......@@ -100,6 +100,7 @@ p {
a {
font-size: 100%;
}
/* Logo */
.logo {
......@@ -192,6 +193,7 @@ summary {
position: absolute;
top: 100%;
left: 0;
z-index: 1;
color: black;
background-color: white;
border: 2px solid @metager-orange;
......@@ -206,6 +208,7 @@ summary {
pointer-events: none;
opacity: 0;
transition: opacity 0.3s ease;
text-transform: initial; // Resets specific styles
}
&.hide-tooltip-on-resultpage:after {
/* Auf kleinen Bildschirmen wird der Tooltip nicht angezeigt */
......@@ -314,4 +317,8 @@ label a {
text-decoration: none;
color: inherit;
}
}
li.nodot {
list-style-type: none;
}
\ No newline at end of file
This diff is collapsed.
......@@ -3,54 +3,51 @@
@section('title', $title )
@section('content')
<style>
#checklist > li {
margin-top: 10px;
}
</style>
<h1>@lang('faktencheck.heading.1')</h1>
<p>@lang('faktencheck.paragraph.1')</p>
<ol id="checklist">
<li>@lang('faktencheck.list.1')</li>
<ol>
<li>@lang('faktencheck.list.1.1')</li>
<li>@lang('faktencheck.list.1.2')</li>
<li>@lang('faktencheck.list.1.3')</li>
<li>@lang('faktencheck.list.1.4')</li>
<li>@lang('faktencheck.list.1.5')</li>
<li>@lang('faktencheck.list.1.6')</li>
<li>@lang('faktencheck.list.1.7')</li>
<li>@lang('faktencheck.list.1.8')</li>
<h1 class="page-title">@lang('faktencheck.heading.1')</h1>
<div class="card-heavy">
<p>@lang('faktencheck.paragraph.1')</p>
<ol id="checklist">
<li>@lang('faktencheck.list.1')</li>
<ol>
<li>@lang('faktencheck.list.1.1')</li>
<li>@lang('faktencheck.list.1.2')</li>
<li>@lang('faktencheck.list.1.3')</li>
<li>@lang('faktencheck.list.1.4')</li>
<li>@lang('faktencheck.list.1.5')</li>
<li>@lang('faktencheck.list.1.6')</li>
<li>@lang('faktencheck.list.1.7')</li>
<li>@lang('faktencheck.list.1.8')</li>
</ol>
<li>@lang('faktencheck.list.2')</li>
<ol>
<li>@lang('faktencheck.list.2.1')</li>
<li>@lang('faktencheck.list.2.2')</li>
<li>@lang('faktencheck.list.2.3')</li>
<li>@lang('faktencheck.list.2.4')</li>
<li>@lang('faktencheck.list.2.5')</li>
<li>@lang('faktencheck.list.2.6')</li>
</ol>
<li>@lang('faktencheck.list.3')</li>
<ol>
<li>@lang('faktencheck.list.3.1')</li>
<li>@lang('faktencheck.list.3.2')</li>
<li>@lang('faktencheck.list.3.3')</li>
<li>@lang('faktencheck.list.3.4')</li>
</ol>
<li>@lang('faktencheck.list.4')</li>
<ol>
<li>@lang('faktencheck.list.4.1')</li>
<li>@lang('faktencheck.list.4.2')</li>
<li>@lang('faktencheck.list.4.3')</li>
</ol>
<li>@lang('faktencheck.list.5')</li>
<ol>
<li>@lang('faktencheck.list.5.1')</li>
<li>@lang('faktencheck.list.5.2')</li>
<li>@lang('faktencheck.list.5.3')</li>
</ol>
<li>@lang('faktencheck.list.6')</li>
<li>@lang('faktencheck.list.7')</li>
</ol>
<li>@lang('faktencheck.list.2')</li>
<ol>
<li>@lang('faktencheck.list.2.1')</li>
<li>@lang('faktencheck.list.2.2')</li>
<li>@lang('faktencheck.list.2.3')</li>
<li>@lang('faktencheck.list.2.4')</li>
<li>@lang('faktencheck.list.2.5')</li>
<li>@lang('faktencheck.list.2.6')</li>
</ol>
<li>@lang('faktencheck.list.3')</li>
<ol>
<li>@lang('faktencheck.list.3.1')</li>
<li>@lang('faktencheck.list.3.2')</li>
<li>@lang('faktencheck.list.3.3')</li>
<li>@lang('faktencheck.list.3.4')</li>
</ol>
<li>@lang('faktencheck.list.4')</li>
<ol>
<li>@lang('faktencheck.list.4.1')</li>
<li>@lang('faktencheck.list.4.2')</li>
<li>@lang('faktencheck.list.4.3')</li>
</ol>
<li>@lang('faktencheck.list.5')</li>
<ol>
<li>@lang('faktencheck.list.5.1')</li>
<li>@lang('faktencheck.list.5.2')</li>
<li>@lang('faktencheck.list.5.3')</li>
</ol>
<li>@lang('faktencheck.list.6')</li>
<li>@lang('faktencheck.list.7')</li>
</ol>
</div>
@endsection
\ No newline at end of file
......@@ -25,9 +25,9 @@
<p>{!! trans('hilfe.mehrwortsuche.2') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.mehrwortsuche.3') !!}</li>
<div class = "search-example">"der" "runde" "tisch"</div>
<div class = "search-example">{!! trans('hilfe.mehrwortsuche.3.example') !!}</div>
<li>{!! trans('hilfe.mehrwortsuche.4') !!}</li>
<div class = "search-example">"der runde tisch"</div>
<div class = "search-example">{!! trans('hilfe.mehrwortsuche.4.example') !!}</div>
</ul>
</div>
</section>
......@@ -37,9 +37,9 @@
<p>{!! trans('hilfe.grossklein.1') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.grossklein.2') !!}</li>
<div class="search-example">{!! trans('hilfe.grossklein.3') !!}</div>
<li>{!! trans('hilfe.grossklein.4') !!}</li>
<div class="search-example">{!! trans('hilfe.grossklein.5') !!}</div>
<div class="search-example">{!! trans('hilfe.grossklein.2.example') !!}</div>
<li class="nodot">{!! trans('hilfe.grossklein.3') !!}</li>
<div class="search-example">{!! trans('hilfe.grossklein.3.example') !!}</div>
</ul>
</div>
</section>
......@@ -48,19 +48,21 @@
<div>
<p>{!! trans('hilfe.domains.sitesearch.explanation') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.domains.sitesearch.example.1') !!}
<div class="search-example">{!! trans('hilfe.domains.sitesearch.example.2') !!}</div></li>
<li>{!! trans('hilfe.domains.sitesearch.example.3') !!}
<div class="search-example">{!! trans('hilfe.domains.sitesearch.example.4') !!}</div></li>
<li>{!! trans('hilfe.domains.sitesearch.example.1') !!}</li>
<div class="search-example">{!! trans('hilfe.domains.sitesearch.example.2') !!}</div>
<li>{!! trans('hilfe.domains.sitesearch.example.3') !!}</li>
<div class="search-example">{!! trans('hilfe.domains.sitesearch.example.4') !!}</div>
</ul>
<p>{!! trans('hilfe.domains.blacklist.explanation') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.domains.blacklist.example.1') !!}</li>
<li>{!! trans('hilfe.domains.blacklist.example.2') !!}
<div class="search-example">{!! trans('hilfe.domains.blacklist.example.3') !!}</div>
{!! trans('hilfe.domains.blacklist.example.4') !!}</li>
<li>{!! trans('hilfe.domains.blacklist.example.5') !!}
<div class="search-example">{!! trans('hilfe.domains.blacklist.example.6') !!}</div></li>
<ul>
<li>{!! trans('hilfe.domains.blacklist.example.2') !!}</li>
<div class="search-example">{!! trans('hilfe.domains.blacklist.example.3') !!}</div>
<li class="nodot">{!! trans('hilfe.domains.blacklist.example.4') !!}</li>
<li>{!! trans('hilfe.domains.blacklist.example.5') !!}</li>
<div class="search-example">{!! trans('hilfe.domains.blacklist.example.6') !!}</div>
</ul>
</ul>
<p>{!! trans('hilfe.domains.showcase.explanation.1') !!}</p>
@include('parts/fake-result')
......@@ -107,6 +109,7 @@
</div>
</section>
<h2 id="dienste">{!! trans('hilfe.dienste') !!}</h2>
<h3><i class="fa fa-angle-double-right"></i> {!! trans('hilfe.dienste.kostenlos') !!}</h3>
<section>
<div id="mg-app" style="margin-top: -100px"></div>
<div style="margin-top: 100px"></div>
......@@ -141,7 +144,6 @@
<p>{!! trans('hilfe.urlshort.1') !!}</p>
</div>
</section>
<h3><i class="fa fa-angle-double-right"></i> {!! trans('hilfe.dienste.kostenlos') !!}</h3>
<h2>{!! trans('hilfe.datenschutz.title') !!}</h2>
<section>
<h3>{!! trans('hilfe.datenschutz.faktencheck.heading') !!}</h3>
......
<input type="checkbox" id="plugin-modal-checkbox" class="hidden">
<input type="checkbox" id="plugin-modal-checkbox" class="hidden" @if( isset($pluginmodal) && $pluginmodal == 'on') checked @endif>
<div class="metager-modal" id="plugin-modal" role="dialog">
<div class="metager-modal-dialog ">
<div class="metager-modal-content">
<div class="metager-modal-header">
<label for="plugin-modal-checkbox" class="close">
<span aria-hidden="true">&times;</span>
</label>
</label>
<h4>
@if ($browser === 'Firefox' || $browser === 'Mozilla')
{{ trans('index.plugin.head.1') }}
......
......@@ -49,6 +49,9 @@
<input type="hidden" name={{ $fp }} value="on">
@endforeach
@endif
@if (isset($focus) && !empty($focus))
<input type="hidden" name="focus" value={{ $focus }}>
@endif
@if (isset($theme))
<input type="hidden" name="theme" value={{ $theme }}>
@endif
......
<?xml version="1.0" encoding="UTF-8" ?>
<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/">
<ShortName>MetaGer</ShortName>
<ShortName>MetaGer ({{ $hostname }})</ShortName>
<Description>{{ trans('plugin.description') }}</Description>
<Contact>office@suma-ev.de</Contact>
<Image width="16" height="16" type="image/x-icon">{{ url('/favicon.ico') }}</Image>
......
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