From 5a8acd82f047e9ee24886933c19803af4348a4bd Mon Sep 17 00:00:00 2001
From: horus
Date: Wed, 21 Feb 2018 23:37:01 +0100
Subject: Improves the offer page, makes some stuff bold, better spacing etc.
 (website)

---
 site/app/Http/Controllers/OfferController.php |  3 ++-
 site/public/css/custom.css                    |  3 +++
 site/resources/views/offer.blade.php          | 14 +++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'site')

diff --git a/site/app/Http/Controllers/OfferController.php b/site/app/Http/Controllers/OfferController.php
index c05cd0e..0a74f6b 100644
--- a/site/app/Http/Controllers/OfferController.php
+++ b/site/app/Http/Controllers/OfferController.php
@@ -58,6 +58,7 @@ class OfferController extends Controller {
 	     */
 	    $view_name = \Request::route()->getName();
 	    $data = DB::table($view_name . '_view')->whereNotNull('url')->orderBy($sort_by, $order_by)->simplePaginate(20);
+	    $count = DB::table($view_name . '_view')->whereNotNull('url')->count();
 
 	    $rss_feed = "/" . $view_name . "/feed/";
 	    $query_string = "";
@@ -88,6 +89,6 @@ class OfferController extends Controller {
 		    $title = ucfirst($view_name) . "-Angebote";
 	    }
 	    
-	    return view('offer', ['data' => $data, 'spirit_type' => $view_name, 'rss_feed' => $rss_feed, 'title' => $title ]);
+	    return view('offer', ['data' => $data, 'count' => $count, 'spirit_type' => $view_name, 'rss_feed' => $rss_feed, 'title' => $title ]);
     }
 } 
diff --git a/site/public/css/custom.css b/site/public/css/custom.css
index b96d7ab..4322ffe 100644
--- a/site/public/css/custom.css
+++ b/site/public/css/custom.css
@@ -164,3 +164,6 @@ footer {
 .border-top { border-top: 1px solid #e5e5e5; }
 .border-bottom { border-bottom: 1px solid #e5e5e5; }
 
+.ml-10 {
+	margin-left: 10px !important;
+}
diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php
index 980d9c3..f68c204 100644
--- a/site/resources/views/offer.blade.php
+++ b/site/resources/views/offer.blade.php
@@ -12,7 +12,7 @@
     <div class="container">
       <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark bbg-white ttext-dark box-shadow">
         <div class="col-md-6 px-0">
-	  <h1 class="display-4 font-italic">{{ ucfirst($spirit_type) }} <!-- ({{$data->count()}} Treffer)--></h1> 
+	  <h1 class="display-4 font-italic">{{ ucfirst($spirit_type) }} <span class="text-mute ml-10">({{$count}} Angebote)</span><!-- --></h1> 
 	  <!--p class="lead my-3">Finde immer die günstigsten Angebote im Bereich Spirituosen. Täglich neue Schnäppchen.</p-->
           <p class="lead mb-0"><a href="/" class="text-white font-weight-bold">Zurück zur Übersicht...</a></p>
         </div>
@@ -73,20 +73,20 @@ if ( !$data->count() ) {
 						<span class="text-fade-out"></span>
 					</h4>
 
-					<p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right">{{ TF::fF($offer->discounted_price) . "€" }}*</strong>
+					<p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="ffloat-right ttext-large" style="margin-left: 3px;">{{ TF::fF($offer->discounted_price) }}€</strong>*
 						<span class="float-right text-muted">{{ TF::fF($offer->base_price ) }}€/L</span>
 					</p>
 					<div class="mb-1 text-muted w-100">
 						<span class="float-right">{{ TF::fF($offer->volume) . " Liter" }}</span><span>{{ TF::fF($offer->abv) . "%" }} Alk.</span>
 					</div>
-					<a class="u" href="{{ $offer->url }}">Jetzt bestellen</a>
+					<a class="u ttext-large" href="{{ $offer->url }}" title="Link zum Angebot bei {{$offer->shop}}">Jetzt bestellen</a>
 					<p class="text-muted text-small w-100 nnmt-10">
-						Versand: {{ TF::fF($offer->shipping_costs) }}€ <span class=" float-right">Gratis ab {{ $offer->free_shipping }}</span>
+						Versand: <strong>{{ TF::fF($offer->shipping_costs) }}€</strong> <span class=" float-right">Gratis ab <strong>{{ $offer->free_shipping }}</strong></span>
 						<br>
 <!--
 						<span class=" float-right">{{ date("d.m.Y", $offer->created_at) }}</span>
 -->
-						<span class=" float-right">* Preis vom {{ strftime("%d. %B", $offer->created_at) }}</span>
+						<span class=" float-right">* Preis vom <strong>{{ strftime("%d. %B", $offer->created_at) }}</strong></span>
 					</p>
 				</div>
 			</div>
@@ -125,9 +125,9 @@ if ( !$data->count() ) {
 					</p>
 					<strong><a href="{{ $offer->url }}" class="text-large">Jetzt bestellen</a></strong>
 					<p class="text-muted text-small w-100 nmt-10">
-						Versand: {{ TF::fF($offer->shipping_costs) }}€ <span class=" float-right">Gratis ab {{ $offer->free_shipping }}</span>
+						Versand: <strong>{{ TF::fF($offer->shipping_costs) }}€</strong> <span class=" float-right">Gratis ab <strong>{{ $offer->free_shipping }}</strong></span>
 						<br>
-						<span class=" float-right">* Preis vom {{ strftime("%d. %B", $offer->created_at) }}</span>
+						<span class=" float-right">* Preis vom <strong>{{ strftime("%d. %B", $offer->created_at) }}</strong></span>
 					</p>
 				</div>
 			</div>
-- 
cgit v1.2.3