From f4f981d8f98e4f74a8d69d05a31ab63e188ea808 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 15 Nov 2015 08:00:17 -0500
Subject: [PATCH] Added missing delimiter settings in reseller form file.
---
interface/web/themes/default/assets/javascripts/ispconfig.js | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index b68af57..cf82d3d 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -11,7 +11,7 @@
options: {
useLoadIndicator: false,
- useComboBox: false,
+ useComboBox: false
},
setOption: function(key, value) {
@@ -91,7 +91,7 @@
placeholder: '',
width: 'element',
selectOnBlur: true,
- allowClear: true,
+ allowClear: true
});
}
},
@@ -121,11 +121,29 @@
});
}
+ $('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 });
},
/* THIS ONE SHOULD BE REMOVED AFTER CREATING THE STATIC LOGIN PAGE!!! */
- submitLoginForm: function(formname) {
+ /*submitLoginForm: function(formname) {
//* Validate form. TODO: username and password with strip();
var frm = document.getElementById(formname);
var userNameObj = frm.username;
@@ -171,7 +189,7 @@
ISPConfig.reportError('Ajax Request was not successful.110');
}
});
- },
+ },*/
submitForm: function(formname, target, confirmation) {
var successMessage = arguments[3];
@@ -191,6 +209,9 @@
if(jqXHR.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = jqXHR.responseText.split(':');
ISPConfig.loadContent(parts[1]);
+ } else if (jqXHR.responseText.indexOf('LOGIN_REDIRECT:') > -1) {
+ // Go to the login page
+ document.location.href = '/index.php';
} else {
$('#pageContent').html(jqXHR.responseText);
ISPConfig.onAfterContentLoad(target, $('#'+formname).serialize());
@@ -336,8 +357,8 @@
loadInitContent: function() {
var pageContentObject = $.ajax({
type: "GET",
- url: "content.php",
- data: "s_mod=login&s_pg=index",
+ url: "dashboard/dashboard.php",
+ data: "",
dataType: "html",
beforeSend: function() {
ISPConfig.showLoadIndicator();
@@ -348,7 +369,7 @@
ISPConfig.loadContent(parts[1]);
} else {
$('#pageContent').html(jqXHR.responseText);
- ISPConfig.onAfterContentLoad('content.php', "s_mod=login&s_pg=index");
+ ISPConfig.onAfterContentLoad('dashboard/dashboard.php', "");
ISPConfig.pageFormChanged = false;
}
ISPConfig.hideLoadIndicator();
--
Gitblit v1.9.1