From 02bf997271f4d09e91c8fcb9cecd08f06f2400c4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Apr 2012 12:04:52 -0400
Subject: [PATCH] Merged revisions 3028-3045 from stable branch.
---
interface/web/themes/default_combobox/templates/main.tpl.htm | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index df26afd..5b73fba 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -6,7 +6,6 @@
<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"/>
- <link href="themes/default_combobox/css/additional.css" rel="stylesheet" type="text/css"/>
<!--[if lte IE 7]>
<link href="themes/default/css/patches/central.css" rel="stylesheet" type="text/css" />
<![endif]-->
@@ -54,6 +53,9 @@
.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 href="themes/default_combobox/css/additional.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>
@@ -70,6 +72,13 @@
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) {
@@ -77,13 +86,41 @@
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
}
});
-
- //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(".ui-autocomplete a").live("click", function(event) {
+ if ($(".panel #Filter").length > 0) {
+ $(".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();
+ }
+ });
+
+ (function( $ ){
+ $(".pnl_listarea th").live("click", function(){
+ if($(this).attr('class').length > 0 && $("#Filter").length > 0){
+ eval($("#Filter").attr("onclick").replace(".php');",".php?orderby="+$(this).attr('class')+"');"));
+ var element = $(this).attr('class');
+ $("#pageForm").ajaxComplete(function() {
+ if($("th."+element).css("background-position") == '0px -15px'){
+ if($("th."+element).css("text-align") == "right"){
+ $("th."+element).css("text-align","left");
+ } else {
+ $("th."+element).css("text-align","right");
+ }
+ } else {
+ $(".pnl_listarea th").css("text-align","");
+ }
+ $(".pnl_listarea th").css("background-position","0 0");
+ $("th."+element).css("background-position","0 -15px");
+ });
+ }
+ });
+ })( jQuery );
(function( $ ) {
$.widget( "ui.combobox", {
@@ -205,7 +242,7 @@
})( jQuery );
- jQuery("body").live("mouseover", function(){
+ jQuery("html").ajaxComplete( function(){
if(jQuery(".panel .list td select").css("display") != "none"){
jQuery(".panel .list td select").combobox();
}
@@ -225,7 +262,7 @@
<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>
</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 -->
--
Gitblit v1.9.1