jro_apps/redmine Commit - r60:362633d486e3

- new controller "myController"...

Jean-Philippe Lang -

r60:362633d486e3

parent child

Context file:

r60:362633d486e3

Expand all files

redmine/app/controllers/my_controller.rb created 644 +128 0

@@ -0,0 +1,128
	1	# redMine - project management software
	2	# Copyright (C) 2006 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class MyController < ApplicationController
	19	layout 'base'
	20	before_filter :require_login
	21
	22	BLOCKS = { 'issues_assigned_to_me' => :label_assigned_to_me_issues,
	23	'issues_reported_by_me' => :label_reported_issues,
	24	'latest_news' => :label_news_latest,
	25	'calendar' => :label_calendar,
	26	'documents' => :label_document_plural
	27	}.freeze
	28
	29	verify :xhr => true,
	30	:session => :page_layout,
	31	:only => [:add_block, :remove_block, :order_blocks]
	32
	33	def index
	34	page
	35	render :action => 'page'
	36	end
	37
	38	# Show user's page
	39	def page
	40	@user = self.logged_in_user
	41	@blocks = @user.pref[:my_page_layout] \|\| { 'left' => ['issues_assigned_to_me'], 'right' => ['issues_reported_by_me'] }
	42	end
	43
	44	# Edit user's account
	45	def account
	46	@user = self.logged_in_user
	47	if request.post? and @user.update_attributes(@params[:user])
	48	set_localization
	49	flash.now[:notice] = l(:notice_account_updated)
	50	self.logged_in_user.reload
	51	end
	52	end
	53
	54	# Change user's password
	55	def change_password
	56	@user = self.logged_in_user
	57	flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
	58	if @user.check_password?(@params[:password])
	59	@user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
	60	if @user.save
	61	flash[:notice] = l(:notice_account_password_updated)
	62	else
	63	render :action => 'account'
	64	return
	65	end
	66	else
	67	flash[:notice] = l(:notice_account_wrong_password)
	68	end
	69	redirect_to :action => 'account'
	70	end
	71
	72	# User's page layout configuration
	73	def page_layout
	74	@user = self.logged_in_user
	75	@blocks = @user.pref[:my_page_layout] \|\| { 'left' => ['issues_assigned_to_me'], 'right' => ['issues_reported_by_me'] }
	76	session[:page_layout] = @blocks
	77	%w(top left right).each {\|f\| session[:page_layout][f] \|\|= [] }
	78	@block_options = []
	79	BLOCKS.each {\|k, v\| @block_options << [l(v), k]}
	80	end
	81
	82	# Add a block to user's page
	83	# The block is added on top of the page
	84	# params[:block] : id of the block to add
	85	def add_block
	86	@user = self.logged_in_user
	87	block = params[:block]
	88	# remove if already present in a group
	89	%w(top left right).each {\|f\| (session[:page_layout][f] \|\|= []).delete block }
	90	# add it on top
	91	session[:page_layout]['top'].unshift block
	92	render :partial => "block", :locals => {:user => @user, :block_name => block}
	93	end
	94
	95	# Remove a block to user's page
	96	# params[:block] : id of the block to remove
	97	def remove_block
	98	block = params[:block]
	99	# remove block in all groups
	100	%w(top left right).each {\|f\| (session[:page_layout][f] \|\|= []).delete block }
	101	render :nothing => true
	102	end
	103
	104	# Change blocks order on user's page
	105	# params[:group] : group to order (top, left or right)
	106	# params[:list-(top\|left\|right)] : array of block ids of the group
	107	def order_blocks
	108	group = params[:group]
	109	group_items = params["list-#{group}"]
	110	if group_items and group_items.is_a? Array
	111	# remove group blocks if they are presents in other groups
	112	%w(top left right).each {\|f\|
	113	session[:page_layout][f] = (session[:page_layout][f] \|\| []) - group_items
	114	}
	115	session[:page_layout][group] = group_items
	116	end
	117	render :nothing => true
	118	end
	119
	120	# Save user's page layout
	121	def page_layout_save
	122	@user = self.logged_in_user
	123	@user.pref[:my_page_layout] = session[:page_layout] if session[:page_layout]
	124	@user.pref.save
	125	session[:page_layout] = nil
	126	redirect_to :action => 'page'
	127	end
	128	end

redmine/app/helpers/my_helper.rb created 644 +19 0

@@ -0,0 +1,19
	1	# redMine - project management software
	2	# Copyright (C) 2006 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	module MyHelper
	19	end

redmine/app/models/user_preference.rb created 644 +44 0

@@ -0,0 +1,44
	1	# redMine - project management software
	2	# Copyright (C) 2006 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	class UserPreference < ActiveRecord::Base
	19	belongs_to :user
	20	serialize :others, Hash
	21
	22	attr_protected :others
	23
	24	def initialize(attributes = nil)
	25	super
	26	self.others \|\|= {}
	27	end
	28
	29	def [](attr_name)
	30	if attribute_present? attr_name
	31	super
	32	else
	33	others[attr_name]
	34	end
	35	end
	36
	37	def []=(attr_name, value)
	38	if attribute_present? attr_name
	39	super
	40	else
	41	others.store attr_name, value
	42	end
	43	end
	44	end

redmine/app/views/my/_block.rhtml created 644 +16 0

@@ -0,0 +1,16
	1	<div id="block_<%= block_name %>" class="mypage-box">
	2
	3	<div style="float:right;margin-right:16px;z-index:500;">
	4	<%= link_to_remote "", {
	5	:url => { :action => "remove_block", :block => block_name },
	6	:complete => "removeBlock('block_#{block_name}')",
	7	:loading => "Element.show('indicator')",
	8	:loaded => "Element.hide('indicator')" },
	9	:class => "close-icon"
	10	%>
	11	</div>
	12
	13	<div class="handle">
	14	<%= render :partial => "my/blocks/#{block_name}", :locals => { :user => user } %>
	15	</div>
	16	</div> No newline at end of file

redmine/app/views/my/blocks/_calendar.rhtml created 644 +45 0

@@ -0,0 +1,45
	1	<h3><%= l(:label_calendar) %></h3>
	2
	3	<%
	4	@date_from = Date.today - (Date.today.cwday-1)
	5	@date_to = Date.today + (7-Date.today.cwday)
	6	@issues = Issue.find :all,
	7	:conditions => ["issues.project_id in (#{@user.projects.collect{\|m\| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to],
	8	:include => [:project, :tracker] unless @user.projects.empty?
	9	@issues \|\|= []
	10	%>
	11
	12	<table class="calenderTable">
	13	<tr class="ListHead">
	14	<td></td>
	15	<% 1.upto(7) do \|d\| %>
	16	<td align="center" width="14%"><%= day_name(d) %></td>
	17	<% end %>
	18	</tr>
	19	<tr height="100">
	20	<% day = @date_from
	21	while day <= @date_to
	22	if day.cwday == 1 %>
	23	<td valign="middle"><%= day.cweek %></td>
	24	<% end %>
	25	<td valign="top" width="14%" class="<%= day.month==@month ? "even" : "odd" %>">
	26	<p align="right"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>
	27	<% day_issues = []
	28	@issues.each { \|i\| day_issues << i if i.start_date == day or i.due_date == day }
	29	day_issues.each do \|i\| %>
	30	<%= if day == i.start_date and day == i.due_date
	31	image_tag('arrow_bw')
	32	elsif day == i.start_date
	33	image_tag('arrow_from')
	34	elsif day == i.due_date
	35	image_tag('arrow_to')
	36	end %>
	37	<small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%= i.subject.sub(/^(.{30}[^\s]\s).$/, '\1 (...)') %></small><br />
	38	<% end %>
	39	</td>
	40	<%= '</tr><tr height="100">' if day.cwday >= 7 and day!=@date_to %>
	41	<%
	42	day = day + 1
	43	end %>
	44	</tr>
	45	</table> No newline at end of file

redmine/app/views/my/blocks/_documents.rhtml created 644 +15 0

@@ -0,0 +1,15
	1	<h3><%=l(:label_document_plural)%></h3>
	2
	3	<ul>
	4	<% for document in Document.find :all,
	5	:limit => 10,
	6	:conditions => "documents.project_id in (#{@user.projects.collect{\|m\| m.id}.join(',')})",
	7	:include => [:project] %>
	8	<li>
	9	<b><%= link_to document.title, :controller => 'documents', :action => 'show', :id => document %></b>
	10	<br />
	11	<%= truncate document.description, 150 %><br />
	12	<em><%= format_time(document.created_on) %></em><br />
	13	</li>
	14	<% end unless @user.projects.empty? %>
	15	</ul> No newline at end of file

redmine/app/views/my/blocks/_issues_assigned_to_me.rhtml created 644 +10 0

@@ -0,0 +1,10
	1	<h3><%=l(:label_assigned_to_me_issues)%></h3>
	2	<% assigned_issues = Issue.find(:all,
	3	:conditions => ["assigned_to_id=?", user.id],
	4	:limit => 10,
	5	:include => [ :status, :project, :tracker ],
	6	:order => 'issues.updated_on DESC') %>
	7	<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
	8	<% if assigned_issues.length > 0 %>
	9	<p><%=lwr(:label_last_updates, assigned_issues.length)%></p>
	10	<% end %>

redmine/app/views/my/blocks/_issues_reported_by_me.rhtml created 644 +10 0

@@ -0,0 +1,10
	1	<h3><%=l(:label_reported_issues)%></h3>
	2	<% reported_issues = Issue.find(:all,
	3	:conditions => ["author_id=?", user.id],
	4	:limit => 10,
	5	:include => [ :status, :project, :tracker ],
	6	:order => 'issues.updated_on DESC') %>
	7	<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
	8	<% if reported_issues.length > 0 %>
	9	<p><%=lwr(:label_last_updates, reported_issues.length)%></p>
	10	<% end %> No newline at end of file

redmine/app/views/my/blocks/_latest_news.rhtml created 644 +13 0

@@ -0,0 +1,13
	1	<h3><%=l(:label_news_latest)%></h3>
	2
	3	<ul>
	4	<% for news in News.find :all,
	5	:limit => 10,
	6	:conditions => "news.project_id in (#{@user.projects.collect{\|m\| m.id}.join(',')})",
	7	:include => [:project, :author] %>
	8	<li><%= link_to news.title, :controller => 'news', :action => 'show', :id => news %><br />
	9	<% unless news.summary.empty? %><%= news.summary %><br /><% end %>
	10	<em><%= news.author.name %>, <%= format_time(news.created_on) %></em><br />
	11	</li>
	12	<% end unless @user.projects.empty? %>
	13	</ul> No newline at end of file

redmine/app/views/my/page.rhtml created 644 +30 0

@@ -0,0 +1,30
	1	<h2><%=l(:label_my_page)%></h2>
	2
	3	<div class="topright">
	4	<small><%= link_to l(:label_personalize_page), :action => 'page_layout' %></small>
	5	</div>
	6
	7	<div id="list-top">
	8	<% @blocks['top'].each do \|b\| %>
	9	<div class="mypage-box">
	10	<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
	11	</div>
	12	<% end if @blocks['top'] %>
	13	</div>
	14
	15	<div id="list-left" class="splitcontentleft">
	16	<% @blocks['left'].each do \|b\| %>
	17	<div class="mypage-box">
	18	<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
	19	</div>
	20	<% end if @blocks['left'] %>
	21	</div>
	22
	23	<div id="list-right" class="splitcontentright">
	24	<% @blocks['right'].each do \|b\| %>
	25	<div class="mypage-box">
	26	<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
	27	</div>
	28	<% end if @blocks['right'] %>
	29	</div>
	30

redmine/app/views/my/page_layout.rhtml created 644 +121 0

@@ -0,0 +1,121
	1	<script language="JavaScript">
	2
	3	function recreateSortables() {
	4	Sortable.destroy('list-top');
	5	Sortable.destroy('list-left');
	6	Sortable.destroy('list-right');
	7
	8	Sortable.create("list-top", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=top', {asynchronous:true, evalScripts:true, onComplete:function(request){new Effect.Highlight("list-top",{});}, onLoaded:function(request){Element.hide('indicator')}, onLoading:function(request){Element.show('indicator')}, parameters:Sortable.serialize("list-top")})}, only:'mypage-box', tag:'div'})
	9	Sortable.create("list-left", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=left', {asynchronous:true, evalScripts:true, onComplete:function(request){new Effect.Highlight("list-left",{});}, onLoaded:function(request){Element.hide('indicator')}, onLoading:function(request){Element.show('indicator')}, parameters:Sortable.serialize("list-left")})}, only:'mypage-box', tag:'div'})
	10	Sortable.create("list-right", {constraint:false, containment:['list-top','list-left','list-right'], dropOnEmpty:true, handle:'handle', onUpdate:function(){new Ajax.Request('/my/order_blocks?group=right', {asynchronous:true, evalScripts:true, onComplete:function(request){new Effect.Highlight("list-right",{});}, onLoaded:function(request){Element.hide('indicator')}, onLoading:function(request){Element.show('indicator')}, parameters:Sortable.serialize("list-right")})}, only:'mypage-box', tag:'div'})
	11	}
	12
	13	function updateSelect() {
	14	s = $('block-select')
	15	for (var i = 0; i < s.options.length; i++) {
	16	if ($('block_' + s.options[i].value)) {
	17	s.options[i].disabled = true;
	18	} else {
	19	s.options[i].disabled = false;
	20	}
	21	}
	22	s.options[0].selected = true;
	23	}
	24
	25	function afterAddBlock() {
	26	recreateSortables();
	27	updateSelect();
	28	}
	29
	30	function removeBlock(block) {
	31	$(block).parentNode.removeChild($(block));
	32	updateSelect();
	33	}
	34
	35	</script>
	36
	37	<div style="float:right;">
	38	<%= start_form_tag({:action => "add_block"}, :id => "block-form") %>
	39
	40	<%= select_tag 'block', "<option></option>" + options_for_select(@block_options), :id => "block-select", :class => "select-small" %>
	41	<small>
	42	<%= link_to_remote l(:button_add),
	43	:url => { :action => "add_block" },
	44	:with => "Form.serialize('block-form')",
	45	:update => "list-top",
	46	:position => :top,
	47	:complete => "afterAddBlock();",
	48	:loading => "Element.show('indicator')",
	49	:loaded => "Element.hide('indicator')"
	50	%>
	51	</small>
	52	<%= end_form_tag %>
	53	<small>\|
	54	<%= link_to l(:button_save), :action => 'page_layout_save' %> \|
	55	<%= link_to l(:button_cancel), :action => 'page' %>
	56	</small>
	57	</div>
	58
	59	<div style="float:right;margin-right:20px;">
	60	<span id="indicator" style="display:none"><%= image_tag "loading.gif" %></span>
	61	</div>
	62
	63	<h2><%=l(:label_my_page)%></h2>
	64
	65	<div id="list-top" class="block-receiver">
	66	<% @blocks['top'].each do \|b\| %>
	67	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
	68	<% end if @blocks['top'] %>
	69	</div>
	70
	71	<div id="list-left" class="splitcontentleft block-receiver">
	72	<% @blocks['left'].each do \|b\| %>
	73	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
	74	<% end if @blocks['left'] %>
	75	</div>
	76
	77	<div id="list-right" class="splitcontentright block-receiver">
	78	<% @blocks['right'].each do \|b\| %>
	79	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
	80	<% end if @blocks['right'] %>
	81	</div>
	82
	83	<%= sortable_element 'list-top',
	84	:tag => 'div',
	85	:only => 'mypage-box',
	86	:handle => "handle",
	87	:dropOnEmpty => true,
	88	:containment => ['list-top', 'list-left', 'list-right'],
	89	:constraint => false,
	90	:complete => visual_effect(:highlight, 'list-top'),
	91	:url => { :action => "order_blocks", :group => "top" },
	92	:loading => "Element.show('indicator')",
	93	:loaded => "Element.hide('indicator')"
	94	%>
	95
	96
	97	<%= sortable_element 'list-left',
	98	:tag => 'div',
	99	:only => 'mypage-box',
	100	:handle => "handle",
	101	:dropOnEmpty => true,
	102	:containment => ['list-top', 'list-left', 'list-right'],
	103	:constraint => false,
	104	:complete => visual_effect(:highlight, 'list-left'),
	105	:url => { :action => "order_blocks", :group => "left" },
	106	:loading => "Element.show('indicator')",
	107	:loaded => "Element.hide('indicator')" %>
	108
	109	<%= sortable_element 'list-right',
	110	:tag => 'div',
	111	:only => 'mypage-box',
	112	:handle => "handle",
	113	:dropOnEmpty => true,
	114	:containment => ['list-top', 'list-left', 'list-right'],
	115	:constraint => false,
	116	:complete => visual_effect(:highlight, 'list-right'),
	117	:url => { :action => "order_blocks", :group => "right" },
	118	:loading => "Element.show('indicator')",
	119	:loaded => "Element.hide('indicator')" %>
	120
	121	<%= javascript_tag "updateSelect()" %> No newline at end of file

redmine/db/migrate/008_create_user_preferences.rb created 644 +12 0

@@ -0,0 +1,12
	1	class CreateUserPreferences < ActiveRecord::Migration
	2	def self.up
	3	create_table :user_preferences do \|t\|
	4	t.column "user_id", :integer, :default => 0, :null => false
	5	t.column "others", :text
	6	end
	7	end
	8
	9	def self.down
	10	drop_table :user_preferences
	11	end
	12	end

redmine/public/images/close.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

redmine/public/images/close_hl.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

redmine/public/images/loading.gif created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

redmine/test/fixtures/user_preferences.yml created 644 +5 0

@@ -0,0 +1,5
	1	# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
	2	first:
	3	id: 1
	4	another:
	5	id: 2

redmine/test/functional/my_controller_test.rb created 644 +18 0

@@ -0,0 +1,18
	1	require File.dirname(__FILE__) + '/../test_helper'
	2	require 'my_controller'
	3
	4	# Re-raise errors caught by the controller.
	5	class MyController; def rescue_action(e) raise e end; end
	6
	7	class MyControllerTest < Test::Unit::TestCase
	8	def setup
	9	@controller = MyController.new
	10	@request = ActionController::TestRequest.new
	11	@response = ActionController::TestResponse.new
	12	end
	13
	14	# Replace this with your real tests.
	15	def test_truth
	16	assert true
	17	end
	18	end

redmine/test/unit/user_preference_test.rb created 644 +10 0

@@ -0,0 +1,10
	1	require File.dirname(__FILE__) + '/../test_helper'
	2
	3	class UserPreferenceTest < Test::Unit::TestCase
	4	fixtures :user_preferences
	5
	6	# Replace this with your real tests.
	7	def test_truth
	8	assert true
	9	end
	10	end

redmine/app/controllers/account_controller.rb +1 -36

             # redMine - project management software
             # Copyright (C) 2006  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.
             class AccountController < ApplicationController
               layout 'base'
               helper :custom_fields
               include CustomFieldsHelper
               # prevents login action to be filtered by check_if_login_required application scope filter
               skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register]
               before_filter :require_login, :except => [:show, :login, :lost_password, :register]
               # Show user's account
               def show
                 @user = User.find(params[:id])
                 @custom_values = @user.custom_values.find(:all, :include => :custom_field)
               end
               # Login request and validation
               def login
                 if request.get?
                   # Logout user
                   self.logged_in_user = nil
                 else
                   # Authenticate user
                   user = User.try_to_login(params[:login], params[:password])
                   if user
                     self.logged_in_user = user
-                    redirect_back_or_default :controller => 'account', :action => 'my_page'
+                    redirect_back_or_default :controller => 'my', :action => 'page'
                   else
                     flash.now[:notice] = l(:notice_account_invalid_creditentials)
                   end
                 end
               end
               # Log out current user and redirect to welcome page
               def logout
                 self.logged_in_user = nil
                 redirect_to :controller => ''
               end
-              # Show logged in user's page
-              def my_page
-                @user = self.logged_in_user
-                @reported_issues = Issue.find(:all, :conditions => ["author_id=?", @user.id], :limit => 10, :include => [ :status, :project, :tracker ], :order => 'issues.updated_on DESC')
-                @assigned_issues = Issue.find(:all, :conditions => ["assigned_to_id=?", @user.id], :limit => 10, :include => [ :status, :project, :tracker ], :order => 'issues.updated_on DESC')
-              end
-              # Edit logged in user's account
-              def my_account
-                @user = self.logged_in_user
-                if request.post? and @user.update_attributes(@params[:user])
-                  set_localization
-                  flash.now[:notice] = l(:notice_account_updated)
-                  self.logged_in_user.reload
-                end
-              end
-              # Change logged in user's password
-              def change_password
-                @user = self.logged_in_user
-                flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'my_account' and return if @user.auth_source_id
-                if @user.check_password?(@params[:password])
-                  @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-                  if @user.save
-                    flash[:notice] = l(:notice_account_password_updated)
-                  else
-                    render :action => 'my_account'
-                    return
-                  end
-                else
-                  flash[:notice] = l(:notice_account_wrong_password)
-                end
-                redirect_to :action => 'my_account'
-              end
               # Enable user to choose a new password
               def lost_password
                 if params[:token]
                   @token = Token.find_by_action_and_value("recovery", params[:token])
                   redirect_to :controller => '' and return unless @token and !@token.expired?
                   @user = @token.user
                   if request.post?
                     @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
                     if @user.save
                       @token.destroy
                       flash[:notice] = l(:notice_account_password_updated)
                       redirect_to :action => 'login'
                       return
                     end
                   end
                   render :template => "account/password_recovery"
                   return
                 else
                   if request.post?
                     user = User.find_by_mail(params[:mail])
                     # user not found in db
                     flash.now[:notice] = l(:notice_account_unknown_email) and return unless user
                     # user uses an external authentification
                     flash.now[:notice] = l(:notice_can_t_change_password) and return if user.auth_source_id
                     # create a new token for password recovery
                     token = Token.new(:user => user, :action => "recovery")
                     if token.save
                       # send token to user via email
                       Mailer.set_language_if_valid(user.language)
                       Mailer.deliver_lost_password(token)
                       flash[:notice] = l(:notice_account_lost_email_sent)
                       redirect_to :action => 'login'
                       return
                     end
                   end
                 end
               end
               # User self-registration
               def register
                 redirect_to :controller => '' and return if $RDM_SELF_REGISTRATION == false
                 if params[:token]
                   token = Token.find_by_action_and_value("register", params[:token])
                   redirect_to :controller => '' and return unless token and !token.expired?
                   user = token.user
                   redirect_to :controller => '' and return unless user.status == User::STATUS_REGISTERED
                   user.status = User::STATUS_ACTIVE
                   if user.save
                     token.destroy
                     flash[:notice] = l(:notice_account_activated)
                     redirect_to :action => 'login'
                     return
                   end
                 else
                   if request.get?
                     @user = User.new(:language => $RDM_DEFAULT_LANG)
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
                   else
                     @user = User.new(params[:user])
                     @user.admin = false
                     @user.login = params[:user][:login]
                     @user.status = User::STATUS_REGISTERED
                     @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
                     @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
                     @user.custom_values = @custom_values
                     token = Token.new(:user => @user, :action => "register")
                     if @user.save and token.save
                       Mailer.set_language_if_valid(@user.language)
                       Mailer.deliver_register(token)
                       flash[:notice] = l(:notice_account_register_done)
                       redirect_to :controller => ''
                     end
                   end
                 end
               end
             end

redmine/app/models/user.rb +6 0

             # redMine - project management software
             # Copyright (C) 2006  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.
             require "digest/sha1"
             class User < ActiveRecord::Base
               has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => true
+              has_many :projects, :through => :memberships
               has_many :custom_values, :dependent => true, :as => :customized
+              has_one :preference, :dependent => true, :class_name => 'UserPreference'
               belongs_to :auth_source
               attr_accessor :password, :password_confirmation
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
               attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
               validates_presence_of :login, :firstname, :lastname, :mail
               validates_uniqueness_of :login, :mail
               # Login must contain lettres, numbers, underscores only
               validates_format_of :login, :with => /^[a-z0-9_]+$/i
               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
               # Password length between 4 and 12
               validates_length_of :password, :in => 4..12, :allow_nil => true
               validates_confirmation_of :password, :allow_nil => true
               validates_associated :custom_values, :on => :update
               # Account statuses
               STATUS_ACTIVE     = 1
               STATUS_REGISTERED = 2
               STATUS_LOCKED     = 3
               def before_save
                 # update hashed_password if password was set
                 self.hashed_password = User.hash_password(self.password) if self.password
               end
               # Returns the user that matches provided login and password, or nil
               def self.try_to_login(login, password)
                 user = find(:first, :conditions => ["login=?", login])
                 if user
                   # user is already in local database
                   return nil if !user.active?
                   if user.auth_source
                     # user has an external authentication method
                     return nil unless user.auth_source.authenticate(login, password)
                   else
                     # authentication with local password
                     return nil unless User.hash_password(password) == user.hashed_password
                   end
                 else
                   # user is not yet registered, try to authenticate with available sources
                   attrs = AuthSource.authenticate(login, password)
                   if attrs
                     onthefly = new(*attrs)
                     onthefly.login = login
                     onthefly.language = $RDM_DEFAULT_LANG
                     if onthefly.save
                       user = find(:first, :conditions => ["login=?", login])
                       logger.info("User '#{user.login}' created on the fly.") if logger
                     end
                   end
                 end
                 user.update_attribute(:last_login_on, Time.now) if user
                 user
                 rescue => text
                   raise text
               end
               # Return user's full name for display
               def display_name
                 firstname + " " + lastname
               end
               def name
                 display_name
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def registered?
                 self.status == STATUS_REGISTERED
               end
               def locked?
                 self.status == STATUS_LOCKED
               end
               def check_password?(clear_password)
                 User.hash_password(clear_password) == self.hashed_password
               end
               def role_for_project(project_id)
                 @role_for_projects ||=
                   begin
                     roles = {}
                     self.memberships.each { |m| roles.store m.project_id, m.role_id }
                     roles
                   end
                 @role_for_projects[project_id]
               end
+              def pref
+                self.preference ||= UserPreference.new(:user => self)
+              end
             private
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")
               end
             end

redmine/app/views/layouts/base.rhtml +2 -2

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%= $RDM_HEADER_TITLE + (@html_title ? ": #{@html_title}" : "") %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="redMine" />
             <meta name="keywords" content="issue,bug,tracker" />
             <%= stylesheet_link_tag "application" %>
             <%= stylesheet_link_tag "menu" %>
             <%= stylesheet_link_tag "rails" %>
             <%= javascript_include_tag :defaults %>
             <%= javascript_include_tag 'menu' %>
             <%= javascript_include_tag 'calendar/calendar' %>
             <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
             <%= javascript_include_tag 'calendar/calendar-setup' %>
             <%= stylesheet_link_tag 'calendar' %>
             <%= stylesheet_link_tag 'jstoolbar' %>
             <script type='text/javascript'>
             var menu_contenu=' \
             <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)"> \
             <a class="menuItem" href="\/admin\/projects" onmouseover="menuItemMouseover(event,\'menuProjects\');"><span class="menuItemText"><%=l(:label_project_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
             <a class="menuItem" href="\/users" onmouseover="menuItemMouseover(event,\'menuUsers\');"><span class="menuItemText"><%=l(:label_user_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
             <a class="menuItem" href="\/roles"><%=l(:label_role_and_permissions)%><\/a> \
             <a class="menuItem" href="\/trackers" onmouseover="menuItemMouseover(event,\'menuTrackers\');"><span class="menuItemText"><%=l(:label_tracker_plural)%><\/span><span class="menuItemArrow">&#9654;<\/span><\/a> \
             <a class="menuItem" href="\/custom_fields"><%=l(:label_custom_field_plural)%><\/a> \
             <a class="menuItem" href="\/enumerations"><%=l(:label_enumerations)%><\/a> \
             <a class="menuItem" href="\/admin\/mail_options"><%=l(:field_mail_notification)%><\/a> \
             <a class="menuItem" href="\/auth_sources"><%=l(:label_authentication)%><\/a> \
             <a class="menuItem" href="\/admin\/info"><%=l(:label_information_plural)%><\/a> \
             <\/div> \
             <div id="menuTrackers" class="menu"> \
             <a class="menuItem" href="\/issue_statuses"><%=l(:label_issue_status_plural)%><\/a> \
             <a class="menuItem" href="\/roles\/workflow"><%=l(:label_workflow)%><\/a> \
             <\/div> \
             <div id="menuProjects" class="menu"><a class="menuItem" href="\/projects\/add"><%=l(:label_new)%><\/a><\/div> \
             <div id="menuUsers" class="menu"><a class="menuItem" href="\/users\/add"><%=l(:label_new)%><\/a><\/div> \
              \
             <% unless @project.nil? || @project.id.nil? %> \
             <div id="menuProject" class="menu" onmouseover="menuMouseover(event)"> \
             <%= link_to l(:label_calendar), {:controller => 'projects', :action => 'calendar', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_activity), {:controller => 'projects', :action => 'activity', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_member_plural), {:controller => 'projects', :action => 'list_members', :id => @project }, :class => "menuItem" %> \
             <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %> \
             <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %> \
             <\/div> \
             <% end %> \
             ';
             </script>
             </head>
             <body>
             <div id="container" >
                 <div id="header">
                 <div style="float: left;">
                     <h1><%= $RDM_HEADER_TITLE %></h1>
                     <h2><%= $RDM_HEADER_SUBTITLE %></h2>
                 </div>
                 <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
                   <% if loggedin? %><small><%=l(:label_logged_as)%> <b><%= @logged_in_user.login %></b></small><% end %>
                 </div>
                 </div>
             	<div id="navigation">
             		<ul>
             	<li class="selected"><%= link_to l(:label_home), { :controller => '' }, :class => "picHome" %></li>
-            	<li><%= link_to l(:label_my_page), { :controller => 'account', :action => 'my_page'}, :class => "picUserPage" %></li>
+            	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "picUserPage" %></li>
             	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "picProject" %></li>
                 <% unless @project.nil? || @project.id.nil? %>
                     <li><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "picProject", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>
                 <% end %>
                 <% if loggedin? %>
-            		<li><%= link_to l(:label_my_account), { :controller => 'account', :action => 'my_account' }, :class => "picUser" %></li>
+            		<li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "picUser" %></li>
                 <% end %>
             	<% if admin_loggedin? %>
             		<li><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "picAdmin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
             	<% end %>
             	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => @params[:controller], :page => @params[:action] }, :target => "new", :class => "picHelp" %></li>
             	<% if loggedin? %>
             		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "picUser" %></li>
             	<% else %>
             		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "picUser" %></li>
             	<% end %>
             		</ul>
             	</div>
             	<script type='text/javascript'>if(document.getElementById) {document.write(menu_contenu);}</script>
             	<div id="subcontent">
             		<% unless @project.nil? || @project.id.nil? %>
             			<h2><%= @project.name %></h2>
             			<ul class="menublock">
             				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
             				<li><%= link_to l(:label_calendar), :controller => 'projects', :action => 'calendar', :id => @project %></li>
             				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
             				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
             				<li><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => @project %></li>
             				<li><%= link_to l(:label_news_plural), :controller => 'projects', :action => 'list_news', :id => @project %></li>
             				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
             				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
             				<li><%= link_to l(:label_member_plural), :controller => 'projects', :action => 'list_members', :id => @project %></li>
             				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
             				<li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>
             			</ul>
             		<% end %>
             		<% if loggedin? and @logged_in_user.memberships.length > 0 %>
             			<h2><%=l(:label_my_projects) %></h2>
             			<ul class="menublock">
             				<% for membership in @logged_in_user.memberships %>
             					<li><%= link_to membership.project.name, :controller => 'projects', :action => 'show', :id => membership.project %></li>
             				<% end %>
             			</ul>
             		<% end %>
             	</div>
             	<div id="content">
             		<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
             		<%= @content_for_layout %>
             	</div>
             	<div id="footer">
             		<p>
             		<%= auto_link $RDM_FOOTER_SIG %> |
             		<a href="http://redmine.rubyforge.org/" target="_new"><%= RDM_APP_NAME %></a> <%= RDM_APP_VERSION %>
             		</p>
             	</div>
             </div>
             </body>
             </html>

redmine/app/views/my/account.rhtml ~~redmine/app/views/account/my_account.rhtml~~ renamed +1 -1

             <h2><%=l(:label_my_account)%></h2>
             <p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
             <%=l(:field_created_on)%>: <%= format_time(@user.created_on) %>,
             <%=l(:field_updated_on)%>: <%= format_time(@user.updated_on) %></p>
             <%= error_messages_for 'user' %>
               <div class="box">
               <h3><%=l(:label_information_plural)%></h3>
-              <%= start_form_tag({:action => 'my_account'}, :class => "tabular") %>
+              <%= start_form_tag({:action => 'account'}, :class => "tabular") %>
               <!--[form:user]-->
               <p><label for="user_firstname"><%=l(:field_firstname)%> <span class="required">*</span></label>
               <%= text_field 'user', 'firstname'  %></p>
               <p><label for="user_lastname"><%=l(:field_lastname)%> <span class="required">*</span></label>
               <%= text_field 'user', 'lastname'  %></p>
               <p><label for="user_mail"><%=l(:field_mail)%> <span class="required">*</span></label>
               <%= text_field 'user', 'mail', :size => 40 %></p>
               <p><label for="user_language"><%=l(:field_language)%></label>
               <%= select("user", "language", lang_options_for_select) %></p>
               <!--[eoform:user]-->
               <p><label for="user_mail_notification"><%=l(:field_mail_notification)%></label>
               <%= check_box 'user', 'mail_notification' %></p>
               <center><%= submit_tag l(:button_save) %></center>
               <%= end_form_tag %>
               </div>
             <% unless @user.auth_source_id %>
               <div class="box">
               <h3><%=l(:field_password)%></h3>
               <%= start_form_tag({:action => 'change_password'}, :class => "tabular") %>
               <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
               <%= password_field_tag 'password', nil, :size => 25 %></p>
               <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
               <%= password_field_tag 'new_password', nil, :size => 25 %></p>
               <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
               <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
               <center><%= submit_tag l(:button_save) %></center>
               <%= end_form_tag %>
               </div>
             <% end %>

redmine/doc/CHANGELOG +1 0

             == redMine changelog
             redMine - project management software
             Copyright (C) 2006  Jean-Philippe Lang
             http://redmine.org/
             == xx/xx/2006 v0.x.x
+            * "my page" is now customizable
             * improved issues change history
             * new functionality: move an issue to another project or tracker
             * new functionality: add a note to an issue
             * new report: project activity
             * "start date" and "% done" fields added on issues
             * project calendar added
             * gantt chart added (exportable to pdf)
             * single/multiple issues pdf export added
             * issues reports improvements
             * multiple file upload for issues attachments
             * textile formating of issue and news descritions (RedCloth required)
             * integration of DotClear jstoolbar for textile formatting
             * calendar date picker for date fields (LGPL DHTML Calendar http://sourceforge.net/projects/jscalendar)
             * new filter in issues list: Author
             * ajaxified paginators
             * option to set number of results per page on issues list
             * localized csv separator (comma/semicolon)
             * csv output encoded to ISO-8859-1
             * user custom field displayed on account/show
             * default configuration improved (default roles, trackers, status, permissions and workflows)
             * fixed: custom fields not in csv exports
             * fixed: project settings now displayed according to user's permissions
             == 10/08/2006 v0.3.0
             * user authentication against multiple LDAP (optional)
             * token based "lost password" functionality
             * user self-registration functionality (optional)
             * custom fields now available for issues, users and projects
             * new custom field format "text" (displayed as a textarea field)
             * project & administration drop down menus in navigation bar for quicker access
             * text formatting is preserved for long text fields (issues, projects and news descriptions)
             * urls and emails are turned into clickable links in long text fields
             * "due date" field added on issues
             * tracker selection filter added on change log
             * Localization plugin replaced with GLoc 1.1.0 (iconv required)
             * error messages internationalization
             * german translation added (thanks to Karim Trott)
             * data locking for issues to prevent update conflicts (using ActiveRecord builtin optimistic locking)
             * new filter in issues list: "Fixed version"
             * active filters are displayed with colored background on issues list
             * custom configuration is now defined in config/config_custom.rb
             * user object no more stored in session (only user_id)
             * news summary field is no longer required
             * tables and forms redesign
             * Fixed: boolean custom field not working
             * Fixed: error messages for custom fields are not displayed
             * Fixed: invalid custom fields should have a red border
             * Fixed: custom fields values are not validated on issue update
             * Fixed: unable to choose an empty value for 'List' custom fields
             * Fixed: no issue categories sorting
             * Fixed: incorrect versions sorting
             == 07/12/2006 - v0.2.2
             * Fixed: bug in "issues list"
             == 07/09/2006 - v0.2.1
             * new databases supported: Oracle, PostgreSQL, SQL Server
             * projects/subprojects hierarchy (1 level of subprojects only)
             * environment information display in admin/info
             * more filter options in issues list (rev6)
             * default language based on browser settings (Accept-Language HTTP header)
             * issues list exportable to CSV (rev6)
             * simple_format and auto_link on long text fields
             * more data validations
             * Fixed: error when all mail notifications are unchecked in admin/mail_options
             * Fixed: all project news are displayed on project summary
             * Fixed: Can't change user password in users/edit
             * Fixed: Error on tables creation with PostgreSQL (rev5)
             * Fixed: SQL error in "issue reports" view with PostgreSQL (rev5)
             == 06/25/2006 - v0.1.0
             * multiple users/multiple projects
             * role based access control
             * issue tracking system
             * fully customizable workflow
             * documents/files repository
             * email notifications on issue creation and update
             * multilanguage support (except for error messages):english, french, spanish
             * online manual in french (unfinished)

redmine/lang/de.yml +2 0

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: January,February,March,April,May,June,July,August,September,October,November,December
             actionview_datehelper_select_month_names_abbr: Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 day
             actionview_datehelper_time_in_words_day_plural: %d days
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: half a minute
             actionview_datehelper_time_in_words_minute_less_than: less than a minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: less than a second
             actionview_datehelper_time_in_words_second_less_than_plural: less than %d seconds
             actionview_instancetag_blank_option: Bitte auserwählt
             activerecord_error_inclusion: ist nicht in der Liste eingeschlossen
             activerecord_error_exclusion: ist reserviert
             activerecord_error_invalid: ist unzulässig
             activerecord_error_confirmation: bringt nicht Bestätigung zusammen
             activerecord_error_accepted: muß angenommen werden
             activerecord_error_empty: kann nicht leer sein
             activerecord_error_blank: kann nicht leer sein
             activerecord_error_too_long: ist zu lang
             activerecord_error_too_short: ist zu kurz
             activerecord_error_wrong_length: ist die falsche Länge
             activerecord_error_taken: ist bereits genommen worden
             activerecord_error_not_a_number: ist nicht eine Zahl
             activerecord_error_not_a_date: ist nicht ein gültiges Datum
             activerecord_error_greater_than_start_date: muß als grösser sein beginnen Datum
             general_fmt_age: %d yr
             general_fmt_age_plural: %d yrs
             general_fmt_date: %%b %%d, %%Y (%%a)
             general_fmt_datetime: %%b %%d, %%Y (%%a), %%I:%%M %%p
             general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
             general_fmt_time: %%I:%%M %%p
             general_text_No: 'Nein'
             general_text_Yes: 'Ja'
             general_text_no: 'nein'
             general_text_yes: 'ja'
             general_lang_de: 'Deutsch'
             general_csv_separator: ';'
             general_day_names: Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag,Sonntag
             notice_account_updated: Konto wurde erfolgreich aktualisiert.
             notice_account_invalid_creditentials: Unzulässiger Benutzer oder Passwort
             notice_account_password_updated: Passwort wurde erfolgreich aktualisiert.
             notice_account_wrong_password: Falsches Passwort
             notice_account_register_done: Konto wurde erfolgreich verursacht.
             notice_account_unknown_email: Unbekannter Benutzer.
             notice_can_t_change_password: Dieses Konto verwendet eine externe Authentisierung Quelle. Unmöglich, das Kennwort zu ändern.
             notice_account_lost_email_sent: Ein email mit Anweisungen, ein neues Kennwort zu wählen ist dir geschickt worden.
             notice_account_activated: Dein Konto ist aktiviert worden. Du kannst jetzt einloggen.
             notice_successful_create: Erfolgreiche Kreation.
             notice_successful_update: Erfolgreiches Update.
             notice_successful_delete: Erfolgreiche Auslassung.
             notice_successful_connection: Erfolgreicher Anschluß.
             notice_file_not_found: Erbetene Akte besteht nicht oder ist gelöscht worden.
             notice_locking_conflict: Data have been updated by another user.
             mail_subject_lost_password: Dein redMine Kennwort
             mail_subject_register: redMine Kontoaktivierung
             gui_validation_error: 1 Störung
             gui_validation_error_plural: %d Störungen
             field_name: Name
             field_description: Beschreibung
             field_summary: Zusammenfassung
             field_is_required: Erforderlich
             field_firstname: Vorname
             field_lastname: Nachname
             field_mail: Email
             field_filename: Datei
             field_filesize: Grootte
             field_downloads: Downloads
             field_author: Autor
             field_created_on: Angelegt
             field_updated_on: aktualisiert
             field_field_format: Format
             field_is_for_all: Für alle Projekte
             field_possible_values: Mögliche Werte
             field_regexp: Regulärer Ausdruck
             field_min_length: Minimale Länge
             field_max_length: Maximale Länge
             field_value: Wert
             field_category: Kategorie
             field_title: Títel
             field_project: Projekt
             field_issue: Antrag
             field_status: Status
             field_notes: Anmerkungen
             field_is_closed: Problem erledigt
             field_is_default: Rückstellung status
             field_html_color: Farbe
             field_tracker: Tracker
             field_subject: Thema
             field_due_date: Abgabedatum
             field_assigned_to: Zugewiesen an
             field_priority: Priorität
             field_fixed_version: Erledigt in Version
             field_user: Benutzer
             field_role: Rolle
             field_homepage: Startseite
             field_is_public: Öffentlich
             field_parent: Subprojekt von
             field_is_in_chlog: Ansicht der Issues in der Historie
             field_login: Mitgliedsname
             field_mail_notification: Mailbenachrichtigung
             field_admin: Administrator
             field_locked: Gesperrt
             field_last_login_on: Letzte Anmeldung
             field_language: Sprache
             field_effective_date: Datum
             field_password: Passwort
             field_new_password: Neues Passwort
             field_password_confirmation: Bestätigung
             field_version: Version
             field_type: Typ
             field_host: Host
             field_port: Port
             field_account: Konto
             field_base_dn: Base DN
             field_attr_login: Mitgliedsnameattribut
             field_attr_firstname: Vornamensattribut
             field_attr_lastname: Namenattribut
             field_attr_mail: Emailattribut
             field_onthefly: On-the-fly Benutzerkreation
             field_start_date: Beginn
             field_done_ratio: %% Getan
             label_user: Benutzer
             label_user_plural: Benutzer
             label_user_new: Neuer Benutzer
             label_project: Projekt
             label_project_new: Neues Projekt
             label_project_plural: Projekte
             label_project_latest: Neueste Projekte
             label_issue: Antrag
             label_issue_new: Neue Antrag
             label_issue_plural: Anträge
             label_issue_view_all: Alle Anträge ansehen
             label_document: Dokument
             label_document_new: Neues Dokument
             label_document_plural: Dokumente
             label_role: Rolle
             label_role_plural: Rollen
             label_role_new: Neue Rolle
             label_role_and_permissions: Rollen und Rechte
             label_member: Mitglied
             label_member_new: Neues Mitglied
             label_member_plural: Mitglieder
             label_tracker: Tracker
             label_tracker_plural: Tracker
             label_tracker_new: Neuer Tracker
             label_workflow: Workflow
             label_issue_status: Antrag Status
             label_issue_status_plural: Antrag Stati
             label_issue_status_new: Neuer Status
             label_issue_category: Antrag Kategorie
             label_issue_category_plural: Antrag Kategorien
             label_issue_category_new: Neue Kategorie
             label_custom_field: Benutzerdefiniertes Feld
             label_custom_field_plural: Benutzerdefinierte Felder
             label_custom_field_new: Neues Feld
             label_enumerations: Enumerationen
             label_enumeration_new: Neuer Wert
             label_information: Information
             label_information_plural: Informationen
             label_please_login: Anmelden
             label_register: Anmelden
             label_password_lost: Passwort vergessen
             label_home: Hauptseite
             label_my_page: Meine Seite
             label_my_account: Mein Konto
             label_my_projects: Meine Projekte
             label_administration: Administration
             label_login: Einloggen
             label_logout: Abmelden
             label_help: Hilfe
             label_reported_issues: Gemeldete Issues
             label_assigned_to_me_issues: Mir zugewiesen
             label_last_login: Letzte Anmeldung
             label_last_updates: Letztes aktualisiertes
             label_last_updates_plural: %d Letztes aktualisiertes
             label_registered_on: Angemeldet am
             label_activity: Aktivität
             label_new: Neue
             label_logged_as: Angemeldet als
             label_environment: Environment
             label_authentication: Authentisierung
             label_auth_source: Authentisierung Modus
             label_auth_source_new: Neuer Authentisierung Modus
             label_auth_source_plural: Authentisierung Modi
             label_subproject: Vorprojekt von
             label_subproject_plural: Vorprojekte
             label_min_max_length: Min - Max Länge
             label_list: Liste
             label_date: Date
             label_integer: Zahl
             label_boolean: Boolesch
             label_string: Text
             label_text: Langer Text
             label_attribute: Attribut
             label_attribute_plural: Attribute
             label_download: %d Herunterlade
             label_download_plural: %d Herunterlade
             label_no_data: Nichts anzuzeigen
             label_change_status: Statuswechsel
             label_history: Historie
             label_attachment: Datei
             label_attachment_new: Neue Datei
             label_attachment_delete: Löschungakten
             label_attachment_plural: Dateien
             label_report: Bericht
             label_report_plural: Berichte
             label_news: Neuigkeit
             label_news_new: Neuigkeite addieren
             label_news_plural: Neuigkeiten
             label_news_latest: Letzte Neuigkeiten
             label_news_view_all: Alle Neuigkeiten anzeigen
             label_change_log: Change log
             label_settings: Konfiguration
             label_overview: Übersicht
             label_version: Version
             label_version_new: Neue Version
             label_version_plural: Versionen
             label_confirmation: Bestätigung
             label_export_to: Export zu
             label_read: Lesen...
             label_public_projects: Öffentliche Projekte
             label_open_issues: Geöffnet
             label_open_issues_plural: Geöffnet
             label_closed_issues: Geschlossen
             label_closed_issues_plural: Geschlossen
             label_total: Gesamtzahl
             label_permissions: Berechtigungen
             label_current_status: Gegenwärtiger Status
             label_new_statuses_allowed: Neue Status gewährten
             label_all: Alle
             label_none: Kein
             label_next: Weiter
             label_previous: Zurück
             label_used_by: Benutzt von
             label_details: Details...
             label_add_note: Eine Anmerkung addieren
             label_per_page: Pro Seite
             label_calendar: Kalender
             label_months_from: Monate von
             label_gantt_chart: Gantt Diagramm
             label_internal: Intern
             label_last_changes: %d änderungen des Letzten
             label_change_view_all: Alle änderungen ansehen
+            label_personalize_page: Diese Seite personifizieren
             button_login: Einloggen
             button_submit: Einreichen
             button_save: Speichern
             button_check_all: Alles auswählen
             button_uncheck_all: Alles abwählen
             button_delete: Löschen
             button_create: Anlegen
             button_test: Testen
             button_edit: Bearbeiten
             button_add: Hinzufügen
             button_change: Wechseln
             button_apply: Anwenden
             button_clear: Zurücksetzen
             button_lock: Verriegeln
             button_unlock: Entriegeln
             button_download: Fernzuladen
             button_list: Aufzulisten
             button_view: Siehe
             button_move: Bewegen
             button_back: Rückkehr
+            button_cancel: Annullieren
             text_select_mail_notifications: Aktionen für die Mailbenachrichtigung aktiviert werden soll.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 heisst keine Beschränkung
             text_possible_values_info: Werte trennten sich mit |
             text_project_destroy_confirmation: Sind sie sicher, daß sie das Projekt löschen wollen ?
             text_workflow_edit: Auswahl Workflow zum Bearbeiten
             text_are_you_sure: Sind sie sicher ?
             text_journal_changed: geändert von %s zu %s
             text_journal_set_to: gestellt zu %s
             text_journal_deleted: gelöscht
             text_tip_task_begin_day: Aufgabe, die an diesem Tag beginnt
             text_tip_task_end_day: Aufgabe, die an diesem Tag beendet
             text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und beendet
             default_role_manager: Manager
             default_role_developper: Developer
             default_role_reporter: Reporter
             default_tracker_bug: Fehler
             default_tracker_feature: Feature
             default_tracker_support: Support
             default_issue_status_new: Neu
             default_issue_status_assigned: Zugewiesen
             default_issue_status_resolved: Gelöst
             default_issue_status_feedback: Feedback
             default_issue_status_closed: Erledigt
             default_issue_status_rejected: Abgewiesen
             default_doc_category_user: Benutzerdokumentation
             default_doc_category_tech: Technische Dokumentation
             default_priority_low: Niedrig
             default_priority_normal: Normal
             default_priority_high: Hoch
             default_priority_urgent: Dringend
             default_priority_immediate: Sofort
             enumeration_issue_priorities: Issue-Prioritäten
             enumeration_doc_categories: Dokumentenkategorien

redmine/lang/en.yml +2 0

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: January,February,March,April,May,June,July,August,September,October,November,December
             actionview_datehelper_select_month_names_abbr: Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 day
             actionview_datehelper_time_in_words_day_plural: %d days
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: half a minute
             actionview_datehelper_time_in_words_minute_less_than: less than a minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: less than a second
             actionview_datehelper_time_in_words_second_less_than_plural: less than %d seconds
             actionview_instancetag_blank_option: Please select
             activerecord_error_inclusion: is not included in the list
             activerecord_error_exclusion: is reserved
             activerecord_error_invalid: is invalid
             activerecord_error_confirmation: doesn't match confirmation
             activerecord_error_accepted: must be accepted
             activerecord_error_empty: can't be empty
             activerecord_error_blank: can't be blank
             activerecord_error_too_long: is too long
             activerecord_error_too_short: is too short
             activerecord_error_wrong_length: is the wrong length
             activerecord_error_taken: has already been taken
             activerecord_error_not_a_number: is not a number
             activerecord_error_not_a_date: is not a valid date
             activerecord_error_greater_than_start_date: must be greater than start date
             general_fmt_age: %d yr
             general_fmt_age_plural: %d yrs
             general_fmt_date: %%m/%%d/%%Y
             general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p
             general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
             general_fmt_time: %%I:%%M %%p
             general_text_No: 'No'
             general_text_Yes: 'Yes'
             general_text_no: 'no'
             general_text_yes: 'yes'
             general_lang_en: 'English'
             general_csv_separator: ','
             general_day_names: Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday
             notice_account_updated: Account was successfully updated.
             notice_account_invalid_creditentials: Invalid user or password
             notice_account_password_updated: Password was successfully updated.
             notice_account_wrong_password: Wrong password
             notice_account_register_done: Account was successfully created.
             notice_account_unknown_email: Unknown user.
             notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
             notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
             notice_account_activated: Your account has been activated. You can now log in.
             notice_successful_create: Successful creation.
             notice_successful_update: Successful update.
             notice_successful_delete: Successful deletion.
             notice_successful_connection: Successful connection.
             notice_file_not_found: Requested file doesn't exist or has been deleted.
             notice_locking_conflict: Data have been updated by another user.
             mail_subject_lost_password: Your redMine password
             mail_subject_register: redMine account activation
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errors
             field_name: Name
             field_description: Description
             field_summary: Summary
             field_is_required: Required
             field_firstname: Firstname
             field_lastname: Lastname
             field_mail: Email
             field_filename: File
             field_filesize: Size
             field_downloads: Downloads
             field_author: Author
             field_created_on: Created
             field_updated_on: Updated
             field_field_format: Format
             field_is_for_all: For all projects
             field_possible_values: Possible values
             field_regexp: Regular expression
             field_min_length: Minimum length
             field_max_length: Maximum length
             field_value: Value
             field_category: Category
             field_title: Title
             field_project: Project
             field_issue: Issue
             field_status: Status
             field_notes: Notes
             field_is_closed: Issue closed
             field_is_default: Default status
             field_html_color: Color
             field_tracker: Tracker
             field_subject: Subject
             field_due_date: Due date
             field_assigned_to: Assigned to
             field_priority: Priority
             field_fixed_version: Fixed version
             field_user: User
             field_role: Role
             field_homepage: Homepage
             field_is_public: Public
             field_parent: Subproject of
             field_is_in_chlog: Issues displayed in changelog
             field_login: Login
             field_mail_notification: Mail notifications
             field_admin: Administrator
             field_locked: Locked
             field_last_login_on: Last connection
             field_language: Language
             field_effective_date: Date
             field_password: Password
             field_new_password: New password
             field_password_confirmation: Confirmation
             field_version: Version
             field_type: Type
             field_host: Host
             field_port: Port
             field_account: Account
             field_base_dn: Base DN
             field_attr_login: Login attribute
             field_attr_firstname: Firstname attribute
             field_attr_lastname: Lastname attribute
             field_attr_mail: Email attribute
             field_onthefly: On-the-fly user creation
             field_start_date: Start
             field_done_ratio: %% Done
             label_user: User
             label_user_plural: Users
             label_user_new: New user
             label_project: Project
             label_project_new: New project
             label_project_plural: Projects
             label_project_latest: Latest projects
             label_issue: Issue
             label_issue_new: New issue
             label_issue_plural: Issues
             label_issue_view_all: View all issues
             label_document: Document
             label_document_new: New document
             label_document_plural: Documents
             label_role: Role
             label_role_plural: Roles
             label_role_new: New role
             label_role_and_permissions: Roles and permissions
             label_member: Member
             label_member_new: New member
             label_member_plural: Members
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: New tracker
             label_workflow: Workflow
             label_issue_status: Issue status
             label_issue_status_plural: Issue statuses
             label_issue_status_new: New status
             label_issue_category: Issue category
             label_issue_category_plural: Issue categories
             label_issue_category_new: New category
             label_custom_field: Custom field
             label_custom_field_plural: Custom fields
             label_custom_field_new: New custom field
             label_enumerations: Enumerations
             label_enumeration_new: New value
             label_information: Information
             label_information_plural: Information
             label_please_login: Please login
             label_register: Register
             label_password_lost: Lost password
             label_home: Home
             label_my_page: My page
             label_my_account: My account
             label_my_projects: My projects
             label_administration: Administration
             label_login: Login
             label_logout: Logout
             label_help: Help
             label_reported_issues: Reported issues
             label_assigned_to_me_issues: Issues assigned to me
             label_last_login: Last connection
             label_last_updates: Last updated
             label_last_updates_plural: %d last updated
             label_registered_on: Registered on
             label_activity: Activity
             label_new: New
             label_logged_as: Logged as
             label_environment: Environment
             label_authentication: Authentication
             label_auth_source: Authentication mode
             label_auth_source_new: New authentication mode
             label_auth_source_plural: Authentication modes
             label_subproject: Subproject
             label_subproject_plural: Subprojects
             label_min_max_length: Min - Max length
             label_list: List
             label_date: Date
             label_integer: Integer
             label_boolean: Boolean
             label_string: Text
             label_text: Long text
             label_attribute: Attribute
             label_attribute_plural: Attributes
             label_download: %d Download
             label_download_plural: %d Downloads
             label_no_data: No data to display
             label_change_status: Change status
             label_history: History
             label_attachment: File
             label_attachment_new: New file
             label_attachment_delete: Delete file
             label_attachment_plural: Files
             label_report: Report
             label_report_plural: Reports
             label_news: News
             label_news_new: Add news
             label_news_plural: News
             label_news_latest: Latest news
             label_news_view_all: View all news
             label_change_log: Change log
             label_settings: Settings
             label_overview: Overview
             label_version: Version
             label_version_new: New version
             label_version_plural: Versions
             label_confirmation: Confirmation
             label_export_to: Export to
             label_read: Read...
             label_public_projects: Public projects
             label_open_issues: Open
             label_open_issues_plural: Open
             label_closed_issues: Closed
             label_closed_issues_plural: Closed
             label_total: Total
             label_permissions: Permissions
             label_current_status: Current status
             label_new_statuses_allowed: New statuses allowed
             label_all: All
             label_none: None
             label_next: Next
             label_previous: Previous
             label_used_by: Used by
             label_details: Details...
             label_add_note: Add a note
             label_per_page: Per page
             label_calendar: Calendar
             label_months_from: months from
             label_gantt_chart: Gantt chart
             label_internal: Internal
             label_last_changes: last %d changes
             label_change_view_all: View all changes
+            label_personalize_page: Personalize this page
             button_login: Login
             button_submit: Submit
             button_save: Save
             button_check_all: Check all
             button_uncheck_all: Uncheck all
             button_delete: Delete
             button_create: Create
             button_test: Test
             button_edit: Edit
             button_add: Add
             button_change: Change
             button_apply: Apply
             button_clear: Clear
             button_lock: Lock
             button_unlock: Unlock
             button_download: Download
             button_list: List
             button_view: View
             button_move: Move
             button_back: Back
+            button_cancel: Cancel
             text_select_mail_notifications: Select actions for which mail notifications should be sent.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 means no restriction
             text_possible_values_info: values separated with |
             text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
             text_workflow_edit: Select a role and a tracker to edit the workflow
             text_are_you_sure: Are you sure ?
             text_journal_changed: changed from %s to %s
             text_journal_set_to: set to %s
             text_journal_deleted: deleted
             text_tip_task_begin_day: task beginning this day
             text_tip_task_end_day: task ending this day
             text_tip_task_begin_end_day: task beginning and ending this day
             default_role_manager: Manager
             default_role_developper: Developer
             default_role_reporter: Reporter
             default_tracker_bug: Bug
             default_tracker_feature: Feature
             default_tracker_support: Support
             default_issue_status_new: New
             default_issue_status_assigned: Assigned
             default_issue_status_resolved: Resolved
             default_issue_status_feedback: Feedback
             default_issue_status_closed: Closed
             default_issue_status_rejected: Rejected
             default_doc_category_user: User documentation
             default_doc_category_tech: Technical documentation
             default_priority_low: Low
             default_priority_normal: Normal
             default_priority_high: High
             default_priority_urgent: Urgent
             default_priority_immediate: Immediate
             enumeration_issue_priorities: Issue priorities
             enumeration_doc_categories: Document categories

redmine/lang/es.yml +2 0

             _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: Enero,Febrero,Marzo,Abril,Mayo,Junio,Julio,Agosto,Septiembre,Octubre,Noviembre,Diciembre
             actionview_datehelper_select_month_names_abbr: Ene,Feb,Mar,Abr,Mayo,Jun,Jul,Ago,Sep,Oct,Nov,Dic
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 day
             actionview_datehelper_time_in_words_day_plural: %d days
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: half a minute
             actionview_datehelper_time_in_words_minute_less_than: less than a minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: less than a second
             actionview_datehelper_time_in_words_second_less_than_plural: less than %d seconds
             actionview_instancetag_blank_option: Please select
             activerecord_error_inclusion: is not included in the list
             activerecord_error_exclusion: is reserved
             activerecord_error_invalid: is invalid
             activerecord_error_confirmation: doesn't match confirmation
             activerecord_error_accepted: must be accepted
             activerecord_error_empty: can't be empty
             activerecord_error_blank: can't be blank
             activerecord_error_too_long: is too long
             activerecord_error_too_short: is too short
             activerecord_error_wrong_length: is the wrong length
             activerecord_error_taken: has already been taken
             activerecord_error_not_a_number: is not a number
             activerecord_error_not_a_date: no es una fecha válida
             activerecord_error_greater_than_start_date: debe ser la fecha mayor que del comienzo
             general_fmt_age: %d año
             general_fmt_age_plural: %d años
             general_fmt_date: %%d/%%m/%%Y
             general_fmt_datetime: %%d/%%m/%%Y %%H:%%M
             general_fmt_datetime_short: %%d/%%m %%H:%%M
             general_fmt_time: %%H:%%M
             general_text_No: 'No'
             general_text_Yes: 'Sí'
             general_text_no: 'no'
             general_text_yes: 'sí'
             general_lang_es: 'Español'
             general_csv_separator: ';'
             general_day_names: Lunes,Martes,Miércoles,Jueves,Viernes,Sábado,Domingo
             notice_account_updated: Account was successfully updated.
             notice_account_invalid_creditentials: Invalid user or password
             notice_account_password_updated: Password was successfully updated.
             notice_account_wrong_password: Wrong password
             notice_account_register_done: Account was successfully created.
             notice_account_unknown_email: Unknown user.
             notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
             notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
             notice_account_activated: Your account has been activated. You can now log in.
             notice_successful_create: Successful creation.
             notice_successful_update: Successful update.
             notice_successful_delete: Successful deletion.
             notice_successful_connection: Successful connection.
             notice_file_not_found: Requested file doesn't exist or has been deleted.
             notice_locking_conflict: Data have been updated by another user.
             mail_subject_lost_password: Tu contraseña del redMine
             mail_subject_register: Activación de la cuenta del redMine
             gui_validation_error: 1 error
             gui_validation_error_plural: %d errores
             field_name: Nombre
             field_description: Descripción
             field_summary: Resumen
             field_is_required: Obligatorio
             field_firstname: Nombre
             field_lastname: Apellido
             field_mail: Email
             field_filename: Fichero
             field_filesize: Tamaño
             field_downloads: Telecargas
             field_author: Autor
             field_created_on: Creado
             field_updated_on: Actualizado
             field_field_format: Formato
             field_is_for_all: Para todos los proyectos
             field_possible_values: Valores posibles
             field_regexp: Expresión regular
             field_min_length: Longitud mínima
             field_max_length: Longitud máxima
             field_value: Valor
             field_category: Categoría
             field_title: Título
             field_project: Proyecto
             field_issue: Petición
             field_status: Estatuto
             field_notes: Notas
             field_is_closed: Petición resuelta
             field_is_default: Estatuto por defecto
             field_html_color: Color
             field_tracker: Tracker
             field_subject: Tema
             field_due_date: Fecha debida
             field_assigned_to: Asignado a
             field_priority: Prioridad
             field_fixed_version: Versión corregida
             field_user: Usuario
             field_role: Papel
             field_homepage: Sitio web
             field_is_public: Público
             field_parent: Proyecto secundario de
             field_is_in_chlog: Consultar las peticiones en el histórico
             field_login: Identificador
             field_mail_notification: Notificación por mail
             field_admin: Administrador
             field_locked: Cerrado
             field_last_login_on: Última conexión
             field_language: Lengua
             field_effective_date: Fecha
             field_password: Contraseña
             field_new_password: Nueva contraseña
             field_password_confirmation: Confirmación
             field_version: Versión
             field_type: Tipo
             field_host: Anfitrión
             field_port: Puerto
             field_account: Cuenta
             field_base_dn: Base DN
             field_attr_login: Cualidad del identificador
             field_attr_firstname: Cualidad del nombre
             field_attr_lastname: Cualidad del apellido
             field_attr_mail: Cualidad del Email
             field_onthefly: Creación del usuario On-the-fly
             field_start_date: Comienzo
             field_done_ratio: %% Realizado
             label_user: Usuario
             label_user_plural: Usuarios
             label_user_new: Nuevo usuario
             label_project: Proyecto
             label_project_new: Nuevo proyecto
             label_project_plural: Proyectos
             label_project_latest: Los proyectos más últimos
             label_issue: Petición
             label_issue_new: Nueva petición
             label_issue_plural: Peticiones
             label_issue_view_all: Ver todas las peticiones
             label_document: Documento
             label_document_new: Nuevo documento
             label_document_plural: Documentos
             label_role: Papel
             label_role_plural: Papeles
             label_role_new: Nuevo papel
             label_role_and_permissions: Papeles y permisos
             label_member: Miembro
             label_member_new: Nuevo miembro
             label_member_plural: Miembros
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: Nuevo tracker
             label_workflow: Workflow
             label_issue_status: Estatuto de petición
             label_issue_status_plural: Estatutos de las peticiones
             label_issue_status_new: Nuevo estatuto
             label_issue_category: Categoría de las peticiones
             label_issue_category_plural: Categorías de las peticiones
             label_issue_category_new: Nueva categoría
             label_custom_field: Campo personalizado
             label_custom_field_plural: Campos personalizados
             label_custom_field_new: Nuevo campo personalizado
             label_enumerations: Listas de valores
             label_enumeration_new: Nuevo valor
             label_information: Informacion
             label_information_plural: Informaciones
             label_please_login: Conexión
             label_register: Registrar
             label_password_lost: ¿Olvidaste la contraseña?
             label_home: Acogida
             label_my_page: Mi página
             label_my_account: Mi cuenta
             label_my_projects: Mis proyectos
             label_administration: Administración
             label_login: Conexión
             label_logout: Desconexión
             label_help: Ayuda
             label_reported_issues: Peticiones registradas
             label_assigned_to_me_issues: Peticiones que me están asignadas
             label_last_login: Última conexión
             label_last_updates: Actualizado
             label_last_updates_plural: %d Actualizados
             label_registered_on: Inscrito el
             label_activity: Actividad
             label_new: Nuevo
             label_logged_as: Conectado como
             label_environment: Environment
             label_authentication: Autentificación
             label_auth_source: Modo de la autentificación
             label_auth_source_new: Nuevo modo de la autentificación
             label_auth_source_plural: Modos de la autentificación
             label_subproject: Proyecto secundario
             label_subproject_plural: Proyectos secundarios
             label_min_max_length: Longitud mín - máx
             label_list: Lista
             label_date: Fecha
             label_integer: Número
             label_boolean: Boleano
             label_string: Texto
             label_text: Texto largo
             label_attribute: Cualidad
             label_attribute_plural: Cualidades
             label_download: %d Telecarga
             label_download_plural: %d Telecargas
             label_no_data: Ningunos datos a exhibir
             label_change_status: Cambiar el estatuto
             label_history: Histórico
             label_attachment: Fichero
             label_attachment_new: Nuevo fichero
             label_attachment_delete: Suprimir el fichero
             label_attachment_plural: Ficheros
             label_report: Informe
             label_report_plural: Informes
             label_news: Noticia
             label_news_new: Nueva noticia
             label_news_plural: Noticias
             label_news_latest: Últimas noticias
             label_news_view_all: Ver todas las noticias
             label_change_log: Cambios
             label_settings: Configuración
             label_overview: Vistazo
             label_version: Versión
             label_version_new: Nueva versión
             label_version_plural: Versiónes
             label_confirmation: Confirmación
             label_export_to: Exportar a
             label_read: Leer...
             label_public_projects: Proyectos publicos
             label_open_issues: Abierta
             label_open_issues_plural: Abiertas
             label_closed_issues: Cerrada
             label_closed_issues_plural: Cerradas
             label_total: Total
             label_permissions: Permisos
             label_current_status: Estado actual
             label_new_statuses_allowed: Nuevos estatutos autorizados
             label_all: Todos
             label_none: Ninguno
             label_next: Próximo
             label_previous: Precedente
             label_used_by: Utilizado por
             label_details: Detalles...
             label_add_note: Agregar una nota
             label_per_page: Por la página
             label_calendar: Calendario
             label_months_from: meses de
             label_gantt_chart: Diagrama de Gantt
             label_internal: Interno
             label_last_changes: %d cambios del último
             label_change_view_all: Ver todos los cambios
+            label_personalize_page: Personalizar esta página
             button_login: Conexión
             button_submit: Someter
             button_save: Validar
             button_check_all: Seleccionar todo
             button_uncheck_all: No seleccionar nada
             button_delete: Suprimir
             button_create: Crear
             button_test: Testar
             button_edit: Modificar
             button_add: Añadir
             button_change: Cambiar
             button_apply: Aplicar
             button_clear: Anular
             button_lock: Bloquear
             button_unlock: Desbloquear
             button_download: Telecargar
             button_list: Listar
             button_view: Ver
             button_move: Mover
             button_back: Atrás
+            button_cancel: Cancelar
             text_select_mail_notifications: Seleccionar las actividades que necesitan la activación de la notificación por mail.
             text_regexp_info: eg. ^[A-Z0-9]+$
             text_min_max_length_info: 0 para ninguna restricción
             text_possible_values_info: Los valores se separaron con |
             text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ?
             text_workflow_edit: Seleccionar un workflow para actualizar
             text_are_you_sure: ¿ Estás seguro ?
             text_journal_changed: cambiado de %s a %s
             text_journal_set_to: fijado a %s
             text_journal_deleted: suprimido
             text_tip_task_begin_day: tarea que comienza este día
             text_tip_task_end_day: tarea que termina este día
             text_tip_task_begin_end_day: tarea que comienza y termina este día
             default_role_manager: Manager
             default_role_developper: Desarrollador
             default_role_reporter: Informador
             default_tracker_bug: Anomalía
             default_tracker_feature: Evolución
             default_tracker_support: Asistencia
             default_issue_status_new: Nuevo
             default_issue_status_assigned: Asignada
             default_issue_status_resolved: Resuelta
             default_issue_status_feedback: Comentario
             default_issue_status_closed: Cerrada
             default_issue_status_rejected: Rechazada
             default_doc_category_user: Documentación del usuario
             default_doc_category_tech: Documentación tecnica
             default_priority_low: Bajo
             default_priority_normal: Normal
             default_priority_high: Alto
             default_priority_urgent: Urgente
             default_priority_immediate: Ahora
             enumeration_issue_priorities: Prioridad de las peticiones
             enumeration_doc_categories: Categorías del documento

redmine/lang/fr.yml +3 -1

             _gloc_rule_default: '|n| n<=1 ? "" : "_plural" '
             actionview_datehelper_select_day_prefix:
             actionview_datehelper_select_month_names: Janvier,Février,Mars,Avril,Mai,Juin,Juillet,Août,Septembre,Octobre,Novembre,Décembre
             actionview_datehelper_select_month_names_abbr: Jan,Fév,Mars,Avril,Mai,Juin,Juil,Août,Sept,Oct,Nov,Déc
             actionview_datehelper_select_month_prefix:
             actionview_datehelper_select_year_prefix:
             actionview_datehelper_time_in_words_day: 1 jour
             actionview_datehelper_time_in_words_day_plural: %d jours
             actionview_datehelper_time_in_words_hour_about: about an hour
             actionview_datehelper_time_in_words_hour_about_plural: about %d hours
             actionview_datehelper_time_in_words_hour_about_single: about an hour
             actionview_datehelper_time_in_words_minute: 1 minute
             actionview_datehelper_time_in_words_minute_half: 30 secondes
             actionview_datehelper_time_in_words_minute_less_than: moins d'une minute
             actionview_datehelper_time_in_words_minute_plural: %d minutes
             actionview_datehelper_time_in_words_minute_single: 1 minute
             actionview_datehelper_time_in_words_second_less_than: moins d'une seconde
             actionview_datehelper_time_in_words_second_less_than_plural: moins de %d secondes
             actionview_instancetag_blank_option: Choisir
             activerecord_error_inclusion: n'est pas inclus dans la liste
             activerecord_error_exclusion: est reservé
             activerecord_error_invalid: est invalide
             activerecord_error_confirmation: ne correspond pas à la confirmation
             activerecord_error_accepted: doit être accepté
             activerecord_error_empty: doit être renseigné
             activerecord_error_blank: doit être renseigné
             activerecord_error_too_long: est trop long
             activerecord_error_too_short: est trop court
             activerecord_error_wrong_length: n'est pas de la bonne longueur
             activerecord_error_taken: est déjà utilisé
             activerecord_error_not_a_number: n'est pas un nombre
             activerecord_error_not_a_date: n'est pas une date valide
             activerecord_error_greater_than_start_date: doit être postérieur à la date de début
             general_fmt_age: %d an
             general_fmt_age_plural: %d ans
             general_fmt_date: %%d/%%m/%%Y
             general_fmt_datetime: %%d/%%m/%%Y %%H:%%M
             general_fmt_datetime_short: %%d/%%m %%H:%%M
             general_fmt_time: %%H:%%M
             general_text_No: 'Non'
             general_text_Yes: 'Oui'
             general_text_no: 'non'
             general_text_yes: 'oui'
             general_lang_fr: 'Français'
             general_csv_separator: ';'
             general_day_names: Lundi,Mardi,Mercredi,Jeudi,Vendredi,Samedi,Dimanche
             notice_account_updated: Le compte a été mis à jour avec succès.
             notice_account_invalid_creditentials: Identifiant ou mot de passe invalide.
             notice_account_password_updated: Mot de passe mis à jour avec succès.
             notice_account_wrong_password: Mot de passe incorrect
             notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé.
             notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
             notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe.
             notice_account_lost_email_sent: Un message contenant les instructions pour choisir un nouveau mot de passe vous a été envoyé.
             notice_account_activated: Votre compte a été activé. Vous pouvez à présent vous connecter.
             notice_successful_create: Création effectuée avec succès.
             notice_successful_update: Mise à jour effectuée avec succès.
             notice_successful_delete: Suppression effectuée avec succès.
             notice_successful_connection: Connection réussie.
             notice_file_not_found: Le fichier demandé n'existe pas ou a été supprimé.
             notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
             mail_subject_lost_password: Votre mot de passe redMine
             mail_subject_register: Activation de votre compte redMine
             gui_validation_error: 1 erreur
             gui_validation_error_plural: %d erreurs
             field_name: Nom
             field_description: Description
             field_summary: Résumé
             field_is_required: Obligatoire
             field_firstname: Prénom
             field_lastname: Nom
             field_mail: Email
             field_filename: Fichier
             field_filesize: Taille
             field_downloads: Téléchargements
             field_author: Auteur
             field_created_on: Créé
             field_updated_on: Mis à jour
             field_field_format: Format
             field_is_for_all: Pour tous les projets
             field_possible_values: Valeurs possibles
             field_regexp: Expression régulière
             field_min_length: Longueur minimum
             field_max_length: Longueur maximum
             field_value: Valeur
             field_category: Catégorie
             field_title: Titre
             field_project: Projet
             field_issue: Demande
             field_status: Statut
             field_notes: Notes
             field_is_closed: Demande fermée
             field_is_default: Statut par défaut
             field_html_color: Couleur
             field_tracker: Tracker
             field_subject: Sujet
             field_due_date: Date d'échéance
             field_assigned_to: Assigné à
             field_priority: Priorité
             field_fixed_version: Version corrigée
             field_user: Utilisateur
             field_role: Rôle
             field_homepage: Site web
             field_is_public: Public
             field_parent: Sous-projet de
             field_is_in_chlog: Demandes affichées dans l'historique
             field_login: Identifiant
             field_mail_notification: Notifications par mail
             field_admin: Administrateur
             field_locked: Verrouillé
             field_last_login_on: Dernière connexion
             field_language: Langue
             field_effective_date: Date
             field_password: Mot de passe
             field_new_password: Nouveau mot de passe
             field_password_confirmation: Confirmation
             field_version: Version
             field_type: Type
             field_host: Hôte
             field_port: Port
             field_account: Compte
             field_base_dn: Base DN
             field_attr_login: Attribut Identifiant
             field_attr_firstname: Attribut Prénom
             field_attr_lastname: Attribut Nom
             field_attr_mail: Attribut Email
             field_onthefly: Création des utilisateurs à la volée
             field_start_date: Début
             field_done_ratio: %% Réalisé
             field_auth_source: Mode d'authentification
             label_user: Utilisateur
             label_user_plural: Utilisateurs
             label_user_new: Nouvel utilisateur
             label_project: Projet
             label_project_new: Nouveau projet
             label_project_plural: Projets
             label_project_latest: Derniers projets
             label_issue: Demande
             label_issue_new: Nouvelle demande
             label_issue_plural: Demandes
             label_issue_view_all: Voir toutes les demandes
             label_document: Document
             label_document_new: Nouveau document
             label_document_plural: Documents
             label_role: Rôle
             label_role_plural: Rôles
             label_role_new: Nouveau rôle
             label_role_and_permissions: Rôles et permissions
             label_member: Membre
             label_member_new: Nouveau membre
             label_member_plural: Membres
             label_tracker: Tracker
             label_tracker_plural: Trackers
             label_tracker_new: Nouveau tracker
             label_workflow: Workflow
             label_issue_status: Statut de demandes
             label_issue_status_plural: Statuts de demandes
             label_issue_status_new: Nouveau statut
             label_issue_category: Catégorie de demandes
             label_issue_category_plural: Catégories de demandes
             label_issue_category_new: Nouvelle catégorie
             label_custom_field: Champ personnalisé
             label_custom_field_plural: Champs personnalisés
             label_custom_field_new: Nouveau champ personnalisé
             label_enumerations: Listes de valeurs
             label_enumeration_new: Nouvelle valeur
             label_information: Information
             label_information_plural: Informations
             label_please_login: Identification
             label_register: S'enregistrer
             label_password_lost: Mot de passe perdu
             label_home: Accueil
             label_my_page: Ma page
             label_my_account: Mon compte
             label_my_projects: Mes projets
             label_administration: Administration
             label_login: Connexion
             label_logout: Déconnexion
             label_help: Aide
             label_reported_issues: Demandes soumises
             label_assigned_to_me_issues: Demandes qui me sont assignées
             label_last_login: Dernière connexion
             label_last_updates: Dernière mise à jour
             label_last_updates_plural: %d dernières mises à jour
             label_registered_on: Inscrit le
             label_activity: Activité
             label_new: Nouveau
             label_logged_as: Connecté en tant que
             label_environment: Environnement
             label_authentication: Authentification
             label_auth_source: Mode d'authentification
             label_auth_source_new: Nouveau mode d'authentification
             label_auth_source_plural: Modes d'authentification
             label_subproject: Sous-projet
             label_subproject_plural: Sous-projets
             label_min_max_length: Longueurs mini - maxi
             label_list: Liste
             label_date: Date
             label_integer: Entier
             label_boolean: Booléen
             label_string: Texte
             label_text: Texte long
             label_attribute: Attribut
             label_attribute_plural: Attributs
             label_download: %d Téléchargement
             label_download_plural: %d Téléchargements
             label_no_data: Aucune donnée à afficher
             label_change_status: Changer le statut
             label_history: Historique
             label_attachment: Fichier
             label_attachment_new: Nouveau fichier
             label_attachment_delete: Supprimer le fichier
             label_attachment_plural: Fichiers
             label_report: Rapport
             label_report_plural: Rapports
             label_news: Annonce
             label_news_new: Nouvelle annonce
             label_news_plural: Annonces
             label_news_latest: Dernières annonces
             label_news_view_all: Voir toutes les annonces
             label_change_log: Historique
             label_settings: Configuration
             label_overview: Aperçu
             label_version: Version
             label_version_new: Nouvelle version
             label_version_plural: Versions
             label_confirmation: Confirmation
             label_export_to: Exporter en
             label_read: Lire...
             label_public_projects: Projets publics
             label_open_issues: Ouverte
             label_open_issues_plural: Ouvertes
             label_closed_issues: Fermée
             label_closed_issues_plural: Fermées
             label_total: Total
             label_permissions: Permissions
             label_current_status: Statut actuel
             label_new_statuses_allowed: Nouveaux statuts autorisés
             label_all: Tous
             label_none: Aucun
             label_next: Suivant
             label_previous: Précédent
             label_used_by: Utilisé par
             label_details: Détails...
             label_add_note: Ajouter une note
             label_per_page: Par page
             label_calendar: Calendrier
             label_months_from: mois depuis
             label_gantt_chart: Diagramme de Gantt
             label_internal: Interne
             label_last_changes: %d derniers changements
             label_change_view_all: Voir tous les changements
+            label_personalize_page: Personnaliser cette page
             button_login: Connexion
             button_submit: Soumettre
-            button_save: Valider
+            button_save: Sauvegarder
             button_check_all: Tout cocher
             button_uncheck_all: Tout décocher
             button_delete: Supprimer
             button_create: Créer
             button_test: Tester
             button_edit: Modifier
             button_add: Ajouter
             button_change: Changer
             button_apply: Appliquer
             button_clear: Effacer
             button_lock: Verrouiller
             button_unlock: Déverrouiller
             button_download: Télécharger
             button_list: Lister
             button_view: Voir
             button_move: Déplacer
             button_back: Retour
+            button_cancel: Annuler
             text_select_mail_notifications: Sélectionner les actions pour lesquelles la notification par mail doit être activée.
             text_regexp_info: ex. ^[A-Z0-9]+$
             text_min_max_length_info: 0 pour aucune restriction
             text_possible_values_info: valeurs séparées par |
             text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ?
             text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
             text_are_you_sure: Etes-vous sûr ?
             text_journal_changed: changé de %s à %s
             text_journal_set_to: mis à %s
             text_journal_deleted: supprimé
             text_tip_task_begin_day: tâche commençant ce jour
             text_tip_task_end_day: tâche finissant ce jour
             text_tip_task_begin_end_day: tâche commençant et finissant ce jour
             default_role_manager: Manager
             default_role_developper: Développeur
             default_role_reporter: Rapporteur
             default_tracker_bug: Anomalie
             default_tracker_feature: Evolution
             default_tracker_support: Assistance
             default_issue_status_new: Nouveau
             default_issue_status_assigned: Assigné
             default_issue_status_resolved: Résolu
             default_issue_status_feedback: Commentaire
             default_issue_status_closed: Fermé
             default_issue_status_rejected: Rejeté
             default_doc_category_user: Documentation utilisateur
             default_doc_category_tech: Documentation technique
             default_priority_low: Bas
             default_priority_normal: Normal
             default_priority_high: Haut
             default_priority_urgent: Urgent
             default_priority_immediate: Immédiat
             enumeration_issue_priorities: Priorités des demandes
             enumeration_doc_categories: Catégories des documents

redmine/public/stylesheets/application.css +36 0

             /* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */
             /* Edited by Jean-Philippe Lang *>
             /**************** Body and tag styles ****************/
             #header * {margin:0; padding:0;}
             p, ul, ol, li {margin:0; padding:0;}
             body{
             font:76% Verdana,Tahoma,Arial,sans-serif;
             line-height:1.4em;
             text-align:center;
             color:#303030;
             background:#e8eaec;
             margin:0;
             }
             a{
             color:#467aa7;
             font-weight:bold;
             text-decoration:none;
             background-color:inherit;
             }
             a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
             a img{border:none;}
             p{padding:0 0 1em 0;}
             p form{margin-top:0; margin-bottom:20px;}
             img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
             img.left{float:left; margin:0 12px 5px 0;}
             img.center{display:block; margin:0 auto 5px auto;}
             img.right{float:right; margin:0 0 5px 12px;}
             /**************** Header and navigation styles ****************/
             #container{
             width:100%;
             min-width: 800px;
             margin:0;
             padding:0;
             text-align:left;
             background:#ffffff;
             color:#303030;
             }
             #header{
             height:4.5em;
             /*width:758px;*/
             margin:0;
             background:#467aa7;
             color:#ffffff;
             margin-bottom:1px;
             }
             #header h1{
             padding:10px 0 0 20px;
             font-size:2em;
             background-color:inherit;
             color:#fff; /*rgb(152, 26, 33);*/
             letter-spacing:-1px;
             font-weight:bold;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #header h2{
             margin:3px 0 0 40px;
             font-size:1.5em;
             background-color:inherit;
             color:#f0f2f4;
             letter-spacing:-1px;
             font-weight:normal;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #navigation{
             height:2.2em;
             line-height:2.2em;
             /*width:758px;*/
             margin:0;
             background:#578bb8;
             color:#ffffff;
             }
             #navigation li{
             float:left;
             list-style-type:none;
             border-right:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li.right {
              float:right;
             list-style-type:none;
             border-right:0;
             border-left:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li a{
             display:block;
             padding:0px 10px 0px 22px;
             font-size:0.8em;
             font-weight:normal;
             /*text-transform:uppercase;*/
             text-decoration:none;
             background-color:inherit;
             color: #ffffff;
             }
             * html #navigation a {width:1%;}
             #navigation .selected,#navigation a:hover{
             color:#ffffff;
             text-decoration:none;
             background-color: #80b0da;
             }
             /**************** Icons links *******************/
             .picHome {	background: url(../images/home.png) no-repeat 4px 50%; }
             .picUser {	background: url(../images/user.png) no-repeat 4px 50%; }
             .picUserPage {	background: url(../images/user_page.png) no-repeat 4px 50%; }
             .picAdmin {	background: url(../images/admin.png) no-repeat 4px 50%; }
             .picProject { background: url(../images/projects.png) no-repeat 4px 50%; }
             .picLogout { background: url(../images/logout.png) no-repeat 4px 50%; }
             .picHelp { background: url(../images/help.png) no-repeat 4px 50%; }
             /**************** Content styles ****************/
             html>body #content {
             height: auto;
             min-height: 500px;
             }
             #content{
             /*float:right;*/
             /*width:530px;*/
             width: auto;
             height:500px;
             font-size:0.9em;
             padding:20px 10px 10px 20px;
             /*position: absolute;*/
             margin-left: 120px;
             border-left: 1px dashed #c0c0c0;
             }
             #content h2{
             display:block;
             margin:0 0 16px 0;
             font-size:1.7em;
             font-weight:normal;
             letter-spacing:-1px;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #content h2 a{font-weight:normal;}
             #content h3{margin:0 0 12px 0; font-size:1.4em;color:#707070;font-family: Trebuchet MS,Georgia,"Times New Roman",serif;}
             #content a:hover,#subcontent a:hover{text-decoration:underline;}
             #content ul,#content ol{margin:0 5px 16px 35px;}
             #content dl{margin:0 5px 10px 25px;}
             #content dt{font-weight:bold; margin-bottom:5px;}
             #content dd{margin:0 0 10px 15px;}
             /***********************************************/
             /*
             form{
             	padding:15px;
             	margin:0 0 20px 0;
             	border:1px solid #c0c0c0;
             	background-color:#CEE1ED;
             	width:600px;
             }
             */
             form {
             	display: inline;
             }
             .noborder {
             	border:0px;
             	background-color:#fff;
             	width:100%;
             }
             textarea {
                 padding:0;
                 margin:0;
             }
             input {
             	vertical-align: middle;
             }
             input.button-small
             {
                 font-size: 0.8em;
             }
             select {
             	vertical-align: middle;
             }
             select.select-small
             {
                border: 1px solid #7F9DB9;
                padding: 1px;
                font-size: 0.8em;
             }
             .active-filter
             {
               background-color: #F9FA9E;
             }
             label {
             	font-weight: bold;
             	font-size: 1em;
             }
             fieldset {
                 border:1px solid #7F9DB9;
                 padding: 6px;
             }
             legend {
                 color: #505050;
             }
             .required {
             	color: #bb0000;
             }
             table.listTableContent {
             	border:1px solid #578bb8;
             	width:99%;
             	border-collapse: collapse;
             }
             table.listTableContent td {
             	padding:2px;
             }
             tr.ListHead {
             	background-color:#467aa7;
             	color:#FFFFFF;
             	text-align:center;
             }
             tr.ListHead a {
             	color:#FFFFFF;
             	text-decoration:underline;
             }
             .odd {
             	background-color:#f0f1f2;
             }
             .even {
             	background-color: #fff;
             }
             table.reportTableContent {
             	border:1px solid #c0c0c0;
             	width:99%;
             	border-collapse: collapse;
             }
             table.reportTableContent td {
             	padding:2px;
             }
             table.calenderTable {
             	border:1px solid #578bb8;
             	width:99%;
             	border-collapse: collapse;
             }
             table.calenderTable td {
             	border:1px solid #578bb8;
             }
             hr { border:none; border-bottom: dotted 1px #c0c0c0; }
             /**************** Sidebar styles ****************/
             #subcontent{
             position: absolute;
             left: 0px;
             width:110px;
             padding:20px 20px 10px 5px;
             }
             #subcontent h2{
             display:block;
             margin:0 0 5px 0;
             font-size:1.0em;
             font-weight:bold;
             text-align:left;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #subcontent p{margin:0 0 16px 0; font-size:0.9em;}
             /**************** Menublock styles ****************/
             .menublock{margin:0 0 20px 8px; font-size:0.8em;}
             .menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
             .menublock li a{font-weight:bold; text-decoration:none;}
             .menublock li a:hover{text-decoration:none;}
             .menublock li ul{margin:0; font-size:1em; font-weight:normal;}
             .menublock li ul li{margin-bottom:0;}
             .menublock li ul a{font-weight:normal;}
             /**************** Searchbar styles ****************/
             #searchbar{margin:0 0 20px 0;}
             #searchbar form fieldset{margin-left:10px; border:0 solid;}
             #searchbar #s{
             height:1.2em;
             width:110px;
             margin:0 5px 0 0;
             border:1px solid #a0a0a0;
             }
             #searchbar #searchbutton{
             width:auto;
             padding:0 1px;
             border:1px solid #808080;
             font-size:0.9em;
             text-align:center;
             }
             /**************** Footer styles ****************/
             #footer{
             clear:both;
             /*width:758px;*/
             padding:5px 0;
             margin:0;
             font-size:0.9em;
             color:#f0f0f0;
             background:#467aa7;
             }
             #footer p{padding:0; margin:0; text-align:center;}
             #footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;}
             #footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;}
             /**************** Misc classes and styles ****************/
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             .clear{clear:both;}
             .small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;}
             .hide{display:none;}
             .textcenter{text-align:center;}
             .textright{text-align:right;}
             .important{color:#f02025; background-color:inherit; font-weight:bold;}
             .box{
             margin:0 0 20px 0;
             padding:10px;
             border:1px solid #c0c0c0;
             background-color:#fafbfc;
             color:#505050;
             line-height:1.5em;
             }
+            a.close-icon {
+            display:block;
+            margin-top:3px;
+            overflow:hidden;
+            width:12px;
+            height:12px;
+            background-repeat: no-repeat;
+            cursor:hand;
+            cursor:pointer;
+            background-image:url('../images/close.png');
+            }
+            a.close-icon:hover {
+            background-image:url('../images/close_hl.png');
+            }
             .rightbox{
             background: #fafbfc;
             border: 1px solid #c0c0c0;
             float: right;
             padding: 8px;
             position: relative;
             margin: 0 5px 5px;
             }
+            .layout-active {
+            background: #ECF3E1;
+            }
+            .block-receiver {
+            border:1px dashed #c0c0c0;
+            margin-bottom: 20px;
+            padding: 15px 0 15px 0;
+            }
+            .mypage-box {
+            margin:0 0 20px 0;
+            color:#505050;
+            line-height:1.5em;
+            }
+            .blocks {
+            cursor: move;
+            }
             .topright{
             position: absolute;
             right: 25px;
             top: 100px;
             }
             .login {
             width: 50%;
             text-align: left;
             }
             img.calendar-trigger {
                 cursor: pointer;
                 vertical-align: middle;
                 margin-left: 4px;
             }
             #history h4 {
                 font-size: 1em;
                 margin-bottom: 12px;
                 margin-top: 20px;
                 font-weight: normal;
                 border-bottom: dotted 1px #c0c0c0;
             }
             #history p {
                 margin-left: 34px;
             }
             /***** CSS FORM ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             }
             .tabular label{
             font-weight: bold;
             float: left;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .error {
             color: #cc0000;
             }
             /*.threepxfix class below:
             Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.
             to account for 3 pixel bug: http://www.positioniseverything.net/explorer/threepxtest.html
             */
             * html .threepxfix{
             margin-left: 3px;
             }

redmine/test/integration/account_test.rb +17 -17

             # redMine - project management software
             # Copyright (C) 2006  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.
             require "#{File.dirname(__FILE__)}/../test_helper"
             class AccountTest < ActionController::IntegrationTest
               fixtures :users
               # Replace this with your real tests.
               def test_login
-                get "account/my_page"
+                get "my/page"
                 assert_redirected_to "account/login"
                 log_user('jsmith', 'jsmith')
-                get "account/my_account"
+                get "my/account"
                 assert_response :success
-                assert_template "account/my_account"
+                assert_template "my/account"
               end
               def test_change_password
                 log_user('jsmith', 'jsmith')
-                get "account/my_account"
+                get "my/account"
                 assert_response :success
-                assert_template "account/my_account"
+                assert_template "my/account"
-                post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello2"
+                post "my/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello2"
                 assert_response :success
-                assert_template "account/my_account"
+                assert_template "my/account"
                 assert_tag :tag => "div", :attributes => { :class => "errorExplanation" }
-                post "account/change_password", :password => 'jsmithZZ', :new_password => "hello", :new_password_confirmation => "hello"
+                post "my/change_password", :password => 'jsmithZZ', :new_password => "hello", :new_password_confirmation => "hello"
-                assert_redirected_to "account/my_account"
+                assert_redirected_to "my/account"
                 assert_equal 'Wrong password', flash[:notice]
-                post "account/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello"
+                post "my/change_password", :password => 'jsmith', :new_password => "hello", :new_password_confirmation => "hello"
-                assert_redirected_to "account/my_account"
+                assert_redirected_to "my/account"
                 log_user('jsmith', 'hello')
               end
               def test_my_account
                 log_user('jsmith', 'jsmith')
-                get "account/my_account"
+                get "my/account"
                 assert_response :success
-                assert_template "account/my_account"
+                assert_template "my/account"
-                post "account/my_account", :user => {:firstname => "Joe", :login => "root", :admin => 1}
+                post "my/account", :user => {:firstname => "Joe", :login => "root", :admin => 1}
                 assert_response :success
-                assert_template "account/my_account"
+                assert_template "my/account"
                 user = User.find(2)
                 assert_equal "Joe", user.firstname
                 assert_equal "jsmith", user.login
                 assert_equal false, user.admin?
               end
               def test_my_page
                 log_user('jsmith', 'jsmith')
-                get "account/my_page"
+                get "my/page"
                 assert_response :success
-                assert_template "account/my_page"
+                assert_template "my/page"
               end
               def test_lost_password
                 get "account/lost_password"
                 assert_response :success
                 assert_template "account/lost_password"
                 post "account/lost_password", :mail => 'jsmith@somenet.foo'
                 assert_redirected_to "account/login"
                 token = Token.find(:first)
                 assert_equal 'recovery', token.action
                 assert_equal 'jsmith@somenet.foo', token.user.mail
                 assert !token.expired?
                 get "account/lost_password", :token => token.value
                 assert_response :success
                 assert_template "account/password_recovery"
                 post "account/lost_password", :token => token.value, :new_password => 'newpass', :new_password_confirmation => 'newpass'
                 assert_redirected_to "account/login"
                 assert_equal 'Password was successfully updated.', flash[:notice]
                 log_user('jsmith', 'newpass')
                 assert_equal 0, Token.count
               end
             end

redmine/test/test_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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.
             ENV["RAILS_ENV"] ||= "test"
             require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
             require 'test_help'
             class Test::Unit::TestCase
               # Transactional fixtures accelerate your tests by wrapping each test method
               # in a transaction that's rolled back on completion.  This ensures that the
               # test database remains unchanged so your fixtures don't have to be reloaded
               # between every test method.  Fewer database queries means faster tests.
               #
               # Read Mike Clark's excellent walkthrough at
               #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
               #
               # Every Active Record database supports transactions except MyISAM tables
               # in MySQL.  Turn off transactional fixtures in this case; however, if you
               # don't care one way or the other, switching from MyISAM to InnoDB tables
               # is recommended.
               self.use_transactional_fixtures = true
               # Instantiated fixtures are slow, but give you @david where otherwise you
               # would need people(:david).  If you don't want to migrate your existing
               # test cases which use the @david style and don't mind the speed hit (each
               # instantiated fixtures translates to a database query per test method),
               # then set this back to true.
               self.use_instantiated_fixtures  = false
               # Add more helper methods to be used by all tests here...
               def log_user(login, password)
                 get "/account/login"
                 assert_equal nil, session[:user_id]
                 assert_response :success
                 assert_template "account/login"
                 post "/account/login", :login => login, :password => password
-                assert_redirected_to "account/my_page"
+                assert_redirected_to "my/page"
                 assert_equal login, User.find(session[:user_id]).login
               end
             end

redmine/app/views/account/my_page.rhtml removed 0 -22

NO CONTENT: file was removed

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