diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-10-20 20:41:11 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-10-20 20:46:48 -0400 |
| commit | 83d71ecb885ec2f594d3863cfa42111b8f06260b (patch) | |
| tree | 0da0e3ec50329e4dffdc773202046dbf643ce4e8 /phpBB/styles | |
| parent | c6e370d33abd64fa928c4d438a75458518d0c8da (diff) | |
| parent | 2d0f96e8cc48ba6eed06f99efb33193fc495eab7 (diff) | |
| download | forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.tar forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.tar.gz forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.tar.bz2 forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.tar.xz forums-83d71ecb885ec2f594d3863cfa42111b8f06260b.zip | |
Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop
* VSEphpbb/ticket/10390:
[ticket/10390] Revert back to escaped script tags inside document.write
[ticket/10390] Fix wording: fallback should be fall back
[ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
[ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
[ticket/10390] Drop http protocol for Microsoft's CDN option
[ticket/10390] Reword the language for jQuery host/server options
[ticket/10390] Fix a type-o - captialize AJAX
[ticket/10390] Improve the jQuery CDN url generation function
[ticket/10390] Move jQuery version definition
[ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/styles')
4 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 275e018f43..4456d6b37d 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -33,7 +33,8 @@ <!-- IF not S_IS_BOT -->{RUN_CRON_TASK}<!-- ENDIF --> </div> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script> +<script type="text/javascript" src="{T_JQUERY_LINK}"></script> +<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> </body> </html> diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html index 5899da0b7a..3458d02495 100644 --- a/phpBB/styles/prosilver/template/simple_footer.html +++ b/phpBB/styles/prosilver/template/simple_footer.html @@ -6,7 +6,8 @@ </div> </div> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script> +<script type="text/javascript" src="{T_JQUERY_LINK}"></script> +<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> </body> </html> diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 3cdd071211..9b0b95372e 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -8,7 +8,8 @@ <!-- IF DEBUG_OUTPUT --><br /><bdo dir="ltr">[ {DEBUG_OUTPUT} ]</bdo><!-- ENDIF --></span> </div> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script> +<script type="text/javascript" src="{T_JQUERY_LINK}"></script> +<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> </body> </html> diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html index f03d1094f2..b51be3ac4c 100644 --- a/phpBB/styles/subsilver2/template/simple_footer.html +++ b/phpBB/styles/subsilver2/template/simple_footer.html @@ -5,7 +5,8 @@ <span class="copyright">Powered by <a href="http://www.phpbb.com/">phpBB</a>® Forum Software © phpBB Group</span> </div> -<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/jquery.js"></script> +<script type="text/javascript" src="{T_JQUERY_LINK}"></script> +<!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> </body> </html> |