Merge with development

6a3ce66e · Karl Hasselbring · 7bb6479b · 9d3367c9 · 6a3ce66e · 6a3ce66e
Commit 6a3ce66e authored Nov 12, 2018 by Karl Hasselbring
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -2,6 +2,7 @@

 namespace App\Console;

+use DB;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

@@ -25,6 +26,12 @@ class Kernel extends ConsoleKernel
    protected function schedule(Schedule $schedule)
    {
        $schedule->command('log:rotate')->everyTenMinutes();
+
+        // Delete all of the old humanverification entries
+        $schedule->call(function() {
+            DB::delete('DELETE FROM humanverification WHERE updated_at < (now() - interval 72 hour) AND whitelist = 0 ORDER BY updated_at DESC');
+            DB::delete('DELETE FROM humanverification WHERE updated_at < (now() - interval 2 week) AND whitelist = 1 ORDER BY updated_at DESC');
+        })->everyThirtyMinutes();
    }

    /**

--- a/resources/assets/less/metager/pages/resultpage/result-page.less
+++ b/resources/assets/less/metager/pages/resultpage/result-page.less
@@ -514,21 +514,30 @@ footer.resultPageFooter {
    grid-template-areas: "results";
 }

-.metager3-unstable-warning-resultpage {
+.metager3-unstable-warning {
    text-align: center;
    position: fixed;
-    bottom: 0;
-    margin-bottom: 0px;
    width: 100%;
+    padding: 15px;
+    @media (max-width: @screen-mobile) {
+        padding: 5px;
+    }
 }

-.metager3-unstable-warning {
-    text-align: center;
-    position: fixed;
+.metager3-unstable-warning-static-pages {
+    .metager3-unstable-warning;
    top: 0;
-    width: 100%;
-    padding-right: 60px;
-    padding-left: 150px;
+    padding-right: 50px;
+    @media (max-width: @screen-mobile) {
+        padding: 5px;
+        padding-right: 50px;
+    }
+}
+
+.metager3-unstable-warning-resultpage {
+    .metager3-unstable-warning;
+    bottom: 0;
+    margin-bottom: 0px;
 }

 /* Settings button and checkboxes */

--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -33,7 +33,7 @@
 	</head>
 	<body>
 		@if(Request::getHttpHost() === "metager3.de")
-		<div class="alert alert-info metager3-unstable-warning">
+		<div class="alert alert-info metager3-unstable-warning-static-pages">
 			{!! @trans('resultPage.metager3') !!}
 		</div>
 		@endif