From 54afe0e3036f339e623e98f5d3fbb397376c7ca2 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 15 Feb 2015 04:05:48 -0500
Subject: [PATCH] allow ipv6 for openvz-container
---
interface/web/themes/default/assets/javascripts/ispconfig.js | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index c523ff6..bc5c988 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -584,7 +584,7 @@
});
$(document).on('click', 'a[data-load-content],button[data-load-content]', function(e) {
- e.preventDefault();
+ //e.preventDefault();
var content_to_load = $(this).attr('data-load-content');
if(!content_to_load) return this;
@@ -592,7 +592,7 @@
});
$(document).on('click', 'a[data-capp],button[data-capp]', function(e) {
- e.preventDefault();
+ //e.preventDefault();
var content_to_load = $(this).attr('data-capp');
if(!content_to_load) return this;
@@ -600,7 +600,7 @@
});
$(document).on('click', 'a[data-submit-form],button[data-submit-form]', function(e) {
- e.preventDefault();
+ //e.preventDefault();
var $el = $(this);
var act = $el.attr('data-form-action');
@@ -633,8 +633,18 @@
var act = $el.attr('data-form-action');
var form = $el.attr('data-submit-form');
+ var dir = $self.attr('data-ordered');
+
act = act + '?orderby=' + column;
ISPConfig.submitForm(form, act);
+
+ $(document).ajaxComplete(function() {
+ var $self = $('#pageForm .table th[data-column="' + column + '"]');
+ $self.parent().children('th[data-column]').removeAttr('data-ordered');
+ if(dir && dir == 'asc') $self.attr('data-ordered', 'desc');
+ else $self.attr('data-ordered', 'asc');
+ });
+
}
});
@@ -694,14 +704,5 @@
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: ''
});
});
--
Gitblit v1.9.1