summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md4
-rw-r--r--banned.php19
-rw-r--r--inc/mod/pages.php5
-rw-r--r--stylesheets/style.css20
-rw-r--r--templates/banned.html1
-rw-r--r--templates/notbanned.html7
-rw-r--r--templates/post_form.html2
-rwxr-xr-xtemplates/themes/zine/zine.html5
8 files changed, 52 insertions, 11 deletions
diff --git a/README.md b/README.md
index f9e34934..768714c5 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,9 @@ You can contribute to lainchan by:
* Providing feedback and suggestions
* Writing/editing documentation
-If you need help developing a patch, please join our IRC channel.
+If you need help developing a patch, please join our IRC channel.
+
+> irc.freenode.net @ #lainchan-dev
Installation
-------------
diff --git a/banned.php b/banned.php
index 1bee9115..a38b87c4 100644
--- a/banned.php
+++ b/banned.php
@@ -1,8 +1,15 @@
<?php
- require_once 'inc/functions.php';
- require_once 'inc/bans.php';
- checkBan();
- print "<!doctype html><html><head><meta charset='utf-8'><title>"._("Banned?")."</title></head><body>";
- print "<h1>"._("You are not banned.")."</h1>";
- print "</body></html>";
+ require_once 'inc/functions.php';
+ require_once 'inc/bans.php';
+ checkBan();
+
+ //If the user is not banned, show the "not banned" page.
+ die(
+ Element('page.html', array(
+ 'title' => _('Not banned!'),
+ 'config' => $config,
+ 'nojavascript' => true,
+ 'body' => Element('notbanned.html', array()
+ ))
+ ));
?>
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index f7de6f42..d4d8f755 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1140,8 +1140,9 @@ function mod_move_reply($originBoard, $postID) {
// build index
buildIndex();
+
// build new thread
- buildThread($newID);
+ buildThread($post['op'] ? $newID : $post['thread']);
// trigger themes
rebuildThemes('post', $targetBoard);
@@ -1159,7 +1160,7 @@ function mod_move_reply($originBoard, $postID) {
openBoard($targetBoard);
// Find new thread on our target board
- $query = prepare(sprintf('SELECT thread FROM ``posts_%s`` WHERE `id` = :id', $targetBoard));
+ $query = prepare(sprintf('SELECT thread, id FROM ``posts_%s`` WHERE `id` = :id', $targetBoard));
$query->bindValue(':id', $newID);
$query->execute() or error(db_error($query));
$post = $query->fetch(PDO::FETCH_ASSOC);
diff --git a/stylesheets/style.css b/stylesheets/style.css
index f101845f..0d713b79 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -1872,3 +1872,23 @@ table.fileboard .intro a {
#rules-popup .rules-popup-form-input {
width: 100px;
}
+
+/* dropdown for boardlist. */
+.dropdown {
+ position: relative;
+ display: inline-block;
+}
+
+/* Alter details as needed, I'm not a designer. */
+.dropdown-content {
+ display: none;
+ position: absolute;
+ background-color: #666666;
+ min-width: 130px;
+ padding: 2px 6px;
+ color: #DCA1F5;
+}
+
+.dropdown:hover .dropdown-content {
+ display: block;
+}
diff --git a/templates/banned.html b/templates/banned.html
index b4cdf3f9..65d66281 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -1,6 +1,7 @@
{% filter remove_whitespace %}
{# Automatically removes unnecessary whitespace #}
<div class="ban">
+ <iframe width="420" height="315" src="https://www.youtube.com/embed/FXPKJUE86d0" frameborder="0" allowfullscreen></iframe>
{% if ban.expires and time() >= ban.expires %}
<h2>{% trans %}You were banned! ;_;{% endtrans %}</h2>
{% else %}
diff --git a/templates/notbanned.html b/templates/notbanned.html
new file mode 100644
index 00000000..6654b6d6
--- /dev/null
+++ b/templates/notbanned.html
@@ -0,0 +1,7 @@
+{% filter remove_whitespace %}
+{# Automatically removes unnecessary whitespace #}
+<div class="ban">
+ <h2>You are not banned!</h2>
+ <p class="reason">Well done on not being terrible!</p>
+</div>
+{% endfilter %}
diff --git a/templates/post_form.html b/templates/post_form.html
index c7a94f8b..0b02dab2 100644
--- a/templates/post_form.html
+++ b/templates/post_form.html
@@ -52,6 +52,7 @@
<td>
<input style="float:left;" type="text" name="subject" size="25" maxlength="100" autocomplete="off">
<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />
+ <input id="spoiler" name="spoiler" type="checkbox"><label for="spoiler">Spoiler Image</label>
</td>
</tr>
{% endif %}
@@ -66,6 +67,7 @@
{% if not (not (config.field_disable_subject or (id and config.field_disable_reply_subject)) or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri))) %}
{% if not (not config.field_disable_email or (mod and post.mod|hasPermission(config.mod.bypass_field_disable, board.uri))) %}
<input accesskey="s" style="margin-left:2px;" type="submit" name="post" value="{% if id %}{{ config.button_reply }}{% else %}{{ config.button_newtopic }}{% endif %}" />
+ <input id="spoiler" name="spoiler" type="checkbox"><label for="spoiler">Spoiler Image</label>
{% endif %}
{% endif %}
</td>
diff --git a/templates/themes/zine/zine.html b/templates/themes/zine/zine.html
index bf4f6dac..166c29d0 100755
--- a/templates/themes/zine/zine.html
+++ b/templates/themes/zine/zine.html
@@ -59,8 +59,9 @@
<span>download</span>
</h2>
<div class="cont">
- <a href="2015-04-20.pdf"><img src="2015-04-20.jpg"/><br/><span>01</span></a>
- <a href="2015-08-28.pdf"><img src="2015-08-28.jpg"/><br/><span>02</span></a>
+ <a href="http://lainzine.neocities.org/all-releases/lainzine01.pdf"><img src="http://lainzine.neocities.org/img/lainzine01.png"/><br/><span>01</span></a>
+ <a href="http://lainzine.neocities.org/all-releases/lainzine02.pdf"><img src="http://lainzine.neocities.org/img/lainzine02.png"/><br/><span>02</span></a>
+ <a href="http://lainzine.neocities.org/all-releases/lainzine03.pdf"><img src="http://lainzine.neocities.org/img/lainzine03.png"/><br/><span>03</span></a>
</div>
</div>
</body>