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 | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 9a7c138..aa4ec17 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -53,8 +53,11 @@
.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/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/uni-form.jquery.js"></script>
<script language="JavaScript" type="text/javascript">
@@ -67,6 +70,13 @@
jQuery(document).ready(function() {
loadInitContent();
+
+ $("#pageForm").submit(function(e){
+ //Prevent form submit: e.preventDefault() in lists
+ if ($(".panel #Filter").length > 0) {
+ e.preventDefault();
+ }
+ });
});
@@ -77,9 +87,9 @@
});
//Use jQuery submit with kespress Enter in panel filterbar
- jQuery(".panel .list input").live("keypress", function(event) {
- if (event.which == '13' && $(this).parents("tr").find("#Filter")) {
- $(this).parents("tr").find("#Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+ jQuery(document).bind("keypress", function(event) {
+ if (event.which == '13' && $(".panel #Filter").length > 0) {
+ $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
}
});
@@ -95,10 +105,10 @@
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
- <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>
+ <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 -->
@@ -124,7 +134,7 @@
<div id="col3_content" class="clearfix">
<a id="content" name="content"></a>
<!-- skiplink anchor: Content -->
- <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm" onSubmit="return false;">
+ <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
<div id="pageContent"><!-- AJAX CONTENT --></div>
</form>
</div>
--
Gitblit v1.9.1