From 4b6d5812a897f4feb1c87aad54fad1784f74c2d8 Mon Sep 17 00:00:00 2001 From: noxy Date: Mon, 2 Sep 2019 20:06:38 +0000 Subject: [PATCH] mehr layout die zweite --- public/css/w0bmcustom.css | 9 +++ public/mobile/css/w0bmcustom.css | 7 +++ public/mobile/js/w0bmscript.js | 16 +++++ public/z0mb/css/z0mb.css | 37 ++++++----- resources/views/layout1/login.blade.php | 1 + resources/views/layout4/categories.blade.php | 20 ++++++ resources/views/layout4/fuetli.blade.php | 7 +-- .../views/layout4/profilelayout.blade.php | 62 ++++++++++++++++--- resources/views/layout4/upload.blade.php | 12 ++++ resources/views/layout5/layout.blade.php | 2 +- .../layout5/partials/navigation.blade.php | 1 + resources/views/layout5/rules.blade.php | 17 ++--- 12 files changed, 156 insertions(+), 35 deletions(-) create mode 100644 resources/views/layout4/categories.blade.php create mode 100644 resources/views/layout4/upload.blade.php diff --git a/public/css/w0bmcustom.css b/public/css/w0bmcustom.css index 30da195..4926e96 100644 --- a/public/css/w0bmcustom.css +++ b/public/css/w0bmcustom.css @@ -3743,6 +3743,15 @@ button#layout4 { color: white; } +button#layout5 { + background: #161618; + width: 100%; + border: 2px solid white; + font-family: Oswald; + margin-bottom: 5px; + color: #1fb2b0; +} + .fickfackfoo.panel-body { padding: 5px 5px; } diff --git a/public/mobile/css/w0bmcustom.css b/public/mobile/css/w0bmcustom.css index e334537..f710eb5 100644 --- a/public/mobile/css/w0bmcustom.css +++ b/public/mobile/css/w0bmcustom.css @@ -3579,4 +3579,11 @@ input#collapsible[type='checkbox'] { div.content-inner { color: #fff; +} + +button.layoutbutton { + width: 100%; + margin-bottom: 5px; + background: black; + color: white; } \ No newline at end of file diff --git a/public/mobile/js/w0bmscript.js b/public/mobile/js/w0bmscript.js index 8217f59..0ff0acd 100644 --- a/public/mobile/js/w0bmscript.js +++ b/public/mobile/js/w0bmscript.js @@ -1410,3 +1410,19 @@ function draw( video, thecanvas, img ){ var dataURL = thecanvas.toDataURL(); img.setAttribute('src', dataURL); } */ + +const infoboxContent = document.querySelector("button#infobox"); +if(infoboxContent) + infoboxContent.dataset.content = infoboxContent.dataset.content.replace(/(https?:\/\/[^\s]+)/g, "$1"); + +//This was supposed to work for urls that are not in a correct url-sheme such as z0r.de/1337 but ehm itz out of biz cuz uhm xD https://f0ck.it/uploads/%5B2019%5D_firefox_YapokIcyShoveler.png +//infoboxContent.dataset.content = infoboxContent.dataset.content.replace(/((https?:\/\/)?[\w-]+(\.[\w-]+)+\.?(:\d+)?(\/\S*)?)?/gi, "$1"); + +document.querySelectorAll("#layoutSwitcher [id^=layout]").forEach(el => el.addEventListener("click", async function(e) { + e.preventDefault(); + const response = await fetch("/api/user/layout?layout=" + this.id.replace("layout", "")); + if(response.ok) + location.reload(); + else + console.warn(response.status, await response.text()); +})); \ No newline at end of file diff --git a/public/z0mb/css/z0mb.css b/public/z0mb/css/z0mb.css index 6145ada..9af5637 100644 --- a/public/z0mb/css/z0mb.css +++ b/public/z0mb/css/z0mb.css @@ -13,7 +13,7 @@ a:link,a:visited{ font-weight:bold; } -a:hover{ +a:hover, .nav-link.dd-button:hover, label.nav-link:hover { color:#999999; } @@ -211,18 +211,7 @@ a.nav-link.layout1:after, a.nav-link.layout2:after, a.nav-link.layout3:after { white-space: nowrap; } -.dd-button:after { - content: ''; - position: absolute; - top: 50%; - right: 15px; - transform: translateY(-50%); - width: 0; - height: 0; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid black; -} + ul.dd-menu { background: black; @@ -234,7 +223,7 @@ ul.dd-menu { } ul.dd-menu > li:hover { - background: #999999; + background: #2f2d2d; } .dd-menu { @@ -278,4 +267,24 @@ ul.dd-menu > li:hover { ul.navbar-nav.mr-auto { flex-direction: row; align-items: flex-end; +} + +label { + margin-bottom: 0; +} + +.nav-link.dd-button { + padding: .5rem 2rem; + font-size: 12px; + font-weight: bold; +} + +label.nav-link { + font-size: 12px; +} + +div#categories { + display: grid; + grid-template-columns: 1fr 1fr; + align-self: center; } \ No newline at end of file diff --git a/resources/views/layout1/login.blade.php b/resources/views/layout1/login.blade.php index 7c6c549..8f9f22b 100644 --- a/resources/views/layout1/login.blade.php +++ b/resources/views/layout1/login.blade.php @@ -7,6 +7,7 @@
+ @include('partials.flash')
diff --git a/resources/views/layout4/categories.blade.php b/resources/views/layout4/categories.blade.php new file mode 100644 index 0000000..53af5df --- /dev/null +++ b/resources/views/layout4/categories.blade.php @@ -0,0 +1,20 @@ +@extends('profilelayout') +@section('novidcontent') +
+

Categories

+
+
+ @foreach($categories as $category) +
+
+ {{$category->name}} +
+

{{$category->name}} {{$category->videos()->count()}}

+

{{$category->description}}

+

View

+
+
+
+ @endforeach +
+@endsection \ No newline at end of file diff --git a/resources/views/layout4/fuetli.blade.php b/resources/views/layout4/fuetli.blade.php index ab519ba..85bdf08 100644 --- a/resources/views/layout4/fuetli.blade.php +++ b/resources/views/layout4/fuetli.blade.php @@ -6,7 +6,7 @@ +

These rules can change at any time!

+ @include('footer') -@endsection +@endsection \ No newline at end of file