Minor improvements. (website)

4 files changed, 4 insertions, 6 deletions

diff --git a/site/app/Http/Controllers/PageFeedController.php b/site/app/Http/Controllers/PageFeedController.php
index ee4f3ec..0dd1b95 100644
--- a/site/app/Http/Controllers/PageFeedController.php
+++ b/site/app/Http/Controllers/PageFeedController.php
@@ -22,7 +22,7 @@ class PageFeedController extends Controller {
 		if ($query != "") {
 			$query .= " UNION ";
 		} 
-		$query .= "(SELECT spirit_type as name, image_url, spirit_type, spirit_type AS url, spirit_type AS feedname, '' AS linktext FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY created_at DESC LIMIT 1)";
+		$query .= "(SELECT spirit_type as name, image_url, spirit_type, spirit_type AS url, CONCAT(spirit_type,'-Feed') AS feedname, CONCAT('Zum ', spirit_type, '-Feed') AS linktext FROM ". $view ."_view WHERE original_price > 19.98 ORDER BY created_at DESC LIMIT 1)";
 	    }
 
 	    # query mit festen parametern
diff --git a/site/resources/views/feeds.blade.php b/site/resources/views/feeds.blade.php
index 34cb091..1c0fe43 100644
--- a/site/resources/views/feeds.blade.php
+++ b/site/resources/views/feeds.blade.php
@@ -29,8 +29,6 @@ foreach( $data as $offer) {
 	} else {
 		// main cards
 		$offer->url = lcfirst($offer->url) ;
-		$offer->feedname = $offer->feedname . "-Feed";
-		$offer->linktext = "Zum ". $offer->spirit_type ." Feed";
 	}
 	$offer->url = $offer->url . "/feed/";
 
diff --git a/site/resources/views/layouts/base.blade.php b/site/resources/views/layouts/base.blade.php
index 491d324..86fda65 100644
--- a/site/resources/views/layouts/base.blade.php
+++ b/site/resources/views/layouts/base.blade.php
@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width, minimumscale=1.0, maximum-scale=1.0" />
         <meta name="description" content="">
         <meta name="author" content="">
-        <link rel="icon" href="/favicon.ico">
+        <link rel="icon" href="https://files.fuselkoenig.de/favicon.ico">
         <title>@yield('header') | Fuselkoenig.de</title>
 
 <!--
diff --git a/site/resources/views/search.blade.php b/site/resources/views/search.blade.php
index bf0fdca..14903a5 100644
--- a/site/resources/views/search.blade.php
+++ b/site/resources/views/search.blade.php
@@ -50,8 +50,8 @@ if ( "" == $search_phrase || !$data->count()) {
 	<form action="/search">
 	  <div class="form-group">
 	    <label for=""></label>
-	    <input type="text" class="form-control" name="q" id="search_form" aria-describedby="suchform-help" placeholder="Hier nach der gewünschten Spirituose suchen, zB Glenfiddich" required>
-	    <small id="emailHelp" class="form-text text-muted">Suche nach der gewünschten Spirituose.</small>
+	    <input type="text" class="form-control" name="q" id="search_form" aria-describedby="suchform-help" placeholder="Hier nach der gewünschten Spirituose suchen..." required>
+	    <small id="emailHelp" class="form-text text-muted">Suche zum Beispiel nach Glenfiddich oder Champagner.</small>
 	  </div>
 	  <button type="submit" class="btn btn-secondary">Suchen</button>
 	</form>