andy/neoCMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	cms/js/neocms.js
#	cms/settings/index.php
This commit is contained in:
Andy Dixon
2024-08-01 21:15:41 +01:00
parent 49e914bb6e bd1567b788
commit c287e9de30
29 changed files with 16 additions and 6683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cms/js/main.js
-24
View File
@@ -10,7 +10,6 @@ $(function () {
});
$(window).bind('resize', windowResize);
$('#neoCMSLoginForm').bind('submit', loginSubmit);
$('#forgotPass').bind('click', forgotShow);
$('#neoCMSUsername input').focus();
$('#neoCMSHome').bind('click', function () {
checkURL(fpath())
@@ -70,29 +69,6 @@ loginIncorr = function (message) {
$('#neoCMSEnter p.error').html(message).css('display', 'block');
$('#neoCMSLoginIframe').remove()
};
forgotShow = function () {
$('#neoCMSLoginForm').attr({action: 'core/forgotpassword.php'}).find('p.error').css('display', 'none');
$('#forgot').css({opacity: '0', display: 'block'}).fadeTo(300, 1.0, function () {
$('#forgotCancel').unbind('click').bind('click', forgotHide);
$('#neoCMSPassword').remove()
})
};
forgotHide = function () {
$('#neoCMSLoginForm').attr({action: 'core/forgotpassword.php'}).find('p.error').css('display', 'none');
$('<li/>').attr('id', 'neoCMSPassword').html('<br/>').prepend($('<label/>').html('Password')).append($('<input/>').addClass("neoCMSInput").attr({
name: "neoCMSPassword",
type: "password",
tabindex: "2"
})).append($('<p/>').addClass('error').html('Required')).insertAfter('#neoCMSUsername');
$('#forgot').css('display', 'none');
$('#neoCMSLoginForm').attr({action: 'core/login.php'});
$('#forgot p.message').html('').css({display: 'none'})
};
forgotReset = function (message) {
var c = (message.match(/domain/gi)) ? '#666' : '#fff';
$('#forgot p.message').html(message).css({color: c, display: 'block'});
$('#neoCMSLoginIframe').remove()
};
windowResize = function () {
if ($('.neoCMSIcon, .neoCMSRepIcon', ifrDoc).length) destroyIcons();
if ($('#overlay').length) $('#overlay').css({width: $(window).width(), height: $(window).height()});