diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index bf348a3a..b550297c 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -3,7 +3,7 @@ <%= stylesheet_link_tag "scaffold" %> - <%= javascript_include_tag :defaults %> + <%= javascript_include_tag 'jquery' %> <%= javascript_include_tag 'jquery.cookie' %> <%= @page_title -%> diff --git a/app/views/login/login.html.erb b/app/views/login/login.html.erb index fd9b36c2..de3d3fe4 100644 --- a/app/views/login/login.html.erb +++ b/app/views/login/login.html.erb @@ -75,4 +75,27 @@ function showPreferredAuth() { } } $(document).ready(showPreferredAuth); + +var Login = { + showOpenid: function() { + $('#database_auth_form').hide(); + $('#openid_auth_form').show(); + $('#alternate_auth_openid').hide(); + $('#alternate_auth_database').show(); + $('#openid_url').focus(); + $('#openid_url').select(); + $.cookie('preferred_auth', 'openid'); + }, + + showDatabase: function(container) { + $('#openid_auth_form').hide(); + $('#database_auth_form').show(); + $('#alternate_auth_database').hide(); + $('#alternate_auth_openid').show(); + $('#user_login').focus(); + $('#user_login').select(); + $.cookie('preferred_auth', 'database'); + } +} + diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 2eff7134..00084de9 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1,25 +1,3 @@ -var Login = { - showOpenid: function() { - $('#database_auth_form').hide(); - $('#openid_auth_form').show(); - $('#alternate_auth_openid').hide(); - $('#alternate_auth_database').show(); - $('#openid_url').focus(); - $('#openid_url').select(); - $.cookie('preferred_auth', 'openid'); - }, - - showDatabase: function(container) { - $('#openid_auth_form').hide(); - $('#database_auth_form').show(); - $('#alternate_auth_database').hide(); - $('#alternate_auth_openid').show(); - $('#user_login').focus(); - $('#user_login').select(); - $.cookie('preferred_auth', 'database'); - } -} - var TracksForm = { toggle: function(toggleDivId, formContainerId, formId, hideLinkText, hideLinkTitle, showLinkText, showLinkTitle) { $('#'+formContainerId).toggle();