diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-09-05 06:03:19 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-09-05 06:03:19 -0400 |
| commit | 145bc230440f3a1a8d3252cfbfb767678d085320 (patch) | |
| tree | 451833c03814530e0a4b1aaad069fb5ba4ae4fcb /phpBB/styles/subsilver2 | |
| parent | 367fe0b4cff31fc11185b84bc7e9e7936fe470e9 (diff) | |
| parent | b98fca54b0fd0e9aaca2f0f12ae9bcae14d014ec (diff) | |
| download | forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar.gz forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar.bz2 forums-145bc230440f3a1a8d3252cfbfb767678d085320.tar.xz forums-145bc230440f3a1a8d3252cfbfb767678d085320.zip | |
Merge remote-tracking branch 'igorw/ticket/10155' into develop
* igorw/ticket/10155:
[ticket/10155] Briefly explain assets in coding-guidelines
[ticket/10155] Move jQuery inclusion to footer
[ticket/10155] Update to jQuery 1.6.2
[ticket/10155] Add jQuery to AUTHORS
[ticket/10155] Add jQuery, introduce global assets path
Diffstat (limited to 'phpBB/styles/subsilver2')
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/simple_footer.html | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/styles/subsilver2/template/overall_footer.html b/phpBB/styles/subsilver2/template/overall_footer.html index 4494ed83bf..3cdd071211 100644 --- a/phpBB/styles/subsilver2/template/overall_footer.html +++ b/phpBB/styles/subsilver2/template/overall_footer.html @@ -8,5 +8,7 @@ <!-- 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> + </body> </html> diff --git a/phpBB/styles/subsilver2/template/simple_footer.html b/phpBB/styles/subsilver2/template/simple_footer.html index e2469c4ed4..f03d1094f2 100644 --- a/phpBB/styles/subsilver2/template/simple_footer.html +++ b/phpBB/styles/subsilver2/template/simple_footer.html @@ -5,5 +5,7 @@ <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> + </body> </html> |