Mercurial > hg > soundsoftware-site
diff app/views/settings/.svn/text-base/_authentication.rhtml.svn-base @ 37:94944d00e43c
* Update to SVN trunk rev 4411
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 19 Nov 2010 13:24:41 +0000 |
| parents | 513646585e45 |
| children |
line wrap: on
line diff
--- a/app/views/settings/.svn/text-base/_authentication.rhtml.svn-base Fri Sep 24 14:06:04 2010 +0100 +++ b/app/views/settings/.svn/text-base/_authentication.rhtml.svn-base Fri Nov 19 13:24:41 2010 +0000 @@ -3,7 +3,7 @@ <div class="box tabular settings"> <p><%= setting_check_box :login_required %></p> -<p><%= setting_select :autologin, [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, :blank => :label_disabled %></p> +<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p> <p><%= setting_select :self_registration, [[l(:label_disabled), "0"], [l(:label_registration_activation_by_email), "1"],