diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-01-25 10:31:06 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-01-25 10:31:06 +0000 |
| commit | 79f92a675af528ecbe5abcc15b9c98805c9c7315 (patch) | |
| tree | c5c2f04a5b16bfc2d98fe03495bc83f902188ee0 /app/views | |
| parent | 3d5d1a38e3d48e1fda7eee751563cbf8c3b0f00b (diff) | |
| download | redmine-79f92a675af528ecbe5abcc15b9c98805c9c7315.tar.gz redmine-79f92a675af528ecbe5abcc15b9c98805c9c7315.zip | |
User display format is now configurable in administration settings.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1103 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/settings/_members.rhtml | 4 | ||||
| -rw-r--r-- | app/views/settings/_general.rhtml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/settings/_members.rhtml b/app/views/projects/settings/_members.rhtml index 55dfde1ac..ab22ac602 100644 --- a/app/views/projects/settings/_members.rhtml +++ b/app/views/projects/settings/_members.rhtml @@ -1,8 +1,8 @@ <%= error_messages_for 'member' %> <% roles = Role.find_all_givable %> -<% users = User.find_active(:all) - @project.users %> +<% users = User.find_active(:all).sort - @project.users %> <% # members sorted by role position - members = @project.members.find(:all, :include => [:role, :user]).sort{|x,y| x.role.position <=> y.role.position} %> + members = @project.members.find(:all, :include => [:role, :user]).sort %> <% if members.any? %> <table class="list"> diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml index 514e62b59..548ebbfac 100644 --- a/app/views/settings/_general.rhtml +++ b/app/views/settings/_general.rhtml @@ -20,6 +20,9 @@ <p><label><%= l(:setting_time_format) %></label> <%= select_tag 'settings[time_format]', options_for_select( [[l(:label_language_based), '']] + Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, Setting.time_format) %></p> +<p><label><%= l(:setting_user_format) %></label> +<%= select_tag 'settings[user_format]', options_for_select( @options[:user_format], Setting.user_format.to_s ) %></p> + <p><label><%= l(:setting_attachment_max_size) %></label> <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p> |