From 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Wed, 21 Jan 2015 18:55:41 -0500
Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:renky/ispconfig3
---
interface/web/themes/default/templates/main.tpl.htm | 108 +++++++----------------------------------------------
1 files changed, 15 insertions(+), 93 deletions(-)
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 9975181..67b37e8 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -94,104 +94,26 @@
</tmpl_loop>
<script>
<!--
- $(document).ready(function() {
- loadInitContent();
- });
-
- $('#searchform').submit(function(e) {
- e.preventDefault();
- });
-
- $("#pageForm").submit(function(e){
- //Prevent form submit: e.preventDefault() in lists
- if ($("#pageForm .table #Filter").length > 0) {
- e.preventDefault();
- }
- });
-
- $('#globalsearch').ispconfigSearch({
- dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
- resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
- noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
- noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
- searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">',
- resultBoxPosition: ''
- });
-
//$('.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">';
+ ISPConfig.tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled">';
+ ISPConfig.tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled">';
+ ISPConfig.tabChangeWarningTxt = '<tmpl_var name="global_tabchange_warning_txt">';
+ ISPConfig.tabChangeDiscardTxt = '<tmpl_var name="global_tabchange_discard_txt">';
- $(document).on("change", function(event) {
- var elName = event.target.localName;
- if ($("#pageForm .table #Filter").length > 0 && elName == 'select') {
- event.preventDefault();
- $("#pageForm .table #Filter").trigger('click');
- }
- if(elName == 'select' || elName == 'input' || elName == 'textarea') {
- if($(event.target).hasClass('no-page-form-change') == false) {
- // set marker that something was changed
- pageFormChanged = true;
- }
- }
- });
+ <tmpl_if name="use_loadindicator" value="y">ISPConfig.setOption('useLoadIndicator', true);</tmpl_if>
+ <tmpl_if name="use_combobox" value="y">ISPConfig.setOption('useComboBox', true);</tmpl_if>
- $(document).on('click', 'a[data-load-content],button[data-load-content]', function(e) {
- e.preventDefault();
- var content_to_load = $(this).attr('data-load-content');
- if(!content_to_load) return this;
-
- loadContent(content_to_load);
- });
+ $(document).ready(function() {
+ $('#globalsearch').ispconfigSearch({
+ dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
+ resultsLimit: '$ <tmpl_var name="globalsearch_resultslimit_of_txt"> % <tmpl_var name="globalsearch_resultslimit_results_txt">',
+ noResultsText: '<tmpl_var name="globalsearch_noresults_text_txt">',
+ noResultsLimit: '<tmpl_var name="globalsearch_noresults_limit_txt">',
+ searchFieldWatermark: '<tmpl_var name="globalsearch_searchfield_watermark_txt">',
+ resultBoxPosition: ''
+ });
- $(document).on('click', 'a[data-capp],button[data-capp]', function(e) {
- e.preventDefault();
- var content_to_load = $(this).attr('data-capp');
- if(!content_to_load) return this;
-
- capp(content_to_load);
- });
-
- $(document).bind("keypress", function(event) {
- //Use $ submit with keypress Enter in panel filterbar
- if (event.which == '13' && $("#pageForm .table #Filter").length > 0 && $(event.target).hasClass('ui-autocomplete-input') == false ) {
- event.preventDefault();
- $("#pageForm .table #Filter").trigger('click');
- }
- //Use $ submit with keypress Enter in forms
- if (event.which == '13' && $(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea' && $(event.target).is(':input')) {
- event.preventDefault();
- $(".pnl_formsarea button.positive:first").not("[disabled='disabled']").trigger('click');
- }
- });
-
- $(document).delegate('.pnl_listarea th', 'click', function(event) {
- if($(this).attr('class').length > 0 && $("#pageForm .table #Filter").length > 0 && $(this).hasClass('tbl_col_buttons') == false && $(this).hasClass('tbl_col_limit') == false && $(this).hasClass('tbl_col_nosort') == false) {
- event.preventDefault();
- var clickevent = $('#Filter').attr('onclick');
- var element = $(this).attr('class');
- if(typeof clickevent == 'string') {
- $('#Filter').attr('onclick', clickevent.replace(".php')", ".php?orderby=" + element + "')"));
- }
- $("#pageForm .table #Filter").trigger('click');
-
- $("#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");
- });
- }
});
//-->
</script>
--
Gitblit v1.9.1