diff options
author | Matt Friedman <maf675@gmail.com> | 2011-09-25 15:12:56 -0700 |
---|---|---|
committer | Matt Friedman <maf675@gmail.com> | 2011-09-26 11:15:22 -0700 |
commit | 56c6476233646e7c735aa4e3b98c4a6b62df5c7d (patch) | |
tree | fb428fc655e39150c57f1a23f027443b3d6c2e87 /phpBB/adm | |
parent | 5e768036f773e461283d0f65841d2ff0618ec7b7 (diff) | |
download | forums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.tar forums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.tar.gz forums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.tar.bz2 forums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.tar.xz forums-56c6476233646e7c735aa4e3b98c4a6b62df5c7d.zip |
[ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.
PHPBB3-10390
Diffstat (limited to 'phpBB/adm')
-rw-r--r-- | phpBB/adm/style/install_footer.html | 3 | ||||
-rw-r--r-- | phpBB/adm/style/overall_footer.html | 3 | ||||
-rw-r--r-- | phpBB/adm/style/simple_footer.html | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index 1b3134b5e1..a3b2294025 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -12,7 +12,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/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index dc03d2cfb5..f05e9c56c5 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -20,7 +20,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/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index 272fd5e3fb..0d697aec1d 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -16,7 +16,8 @@ </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> |