From 192581bd55924b97ac14f270e408f1faeb856da8 Mon Sep 17 00:00:00 2001
From: horus
Date: Sat, 10 Feb 2018 04:02:37 +0100
Subject: Improves mobile layout.

---
 site/public/css/custom.css                     | 22 +++++++++++++++++--
 site/resources/views/index.blade.php           |  8 ++++---
 site/resources/views/offer.blade.php           | 30 +++++++++++++++++++-------
 site/resources/views/snippets/navbar.blade.php |  2 +-
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/site/public/css/custom.css b/site/public/css/custom.css
index 417d4dd..b718b50 100644
--- a/site/public/css/custom.css
+++ b/site/public/css/custom.css
@@ -20,8 +20,6 @@
 	padding-right: 20px;
 	padding-left: 20px;
 }
-.bg-dark-opacity {
-}
 .w-55 {
 	width: 55% !important;
 }
@@ -40,3 +38,23 @@
 .mt-20 {
 	margin-top: 20px;
 }
+.text-dotted {
+	text-decoration: underline dotted;
+}
+.off-badge {
+	color: white; 
+	font-size: 150%; 
+	padding-right: 10px; 
+	padding-left:10px; 
+	opacity: 0.9;
+}
+.off-badge-small {
+	font-size: 120%; 
+}
+.text-large {
+	font-size: 120%; 
+}
+.img-grey {
+	opacity: 0.7; 
+	filter: grayscale(100%);
+}
diff --git a/site/resources/views/index.blade.php b/site/resources/views/index.blade.php
index 448c069..c2643cb 100644
--- a/site/resources/views/index.blade.php
+++ b/site/resources/views/index.blade.php
@@ -4,7 +4,7 @@
     <div class="container">
       <div class="jumbotron p-3 p-md-5 text-white rounded bg-dark">
         <div class="col-md-6 px-0">
-          <h1 class="display-4 font-italic">Alkobote.de</h1>
+          <h1 class="display-4 font-italic">Sonderangebote</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">Erfahre mehr...</a></p>
         </div>
@@ -18,7 +18,7 @@ $count = 0;
 foreach( $data as $offer) {
 
 
-	if ( "Anderes" == $offer->spirit_type ) {
+	if ( "Verschiedenes" == $offer->spirit_type ) {
 		$offer->url = "misc";
 		$offer->angebotsname = "anderen Angeboten";
 		$offer->linktext = "Weitere günstige Angebote entdecken.";
@@ -56,11 +56,13 @@ foreach( $data as $offer) {
 			<div class="d-inline align-items-start text-left w-100 mb-2">
 				<strong class="text-dark">{{ $offer->spirit_type }}</strong>
 			</div>
-			<h3 class="mb-0 d-inline-block hide-overflow">
+			<h3 class="mb-0 d-inline-block h-100">
 				<a class="text-dark" href="/{{ $offer->url }}">
 					Hier geht es zu den {{ $offer->angebotsname }}
 				</a>
 			</h3>
+			<p class="card-text ">Bis zu <span class="bg-danger rounded off-badge off-badge-small">{{ $offer->procent}}%</span> sparen!</p>
+			
 			<a class="w-100" href="/{{ $offer->url }}" style="word-wrap: none;">{{ $offer->linktext }}</a>
 			<!--p class="card-text mb-auto text-success w-100"><del class="text-danger">{{ TF::fF($offer->original_price) . "€" }}</del> <strong class="float-right">{{ TF::fF($offer->discounted_price) . "€" }}</strong></p-->
 		</div>
diff --git a/site/resources/views/offer.blade.php b/site/resources/views/offer.blade.php
index f17c39e..54e4e75 100644
--- a/site/resources/views/offer.blade.php
+++ b/site/resources/views/offer.blade.php
@@ -10,6 +10,8 @@
         </div>
       </div>
 
+<div class="row mb-2">
+</div>
 <?php 
 
 $count = 0;
@@ -28,13 +30,13 @@ foreach( $data as $offer) {
 
 			<!-- >= md -->
 			<div class="card-body d-none d-md-flex flex-row align-items-start">
-				<div class="card-img-overlay">
-					<p class="card-text bg-danger float-right rounded" style="color: white; font-size: 150%; padding-right: 10px; padding-left:10px; opacity: 0.9;">{{ $offer->procent}}%</p>
+				<div class="card-img-overlay" title="{{$offer->name}} :: {{ $offer->shop }}">
+					<p class="card-text bg-danger float-right rounded off-badge">{{ $offer->procent}}%</p>
 				</div>
 				<div class="card-img-overlay w-55">
 					<div class="d-inline align-items-start text-left w-100 mb-2">
 						<strong class="text-primary">{{ $offer->spirit_type }}</strong>
-						<a class="text-muted float-right" href="{{ $offer->shop_url }}">{{ $offer->shop }}</a>
+						<a class="text-dark float-right" href="{{ $offer->shop_url }}">{{ $offer->shop }}</a>
 					</div>
 
 					<h4 class="mb-0 hide-overflow h-45">
@@ -56,17 +58,26 @@ foreach( $data as $offer) {
 			<img class="card-img-right flex-auto d-none d-md-block img-thumbnail" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{$offer->name}} :: {{ $offer->shop }}">
 
 			<!-- <= sm -->
-			<img class="card-img-top flex-auto d-sm-block img-thumbnail d-md-none" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{$offer->name}} :: {{ $offer->shop }}" style="opacity: 0.7; filter: grayscale(100%);">
+			<!-- Maybe make the image a link
+				<a href="{{ $offer->url}}">
+				</a>
+			-->
+			<img class="card-img-top flex-auto d-sm-block img-thumbnail d-md-none" src="{{ $offer->image_url }}" alt="{{ $offer->name }}" title="{{$offer->name}} :: {{ $offer->shop }}">
 			<div class="card-body .d-md-none d-lg-none d-xl-none d-xs-flex flex-column align-items-start">
+<!--
 				<div class="h-100 card-img-overlay">
 					<p class="card-text bg-danger float-right rounded" style="color: white; font-size: 150%; padding-right: 10px; padding-left:10px; opacity: 0.9;">{{ $offer->procent}}%</p>
 				</div>
-				<div class="flex-column card-img-overlay bg-dark-opacity" sstyle="top: 350px">
+-->
+				<div class="flex-column bg-dark-opacity" >
 					<div class="d-inline align-items-start text-left w-100 mb-2">
+						<p class="card-text bg-danger rounded off-badge text-center" title="{{$offer->name}} :: {{ $offer->shop }}"><strong>{{ $offer->procent}}%</strong> gesenkt</p>
+						<a class="text-dark float-right text-dotted" href="{{ $offer->shop_url }}">{{ $offer->shop }}</a>
+					</div>
+					<div class="d-block align-items-start text-left w-100 mb-2">
 						<strong class="text-primary">{{ $offer->spirit_type }}</strong>
-						<a class="text-dark" href="{{ $offer->shop_url }}">{{ $offer->shop }}</a>
 					</div>
-					<h3 class="mb-0 d-inline-block hide-overflow">
+					<h3 class="mb-0 d-inline-block hide-overflow h-100">
 					<a class="text-dark ttext-truncate" href="#{{ $offer->name }}" title="{{$offer->name}}" >{{ $offer->name }}</a>
 					</h3>
 
@@ -77,7 +88,10 @@ foreach( $data as $offer) {
 					<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>
 					<span class="float-right text-muted">{{ TF::fF($offer->base_price ) }}€/L</span>
 					</p>
-					<a href="{{ $offer->url }}">Jetzt bestellen</a>
+					<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>
+					</p>
 				</div>
 			</div>
 		</div>
diff --git a/site/resources/views/snippets/navbar.blade.php b/site/resources/views/snippets/navbar.blade.php
index 379dfeb..f9f1860 100644
--- a/site/resources/views/snippets/navbar.blade.php
+++ b/site/resources/views/snippets/navbar.blade.php
@@ -23,7 +23,7 @@
               <a class="nav-link" href="/rum">Rum{!! Request::is('rum') ? ' <span class="sr-only">(current)</span>' : ''!!}</a>
             </li>
             <li class="nav-item {{ Request::is('misc') ? 'active' : '' }}">   
-              <a class="nav-link" href="/misc">Anderes{!! Request::is('misc') ? ' <span class="sr-only">(current)</span>' : ''!!}</a>
+              <a class="nav-link" href="/misc">Verschiedenes {!! Request::is('misc') ? ' <span class="sr-only">(current)</span>' : ''!!}</a>
             </li>
           </ul>
           <form class="form-inline mt-2 mt-md-0">
-- 
cgit v1.2.3