blah

public/s/css/f0ck.css

@@ -253,6 +253,10 @@ html[theme="paper"] .v0ck_player_button svg:hover {
   stroke: var(--white);
 }
 
+html[theme="paper"] .badge-dark, #themeselector {
+  border: 1px solid var(--white);
+}
+
 html[theme="atmos"] {
   --accent: #1fb2b0;
   --bg: #161618;

public/s/js/admin.js

@@ -47,8 +47,6 @@ const flash = ({ type, msg }) => {
       if(!confirm("Do you really want to delete this tag?"))
         return;
       const tagid = +e.target.parentElement.dataset.tagid;
-      /*if(!tags.includes(tag))
-        return alert("wtf");*/
       const res = await deleteTag(postid, tagid);
       if(!res.success)
         return alert("uff");
@@ -89,7 +87,7 @@ const flash = ({ type, msg }) => {
 
         const span = document.createElement("span");
         span.classList.add("badge", "badge-light", "mr-2");
-        span.title = tag.user;
+        span.setAttribute('tooltip', tag.user);
         span.dataset.tagid = tag.id;
 
         if(tag.tag == "sfw") {

views/about.html

@@ -1,4 +1,4 @@
-@include(main/header)
+@include(snippets/header)
     <div class="about">
       <div>
         <a href="/48908"><img src="/s/img/loool.webp" /></a>
@@ -46,4 +46,4 @@
       <p>Cookies: Yes, we set 1 cookie for your prefered stylesheet, this is a optional cookie and not required for the site to function, simply cosmetics, you can block this cookie and the site will still work as intended and will default to the default f0ck theme called "f0ck"</p>
       <p>Logs: No for Tor - Yes for cloudflare and cloudflare probably sells your soul to the devil, however our webserver doesn't log cloudflare connecting to our webserver, if you want to lurk without being flared by the cloud, see the above tor section my man</p>
     </div>
-@include(main/footer)
+@include(snippets/footer)

views/admin.html

@@ -1,3 +1,3 @@
-@include(main/header_admin)
+@include(snippets/header_admin)
 
-@include(main/footer)
+@include(snippets/footer)

views/error.html

@@ -1,3 +1,3 @@
-@include(main/header)
+@include(snippets/header)
 <h1>{{ message }}</h1>
-@include(main/footer)
+@include(snippets/footer)

views/index.html

@@ -1,4 +1,4 @@
-@include(main/header)
+@include(snippets/header)
   <div class="index-container">
     @if(tmp.user)<h2>user: {!! tmp.user.toLowerCase() !!}@if(tmp.mime) ({{ tmp.mime }}s)@else (all)@endif</h2>@endif
     @if(tmp.tag)<h2>tag: @if(session)<a href="/admin/test?tag={!! tmp.tag.toLowerCase() !!}" target="_blank">{!! tmp.tag.toLowerCase() !!}</a>@else{!! tmp.tag.toLowerCase() !!}@endif@if(tmp.mime) ({{ tmp.mime }}s)@else (all)@endif</h2>@endif
@@ -11,4 +11,4 @@
       &#9660;
     </div>
   </div>
-@include(main/footer)
+@include(snippets/footer)

views/item.html

@@ -1,4 +1,4 @@
-@include(main/header)
+@include(snippets/header)
   <div class="container">
     <div class="content">
       <div class="next-post">
@@ -16,8 +16,7 @@
         <div hidden class="f0ck95"><img src="/s/img/f0ck95/computer.png" alt="f0ck95" loading="lazy" /><a href="/random">Random</a></div>
         @if(item.mime.startsWith("video"))
         <div class="embed-responsive embed-responsive-16by9">
-          <video id="my-video" class="embed-responsive-item" width="640" height="360" src="{{ item.dest }}"
-            preload="auto" autoplay controls loop playsinline></video>
+          <video id="my-video" class="embed-responsive-item" width="640" height="360" src="{{ item.dest }}" preload="auto" autoplay controls loop playsinline></video>
         </div>
         @elseif(item.mime.startsWith("audio"))
         <div class="embed-responsive embed-responsive-16by9" style="background: url('@if(item.coverart)//f0ck.me{{ item.coverart }}@else/s/img/200.gif@endif') no-repeat center / contain black;">
@@ -63,16 +62,15 @@
       <span class="badge badge-dark" id="tags">
       @if(typeof item.tags !== "undefined")
         @each(item.tags as tag)
-        <span @if(session)@if(session.id != 9)tooltip@elseiftitle@endif="{{ tag.user }}" data-tagid="{{ tag.id }}"@endif class="badge@if(tag.tag[0] == "&") badge-greentext@endif badge-{{ (tag.tag === "nsfw" ? "danger" : tag.tag === "sfw" ? "success" : "light") }} mr-2">
+        <span @if(session)tooltip="{{ tag.user }}" data-tagid="{{ tag.id }}"@endif class="badge@if(tag.tag[0] == "&") badge-greentext@endif badge-{{ (tag.tag === "nsfw" ? "danger" : tag.tag === "sfw" ? "success" : "light") }} mr-2">
           <a href="/tag/{{ tag.tag.replace(/\s/g, "%20") }}">{{ tag.tag }}</a>@if(session)&nbsp;<a href="#">&#215;</a>@endif
         </span>
         @endeach
       @endif
       @if(session)
-      <a href="#" id="a_addtag">add tag</a>
-      &nbsp;-&nbsp;<a href="#" id="a_toggle">toggle</a>
+      <a href="#" id="a_addtag">add tag</a>&nbsp;-&nbsp;<a href="#" id="a_toggle">toggle</a>
       @endif
       </span>
     </div>
   </div>
-@include(main/footer)
+@include(snippets/footer)

views/partials/pagination.html

@@ -1,15 +0,0 @@
-@if(typeof pagination !== "undefined")
-<nav class="pagination">
-  <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.start }}" class="page-item-1 btn start@if(!pagination.prev) disabled@endif">&laquo;</a>
-  <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.prev }}" class="page-item-2 btn prev@if(!pagination.prev) disabled@endif">&lsaquo;</a>
-  @each(pagination.cheat as i)
-    @if(i == pagination.page)
-      <span class="btn disabled">{{ i }}</span>
-    @else
-      <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ i }}" class="pagination-int-item btn">{{ i }}</a>
-    @endif
-  @endeach
-  <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.next }}" class="page-item-3 btn next@if(!pagination.next) disabled@endif">&rsaquo;</a>
-  <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.end }}" class="page-item-4 btn start@if(!pagination.next) disabled@endif">&raquo;</a>
-</nav>
-@endif

views/ranking.html

@@ -1,4 +1,4 @@
-@include(main/header)
+@include(snippets/header)
 <h1>Ranking lol</h1>
 <table class="table">
   <thead>
@@ -26,4 +26,4 @@
   <tr><td>SFW</td><td>{{ stats.sfw }}</td></tr>
   <tr><td>NSFW</td><td>{{ stats.nsfw }}</td></tr>
 </table>
-@include(main/footer)
+@include(snippets/footer)

views/settings.html

@@ -1,4 +1,4 @@
-@include(main/header)
+@include(snippets/header)
 <h1>Settings</h1>
 <h2>Account</h2>
 <table class="table">
@@ -40,4 +40,4 @@
     @endeach
   </tbody>
 </table>
-@include(main/footer)
+@include(snippets/footer)

views/snippets/navbar.html

@@ -60,7 +60,21 @@
   <div class="collapse navbar-collapse show" id="navbarSupportedContent">
     <div class="pagination-container-fluid">
       <div class="pagination-wrapper">
-        @if(typeof pagination !== "undefined")@include(partials/pagination)@endif
+        @if(typeof pagination !== "undefined")
+        <nav class="pagination">
+          <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.start }}" class="page-item-1 btn start@if(!pagination.prev) disabled@endif">&laquo;</a>
+          <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.prev }}" class="page-item-2 btn prev@if(!pagination.prev) disabled@endif">&lsaquo;</a>
+          @each(pagination.cheat as i)
+            @if(i == pagination.page)
+              <span class="btn disabled">{{ i }}</span>
+            @else
+              <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ i }}" class="pagination-int-item btn">{{ i }}</a>
+            @endif
+          @endeach
+          <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.next }}" class="page-item-3 btn next@if(!pagination.next) disabled@endif">&rsaquo;</a>
+          <a href="/{{ pagination.link }}@if(pagination.link.length != 0)/@endif@if(!pagination.uff)p/@endif{{ pagination.end }}" class="page-item-4 btn start@if(!pagination.next) disabled@endif">&raquo;</a>
+        </nav>
+        @endif
       </div>
     </div>
   </div>