Added attribute for script-tag relocating

diff --git a/com.woltlab.wcf/templates/__commentJavaScript.tpl b/com.woltlab.wcf/templates/__commentJavaScript.tpl
index 3981bf3ec5757ab7738905d76e0496968d34637e..307ea7b42b24f2fd77cd6301a40b42959685e1a9 100644 (file)
--- a/com.woltlab.wcf/templates/__commentJavaScript.tpl
+++ b/com.woltlab.wcf/templates/__commentJavaScript.tpl
@@ -1,6 +1,6 @@
-<script src="{@$__wcf->getPath()}js/WCF.Comment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Comment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl
index 5204f5ce6f48e795dbe05877c0b6fdae2365529e..8c808770d3cd0ec74201afca47eb971444e5f671 100644 (file)
--- a/com.woltlab.wcf/templates/__messageFormPoll.tpl
+++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl
@@ -1,6 +1,6 @@
 {if $__showPoll|isset && $__showPoll}
-       <script src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl b/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl
index 645f5249bd8397677793d009710b1c06e2ad6344..8ad5b55c53a1c06cd99cc66f5a5c0c1a445e943a 100644 (file)
--- a/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl
+++ b/com.woltlab.wcf/templates/aclPermissionJavaScript.tpl
@@ -1,4 +1,4 @@
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                {if $aclValues[$objectTypeID]|isset}

diff --git a/com.woltlab.wcf/templates/aclPermissions.tpl b/com.woltlab.wcf/templates/aclPermissions.tpl
index 97a646b9ac21658a25471b3df3279cebc8fa7bd0..e42010ae37f874356b2ec4be5fe747c5277d74bb 100644 (file)
--- a/com.woltlab.wcf/templates/aclPermissions.tpl
+++ b/com.woltlab.wcf/templates/aclPermissions.tpl
@@ -1,5 +1,5 @@
-<script src="{@$__wcf->getPath()}js/WCF.ACL{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.ACL{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl
index 01438c214178400b98776304e6ae60b9e362dc07..b5a3d7c4319c504854877e5e71f5abf6c6476312 100644 (file)
--- a/com.woltlab.wcf/templates/avatarEdit.tpl
+++ b/com.woltlab.wcf/templates/avatarEdit.tpl
@@ -114,7 +114,7 @@
 
 {include file='footer'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/benchmark.tpl b/com.woltlab.wcf/templates/benchmark.tpl
index 42259ffc3c3946c2bdef1a1ee881fca0ee329959..d289c89fd58ac64d3fccdaeca3d96aeaf34a18b6 100644 (file)
--- a/com.woltlab.wcf/templates/benchmark.tpl
+++ b/com.woltlab.wcf/templates/benchmark.tpl
@@ -1,7 +1,7 @@
 <p class="marginTop" id="benchmark"><small>Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</small></p>
 
 {if ENABLE_DEBUG_MODE} 
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        $('#benchmarkDetails > li > span').click(function() {
@@ -23,7 +23,7 @@
                {/foreach}
        </ul>
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        $('#benchmark').click(function() {

diff --git a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
index 14e149757d37e3b9eb41ad2abf7f571e7f9a2fb8..c1d02e26d931852b203e1d25d173e15c5f18f5f7 100644 (file)
--- a/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
+++ b/com.woltlab.wcf/templates/birthdaySearchableOptionType.tpl
@@ -1,7 +1,7 @@
 <input type="number" id="{$option->optionName}" name="values[{$option->optionName}][ageFrom]" value="{@$valueAgeFrom}" placeholder="{lang}wcf.user.birthday.age.from{/lang}" min="0" max="120" class="tiny" />
 <input type="number" id="{$option->optionName}_age_to" name="values[{$option->optionName}][ageTo]" value="{@$valueAgeTo}" placeholder="{lang}wcf.user.birthday.age.to{/lang}" min="0" max="120" class="tiny" />
 
-<script>
+<script data-relocate="true">
 //<![CDATA[
 $(function() {
        $('#{$option->optionName}').parents('dl:eq(0)').find('> dt > label').text('{lang}wcf.user.birthday.age{/lang}');

diff --git a/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl b/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
index 0426c0a5ea0451ba5203093bbaef768573f25397..3b981ef57abfbfcf8c07e233c8c27c31afbdfd25 100644 (file)
--- a/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
+++ b/com.woltlab.wcf/templates/dashboardBoxRecentActivity.tpl
@@ -9,7 +9,7 @@
        </ul>
 </div>
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/following.tpl b/com.woltlab.wcf/templates/following.tpl
index 1949595338d137d6910d0d9f3eec65b0779888b1..1ef1764226f6b8bb90dc93f6409278db6db2f5ec 100644 (file)
--- a/com.woltlab.wcf/templates/following.tpl
+++ b/com.woltlab.wcf/templates/following.tpl
@@ -4,7 +4,7 @@
        <title>{lang}wcf.user.following{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
        {include file='headInclude'}
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Action.Delete('wcf\\data\\user\\follow\\UserFollowAction', '.jsFollowing');

diff --git a/com.woltlab.wcf/templates/groupedUserList.tpl b/com.woltlab.wcf/templates/groupedUserList.tpl
index 83746793e901d00f2089d12f51dcc18ed7a89b22..d2c55729046fa9a096a0fb065635b674dce244be 100644 (file)
--- a/com.woltlab.wcf/templates/groupedUserList.tpl
+++ b/com.woltlab.wcf/templates/groupedUserList.tpl
@@ -20,7 +20,7 @@
 
 <div class="contentNavigation"><div class="jsPagination"></div></div>
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index 8f0e5b9439b38d74b83fbfd0bc6a8c8c3d5dac31..18a59ad7d3a84a4a2c3f5051304d4101800c7731 100644 (file)
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -6,7 +6,7 @@
 {implode from=$__wcf->getMetaTagHandler() item=__metaTag glue="\n"}{@$__metaTag}{/implode}
 {event name='metaTags'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        var SID_ARG_2ND = '{@SID_ARG_2ND_NOT_ENCODED}';
        var WCF_PATH = '{@$__wcf->getPath()}';
@@ -16,39 +16,39 @@
        //]]>
 </script>
 {if JQUERY_SOURCE == 'google'}
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.1/jquery.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
+<script data-relocate="true" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.1/jquery.min.js"></script>
+<script data-relocate="true" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
 {elseif JQUERY_SOURCE == 'microsoft'}
-<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-2.0.1.min.js"></script>
-<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.10.3/jquery-ui.min.js"></script>
+<script data-relocate="true" src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-2.0.1.min.js"></script>
+<script data-relocate="true" src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.10.3/jquery-ui.min.js"></script>
 {elseif JQUERY_SOURCE == 'cloudflare'}
-<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.1/jquery.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
+<script data-relocate="true" src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.1/jquery.min.js"></script>
+<script data-relocate="true" src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
 {else}
-<script src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"></script>
-<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"></script>
 {/if}
 {if JQUERY_SOURCE != 'local'}
-<script>
+<script data-relocate="true">
        //<![CDATA[
        if (!window.jQuery) {
-               document.write('<script src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"><\/script>');
-               document.write('<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"><\/script>');
+               document.write('<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"><\/script>');
+               document.write('<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"><\/script>');
        }
        //]]>
 </script>
 {/if}
-<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js?v={@$__wcfVersion}"></script>
-<script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
-<script src="{@$__wcf->getPath()}js/WCF{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        WCF.User.init({@$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
        //]]>
 </script>
-<script src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script src="{@$__wcf->getPath('wcf')}js/WCF.Like{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath('wcf')}js/WCF.Like{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 {event name='javascriptInclude'}
 
 <!-- Stylesheets -->
@@ -67,7 +67,7 @@
        </style>
 </noscript>
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({
@@ -166,7 +166,7 @@
        //]]>
 </script>
  <!--[IF IE 9]>
- <script>
+ <script data-relocate="true">
        $(function() {
                function fixButtonTypeIE9() {
                        $('button').each(function(index, button) {

diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index 6409879b1b3f38fbd4554ca31b1c770a1314bda7..9f3aa8bbd21eefcec0573de71ab1270801648c73 100644 (file)
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -59,7 +59,7 @@
                                        </aside>
                                        
                                        {if $sidebarOrientation|isset && $sidebarOrientation == 'right'}
-                                               <script>
+                                               <script data-relocate="true">
                                                        //<![CDATA[
                                                        $(function() {
                                                                new WCF.Collapsible.Sidebar();

diff --git a/com.woltlab.wcf/templates/ignoredUsers.tpl b/com.woltlab.wcf/templates/ignoredUsers.tpl
index a3f45604fb9d99a040cd9fd103e83fc0f1b0589a..e8d186978dff638b1b9701e273ac1428dc2ff00f 100644 (file)
--- a/com.woltlab.wcf/templates/ignoredUsers.tpl
+++ b/com.woltlab.wcf/templates/ignoredUsers.tpl
@@ -4,7 +4,7 @@
        <title>{lang}wcf.user.ignoredUsers{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
        {include file='headInclude'}
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Action.Delete('wcf\\data\\user\\ignore\\UserIgnoreAction', '.jsIgnoredUser');

diff --git a/com.woltlab.wcf/templates/imageViewer.tpl b/com.woltlab.wcf/templates/imageViewer.tpl
index d21b01753dc90cab47fdf3d9bbb3deba6351ea93..69e655e63ea470473e2a112cebf94a0e314fb4dc 100644 (file)
--- a/com.woltlab.wcf/templates/imageViewer.tpl
+++ b/com.woltlab.wcf/templates/imageViewer.tpl
@@ -1,7 +1,7 @@
 {if !$__imageViewerLoaded|isset}
-       <script src="{@$__wcf->getPath()}js/3rdParty/slimbox2.min.js"></script>
-       <script src="{@$__wcf->getPath()}js/WCF.ImageViewer{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/slimbox2.min.js"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.ImageViewer{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true">
                //<![CDATA[
                var $imageViewer = null;
                $(function() {

diff --git a/com.woltlab.wcf/templates/login.tpl b/com.woltlab.wcf/templates/login.tpl
index 156adf605d75975c7f43dc118d30d4f0bbd6c56c..f7822f2bfae50ed0ca4feb887d24079c729eb12f 100644 (file)
--- a/com.woltlab.wcf/templates/login.tpl
+++ b/com.woltlab.wcf/templates/login.tpl
@@ -5,8 +5,8 @@
        
        {include file='headInclude'}
        
-       <script src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.User.Login(false);

diff --git a/com.woltlab.wcf/templates/lostPassword.tpl b/com.woltlab.wcf/templates/lostPassword.tpl
index 706a9cb7bb1f75d8898ff1a9dc083d9fd4096886..0705318d87b32cc9b11de52f777f06ec9c7bc8b5 100644 (file)
--- a/com.woltlab.wcf/templates/lostPassword.tpl
+++ b/com.woltlab.wcf/templates/lostPassword.tpl
@@ -4,8 +4,8 @@
        <title>{lang}wcf.user.lostPassword{/lang} - {PAGE_TITLE|language}</title>
        {include file='headInclude'}
        
-       <script src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.User.Registration.LostPassword();

diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index 1a8e5a3f710a11c8b0c9610beb16c925f1b2d862..7cf5537776559bfb7c711f425e9763c955d54c7f 100644 (file)
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -14,7 +14,7 @@
        {/if}
        <link rel="canonical" href="{link controller='MembersList'}{if $pageNo > 1}pageNo={@$pageNo}&{/if}{@$canonicalURLParameters}{/link}" />
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                        $(function() {
                                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/messageFormAttachments.tpl b/com.woltlab.wcf/templates/messageFormAttachments.tpl
index c74aaebc511fbc08d2ab4e26031a469ba8639d14..050b7522e08a7a3042eb23d1cc9a759ed68baf05 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormAttachments.tpl
+++ b/com.woltlab.wcf/templates/messageFormAttachments.tpl
@@ -34,8 +34,8 @@
        {event name='fields'}
 </div>
 
-<script src="{@$__wcf->getPath()}js/WCF.Attachment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Attachment{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
index ad7a3b408b171e1f940195cafa845393d11471c0..6c2c330cb42d8d4b26f38261db627b65207e1c75 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
+++ b/com.woltlab.wcf/templates/messageFormMultilingualism.tpl
@@ -12,7 +12,7 @@
                </dd>
        </dl>
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        var $languages = {

diff --git a/com.woltlab.wcf/templates/messageFormPreviewButton.tpl b/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
index ca209a81c18ee9eedebdad272f23b769800397e2..cd1bc984a429f8dff2a7bba75748c2604bb8a94e 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
+++ b/com.woltlab.wcf/templates/messageFormPreviewButton.tpl
@@ -1,6 +1,6 @@
 <button id="previewButton" class="jsOnly" accesskey="p">{lang}wcf.global.button.preview{/lang}</button>
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/messageFormSmilies.tpl b/com.woltlab.wcf/templates/messageFormSmilies.tpl
index 6a48c2e798f8e2fdb1c866a56babb15e2de3b88f..b7b3d30293d821f0225dfbba245d2e28db9eb866 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormSmilies.tpl
+++ b/com.woltlab.wcf/templates/messageFormSmilies.tpl
@@ -27,7 +27,7 @@
                        {/if}
                {/foreach}
                
-               <script>
+               <script data-relocate="true">
                        //<![CDATA[
                        $(function() {
                                new WCF.Message.SmileyCategories();
@@ -40,7 +40,7 @@
        
        {event name='fields'}
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Message.Smilies('{if $wysiwygSelector|isset}{$wysiwygSelector|encodeJS}{else}text{/if}');

diff --git a/com.woltlab.wcf/templates/messageFormTabs.tpl b/com.woltlab.wcf/templates/messageFormTabs.tpl
index f3e8d33a35d7b78efa3702a16b94e0ccb000dab7..6f171075afcbf4fee24fb39d093f67de353d87f0 100644 (file)
--- a/com.woltlab.wcf/templates/messageFormTabs.tpl
+++ b/com.woltlab.wcf/templates/messageFormTabs.tpl
@@ -18,7 +18,7 @@
        {event name='tabMenuContents'}
 </div>
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                if (jQuery.browser.mobile) $('#smiliesTab, #smilies').remove();

diff --git a/com.woltlab.wcf/templates/messageOptionType.tpl b/com.woltlab.wcf/templates/messageOptionType.tpl
index 79571b400a96800632ce797514d40c22c7f53e19..8a50966e57fe5133f81ba3fe1b17770c03567b2f 100644 (file)
--- a/com.woltlab.wcf/templates/messageOptionType.tpl
+++ b/com.woltlab.wcf/templates/messageOptionType.tpl
@@ -1,7 +1,7 @@
 <textarea id="{$option->optionName}" name="values[{$option->optionName}]" cols="40" rows="10">{$value}</textarea>
 {include file='wysiwyg' wysiwygSelector=$option->optionName}
 
-<script>
+<script data-relocate="true">
 //<![CDATA[
 $(function() {
        $('#{$option->optionName}').parents('dl:eq(0)').addClass('wide');

diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl
index df5c93313042a00adbe1fe023dcab342929de53e..51f1eefbd5f311f414e17e90219d1ef0f260a175 100644 (file)
--- a/com.woltlab.wcf/templates/messageSidebar.tpl
+++ b/com.woltlab.wcf/templates/messageSidebar.tpl
@@ -1,5 +1,5 @@
 {if !$__messageSidebarJavascript|isset}
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/messageUserOptionOutput.tpl b/com.woltlab.wcf/templates/messageUserOptionOutput.tpl
index 4b46481301bd7de5cf9ab893b2a78cc919089f4a..429752a289f8c4c2bd548de2e42cdd29f0ae2a87 100644 (file)
--- a/com.woltlab.wcf/templates/messageUserOptionOutput.tpl
+++ b/com.woltlab.wcf/templates/messageUserOptionOutput.tpl
@@ -5,7 +5,7 @@
                {/content}
        </div>
        
-       <script>
+       <script data-relocate="true">
        //<![CDATA[
        $(function() {
                $('#{$option->optionName}').parents('dl:eq(0)').addClass('wide');

diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index 16ef7871514705038bc447f2b0124c7edbc79934..ee789582ae16a725a336a45f625500810e3875c3 100644 (file)
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -5,8 +5,8 @@
        
        {include file='headInclude'}
        
-       <script src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Moderation.Activation.Management({@$queue->queueID}, '{link controller='ModerationList'}{/link}');

diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index 0a1acab8ec0e0116eff8c4e8818f0b4485914195..985eb95e8d876a4f17cb2565346a8635a973ca6f 100644 (file)
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -5,8 +5,8 @@
        
        {include file='headInclude'}
        
-       <script src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl b/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl
index 22ea3e1bf0c880a7c5476091d51d2201f37ca036..fb0009a8a5d241674ce8a26d3e8ac4db24b65139 100644 (file)
--- a/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl
+++ b/com.woltlab.wcf/templates/multipleLanguageInputJavascript.tpl
@@ -1,5 +1,5 @@
 {if !$forceSelection|isset}{assign var=forceSelection value=false}{/if}
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };

diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 3fac798d583ccae919e65752ebdffd881d8a8c32..664def2034e0282d4019536e2945ae53933fead7 100644 (file)
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -4,7 +4,7 @@
        <title>{lang}wcf.user.notification.notifications{/lang} - {lang}wcf.user.usercp{/lang} - {PAGE_TITLE|language}</title>
        {include file='headInclude'}
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/notificationSettings.tpl b/com.woltlab.wcf/templates/notificationSettings.tpl
index 3c805b163b80ec8eff027768f2364b4c05f0707e..0e1d39889cb2e96139e52087c4a48b754a77ba38 100644 (file)
--- a/com.woltlab.wcf/templates/notificationSettings.tpl
+++ b/com.woltlab.wcf/templates/notificationSettings.tpl
@@ -5,7 +5,7 @@
        
        {include file='headInclude'}
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        $('#notificationSettings > fieldset > dl > dd > label > input').each(function(index, value) {

diff --git a/com.woltlab.wcf/templates/poll.tpl b/com.woltlab.wcf/templates/poll.tpl
index a352b3a84440237646193042e1c6697c36b004e9..d33fbf93ea9528b69abf0d83228edec23f88bb0d 100644 (file)
--- a/com.woltlab.wcf/templates/poll.tpl
+++ b/com.woltlab.wcf/templates/poll.tpl
@@ -1,7 +1,7 @@
 {if $__wcf->getUser()->userID && !$__pollLoadedJavaScript|isset}
        {assign var=__pollLoadedJavaScript value=true}
-       <script src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Poll{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Poll.Manager('.pollContainer');

diff --git a/com.woltlab.wcf/templates/recaptcha.tpl b/com.woltlab.wcf/templates/recaptcha.tpl
index d801058603f2a44ed668504306700f4ee194989b..10474f46bce8eada6b13ce69d4248939a687619d 100644 (file)
--- a/com.woltlab.wcf/templates/recaptcha.tpl
+++ b/com.woltlab.wcf/templates/recaptcha.tpl
@@ -3,7 +3,7 @@
        <small>{lang}wcf.recaptcha.description{/lang}</small>
        
        <dl class="wide reCaptcha{if $errorField == 'recaptchaString'} formError{/if}">
-               <script>
+               <script data-relocate="true">
                        //<![CDATA[
                        var RecaptchaOptions = {
                                lang: '{@$recaptchaLanguageCode}',
@@ -37,7 +37,7 @@
                        </ul>
                </dd>
                
-               <script src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
+               <script data-relocate="true" src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/challenge?k={$recaptchaPublicKey}"></script>
                <noscript>
                        <dd>
                                <iframe src="http{if $recaptchaUseSSL}s{/if}://www.google.com/recaptcha/api/noscript?k={$recaptchaPublicKey}" height="300" width="500" seamless="seamless"></iframe><br />

diff --git a/com.woltlab.wcf/templates/recentActivities.tpl b/com.woltlab.wcf/templates/recentActivities.tpl
index 2130cf86cca9b377516b20b9c409b4618a83b9d9..9f54fea14f8c3bc2424ca183b7ea430e694823f9 100644 (file)
--- a/com.woltlab.wcf/templates/recentActivities.tpl
+++ b/com.woltlab.wcf/templates/recentActivities.tpl
@@ -1,5 +1,5 @@
 {hascontent}
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/recentActivityList.tpl b/com.woltlab.wcf/templates/recentActivityList.tpl
index e6f200257d924450a16a34fc10ef13eb2fbd3d55..e68e6dba1678becac0df8c38a1a21e52b3ef5a9a 100644 (file)
--- a/com.woltlab.wcf/templates/recentActivityList.tpl
+++ b/com.woltlab.wcf/templates/recentActivityList.tpl
@@ -7,7 +7,7 @@
        
        <link rel="canonical" href="{link controller='RecentActivityList'}{/link}" />
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index 6d8aea3b74bc43d3007da5f72d9ac33573480e6c..5146e95614dca2e1bbbb6d90227a890632a230fd 100644 (file)
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -4,8 +4,8 @@
        <title>{lang}wcf.user.register{/lang} - {PAGE_TITLE|language}</title>
        {include file='headInclude'}
        
-       <script src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl
index f718916229055a06b91f022503ebb4ecc5d199ea..fbc9d40021865243ab75bb58db8e01a96ebe65dd 100644 (file)
--- a/com.woltlab.wcf/templates/search.tpl
+++ b/com.woltlab.wcf/templates/search.tpl
@@ -110,7 +110,7 @@
                                        
                                        {include file=$objectType->getFormTemplateName() application=$objectType->getApplication()}
                                        
-                                       <script>
+                                       <script data-relocate="true">
                                                //<![CDATA[
                                                $(function() {
                                                        $('#{@$__jsID}').click(function() {
@@ -133,7 +133,7 @@
 
 {include file='footer'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Search.User($('#searchAuthor'), function(data) {

diff --git a/com.woltlab.wcf/templates/searchArea.tpl b/com.woltlab.wcf/templates/searchArea.tpl
index c0e061c7a4e1cfe316c3594102a50e3fe36b6b81..dc5f2944e7f589abfd6b1f584dd6afd574d6ff1e 100644 (file)
--- a/com.woltlab.wcf/templates/searchArea.tpl
+++ b/com.woltlab.wcf/templates/searchArea.tpl
@@ -25,8 +25,8 @@
        </form>
 </aside>
 
-<script src="{@$__wcf->getPath('wcf')}js/WCF.Search.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath('wcf')}js/WCF.Search.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Search.Message.SearchArea($('#search'));

diff --git a/com.woltlab.wcf/templates/settings.tpl b/com.woltlab.wcf/templates/settings.tpl
index d88785a99f9da60e06370a4439151898b22c68a1..fe87cbd724b82525727edc2a078d17d515c22b78 100644 (file)
--- a/com.woltlab.wcf/templates/settings.tpl
+++ b/com.woltlab.wcf/templates/settings.tpl
@@ -43,7 +43,7 @@
                                        <dl>
                                                <dt><label>{lang}wcf.user.language{/lang}</label></dt>
                                                <dd id="languageIDContainer">
-                                                       <script>
+                                                       <script data-relocate="true">
                                                                //<![CDATA[
                                                                $(function() {
                                                                        var $languages = {

diff --git a/com.woltlab.wcf/templates/shareButtons.tpl b/com.woltlab.wcf/templates/shareButtons.tpl
index 55808ec5a8e3b5b0b5aa42804c45232190ed6a5c..4f691d36d3f23d8ca29fd0fb8ae46d6aff6cb75f 100644 (file)
--- a/com.woltlab.wcf/templates/shareButtons.tpl
+++ b/com.woltlab.wcf/templates/shareButtons.tpl
@@ -32,7 +32,7 @@
                {event name='buttons'}
        </ul>
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl
index 2bba8eab0baa3fc68ba14e32f5f3b3d375a562e8..4b825d9b241666dfe74588b0aaa3484ec1d2bc85 100644 (file)
--- a/com.woltlab.wcf/templates/signatureEdit.tpl
+++ b/com.woltlab.wcf/templates/signatureEdit.tpl
@@ -5,7 +5,7 @@
        
        {include file='headInclude'}
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/sitemap.tpl b/com.woltlab.wcf/templates/sitemap.tpl
index 5fe6d0685607cede7e10f63d316afb5adf3d3b3e..3518a738208a640bcdcdffcaac4eac10a473d563 100644 (file)
--- a/com.woltlab.wcf/templates/sitemap.tpl
+++ b/com.woltlab.wcf/templates/sitemap.tpl
@@ -18,7 +18,7 @@
                        {/foreach}
                </div>
                
-               <script>
+               <script data-relocate="true">
                        //<![CDATA[
                        $(function() {
                                // fix anchor

diff --git a/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl b/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
index ff6be9d1d4aeda316183ea41d799088c4d9a9adf..0fc9f506140e2a9c7c6112eb1b67233f4d07d78b 100644 (file)
--- a/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
+++ b/com.woltlab.wcf/templates/spoilerBBCodeTag.tpl
@@ -11,7 +11,7 @@
 </div>
 
 <!-- begin:parser_nonessential -->
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $spoilerBox = $('.jsSpoilerBox').removeClass('jsSpoilerBox');

diff --git a/com.woltlab.wcf/templates/tagInput.tpl b/com.woltlab.wcf/templates/tagInput.tpl
index d28cbe5b6541622c3f083d10454665930d3e0cd4..a598f93ddbc5436c583d43067e5ea1540b7f535a 100644 (file)
--- a/com.woltlab.wcf/templates/tagInput.tpl
+++ b/com.woltlab.wcf/templates/tagInput.tpl
@@ -6,8 +6,8 @@
                <small>{lang}wcf.tagging.tags.description{/lang}</small>
        </dd>
 </dl>
-<script src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $tagList = new WCF.Tagging.TagList('#tagList{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}', '#tagSearchInput{if $tagInputSuffix|isset}{@$tagInputSuffix}{/if}', {@TAGGING_MAX_TAG_LENGTH});

diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl
index f8174dbcae976e54722af6a1a2deadebbf9d38b5..ef3519bb4162623515873e30dd03268d6c9dbcc6 100644 (file)
--- a/com.woltlab.wcf/templates/team.tpl
+++ b/com.woltlab.wcf/templates/team.tpl
@@ -7,7 +7,7 @@
        
        <link rel="canonical" href="{link controller='Team'}{/link}" />
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                        $(function() {
                                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/textI18nOptionType.tpl b/com.woltlab.wcf/templates/textI18nOptionType.tpl
index bd92a3713ac2d54b19338f144f1b927043c42794..db0f9c80d5f2d3709915f555656ec0aa3e0b252b 100644 (file)
--- a/com.woltlab.wcf/templates/textI18nOptionType.tpl
+++ b/com.woltlab.wcf/templates/textI18nOptionType.tpl
@@ -1,4 +1,4 @@
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };

diff --git a/com.woltlab.wcf/templates/textareaI18nOptionType.tpl b/com.woltlab.wcf/templates/textareaI18nOptionType.tpl
index 18d22971e424e16ad6d1dac12001ec081781d552..57cafbe9934ad8d4f1b30cbe4358c321a59ca2d1 100644 (file)
--- a/com.woltlab.wcf/templates/textareaI18nOptionType.tpl
+++ b/com.woltlab.wcf/templates/textareaI18nOptionType.tpl
@@ -1,4 +1,4 @@
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index 8a735a0039600c780bab51e955daa29c0e3c32cc..12e1da14c9f35fdc3a0142286e28b32f8aeb0c52 100644 (file)
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -7,9 +7,9 @@
        
        <link rel="canonical" href="{link controller='User' object=$user}{/link}" />
        
-       <script src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath('wcf')}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
        {event name='javascriptInclude'}
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        {if $__wcf->getUser()->userID && $__wcf->getUser()->userID != $user->userID}

diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl
index f444cf7ffb4f1b9f1dcbdf214c54c83c99ed6721..9b24e4b646ae5d6d36bce52c90a502cdb8923469 100644 (file)
--- a/com.woltlab.wcf/templates/userException.tpl
+++ b/com.woltlab.wcf/templates/userException.tpl
@@ -12,7 +12,7 @@
 <p id="errorMessage" class="error">
        {@$message}
 </p>
-<script>
+<script data-relocate="true">
        //<![CDATA[
        if (document.referrer) {
                $('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 

diff --git a/com.woltlab.wcf/templates/userMenuSidebar.tpl b/com.woltlab.wcf/templates/userMenuSidebar.tpl
index 936466c8598d5179482a232b2390470c45ec7a87..90102959053aeb824d2b0efd7178c1dc22b3df21 100644 (file)
--- a/com.woltlab.wcf/templates/userMenuSidebar.tpl
+++ b/com.woltlab.wcf/templates/userMenuSidebar.tpl
@@ -1,7 +1,7 @@
 {capture assign='sidebar'}
        {assign var=__userMenuActiveItems value=$__wcf->getUserMenu()->getActiveMenuItems()}
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        // mobile safari hover workaround

diff --git a/com.woltlab.wcf/templates/userPanel.tpl b/com.woltlab.wcf/templates/userPanel.tpl
index 48a3d3344696b49eaedfd04339af5f7fba7ba1d5..bac5df6c4145d81225f7d50cd4e077f10bc0aaae 100644 (file)
--- a/com.woltlab.wcf/templates/userPanel.tpl
+++ b/com.woltlab.wcf/templates/userPanel.tpl
@@ -31,7 +31,7 @@
        {if !$__hideUserMenu|isset}
                <li id="userNotifications" data-count="{#$__wcf->getUserNotificationHandler()->getNotificationCount()}">
                        <a href="{link controller='NotificationList'}{/link}"><span class="icon icon16 icon-bell-alt"></span> <span>{lang}wcf.user.notification.notifications{/lang}</span>{if $__wcf->getUserNotificationHandler()->getNotificationCount()} <span class="badge badgeInverse">{#$__wcf->getUserNotificationHandler()->getNotificationCount()}</span>{/if}</a>
-                       <script>
+                       <script data-relocate="true">
                                //<![CDATA[
                                $(function() {
                                        WCF.Language.addObject({
@@ -134,7 +134,7 @@
                                </form>
                        </div>
                        
-                       <script>
+                       <script data-relocate="true">
                                //<![CDATA[
                                $(function() {
                                        WCF.Language.addObject({
@@ -150,7 +150,7 @@
        {/if}
        {if $__wcf->getLanguage()->getLanguages()|count > 1}
                <li id="pageLanguageContainer">
-                       <script>
+                       <script data-relocate="true">
                                //<![CDATA[
                                $(function() {
                                        var $languages = {
@@ -183,8 +183,8 @@
                                <span>{lang}wcf.moderation.moderation{/lang}</span>
                                {if $__wcf->getModerationQueueManager()->getOutstandingModerationCount()}<span class="badge badgeInverse">{#$__wcf->getModerationQueueManager()->getOutstandingModerationCount()}</span>{/if}
                        </a>
-                       <script src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-                       <script>
+                       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Moderation{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+                       <script data-relocate="true">
                                //<![CDATA[
                                $(function() {
                                        WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/userProfilePreview.tpl b/com.woltlab.wcf/templates/userProfilePreview.tpl
index 83e1929dac461f43e7312c6d8fc75d4543e72fca..eb27f3a7f70c66dfeb5d54cb9f36248c42e2eb00 100644 (file)
--- a/com.woltlab.wcf/templates/userProfilePreview.tpl
+++ b/com.woltlab.wcf/templates/userProfilePreview.tpl
@@ -5,7 +5,7 @@
                <a href="{link controller='User' object=$user}{/link}" title="{$user->username}">{@$user->getAvatar()->getImageTag(128)}</a>
                
                {if $__wcf->getUser()->userID && $__wcf->getUser()->userID != $user->userID}
-                       <script>
+                       <script data-relocate="true">
                                //<![CDATA[
                                        $(function() {
                                                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/userSearch.tpl b/com.woltlab.wcf/templates/userSearch.tpl
index 42505c9bcf580a1a241155b729d055fed963d4a9..b4636648789512feb15d941c262f98107f437b66 100644 (file)
--- a/com.woltlab.wcf/templates/userSearch.tpl
+++ b/com.woltlab.wcf/templates/userSearch.tpl
@@ -5,7 +5,7 @@
        
        {include file='headInclude'}
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Search.User('#username', null, false, [ ], false);

diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl
index f3cd0a4a3590c600a7a5588f9310e52c6cfba272..4f850ea0d55981887037044c4d459c2a706f2348 100644 (file)
--- a/com.woltlab.wcf/templates/usersOnlineList.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineList.tpl
@@ -7,7 +7,7 @@
        
        <link rel="canonical" href="{link controller='UsersOnlineList'}{/link}" />
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                        $(function() {
                                WCF.Language.addObject({

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index 44422ec9a9480bd96f960ed40a4816c554d9f8e7..6eb7619fec5b8f02ac4b6f38dfd8938158c1b164 100644 (file)
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -1,14 +1,14 @@
-<script>
+<script data-relocate="true">
 //<![CDATA[
        var CKEDITOR_BASEPATH = '{@$__wcf->getPath()}js/3rdParty/ckeditor/';
        var __CKEDITOR_BUTTONS = [ {implode from=$__wcf->getBBCodeHandler()->getButtonBBCodes() item=__bbcode}{ icon: '../../../icon/{$__bbcode->wysiwygIcon}', label: '{$__bbcode->buttonLabel|language}', name: '{$__bbcode->bbcodeTag}' }{/implode} ];
 //]]>
 </script>
-<script src="{@$__wcf->getPath()}js/3rdParty/ckeditor/ckeditor.js"></script>
-<script src="{@$__wcf->getPath()}js/3rdParty/ckeditor/adapters/jquery.js"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/ckeditor/ckeditor.js"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/ckeditor/adapters/jquery.js"></script>
 {event name='javascriptIncludes'}
 
-<script>
+<script data-relocate="true">
 //<![CDATA[
 $(function() {
        if ($.browser.mobile) {

diff --git a/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl b/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl
index 645f5249bd8397677793d009710b1c06e2ad6344..8ad5b55c53a1c06cd99cc66f5a5c0c1a445e943a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl
+++ b/wcfsetup/install/files/acp/templates/aclPermissionJavaScript.tpl
@@ -1,4 +1,4 @@
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                {if $aclValues[$objectTypeID]|isset}

diff --git a/wcfsetup/install/files/acp/templates/aclPermissions.tpl b/wcfsetup/install/files/acp/templates/aclPermissions.tpl
index a2434ed10aae3d203af62e0edbc6cd7e20e0f0ac..9f630fdde83921bc8c78435b986e96a2bcf5d29b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/aclPermissions.tpl
+++ b/wcfsetup/install/files/acp/templates/aclPermissions.tpl
@@ -1,5 +1,5 @@
-<script src="{@$__wcf->getPath()}js/WCF.ACL.js"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.ACL.js"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
index e9d310e0b6d18845f578e629d6a7f46322d0f1fc..93c81262771b5ca1f3c5a122ca7fdcb1aaab74a4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.application.edit'}
 
 {if $application->packageID != 1 && !$application->isPrimary}
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        WCF.Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/attachmentList.tpl b/wcfsetup/install/files/acp/templates/attachmentList.tpl
index 1e0c0c4cfdf68de86faa8da7049a89029a47366d..06761d535c38fbec1ba89639f6c4eb2e6592228e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/attachmentList.tpl
+++ b/wcfsetup/install/files/acp/templates/attachmentList.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.attachment.list'}
 
 {include file='imageViewer'}
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\attachment\\AttachmentAction', '.jsAttachmentRow');

diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
index cf2d2a6916bb9db614afc5ab62e83897c2dfba59..3f592f28a26f6b0c5a34bd4718a82596b2bd47bc 100644 (file)
--- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl
@@ -35,7 +35,7 @@
                {event name='attributeFields'}
        </fieldset>
 {/capture}
-<script>
+<script data-relocate="true">
 //<![CDATA[
        $(function() {
                $('.jsDeleteButton').click(function (event) {

diff --git a/wcfsetup/install/files/acp/templates/bbcodeList.tpl b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
index d2dd73b513c5845dd311771dbd351e891d0eb8b5..2f7e5793ad06e6e869db730fb562b737f0d7c7ba 100644 (file)
--- a/wcfsetup/install/files/acp/templates/bbcodeList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
        <h1>{lang}wcf.acp.bbcode.list{/lang}</h1>
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Action.Delete('wcf\\data\\bbcode\\BBCodeAction', '.jsBBCodeRow');

diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
index 08414d990e85330d2135492c6806770e654b694c..d8317586e9c20de59704403a59eef862dbea3ab4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
+++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
        <h1>{lang}wcf.acp.bbcode.mediaProvider.list{/lang}</h1>
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Action.Delete('wcf\\data\\bbcode\\media\\provider\\BBCodeMediaProviderAction', '.jsMediaProviderRow');

diff --git a/wcfsetup/install/files/acp/templates/benchmark.tpl b/wcfsetup/install/files/acp/templates/benchmark.tpl
index 42259ffc3c3946c2bdef1a1ee881fca0ee329959..d289c89fd58ac64d3fccdaeca3d96aeaf34a18b6 100644 (file)
--- a/wcfsetup/install/files/acp/templates/benchmark.tpl
+++ b/wcfsetup/install/files/acp/templates/benchmark.tpl
@@ -1,7 +1,7 @@
 <p class="marginTop" id="benchmark"><small>Execution time: {@$__wcf->getBenchmark()->getExecutionTime()}s ({#($__wcf->getBenchmark()->getExecutionTime()-$__wcf->getBenchmark()->getQueryExecutionTime())/$__wcf->getBenchmark()->getExecutionTime()*100}% PHP, {#$__wcf->getBenchmark()->getQueryExecutionTime()/$__wcf->getBenchmark()->getExecutionTime()*100}% SQL) | SQL queries: {#$__wcf->getBenchmark()->getQueryCount()} | Memory-Usage: {$__wcf->getBenchmark()->getMemoryUsage()}</small></p>
 
 {if ENABLE_DEBUG_MODE} 
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        $('#benchmarkDetails > li > span').click(function() {
@@ -23,7 +23,7 @@
                {/foreach}
        </ul>
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        $('#benchmark').click(function() {

diff --git a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
index 314f7d10c111996ceb0520427c711ce6dd26a97c..b8420e86fd3b1a3ff0e834accd24ec975e3823e7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/birthdaySearchableOptionType.tpl
@@ -1,7 +1,7 @@
 <input type="number" id="{$option->optionName}_age_from" name="values[{$option->optionName}][ageFrom]" value="{@$valueAgeFrom}" placeholder="{lang}wcf.user.birthday.age.from{/lang}" min="0" max="120" class="tiny" />
 <input type="number" id="{$option->optionName}_age_to" name="values[{$option->optionName}][ageTo]" value="{@$valueAgeTo}" placeholder="{lang}wcf.user.birthday.age.to{/lang}" min="0" max="120" class="tiny" />
 
-<script>
+<script data-relocate="true">
 //<![CDATA[
 $(function() {
        $('#{$option->optionName}_age_from').parents('dl:eq(0)').find('> dt > label').text('{lang}wcf.user.birthday.age{/lang}').attr('for', '{$option->optionName}_age_from');

diff --git a/wcfsetup/install/files/acp/templates/cacheList.tpl b/wcfsetup/install/files/acp/templates/cacheList.tpl
index 743ceffce1991db87bfc42b66121170924998314..1cba0b08c54cba468d639d80e7ca36b94c364c46 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cacheList.tpl
+++ b/wcfsetup/install/files/acp/templates/cacheList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.cache.list'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Collapsible.Simple.init();

diff --git a/wcfsetup/install/files/acp/templates/categoryList.tpl b/wcfsetup/install/files/acp/templates/categoryList.tpl
index a9f0f4e3a67b5899ccb241f7f5ad4fd50426954c..5d8dd8a3874f870d22e61f068084c660a89b7768 100644 (file)
--- a/wcfsetup/install/files/acp/templates/categoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryList.tpl
@@ -1,7 +1,7 @@
 {include file='header'}
 
 {if $categoryNodeList->hasChildren()}
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        {if $collapsibleObjectTypeID}

diff --git a/wcfsetup/install/files/acp/templates/codemirror.tpl b/wcfsetup/install/files/acp/templates/codemirror.tpl
index ab30233d72f254a1a8f6bc806afaab56aaf73ab8..97b9d8796fe5c990993f84bbf71a771e0f7579f4 100644 (file)
--- a/wcfsetup/install/files/acp/templates/codemirror.tpl
+++ b/wcfsetup/install/files/acp/templates/codemirror.tpl
@@ -1,13 +1,13 @@
 {if !$codemirrorLoaded|isset}
-       <script src="{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.js"></script>
-       <script src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/dialog/dialog.js"></script>
-       <script src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/search/searchcursor.js"></script>
-       <script src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/search/search.js"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.js"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/dialog/dialog.js"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/search/searchcursor.js"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/addon/search/search.js"></script>
 {/if}
-{if $codemirrorMode|isset}<script src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/{$codemirrorMode}/{$codemirrorMode}.js"></script>{/if}
+{if $codemirrorMode|isset}<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/{$codemirrorMode}/{$codemirrorMode}.js"></script>{/if}
 {event name='javascriptIncludes'}
 
-<script>
+<script data-relocate="true">
 //<![CDATA[
        {if !$codemirrorLoaded|isset}
                $('<link rel="stylesheet" href="{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.css" />').appendTo('head');

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index 766ebea64ad3a580784f5ffa0cb67557df04d68d..2860c0f58e38537eb5725aca624ce6dad64a768b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -5,7 +5,7 @@
        <p>{lang}wcf.acp.cronjob.subtitle{/lang}</p>
 </header>
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\cronjob\\CronjobAction', '.jsCronjobRow');

diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 0cc39e52111715f4457a2b3a29478387ac6f6d6a..8da4c6ae0237462a96944a77f11f28609a4cbf01 100644 (file)
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.cronjob.log'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/dashboardOption.tpl b/wcfsetup/install/files/acp/templates/dashboardOption.tpl
index 15f432c9676a07a7d4cf519ce3541270c81b0db1..c024e05a8c0d16ce83b50f4c692ecd7a9eb105bc 100644 (file)
--- a/wcfsetup/install/files/acp/templates/dashboardOption.tpl
+++ b/wcfsetup/install/files/acp/templates/dashboardOption.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.dashboard.option'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.TabMenu.init();
@@ -77,7 +77,7 @@
                                <button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
                        </div>
                        
-                       <script>
+                       <script data-relocate="true">
                                //<![CDATA[
                                $(function() {
                                        new WCF.Sortable.List('dashboard-content', 'wcf\\data\\dashboard\\box\\DashboardBoxAction', 0, { }, true, { boxType: 'content', objectTypeID: {@$objectTypeID} });
@@ -125,7 +125,7 @@
                                <button data-type="submit">{lang}wcf.global.button.saveSorting{/lang}</button>
                        </div>
                        
-                       <script>
+                       <script data-relocate="true">
                                //<![CDATA[
                                $(function() {
                                        new WCF.Sortable.List('dashboard-sidebar', 'wcf\\data\\dashboard\\box\\DashboardBoxAction', 0, { }, true, { boxType: 'sidebar', objectTypeID: {@$objectTypeID} });

diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl
index 5539de9122d65167d44180065d929ad4490c05a0..a1a737ca7e84649ad10fabc2e003750f470d4870 100644 (file)
--- a/wcfsetup/install/files/acp/templates/dataImport.tpl
+++ b/wcfsetup/install/files/acp/templates/dataImport.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.dataImport'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                {if $queue|isset}

diff --git a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
index 609aeb79df93496eb0d9b57cbd9029c820d463b4..338c9b9524368dd3026c299edcaa06390a57a923 100644 (file)
--- a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
+++ b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
@@ -1,5 +1,5 @@
 {include file='header' pageTitle='wcf.acp.exceptionLog'}
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                {if $exceptionID}window.location.hash = '{$exceptionID|encodeJS}';{/if}

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index 2ddb3d63de8af3ab4f54b720c1f061def6d79102..f7f379cec840d1f92ffec2a988c09bfd8b12597a 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -4,7 +4,7 @@
        <base href="{$baseHref}" />
        <meta charset="utf-8" />
        <title>{if $pageTitle|isset}{@$pageTitle|language} - {/if}{lang}wcf.global.acp{/lang}{if PACKAGE_ID} - {PAGE_TITLE|language}{/if}</title>
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                var SID_ARG_2ND = '{@SID_ARG_2ND_NOT_ENCODED}';
                var WCF_PATH = '{@$__wcf->getPath()}';
@@ -13,13 +13,13 @@
                var TIME_NOW = {@TIME_NOW};
                //]]>
        </script>
-       <script src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"></script>
-       <script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"></script>
-       <script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js?v={@$__wcfVersion}"></script>
-       <script src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
-       <script src="{@$__wcf->getPath()}js/WCF.js?v={@$__wcfVersion}"></script>
-       <script src="{@$__wcf->getPath()}acp/js/WCF.ACP.js?v={@$__wcfVersion}"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery.min.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.min.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}acp/js/WCF.ACP.js?v={@$__wcfVersion}"></script>
+       <script data-relocate="true">
                //<![CDATA[
                WCF.User.init({$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
                //]]>
@@ -30,7 +30,7 @@
        {@$__wcf->getStyleHandler()->getStylesheet()}
        {event name='stylesheets'}
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        {* work-around for unknown core-object during WCFSetup *}

diff --git a/wcfsetup/install/files/acp/templates/imageViewer.tpl b/wcfsetup/install/files/acp/templates/imageViewer.tpl
index d41fa9e272fccbe5b0b9e10d7de3674a8812f5c3..f8280855a8393a0633b6d3068b01da4e8efe4521 100644 (file)
--- a/wcfsetup/install/files/acp/templates/imageViewer.tpl
+++ b/wcfsetup/install/files/acp/templates/imageViewer.tpl
@@ -1,7 +1,7 @@
 {if !$__imageViewerLoaded|isset}
-       <script src="{@$__wcf->getPath()}js/3rdParty/slimbox2.min.js"></script>
-       <script src="{@$__wcf->getPath()}js/WCF.ImageViewer.js"></script>
-       <script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/slimbox2.min.js"></script>
+       <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.ImageViewer.js"></script>
+       <script data-relocate="true">
                //<![CDATA[
                var $imageViewer = null;
                $(function() {

diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index 0170e531c475b526bd8a4799394857cb51ff4ca4..05fe6a9e28aa6a40d3b3c387bc5d8ed3c5c1f696 100644 (file)
--- a/wcfsetup/install/files/acp/templates/index.tpl
+++ b/wcfsetup/install/files/acp/templates/index.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.TabMenu.init();
@@ -47,7 +47,7 @@
                                <a class="twitter-timeline" href="https://twitter.com/woltlab" data-chrome="nofooter transparent" data-widget-id="335166618281865217">Tweets by @woltlab</a>
                        {/if}
                        {literal}
-                               <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+                               <script data-relocate="true">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
                        {/literal}
                </div>
        {/if}

diff --git a/wcfsetup/install/files/acp/templates/labelAdd.tpl b/wcfsetup/install/files/acp/templates/labelAdd.tpl
index 4e992c391b8f6c1f83cdc5a6bd3e506868f36582..e50117d84912c0f01f0f65ae4d087b718f6324b9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelAdd.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
-<script src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
index 0b838e840332c9b727af123d5c5817ad885cedae..2e2b97816ec5ed14c8c0b89c8446bce5ad0db7af 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupAdd.tpl
@@ -1,8 +1,8 @@
 {include file='header'}
 
 {include file='aclPermissions'}
-<script src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Label{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.ACL.List($('#groupPermissions'), {@$objectTypeID}{if $groupID|isset}, '', {@$groupID}{/if});

diff --git a/wcfsetup/install/files/acp/templates/labelGroupList.tpl b/wcfsetup/install/files/acp/templates/labelGroupList.tpl
index 7af3305b2ca84a07957bbb9f13ae2b5d697fb7ef..b81f7497aeeacbc5696ce39d12226d01fb79f7f3 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelGroupList.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\label\\group\\LabelGroupAction', '.jsLabelGroupRow');

diff --git a/wcfsetup/install/files/acp/templates/labelList.tpl b/wcfsetup/install/files/acp/templates/labelList.tpl
index a21e7c807e4dbe0db95c55664a60426f49e3a2fe..2efbfd56b3b15402a28365b820e71de2dfe88735 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelList.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\label\\LabelAction', '.jsLabelRow');

diff --git a/wcfsetup/install/files/acp/templates/languageItemList.tpl b/wcfsetup/install/files/acp/templates/languageItemList.tpl
index c898781a2cc33efba9755a50c07c146f90c2d9ac..662bcefc11383415a3844a26e7ffbbab066503ea 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageItemList.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle="wcf.acp.language.item.list"}
 
-<script src="{@$__wcf->getPath()}acp/js/WCF.ACP.Language.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}acp/js/WCF.ACP.Language.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.ACP.Language.ItemList();

diff --git a/wcfsetup/install/files/acp/templates/languageList.tpl b/wcfsetup/install/files/acp/templates/languageList.tpl
index 91414274dd6fb25cb8e4a984312aa8c475b5bde1..03c7a843791ba730469b821108f2fe7502f36fb2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.language.list'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\language\\LanguageAction', '.jsLanguageRow');

diff --git a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
index 40fe92a017fbf5045f0ec60b50d19bb4537fab5d..801dd1536426ef77f3b307d6d01610b422099232 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
+++ b/wcfsetup/install/files/acp/templates/languageMultilingualism.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.language.multilingualism'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $languageIDs = $('#languageIDs');

diff --git a/wcfsetup/install/files/acp/templates/languageServerList.tpl b/wcfsetup/install/files/acp/templates/languageServerList.tpl
index 67b3d89d041399777b3a3c807b42aee079e10c86..bdfc876773450d5e9df15b8fa24084157a9ff47e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/languageServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/languageServerList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.languageServer.list'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\language\\server\\LanguageServerAction', '.jsLanguageServerRow');

diff --git a/wcfsetup/install/files/acp/templates/login.tpl b/wcfsetup/install/files/acp/templates/login.tpl
index cbaa9e264555b57b18d6a79892d526c5e26eee28..162c574b4dc138fe71a7aa69d129cdffe0b31a1e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/login.tpl
+++ b/wcfsetup/install/files/acp/templates/login.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.user.login'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                if (!$('#username').val() || '{$errorField}' == 'username') {

diff --git a/wcfsetup/install/files/acp/templates/masterPassword.tpl b/wcfsetup/install/files/acp/templates/masterPassword.tpl
index 62d9e39f50d596f7bfbb0d050149b00c62b4c367..3e313a62bba306c397a41f2702e015b305860d1f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPassword.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPassword.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.masterPassword.enter'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                $('#masterPassword').focus();

diff --git a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
index 2dfd6fc16b2acb3b74413661ca146ca2930344f5..8642f6ea4101e08dadf60165e9ba0ed4a69c5993 100644 (file)
--- a/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
+++ b/wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.masterPassword.init'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                $('#setPassword').click(function() {

diff --git a/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl b/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl
index 022dc01a66faae14bd4d72e224909b9671993108..5c5c1993d5a966a9d2dae4ef46cdc02ba49aadbf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl
+++ b/wcfsetup/install/files/acp/templates/multipleLanguageInputJavascript.tpl
@@ -1,4 +1,4 @@
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };

diff --git a/wcfsetup/install/files/acp/templates/option.tpl b/wcfsetup/install/files/acp/templates/option.tpl
index 15ed4034d54a74e11e085e27c04f2c9550e24c46..0984f8686eb6cfdd5a92aa86467ed6e6ddcf9e41 100644 (file)
--- a/wcfsetup/install/files/acp/templates/option.tpl
+++ b/wcfsetup/install/files/acp/templates/option.tpl
@@ -2,7 +2,7 @@
 
 {event name='javascriptInclude'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.TabMenu.init();

diff --git a/wcfsetup/install/files/acp/templates/package.tpl b/wcfsetup/install/files/acp/templates/package.tpl
index 0d4dc7ff55541fe729c5e0f4366a7cef2c9fafb5..aa36d02c351350e570824c4ec20d16f80acb37e5 100644 (file)
--- a/wcfsetup/install/files/acp/templates/package.tpl
+++ b/wcfsetup/install/files/acp/templates/package.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle=$package->getName()}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.TabMenu.init()

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
index af2d094cd42882aa9d31ec22de9b41631cebaeed..2f7be72099332994e20addbd35a416f618834b8c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationConfirm.tpl
@@ -1,7 +1,7 @@
 {capture assign='pageTitle'}{lang}wcf.acp.package.{@$queue->action}.title{/lang}: {$archive->getLocalizedPackageInfo('packageName')}{/capture}
 {include file='header'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
index a22660996545f56c81a6efa8e426b82610697208..b1573eeef5c0f29c0da5f999af8faa2490f74e58 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
+++ b/wcfsetup/install/files/acp/templates/packageInstallationSetup.tpl
@@ -1,6 +1,6 @@
 {include file='header' templateName='packageInstallationSetup'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.add('wcf.acp.package.install.title', '{lang}wcf.acp.package.install.title{/lang}');

diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index 74201d7f85ceac43ee7c8e65221258e443837a43..16b3834734b6877ba9f2b2c53bef251ce9c8e154 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.package.list'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({
@@ -94,7 +94,7 @@
                {@$pagesLinks}
                
                {hascontent}
-                       <script>
+                       <script data-relocate="true">
                                //<![CDATA[
                                $(function() {
                                        new WCF.ACP.Package.Uninstallation($('.jsPluginContainer .jsUninstallButton'));

diff --git a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
index 503b8d1464b2ee5ed7ce7220e676754a8d2d3563..686ef9edbba1cd9333a46f644b1d44611624506f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
+++ b/wcfsetup/install/files/acp/templates/packageStartInstall.tpl
@@ -5,7 +5,7 @@
 {/if}
 {include file='header'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/packageUpdate.tpl b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
index 480fffe98e2039a829102e41bbc1f3fb99a1493f..21fd8e5a6d1fcc5adab32d7ce4dae087c242729c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdate.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdate.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.package.update.title'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.Language.addObject({

diff --git a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
index f494be91364bfaee10932211e658e62edd30109d..5d75f1d76b07afb22ad8edfc6f839429861502a9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageUpdateServerList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.updateServer.list'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\package\\update\\server\\PackageUpdateServerAction', '.jsUpdateServerRow');

diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
index 3a91ab27a7cccfe02492c4e4fc3e8aaafb78ad6b..8d14bfcd425d78f4d5f94befb482accfcbee3a7d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemAdd.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.pageMenu.'|concat:$action}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $menuPosition = $('#menuPosition');

diff --git a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
index 9fdbbfce85a5cf301dfa3546da9da3bea0b1ce60..469f2720f6ee50fc3b0983317a6d35c39fdb0f62 100644 (file)
--- a/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
+++ b/wcfsetup/install/files/acp/templates/pageMenuItemList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.pageMenu.list'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\page\\menu\\item\\PageMenuItemAction', '.sortableNode', '> .sortableNodeLabel .jsDeleteButton');

diff --git a/wcfsetup/install/files/acp/templates/rebuildData.tpl b/wcfsetup/install/files/acp/templates/rebuildData.tpl
index 7d62995c2cd3c16bc81f7bd54cce11dc66c9c677..67efa58ebce86d8167dc020eca193a39143c9419 100644 (file)
--- a/wcfsetup/install/files/acp/templates/rebuildData.tpl
+++ b/wcfsetup/install/files/acp/templates/rebuildData.tpl
@@ -27,7 +27,7 @@
                                        <a class="button small" id="rebuildData{@$objectType->objectTypeID}">{lang}wcf.acp.rebuildData.{@$objectType->objectType}{/lang}</a>
                                        <small>{lang}wcf.acp.rebuildData.{@$objectType->objectType}.description{/lang}</small>
                                        
-                                       <script>
+                                       <script data-relocate="true">
                                                //<![CDATA[
                                                $(function() {
                                                        $('#rebuildData{@$objectType->objectTypeID}').click(function () {

diff --git a/wcfsetup/install/files/acp/templates/smileyList.tpl b/wcfsetup/install/files/acp/templates/smileyList.tpl
index a50644d91adead655500d456fa85962e1e9fd1d8..ed31f280e6138397fdb0d694dd506caacf7afef2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/smileyList.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyList.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.smiley.list'}
 
 {if $objects|count}
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Action.Delete('wcf\\data\\smiley\\SmileyAction', $('.smileyRow'));

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index d94719abdb2a986c228f80ab1c7c6c2b52e49195..6ecd77bcd2f0cafd8b5bb5c21ab56e46e6626fa2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -1,8 +1,8 @@
 {include file='header' pageTitle='wcf.acp.style.'|concat:$action}
 
-<script src="{@$__wcf->getPath()}acp/js/WCF.ACP.Style.js?v={@$__wcfVersion}"></script>
-<script src="{@$__wcf->getPath()}js/WCF.ColorPicker.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}acp/js/WCF.ACP.Style.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.ColorPicker.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.ColorPicker('.jsColorPicker');

diff --git a/wcfsetup/install/files/acp/templates/styleExport.tpl b/wcfsetup/install/files/acp/templates/styleExport.tpl
index b0984d03a3b5c96402213b14a4601a4a856cefda..da1d745a679402d1b7e7608a6c3968bf8266dc85 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleExport.tpl
+++ b/wcfsetup/install/files/acp/templates/styleExport.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.style.exportStyle'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                $('#exportAsPackage').change(function (event) {

diff --git a/wcfsetup/install/files/acp/templates/styleList.tpl b/wcfsetup/install/files/acp/templates/styleList.tpl
index 40c3857caff291805285bd3268ade27e008f6d35..a2d48cf1cf05c06368b316eaf8c1a907095fa9a7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleList.tpl
+++ b/wcfsetup/install/files/acp/templates/styleList.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.style.list'}
 
-<script src="{@$__wcf->getPath()}acp/js/WCF.ACP.Style.js?v={@$__wcfVersion}"></script>
-<script>
+<script data-relocate="true" src="{@$__wcf->getPath()}acp/js/WCF.ACP.Style.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Toggle('wcf\\data\\style\\StyleAction', '.buttonList');

diff --git a/wcfsetup/install/files/acp/templates/tagAdd.tpl b/wcfsetup/install/files/acp/templates/tagAdd.tpl
index c826629f1f983a95da8436aa7b7ffaf1e0af780b..7189b2d72e754fdfb906eef1cda063a0f8a0cf6d 100644 (file)
--- a/wcfsetup/install/files/acp/templates/tagAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/tagAdd.tpl
@@ -79,8 +79,8 @@
                                        </dd>
                                </dl>
                                
-                               <script src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-                               <script>
+                               <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Tagging{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+                               <script data-relocate="true">
                                        //<![CDATA[
                                        $(function() {
                                                var $tagList = new WCF.Tagging.TagList('#synonymList', '#synonyms');

diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index 1de04491a959015d85f5d1af9cc0893affb76851..890f175314a367cbeeb83ab949039d539fe9a483 100644 (file)
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.tag.list'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\tag\\TagAction', '.jsTagRow');

diff --git a/wcfsetup/install/files/acp/templates/templateGroupList.tpl b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
index 47c5fbf69b57bb2d536aecf73d8fd77d5656c6f5..a6b865964bb5289bd61a030357be25fd57fdf442 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateGroupList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
        <h1>{lang}wcf.acp.template.group.list{/lang}</h1>
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Action.Delete('wcf\\data\\template\\group\\TemplateGroupAction', '.jsTemplateGroupRow');

diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl
index e68bd3b2ddd21e2cbd1c9389795e695120cd10a9..42044acfe1e7102148ff01e39d01ff140bd0cabf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateList.tpl
+++ b/wcfsetup/install/files/acp/templates/templateList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle="wcf.acp.template.list"}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\template\\TemplateAction', '.jsTemplateRow');

diff --git a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
index bd92a3713ac2d54b19338f144f1b927043c42794..db0f9c80d5f2d3709915f555656ec0aa3e0b252b 100644 (file)
--- a/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textI18nOptionType.tpl
@@ -1,4 +1,4 @@
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };

diff --git a/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl b/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
index 18d22971e424e16ad6d1dac12001ec081781d552..57cafbe9934ad8d4f1b30cbe4358c321a59ca2d1 100644 (file)
--- a/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
+++ b/wcfsetup/install/files/acp/templates/textareaI18nOptionType.tpl
@@ -1,4 +1,4 @@
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var $availableLanguages = { {implode from=$availableLanguages key=languageID item=languageName}{@$languageID}: '{$languageName}'{/implode} };

diff --git a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
index 78bde377caab7c7e235d1251817d124348bc664e..cfda2fa9523313dac71f0d309e0d5dd34dabab45 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userActivityPointOption.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.user.activityPoint.option'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                $('#updateEvents').click(function () {

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index 9c39b0a4364a5371bb6e9e7109d444b1b2263061..59c242bbe91a1dbc20999ed2e1bc8ae2c2aac149 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.user.'|concat:$action}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.TabMenu.init();
@@ -186,7 +186,7 @@
                                        {event name='banFields'}
                                </fieldset>
                                
-                               <script>
+                               <script data-relocate="true">
                                        //<![CDATA[
                                        $('#banned').change(function (event) {
                                                if ($('#banned').is(':checked')) {
@@ -309,7 +309,7 @@
                                        </dl>
                                </fieldset>
                                
-                               <script>
+                               <script data-relocate="true">
                                        //<![CDATA[
                                        $('#disableSignature').change(function (event) {
                                                if ($('#disableSignature').is(':checked')) {
@@ -387,9 +387,9 @@
                                        </dl>
                                </fieldset>
                                
-                               <script src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-                               <script src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
-                               <script>
+                               <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Message{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+                               <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.User{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+                               <script data-relocate="true">
                                        //<![CDATA[
                                        $(function() {
                                                $('#disableAvatar').change(function (event) {

diff --git a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
index eabfad97b6a8d97f4c929e8b8224e7973bceed1c..8aee0224ef2beb17094e89493faae6221c275f32 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
+++ b/wcfsetup/install/files/acp/templates/userBulkProcessing.tpl
@@ -1,7 +1,7 @@
 {include file='header' pageTitle='wcf.acp.user.bulkProcessing'}
 
 {if $mailID|isset}
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', '', {
@@ -12,7 +12,7 @@
        </script>
 {/if}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                function toggleContainer(value) {

diff --git a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
index 8b77f99fe5b19a1067d3d225f6c7528a38e5b1a2..a5c23819fddd8bb1c69817c78b3d53fc826db3f7 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
+++ b/wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.user.exportEmailAddress'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.ACP.Options();

diff --git a/wcfsetup/install/files/acp/templates/userException.tpl b/wcfsetup/install/files/acp/templates/userException.tpl
index 345c74cb8af4e42a483b72e91387004310ceb75a..be69ad2a153c1c76a63d946d53bf53c655001af8 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userException.tpl
+++ b/wcfsetup/install/files/acp/templates/userException.tpl
@@ -4,7 +4,7 @@
        {@$message}
 </p>
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        if (document.referrer) {
                $('#errorMessage').append('<br /><a href="' + document.referrer + '">{lang}wcf.global.error.backward{/lang}</a>'); 

diff --git a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
index 4e344e5189f6308c298a5062c010a601fd164ac3..9f21a8273ac95aaf48d00eee76ee9bf35dc16d8c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupAdd.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.group.'|concat:$action}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.TabMenu.init();

diff --git a/wcfsetup/install/files/acp/templates/userGroupList.tpl b/wcfsetup/install/files/acp/templates/userGroupList.tpl
index 2c3912279437d72620a3dd10eb9d6d2687cd3113..d391c0bb20b8fba7c8c0ad20ce05b2c10cb320f6 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupList.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.group.list'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\user\\group\\UserGroupAction', '.jsUserGroupRow');

diff --git a/wcfsetup/install/files/acp/templates/userGroupOption.tpl b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
index 2ad5e4295acf41434dba792b22ddf15f2cc12d3c..8c70c6f91f53a5ffe5eb459eb58adade7003eae2 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userGroupOption.tpl
+++ b/wcfsetup/install/files/acp/templates/userGroupOption.tpl
@@ -1,6 +1,6 @@
 {include file='header'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.ACP.Options.Group({if $canEditEveryone}true{else}false{/if});

diff --git a/wcfsetup/install/files/acp/templates/userList.tpl b/wcfsetup/install/files/acp/templates/userList.tpl
index 0cca2fe22ee3f4460b86f85617a17476bef7336f..bd8c93e381bed761cb619126b390ecc95bce495f 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userList.tpl
+++ b/wcfsetup/install/files/acp/templates/userList.tpl
@@ -7,7 +7,7 @@
 {include file='header'}
 
 {event name='javascriptInclude'}
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                var actionObjects = { };

diff --git a/wcfsetup/install/files/acp/templates/userMail.tpl b/wcfsetup/install/files/acp/templates/userMail.tpl
index f2bef83069e1ce6b16a2a16c1f2a4509df977253..fd83c4c004de637e48ad190a1acdba16b9592f76 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userMail.tpl
+++ b/wcfsetup/install/files/acp/templates/userMail.tpl
@@ -9,7 +9,7 @@
 {include file='header'}
 
 {if $mailID|isset}
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.ACP.Worker('mail', 'wcf\\system\\worker\\MailWorker', '', {

diff --git a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
index 6565770e2d0d5e23f99cf1b2c363d332f5cc6cc4..c601f7045dbc81e2159ff38564302aecf1541af1 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionCategoryList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
        <h1>{lang}wcf.acp.user.option.category.list{/lang}</h1>
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Action.Delete('wcf\\data\\user\\option\\category\\UserOptionCategoryAction', '.jsCategoryRow');

diff --git a/wcfsetup/install/files/acp/templates/userOptionList.tpl b/wcfsetup/install/files/acp/templates/userOptionList.tpl
index c3d8a9edef2aad365cd5f3e22eaa7338c4a49b18..b9edb5bb4ed28373f323da98b57803b64790aad5 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionList.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionList.tpl
@@ -3,7 +3,7 @@
 <header class="boxHeadline">
        <h1>{lang}wcf.acp.user.option.list{/lang}</h1>
        
-       <script>
+       <script data-relocate="true">
                //<![CDATA[
                $(function() {
                        new WCF.Action.Delete('wcf\\data\\user\\option\\UserOptionAction', '.jsOptionRow');

diff --git a/wcfsetup/install/files/acp/templates/userRankList.tpl b/wcfsetup/install/files/acp/templates/userRankList.tpl
index 378acc532274f9f639cb4f031765e69884c79e2c..60c751f9392a129b0010a45de3c08afea3ff4e12 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userRankList.tpl
+++ b/wcfsetup/install/files/acp/templates/userRankList.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.user.rank.list'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                new WCF.Action.Delete('wcf\\data\\user\\rank\\UserRankAction', '.jsUserRankRow');

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 7f01f98db47b235af089ecabbcbe784fdf1ed8d8..d36e368f4f37d2f136f5a98a64d3ecec939d4c16 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -1,6 +1,6 @@
 {include file='header' pageTitle='wcf.acp.user.search'}
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        $(function() {
                WCF.TabMenu.init();

diff --git a/wcfsetup/install/files/lib/util/HeaderUtil.class.php b/wcfsetup/install/files/lib/util/HeaderUtil.class.php
index 6733575fb8d6257197d4b8cab0bd461523f99886..be24e981dfd04820a7907d7c8b2f16867d69cd56 100644 (file)
--- a/wcfsetup/install/files/lib/util/HeaderUtil.class.php
+++ b/wcfsetup/install/files/lib/util/HeaderUtil.class.php
@@ -90,7 +90,7 @@ final class HeaderUtil {
                
                // move script tags to the bottom of the page
                $javascript = array();
-               self::$output = preg_replace_callback('~(?P<conditionBefore><!--\[IF [^<]+\s*)?<script(?P<script>.*?)</script>(?P<conditionAfter>\s*<!\[ENDIF]-->)?~s', function($matches) use (&$javascript) {
+               self::$output = preg_replace_callback('~(?P<conditionBefore><!--\[IF [^<]+\s*)?<script data-relocate="true"(?P<script>.*?)</script>(?P<conditionAfter>\s*<!\[ENDIF]-->)?~s', function($matches) use (&$javascript) {
                        $match = '';
                        if (isset($matches['conditionBefore'])) $match .= $matches['conditionBefore'];
                        $match .= '<script' . $matches['script'] . '</script>';

diff --git a/wcfsetup/setup/template/stepInstallPackages.tpl b/wcfsetup/setup/template/stepInstallPackages.tpl
index 09a55804e7de8688a0b5215bb00546b9c946fad8..59d0bb4cf1695e352f24820804b5d55016a7cdf3 100644 (file)
--- a/wcfsetup/setup/template/stepInstallPackages.tpl
+++ b/wcfsetup/setup/template/stepInstallPackages.tpl
@@ -13,7 +13,7 @@
        </div>
 </form>
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        window.onload = function() {
                document.forms[0].submit();

diff --git a/wcfsetup/setup/template/stepNext.tpl b/wcfsetup/setup/template/stepNext.tpl
index 93da3a6e3aa6f58e2964afccd8992ddf23bcc925..4dcef26eb225d1a5600a4bc2063057483d6c0172 100644 (file)
--- a/wcfsetup/setup/template/stepNext.tpl
+++ b/wcfsetup/setup/template/stepNext.tpl
@@ -22,7 +22,7 @@
        </div>
 </form>
 
-<script>
+<script data-relocate="true">
        //<![CDATA[
        window.onload = function() {
                document.forms[0].submit();

diff --git a/wcfsetup/setup/template/stepSearchWcfDir.tpl b/wcfsetup/setup/template/stepSearchWcfDir.tpl
index 17757905e31cd8e954f0b05a01ae275226fe745d..1fe55c5b8baee8f5b8d10529a645136134405a72 100644 (file)
--- a/wcfsetup/setup/template/stepSearchWcfDir.tpl
+++ b/wcfsetup/setup/template/stepSearchWcfDir.tpl
@@ -1,7 +1,7 @@
 {include file='header'}
 
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
-<script>
+<script data-relocate="true" src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
+<script data-relocate="true">
        //<![CDATA[
        if (window.jQuery) {
                $(function() {