diff --git a/application/views/pages/login/login_view.php b/application/views/pages/login/login_view.php index 354d951..5304a8d 100644 --- a/application/views/pages/login/login_view.php +++ b/application/views/pages/login/login_view.php @@ -33,8 +33,9 @@ +load->view('specials/notify_modal'); ?> -
> +
@@ -42,16 +43,16 @@ ...

projectbeheer

-
+
- +
- +
@@ -102,5 +103,8 @@ + + + diff --git a/application/views/specials/notify_modal.php b/application/views/specials/notify_modal.php new file mode 100644 index 0000000..327549b --- /dev/null +++ b/application/views/specials/notify_modal.php @@ -0,0 +1,37 @@ + \ No newline at end of file diff --git a/public/js/lib/modules/login/loginModule.js b/public/js/lib/modules/login/loginModule.js index 2fa702b..23cfa0c 100644 --- a/public/js/lib/modules/login/loginModule.js +++ b/public/js/lib/modules/login/loginModule.js @@ -4,29 +4,29 @@ * Date: 05/12/2017 * Time: 11:17 */ -var pp = {}; +var dbo = {}; $( function () { - pp.loginModel = { + dbo.loginModel = { username: ko.observable( '' ), password: ko.observable( '' ), login: function () { - pp.loginService.login(); + dbo.loginService.login(); } } - ko.applyBindings( pp.loginModel, document.getElementById( "login-user" ) ); + ko.applyBindings( dbo.loginModel, document.getElementById( "login-form" ) ); } ); -pp.loginService = { +dbo.loginService = { login: function () { - var ds = pp.loginDataservice; - var self = pp.loginService; - var vm = pp.loginModel; + var ds = dbo.loginDataservice; + var self = dbo.loginService; + var vm = dbo.loginModel; self.validateInput( function ( data ) { if ( !data ) return self.notifyWrongPassword(); @@ -39,7 +39,7 @@ pp.loginService = { }, validateInput: function ( callback ) { - var vm = pp.loginModel; + var vm = dbo.loginModel; if ( vm.username().length < 2 ) return callback( false ); if ( vm.password().length < 6 ) return callback( false ); @@ -62,7 +62,7 @@ pp.loginService = { }; -pp.loginDataservice = { +dbo.loginDataservice = { login: function ( submitDATA, callback ) { $.post( 'index.php/login/', submitDATA, function ( data ) { diff --git a/public/js/lib/modules/specials/notifyModule.js b/public/js/lib/modules/specials/notifyModule.js index 8ef53f0..7974324 100644 --- a/public/js/lib/modules/specials/notifyModule.js +++ b/public/js/lib/modules/specials/notifyModule.js @@ -6,10 +6,10 @@ */ var notifyMe = function ( options, callback ) { - pp.notifyModel.init( options, callback ); + dbo.notifyModel.init( options, callback ); } -pp.notifyModel = { +dbo.notifyModel = { title : ko.observable( null ), message : ko.observable( null ), @@ -21,7 +21,7 @@ pp.notifyModel = { callback : null, init: function ( options, callback ) { - var vm = pp.notifyModel; + var vm = dbo.notifyModel; vm.callback = callback; @@ -31,7 +31,7 @@ pp.notifyModel = { }, setOptions: function ( options ) { - var vm = pp.notifyModel; + var vm = dbo.notifyModel; vm.title( options.title || '' ); vm.message( options.message || '' ); @@ -40,27 +40,28 @@ pp.notifyModel = { vm.noText( options.noText || 'Nee' ); vm.yesText( options.yesText || 'Ja' ); vm.closeText( options.closeText || 'ok' ); + vm.modalClass( options.modalClass || 'modal-primary'); }, closeNo: function () { - if ( typeof( pp.notifyModel.callback ) == 'function' ) callback( false ); + if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback( false ); }, closeYes: function () { - if ( typeof( pp.notifyModel.callback ) == 'function' ) callback( true ); + if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback( true ); }, closeOk: function () { - if ( typeof( pp.notifyModel.callback ) == 'function' ) callback(); + if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback(); }, close: function () { - if ( typeof( pp.notifyModel.callback ) == 'function' ) callback(); + if ( typeof( dbo.notifyModel.callback ) == 'function' ) callback(); } } -ko.applyBindings( pp.notifyModel, document.getElementById( "notify-me" ) ); +ko.applyBindings( dbo.notifyModel, document.getElementById( "notify-me" ) );