Added nojavascript option in template files; made use of it in install.php. Pre-compiled default main.js no longer distributed with Tinyboard.

This commit is contained in:
Savetheinternet 2011-11-19 00:06:51 +11:00
parent 3e28328dc9
commit f25365dec5
5 changed files with 5 additions and 200 deletions

View File

@ -11,7 +11,8 @@
$page = Array(
'config' => $config,
'title' => 'Install',
'body' => ''
'body' => '',
'nojavascript' => true
);
// this breaks the dispaly of licenses if enabled

196
main.js
View File

@ -1,196 +0,0 @@
function get_cookie(cookie_name)
{
var results = document.cookie.match ( '(^|;) ?' + cookie_name + '=([^;]*)(;|$)');
if(results)
return (unescape(results[2]));
else
return null;
}
function highlightReply(id)
{
if(window.event !== undefined && event.which == 2) {
// don't highlight on middle click
return true;
}
var divs = document.getElementsByTagName('div');
for (var i = 0; i < divs.length; i++)
{
if (divs[i].className.indexOf('post') != -1)
divs[i].className = divs[i].className.replace(/highlighted/, '');
}
if (id) {
post = document.getElementById('reply_'+id);
if(post)
post.className += ' highlighted';
}
}
function focusId(id)
{
document.getElementById(id).focus();
init();
}
function generatePassword() {
pass = '';
chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()_+';
for(i=0;i<8;i++) {
rnd = Math.floor(Math.random() * chars.length);
pass += chars.substring(rnd,rnd + 1);
}
return pass;
}
function dopost(form) {
localStorage.name = form.name.value.replace(/ ##.+$/, '');
if(form.email.value != 'sage')
localStorage.email = form.email.value;
saved[document.location] = form.body.value;
sessionStorage.body = JSON.stringify(saved);
return form.body.value != "" || form.file.value != "";
}
function citeReply(id) {
body = document.getElementById('body');
if (document.selection) {
// IE
body.focus();
sel = document.selection.createRange();
sel.text = '>>' + id + '\n';
} else if (body.selectionStart || body.selectionStart == '0') {
// Mozilla
start = body.selectionStart;
end = body.selectionEnd;
body.value = body.value.substring(0, start) + '>>' + id + '\n' + body.value.substring(end, body.value.length);
} else {
// ???
body.value += '>>' + id + '\n';
}
}
var selectedstyle = 'Yotsuba B';
var styles = [
['Yotsuba B', '/Tinyboard/stylesheets/default.css'],
['Yotsuba', '/Tinyboard/stylesheets/yotsuba.css']
];
var saved = {};
function changeStyle(x) {
localStorage.stylesheet = styles[x][1];
document.getElementById('stylesheet').href = styles[x][1];
selectedstyle = styles[x][0];
}
if(localStorage.stylesheet) {
for(x=0;x<styles.length;x++) {
if(styles[x][1] == localStorage.stylesheet) {
changeStyle(x);
break;
}
}
}
function rememberStuff() {
if(document.forms.post) {
if(!localStorage.password)
localStorage.password = generatePassword();
document.forms.post.password.value = localStorage.password;
if(localStorage.name)
document.forms.post.name.value = localStorage.name;
if(localStorage.email)
document.forms.post.email.value = localStorage.email;
if (window.location.hash.indexOf('q') == 1)
citeReply(window.location.hash.substring(2));
if(sessionStorage.body) {
saved = JSON.parse(sessionStorage.body);
if(get_cookie('serv')) {
// Remove successful posts
successful = JSON.parse(get_cookie('serv'));
for (var url in successful) {
saved[url] = null;
}
sessionStorage.body = JSON.stringify(saved);
document.cookie = 'serv={};expires=0;path=/;';
}
if(saved[document.location]) {
document.forms.post.body.value = saved[document.location];
}
}
if(localStorage.body) {
document.forms.post.body.value = localStorage.body;
localStorage.body = '';
}
}
}
function init_expanding() {
link = document.getElementsByTagName('a');
for ( i in link ) {
if(typeof link[i] == "object" && link[i].childNodes[0].src && link[i].className != 'file') {
link[i].onclick = function(e) {
if(e.which == 2) {
return true;
}
if(!this.tag) {
this.tag = this.childNodes[0].src;
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 = '';
}
} else {
this.childNodes[0].src = this.tag;
this.childNodes[0].style.width = 'auto';
this.childNodes[0].style.height = 'auto';
this.tag = '';
}
return false;
}
}
}
}
function init()
{
newElement = document.createElement('div');
newElement.className = 'styles';
for(x=0;x<styles.length;x++) {
style = document.createElement('a');
style.innerHTML = '[' + styles[x][0] + ']';
style.href = 'javascript:changeStyle(' + x + ');';
if(selectedstyle == styles[x][0])
style.className = 'selected';
newElement.appendChild(style);
}
document.getElementsByTagName('body')[0].insertBefore(newElement, document.getElementsByTagName('body')[0].lastChild.nextSibling)
if(document.forms.postcontrols) {
document.forms.postcontrols.password.value = localStorage.password;
}
if(window.location.hash.indexOf('q') != 1 && window.location.hash.substring(1))
highlightReply(window.location.hash.substring(1));
init_expanding();
}
var RecaptchaOptions = {
theme : 'clean'
};
window.onload = init;

View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}" />{% endif %}
<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}" />
<script type="text/javascript" src="{{ config.url_javascript }}"></script>
{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}
{% if config.recaptcha %}<style type="text/css">{% raw %}
.recaptcha_image_cell {
background: none !important;

View File

@ -7,7 +7,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}" />
<script type="text/javascript" src="{{ config.url_javascript }}"></script>
{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}
</head>
<body>
{% if pm %}<div class="top_notice">You have <a href="?/PM/{{ pm.id }}">an unread PM</a>{% if pm.waiting > 0 %}, plus {{ pm.waiting }} more waiting{% endif %}.</div><hr />{% endif %}

View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}" />{% endif %}
<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}" />
<script type="text/javascript" src="{{ config.url_javascript }}"></script>
{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}
{% if config.recaptcha %}<style type="text/css">{% raw %}
.recaptcha_image_cell {
background: none !important;