jro_apps/redmine Commit - r232:2b7c31feb504

setting password_lost renamed to lost_password...

Jean-Philippe Lang -

r232:2b7c31feb504

parent child

Context file:

r232:2b7c31feb504

Collapse all files

app/views/account/login.rhtml +1 -1

             <center>
             <div class="box login">
             <h2 class="icon22 icon22-authent"><%=l(:label_please_login)%></h2>
             <% form_tag({:action=> "login"}, :class => "tabular") do %>
             <p><label for="login"><%=l(:field_login)%>:</label>
             <%= text_field_tag 'login', nil, :size => 25 %></p>
             <p><label for="password"><%=l(:field_password)%>:</label>
             <%= password_field_tag 'password', nil, :size => 25 %></p>
             <p><center><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></center>
             <% end %>
             <br>
             <% links = []
                links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?
-               links << link_to(l(:label_password_lost), :action => 'password_lost') if Setting.password_lost?
+               links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password?
             %>
             <%= links.join(" | ") %>
             </p>
             </div>
             </center>

app/views/settings/edit.rhtml +1 -1

             <h2><%= l(:label_settings) %></h2>
             <% form_tag({:action => 'edit'}, :class => "tabular") do %>
             <div class="box">
             <p><label><%= l(:setting_app_title) %></label>
             <%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p>
             <p><label><%= l(:setting_app_subtitle) %></label>
             <%= text_field_tag 'settings[app_subtitle]', Setting.app_subtitle, :size => 60 %></p>
             <p><label><%= l(:setting_welcome_text) %></label>
             <%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5 %></p>
             <p><label><%= l(:setting_default_language) %></label>
             <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
             <p><label><%= l(:setting_login_required) %></label>
             <%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
             <p><label><%= l(:setting_self_registration) %></label>
             <%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
             <p><label><%= l(:label_password_lost) %></label>
-            <%= check_box_tag 'settings[password_lost]', 1, Setting.password_lost? %><%= hidden_field_tag 'settings[password_lost]', 0 %></p>
+            <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
             <p><label><%= l(:setting_attachment_max_size) %></label>
             <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
             <p><label><%= l(:setting_issues_export_limit) %></label>
             <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
             <p><label><%= l(:setting_mail_from) %></label>
             <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
             <p><label><%= l(:setting_host_name) %></label>
             <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
             <p><label><%= l(:setting_text_formatting) %></label>
             <%= select_tag 'settings[text_formatting]', options_for_select( [[l(:label_none), 0], ["textile", "textile"]], Setting.text_formatting) %></p>
             </div>
             <%= submit_tag l(:button_save) %>
             <% end %>

config/settings.yml +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             # DO NOT MODIFY THIS FILE !!!
             # Settings can be defined through the application in Admin -> Settings
             app_title:
               default: redMine
             app_subtitle:
               default: Project management
             welcome_text:
               default:
             login_required:
               default: 0
             self_registration:
               default: 1
-            password_lost:
+            lost_password:
               default: 1
             attachment_max_size:
               format: int
               default: 5120
             issues_export_limit:
               format: int
               default: 500
             mail_from:
               default: redmine@somenet.foo
             text_formatting:
               default: textile
             default_language:
               default: en
             host_name:
               default: localhost:3000

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages