diff --git a/install.sql b/install.sql
index 10198ee2..2706140d 100644
--- a/install.sql
+++ b/install.sql
@@ -143,7 +143,7 @@ CREATE TABLE IF NOT EXISTS `mods` (
-- Dumping data for table `mods`
--
-INSERT INTO `mods` (`id`, `username`, `password`, `type`, `boards`) VALUES
+INSERT INTO `mods` (`id`, `username`, `password`, `salt`, `type`, `boards`) VALUES
(1, 'admin', 'cedad442efeef7112fed0f50b011b2b9bf83f6898082f995f69dd7865ca19fb7', '4a44c6c55df862ae901b413feecb0d49', 2, '*');
-- --------------------------------------------------------
diff --git a/js/expand.js b/js/expand.js
index 06151627..6b8657bd 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -41,6 +41,9 @@ $(document).ready(function(){
else {
last_expanded = post_in_doc;
}
+ else {
+ last_expanded = post_in_doc;
+ }
});
$('' + _('Hide expanded replies') + '.')
.insertAfter(thread.find('span.omitted').css('display', 'none'))
diff --git a/js/hide-images.js b/js/hide-images.js
new file mode 100644
index 00000000..7344cd8f
--- /dev/null
+++ b/js/hide-images.js
@@ -0,0 +1,84 @@
+/*
+ * hide-images.js
+ * https://github.com/savetheinternet/Tinyboard/blob/master/js/hide-images.js
+ *
+ * Hide individual images.
+ *
+ * Released under the MIT license
+ * Copyright (c) 2013 Michael Save
+ *
+ * Usage:
+ * $config['additional_javascript'][] = 'js/jquery.min.js';
+ * $config['additional_javascript'][] = 'js/hide-images.js';
+ *
+ */
+
+$(document).ready(function(){
+ $('').appendTo($('head'));
+
+ var board = $('form input[name="board"]').val().toString();
+
+ if (!localStorage.hiddenimages)
+ localStorage.hiddenimages = '{}';
+
+ // Load data from HTML5 localStorage
+ var hidden_data = JSON.parse(localStorage.hiddenimages);
+
+ var store_data = function() {
+ localStorage.hiddenimages = JSON.stringify(hidden_data);
+ };
+
+ // Delete old hidden images (30+ days old)
+ for (var key in hidden_data) {
+ for (var id in hidden_data[key]) {
+ if (hidden_data[key][id] < Math.round(Date.now() / 1000) - 60 * 60 * 24 * 30) {
+ delete hidden_data[key][id];
+ store_data();
+ }
+ }
+ }
+
+ if (!hidden_data[board]) {
+ hidden_data[board] = {}; // id : timestamp
+ }
+
+ $('div.post > a > img, div > a > img').each(function() {
+ var img = this;
+ var fileinfo = $(this).parent().prev();
+ var id = $(this).parent().parent().find('>p.intro>a.post_no:eq(1),>div.post.op>p.intro>a.post_no:eq(1)').text();
+
+ var replacement = $('File (hide): ');
+
+ replacement.find('a').click(function() {
+ hidden_data[board][id] = Math.round(Date.now() / 1000);
+ store_data();
+
+ var show_link = $('show').click(function() {
+ delete hidden_data[board][id];
+ store_data();
+
+ $(img)
+ .removeClass('hidden')
+ .attr('src', $(img).data('orig'));
+ $(this).prev().show();
+ $(this).remove();
+ });
+
+ $(this).hide().after(show_link);
+
+ if ($(img).parent()[0].dataset.expanded == 'true') {
+ $(img).parent().click();
+ }
+ $(img)
+ .data('orig', img.src)
+ .attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==')
+ .addClass('hidden');
+ });
+
+ $(this).parent().prev().contents().first().replaceWith(replacement);
+
+ if (hidden_data[board][id])
+ $(this).parent().prev().find('.hide-image-link').click();
+
+ });
+});
diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 7c9923fa..fb78c222 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -3,7 +3,7 @@
* https://github.com/savetheinternet/Tinyboard/blob/master/js/inline-expanding.js
*
* Released under the MIT license
- * Copyright (c) 2012 Michael Save
+ * Copyright (c) 2012-2013 Michael Save
*
* Usage:
* $config['additional_javascript'][] = 'js/jquery.min.js';
@@ -15,31 +15,38 @@ onready(function(){
var inline_expand_post = function() {
var link = this.getElementsByTagName('a');
- for(var i = 0; i < link.length; i++) {
- if(typeof link[i] == "object" && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
+ for (var i = 0; i < link.length; i++) {
+ if (typeof link[i] == "object" && link[i].childNodes && link[i].childNodes[0].src && link[i].className != 'file') {
link[i].childNodes[0].style.maxWidth = '95%';
+ link[i].childNodes[0].style.maxHeight = '95%';
link[i].onclick = function(e) {
- if(e.which == 2) {
+ if (this.childNodes[0].className == 'hidden')
+ return false;
+ if (e.which == 2)
return true;
- }
- if(!this.tag) {
- this.tag = this.childNodes[0].src;
+ if (!this.dataset.src) {
+ this.dataset.expanded = 'true';
+ this.dataset.src= this.childNodes[0].src;
+ this.dataset.width = this.childNodes[0].style.width;
+ this.dataset.height = this.childNodes[0].style.height;
this.childNodes[0].src = this.href;
this.childNodes[0].style.width = 'auto';
this.childNodes[0].style.height = 'auto';
this.childNodes[0].style.opacity = '0.4';
this.childNodes[0].style.filter = 'alpha(opacity=40)';
this.childNodes[0].onload = function() {
- this.style.opacity = '1';
- this.style.filter = '';
+ this.style.opacity = '';
+ delete this.style.filter;
}
} else {
- this.childNodes[0].src = this.tag;
- this.childNodes[0].style.width = 'auto';
- this.childNodes[0].style.height = 'auto';
- this.tag = '';
+ this.childNodes[0].src = this.dataset.src;
+ this.childNodes[0].style.width = this.dataset.width;
+ this.childNodes[0].style.height = this.dataset.height;
+ delete this.dataset.expanded;
+ delete this.dataset.src;
+ delete this.childNodes[0].style.opacity;
+ delete this.childNodes[0].style.filter;
}
- return false;
}
}
}
diff --git a/js/toggle-images.js b/js/toggle-images.js
new file mode 100644
index 00000000..74f2fab4
--- /dev/null
+++ b/js/toggle-images.js
@@ -0,0 +1,77 @@
+/*
+ * toggle-images.js
+ *
+ * Released under the MIT license
+ * Copyright (c) 2012 Michael Save
+ *
+ * Usage:
+ * $config['additional_javascript'][] = 'js/jquery.min.js';
+ * $config['additional_javascript'][] = 'js/toggle-images.js';
+ *
+ */
+
+$(document).ready(function(){
+ var hide_images = localStorage['hideimages'] ? true : false;
+
+ $('').appendTo($('head'));
+
+ var hideImage = function() {
+ if ($(this).parent()[0].dataset.expanded == 'true') {
+ $(this).parent().click();
+ }
+ $(this)
+ .attr('data-orig', this.src)
+ .attr('src', 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==')
+ .addClass('hidden');
+ };
+
+ var restoreImage = function() {
+ $(this)
+ .attr('src', $(this).attr('data-orig'))
+ .removeClass('hidden');
+ };
+
+ // Fix for hide-images.js
+ var show_hide_hide_images_buttons = function() {
+ if (hide_images) {
+ $('a.hide-image-link').each(function() {
+ if ($(this).next().hasClass('show-image-link')) {
+ $(this).next().hide();
+ }
+ $(this).hide().after('hidden');
+ });
+ } else {
+ $('span.toggle-images-placeholder').remove();
+ $('a.hide-image-link').each(function() {
+ if ($(this).next().hasClass('show-image-link')) {
+ $(this).next().show();
+ } else {
+ $(this).show();
+ }
+ });
+ }
+ };
+
+ $('hr:first').before('');
+ $('div#toggle-images a')
+ .text((hide_images ? 'Show' : 'Hide') + ' images')
+ .click(function() {
+ hide_images = !hide_images;
+ if (hide_images) {
+ $('div > a > img').each(hideImage);
+ localStorage.hideimages = true;
+ } else {
+ $('div > a > img').each(restoreImage);
+ delete localStorage.hideimages;
+ }
+
+ show_hide_hide_images_buttons();
+
+ $(this).text((hide_images ? 'Show' : 'Hide') + ' images')
+ });
+
+ if (hide_images) {
+ $('div > a > img').each(hideImage);
+ show_hide_hide_images_buttons();
+ }
+});
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 393f9faa..fbb5370f 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -405,7 +405,6 @@ table.mod.config-editor td {
table.mod.config-editor input[type="text"] {
width: 98%;
}
-
.desktop-style div.boardlist:nth-child(1) {
position: fixed;
top: 0px;
@@ -459,6 +458,6 @@ table.mod.config-editor input[type="text"] {
opacity: 0.8;
}
p.intro.thread-hidden {
- margin: 0px;
- padding: 0px;
+ margin: 0px;
+ padding: 0px;
}