From 5693a2f95a72cf65dac5b44e4bb1f6afc2de9be2 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Mon, 04 Jan 2016 09:02:52 -0500 Subject: [PATCH] - Scroll change --- interface/web/themes/default/assets/javascripts/ispconfig.js | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js index b68af57..439bd69 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(); @@ -587,7 +608,9 @@ }); $(document).on('click', 'a[data-load-content],button[data-load-content]', function(e) { - //e.preventDefault(); + e.preventDefault(); + $('html, body').animate({scrollTop: $('#pageContent').offset().top}, 1000); + var content_to_load = $(this).attr('data-load-content'); if(!content_to_load) return this; @@ -595,7 +618,9 @@ }); $(document).on('click', 'a[data-capp],button[data-capp]', function(e) { - //e.preventDefault(); + e.preventDefault(); + $('html, body').animate({scrollTop: $('#pageContent').offset().top}, 1000); + var content_to_load = $(this).attr('data-capp'); if(!content_to_load) return this; @@ -603,7 +628,8 @@ }); $(document).on('click', 'a[data-submit-form],button[data-submit-form]', function(e) { - //e.preventDefault(); + e.preventDefault(); + $('html, body').animate({scrollTop: $('#pageContent').offset().top}, 1000); var $el = $(this); var act = $el.attr('data-form-action'); -- Gitblit v1.9.1