Merge branch 'f0ckdev' into 'master'

Revert

See merge request !105
This commit is contained in:
Flummi 2017-04-01 18:01:25 +00:00
commit 7f4265614c
3 changed files with 34 additions and 21 deletions

View File

@ -9,7 +9,7 @@
<body> <body>
<div class="navbar"><a href="/">f0ck.me</a> | <a href="/how">how to</a> | <a href="/contact">Contact</a> | <a href="/random">Random</a> | <span id="themes"></span></div> <div class="navbar"><a href="/">f0ck.me</a> | <a href="/how">how to</a> | <a href="/contact">Contact</a> | <a href="/random">Random</a> | <span id="themes"></span></div>
<ul id="posts" data-last="{{ last }}"> <ul id="posts" data-last="{{ last }}">
{% for item in items %}<li class="post"><a href="./{{ item.id }}" title="{{ item.mime }}"><img class="thumb" src="./t/16430.png" /></a></li> {% for item in items %}<li class="post"><a href="./{{ item.id }}" title="{{ item.mime }}"><img class="thumb" src="./t/{{ item.id }}.png" /></a></li>
{% endfor %} {% endfor %}
</ul> </ul>
<script src="./s/jquery-3.1.0.min.js"></script> <script src="./s/jquery-3.1.0.min.js"></script>

View File

@ -22,13 +22,25 @@
</div> </div>
<div class="wrapper"> <div class="wrapper">
<div class="medium"> <div class="medium">
{% if item == "image" || item == "audio" || item == "video" %} {% if item == "video" %}
<a href="{{ dest }}" target="_blank"><img src="./b/dc4c9160.jpg" style="max-width: 640px;height:auto;" /></a> <video id="player" src="{{ dest }}" preload="auto" controls loop></video>
{% elseif item == "audio" %}
{% if thumb != null %}
<div>
<img src="{{ thumb }}" /><br />
{% endif %}
<audio id="player" controls loop src="{{ dest }}" type="audio/mp3" ></audio>
{% if thumb != null %}
</div>
{% endif %}
{% elseif item == "image" %}
<a href="{{ dest }}" target="_blank"><img src="{{ dest }}" style="max-width: 640px;height:auto;" /></a>
{% else %} {% else %}
<h1>404 - Not f0cked</h1> <h1>404 - Not f0cked</h1>
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="panel info"> <div class="panel info">
<span class="id">ID: {{ id }} | by: <span class="name">{{ username }}</span><span></span><br /> <span class="id">ID: {{ id }} | by: <span class="name">{{ username }}</span><span></span><br />
<span class="src">src: <a id="holland" href="{{ srcurl }}" target="_blank">{{ src }}</a></span><br /> <span class="src">src: <a id="holland" href="{{ srcurl }}" target="_blank">{{ src }}</a></span><br />
@ -40,6 +52,7 @@
<span class="timestamp">timestamp: {{ timestamp }}</span><br> <span class="timestamp">timestamp: {{ timestamp }}</span><br>
<span id="themes">theme: </span> <span id="themes">theme: </span>
</div> </div>
<script src="./s/shit.js"></script> <script src="./s/shit.js"></script>
<script src="./s/theme.js"></script> <script src="./s/theme.js"></script>
<script src="./s/plyr.js"></script> <script src="./s/plyr.js"></script>

View File

@ -7,7 +7,7 @@ $(()=>{
var html = ""; var html = "";
for(var i = 0; i < msg.items.length; i++) for(var i = 0; i < msg.items.length; i++)
if(msg.items[i].id) if(msg.items[i].id)
html += "<li class=\"post\"><a href=\"./"+msg.items[i].id+"\" title=\""+msg.items[i].mime+"\"><img class=\"thumb\" src=\"./t/16430.png\" /></a></li>\n"; html += "<li class=\"post\"><a href=\"./"+msg.items[i].id+"\" title=\""+msg.items[i].mime+"\"><img class=\"thumb\" src=\"./t/"+msg.items[i].id+".png\" /></a></li>\n";
$('#posts').append(html); $('#posts').append(html);
$('#posts').data('last', msg.last); $('#posts').data('last', msg.last);
load = false; load = false;