diff options
| author | michael pereira | 2011-04-26 10:59:15 +0200 |
|---|---|---|
| committer | michael pereira | 2011-04-26 10:59:15 +0200 |
| commit | cd54d29288e6d4f0085beec47d3dc257774e6659 (patch) | |
| tree | 124480bfe99570c091643960c70b3555e42c75dc /application/modules/fbgui | |
| parent | home on usb and draggable bootmenulist (diff) | |
| parent | groupController Redirects && Graph editiert (diff) | |
| download | pbs2-cd54d29288e6d4f0085beec47d3dc257774e6659.tar.gz pbs2-cd54d29288e6d4f0085beec47d3dc257774e6659.tar.xz pbs2-cd54d29288e6d4f0085beec47d3dc257774e6659.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/fbgui')
3 files changed, 9 insertions, 2 deletions
diff --git a/application/modules/fbgui/forms/MembershipSelect.php b/application/modules/fbgui/forms/MembershipSelect.php index a141116..d59a6d8 100644 --- a/application/modules/fbgui/forms/MembershipSelect.php +++ b/application/modules/fbgui/forms/MembershipSelect.php @@ -42,6 +42,7 @@ class fbgui_Form_MembershipSelect extends Zend_Form $this->addElement('submit', 'selectmembership', array( 'required' => false, + 'id' => 'submit', 'ignore' => true, 'label' => 'Select', )); diff --git a/application/modules/fbgui/views/scripts/auth/login.phtml b/application/modules/fbgui/views/scripts/auth/login.phtml index 330b34f..e78d973 100644 --- a/application/modules/fbgui/views/scripts/auth/login.phtml +++ b/application/modules/fbgui/views/scripts/auth/login.phtml @@ -7,10 +7,10 @@ echo $this->loginForm; <script> $(document).ready(function(){ $("#email").focus(); - $('input').keypress(function(e) { + $(document).keydown(function(e) { if(e.which == 13) { $(this).blur(); - $('#login').focus().click(); + $('#submit').focus().click(); } }); }); diff --git a/application/modules/fbgui/views/scripts/person/selectmembership.phtml b/application/modules/fbgui/views/scripts/person/selectmembership.phtml index e226b82..c40f94a 100644 --- a/application/modules/fbgui/views/scripts/person/selectmembership.phtml +++ b/application/modules/fbgui/views/scripts/person/selectmembership.phtml @@ -6,5 +6,11 @@ echo $this->membershipSelectForm; <script> $(document).ready(function(){ $("#membershipID").focus(); + $(document).keydown(function(e) { + if(e.which == 13) { + $(this).blur(); + $('#submit').focus().click(); + } + }); }); </script> |