1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-23 23:20:57 +01:00

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

This reverts commit a84c4510fc, reversing
changes made to a8327c3a37.
This commit is contained in:
czaks 2013-08-05 06:17:01 -04:00
parent 0d8e2a65ab
commit 2cc0769f54
6 changed files with 4 additions and 40 deletions

4
.gitignore vendored
View File

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

View File

@ -1327,3 +1327,4 @@
// Complex regular expression to catch URLs. // 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\-~.#\/?=&;:+%!*\[\]@$\'()+,|\^]+)?)?' . '/'; $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\-~.#\/?=&;:+%!*\[\]@$\'()+,|\^]+)?)?' . '/';

View File

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

View File

@ -22,7 +22,7 @@ $(document).ready(function(){
var thread = $(this).parent().parent().parent(); var thread = $(this).parent().parent().parent();
var id = thread.attr('id').replace(/^thread_/, ''); var id = thread.attr('id').replace(/^thread_/, '');
$.ajax({ $.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, context: document.body,
success: function(data) { success: function(data) {
var last_expanded = false; var last_expanded = false;

View File

@ -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 Executable file → Normal file
View File

@ -128,41 +128,6 @@
<input type="hidden" name="hash" value="{{ antibot.hash() }}"> <input type="hidden" name="hash" value="{{ antibot.hash() }}">
</form> </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 %} <script type="text/javascript">{% raw %}
rememberStuff(); rememberStuff();
{% endraw %}</script> {% endraw %}</script>