From aad0482e378a5131bee7f2ee05accae4b2b8839d Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Wed, 26 Sep 2018 08:35:18 +0200
Subject: [PATCH] First Version of our new Associator
---
app/Http/Controllers/Assoziator.php | 11 ++++++++---
resources/lang/de/asso.php | 2 ++
resources/views/assoziator/asso.blade.php | 21 ++++++++++++++++++++-
resources/views/parts/sidebar.blade.php | 2 +-
4 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/app/Http/Controllers/Assoziator.php b/app/Http/Controllers/Assoziator.php
index ced17b418..a461f9a96 100644
--- a/app/Http/Controllers/Assoziator.php
+++ b/app/Http/Controllers/Assoziator.php
@@ -76,9 +76,14 @@ class Assoziator extends Controller
}
arsort($words);
- unset($words[$eingabe]);
- unset($words[strtolower($eingabe)]);
- unset($words[ucfirst($eingabe)]);
+ $eingabeWords = explode(" ", $eingabe);
+ foreach($eingabeWords as $eingabeWord){
+ unset($words[$eingabeWord]);
+ unset($words[strtolower($eingabeWord)]);
+ unset($words[ucfirst($eingabeWord)]);
+ unset($words[strtoupper($eingabeWord)]);
+ }
+
unset($words["de"]);
unset($words["com"]);
unset($words["wiki"]);
diff --git a/resources/lang/de/asso.php b/resources/lang/de/asso.php
index 55fd703e5..c1c451a64 100644
--- a/resources/lang/de/asso.php
+++ b/resources/lang/de/asso.php
@@ -3,4 +3,6 @@ return [
'head.1' => 'MetaGer Assoziator',
'1.1' => 'Wenn Sie mit Ihren Suchwörtern nicht weiter kommen: Vielleicht fehlen Ihnen die richtigen? Fragen Sie unseren Assoziator: Geben Sie hier einfach ein oder mehrere Wörter ein, zu denen Sie neue oder bessere Begriffe suchen. Versuchen Sie mit den dann gefundenen Wörtern eine neue Suche indem Sie das neue Wort in der Ausgabeseite anklicken. Es gilt unsere',
'1.2' => 'Datenschutzerklärung',
+ 'reasso.title' => 'Diesen Begriff assoziieren',
+ 'searchasso.title' => 'MetaGer Suche nach diesem Begriff durchführen',
];
\ No newline at end of file
diff --git a/resources/views/assoziator/asso.blade.php b/resources/views/assoziator/asso.blade.php
index c6eefe877..855996336 100644
--- a/resources/views/assoziator/asso.blade.php
+++ b/resources/views/assoziator/asso.blade.php
@@ -7,6 +7,20 @@
form div.input-group-addon button {
padding: 9px;
}
+
+ .reasso {
+ color: rgb(0, 102, 204);
+ }
+ .reasso:hover {
+ color: red;
+ }
+
+ td.association {
+ display: flex;
+ }
+ .asso-search-link {
+ margin-right: 10px;
+ }
</style>
<h1 class="page-title">{{ trans('asso.head.1') }}</h1>
<div class="card-heavy">
@@ -36,7 +50,12 @@
@foreach($words as $key => $value)
<tr>
<td>{{ $i }}</td>
- <td>{{ $key }}</td>
+ <td class="association">
+ <a class="asso-search-link" href="{{ action('MetaGerSearch@search', ['eingabe' => $key]) }}" title="{{ trans('asso.searchasso.title') }}"><i class="fa fa-search" aria-hidden="true"></i></a>
+ <form method="POST">
+ <button name="q" value="{{ $key }}" class="reasso" type="submit" title="{{ trans('asso.reasso.title') }}">{{ $key }}</button>
+ </form>
+ </td>
<td>{{ round(($value / $wordCount) * 100, 2) }}%</td>
@php $i++; @endphp
</tr>
diff --git a/resources/views/parts/sidebar.blade.php b/resources/views/parts/sidebar.blade.php
index ed5e2fbf4..2058f23e2 100644
--- a/resources/views/parts/sidebar.blade.php
+++ b/resources/views/parts/sidebar.blade.php
@@ -26,7 +26,7 @@
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/zitat-suche/") }}" tabindex="227">{{ trans('sidebar.nav22') }}</a>
</li>
<li>
- <a class="inlink" href="https://metager.de/klassik/asso/" tabindex="228">{{ trans('sidebar.nav11') }}</a>
+ <a href="{{ action('Assoziator@asso') }}" tabindex="228">{{ trans('sidebar.nav11') }}</a>
</li>
<li>
<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/app/") }}" tabindex="229">@lang('sidebar.nav25')</a>
--
GitLab