' +
'/'+e[0]+'/ - ' +
''+e[1].replace("thread_", _("Thread #"))+'' +
@@ -35,20 +39,21 @@ watchlist.render = function(reset) {
'
');
});
if ($('#watchlist').length) {
- //If the watchlist is already there, empty it and append the threads.
+ // If the watchlist is already there, empty it and append the threads.
$('#watchlist').children('.watchlist-inner').remove();
$('#watchlist').append(threads.join(''));
} else {
- //If the watchlist has not yet been rendered, create it.
- var menuStyle = getComputedStyle($('.boardlist')[0]);
+ // If the watchlist has not yet been rendered, create it.
+ let menuStyle = getComputedStyle($('.boardlist')[0]);
$((active_page == 'ukko') ? 'hr:first' : (active_page == 'catalog') ? 'body>span:first' : 'form[name="post"]').before(
$(''+
- '
').css("background-color", menuStyle.backgroundColor).css("border", menuStyle.borderBottomWidth+" "+menuStyle.borderBottomStyle+" "+menuStyle.borderBottomColor));
+ ''+
- '['+_('Clear List')+'] '+
- '['+_('Clear Ghosts')+']'+
- '
'+
- threads.join('')+
- ''+
+ '['+_('Clear List')+'] '+
+ '['+_('Clear Ghosts')+']'+
+ '
'+
+ threads.join('')+
+ '').css("background-color", menuStyle.backgroundColor).css("border", menuStyle.borderBottomWidth+" "+menuStyle.borderBottomStyle+" "+menuStyle.borderBottomColor)
+ );
}
return this;
};
@@ -58,32 +63,31 @@ watchlist.render = function(reset) {
* @param {[Obj/Str]} sel [An unwrapped jquery selector.]
*/
watchlist.add = function(sel) {
- var threadName, threadInfo;
+ let threadName;
+ let threadInfo;
- var board_name = $(sel).parents('.thread').data('board');
+ let board_name = $(sel).parents('.thread').data('board');
if (active_page === 'thread') {
- if ($('.subject').length){
- //If a subject is given, use the first 20 characters as the thread name.
+ if ($('.subject').length) {
+ // If a subject is given, use the first 20 characters as the thread name.
threadName = $('.subject').text().substring(0,20);
} else { //Otherwise use the thread id.
threadName = $('.op').parent().attr('id');
}
- //board name, thread name as defined above, current amount of posts, thread url
+ // Board name, thread name as defined above, current amount of posts, thread url
threadInfo = [board_name, threadName, $('.post').length, location.href];
-
} else if (active_page === 'index' || active_page === 'ukko') {
-
- var postCount;
- //Figure out the post count.
+ let postCount;
+ // Figure out the post count.
if ($(sel).parents('.op').children('.omitted').length) {
postCount = $(sel).parents('.op').children('.omitted').text().split(' ')[0];
} else {
postCount = $(sel).parents('.op').siblings('.post').length+1;
}
- //Grab the reply link.;
- var threadLink = $(sel).siblings('a:not(.watchThread)').last().attr('href');
- //Figure out the thread name. If anon, use the thread id.
+ // Grab the reply link.;
+ let threadLink = $(sel).siblings('a:not(.watchThread)').last().attr('href');
+ // Figure out the thread name. If anon, use the thread id.
if ($(sel).parent().find('.subject').length) {
threadName = $(sel).parent().find('.subject').text().substring(0,20);
} else {
@@ -91,7 +95,6 @@ watchlist.add = function(sel) {
}
threadInfo = [board_name, threadName, postCount, threadLink];
-
} else {
alert('Functionality not yet implemented for this type of page.');
return this;
@@ -102,7 +105,7 @@ watchlist.add = function(sel) {
return this;
}
- var _watchlist = JSON.parse(localStorage.watchlist); //Read the watchlist
+ let _watchlist = JSON.parse(localStorage.watchlist); //Read the watchlist
_watchlist.push(threadInfo); //Add the new watch item.
localStorage.watchlist = JSON.stringify(_watchlist); //Save the watchlist.
return this;
@@ -113,7 +116,7 @@ watchlist.add = function(sel) {
* @param {[Int]} n [The index at which to remove.]
*/
watchlist.remove = function(n) {
- var _watchlist = JSON.parse(localStorage.watchlist);
+ let _watchlist = JSON.parse(localStorage.watchlist);
_watchlist.splice(n, 1);
localStorage.watchlist = JSON.stringify(_watchlist);
return this;
@@ -137,26 +140,26 @@ watchlist.exists = function(sel) {
error: function() {
watchlist.remove(parseInt($(sel).attr('id').split('-')[1])).render();
},
- success : function(){
+ success : function() {
return;
}
});
};
-$(document).ready(function(){
+$(document).ready(function() {
if (!(active_page == 'thread' || active_page == 'index' || active_page == 'catalog' || active_page == 'ukko')) {
return;
}
- //Append the watchlist toggle button.
- $('.boardlist').append(' [ '+_('watchlist')+' ]');
- //Append a watch thread button after every OP post number.
- $('.op>.intro>.post_no:odd').after('['+_('Watch Thread')+']');
+ // Append the watchlist toggle button.
+ $('.boardlist').append(' [ ' + _('watchlist') + ' ]');
+ // Append a watch thread button after every OP post number.
+ $('.op>.intro>.post_no:odd').after('[' + _('Watch Thread') + ']');
- //Draw the watchlist, hidden.
+ // Draw the watchlist, hidden.
watchlist.render();
- //Show or hide the watchlist.
+ // Show or hide the watchlist.
$('.watchlist-toggle').on('click', function(e) {
e.preventDefault();
//if ctrl+click, reset the watchlist.
@@ -167,35 +170,33 @@ $(document).ready(function(){
$('#watchlist').css('display', 'none');
} else {
$('#watchlist').css('display', 'block');
- } //Shit got really weird with hide/show. Went with css manip. Probably faster anyway.
+ } // Shit got really weird with hide/show. Went with css manip. Probably faster anyway.
});
- //Trigger the watchlist add function.
- //The selector is passed as an argument in case the page is not a thread.
+ // Trigger the watchlist add function.
+ // The selector is passed as an argument in case the page is not a thread.
$('.watchThread').on('click', function(e) {
e.preventDefault();
watchlist.add(this).render();
});
- //The index is saved in .watchlist-inner so that it can be passed as the argument here.
- //$('.watchlist-remove').on('click') won't work in case of re-renders and
- //the page will need refreshing. This works around that.
+ // The index is saved in .watchlist-inner so that it can be passed as the argument here.
+ // $('.watchlist-remove').on('click') won't work in case of re-renders and
+ // the page will need refreshing. This works around that.
$(document).on('click', '.watchlist-remove', function() {
- var item = parseInt($(this).parent().attr('id').split('-')[1]);
+ let item = parseInt($(this).parent().attr('id').split('-')[1]);
watchlist.remove(item).render();
});
- //Empty the watchlist and redraw it.
- $('#clearList').on('click', function(){
+ // Empty the watchlist and redraw it.
+ $('#clearList').on('click', function() {
watchlist.clear().render();
});
- //Get rid of every watched item that no longer directs to an existing page.
+ // Get rid of every watched item that no longer directs to an existing page.
$('#clearGhosts').on('click', function() {
- $('.watchlist-inner').each(function(){
+ $('.watchlist-inner').each(function() {
watchlist.exists(this);
});
});
-
});
-
diff --git a/stylesheets/style.css b/stylesheets/style.css
index cd2e931b..131e00f4 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -929,9 +929,11 @@ pre {
display: inline-block;
user-select: none;
}
+
.poster_id:hover {
color: #800000!important;
}
+
.poster_id::before {
content: " ID: ";
}
diff --git a/templates/header.html b/templates/header.html
index 51a9593c..335f572e 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -12,7 +12,7 @@
var modRoot = "{{ config.root }}" + (inMod ? "mod.php?/" : "");
{% if not nojavascript %}
-
+
{% if not config.additional_javascript_compile %}
{% for javascript in config.additional_javascript %}{% endfor %}
{% endif %}
diff --git a/templates/post/fileinfo.html b/templates/post/fileinfo.html
index 74ad33d2..105174b5 100644
--- a/templates/post/fileinfo.html
+++ b/templates/post/fileinfo.html
@@ -1,9 +1,9 @@
{% if post.embed %}
{{ post.embed }}
- {% else %}
-
- {% for file in post.files %}
-
+ {% else %}
+
+ {% for file in post.files %}
+
{% if file.file == 'deleted' %}
{% else %}
diff --git a/templates/post/image_identification.html b/templates/post/image_identification.html
index d0609873..4fd45e24 100644
--- a/templates/post/image_identification.html
+++ b/templates/post/image_identification.html
@@ -1,13 +1,13 @@
{% if file.thumb != 'file' and config.image_identification %}
{% if config.image_identification_imgops %}
- ImgOps
+ ImgOps
{% endif %}
{% if config.image_identification_exif and file.file|extension == 'jpg' %}
- Exif
+ Exif
{% endif %}
{% if config.image_identification_google %}
- Google
+ Google
{% endif %}
{% if config.image_identification_iqdb %}
iqdb
@@ -16,4 +16,4 @@
Yandex
{% endif %}
-{% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/templates/post/name.html b/templates/post/name.html
index fda086a5..00490df9 100644
--- a/templates/post/name.html
+++ b/templates/post/name.html
@@ -12,5 +12,5 @@
{% endif %}
{% if capcode %}
- {{ capcode.cap }}
+ {{ capcode.cap }}
{% endif %}