w0bm/Gw0bm
4
0
Fork 0
Code Pull Requests Activity

some css tweaks and other minor improvements/fixes

Browse Source
This commit is contained in:
noxy
2019-11-27 15:23:48 +00:00
parent 5fc7bf3036
commit 50ba00431b
35 changed files with 880 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
<thead>
<tr>
<th>ID</th>
<th>Thumb</th>
<th>Video Title</th>
<th>Artist</th>
<th>Songtitle</th>
@@ -33,6 +34,9 @@
@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>

19
resources/views/layout2/layout.blade.php
View File

@@ -51,10 +51,27 @@
<script type="text/javascript" defer src="/njum/js/popper.min.js"></script>
<script type="text/javascript" defer src="/njum/js/bootstrap.min.js"></script>
<script type="text/javascript" defer src="/njum/js/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" defer src="/njum/js/newscript.js"></script>
<script type="text/javascript" src="/js/clipboard.min.js"></script>
<script type="text/javascript" defer src="/njum/js/newscript.js?v={{ filemtime("njum/js/newscript.js") }}"></script>
<script src="/njum/js/sticky_video.js"></script>
<script>
// Initialize
//new StickyVideo('sticky-container')
</script>
<script type="text/javascript">
var clipboard = new ClipboardJS('.copylink');
clipboard.on('success', function(e) {
console.info('Action:', e.action);
console.info('Text:', e.text);
console.info('Trigger:', e.trigger);
e.clearSelection();
});
clipboard.on('error', function(e) {
console.error('Action:', e.action);
console.error('Trigger:', e.trigger);
});
</script>
</html>

6
resources/views/layout2/partials/frontendedit.blade.php
View File

@@ -35,15 +35,17 @@
</div>
<div class="form-group">
<label for="tageditor">Add Tags</label>
<div class="frontendedittags">
@include('partials.tags')
</div>
</div>
<div class="deleteit">
@endif @if(auth()->check() && auth()->user()->can('delete_video'))<a class="delete_video" href="#"><i class="fa fa-trash fa-lg"></i> Remove upload</a>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Save changes</button>
<button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-dark">Save changes</button>
</div>
</div>
</div>

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

@@ -12,7 +12,10 @@
@if(Auth::check())
<li class="nav-link dropdown">
<button id="nav-user" class="btn btn-dark nav-link bg-toggle dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span><i class="fa fa-user fa-lg"></i> {{Auth::user()->username}}</span>
<span>
@if(Auth::user()->messagesRecv()->unread()->count() < 1)
<span class="nomsg">|</span>@else
<span class="yesmg">|</span>@endif {{Auth::user()->username}}</span>
</button>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<div class="grid-menu">
@@ -32,10 +35,11 @@
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Links
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<div class="dropdown-menu LinksGrid" aria-labelledby="navbarDropdown">
<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="/rules">Rules</a>
<a class="dropdown-item" href="/stats">Stats</a>
</div>
</li>

4
resources/views/layout2/partials/report.blade.php
View File

@@ -30,8 +30,8 @@
<p>Abuse of this form will be awarded with a permanent ban!</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-primary">Send Report</button>
<button type="button" class="btn btn-dark" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-dark">Send Report</button>
</div>
</div>
</div>

8
resources/views/layout2/partials/tags.blade.php
View File

@@ -12,7 +12,7 @@
</div>
</div>
<div class="sendtags">
<button href="/{{$video->id}}/tag" id="submittags" type="submit" class="btn btn-primary">Submit</button>
<button href="/{{$video->id}}/tag" id="submittags" type="submit" class="btn btn-dark">Submit</button>
</div>
</div>
@else
@@ -24,11 +24,11 @@
@if(count($video->tags))
@foreach($video->tags as $tag)
@if($tag == 'sfw')
<span class="badge badge-success"><a href="/index?q={{$tag->normalized}}" class="badge badge-success">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-success" href="#"><i class="fa fa-times"></i></a></span>@endif
<span class="badge badge-sfw"><a href="/index?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@endif
@elseif($tag == 'nsfw')
<span class="badge badge-danger"><a href="/index?q={{$tag->normalized}}" class="badge badge-danger">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-danger" href="#"><i class="fa fa-times"></i></a></span>@endif
<span class="badge badge-nsfw"><a href="/index?q={{$tag->normalized}}" class="badge nsfw-text">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@endif
@else
<span class="badge badge-secondary"><a href="/index?q={{$tag->normalized}}" class="badge badge-secondary">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge badge-secondary" href="#"><i class="fa fa-times"></i></a></span>@endif
<span class="badge badge-secondary"><a href="/index?q={{$tag->normalized}}" class="badge">{{$tag->name}}</a>@if(Auth::check() && Auth::user()->can('edit_video')) <a class="delete-tag badge" href="#"><i class="fa fa-times"></i></a></span>@endif
@endif
@endforeach
@else

2
resources/views/layout2/upload.blade.php
View File

@@ -7,7 +7,7 @@
</div>
<li class="list-group-item">
@include('partials.flash')
<button id="btn-upload" type="button" class="btn btn-primary btn-sm"><span class="laz0r">Fire the laz0r</span>
<button id="btn-upload" type="button" class="btn btn-primary btn-sm"><span class="laz0r">Fire the laz0r</span>
<span class="" id="laz0r-fire"></span>
<span class="hidden-xs" id="shoop-laz0r"></span>
</button>

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

@@ -1,5 +1,6 @@
<ul class="nav justify-content-center">
<li class="safe-for-rating">
<div class="monchichi">
<li class="safe-for-rating legacy-item">
<a class="badge video-id">{{$video->id}}</a>
<a class="badge video-rating {{$sfw ? 'sfw' : 'nsfw'}}">{{$sfw ? "sfw" : "nsfw"}}</a>
</li>
@@ -19,6 +20,9 @@
@else
@endif
</li>
<li class="legacy-item">
<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">
<i class="fa fa-lg fa-info-circle"></i>
@@ -41,4 +45,5 @@
<li class="legacy-item">
<button id="webm_report" class="btn btn-dark" data-toggle="modal" data-target="#webmreportmodal"><i class="fa fa-warning fa-md"></i></button>
</li>
</ul>
</div>
</ul>

13
resources/views/layout2/video-partials/popover-metadata.blade.php
View File

@@ -1,4 +1,7 @@
<div class="popover-metadata">
<div class="filesize">
<span class="dlwebm badge badge-secondary"><a class='file_size' href='{{ '/b/' . $video->file }}' download>{{ HumanReadable::bytesToHuman($video->filesize()) }}</a></span>
</div>
@if($video->videotitle) <div class="artist">
<strong>Videotitle:</strong> {{$video->videotitle}}
</div>@endif
@@ -20,16 +23,12 @@
<div class="added">
<strong>Added:</strong> <a id="timestamp" title="{{$video->created_at->toIso8601String()}}">{{$video->created_at->diffForHumans()}}</a> <time class="timeago" data-toggle="tooltip" datetime="{{$video->created_at->toIso8601String()}}" title="{{$video->created_at->toIso8601String()}}"></time>
</div>
<div class="filesize">
<span class="badge badge-secondary">{{ HumanReadable::bytesToHuman($video->filesize()) }}</span>
<span class="download-webm"><a class='file_size' href='{{ '/b/' . $video->file }}' download>DL</a></span>
</div>
<div class="toggo tag-panel-body">
<div id="tag-display" class="tag-panel-body">
<div class="toggo tag-panel-body smallfontsize">
<div id="tag-display " class="tag-panel-body">
@if(count($video->tags))
@foreach($video->tags as $tag)
@if($tag == 'sfw')
<span class="badge badge-success"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a></span>
<span class="badge badge-sfw"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a></span>
@elseif($tag == 'nsfw')
<span class="badge badge-danger"><a href="/index?q={{$tag->normalized}}" class="default-link">{{$tag->name}}</a></span>
@else