w0bm/Gw0bm
4
0
Fork 0
Code Pull Requests Activity

varios small changes

Browse Source
This commit is contained in:
noxy
2019-11-29 19:39:08 +00:00
parent 50ba00431b
commit 55be581dac
11 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/Http/Controllers/tmp/test.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

2
config/captcha.php
View File

@@ -19,7 +19,7 @@ return [
],
'flat' => [
'length' => 25,
'length' => 17,
'width' => 500,
'height' => 36,
'quality' => 60,

7
public/njum/js/clipboard.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

17
public/njum/js/newscript.js
View File

@@ -1016,7 +1016,7 @@ function deleteComment(self) {
if(retval == 'success') {
flash('success', 'Comment deleted');
comment.removeClass('panel-default').addClass('panel-danger');
comment.find('.panel-footer').children('a[onclick="deleteComment($(this))"]').replaceWith('<a href="#" onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>');
comment.find('.panel-footer').children('a[onclick="deleteComment($(this))"]').replaceWith('<a href="href="#' + id + '"' + 'onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>');
comment.find('.panel-footer > a[onclick="editComment($(this))"]').remove();
}
else if(retval == 'invalid_request') flash('error', 'Invalid request');
@@ -1048,7 +1048,7 @@ function restoreComment(self) {
if(retval == 'success') {
flash('success', 'Comment restored');
comment.removeClass('panel-danger').addClass('panel-default');
comment.find('.panel-footer').children('a[onclick]').replaceWith('<a href="#" onclick="deleteComment($(this))"><i style="color:red"; class="fa fa-times" aria-hidden="true"></i></a> <a href="#" onclick="editComment($(this))"><i style="color:cyan;" class="fa fa-pencil-square" aria-hidden="true"></i></a>');
comment.find('.panel-footer').children('a[onclick]').replaceWith('<a href="href="#' + id + '"' + 'onclick="deleteComment($(this))"><i style="color:red"; class="fa fa-times" aria-hidden="true"></i></a> <a href="href="#' + id + '"' + 'onclick="editComment($(this))"><i style="color:cyan;" class="fa fa-pencil-square" aria-hidden="true"></i></a>');
}
else if(retval == 'invalid_request') flash('error', 'Invalid request');
else if(retval == 'not_logged_in') flash('error', 'Not logged in');
@@ -1074,11 +1074,11 @@ function editComment(self) {
body.replaceWith(textarea);
textarea.val($('<div>').html(retval.comment).text());
self.prev().remove();
self.replaceWith('<a href="#" class="saveCommentEdit">[save]</a> <a href="#" class="abortCommentEdit">[abort]</a>');
self.replaceWith('<a href="#" class="saveCommentEdit">[save]</a> <a href="#' + id + '"' + 'class="abortCommentEdit">[abort]</a>');
comment.find('.abortCommentEdit').on('click', function(e) {
e.preventDefault();
$(this).prev().remove();
$(this).replaceWith('<a class="delete_comment" href="#" onclick="deleteComment($(this))">[del]</a> <a class="edit_comment" href="#" onclick="editComment($(this))">[edit]</a>');
$(this).replaceWith('<a class="delete_comment" href="#' + id + '"' + 'onclick="deleteComment($(this))">[del]</a> <a class="edit_comment" href="#' + id + '"' + 'onclick="editComment($(this))">[edit]</a>');
textarea.replaceWith(body);
});
comment.find('.saveCommentEdit').on('click', function(e) {
@@ -1313,4 +1313,11 @@ function Copy() {
console.log(Url.innerHTML)
Url.select();
document.execCommand("copy");
}
}
// Vielen Dank an Flummi!
// This code snippet makes full and valid urls clickable in the info box!
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>");

1
resources/views/errors/404.blade.php
View File

@@ -1,3 +1,4 @@
<style type="text/css">
body {
background: black;

9
resources/views/layout2/index.blade.php
View File

@@ -12,7 +12,6 @@
<thead>
<tr>
<th>ID</th>
<th>Thumb</th>
<th>Video Title</th>
<th>Artist</th>
<th>Songtitle</th>
@@ -30,13 +29,13 @@
@if($edit = auth()->check() && auth()->user()->can('edit_video'))
<form action="/index/{{$video->id}}" method="post" id="edit_{{$video->id}}" class="indexform"></form>
@endif
<span class="vinfo vid"><a href="{{url($video->id)}}">{{$video->id}}</a></span>
<div class="relativebla">
<span class="vinfo vid"><a href="{{url($video->id)}}">{{$video->id}}</a></span>
<a href="{{url($video->id)}}"><img id="indexthumb" src="/thumbs/beta/{{$thumb}}.png"></a>
</div>
@if($edit)
<input type="submit" class="btn btn-primary" value="Save" form="edit_{{$video->id}}">
@endif
</td>
<td>
<img id="indexthumb" src="/thumbs/beta/{{$thumb}}.png">
</td>
<td>
<span class="vinfo vvideotitle">{{$video->videotitle or ''}}</span>

12
resources/views/layout2/irc.blade.php Normal file
View File

@@ -0,0 +1,12 @@
@extends('profilelayout')
@section('novidcontent')
<div class="page-header">
<h3>IRC</h3>
<p>Don't forget to enable Dark Mode!</p>
</div>
<div class="box">
<iframe src="https://webirc.n0xy.net?nick={{Auth::user()->username}}&join=%23w0bm&username={{Auth::user()->username}}"></iframe>
</div>
@endsection

11
resources/views/layout2/partials/comment.blade.php
View File

@@ -2,14 +2,17 @@
<div class="comment panel-body" author="{{$comment->user->username}}">
@simplemd($comment->content)
</div>
<div class="panel-footer">by <a class="{{$comment->user->username}}" href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time></small>
@if($mod)
<div class="panel-footer">by <a class="{{$comment->user->username}}" href="/user/{{$comment->user->username}}">{!! $comment->user->displayName() !!}</a> <small><time class="timeago" data-toggle="tooltip" data-placement="top" datetime="{{$comment->created_at}}+0000" title="{{$comment->created_at}}+0000"></time>
<div class="dingz">
@if($mod)
@if($del)
<a href="#" onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>
@else
<a class="delete_comment" href="#" onclick="deleteComment($(this))">[del]</a>
<a class="edit_comment" href="#" onclick="editComment($(this))">[edit]</a>
<a class="delete_comment" href="#{{$comment->id}}" onclick="deleteComment($(this))">[del]</a>
<a class="edit_comment" href="#{{$comment->id}}" onclick="editComment($(this))">[edit]</a>
@endif
@endif
</div>
</small>
</div>
</div>

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

@@ -39,6 +39,7 @@
<a class="dropdown-item" href="/index">Index</a>
<a class="dropdown-item" href="/categories">Categories</a>
<a class="dropdown-item" href="/about">About</a>
<a class="dropdown-item" href="/irc">IRC</a>
<a class="dropdown-item" href="/rules">Rules</a>
<a class="dropdown-item" href="/stats">Stats</a>
</div>

2
resources/views/layout2/video-partials/legacy-metadata.blade.php
View File

@@ -24,7 +24,7 @@
<button class="copylink" data-clipboard-text="{{url($video->id)}}" title="Copy URL!"><i class="fa fa-link"></i></button>
</li>
<li class="legacy-item">
<button type="button" class="btn btn-dark metadata-button bg-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true" data-container="body">
<button type="button" id="infobox" class="btn btn-dark metadata-button bg-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-html="true" data-container="body">
<i class="fa fa-lg fa-info-circle"></i>
</button>
</li>

4
resources/views/layout5/partials/comment.blade.php
View File

@@ -7,8 +7,8 @@
@if($del)
<a href="#" onclick="restoreComment($(this))"><i style="color:green"; class="fa fa-refresh" aria-hidden="true"></i></a>
@else
<a class="delete_comment" href="#" onclick="deleteComment($(this))">[del]</a>
<a class="edit_comment" href="#" onclick="editComment($(this))">[edit]</a>
<a class="delete_comment" href="#{{$comment->id}}" onclick="deleteComment($(this))">[del]</a>
<a class="edit_comment" href="#{{$comment->id}}" onclick="editComment($(this))">[edit]</a>
@endif
@endif
</div>