Cool_Tools/vichan
1
0
Fork 0
mirror of https://github.com/vichan-devel/vichan.git synced 2025-02-24 22:25:00 +01:00
Code Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/fallenPineapple/master'

Browse Source
This commit is contained in:
Equus 2017-04-25 22:42:38 +02:00
commit 807e24d15a
13 changed files with 40 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/functions.php
View File

@ -1855,13 +1855,16 @@ function markup_url($matches) {
$link = (object) array( $link = (object) array(
'href' => $config['link_prefix'] . $url, 'href' => $config['link_prefix'] . $url,
'text' => $url, 'text' => $url,
'rel' => 'nofollow', 'rel' => 'nofollow noreferrer',
'target' => '_blank', 'target' => '_blank',
); );
event('markup-url', $link); event('markup-url', $link);
$link = (array)$link; $link = (array)$link;
if (strncasecmp($link['href'], 'http', 4) === 0)
{
$link['href'] = 'https://href.li/?' . $link['href'];
}
$parts = array(); $parts = array();
foreach ($link as $attr => $value) { foreach ($link as $attr => $value) {
if ($attr == 'text' || $attr == 'after') if ($attr == 'text' || $attr == 'after')

8
js/comment-toolbar.js
View File

@ -314,7 +314,7 @@ if (active_page == 'thread' || active_page == 'index') {
// setting for enabling formatting keybinds // setting for enabling formatting keybinds
$(s1).on(e, function(e) { $(s1).on(e, function(e) {
console.log('Keybind'); console.log('Keybind');
if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'true') { if (localStorage.formatText_keybinds == 'false') {
localStorage.formatText_keybinds = 'true'; localStorage.formatText_keybinds = 'true';
if (window.Options && Options.get_tab('general')) e.target.checked = true; if (window.Options && Options.get_tab('general')) e.target.checked = true;
} else { } else {
@ -339,8 +339,8 @@ if (active_page == 'thread' || active_page == 'index') {
// make sure the tab settings are switch properly at loadup // make sure the tab settings are switch properly at loadup
if (window.Options && Options.get_tab('general')) { if (window.Options && Options.get_tab('general')) {
if (localStorage.formatText_keybinds == 'true') $(s1)[0].checked = true; if (localStorage.formatText_keybinds == 'false') $(s1)[0].checked = false;
else $(s1)[0].checked = false; else $(s1)[0].checked = true;
if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true; if (localStorage.formatText_toolbar == 'true') $(s2)[0].checked = true;
else $(s2)[0].checked = false; else $(s2)[0].checked = false;
} }
@ -350,7 +350,7 @@ if (active_page == 'thread' || active_page == 'index') {
//attach listener to <body> so it also works on quick-reply box //attach listener to <body> so it also works on quick-reply box
$('body').on('keydown', '[name="body"]', function(e) { $('body').on('keydown', '[name="body"]', function(e) {
if (!localStorage.formatText_keybinds || localStorage.formatText_keybinds == 'false') return; if (localStorage.formatText_keybinds == 'false') return;
var key = String.fromCharCode(e.which).toLowerCase(); var key = String.fromCharCode(e.which).toLowerCase();
var rules = JSON.parse(localStorage.formatText_rules); var rules = JSON.parse(localStorage.formatText_rules);
for (var index in rules) { for (var index in rules) {

6
js/settings.js
View File

@ -31,9 +31,9 @@ tb_settings['quick-reply'] = {
// Hide form when scrolled to top of page (where original form is visible) // Hide form when scrolled to top of page (where original form is visible)
hide_at_top: true, hide_at_top: true,
// "Quick reply" button floating at the top right hand corner of the page at all times // "Quick reply" button floating at the top right hand corner of the page at all times
floating_link: false, floating_link: true,
// Show remote in quick reply // Show remote in quick reply
show_remote: false, show_remote: true,
// Show embedding in quick reply // Show embedding in quick reply
show_embed: false show_embed: false
}; };
@ -57,7 +57,7 @@ tb_settings['auto-reload'] = {
// Minimum delay before reloading the page when at the bottom // Minimum delay before reloading the page when at the bottom
min_delay_bottom: 5000, min_delay_bottom: 5000,
// Maximum delay before reloading the page // Maximum delay before reloading the page
max_delay: 600000, max_delay: 60000,
// Delay if there was an error // Delay if there was an error
error_delay: 30000, error_delay: 30000,
// Reset the delay to the minimum upon focussing the window. // Reset the delay to the minimum upon focussing the window.

6
js/toggle-images.js
View File

@ -74,10 +74,10 @@ $(document).ready(function(){
.on(event, function() { .on(event, function() {
hide_images = !hide_images; hide_images = !hide_images;
if (hide_images) { if (hide_images) {
$('img.post-image, .theme-catalog .thread>a>img').each(hideImage); $('img.post-image, .theme-catalog .thread>a>img, img.banner, img.board_image').each(hideImage);
localStorage.hideimages = true; localStorage.hideimages = true;
} else { } else {
$('img.post-image, .theme-catalog .thread>a>img').each(restoreImage); $('img.post-image, .theme-catalog .thread>a>img, img.banner, img.board_image').each(restoreImage);
delete localStorage.hideimages; delete localStorage.hideimages;
} }
@ -87,7 +87,7 @@ $(document).ready(function(){
}); });
if (hide_images) { if (hide_images) {
$('img.post-image, .theme-catalog .thread>a>img').each(hideImage); $('img.post-image, .theme-catalog .thread>a>img, img.banner, img.board_image').each(hideImage);
show_hide_hide_images_buttons(); show_hide_hide_images_buttons();
if (window.Options && Options.get_tab('general')) { if (window.Options && Options.get_tab('general')) {

0
stylesheets/img/testorange_f_bg.gif → stylesheets/img/orange_f_bg.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 143 B

After

Width:  |  Height:  |  Size: 143 B

0
stylesheets/img/testorange_textarea_bg.gif → stylesheets/img/orange_textarea_bg.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

BIN
stylesheets/img/testorange_testo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

18
stylesheets/testorange.css → stylesheets/orange.css
View File

@ -1,4 +1,4 @@
/* +piwnichan style, based on testorange.css from Karachan */ /* +piwnichan style, based on orange.css from Karachan */
body { body {
font-family: sans-serif; font-family: sans-serif;
@ -6,19 +6,19 @@ body {
color:#bebebe; color:#bebebe;
background-color: #1e1e1e; background-color: #1e1e1e;
background-image: url('img/testorange_testo.png'), url('img/testorange_top_bg.png'), url('img/testorange_bg.png'); background-image: url('img/orange_top_bg.png'), url('img/orange_bg.png');
background-repeat: no-repeat, repeat-x, repeat; background-repeat: repeat-x, repeat;
background-attachment: fixed, scroll, scroll; background-attachment: scroll, scroll;
background-position: right bottom, 0% 0%, 0% 0%; background-position: 0% 0%, 0% 0%;
} }
.desktop-style .bl-menu{ .desktop-style .bl-menu{
background-image: url('img/testorange_bg.png'); background-image: url('img/orange_bg.png');
background-repeat: repeat; background-repeat: repeat;
} }
.boardlist .board a { .boardlist .board a {
background-image: url('img/testorange_bg.png'); background-image: url('img/orange_bg.png');
background-repeat: repeat; background-repeat: repeat;
} }
@ -46,7 +46,7 @@ input {
background: #fff; background: #fff;
} }
textarea { textarea {
background: #dedede url('img/testorange_textarea_bg.gif') repeat-x; background: #dedede url('img/orange_textarea_bg.gif') repeat-x;
} }
input, textarea { input, textarea {
border: 1px #fff solid; border: 1px #fff solid;
@ -180,7 +180,7 @@ div.post.reply {
color: #bebebe; color: #bebebe;
} }
form table th, div.banner, div.pages, .replymode, .postblock, .passvalid, .catalogmode { form table th, div.banner, div.pages, .replymode, .postblock, .passvalid, .catalogmode {
background: #ff9100 url('img/testorange_f_bg.gif') repeat-x !important; background: #ff9100 url('img/orange_f_bg.gif') repeat-x !important;
} }
div.pages, div.pages a { div.pages, div.pages a {
color: black; color: black;

13
stylesheets/style.css
View File

@ -549,7 +549,6 @@ table.mod.config-editor input[type="text"] {
z-index: 30; z-index: 30;
box-shadow: 0 1px 2px rgba(0, 0, 0, .15); box-shadow: 0 1px 2px rgba(0, 0, 0, .15);
border-bottom: 1px solid; border-bottom: 1px solid;
background-color: #D6DAF0;
} }
.desktop-style body { .desktop-style body {
@ -988,17 +987,7 @@ div.boardlist a {
/* Threads */ /* Threads */
/* Thread Footer */ /* Thread Footer */
#thread-interactions-alt {
margin: 8px 0;
clear: both;
}
#thread-links-alt {
float: left;
}
#thread-links-alt > a {
padding-left: none;
padding-right: 10px;
}
#thread-interactions { #thread-interactions {
margin: 8px 0; margin: 8px 0;
clear: both; clear: both;

11
templates/index.html
View File

@ -60,17 +60,10 @@
<form name="postcontrols" action="{{ config.post_url }}" method="post"> <form name="postcontrols" action="{{ config.post_url }}" method="post">
<input type="hidden" name="board" value="{{ board.uri }}" /> <input type="hidden" name="board" value="{{ board.uri }}" />
{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %} {% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
<a id="unimportant" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a> &nbsp; {% if config.catalog_link %}<a id="unimportant" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>{% endif %} &nbsp; <a id="unimportant" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a> &nbsp; {% if config.catalog_link %}<a id="unimportant" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>{% endif %}
<hr /> <hr />
{{ body }} {{ body }}
<div id="thread-interactions-alt"> &nbsp; <a id="unimportant" href="#top">[{% trans %}Go to top{% endtrans %}]</a> &nbsp; {% if config.catalog_link %}<a id="unimportant" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>{% endif %}
<span id="thread-links-alt">
<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
{% if config.catalog_link %}
<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
{% endif %}
</span>
</div>
{% include 'report_delete.html' %} {% include 'report_delete.html' %}
</form> </form>

9
templates/main.js
View File

@ -1,4 +1,10 @@
{% raw %} {% raw %}
/*
* main.js - This file is compiled and contains code from the following scripts, concatenated together in order:
* {% endraw %}{{ config.additional_javascript|join(', ') }}{% raw %}
* Please see those files for licensing and authorship information.
* Compiled on {% endraw %}{{ time()|date("%c") }}{% raw %}
*/
/* gettext-compatible _ function, example of usage: /* gettext-compatible _ function, example of usage:
* *
@ -390,6 +396,9 @@ function ready() {
var post_date = "{{ config.post_date }}"; var post_date = "{{ config.post_date }}";
var max_images = {{ config.max_images }}; var max_images = {{ config.max_images }};
if (typeof active_page === "undefined") {
active_page = "page";
}
onready(init); onready(init);

2
templates/themes/recent/recent.html
View File

@ -17,7 +17,7 @@
<h1>{{ settings.title }}</h1> <h1>{{ settings.title }}</h1>
<div class="subtitle">{{ settings.subtitle }}</div> <div class="subtitle">{{ settings.subtitle }}</div>
</header> </header>
{% if config.url_banner %}<img class="board_image" src="{{ config.url_banner }}" {% if config.banner_width or config.banner_height %}style="{% if config.banner_width %}width:{{ config.banner_width }}px{% endif %};{% if config.banner_width %}height:{{ config.banner_height }}px{% endif %}" {% endif %}alt="" />{% endif %}
<div class="box-wrap"> <div class="box-wrap">
<div class="box left"> <div class="box left">
<h2>Recent Images</h2> <h2>Recent Images</h2>

4
templates/thread.html
View File

@ -55,16 +55,16 @@
<form name="postcontrols" action="{{ config.post_url }}" method="post"> <form name="postcontrols" action="{{ config.post_url }}" method="post">
<input type="hidden" name="board" value="{{ board.uri }}" /> <input type="hidden" name="board" value="{{ board.uri }}" />
{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %} {% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}
<a id="unimportant" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a> &nbsp; {% if config.catalog_link %}<a id="unimportant" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>{% endif %} &nbsp; <a id="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a> &nbsp; <a id="unimportant" href="#bottom">[{% trans %}Go to bottom{% endtrans %}]</a> &nbsp; {% if config.catalog_link %}<a id="unimportant" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>{% endif %} &nbsp; <a id="unimportant" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
<hr /> <hr />
{{ body }} {{ body }}
<div id="thread-interactions"> <div id="thread-interactions">
<span id="thread-links"> <span id="thread-links">
<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
<a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a> <a id="thread-top" href="#top">[{% trans %}Go to top{% endtrans %}]</a>
{% if config.catalog_link %} {% if config.catalog_link %}
<a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a> <a id="thread-catalog" href="{{ config.root }}{{ board.dir }}{{ config.catalog_link }}">[{% trans %}Catalog{% endtrans %}]</a>
{% endif %} {% endif %}
<a id="thread-return" href="{{ return }}">[{% trans %}Return{% endtrans %}]</a>
</span> </span>
<span id="thread-quick-reply"> <span id="thread-quick-reply">