diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js index 04fa820..9733643 100644 --- a/uVote/page/default_page/js/loadtexts.js +++ b/uVote/page/default_page/js/loadtexts.js @@ -51,9 +51,7 @@ $(document).ready(function() { //load_user_main_tab('user_main_uVote'); }); - -}); -$("#form_login input").not("[type=submit]").jqBootstrapValidation({ + $("#form_login input").not("[type=submit]").jqBootstrapValidation({ preventSubmit: true, submitError: function($form, event, errors) {}, @@ -80,7 +78,9 @@ $("#form_login input").not("[type=submit]").jqBootstrapValidation({ event.preventDefault(); } }); - + +}); + function register_registerform(){ console.log("wegwegwegwegwegweg"); $("#register_user_form input").not("[type=submit]").jqBootstrapValidation( diff --git a/uVote/page/page_uvote.php b/uVote/page/page_uvote.php index 96e5956..64c1c89 100644 --- a/uVote/page/page_uvote.php +++ b/uVote/page/page_uvote.php @@ -18,8 +18,11 @@ class page_uvote extends \SYSTEM\API\api_default { public static function action_user_list(){ return new user_list();} - public static function action_user_main_uVote(){ - return new user_main_uVote();} + public static function action_user_list_active(){ + return new user_list_active();} + + public static function action_user_list_ended(){ + return new user_list_ended();} public static function action_user_main_urVote(){ return new user_main_urVote();}