From 5556990b94ab4e4081b00c46f5064062e5cb4473 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Mon, 24 Dec 2012 18:21:21 +0100 Subject: [PATCH 1/2] add config root to JS side --- templates/generic_page.html | 1 + templates/index.html | 1 + templates/page.html | 1 + templates/thread.html | 1 + 4 files changed, 4 insertions(+) diff --git a/templates/generic_page.html b/templates/generic_page.html index 9099c79c..c50fb5dd 100644 --- a/templates/generic_page.html +++ b/templates/generic_page.html @@ -9,6 +9,7 @@ {% if config.meta_keywords %}{% endif %} {% if config.default_stylesheet.1 != '' %}{% endif %} + {% if not nojavascript %} {% if not config.additional_javascript_compile %} diff --git a/templates/index.html b/templates/index.html index 76c35d95..d7910416 100644 --- a/templates/index.html +++ b/templates/index.html @@ -8,6 +8,7 @@ {% if config.meta_keywords %}{% endif %} {% if config.default_stylesheet.1 != '' %}{% endif %} + {% if not nojavascript %} {% if not config.additional_javascript_compile %} diff --git a/templates/page.html b/templates/page.html index 0f59e6b1..8fbc49cd 100644 --- a/templates/page.html +++ b/templates/page.html @@ -7,6 +7,7 @@ {{ title }} {% if config.default_stylesheet.1 != '' %}{% endif %} + {% if not nojavascript %}{% endif %} diff --git a/templates/thread.html b/templates/thread.html index 60d3c82e..4c359861 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -8,6 +8,7 @@ {% if config.meta_keywords %}{% endif %} {% if config.default_stylesheet.1 != '' %}{% endif %} + {% if not nojavascript %} {% if not config.additional_javascript_compile %} From 146859f94a5d3112f5c88b3e4221324cf74be4c4 Mon Sep 17 00:00:00 2001 From: asiekierka Date: Mon, 24 Dec 2012 18:22:23 +0100 Subject: [PATCH 2/2] added config root to attention bar and imgcaptcha --- js/attention-bar.js | 2 +- js/imgcaptcha.js | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/js/attention-bar.js b/js/attention-bar.js index e0af8b02..a84cadff 100644 --- a/js/attention-bar.js +++ b/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); }); diff --git a/js/imgcaptcha.js b/js/imgcaptcha.js index 8d3ed95c..99aad414 100644 --- a/js/imgcaptcha.js +++ b/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