Merge branch '596-umfangreicher-designumbau-ergebnisseite' into 'MetaGer-Redesign'

Resolve "Umfangreicher Designumbau Ergebnisseite"

See merge request !1060

public/css/theme.css.php

@@ -15,9 +15,10 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
 	-webkit-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
 	-moz-box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
 	box-shadow: 0px 0px 2px 2px <?=$colorRGBA?>;
-    border-color: <?=$colorRGBA?>;
+  border-color: <?=$colorRGBA?>;
 }
 
+
 #mglogo > a {
 	background-image: linear-gradient(<?=$color?> 0%, <?=$color?> 250%);
     background-color: transparent;
@@ -46,11 +47,6 @@ input[type=text]:focus, textarea:focus, input[type=email]:focus, input[type=tel]
 	box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
 }
 
-.navbar.navbar-resultpage {
-    border-bottom: 2px solid <?=$color?>;
-    box-shadow: none;
-}
-
 .lSPrev > i, .lSNext > i {
 	color: <?=$color?>;
 }
\ No newline at end of file

resources/assets/js/scriptResultPage.js

@@ -82,6 +82,15 @@ function getDocumentReadyForUse (fokus, custom = false) {
   productWidget();
   $('iframe:not(.resized)').iFrameResize();
   $('iframe').addClass('resized');
+  addListeners();
+}
+
+function addListeners () {
+  $('#reset').attr('type', 'button').click(resetSearchbar);
+}
+
+function resetSearchbar () {
+  $('#eingabeTop').val('');
 }
 
 function pluginInfo () {
@@ -570,7 +579,7 @@ function loadQuicktips (search, locale, sprueche) {
 }
 
 const QUICKTIP_SERVER = 'https://quicktips.metager3.de';
-//const QUICKTIP_SERVER = 'http://localhost:63825';
+// const QUICKTIP_SERVER = 'http://localhost:63825'
 
 /**
  * Requests quicktips from the quicktip server and passes them to the loadedHandler
@@ -588,7 +597,6 @@ function getQuicktips (search, locale, blacklist, loadedHandler) {
   $.get(getString, function (data, status) {
     if (status === 'success') {
       var quicktips = $(data).children('feed').children('entry').map(function () {
-        console.log(this);
         return quicktip = {
           type: $(this).children('mg\\:type').text(),
           title: $(this).children('title').text(),
@@ -605,7 +613,6 @@ function getQuicktips (search, locale, blacklist, loadedHandler) {
           }).toArray()
         };
       }).toArray();
-      console.log(quicktips);
       loadedHandler(quicktips);
     } else {
       console.error('Loading quicktips failed with status ' + status);

resources/assets/less/metager/result-page.less

@@ -93,6 +93,8 @@ footer {
 .navbar-resultpage {
     background-color: @navbar-resultpage-background-color;
     position: absolute;
+    border-bottom: 2px solid #ff8000;
+    padding-bottom: 10px;
     &>ul>li {
         padding-left: 0;
         padding-right: 0;
@@ -295,9 +297,55 @@ a {
     border: 1px dotted black;
 }
 
+#logo-searchbar-container {
+    display: flex;
+}
+
+.mg-logo {
+    color: #ff8000;
+    font-family: Liberation Sans, sans-serif;
+    padding: 5px 30px 0px 0px;
+}
+
+#header-searchbar {
+    flex-grow: 1;
+}
+
+.searchbar {
+    margin-top: 5px;
+    display: flex;
+    align-items: center;
+    border-left: #bbb solid 1px;
+    .search-input {
+        order: 2;
+        border: none;
+        box-shadow: none !important;
+        border: white solid 1px;
+        font-size: 16px;
+        &:focus {
+            border: #bbb dotted 1px;
+            background-color: #eee;
+            -webkit-box-shadow: none;
+            -moz-box-shadow: none;
+            box-shadow: none;
+        }
+    }
+    .search-reset {
+        order: 1;
+        border: none;
+        background-color: transparent;
+        color: #444;
+    }
+    .search-submit {
+        order: 3;
+        color: #bbb;
+        font-size: 20px;
+    }
+}
+
 .result {
-    margin-top: 10px;
-    margin-bottom: 30px;
+    margin-top: 20px;
+    margin-bottom: 40px;
     width: 100%;
     &>.resultInformation {
         border-radius: 5px;
@@ -618,6 +666,7 @@ a {
     }
 }
 
+
 /*
  * <div id="quicktips">
  *   <div class="quicktip" type="TYPE">
@@ -660,16 +709,16 @@ a {
             border-bottom: 1px solid #ddd;
             h2 {
                 margin: 10px 0px;
-                font-size: 16px;
+                font-size: 17px;
                 font-weight: bold;
             }
             p {
                 display: none;
-                font-size: 14px;
+                font-size: 15px;
             }
         }
         .gefVon {
-            font-size: 14px;
+            font-size: 15px;
         }
         &[type=spruch] {
             border-left: 3px solid #070;

resources/assets/less/metager/variables.less

@@ -46,4 +46,14 @@
 @base-aufruf-winter-border-color: #953535;
 @base-aufruf-winter-btn-color: white;
 @base-aufruf-winter-btn-hover-background-color: #bd0d0d;
-@base-new-feature-badge-background-color: #f80;
\ No newline at end of file
+@base-new-feature-badge-background-color: #f80;
+// Bootstrap Ersatz
+/*
+@screen-sm-min: 768px;
+@screen-md-min: 992px;
+@screen-lg-min: 1200px;
+@screen-xs-max: (@screen-sm-min - 1);
+@screen-sm-max: (@screen-md-min - 1);
+@screen-md-max: (@screen-lg-min - 1);
+@grid-gutter-width: 30px;
+*/
\ No newline at end of file

resources/lang/de/resultPage.php

@@ -4,4 +4,5 @@ return [
     'opensearch' => 'MetaGer: Sicher suchen & finden, Privatsphäre schützen',
     'startseite'  => 'MetaGer-Startseite',
     'impressum'  => 'Impressum',
+    'search-placeholder' => 'Suchbegriff(e) eingeben',
 ];

resources/views/layouts/researchandtabs.blade.php

@@ -12,17 +12,16 @@
 	<header id="research" class="row">
 		<nav class="navbar navbar-default navbar-fixed-top navbar-resultpage">
 			<div class="container">
-				<div class="row">
-					<div class="col-xs-3 logo dense-col">
-						<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1>M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
+				<div class="row" id="logo-searchbar-container">
+					<div id="header-logo">
+						<a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}"><h1 class="mg-logo">M<span class="hidden-xs">eta</span>G<span class="hidden-xs">er</span></h1></a>
 					</div>
-					<div class="col-xs-9 dense-col">
+					<div id="header-searchbar">
 						<form method="{{ Request::method() }}" accept-charset="UTF-8" class="form search-bar-input" id="submitForm">
-							<div class="input-group">
-								<input autocomplete="off" class="form-control" form="submitForm" id="eingabeTop" name="eingabe" placeholder="Suchbegriffe erweitern/verändern, oder völlig neue Suche:" tabindex="1" type="text" value="{{ $eingabe }}" required />
-								<div class="input-group-addon">
-									<button type='submit' form="submitForm" id='search'><i class="fa fa-search" aria-hidden="true"></i></button>
-								</div>
+							<div class="searchbar">
+								<input autocomplete="off" class="form-control search-input" form="submitForm" id="eingabeTop" name="eingabe" placeholder="{{ @trans('resultPage.search-placeholder') }}" tabindex="1" type="text" value="{{ $eingabe }}" required />
+								<button class="search-reset" type='reset' accesskey="r" form="submitForm" id='reset' value=""><i class="fa fa-times" aria-hidden="true"></i></button>
+								<button class="search-submit" type='submit' form="submitForm" id='search'><i class="fa fa-search" aria-hidden="true"></i></button>
 							</div>
 							@foreach( $metager->request->all() as $key => $value)
 								@if($key !== "eingabe" && $key !== "page" && $key !== "next")
@@ -30,7 +29,7 @@
 								@endif
 							@endforeach
 						</form>
-					</div>
+          </div>
 				</div>
 			</div>
 		</nav>