Commit 19e18563 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '318-host-und-domainblacklisting-wird-in-der-hilfe-nicht-erwahnt' into 'development'

Resolve "Host- und Domainblacklisting wird in der Hilfe nicht erwähnt"

Closes #318

See merge request !600
parents 23cd3c8f ed967991
......@@ -208,7 +208,6 @@ class Result
if (strpos($text, $phrase) === false) {
return false;
}
}
/* Der Host-Filter der sicherstellt,
......
This diff is collapsed.
......@@ -29,13 +29,13 @@ return [
"allgemein.3" => "Add MetaGer to your browsers search engines by clicking the \"Add the MetaGer Plugin\" button just below the search field.",
"suchfokus.title" => "select a search focus / using the \"customize\" button",
"suchfokus.1" => "Just pick one of the foci ( \"web\", \"pictures\", \"news\", \"science\" or \"shopping\" ) to start a search with general settings made by us. These should fit most of your needs. You may set exact personally ADV?? adjustments to the foci (some other settings are available too) by clicking \"customize\". At last, make a decision whether your settings should be used once ( it is possible to set a bookmark ) or permanent by clicking either \"one time use\" or \"permanent use\". Your settings are stored in the so called \"local storage\" of your webbrowser (JavaScript is needed for this).",
"sucheingabe" => "search field",
"sucheingabe.title" => "search field",
"stopworte.title" => "stopwords",
"stopworte.1" => "If you want to exclude words within the search result, you have to put a \"-\" in front of that word",
"stopworte.2" => "Example: You search for a new car, but no BMW. Then you search should be <div class=\"well well-sm\">new car -bmw</div>",
"mehrwortsuche.title" => "searchinf for more than one word",
"mehrwortsuche.1" => "If you search for more than one word than such results will be show which contain all these words or such who will be as close as possible to it. If you search for an exact phrase you should set your word within quotation marks.",
"mehrwortsuche.2" => "Example: search for Shakespears <div class=\"well well-sm\">to be or not to be</div> will deliver many results, but the exact phrase will only be found using <div class=\"well well-sm\">\"to be or nor to be\"</div>",
"mehrwortsuche.title" => "searching for more than one word",
"mehrwortsuche.1" => "If you search for more than one word than such results will be show which contain all these words or such who will be as close as possible to it. If you search for an exact phrase you should set your word within quotation marks.",
"mehrwortsuche.2" => "Example: search for Shakespears <div class=\"well well-sm\">to be or not to be</div> will deliver many results, but the exact phrase will only be found using <div class=\"well well-sm\">\"to be or nor to be\"</div>",
"grossklein.title" => "Upper case vs. lower case",
"grossklein.1" => "Upper case will not be distinguished from lower case",
"grossklein.2" => "Searching for <div class=\"well well-sm\">Shakespeare</div> or <div class=\"well well-sm\">SHAKESPEARE</div> will deliver the same results as <div class=\"well well-sm\">shakespeare</div>",
......
......@@ -26,7 +26,8 @@
<p>{!! trans('hilfe.suchfokus.1') !!}</p>
</div>
</div>
<h2>{!! trans('hilfe.sucheingabe') !!}</h2>
<h2>{!! trans('hilfe.sucheingabe.title') !!}</h2>
<p>{!! trans('hilfe.sucheingabe.hint') !!}</p>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{!! trans('hilfe.stopworte.title') !!}</h3>
......@@ -44,8 +45,13 @@
</div>
<div class="panel-body">
<p>{!! trans('hilfe.mehrwortsuche.1') !!}</p>
<div class = "well well-sm">der runde tisch</div>
<p>{!! trans('hilfe.mehrwortsuche.2') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.mehrwortsuche.2') !!}</li>
<li>{!! trans('hilfe.mehrwortsuche.3') !!}</li>
<div class = "well well-sm">"der" "runde" "tisch"</div>
<li>{!! trans('hilfe.mehrwortsuche.4') !!}</li>
<div class = "well well-sm">"der runde tisch"</div>
</ul>
</div>
</div>
......@@ -60,6 +66,46 @@
</ul>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{!! trans('hilfe.domains.title') !!}</h3>
</div>
<div class="panel-body">
<p>{!! trans('hilfe.domains.sitesearch.explanation') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.domains.sitesearch.example.1') !!}
<div class="well well-sm">{!! trans('hilfe.domains.sitesearch.example.2') !!}</div></li>
<li>{!! trans('hilfe.domains.sitesearch.example.3') !!}
<div class="well well-sm">{!! trans('hilfe.domains.sitesearch.example.4') !!}</div></li>
</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="well well-sm">{!! trans('hilfe.domains.blacklist.example.3') !!}</div>
{!! trans('hilfe.domains.blacklist.example.4') !!}</li>
<li>{!! trans('hilfe.domains.blacklist.example.5') !!}
<div class="well well-sm">{!! trans('hilfe.domains.blacklist.example.6') !!}</div></li>
</ul>
<p>{!! trans('hilfe.domains.showcase.explanation.1') !!}</p>
<img src="/img/blacklist-tutorial-searchexample.png">
<p>{!! trans('hilfe.domains.showcase.explanation.2') !!}<p>
<div class="media">
<div class="media-left">
<img src="/img/blacklist-tutorial-options.png">
</div>
<div class="media-body">
<p>{!! trans('hilfe.domains.showcase.menu.1') !!}</p>
<ul class="dotlist">
<li>{!! trans('hilfe.domains.showcase.menu.2') !!}</li>
<li>{!! trans('hilfe.domains.showcase.menu.3') !!}</li>
<li>{!! trans('hilfe.domains.showcase.menu.4') !!}</li>
</ul>
</div>
</div>
</div>
</div>
<h2 id="dienste">{!! trans('hilfe.dienste') !!}</h2>
<div class="panel panel-default">
<div class="panel-heading">
......
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