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_64_navimg/templates/main.tpl.htm | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index ce013cf..c0180e1 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -94,22 +94,35 @@
});
jQuery('.ttip').tipsy({live: true, gravity: 'ne', html: true});
+
+ tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled>';
+ tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled>';
+ tabChangeWarningTxt = '<tmpl_var name="global_tabchange_warning_txt">';
+ tabChangeDiscardTxt = '<tmpl_var name="global_tabchange_discard_txt">';
});
jQuery(document).bind("change", function(event) {
- if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
- jQuery(".panel #Filter").trigger('click');
- }
+ var elName = event.target.localName;
+ if (jQuery(".panel #Filter").length > 0 && elName == 'select') {
+ event.preventDefault();
+ jQuery(".panel #Filter").trigger('click');
+ }
+ if(elName == 'select' || elName == 'input' || elName == 'textarea') {
+ // set marker that something was changed
+ pageFormChanged = true;
+ }
});
jQuery(document).bind("keypress", function(event) {
//Use jQuery submit with keypress Enter in panel filterbar
if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+ 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') {
- jQuery(".pnl_formsarea button.positive:first").trigger('click');
+ 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").not("[disabled='disabled']").trigger('click');
}
});
</script>
--
Gitblit v1.9.1