From 63f43153466268990fa066614e3a2abdeb52950c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 27 Nov 2012 21:22:10 +0000
Subject: [PATCH] Moved extra JavaScripts to external template

---
 templates/de/html/js/js_order_send.tpl        |  7 +++-
 .../de/html/js/js_surfbar_member_book.tpl     | 29 +++++++++++++++++
 .../de/html/js/js_surfbar_member_edit.tpl     |  9 ++++++
 .../member/member_book_surfbar_dynamic.tpl    | 32 -------------------
 .../member/member_book_surfbar_static.tpl     | 32 -------------------
 .../de/html/member/member_order_send.tpl      |  9 ++----
 .../html/member/member_payout_form_banner.tpl |  6 ++--
 .../member_surfbar_edit_action_form.tpl       | 11 -------
 8 files changed, 49 insertions(+), 86 deletions(-)

diff --git a/templates/de/html/js/js_order_send.tpl b/templates/de/html/js/js_order_send.tpl
index ef32d52b92..537ed74810 100644
--- 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 8ec8ffcc91..a0ab20c8fb 100644
--- 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 b36166e789..2e0962c6d8 100644
--- 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 081b7c2e7c..faf60649e0 100644
--- 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 b2c67e14da..40ed7b326e 100644
--- 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 ef8b03fa46..7da43d4c20 100644
--- 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 ab398738e4..b7315f75fd 100644
--- 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 3dc881d277..ec7dfeaa16 100644
--- 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>
-- 
2.39.2