Browse Source

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

pull/40/head
Marcin Łabanowski 12 years ago
parent
commit
d3cd26be65
  1. 2
      js/attention-bar.js
  2. 10
      js/imgcaptcha.js
  3. 1
      templates/generic_page.html
  4. 1
      templates/index.html
  5. 1
      templates/page.html
  6. 1
      templates/thread.html

2
js/attention-bar.js

@ -1,7 +1,7 @@
$(document).ready(function(){
$("#attention_bar").click(function(eO){ $("#attention_bar").css("display","none");
$("#attention_bar_form").css("display","block"); });
$.get("/attentionbar.txt", function(data) {
$.get(configRoot + "attentionbar.txt", function(data) {
$("#attention_bar").text(data);
$("#attention_bar_input").val(data);
});

10
js/imgcaptcha.js

@ -1,15 +1,11 @@
//function obecnyCzas() {
// return Math.round(new Date().getTime() / 1000);
//}
function ic_odswiezKapcze() {
$.get("/imgcaptcha_p.php", function(data) {
$.get(configRoot + "imgcaptcha_p.php", function(data) {
$("#imgcaptcha_hash").val(data);
$("#imgcaptcha_img").prop("src","/imgcaptcha_im.php?cr=" + data);
$("#imgcaptcha_img").prop("src",configRoot + "imgcaptcha_im.php?cr=" + data);
});
}
//function resetujKapcze() {
// $("#imgcaptcha_img").prop("src","/zakrytek.png");
// $("#imgcaptcha_img").prop("src",configRoot + "zakrytek.png");
//}
//$(document).ready(function(){
// //resetujKapcze(); - to nie powinno byc na razie potrzebne

1
templates/generic_page.html

@ -9,6 +9,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes">
{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
<script type="text/javascript">var configRoot="{{ config.root }}";</script>
{% if not nojavascript %}
<script type="text/javascript" src="{{ config.url_javascript }}"></script>
{% if not config.additional_javascript_compile %}

1
templates/index.html

@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
<script type="text/javascript">var configRoot="{{ config.root }}";</script>
{% if not nojavascript %}
<script type="text/javascript" src="{{ config.url_javascript }}"></script>
{% if not config.additional_javascript_compile %}

1
templates/page.html

@ -7,6 +7,7 @@
<title>{{ title }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
<script type="text/javascript">var configRoot="{{ config.root }}";</script>
{% if not nojavascript %}<script type="text/javascript" src="{{ config.url_javascript }}"></script>{% endif %}
</head>
<body>

1
templates/thread.html

@ -8,6 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=yes">
{% if config.meta_keywords %}<meta name="keywords" content="{{ config.meta_keywords }}">{% endif %}
{% if config.default_stylesheet.1 != '' %}<link rel="stylesheet" type="text/css" id="stylesheet" href="{{ config.uri_stylesheets }}{{ config.default_stylesheet.1 }}">{% endif %}
<script type="text/javascript">var configRoot="{{ config.root }}";</script>
{% if not nojavascript %}
<script type="text/javascript" src="{{ config.url_javascript }}"></script>
{% if not config.additional_javascript_compile %}

Loading…
Cancel
Save