From 897af06af9522ded99b1e0f46730299e89856ffe Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 11 Jun 2012 05:00:57 -0400
Subject: [PATCH] Updated version number to 3.0.4.6

---
 interface/web/themes/default/templates/main.tpl.htm |   57 ++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 9cc569a..aa4ec17 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -4,6 +4,7 @@
 <head>
     <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
     <meta http-equiv="Content-Type" content="text/html; charset=<tmpl_var name="html_content_encoding">"/>
+	<meta http-equiv="X-UA-Compatible" content="IE=8"/>
     <link href="themes/default/css/central.css" rel="stylesheet" type="text/css"/>
     <!--[if lte IE 7]>
 	    <link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
@@ -52,14 +53,49 @@
         .uniForm .blockLabels .inlineLabel input{ margin-top: -.3em; }
       </style>
     <![endif]-->
+	<link href="themes/default/css/screen/redmond/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
+	<link href="themes/default/css/screen/jquery-ui-custom.css" rel="stylesheet" type="text/css"/>
     <link rel="shortcut icon" href="/themes/default/images/favicon.ico" />
-    <script type="text/javascript" src="js/yui/yahoo/yahoo-min.js"></script>
-    <script type="text/javascript" src="js/yui/connection/connection-min.js"></script>
+    <script type="text/javascript" src="js/jquery-1.6.3.min.js"></script>
+	<script type="text/javascript" src="js/jquery-ui-1.8.16.custom.min.js"></script>
     <script type="text/javascript" src="js/scrigo.js.php"></script>
-    <script type="text/javascript" src="js/uni-form/jquery.js"></script>
     <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
+	<script language="JavaScript" type="text/javascript">
+		var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
+		if(!is_chrome && getInternetExplorerVersion() > 8.0) {
+			var style = document.createElement('style');
+			style.innerHTML = '#page_margins { min-width: 980px; max-width: 80%; background: #fff; display: table;}';
+			document.getElementsByTagName("head")[0].appendChild(style);
+		}
+
+		jQuery(document).ready(function() {
+			loadInitContent();
+			
+			$("#pageForm").submit(function(e){
+				//Prevent form submit: e.preventDefault() in lists
+				if ($(".panel #Filter").length > 0) {
+					e.preventDefault();
+				}
+			});
+		});
+		
+		
+		jQuery(document).bind("change", function(event) {
+			if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
+				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			}
+		});
+		
+		//Use jQuery submit with kespress Enter in panel filterbar
+		jQuery(document).bind("keypress", function(event) {
+			if (event.which == '13' && $(".panel #Filter").length > 0) {
+				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			}
+		});
+
+	</script>
 </head>
-<body onload="loadInitContent()">
+<body>
     <div id="page_margins">
         <div id="page">
             <div id="header">
@@ -68,9 +104,11 @@
                     <a class="skip" href="#navigation" title="skip link">Skip to the navigation</a><span class="hideme">.</span>
                     <a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
                     <!-- end: skip link navigation -->
-                    <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+			        <tmpl_if name="cpuser">
+                    <span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+			        </tmpl_if>
                 </div>
-                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
                 <span>hosting control panel</span>
             </div>
             <!-- begin: main navigation #nav -->
@@ -106,10 +144,11 @@
                 <!-- end: #col3 -->
             </div>
             <!-- end: #main -->
-        <!-- begin: #footer -->
-        <div id="footer">
+            <!-- begin: #footer -->
+            <div id="footer">
             Powered by <a href="<tmpl_var name="app_link">" target="_blank"><tmpl_var name="app_title"></a>
-        </div><!-- end: #footer -->
+            </div><!-- end: #footer -->
+        </div>
     </div>
 </body>
 </html>

--
Gitblit v1.9.1