Moved extra JavaScripts to external template

diff --git a/templates/de/html/js/js_order_send.tpl b/templates/de/html/js/js_order_send.tpl
index ef32d52b9295f8a024b66b235d01abe250575524..537ed748102c9ca425f626f2632d26ce1ef63d0f 100644 (file)
--- a/templates/de/html/js/js_order_send.tpl
+++ b/templates/de/html/js/js_order_send.tpl
@@ -30,7 +30,7 @@ var counter = document.getElementById('counter');
 var form    = document.getElementById('form');
 var ok      = document.getElementById('ok');
 
-function Submit() {
+function submitForm() {
        if (counter.innerHTML > 0) {
                alert('{--MEMBER_ORDER_PLEASE_WAIT_TESTER--}');
                return false;
@@ -50,3 +50,8 @@ function Counter() {
 
 ok.value='{--MEMBER_ORDER_TEST_STARTED--}';
 var interval = window.setInterval("Counter()", 1000);
+
+// Register event listener
+$('#form').submit(function() {
+       return submitForm();
+});

diff --git a/templates/de/html/js/js_surfbar_member_book.tpl b/templates/de/html/js/js_surfbar_member_book.tpl
index 8ec8ffcc912f5c8bfacee7c224cdf9916bed5eab..a0ab20c8fb7e4411500e4251468cc147d860f887 100644 (file)
--- a/templates/de/html/js/js_surfbar_member_book.tpl
+++ b/templates/de/html/js/js_surfbar_member_book.tpl
@@ -97,3 +97,32 @@ function resetForm () {
 
 focusLimitedNo();
 document.getElementById('url').focus();
+
+// Register all event listeners
+$('#book').submit(function() {
+       return submitForm();
+});
+
+$('#reset').click(function() {
+       return resetForm();
+});
+
+$('#limit').click(function() {
+       return focusLimit();
+});
+
+$('#limit').blur(function() {
+       return blurLimit();
+});
+
+$('#limit').change(function() {
+       return changeLimited();
+});
+
+$('#limited_no').click(function() {
+       return focusLimitedNo();
+});
+
+$('#limited_yes').click(function() {
+       return focusLimitedYes();
+});

diff --git a/templates/de/html/js/js_surfbar_member_edit.tpl b/templates/de/html/js/js_surfbar_member_edit.tpl
index b36166e78970b15e07db8981324f44a94b2e3730..2e0962c6d8e9c2be38cec92730e77aa2dfebba57 100644 (file)
--- a/templates/de/html/js/js_surfbar_member_edit.tpl
+++ b/templates/de/html/js/js_surfbar_member_edit.tpl
@@ -70,3 +70,12 @@ if ($content[limited] == true) {
 } else {
        FocusLimitedNo();
 }
+
+// Register event listeners
+$('#edit').submit(function() {
+       return submitForm();
+});
+
+$('#reset').click(function() {
+       return resetForm();
+});

diff --git a/templates/de/html/member/member_book_surfbar_dynamic.tpl b/templates/de/html/member/member_book_surfbar_dynamic.tpl
index 081b7c2e7c512f6db20205efb174ff36ada34345..faf60649e0128f413b572d67c06ad2d53bd88341 100644 (file)
--- a/templates/de/html/member/member_book_surfbar_dynamic.tpl
+++ b/templates/de/html/member/member_book_surfbar_dynamic.tpl
@@ -47,38 +47,6 @@
 
 <script type="text/javascript" src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}"></script>
 
-<script type="text/javascript">
-<!--
-$('#book').submit(function() {
-       return submitForm();
-});
-
-$('#reset').click(function() {
-       return resetForm();
-});
-
-$('#limit').click(function() {
-       return focusLimit();
-});
-
-$('#limit').blur(function() {
-       return blurLimit();
-});
-
-$('#limit').change(function() {
-       return changeLimited();
-});
-
-$('#limited_no').click(function() {
-       return focusLimitedNo();
-});
-
-$('#limited_yes').click(function() {
-       return focusLimitedYes();
-});
-//-->
-</script>
-
 {%form_close%}
 
 <span class="notice" style="padding:5px">

diff --git a/templates/de/html/member/member_book_surfbar_static.tpl b/templates/de/html/member/member_book_surfbar_static.tpl
index b2c67e14da379d02c637aa8540ee50f0321eb70d..40ed7b326e99c4181428af649f1c9a2010e9fb3f 100644 (file)
--- a/templates/de/html/member/member_book_surfbar_static.tpl
+++ b/templates/de/html/member/member_book_surfbar_static.tpl
@@ -47,37 +47,5 @@
 
 <script type="text/javascript" src="{%url=js.php?js=surfbar_member_book%}{%ext,version=surfbar%}"></script>
 
-<script type="text/javascript">
-<!--
-$('#book').submit(function() {
-       return submitForm();
-});
-
-$('#reset').click(function() {
-       return resetForm();
-});
-
-$('#limit').click(function() {
-       return focusLimit();
-});
-
-$('#limit').blur(function() {
-       return blurLimit();
-});
-
-$('#limit').change(function() {
-       return changeLimited();
-});
-
-$('#limited_no').click(function() {
-       return focusLimitedNo();
-});
-
-$('#limited_yes').click(function() {
-       return focusLimitedYes();
-});
-//-->
-</script>
-
 {%form_close%}
 </div>

diff --git a/templates/de/html/member/member_order_send.tpl b/templates/de/html/member/member_order_send.tpl
index ef8b03fa4618ebe7df58e6197f8dc1cf8bbcbaa6..7da43d4c20b2f0cac98a15f1adc9a8d8600f902d 100644 (file)
--- a/templates/de/html/member/member_order_send.tpl
+++ b/templates/de/html/member/member_order_send.tpl
@@ -6,13 +6,8 @@
 <div>
        <input type="submit" class="form_submit" id="ok" name="ok" value="{--MEMBER_DO_ORDER--}" />
 </div>
+
 <script type="text/javascript" src="{%url=js.php?js=order_send%}{%ext,version=order%}"></script>
-<script type="text/javascript">
-<!--
-$('#form').submit(function() {
-       return submitForm();
-});
-//-->
-</script>
+
 {%form_close%}
 </div>

diff --git a/templates/de/html/member/member_payout_form_banner.tpl b/templates/de/html/member/member_payout_form_banner.tpl
index ab398738e4869571b64e09f6e21f3ee332520e2a..b7315f75fda60bca71f79bd8cd589a242b2d6bec 100644 (file)
--- a/templates/de/html/member/member_payout_form_banner.tpl
+++ b/templates/de/html/member/member_payout_form_banner.tpl
@@ -47,7 +47,7 @@
 </table>
 {%form_close%}
 
-<!-- Hinweise zur "Auszahlung" in Bannerviews, Textlinkklicks, etc. //-->
-<div class="notice">(*):&nbsp;{--PAYOUT_BANNER_NOTICE--}</div>
-<!-- Hinweise zur "Auszahlung" in Bannerviews, Textlinkklicks, etc. //-->
+<div class="notice">
+       (*):&nbsp;{--PAYOUT_BANNER_NOTICE--}
+</div>
 </div>

diff --git a/templates/de/html/member/member_surfbar_edit_action_form.tpl b/templates/de/html/member/member_surfbar_edit_action_form.tpl
index 3dc881d277a21e49bffe12e39b1569bb09dca208..ec7dfeaa167de5da05f31fb8974b1f5633916172 100644 (file)
--- a/templates/de/html/member/member_surfbar_edit_action_form.tpl
+++ b/templates/de/html/member/member_surfbar_edit_action_form.tpl
@@ -40,17 +40,6 @@
 
 <script type="text/javascript"
  src="{%url=js.php?js=surfbar_member_edit%}{%ext,version=surfbar%}&amp;url_views_max=$content[url_views_max]&amp;limited=$content[limited]"></script>
-<script type="text/javascript">
-<!--
-$('#edit').submit(function() {
-       return submitForm();
-});
-
-$('#reset').click(function() {
-       return resetForm();
-});
-//-->
-</script>
 
 {%form_close%}
 </div>