From a6b70e20fc2909e38a88adcb38c9bbb053e362da Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Sat, 30 Jan 2010 12:05:15 +0000
Subject: [PATCH] Merged js stuff

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15504 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/html/include/{focus.js => gosa.js}     | 14 ++++++++++++++
 gosa-core/html/include/warning.js                | 13 -------------
 gosa-core/ihtml/themes/default/headers.tpl       |  3 +--
 gosa-core/ihtml/themes/default/password.tpl      |  3 +--
 gosa-core/ihtml/themes/default/setup_headers.tpl |  4 +---
 5 files changed, 17 insertions(+), 20 deletions(-)
 rename gosa-core/html/include/{focus.js => gosa.js} (98%)
 delete mode 100644 gosa-core/html/include/warning.js

diff --git a/gosa-core/html/include/focus.js b/gosa-core/html/include/gosa.js
similarity index 98%
rename from gosa-core/html/include/focus.js
rename to gosa-core/html/include/gosa.js
index f67f8e616..4190e9e52 100644
--- a/gosa-core/html/include/focus.js
+++ b/gosa-core/html/include/gosa.js
@@ -39,6 +39,20 @@ for (iln = 0; iln < len; iln++){
 netscape= (ver.charAt(iln+1).toUpperCase() != "C");
 
 
+function question(text, url)
+{
+  if(document.mainform.ignore){
+        location.href= url;
+        return true;
+  }
+  if(confirm(text)){
+        location.href= url;
+        return true;
+  }
+  return false;
+}
+
+
 /* Toggle checkbox that matches regex */
 function chk_set_all(regex,value)
 {
diff --git a/gosa-core/html/include/warning.js b/gosa-core/html/include/warning.js
deleted file mode 100644
index 1c061fb8e..000000000
--- a/gosa-core/html/include/warning.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function question(text, url)
-{
-  if(document.mainform.ignore){
-	location.href= url;
-	return true;
-  }
-  if(confirm(text)){
-	location.href= url;
-  	return true;
-  }
-  return false;
-}
-
diff --git a/gosa-core/ihtml/themes/default/headers.tpl b/gosa-core/ihtml/themes/default/headers.tpl
index fc4950c8e..c771bf7cb 100644
--- a/gosa-core/ihtml/themes/default/headers.tpl
+++ b/gosa-core/ihtml/themes/default/headers.tpl
@@ -31,8 +31,7 @@
 {if $iePngWorkaround}
   <script language="javascript" src="include/png.js" type="text/javascript"></script>
 {/if}
-  <script language="javascript" src="include/focus.js" type="text/javascript"></script>
-  <script language="javascript" src="include/warning.js" type="text/javascript"></script>
+  <script language="javascript" src="include/gosa.js" type="text/javascript"></script>
 {if $usePrototype == 'true'}
   <script language="javascript" src="include/prototype.js" type="text/javascript"></script>
   <script language="javascript" src="include/scriptaculous.js" type="text/javascript"></script>
diff --git a/gosa-core/ihtml/themes/default/password.tpl b/gosa-core/ihtml/themes/default/password.tpl
index 8956e5175..fabd05230 100644
--- a/gosa-core/ihtml/themes/default/password.tpl
+++ b/gosa-core/ihtml/themes/default/password.tpl
@@ -21,8 +21,7 @@
   <link rel="shortcut icon" href="favicon.ico">
 
   {if isset($ieworkaround)}<script language="javascript"src="include/png.js" type="text/javascript"></script>{/if}
-  <script language="javascript" src="include/focus.js" type="text/javascript"></script>
-  <script language="javascript" src="include/warning.js" type="text/javascript"></script>
+  <script language="javascript" src="include/gosa.js" type="text/javascript"></script>
   <script language="javascript" src="include/pwdStrength.js" type="text/javascript"></script>
 </head>
 
diff --git a/gosa-core/ihtml/themes/default/setup_headers.tpl b/gosa-core/ihtml/themes/default/setup_headers.tpl
index 95605b49c..2ca2943ed 100644
--- a/gosa-core/ihtml/themes/default/setup_headers.tpl
+++ b/gosa-core/ihtml/themes/default/setup_headers.tpl
@@ -19,7 +19,5 @@
   <link rel="shortcut icon" href="favicon.ico">
 
   <script language="javascript"src="include/png.js" type="text/javascript"></script>
-  <script language="javascript"src="include/calendar.js" type="text/javascript"></script>
-  <script language="javascript"src="include/focus.js" type="text/javascript"></script>
-  <script language="javascript"src="include/warning.js" type="text/javascript"></script>
+  <script language="javascript"src="include/gosa.js" type="text/javascript"></script>
 </head>
-- 
2.30.2