Browse Source

Revert "Merge branch 'master' of github.com:vichan-devel/Tinyboard"

This reverts commit a84c4510fc, reversing
changes made to a8327c3a37.
pull/40/head
czaks 11 years ago
parent
commit
2cc0769f54
  1. 4
      .gitignore
  2. 1
      inc/config.php
  3. 1
      inc/mod/pages.php
  4. 2
      js/expand.js
  5. 1
      templates/boardlist.html
  6. 35
      templates/post_form.html

4
.gitignore

@ -18,7 +18,3 @@
thumbs.db
Icon?
Thumbs.db
#vichan custom
favicon.ico
/static/spoiler.png

1
inc/config.php

@ -1327,3 +1327,4 @@
// Complex regular expression to catch URLs.
$config['url_regex'] = '/' . '(https?|ftp):\/\/' . '(([\w\-]+\.)+[a-zA-Z]{2,6}|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' . '(:\d+)?' . '(\/([\w\-~.#\/?=&;:+%!*\[\]@$\'()+,|\^]+)?)?' . '/';

1
inc/mod/pages.php

@ -1328,6 +1328,7 @@ function mod_delete($board, $post) {
if (!hasPermission($config['mod']['delete'], $board))
error($config['error']['noaccess']);
// Delete post
deletePost($post);
// Record the action
modLog("Deleted post #{$post}");

2
js/expand.js

@ -22,7 +22,7 @@ $(document).ready(function(){
var thread = $(this).parent().parent().parent();
var id = thread.attr('id').replace(/^thread_/, '');
$.ajax({
url: thread.find('p.intro a.post_no.p1:first').attr('href'),
url: thread.find('p.intro a.post_no:first').attr('href'),
context: document.body,
success: function(data) {
var last_expanded = false;

1
templates/boardlist.html

@ -0,0 +1 @@
I'm your overboard boardlist. You can put here anything and I reside in templates/boardlist.html

35
templates/post_form.html

@ -128,41 +128,6 @@
<input type="hidden" name="hash" value="{{ antibot.hash() }}">
</form>
<div style='float: left;' id='_waudiv'>
<script id="_waukts">
_waufun = function() {
$("#_wauscr").remove();
$("#_waudiv div").remove();
WAU_ren = undefined;
_wau = [["classic", "569e2sx122oe", "kts"]];
var s=document.createElement("script");
s.async=true;
s.id="_wauscr";
s.src="http://widgets.amung.us/classic.js?"+Math.random();
document.getElementsByTagName("head")[0].appendChild(s);
setInterval(_waufun, 3600000);
};
_waufun();
</script>
</div>
<div style='float: left; text-align: center; margin: 5px;'>
<strong><a href='http://webchat.6irc.net/?channels=vichan-int-{{ board.uri }}&nick=Anon....'>
IRC: #vichan-int-{{ board.uri }}</strong>
<br><small>New thread preview live and discussion</small></a>
</div>
<div style='float: left; text-align: center; margin: 5px; width: 230px;'>
<strong><a href='http://webchat.6irc.net/?channels=vichan-int-{{ board.uri }}-full&nick=Anon....'>
IRC: #vichan-int-{{ board.uri }}-full</strong>
<br><small>All new posts preview live</small></a>
</div>
<script type="text/javascript">{% raw %}
rememberStuff();
{% endraw %}</script>

Loading…
Cancel
Save