w0bm/Gw0bm
4
0
Fork 0
Code Pull Requests Activity

mehr layout die zweite

Browse Source
This commit is contained in:
noxy
2019-09-02 20:06:38 +00:00
parent 4c21480392
commit 4b6d5812a8
12 changed files with 156 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/css/w0bmcustom.css vendored
View File

@@ -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;
}

7
public/mobile/css/w0bmcustom.css vendored
View File

@@ -3580,3 +3580,10 @@ input#collapsible[type='checkbox'] {
div.content-inner {
color: #fff;
}
button.layoutbutton {
width: 100%;
margin-bottom: 5px;
background: black;
color: white;
}

16
public/mobile/js/w0bmscript.js
View File

@@ -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, "<a href='$1' target='_blank' rel='extern'>$1</a>");
//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, "<a href='$1'>$1</a>");
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());
}));

37
public/z0mb/css/z0mb.css vendored
View File

@@ -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 {
@@ -279,3 +268,23 @@ 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;
}

1
resources/views/layout1/login.blade.php
View File

@@ -7,6 +7,7 @@
<div hiden class="nodisplay">
<div class="wrap-collabsible">
@include('partials.flash')
<input id="collapsible" class="toggle" type="checkbox">
<label for="collapsible" class="lbl-toggle">Login</label>
<div class="collapsible-content">

20
resources/views/layout4/categories.blade.php Normal file
View File

@@ -0,0 +1,20 @@
@extends('profilelayout')
@section('novidcontent')
<div class="page-header">
<h3>Categories</h3>
</div>
<div class="" id="categories">
@foreach($categories as $category)
<div id="category_box_{{$category->shortname}}" class="col-sm-6 col-md-4 category">
<div class="thumbnail">
<img src="{{ asset('/images/cat/' . $category->shortname . '.png') }}" alt="{{$category->name}}">
<div class="caption">
<h3>{{$category->name}} <small>{{$category->videos()->count()}}</small></h3>
<p>{{$category->description}}</p>
<p><a href="{{$category->shortname}}" class="btn btn-primary" role="button">View</a></p>
</div>
</div>
</div>
@endforeach
</div>
@endsection

7
resources/views/layout4/fuetli.blade.php
View File

@@ -6,7 +6,7 @@
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item rating-box">
<li class="nav-item">
<a class="nav-link video-id">{{$video->id}}</a>
<a class="nav-link video-rating {{$sfw ? 'sfw' : 'nsfw'}}">{{$sfw ? "SFW" : "NSFW"}}</a>
</li>
@@ -40,9 +40,8 @@
<input type="checkbox" class="dd-input" id="test">
<ul class="dd-menu">
<li>Action</li>
<li>Another action</li>
<li>Something else here</li>
<li><a href="/{{Auth::user()->username}}">{{Auth::user()->username}}</a></li>
<li><a href="{{url('logout')}}">Logout</a></li>
</ul>
</label>
</li>

62
resources/views/layout4/profilelayout.blade.php
View File

@@ -6,7 +6,7 @@
<meta name="_token" content="{{csrf_token()}}">
<meta name="keywords" content="Random WebMs, WebMs, Internet Videos">
<link rel="icon" href="/favicon.png">
<title>@if(isset($video)){{ $video->id }} -@endif w0bm.com</title>
<title>w0bm.com - Categories</title>
<link rel="stylesheet" type="text/css" href="/z0mb/css/bootstrap-dark.css?v={{ filemtime("z0mb/css/bootstrap-dark.css") }}">
<link rel="stylesheet" type="text/css" href="/z0mb/css/cstms.css?v={{ filemtime("z0mb/css/cstms.css") }}">
<link rel="stylesheet" type="text/css" href="/z0mb/css/z0mb.css?v={{ filemtime("z0mb/css/z0mb.css") }}">
@@ -14,17 +14,61 @@
<body>
<div data-simplebar class="container-fluid">
<div class="container">
<nav class="navbar navbar-expand-lg sticky-top pl-3">
<a class="navbar-brand" href="/">z0mb<zombie>ie</zombie></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="/">Random</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/index">Index</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/categories">Categories</a>
</li>
<li class="nav-item">
<label class="dropdown">
<div class="nav-link dd-button">
{{Auth::user()->username}}
</div>
<input type="checkbox" class="dd-input" id="test">
<ul class="dd-menu">
<li><a href="/user/{{Auth::user()->username}}">{{Auth::user()->username}}</a></li>
<li><a href="{{url('logout')}}">Logout</a></li>
</ul>
</label>
</li>
<li class="nav-item">
<div class="dropdownie">
<input type="checkbox" id="my-dropdownie" value="" name="my-checkbox">
<label class="nav-link" for="my-dropdownie" data-toggle="dropdownie">[ layout ]</label>
<ul class="layout-ul">
<li><a class="nav-link layout1" style="font-size: 10px;" href="/api/user/layout?layout=1">w0bm</a></li>
<li><a class="nav-link layout2" style="font-size: 10px;" href="/api/user/layout?layout=2">Njum</a></li>
<li><a class="nav-link layout3" style="font-size: 10px;" href="/api/user/layout?layout=3">z0mb</a></li>
</ul>
</div>
</li>
</ul>
<div class="search-index hidden-xs d-none d-md-block">
<form method="get" action="/index" class="form-inline my-2 my-lg-0">
{!! Form::text('q', isset($q) ? $q : null, ['class' => 'form-control mr-sm-2 search-input text-light', 'placeholder' => 'Search w0bm.com']) !!}
<button class="btn btn-dark" type="submit">Search</button>
</form>
</div>
</div>
</nav>
@include('partials.flash')
@yield('novidcontent')
<wip>v.1.{{ filemtime("z0mb/css/z0mb.css") }} WIP</wip>
</div>
</div>
</body>
<script type="text/javascript" defer src="/z0mb/js/jquery.min.js"></script>
<script type="text/javascript" defer src="/z0mb/js/jquery.timeago.js"></script>
<script type="text/javascript" defer src="/z0mb/js/popper.min.js"></script>
<script type="text/javascript" defer src="/z0mb/js/bootstrap.min.js"></script>
<script type="text/javascript" defer src="/njum/js/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" defer src="/z0mb/js/handlebars.min.js"></script>
<script type="text/javascript" defer src="/z0mb/js/newscript.js?v={{ filemtime("z0mb/js/newscript.js") }}"></script>
</html>

12
resources/views/layout4/upload.blade.php Normal file
View File

@@ -0,0 +1,12 @@
@extends('profilelayout')
@section('novidcontent')
<div class="container">
<ul class="list-group">
<div class="uploadheader">
<h3 id="upheader">Upload</h3>
</div>
<div class="box">
<p>Uploading is currently only working with JS</p>
<p>Switch layouts <a href="/">/</a></p>
</div>
@endsection

2
resources/views/layout5/layout.blade.php
View File

@@ -90,6 +90,6 @@ clipboard.on('error', function(e) {
console.error('Trigger:', e.trigger);
});
</script>
<script src="/mobile/js/w0bmscript.js?v={{ filemtime("js/w0bmscript.js") }}"></script>
<script src="/mobile/js/w0bmscript.js?v={{ filemtime("mobile/js/w0bmscript.js") }}"></script>
</body>
</html>

1
resources/views/layout5/partials/navigation.blade.php
View File

@@ -17,6 +17,7 @@
<ul class="nav navbar-nav navbar-left">
<li><a href="{{url('categories')}}"><i class="fa fa-clone"></i> Categories</a></li>
<li><a href="{{url('index')}}"><i class="fa fa-list"></i> Index</a></li>
@include('partials.layoutchanger')
</ul>
@if(Auth::check())
<ul class="nav navbar-nav navbar-right">

15
resources/views/layout5/rules.blade.php
View File

@@ -3,14 +3,14 @@
<div class="page-header">
<h4>Rules for w0bm.com</h4>
</div>
<p>These are more or less guidelines for a friendly and peaceful together, please don't try to abuse this or push it to the limits.</p>
<div class="box">
<h5>General</h5>
<ol>
<li>Content on this website is intended for adults (18+).</li>
<li>Content on this website is intended for adults (18+), we can't check your age and don't want to, but keep this in mind, this is a website by adults for adults.</li>
<li>No Comment or Tag spamming</li>
<li>No Child porn and/or underage modeling videos/links to websites</li>
<li>No racism</li>
<li>Be friendly to each other! No harrassing etc.</li>
<li>No Terrorist Propaganda and Content!</li>
</ol>
</div>
@@ -19,16 +19,17 @@
<ol>
<li>The focus is on videos that are catchy and fun to watch, for example <a href="/index?q=loop">loops</a> this does not mean these are the only videos we welcome, it's just our main focus, we have plenty of videos that are completely unrelated to loops or catchy stuff and are still fitting, ask yourself "does my upload fit on w0bm.com?" and if yes, you're good to go!</li>
<li>The Artist and Songtitle field is only for the Artist and Song information respectively, anything else in there probably doesn't belong in there, use the Tags.</li>
<li>The Video Source field shouldn't be used for links, but you guys don't listen to me anyways ;_;</li>
<li>I reserve the right to remove uploads that I consider not worth being on w0bm.com without comment, discussions about deleted videos will be ignored and can lead in extreme cases to a ban.</li>
</ol>
</div>
<div class="box">
<h5>Tagging</h5>
<ol>
<li>Try at least adding 3 tags to your upload, theres always something to describe, even if you do it later on, please do it.</li>
<li>Tags should always describe what you see in the video and maybe some additional informations</li>
<li>No links in the Tags, use the comment section for that!</li>
<li>Always give your video a rating like "sfw" or "nsfw" so people can filter.</li>
<li>Always give your video a rating like "sfw" or "nsfw" so people can filter and please be strict about this in the future!</li>
<li>Comments are not welcome in the Tag section</li>
</ol>
</div>
@@ -36,10 +37,10 @@
<div class="box">
<h5>Commenting</h5>
<ol>
<li>You don't have to be polite, but you also don't have to be an asshole.</li>
<li>NSFW images should only be posted on NSFW videos.</li>
<li>Live with different opinions, and deal with it.</li>
<li>No scam links or links to paywall sites, no unauthorized advertisment</li>
<li>No spam</li>
</ol>
</div>
@@ -49,5 +50,7 @@
<li>Tag reposts with the tag: repost also link the original and the repost in the comments, maybe some admin or moderator is going to care about it and deletes the repost.</li>
</ul>
</div>
<p>These rules can change at any time!</p>
@include('footer')
@endsection