From da9e99596e2fcb76a37fcc8a24c8eacd00ff186c Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Mon, 14 Sep 2015 04:23:58 -0400
Subject: [PATCH] resize openvz-server with ploop enabled
---
interface/web/themes/default/assets/javascripts/ispconfig.js | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index 3279f28..2db94df 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -121,6 +121,24 @@
});
}
+ $('input[data-input-element="date"]').datetimepicker({
+ 'language': 'en', // TODO
+ 'todayHighlight': true,
+ 'todayBtn': 'linked',
+ 'bootcssVer': 3,
+ 'fontAwesome': true,
+ 'autoclose': true,
+ 'minView': 'month'
+ });
+ $('input[data-input-element="datetime"]').datetimepicker({
+ 'language': 'en', // TODO
+ 'todayHighlight': true,
+ 'todayBtn': 'linked',
+ 'bootcssVer': 3,
+ 'fontAwesome': true,
+ 'autoclose': true
+ });
+
ISPConfig.callHook('onAfterContentLoad', {'url': url, 'data': data });
},
@@ -464,7 +482,7 @@
});
},
- loadOptionInto: function(elementid,pagename) {
+ loadOptionInto: function(elementid,pagename,callback) {
var pageContentObject2 = $.ajax({
type: "GET",
url: pagename,
@@ -481,6 +499,9 @@
foo2.appendChild(document.createTextNode(elemente[i]));
foo2.value=elemente[i];
el.appendChild(foo2);
+ }
+ if (typeof(callback) != 'undefined') {
+ callback(elementid,pagename);
}
},
error: function() {
@@ -584,7 +605,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 +613,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 +621,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');
@@ -635,7 +656,11 @@
var dir = $self.attr('data-ordered');
- act = act + '?orderby=' + column;
+ var separator = '?';
+ if(act.indexOf("?") >= 0){
+ separator = '&';
+ }
+ act = act + separator + 'orderby=' + column;
ISPConfig.submitForm(form, act);
$(document).ajaxComplete(function() {
@@ -704,14 +729,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