From a008884b8f041577d43675f13c492f45fb9ee066 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 16 Oct 2012 10:38:27 -0400
Subject: [PATCH] Merged revisions 3536-3555 from 3.0.5 stable branch.
---
interface/web/themes/default/templates/main.tpl.htm | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index ea2698f..ce74406 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -64,16 +64,43 @@
jQuery(document).bind("keypress", function(event) {
//Use jQuery submit with keypress Enter in panel filterbar
- if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+ if (event.which == '13' && jQuery(".panel #Filter").length > 0 && jQuery(event.target).hasClass('ui-autocomplete-input') == false ) {
event.preventDefault();
jQuery(".panel #Filter").trigger('click');
}
//Use jQuery submit with keypress Enter in forms
- if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea') {
+ if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea' && jQuery(event.target).is(':input')) {
event.preventDefault();
- jQuery(".pnl_formsarea button.positive:first").trigger('click');
+ jQuery(".pnl_formsarea button.positive:first").not("[disabled='disabled']").trigger('click');
}
});
+
+ jQuery(document).delegate('.pnl_listarea th', 'click', function(event) {
+ if(jQuery(this).attr('class').length > 0 && jQuery(".panel #Filter").length > 0 && jQuery(this).hasClass('tbl_col_buttons') == false && jQuery(this).hasClass('tbl_col_limit') == false && jQuery(this).hasClass('tbl_col_nosort') == false) {
+ event.preventDefault();
+ var clickevent = jQuery('#Filter').attr('onclick');
+ var element = jQuery(this).attr('class');
+ if(typeof clickevent == 'string') {
+ jQuery('#Filter').attr('onclick', clickevent.replace(".php')", ".php?orderby=" + element + "')"));
+ }
+ jQuery(".panel #Filter").trigger('click');
+
+ jQuery("#pageForm").ajaxComplete(function() {
+ if(jQuery("th."+element).css("background-position") == '0px -15px') {
+ if(jQuery("th."+element).css("text-align") == "right") {
+ jQuery("th."+element).css("text-align","left");
+ } else {
+ jQuery("th."+element).css("text-align","right");
+ }
+ } else {
+ jQuery(".pnl_listarea th").css("text-align","");
+ }
+ jQuery(".pnl_listarea th").css("background-position","0 0");
+ jQuery("th."+element).css("background-position","0 -15px");
+ });
+ }
+ });
+
</script>
</head>
<body>
--
Gitblit v1.9.1