117 files changed, 2483 insertions, 2483 deletions
diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index 5a94cb1ed..73f6fe49f 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -1,24 +1,24 @@
-<center>
-<div class="box login">
+<center>
+<div class="box login">
 <h2 class="icon22 icon22-authent"><%=l(:label_please_login)%></h2>
-
-<% form_tag({:action=> "login"}, :class => "tabular") do %>
-<p><label for="login"><%=l(:field_login)%>:</label>
-<%= text_field_tag 'login', nil, :size => 25 %></p>
-
-<p><label for="password"><%=l(:field_password)%>:</label>
-<%= password_field_tag 'password', nil, :size => 25 %></p>
-
+
+<% form_tag({:action=> "login"}, :class => "tabular") do %>
+<p><label for="login"><%=l(:field_login)%>:</label>
+<%= text_field_tag 'login', nil, :size => 25 %></p>
+
+<p><label for="password"><%=l(:field_password)%>:</label>
+<%= password_field_tag 'password', nil, :size => 25 %></p>
+
 <p><center><input type="submit" name="login" value="<%=l(:button_login)%> &#187;" class="primary" /></center>
-<% end %>
-
-<br>
-<% links = []
-   links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?
-   links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password?
-%>
-<%= links.join(" | ") %>
-</p>
+<% end %>
+
+<br>
+<% links = []
+   links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?
+   links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password?
+%>
+<%= links.join(" | ") %>
+</p>
 
-</div>
+</div>
 </center>
 \ No newline at end of file
diff --git a/app/views/account/lost_password.rhtml b/app/views/account/lost_password.rhtml
index ebc64e326..b27123a6e 100644
--- a/app/views/account/lost_password.rhtml
+++ b/app/views/account/lost_password.rhtml
@@ -1,14 +1,14 @@
-<center>
-<div class="box login">
-<h2><%=l(:label_password_lost)%></h2>
-
-<% form_tag({:action=> "lost_password"}, :class => "tabular") do %>
-
-<p><label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
-<%= text_field_tag 'mail', nil, :size => 40 %></p>
-
-<p><center><%= submit_tag l(:button_submit) %></center></p>
-
-<% end %>
-</div>
+<center>
+<div class="box login">
+<h2><%=l(:label_password_lost)%></h2>
+
+<% form_tag({:action=> "lost_password"}, :class => "tabular") do %>
+
+<p><label for="mail"><%=l(:field_mail)%> <span class="required">*</span></label>
+<%= text_field_tag 'mail', nil, :size => 40 %></p>
+
+<p><center><%= submit_tag l(:button_submit) %></center></p>
+
+<% end %>
+</div>
 </center>
 \ No newline at end of file
diff --git a/app/views/account/password_recovery.rhtml b/app/views/account/password_recovery.rhtml
index 2aa581042..89b105292 100644
--- a/app/views/account/password_recovery.rhtml
+++ b/app/views/account/password_recovery.rhtml
@@ -1,21 +1,21 @@
 <center>
 <div class="box login">
 <h2><%=l(:label_password_lost)%></h2>
-
-<p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
+
+<p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
 
 <%= error_messages_for 'user' %>
-
+
   <% form_tag({:token => @token.value}, :class => "tabular") do %>
-
+
   <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
-  <%= password_field_tag 'new_password', nil, :size => 25 %></p>
-
+  <%= 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>
+  <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
 
   <p><center><%= submit_tag l(:button_save) %></center></p>
-  <% end %>
-  
+  <% end %>
+  
 </div>
 </center>
 \ No newline at end of file
diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index ac16c3b49..ef9a12ac0 100644
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -7,7 +7,7 @@
 <!--[form:user]-->
 <p><label for="user_login"><%=l(:field_login)%> <span class="required">*</span></label>
 <%= text_field 'user', 'login', :size => 25  %></p>
-
+
 <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
 <%= password_field_tag 'password', nil, :size => 25  %></p>
 
@@ -16,22 +16,22 @@
 
 <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'  %></p>
-
+<%= text_field 'user', 'mail'  %></p>
+
 <p><label for="user_language"><%=l(:field_language)%></label>
-<%= select("user", "language", lang_options_for_select) %></p>
-
+<%= select("user", "language", lang_options_for_select) %></p>
+
 <% for @custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label @custom_value %></p>
-<% end %>
-
+<% end %>
+
 <p><label for="user_mail_notification"><%=l(:field_mail_notification)%></label>
-<%= check_box 'user', 'mail_notification' %></p>
+<%= check_box 'user', 'mail_notification' %></p>
 <!--[eoform:user]-->
 </div>
 
diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml
index c686b709c..19fedb3b6 100644
--- a/app/views/account/show.rhtml
+++ b/app/views/account/show.rhtml
@@ -1,26 +1,26 @@
-<h2><%= @user.display_name %></h2>
-
-<p>
-<%= mail_to @user.mail unless @user.pref.hide_mail %>
-<ul>
-    <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
-<% for custom_value in @custom_values %>
-<% if !custom_value.value.empty? %>
-    <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
-<% end %>
-<% end %>
-</ul>
-</p>
-
-<h3><%=l(:label_project_plural)%></h3>
-<p>
-<% for membership in @user.memberships %>
-	<%= membership.project.name %> (<%= membership.role.name %>, <%= format_date(membership.created_on) %>)
-	<br />
-<% end %>
-</p>
-
-<h3><%=l(:label_activity)%></h3>
-<p>
-<%=l(:label_reported_issues)%>: <%= Issue.count(["author_id=?", @user.id]) %>
+<h2><%= @user.display_name %></h2>
+
+<p>
+<%= mail_to @user.mail unless @user.pref.hide_mail %>
+<ul>
+    <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
+<% for custom_value in @custom_values %>
+<% if !custom_value.value.empty? %>
+    <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
+<% end %>
+<% end %>
+</ul>
+</p>
+
+<h3><%=l(:label_project_plural)%></h3>
+<p>
+<% for membership in @user.memberships %>
+	<%= membership.project.name %> (<%= membership.role.name %>, <%= format_date(membership.created_on) %>)
+	<br />
+<% end %>
+</p>
+
+<h3><%=l(:label_activity)%></h3>
+<p>
+<%=l(:label_reported_issues)%>: <%= Issue.count(["author_id=?", @user.id]) %>
 </p>
 \ No newline at end of file
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index 535a90b59..02eb5ae89 100644
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -1,45 +1,45 @@
-<h2><%=l(:label_administration)%></h2>
-
-<p class="icon22 icon22-projects">
-<%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> |
-<%= link_to l(:label_new), :controller => 'projects', :action => 'add' %>
-</p>
-
-<p class="icon22 icon22-users">
-<%= link_to l(:label_user_plural), :controller => 'users' %> |
-<%= link_to l(:label_new), :controller => 'users', :action => 'add' %>
-</p>
-
-<p class="icon22 icon22-role">
-<%= link_to l(:label_role_and_permissions), :controller => 'roles' %>
-</p>
-
-<p class="icon22 icon22-tracker">
-<%= link_to l(:label_tracker_plural), :controller => 'trackers' %> |
-<%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses' %> |
-<%= link_to l(:label_workflow), :controller => 'roles', :action => 'workflow' %>
-</p>
-
-<p class="icon22 icon22-workflow">
-<%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %>
-</p>
-
-<p class="icon22 icon22-options">
-<%= link_to l(:label_enumerations), :controller => 'enumerations' %>
-</p>
-
-<p class="icon22 icon22-notifications">
-<%= link_to l(:field_mail_notification), :controller => 'admin', :action => 'mail_options' %>
-</p>
-
-<p class="icon22 icon22-authent">
-<%= link_to l(:label_authentication), :controller => 'auth_sources' %>
-</p>
-
-<p class="icon22 icon22-settings">
-<%= link_to l(:label_settings), :controller => 'settings' %>
-</p>
-
-<p class="icon22 icon22-info">
-<%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
+<h2><%=l(:label_administration)%></h2>
+
+<p class="icon22 icon22-projects">
+<%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> |
+<%= link_to l(:label_new), :controller => 'projects', :action => 'add' %>
+</p>
+
+<p class="icon22 icon22-users">
+<%= link_to l(:label_user_plural), :controller => 'users' %> |
+<%= link_to l(:label_new), :controller => 'users', :action => 'add' %>
+</p>
+
+<p class="icon22 icon22-role">
+<%= link_to l(:label_role_and_permissions), :controller => 'roles' %>
+</p>
+
+<p class="icon22 icon22-tracker">
+<%= link_to l(:label_tracker_plural), :controller => 'trackers' %> |
+<%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses' %> |
+<%= link_to l(:label_workflow), :controller => 'roles', :action => 'workflow' %>
+</p>
+
+<p class="icon22 icon22-workflow">
+<%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %>
+</p>
+
+<p class="icon22 icon22-options">
+<%= link_to l(:label_enumerations), :controller => 'enumerations' %>
+</p>
+
+<p class="icon22 icon22-notifications">
+<%= link_to l(:field_mail_notification), :controller => 'admin', :action => 'mail_options' %>
+</p>
+
+<p class="icon22 icon22-authent">
+<%= link_to l(:label_authentication), :controller => 'auth_sources' %>
+</p>
+
+<p class="icon22 icon22-settings">
+<%= link_to l(:label_settings), :controller => 'settings' %>
+</p>
+
+<p class="icon22 icon22-info">
+<%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
 </p>
 \ No newline at end of file
diff --git a/app/views/admin/info.rhtml b/app/views/admin/info.rhtml
index b9f50af44..2ea692c79 100644
--- a/app/views/admin/info.rhtml
+++ b/app/views/admin/info.rhtml
@@ -1,3 +1,3 @@
-<h2><%=l(:label_information_plural)%></h2>
-
+<h2><%=l(:label_information_plural)%></h2>
+
 <p><%=l(:field_version)%>: <strong>redMine <%= Redmine::VERSION %></strong> (<%= @db_adapter_name %>)</p>
 \ No newline at end of file
diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml
index 590c75b3d..8fd5de7e1 100644
--- a/app/views/admin/mail_options.rhtml
+++ b/app/views/admin/mail_options.rhtml
@@ -1,25 +1,25 @@
-<h2><%=l(:field_mail_notification)%></h2>
-
-<% form_tag ({:action => 'mail_options'}, :id => 'mail_options_form') do %>
-
-<div class="box">
-<p><%=l(:text_select_mail_notifications)%></p>
-
-<% actions = @actions.group_by {|p| p.group_id } %>
-<% actions.keys.sort.each do |group_id| %>
-<fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
-<% actions[group_id].each do |p| %>
-  <div style="width:170px;float:left;"><%= check_box_tag "action_ids[]", p.id, p.mail_enabled? %>
-  <%= l(p.description.to_sym) %>
-  </div>
-<% end %>
-<div class="clear"></div>
-</fieldset>
-<% end %>
-
-<br />
-<p><%= check_all_links 'mail_options_form' %></p>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
+<h2><%=l(:field_mail_notification)%></h2>
+
+<% form_tag ({:action => 'mail_options'}, :id => 'mail_options_form') do %>
+
+<div class="box">
+<p><%=l(:text_select_mail_notifications)%></p>
+
+<% actions = @actions.group_by {|p| p.group_id } %>
+<% actions.keys.sort.each do |group_id| %>
+<fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
+<% actions[group_id].each do |p| %>
+  <div style="width:170px;float:left;"><%= check_box_tag "action_ids[]", p.id, p.mail_enabled? %>
+  <%= l(p.description.to_sym) %>
+  </div>
+<% end %>
+<div class="clear"></div>
+</fieldset>
+<% end %>
+
+<br />
+<p><%= check_all_links 'mail_options_form' %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index cf7c06070..9c0595eb7 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -6,24 +6,24 @@
 
 <table class="list">
   <thead><tr>
-	<%= sort_header_tag('name', :caption => l(:label_project)) %>
-	<th><%=l(:field_description)%></th>
+	<%= sort_header_tag('name', :caption => l(:label_project)) %>
+	<th><%=l(:field_description)%></th>
 	<th><%=l(:field_is_public)%></th>
-	<th><%=l(:label_subproject_plural)%></th>
-	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
+	<th><%=l(:label_subproject_plural)%></th>
+	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
     <th></th>
   </tr></thead>
   <tbody>
 <% for project in @projects %>
-  <tr class="<%= cycle("odd", "even") %>">
-	<td><%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %>
-	<td><%=h project.description %>
+  <tr class="<%= cycle("odd", "even") %>">
+	<td><%= link_to project.name, :controller => 'projects', :action => 'settings', :id => project %>
+	<td><%=h project.description %>
 	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
-	<td align="center"><%= project.children.size %>
-	<td align="center"><%= format_date(project.created_on) %>
+	<td align="center"><%= project.children.size %>
+	<td align="center"><%= format_date(project.created_on) %>
   <td align="center">
-    <%= button_to l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => "button-small" %>
-  </td>
+    <%= button_to l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => "button-small" %>
+  </td>
   </tr>
 <% end %>
   </tbody>
diff --git a/app/views/common/404.rhtml b/app/views/common/404.rhtml
index a81eeba02..a1a11c32c 100644
--- a/app/views/common/404.rhtml
+++ b/app/views/common/404.rhtml
@@ -1,4 +1,4 @@
-<h2>404</h2>
-
-<p><%= l(:notice_file_not_found) %></p>
-<p><a href="javascript:history.back()">Back</a></p>
+<h2>404</h2>
+
+<p><%= l(:notice_file_not_found) %></p>
+<p><a href="javascript:history.back()">Back</a></p>
diff --git a/app/views/custom_fields/_form.rhtml b/app/views/custom_fields/_form.rhtml
index 36be6259a..427276445 100644
--- a/app/views/custom_fields/_form.rhtml
+++ b/app/views/custom_fields/_form.rhtml
@@ -57,30 +57,30 @@ function deleteValueField(e) {
 <!--[form:custom_field]-->
 <div class="box">
 <p><%= f.text_field :name, :required => true %></p>
-<p><%= f.select :field_format, custom_field_formats_for_select, {}, :onchange => "toggle_custom_field_format();" %></p>
+<p><%= f.select :field_format, custom_field_formats_for_select, {}, :onchange => "toggle_custom_field_format();" %></p>
 <p><label for="custom_field_min_length"><%=l(:label_min_max_length)%></label>
    <%= f.text_field :min_length, :size => 5, :no_label => true %> - 
    <%= f.text_field :max_length, :size => 5, :no_label => true %><br>(<%=l(:text_min_max_length_info)%>)</p>
-<p><%= f.text_field :regexp, :size => 50 %><br>(<%=l(:text_regexp_info)%>)</p>
+<p><%= f.text_field :regexp, :size => 50 %><br>(<%=l(:text_regexp_info)%>)</p>
 <p id="custom_field_possible_values"><label><%= l(:field_possible_values) %> <%= image_to_function "add.png", "addValueField();return false" %></label>
 <% (@custom_field.possible_values.to_a + [""]).each do |value| %>
 <span><%= text_field_tag 'custom_field[possible_values][]', value, :size => 30 %> <%= image_to_function "delete.png", "deleteValueField(this);return false" %><br /></span>
 <% end %>
 
 </p>
-</div>
+</div>
 <%= javascript_tag "toggle_custom_field_format();" %>
 <!--[eoform:custom_field]-->
 
 <div class="box">
 <% case @custom_field.type.to_s
-when "IssueCustomField" %>
-    
-    <fieldset><legend><%=l(:label_tracker_plural)%></legend>
+when "IssueCustomField" %>
+    
+    <fieldset><legend><%=l(:label_tracker_plural)%></legend>
     <% for tracker in @trackers %>
-        <%= check_box_tag "tracker_ids[]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
+        <%= check_box_tag "tracker_ids[]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
     <% end %>
-    </fieldset>
+    </fieldset>
     &nbsp;
     <p><%= f.check_box :is_required %></p>
     <p><%= f.check_box :is_for_all %></p>
diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml
index 76637c8d5..b6f1f278e 100644
--- a/app/views/custom_fields/list.rhtml
+++ b/app/views/custom_fields/list.rhtml
@@ -6,29 +6,29 @@
 <li><%= link_to l(:label_project_plural), {}, :id=> "tab-ProjectCustomField", :onclick => "showTab('ProjectCustomField'); this.blur(); return false;" %></li>
 <li><%= link_to l(:label_user_plural), {}, :id=> "tab-UserCustomField", :onclick => "showTab('UserCustomField'); this.blur(); return false;" %></li>
 </ul>
-</div>
+</div>
 
 <% %w(IssueCustomField ProjectCustomField UserCustomField).each do |type| %>
 <div id="tab-content-<%= type %>" class="tab-content">
-<table class="list">		
+<table class="list">		
   <thead><tr>	
-	<th width="30%"><%=l(:field_name)%></th>
-	<th><%=l(:field_field_format)%></th>
+	<th width="30%"><%=l(:field_name)%></th>
+	<th><%=l(:field_field_format)%></th>
 	<th><%=l(:field_is_required)%></th>
-	<% if type == 'IssueCustomField' %>
-	<th><%=l(:field_is_for_all)%></th>
+	<% if type == 'IssueCustomField' %>
+	<th><%=l(:field_is_for_all)%></th>
 	<th><%=l(:label_used_by)%></th>
-	<% end %>
-	<th width="10%"></th>
+	<% end %>
+	<th width="10%"></th>
   </tr></thead>
   <tbody>
 <% for custom_field in (@custom_fields_by_type[type] || []) %>
-  <tr class="<%= cycle("odd", "even") %>">
+  <tr class="<%= cycle("odd", "even") %>">
 	<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
-	<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %></td>
+	<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %></td>
 	<td align="center"><%= image_tag 'true.png' if custom_field.is_required? %></td>
-	<% if type == 'IssueCustomField' %>
-	<td align="center"><%= image_tag 'true.png' if custom_field.is_for_all? %></td>
+	<% if type == 'IssueCustomField' %>
+	<td align="center"><%= image_tag 'true.png' if custom_field.is_for_all? %></td>
 	<td align="center"><%= custom_field.projects.count.to_s + ' ' + lwr(:label_project, custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
 	<% end %>
 	<td align="center">
diff --git a/app/views/documents/_document.rhtml b/app/views/documents/_document.rhtml
index 81e039be2..e1539b828 100644
--- a/app/views/documents/_document.rhtml
+++ b/app/views/documents/_document.rhtml
@@ -1,3 +1,3 @@
-<p><%= link_to h(document.title), :controller => 'documents', :action => 'show', :id => document %><br />
-<% unless document.description.empty? %><%=h(truncate(document.description, 250)) %><br /><% end %>
+<p><%= link_to h(document.title), :controller => 'documents', :action => 'show', :id => document %><br />
+<% unless document.description.empty? %><%=h(truncate(document.description, 250)) %><br /><% end %>
 <em><%= format_time(document.created_on) %></em></p>
 \ No newline at end of file
diff --git a/app/views/documents/_form.rhtml b/app/views/documents/_form.rhtml
index 40bbdc66a..bd6e6cc7e 100644
--- a/app/views/documents/_form.rhtml
+++ b/app/views/documents/_form.rhtml
@@ -1,11 +1,11 @@
 <%= error_messages_for 'document' %>
 <div class="box">
 <!--[form:document]-->
-<p><label for="document_category_id"><%=l(:field_category)%></label>
-<select name="document[category_id]">
+<p><label for="document_category_id"><%=l(:field_category)%></label>
+<select name="document[category_id]">
 <%= options_from_collection_for_select @categories, "id", "name", @document.category_id %>
-</select></p>
-
+</select></p>
+
 <p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label>
 <%= text_field 'document', 'title', :size => 60 %></p>
 
diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml
index 31595ab0f..730cbbb11 100644
--- a/app/views/documents/show.rhtml
+++ b/app/views/documents/show.rhtml
@@ -1,37 +1,37 @@
-<div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'icon icon-edit' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-</div>
-
-<h2><%= @document.title %></h2>
-
-<p><em><%= @document.category.name %><br />
-<%= format_date @document.created_on %></em></p>
-<%= textilizable @document.description %>
-<br />
-
-<h3><%= l(:label_attachment_plural) %></h3>
+<div class="contextual">
+<%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'icon icon-edit' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+</div>
+
+<h2><%= @document.title %></h2>
+
+<p><em><%= @document.category.name %><br />
+<%= format_date @document.created_on %></em></p>
+<%= textilizable @document.description %>
+<br />
+
+<h3><%= l(:label_attachment_plural) %></h3>
 <ul class="documents">  
 <% for attachment in @attachments %>
-    <li>
-        <div class="contextual">
-        <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-        </div>
-        <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
-        (<%= number_to_human_size attachment.filesize %>)<br />
+    <li>
+        <div class="contextual">
+        <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+        </div>
+        <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
+        (<%= number_to_human_size attachment.filesize %>)<br />
         <em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em><br />
-        <%= lwr(:label_download, attachment.downloads) %>
-    </li>
+        <%= lwr(:label_download, attachment.downloads) %>
+    </li>
+<% end %>
+</ul>
+<br />
+
+
+<% if authorize_for('documents', 'add_attachment') %>
+  <% form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") do %>
+    <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
+    <%= image_to_function "add.png", "addFileField();return false" %></label>
+    <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+  <%= submit_tag l(:button_add) %>
+  <% end %> 
 <% end %>
-</ul>
-<br />
-
-
-<% if authorize_for('documents', 'add_attachment') %>
-  <% form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :class => "tabular") do %>
-    <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
-    <%= image_to_function "add.png", "addFileField();return false" %></label>
-    <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
-  <%= submit_tag l(:button_add) %>
-  <% end %> 
-<% end %>
diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml
index 18508125f..f7756ce30 100644
--- a/app/views/enumerations/list.rhtml
+++ b/app/views/enumerations/list.rhtml
@@ -1,19 +1,19 @@
 <h2><%=l(:label_enumerations)%></h2>
 &nbsp;
-<% Enumeration::OPTIONS.each do |option, name| %>
-
-	<% if params[:opt]==option %>	
-  
-		<h3><%= l(name) %></h3>
-		<ul>
-		<% for value in Enumeration.find(:all, :conditions => ["opt = ?", option]) %>			
-			<li><%= link_to value.name, :action => 'edit', :id => value %></li>	
-		<% end %>
-    </ul>
-    <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "icon icon-add" %></p>&nbsp;
-    
-	<% else %>	
-		<h3><%= link_to l(name), :opt => option %></h3>
-	<% end %>
-  
+<% Enumeration::OPTIONS.each do |option, name| %>
+
+	<% if params[:opt]==option %>	
+  
+		<h3><%= l(name) %></h3>
+		<ul>
+		<% for value in Enumeration.find(:all, :conditions => ["opt = ?", option]) %>			
+			<li><%= link_to value.name, :action => 'edit', :id => value %></li>	
+		<% end %>
+    </ul>
+    <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option }, :class => "icon icon-add" %></p>&nbsp;
+    
+	<% else %>	
+		<h3><%= link_to l(name), :opt => option %></h3>
+	<% end %>
+  
 <% end %>
 \ No newline at end of file
diff --git a/app/views/issue_statuses/_form.rhtml b/app/views/issue_statuses/_form.rhtml
index f3b1cf2ca..7f6dc5be0 100644
--- a/app/views/issue_statuses/_form.rhtml
+++ b/app/views/issue_statuses/_form.rhtml
@@ -6,13 +6,13 @@
 <%= text_field 'issue_status', 'name'  %></p>
 
 <p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label>
-<%= check_box 'issue_status', 'is_closed' %></p>
-
+<%= check_box 'issue_status', 'is_closed' %></p>
+
 <p><label for="issue_status_is_default"><%=l(:field_is_default)%></label>
-<%= check_box 'issue_status', 'is_default' %></p>
-
+<%= check_box 'issue_status', 'is_default' %></p>
+
 <p><label for="issue_status_html_color"><%=l(:field_html_color)%><span class="required"> *</span></label>
-#<%= text_field 'issue_status', 'html_color', :maxlength => 6 %></p>
+#<%= text_field 'issue_status', 'html_color', :maxlength => 6 %></p>
 
 <!--[eoform:issue_status]-->
 </div>
 \ No newline at end of file
diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml
index 01617c329..973cc9c76 100644
--- a/app/views/issue_statuses/list.rhtml
+++ b/app/views/issue_statuses/list.rhtml
@@ -6,18 +6,18 @@
  
 <table class="list">
   <thead><tr>
-  <th><%=l(:field_status)%></th>
-  <th><%=l(:field_is_default)%></th>
-  <th><%=l(:field_is_closed)%></th>
+  <th><%=l(:field_status)%></th>
+  <th><%=l(:field_is_default)%></th>
+  <th><%=l(:field_is_closed)%></th>
   <th><%=l(:button_sort)%></th>
   <th></th>
   </tr></thead>
   <tbody>  
 <% for status in @issue_statuses %>
   <tr class="<%= cycle("odd", "even") %>">
-  <td><div class="square" style="background:#<%= status.html_color %>;"></div> <%= link_to status.name, :action => 'edit', :id => status %></td>
-  <td align="center"><%= image_tag 'true.png' if status.is_default? %></td>
-  <td align="center"><%= image_tag 'true.png' if status.is_closed? %></td>
+  <td><div class="square" style="background:#<%= status.html_color %>;"></div> <%= link_to status.name, :action => 'edit', :id => status %></td>
+  <td align="center"><%= image_tag 'true.png' if status.is_default? %></td>
+  <td align="center"><%= image_tag 'true.png' if status.is_closed? %></td>
   <td align="center">
     <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => status, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
     <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:action => 'move', :id => status, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> -
@@ -25,11 +25,11 @@
     <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => status, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
   </td>
   <td align="center">
-    <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
+    <%= button_to l(:button_delete), { :action => 'destroy', :id => status }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
   </td>
   </tr>
 <% end %>
   </tbody>
 </table>
-
+
 <%= pagination_links_full @issue_status_pages %>
 \ No newline at end of file
diff --git a/app/views/issues/_add_shortcut.rhtml b/app/views/issues/_add_shortcut.rhtml
index 7cd3114c6..c6a5a4667 100644
--- a/app/views/issues/_add_shortcut.rhtml
+++ b/app/views/issues/_add_shortcut.rhtml
@@ -1,5 +1,5 @@
-<% if authorize_for('projects', 'add_issue') %>
-<% form_tag({ :controller => 'projects', :action => 'add_issue', :id => @project }, :method => 'get') do %>
-<%= l(:label_issue_new) %>: <%= select_tag 'tracker_id', ("<option></option>" + options_from_collection_for_select(trackers, 'id', 'name')), :onchange => "if (this.value!='') {this.form.submit();}" %>
-<% end %>
-<% end %>
+<% if authorize_for('projects', 'add_issue') %>
+<% form_tag({ :controller => 'projects', :action => 'add_issue', :id => @project }, :method => 'get') do %>
+<%= l(:label_issue_new) %>: <%= select_tag 'tracker_id', ("<option></option>" + options_from_collection_for_select(trackers, 'id', 'name')), :onchange => "if (this.value!='') {this.form.submit();}" %>
+<% end %>
+<% end %>
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index 37faf977b..cc02eee4e 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -1,11 +1,11 @@
-<% for journal in journals %>
-	<h4><%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
-	<ul>
-	<% for detail in journal.details %>
-	   <li><%= show_detail(detail) %></li>
-	<% end %>
-	</ul>
-	<% if journal.notes? %>
-    	<%= textilizable journal.notes %>
-	<% end %>
-<% end %>
+<% for journal in journals %>
+	<h4><%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
+	<ul>
+	<% for detail in journal.details %>
+	   <li><%= show_detail(detail) %></li>
+	<% end %>
+	</ul>
+	<% if journal.notes? %>
+    	<%= textilizable journal.notes %>
+	<% end %>
+<% end %>
diff --git a/app/views/issues/_list_simple.rhtml b/app/views/issues/_list_simple.rhtml
index 10d880f43..0e3c39bbf 100644
--- a/app/views/issues/_list_simple.rhtml
+++ b/app/views/issues/_list_simple.rhtml
@@ -1,25 +1,25 @@
-<% if issues.length > 0 %>
-	<table class="list">		
-		<thead><tr>
-		<th>#</th>
-		<th><%=l(:field_tracker)%></th>
-		<th><%=l(:field_subject)%></th>
-		</tr></thead>
-		<tbody>	
+<% if issues.length > 0 %>
+	<table class="list">		
+		<thead><tr>
+		<th>#</th>
+		<th><%=l(:field_tracker)%></th>
+		<th><%=l(:field_subject)%></th>
+		</tr></thead>
+		<tbody>	
 		<% for issue in issues %>
-		<tr class="<%= cycle("odd", "even") %>">
-			<th align="center">
-				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
-			</th>
+		<tr class="<%= cycle("odd", "even") %>">
+			<th align="center">
+				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
+			</th>
 			<td><p class="small"><%= issue.project.name %> - <%= issue.tracker.name %><br />
-                <%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td>
-			<td>
-                <p class="small"><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></p>
+                <%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td>
+			<td>
+                <p class="small"><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></p>
             </td>
 		</tr>
-		<% end %>
+		<% end %>
 		</tbody>
-	</table>
-<% else %>
-	<i><%=l(:label_no_data)%></i>
+	</table>
+<% else %>
+	<i><%=l(:label_no_data)%></i>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/issues/_tooltip.rhtml b/app/views/issues/_tooltip.rhtml
index d7b555e4a..d186322c6 100644
--- a/app/views/issues/_tooltip.rhtml
+++ b/app/views/issues/_tooltip.rhtml
@@ -1,6 +1,6 @@
-<%= link_to "#{issue.tracker.name} ##{issue.id}", { :controller => 'issues', :action => 'show', :id => issue } %></strong>: <%=h issue.subject %><br />
-<br />
-<strong><%= l(:field_start_date) %></strong>: <%= format_date(issue.start_date) %><br />
-<strong><%= l(:field_due_date) %></strong>: <%= format_date(issue.due_date) %><br />
-<strong><%= l(:field_assigned_to) %></strong>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %><br />
-<strong><%= l(:field_priority) %></strong>: <%= issue.priority.name %>
+<%= link_to "#{issue.tracker.name} ##{issue.id}", { :controller => 'issues', :action => 'show', :id => issue } %></strong>: <%=h issue.subject %><br />
+<br />
+<strong><%= l(:field_start_date) %></strong>: <%= format_date(issue.start_date) %><br />
+<strong><%= l(:field_due_date) %></strong>: <%= format_date(issue.due_date) %><br />
+<strong><%= l(:field_assigned_to) %></strong>: <%= issue.assigned_to ? issue.assigned_to.name : "-" %><br />
+<strong><%= l(:field_priority) %></strong>: <%= issue.priority.name %>
diff --git a/app/views/issues/change_status.rhtml b/app/views/issues/change_status.rhtml
index 377e0da2e..61e2fad29 100644
--- a/app/views/issues/change_status.rhtml
+++ b/app/views/issues/change_status.rhtml
@@ -1,37 +1,37 @@
 <h2><%=l(:label_issue)%> #<%= @issue.id %>: <%=h @issue.subject %></h2>
-
-<%= error_messages_for 'issue' %>
-<% form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") do %>
-
-<%= hidden_field_tag 'confirm', 1 %>
+
+<%= error_messages_for 'issue' %>
+<% form_tag({:action => 'change_status', :id => @issue}, :class => "tabular") do %>
+
+<%= hidden_field_tag 'confirm', 1 %>
 <%= hidden_field_tag 'new_status_id', @new_status.id %>
 
-<div class="box">
-<p><label><%=l(:label_issue_status_new)%></label> <%= @new_status.name %></p>
-
+<div class="box">
+<p><label><%=l(:label_issue_status_new)%></label> <%= @new_status.name %></p>
+
 <p><label for="issue_assigned_to_id"><%=l(:field_assigned_to)%></label>
-<select name="issue[assigned_to_id]">
-<option value=""></option>
+<select name="issue[assigned_to_id]">
+<option value=""></option>
 <%= options_from_collection_for_select @assignable_to, "id", "display_name", @issue.assigned_to_id %></p>
-</select></p>
+</select></p>
 
 
 <p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label>
 <%= select("issue", "done_ratio", ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) ) %>
 </select></p>
 
-
+
 <p><label for="issue_fixed_version"><%=l(:field_fixed_version)%></label>
-<select name="issue[fixed_version_id]">
-<option value="">--none--</option>
-<%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %>
+<select name="issue[fixed_version_id]">
+<option value="">--none--</option>
+<%= options_from_collection_for_select @issue.project.versions, "id", "name", @issue.fixed_version_id %>
 </select></p>
 
 <p><label for="notes"><%= l(:field_notes) %></label>
 <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %></p>
 
 </div>
-
+
 <%= hidden_field 'issue', 'lock_version' %>
-<%= submit_tag l(:button_save) %>
-<% end %>
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/issues/history.rhtml b/app/views/issues/history.rhtml
index 2443cc739..830e1fc8e 100644
--- a/app/views/issues/history.rhtml
+++ b/app/views/issues/history.rhtml
@@ -1,6 +1,6 @@
-<h3><%=l(:label_history)%></h3>
-<div id="history">
-<%= render :partial => 'history', :locals => { :journals => @journals } %>
-</div>
-<br />
+<h3><%=l(:label_history)%></h3>
+<div id="history">
+<%= render :partial => 'history', :locals => { :journals => @journals } %>
+</div>
+<br />
 <p><%= link_to l(:button_back), :action => 'show', :id => @issue %></p>
 \ No newline at end of file
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 442c30abe..43e959c1b 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -1,111 +1,111 @@
-<div class="contextual">
-<%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>
-</div>
-
-<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2>
+<div class="contextual">
+<%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'icon icon-pdf' %>
+</div>
 
-<div class="box">
-<table width="100%">
-<tr>
-    <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td>
-    <td style="width:15%"><b><%=l(:field_priority)%> :</b></td><td style="width:35%"><%= @issue.priority.name %></td>
-</tr>
-<tr>
-    <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? @issue.assigned_to.name : "-" %></td>
-    <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
-</tr>
-<tr>
-    <td><b><%=l(:field_author)%> :</b></td><td><%= link_to_user @issue.author %></td>
-    <td><b><%=l(:field_start_date)%> :</b></td><td><%= format_date(@issue.start_date) %></td>
-</tr>
-<tr>
-    <td><b><%=l(:field_created_on)%> :</b></td><td><%= format_date(@issue.created_on) %></td>
-    <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
-</tr>
-<tr>
-    <td><b><%=l(:field_updated_on)%> :</b></td><td><%= format_date(@issue.updated_on) %></td>
-    <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td>
-</tr>
-<tr>
-    <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? @issue.fixed_version.name : "-" %></td>
-    <td></td><td></td>
-</tr>
-<tr>
-<% n = 0
-for custom_value in @custom_values %>
-    <td><b><%= custom_value.custom_field.name %> :</b></td><td><%=h show_value custom_value %></td>
-<% n = n + 1
-   if (n > 1) 
-        n = 0 %>
-        </tr><tr>
- <%end
-end %>
-</tr>
-</table>
-<hr />
-<br />
-
-<b><%=l(:field_description)%> :</b><br /><br />
-<%= textilizable @issue.description %>
-<br />
-
-<div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %>
-<%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-</div>
-
-<% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
-  <% form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
-  <%=l(:label_change_status)%> :
-  <select name="new_status_id">
-  <%= options_from_collection_for_select @status_options, "id", "name" %>
-  </select>
-  <%= submit_tag l(:button_change) %>
-  <% end %>
-<% end %>
-&nbsp;
-</div>
-
-<div id="history" class="box">
-<h3><%=l(:label_history)%>
-<% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3>
-<%= render :partial => 'history', :locals => { :journals => @journals } %>
-<% if @journals_count > @journals.length %>
-    <p><center><small><%= link_to l(:label_change_view_all), :action => 'history', :id => @issue %></small></center></p>
+<h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%=h @issue.subject %></h2>
+
+<div class="box">
+<table width="100%">
+<tr>
+    <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td>
+    <td style="width:15%"><b><%=l(:field_priority)%> :</b></td><td style="width:35%"><%= @issue.priority.name %></td>
+</tr>
+<tr>
+    <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? @issue.assigned_to.name : "-" %></td>
+    <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
+</tr>
+<tr>
+    <td><b><%=l(:field_author)%> :</b></td><td><%= link_to_user @issue.author %></td>
+    <td><b><%=l(:field_start_date)%> :</b></td><td><%= format_date(@issue.start_date) %></td>
+</tr>
+<tr>
+    <td><b><%=l(:field_created_on)%> :</b></td><td><%= format_date(@issue.created_on) %></td>
+    <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
+</tr>
+<tr>
+    <td><b><%=l(:field_updated_on)%> :</b></td><td><%= format_date(@issue.updated_on) %></td>
+    <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td>
+</tr>
+<tr>
+    <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? @issue.fixed_version.name : "-" %></td>
+    <td></td><td></td>
+</tr>
+<tr>
+<% n = 0
+for custom_value in @custom_values %>
+    <td><b><%= custom_value.custom_field.name %> :</b></td><td><%=h show_value custom_value %></td>
+<% n = n + 1
+   if (n > 1) 
+        n = 0 %>
+        </tr><tr>
+ <%end
+end %>
+</tr>
+</table>
+<hr />
+<br />
+
+<b><%=l(:field_description)%> :</b><br /><br />
+<%= textilizable @issue.description %>
+<br />
+
+<div class="contextual">
+<%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %>
+<%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+</div>
+
+<% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
+  <% form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
+  <%=l(:label_change_status)%> :
+  <select name="new_status_id">
+  <%= options_from_collection_for_select @status_options, "id", "name" %>
+  </select>
+  <%= submit_tag l(:button_change) %>
+  <% end %>
+<% end %>
+&nbsp;
+</div>
+
+<div id="history" class="box">
+<h3><%=l(:label_history)%>
+<% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3>
+<%= render :partial => 'history', :locals => { :journals => @journals } %>
+<% if @journals_count > @journals.length %>
+    <p><center><small><%= link_to l(:label_change_view_all), :action => 'history', :id => @issue %></small></center></p>
+<% end %>
+</div>
+
+<div class="box">
+<h3><%=l(:label_attachment_plural)%></h3>
+<table width="100%">
+<% for attachment in @issue.attachments %>
+<tr>
+<td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size(attachment.filesize) %>)</td>
+<td><%= format_date(attachment.created_on) %></td>
+<td><%= attachment.author.display_name %></td>
+<td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></div></td>
+</tr>
 <% end %>
-</div>
-
-<div class="box">
-<h3><%=l(:label_attachment_plural)%></h3>
-<table width="100%">
-<% for attachment in @issue.attachments %>
-<tr>
-<td><%= link_to attachment.filename, { :action => 'download', :id => @issue, :attachment_id => attachment }, :class => 'icon icon-attachment' %> (<%= number_to_human_size(attachment.filesize) %>)</td>
-<td><%= format_date(attachment.created_on) %></td>
-<td><%= attachment.author.display_name %></td>
-<td><div class="contextual"><%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy_attachment', :id => @issue, :attachment_id => attachment }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></div></td>
-</tr>
+</table>
+<br />
+<% if authorize_for('issues', 'add_attachment') %>
+  <% form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %>
+  <p id="attachments_p"><label><%=l(:label_attachment_new)%>
+  <%= image_to_function "add.png", "addFileField();return false" %></label>
+  <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+  <%= submit_tag l(:button_add) %>
+  <% end %> 
+<% end %>
+</div>
+
+<% if authorize_for('issues', 'add_note') %>
+  <div class="box">
+  <h3><%= l(:label_add_note) %></h3>
+  <% form_tag ({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) do %>
+  <p><label for="notes"><%=l(:field_notes)%></label>
+    <%= text_area_tag 'notes', '', :cols => 60, :rows => 10, :class => 'wiki-edit'  %></p>
+  <%= submit_tag l(:button_add) %>
+  <% end %>  
+  </div>
 <% end %>
-</table>
-<br />
-<% if authorize_for('issues', 'add_attachment') %>
-  <% form_tag ({ :controller => 'issues', :action => 'add_attachment', :id => @issue }, :multipart => true, :class => "tabular") do %>
-  <p id="attachments_p"><label><%=l(:label_attachment_new)%>
-  <%= image_to_function "add.png", "addFileField();return false" %></label>
-  <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
-  <%= submit_tag l(:button_add) %>
-  <% end %> 
-<% end %>
-</div>
-
-<% if authorize_for('issues', 'add_note') %>
-  <div class="box">
-  <h3><%= l(:label_add_note) %></h3>
-  <% form_tag ({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular" ) do %>
-  <p><label for="notes"><%=l(:field_notes)%></label>
-    <%= text_area_tag 'notes', '', :cols => 60, :rows => 10, :class => 'wiki-edit'  %></p>
-  <%= submit_tag l(:button_add) %>
-  <% end %>  
-  </div>
-<% end %>
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 7665632ef..2c7ceb9a4 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -1,149 +1,149 @@
-<!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><%= Setting.app_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" />
-<!--[if IE]>
-    <style type="text/css">
-    body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
-    </style>
-<![endif]-->
-<%= stylesheet_link_tag "application" %>
-<%= stylesheet_link_tag "print", :media => "print" %>
-<%= javascript_include_tag :defaults %>
-<%= javascript_include_tag 'menu' %>
-<%= stylesheet_link_tag 'jstoolbar' %>
-<!-- page specific tags --><%= yield :header_tags %>
-</head>
-
-<body>
-<div id="container" >
-
-    <div id="header">
-    <div style="float: left;">
-        <h1><%= Setting.app_title %></h1>
-        <h2><%= Setting.app_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><%= link_to l(:label_home), { :controller => 'welcome' }, :class => "icon icon-home" %></li>
-	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>
-	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>
-			
-    <% unless @project.nil? || @project.id.nil? %>
-        <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>
-    <% end %>
-			
-    <% if loggedin? %>
-		<li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "icon icon-user" %></li>
-    <% end %>
-			
-	<% if admin_loggedin? %>
-		<li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "icon icon-admin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
-	<% end %>
-			
-	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :onclick => "window.open(this.href); return false;", :class => "icon icon-help" %></li>
-	
-	<% if loggedin? %>
-		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "icon icon-user" %></li>	
-	<% else %>	
-		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "icon icon-user" %></li>
-	<% end %>
-		</ul>		
-	</div>
-
-    <% if admin_loggedin? %>
-    <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)">
-        <a class="menuItem" href="<%= url_for :controller => 'admin', :action => 'projects' %>" onmouseover="menuItemMouseover(event,'menuProjects');"><span class="menuItemText"><%=l(:label_project_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
-        <a class="menuItem" href="<%= url_for :controller => 'users' %>" onmouseover="menuItemMouseover(event,'menuUsers');"><span class="menuItemText"><%=l(:label_user_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
-        <%= link_to l(:label_role_and_permissions), {:controller => 'roles' }, :class => "menuItem" %>
-        <a class="menuItem" href="<%= url_for :controller => 'trackers' %>" onmouseover="menuItemMouseover(event,'menuTrackers');"><span class="menuItemText"><%=l(:label_tracker_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
-        <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields' }, :class => "menuItem" %>
-        <%= link_to l(:label_enumerations), {:controller => 'enumerations' }, :class => "menuItem" %>
-        <%= link_to l(:field_mail_notification), {:controller => 'admin', :action => 'mail_options' }, :class => "menuItem" %>
-        <%= link_to l(:label_authentication), {:controller => 'auth_sources' }, :class => "menuItem" %>
-        <%= link_to l(:label_settings), {:controller => 'settings' }, :class => "menuItem" %>
-        <%= link_to l(:label_information_plural), {:controller => 'admin', :action => 'info' }, :class => "menuItem" %>
-    </div>
-    <div id="menuTrackers" class="menu">
-        <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses' }, :class => "menuItem" %>
-        <%= link_to l(:label_workflow), {:controller => 'roles', :action => 'workflow' }, :class => "menuItem" %>
-    </div>
-    <div id="menuProjects" class="menu"><%= link_to l(:label_new), {:controller => 'projects', :action => 'add' }, :class => "menuItem" %></div>
-    <div id="menuUsers" class="menu"><%= link_to l(:label_new), {:controller => 'users', :action => 'add' }, :class => "menuItem" %></a></div>
-    <% end %>
-    
-    <% 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_gantt), {:controller => 'projects', :action => 'gantt', :id => @project }, :class => "menuItem" %>
-        <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 }, :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_roadmap), {:controller => 'projects', :action => 'roadmap', :id => @project }, :class => "menuItem" %>
-        <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>
-        <%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %>
-        <%= 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 l(:label_search), {:controller => 'projects', :action => 'search', :id => @project }, :class => "menuItem" %>
-        <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %>
-        <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %>
-    </div>
-    <% end %>
-
-	
-	<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_gantt), :controller => 'projects', :action => 'gantt', :id => @project %></li>
-				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></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_roadmap), :controller => 'projects', :action => 'roadmap', :id => @project %></li>
-				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
-				<li><%= link_to l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil if @project.wiki and !@project.wiki.new_record? %></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 l(:label_search), :controller => 'projects', :action => 'search', :id => @project %></li>
-				<li><%= link_to l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project if @project.repository and !@project.repository.new_record? %></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><a href="http://redmine.rubyforge.org/">redMine</a> <small><%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang</small></p>
-	</div>
-
-</div>
-</body>
+<!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><%= Setting.app_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" />
+<!--[if IE]>
+    <style type="text/css">
+    body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
+    </style>
+<![endif]-->
+<%= stylesheet_link_tag "application" %>
+<%= stylesheet_link_tag "print", :media => "print" %>
+<%= javascript_include_tag :defaults %>
+<%= javascript_include_tag 'menu' %>
+<%= stylesheet_link_tag 'jstoolbar' %>
+<!-- page specific tags --><%= yield :header_tags %>
+</head>
+
+<body>
+<div id="container" >
+
+    <div id="header">
+    <div style="float: left;">
+        <h1><%= Setting.app_title %></h1>
+        <h2><%= Setting.app_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><%= link_to l(:label_home), { :controller => 'welcome' }, :class => "icon icon-home" %></li>
+	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>
+	<li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>
+			
+    <% unless @project.nil? || @project.id.nil? %>
+        <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>
+    <% end %>
+			
+    <% if loggedin? %>
+		<li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "icon icon-user" %></li>
+    <% end %>
+			
+	<% if admin_loggedin? %>
+		<li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "icon icon-admin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
+	<% end %>
+			
+	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :onclick => "window.open(this.href); return false;", :class => "icon icon-help" %></li>
+	
+	<% if loggedin? %>
+		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "icon icon-user" %></li>	
+	<% else %>	
+		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "icon icon-user" %></li>
+	<% end %>
+		</ul>		
+	</div>
+
+    <% if admin_loggedin? %>
+    <div id="menuAdmin" class="menu" onmouseover="menuMouseover(event)">
+        <a class="menuItem" href="<%= url_for :controller => 'admin', :action => 'projects' %>" onmouseover="menuItemMouseover(event,'menuProjects');"><span class="menuItemText"><%=l(:label_project_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
+        <a class="menuItem" href="<%= url_for :controller => 'users' %>" onmouseover="menuItemMouseover(event,'menuUsers');"><span class="menuItemText"><%=l(:label_user_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
+        <%= link_to l(:label_role_and_permissions), {:controller => 'roles' }, :class => "menuItem" %>
+        <a class="menuItem" href="<%= url_for :controller => 'trackers' %>" onmouseover="menuItemMouseover(event,'menuTrackers');"><span class="menuItemText"><%=l(:label_tracker_plural)%></span><span class="menuItemArrow">&#9654;</span></a>
+        <%= link_to l(:label_custom_field_plural), {:controller => 'custom_fields' }, :class => "menuItem" %>
+        <%= link_to l(:label_enumerations), {:controller => 'enumerations' }, :class => "menuItem" %>
+        <%= link_to l(:field_mail_notification), {:controller => 'admin', :action => 'mail_options' }, :class => "menuItem" %>
+        <%= link_to l(:label_authentication), {:controller => 'auth_sources' }, :class => "menuItem" %>
+        <%= link_to l(:label_settings), {:controller => 'settings' }, :class => "menuItem" %>
+        <%= link_to l(:label_information_plural), {:controller => 'admin', :action => 'info' }, :class => "menuItem" %>
+    </div>
+    <div id="menuTrackers" class="menu">
+        <%= link_to l(:label_issue_status_plural), {:controller => 'issue_statuses' }, :class => "menuItem" %>
+        <%= link_to l(:label_workflow), {:controller => 'roles', :action => 'workflow' }, :class => "menuItem" %>
+    </div>
+    <div id="menuProjects" class="menu"><%= link_to l(:label_new), {:controller => 'projects', :action => 'add' }, :class => "menuItem" %></div>
+    <div id="menuUsers" class="menu"><%= link_to l(:label_new), {:controller => 'users', :action => 'add' }, :class => "menuItem" %></a></div>
+    <% end %>
+    
+    <% 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_gantt), {:controller => 'projects', :action => 'gantt', :id => @project }, :class => "menuItem" %>
+        <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 }, :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_roadmap), {:controller => 'projects', :action => 'roadmap', :id => @project }, :class => "menuItem" %>
+        <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>
+        <%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %>
+        <%= 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 l(:label_search), {:controller => 'projects', :action => 'search', :id => @project }, :class => "menuItem" %>
+        <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %>
+        <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %>
+    </div>
+    <% end %>
+
+	
+	<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_gantt), :controller => 'projects', :action => 'gantt', :id => @project %></li>
+				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></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_roadmap), :controller => 'projects', :action => 'roadmap', :id => @project %></li>
+				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
+				<li><%= link_to l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil if @project.wiki and !@project.wiki.new_record? %></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 l(:label_search), :controller => 'projects', :action => 'search', :id => @project %></li>
+				<li><%= link_to l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project if @project.repository and !@project.repository.new_record? %></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><a href="http://redmine.rubyforge.org/">redMine</a> <small><%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang</small></p>
+	</div>
+
+</div>
+</body>
 </html>
 \ No newline at end of file
diff --git a/app/views/mailer/_issue.rhtml b/app/views/mailer/_issue.rhtml
index 4c5255d3e..877947d38 100644
--- a/app/views/mailer/_issue.rhtml
+++ b/app/views/mailer/_issue.rhtml
@@ -1,7 +1,7 @@
-<%=l(:label_issue)%> #<%= issue.id %> - <%= issue.subject %>
-<%=l(:field_author)%>: <%= issue.author.display_name %>
-<%=l(:field_status)%>: <%= issue.status.name %>
+<%=l(:label_issue)%> #<%= issue.id %> - <%= issue.subject %>
+<%=l(:field_author)%>: <%= issue.author.display_name %>
+<%=l(:field_status)%>: <%= issue.status.name %>
+
+<%= issue.description %>
 
-<%= issue.description %>
-
 http://<%= Setting.host_name %>/issues/show/<%= issue.id %>
 \ No newline at end of file
diff --git a/app/views/mailer/attachments_add_de.rhtml b/app/views/mailer/attachments_add_de.rhtml
index f17af9d8e..81e2974c1 100644
--- a/app/views/mailer/attachments_add_de.rhtml
+++ b/app/views/mailer/attachments_add_de.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> files(s) added.
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @added_to %>
+<%= @attachments.size %> files(s) added.
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
 <%= @url %>
 \ No newline at end of file
diff --git a/app/views/mailer/attachments_add_en.rhtml b/app/views/mailer/attachments_add_en.rhtml
index f17af9d8e..81e2974c1 100644
--- a/app/views/mailer/attachments_add_en.rhtml
+++ b/app/views/mailer/attachments_add_en.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> files(s) added.
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @added_to %>
+<%= @attachments.size %> files(s) added.
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
 <%= @url %>
 \ No newline at end of file
diff --git a/app/views/mailer/attachments_add_es.rhtml b/app/views/mailer/attachments_add_es.rhtml
index f17af9d8e..81e2974c1 100644
--- a/app/views/mailer/attachments_add_es.rhtml
+++ b/app/views/mailer/attachments_add_es.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> files(s) added.
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @added_to %>
+<%= @attachments.size %> files(s) added.
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
 <%= @url %>
 \ No newline at end of file
diff --git a/app/views/mailer/attachments_add_fr.rhtml b/app/views/mailer/attachments_add_fr.rhtml
index 381b48961..8a0430d86 100644
--- a/app/views/mailer/attachments_add_fr.rhtml
+++ b/app/views/mailer/attachments_add_fr.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> fichier(s) ajouté(s).
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @added_to %>
+<%= @attachments.size %> fichier(s) ajouté(s).
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
 <%= @url %>
 \ No newline at end of file
diff --git a/app/views/mailer/attachments_add_ja.rhtml b/app/views/mailer/attachments_add_ja.rhtml
index e0e95bd0a..41131e573 100644
--- a/app/views/mailer/attachments_add_ja.rhtml
+++ b/app/views/mailer/attachments_add_ja.rhtml
@@ -1,6 +1,6 @@
-<%= @added_to %>
-<%= @attachments.size %> ファイルが追加されました。
-<% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
+<%= @added_to %>
+<%= @attachments.size %> ファイルが追加されました。
+<% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
 <%= @url %>
 \ No newline at end of file
diff --git a/app/views/mailer/document_add_de.rhtml b/app/views/mailer/document_add_de.rhtml
index a022829a7..67648de15 100644
--- a/app/views/mailer/document_add_de.rhtml
+++ b/app/views/mailer/document_add_de.rhtml
@@ -1,4 +1,4 @@
-A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
-<%= l(:field_title) %>: <%= @document.title %>
-
+A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
+<%= l(:field_title) %>: <%= @document.title %>
+
 http://<%= Setting.host_name %>/documents/show/<%= @document.id %>
 \ No newline at end of file
diff --git a/app/views/mailer/document_add_en.rhtml b/app/views/mailer/document_add_en.rhtml
index a022829a7..67648de15 100644
--- a/app/views/mailer/document_add_en.rhtml
+++ b/app/views/mailer/document_add_en.rhtml
@@ -1,4 +1,4 @@
-A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
-<%= l(:field_title) %>: <%= @document.title %>
-
+A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
+<%= l(:field_title) %>: <%= @document.title %>
+
 http://<%= Setting.host_name %>/documents/show/<%= @document.id %>
 \ No newline at end of file
diff --git a/app/views/mailer/document_add_es.rhtml b/app/views/mailer/document_add_es.rhtml
index a022829a7..67648de15 100644
--- a/app/views/mailer/document_add_es.rhtml
+++ b/app/views/mailer/document_add_es.rhtml
@@ -1,4 +1,4 @@
-A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
-<%= l(:field_title) %>: <%= @document.title %>
-
+A document has been added to <%= @document.project.name %> (<%= @document.category.name %>):
+<%= l(:field_title) %>: <%= @document.title %>
+
 http://<%= Setting.host_name %>/documents/show/<%= @document.id %>
 \ No newline at end of file
diff --git a/app/views/mailer/document_add_fr.rhtml b/app/views/mailer/document_add_fr.rhtml
index c116c84cb..b6f877579 100644
--- a/app/views/mailer/document_add_fr.rhtml
+++ b/app/views/mailer/document_add_fr.rhtml
@@ -1,4 +1,4 @@
-Un document a été ajouté à <%= @document.project.name %> (<%= @document.category.name %>):
-<%= l(:field_title) %>: <%= @document.title %>
-
+Un document a été ajouté à <%= @document.project.name %> (<%= @document.category.name %>):
+<%= l(:field_title) %>: <%= @document.title %>
+
 http://<%= Setting.host_name %>/documents/show/<%= @document.id %>
 \ No newline at end of file
diff --git a/app/views/mailer/document_add_ja.rhtml b/app/views/mailer/document_add_ja.rhtml
index c64740fb4..3834947b8 100644
--- a/app/views/mailer/document_add_ja.rhtml
+++ b/app/views/mailer/document_add_ja.rhtml
@@ -1,4 +1,4 @@
-文書が <%= @document.project.name %> (<%= @document.category.name %>) に追加されました:
-<%= l(:field_title) %>: <%= @document.title %>
-
+文書が <%= @document.project.name %> (<%= @document.category.name %>) に追加されました:
+<%= l(:field_title) %>: <%= @document.title %>
+
 http://<%= Setting.host_name %>/documents/show/<%= @document.id %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_add_de.rhtml b/app/views/mailer/issue_add_de.rhtml
index 9efec9ad9..823de2cef 100644
--- a/app/views/mailer/issue_add_de.rhtml
+++ b/app/views/mailer/issue_add_de.rhtml
@@ -1,3 +1,3 @@
-Issue #<%= @issue.id %> has been reported.
-----------------------------------------
+Issue #<%= @issue.id %> has been reported.
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_add_en.rhtml b/app/views/mailer/issue_add_en.rhtml
index 9efec9ad9..823de2cef 100644
--- a/app/views/mailer/issue_add_en.rhtml
+++ b/app/views/mailer/issue_add_en.rhtml
@@ -1,3 +1,3 @@
-Issue #<%= @issue.id %> has been reported.
-----------------------------------------
+Issue #<%= @issue.id %> has been reported.
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_add_es.rhtml b/app/views/mailer/issue_add_es.rhtml
index 9efec9ad9..823de2cef 100644
--- a/app/views/mailer/issue_add_es.rhtml
+++ b/app/views/mailer/issue_add_es.rhtml
@@ -1,3 +1,3 @@
-Issue #<%= @issue.id %> has been reported.
-----------------------------------------
+Issue #<%= @issue.id %> has been reported.
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_add_fr.rhtml b/app/views/mailer/issue_add_fr.rhtml
index 628ecae12..458188782 100644
--- a/app/views/mailer/issue_add_fr.rhtml
+++ b/app/views/mailer/issue_add_fr.rhtml
@@ -1,3 +1,3 @@
-Une nouvelle demande (#<%= @issue.id %>) a été soumise.
-----------------------------------------
+Une nouvelle demande (#<%= @issue.id %>) a été soumise.
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_add_ja.rhtml b/app/views/mailer/issue_add_ja.rhtml
index 113546ae1..14d9258ab 100644
--- a/app/views/mailer/issue_add_ja.rhtml
+++ b/app/views/mailer/issue_add_ja.rhtml
@@ -1,3 +1,3 @@
-問題 #<%= @issue.id %> が報告されました。
-----------------------------------------
+問題 #<%= @issue.id %> が報告されました。
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_edit_de.rhtml b/app/views/mailer/issue_edit_de.rhtml
index d22d6c534..7a9ca1634 100644
--- a/app/views/mailer/issue_edit_de.rhtml
+++ b/app/views/mailer/issue_edit_de.rhtml
@@ -1,8 +1,8 @@
-Issue #<%= @issue.id %> has been updated.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+Issue #<%= @issue.id %> has been updated.
+<%= @journal.user.name %>
+<% for detail in @journal.details %>
+<%= show_detail(detail, true) %>
+<% end %>
+<%= @journal.notes if @journal.notes? %>
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_edit_en.rhtml b/app/views/mailer/issue_edit_en.rhtml
index d22d6c534..7a9ca1634 100644
--- a/app/views/mailer/issue_edit_en.rhtml
+++ b/app/views/mailer/issue_edit_en.rhtml
@@ -1,8 +1,8 @@
-Issue #<%= @issue.id %> has been updated.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+Issue #<%= @issue.id %> has been updated.
+<%= @journal.user.name %>
+<% for detail in @journal.details %>
+<%= show_detail(detail, true) %>
+<% end %>
+<%= @journal.notes if @journal.notes? %>
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_edit_es.rhtml b/app/views/mailer/issue_edit_es.rhtml
index d22d6c534..7a9ca1634 100644
--- a/app/views/mailer/issue_edit_es.rhtml
+++ b/app/views/mailer/issue_edit_es.rhtml
@@ -1,8 +1,8 @@
-Issue #<%= @issue.id %> has been updated.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+Issue #<%= @issue.id %> has been updated.
+<%= @journal.user.name %>
+<% for detail in @journal.details %>
+<%= show_detail(detail, true) %>
+<% end %>
+<%= @journal.notes if @journal.notes? %>
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_edit_fr.rhtml b/app/views/mailer/issue_edit_fr.rhtml
index d86f29c25..ecea9e274 100644
--- a/app/views/mailer/issue_edit_fr.rhtml
+++ b/app/views/mailer/issue_edit_fr.rhtml
@@ -1,8 +1,8 @@
-La demande #<%= @issue.id %> a été mise à jour.
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+La demande #<%= @issue.id %> a été mise à jour.
+<%= @journal.user.name %>
+<% for detail in @journal.details %>
+<%= show_detail(detail, true) %>
+<% end %>
+<%= @journal.notes if @journal.notes? %>
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/issue_edit_ja.rhtml b/app/views/mailer/issue_edit_ja.rhtml
index b0a93db87..d3b1b520b 100644
--- a/app/views/mailer/issue_edit_ja.rhtml
+++ b/app/views/mailer/issue_edit_ja.rhtml
@@ -1,8 +1,8 @@
-問題 #<%= @issue.id %> が更新されました。
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
-<%= show_detail(detail, true) %>
-<% end %>
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
+問題 #<%= @issue.id %> が更新されました。
+<%= @journal.user.name %>
+<% for detail in @journal.details %>
+<%= show_detail(detail, true) %>
+<% end %>
+<%= @journal.notes if @journal.notes? %>
+----------------------------------------
 <%= render :file => "_issue", :use_full_path => true, :locals => { :issue => @issue } %>
 \ No newline at end of file
diff --git a/app/views/mailer/lost_password_de.rhtml b/app/views/mailer/lost_password_de.rhtml
index 0b391498b..332ddeb0b 100644
--- a/app/views/mailer/lost_password_de.rhtml
+++ b/app/views/mailer/lost_password_de.rhtml
@@ -1,3 +1,3 @@
-To change your password, use the following link:
-
+To change your password, use the following link:
+
 http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/mailer/lost_password_en.rhtml b/app/views/mailer/lost_password_en.rhtml
index 0b391498b..332ddeb0b 100644
--- a/app/views/mailer/lost_password_en.rhtml
+++ b/app/views/mailer/lost_password_en.rhtml
@@ -1,3 +1,3 @@
-To change your password, use the following link:
-
+To change your password, use the following link:
+
 http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/mailer/lost_password_es.rhtml b/app/views/mailer/lost_password_es.rhtml
index 0b391498b..332ddeb0b 100644
--- a/app/views/mailer/lost_password_es.rhtml
+++ b/app/views/mailer/lost_password_es.rhtml
@@ -1,3 +1,3 @@
-To change your password, use the following link:
-
+To change your password, use the following link:
+
 http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/mailer/lost_password_fr.rhtml b/app/views/mailer/lost_password_fr.rhtml
index 18b6bf6ae..8282611e8 100644
--- a/app/views/mailer/lost_password_fr.rhtml
+++ b/app/views/mailer/lost_password_fr.rhtml
@@ -1,3 +1,3 @@
-Pour changer votre mot de passe, utilisez le lien suivant:
-
+Pour changer votre mot de passe, utilisez le lien suivant:
+
 http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/mailer/lost_password_ja.rhtml b/app/views/mailer/lost_password_ja.rhtml
index 99266be26..1f203e8d9 100644
--- a/app/views/mailer/lost_password_ja.rhtml
+++ b/app/views/mailer/lost_password_ja.rhtml
@@ -1,3 +1,3 @@
-パスワードを変更するには、以下のリンクをたどってください:
-
+パスワードを変更するには、以下のリンクをたどってください:
+
 http://<%= Setting.host_name %>/account/lost_password?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/mailer/register_de.rhtml b/app/views/mailer/register_de.rhtml
index 95cc7c4a6..64477febc 100644
--- a/app/views/mailer/register_de.rhtml
+++ b/app/views/mailer/register_de.rhtml
@@ -1,3 +1,3 @@
-To activate your redMine account, use the following link:
-
+To activate your redMine account, use the following link:
+
 http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/mailer/register_en.rhtml b/app/views/mailer/register_en.rhtml
index 95cc7c4a6..64477febc 100644
--- a/app/views/mailer/register_en.rhtml
+++ b/app/views/mailer/register_en.rhtml
@@ -1,3 +1,3 @@
-To activate your redMine account, use the following link:
-
+To activate your redMine account, use the following link:
+
 http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/mailer/register_es.rhtml b/app/views/mailer/register_es.rhtml
index 95cc7c4a6..64477febc 100644
--- a/app/views/mailer/register_es.rhtml
+++ b/app/views/mailer/register_es.rhtml
@@ -1,3 +1,3 @@
-To activate your redMine account, use the following link:
-
+To activate your redMine account, use the following link:
+
 http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/mailer/register_fr.rhtml b/app/views/mailer/register_fr.rhtml
index 402b2a5d4..2258480c0 100644
--- a/app/views/mailer/register_fr.rhtml
+++ b/app/views/mailer/register_fr.rhtml
@@ -1,3 +1,3 @@
-Pour activer votre compte sur redMine, utilisez le lien suivant:
-
+Pour activer votre compte sur redMine, utilisez le lien suivant:
+
 http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/mailer/register_ja.rhtml b/app/views/mailer/register_ja.rhtml
index b990b934e..2f5846fba 100644
--- a/app/views/mailer/register_ja.rhtml
+++ b/app/views/mailer/register_ja.rhtml
@@ -1,3 +1,3 @@
-redMine アカウントをアクティブにするには、以下のリンクをたどってください:
-
+redMine アカウントをアクティブにするには、以下のリンクをたどってください:
+
 http://<%= Setting.host_name %>/account/register?token=<%= @token.value %>
 \ No newline at end of file
diff --git a/app/views/my/_block.rhtml b/app/views/my/_block.rhtml
index 3f72bdaf1..39e6c3bd7 100644
--- a/app/views/my/_block.rhtml
+++ b/app/views/my/_block.rhtml
@@ -1,16 +1,16 @@
-<div id="block_<%= block_name %>" class="mypage-box">
-
-    <div style="float:right;margin-right:16px;z-index:500;">
-    <%= link_to_remote "", {
-        :url => { :action => "remove_block", :block => block_name },
-        :complete => "removeBlock('block_#{block_name}')",
-        :loading => "Element.show('indicator')",
-        :loaded => "Element.hide('indicator')" },
-        :class => "close-icon"
-         %>        
-    </div>
-     
-    <div class="handle">
-	<%= render :partial => "my/blocks/#{block_name}", :locals => { :user => user } %>
-	</div>
+<div id="block_<%= block_name %>" class="mypage-box">
+
+    <div style="float:right;margin-right:16px;z-index:500;">
+    <%= link_to_remote "", {
+        :url => { :action => "remove_block", :block => block_name },
+        :complete => "removeBlock('block_#{block_name}')",
+        :loading => "Element.show('indicator')",
+        :loaded => "Element.hide('indicator')" },
+        :class => "close-icon"
+         %>        
+    </div>
+     
+    <div class="handle">
+	<%= render :partial => "my/blocks/#{block_name}", :locals => { :user => user } %>
+	</div>
 </div>
 \ No newline at end of file
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index 09a43b468..8a1468cd5 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -1,11 +1,11 @@
 <h2><%=l(:label_my_account)%></h2>
-
-<p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
-<%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p>
+
+<p><%=l(:field_login)%>: <strong><%= @user.login %></strong><br />
+<%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p>
 
 <%= error_messages_for 'user' %>
-
-<div class="box">
+
+<div class="box">
 <h3><%=l(:label_information_plural)%></h3>
   
 <% labelled_tabular_form_for :user, @user, :url => { :action => "account" } do |f| %>
@@ -21,26 +21,26 @@
 <% end %>
 
 <center><%= submit_tag l(:button_save) %></center>
-<% end %>
-</div>
-
+<% end %>
+</div>
+
 
-<% unless @user.auth_source_id %>
-  <div class="box">
-  <h3><%=l(:field_password)%></h3>
+<% unless @user.auth_source_id %>
+  <div class="box">
+  <h3><%=l(:field_password)%></h3>
 
   <% form_tag({:action => 'change_password'}, :class => "tabular") do %>
-
+
   <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>
-
+  <%= 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>
+  <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
 
   <center><%= submit_tag l(:button_save) %></center>
-  <% end %>
+  <% end %>
   </div>
-<% end %>
+<% end %>
diff --git a/app/views/my/blocks/_calendar.rhtml b/app/views/my/blocks/_calendar.rhtml
index dfff5b78a..4c583e496 100644
--- a/app/views/my/blocks/_calendar.rhtml
+++ b/app/views/my/blocks/_calendar.rhtml
@@ -1,47 +1,47 @@
-<h3><%= l(:label_calendar) %></h3>
-
-<%
-@date_from = Date.today - (Date.today.cwday-1)
-@date_to = Date.today + (7-Date.today.cwday)
-@issues = Issue.find :all,
-                     :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],
-                     :include => [:project, :tracker]  unless @user.projects.empty?
-@issues ||= []
-%>
-
-<table class="list with-cells">
-<thead><tr>
-<th></th>
-<% 1.upto(7) do |d| %>
-    <th align="center" width="14%"><%= day_name(d) %></th>
-<% end %>
-</tr></thead>
-<tbdoy>
-<tr height="100">
-<% day = @date_from
-while day <= @date_to
-	if day.cwday == 1 %>
-	<th valign="middle"><%= day.cweek %></th>
-	<% end %>	
-	<td valign="top" width="14%" class="<%= day.month==@month ? "even" : "odd" %>">
-	<p align="right"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>	
-	<% day_issues = []
-	@issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day } 
-	day_issues.each do |i| %>	
-		<%= if day == i.start_date and day == i.due_date
-		    image_tag('arrow_bw.png')
-		elsif day == i.start_date
-		    image_tag('arrow_from.png') 
-		elsif day == i.due_date
-		    image_tag('arrow_to.png') 
-		end %>
-		<small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
-	<% end %>
-    </td>
-	<%= '</tr><tr height="100">' if day.cwday >= 7 and day!=@date_to %>
-	<%
-	day = day + 1
-end %>
-</tr>
-</tbody>
+<h3><%= l(:label_calendar) %></h3>
+
+<%
+@date_from = Date.today - (Date.today.cwday-1)
+@date_to = Date.today + (7-Date.today.cwday)
+@issues = Issue.find :all,
+                     :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],
+                     :include => [:project, :tracker]  unless @user.projects.empty?
+@issues ||= []
+%>
+
+<table class="list with-cells">
+<thead><tr>
+<th></th>
+<% 1.upto(7) do |d| %>
+    <th align="center" width="14%"><%= day_name(d) %></th>
+<% end %>
+</tr></thead>
+<tbdoy>
+<tr height="100">
+<% day = @date_from
+while day <= @date_to
+	if day.cwday == 1 %>
+	<th valign="middle"><%= day.cweek %></th>
+	<% end %>	
+	<td valign="top" width="14%" class="<%= day.month==@month ? "even" : "odd" %>">
+	<p align="right"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>	
+	<% day_issues = []
+	@issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day } 
+	day_issues.each do |i| %>	
+		<%= if day == i.start_date and day == i.due_date
+		    image_tag('arrow_bw.png')
+		elsif day == i.start_date
+		    image_tag('arrow_from.png') 
+		elsif day == i.due_date
+		    image_tag('arrow_to.png') 
+		end %>
+		<small><%= link_to "#{i.tracker.name} ##{i.id}", :controller => 'issues', :action => 'show', :id => i %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small><br />
+	<% end %>
+    </td>
+	<%= '</tr><tr height="100">' if day.cwday >= 7 and day!=@date_to %>
+	<%
+	day = day + 1
+end %>
+</tr>
+</tbody>
 </table>
 \ No newline at end of file
diff --git a/app/views/my/blocks/_documents.rhtml b/app/views/my/blocks/_documents.rhtml
index eb8c16a58..a1bb0b36c 100644
--- a/app/views/my/blocks/_documents.rhtml
+++ b/app/views/my/blocks/_documents.rhtml
@@ -1,8 +1,8 @@
-<h3><%=l(:label_document_plural)%></h3>
-
-<%= render(:partial => 'documents/document',
-           :collection => Document.find(:all,
-                         :limit => 10,
-                         :order => 'documents.created_on DESC',
-                         :conditions => "documents.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
+<h3><%=l(:label_document_plural)%></h3>
+
+<%= render(:partial => 'documents/document',
+           :collection => Document.find(:all,
+                         :limit => 10,
+                         :order => 'documents.created_on DESC',
+                         :conditions => "documents.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
                          :include => [:project])) unless @user.projects.empty? %>
 \ No newline at end of file
diff --git a/app/views/my/blocks/_issuesassignedtome.rhtml b/app/views/my/blocks/_issuesassignedtome.rhtml
index 2a4e2a05d..e52e0fad1 100644
--- a/app/views/my/blocks/_issuesassignedtome.rhtml
+++ b/app/views/my/blocks/_issuesassignedtome.rhtml
@@ -1,10 +1,10 @@
-<h3><%=l(:label_assigned_to_me_issues)%></h3>
-<% assigned_issues = Issue.find(:all, 
-                                :conditions => ["assigned_to_id=?", user.id],
-                                :limit => 10, 
-                                :include => [ :status, :project, :tracker ], 
-                                :order => 'issues.updated_on DESC') %>
-<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
-<% if assigned_issues.length > 0 %>
-<p><%=lwr(:label_last_updates, assigned_issues.length)%></p>
-<% end %>
+<h3><%=l(:label_assigned_to_me_issues)%></h3>
+<% assigned_issues = Issue.find(:all, 
+                                :conditions => ["assigned_to_id=?", user.id],
+                                :limit => 10, 
+                                :include => [ :status, :project, :tracker ], 
+                                :order => 'issues.updated_on DESC') %>
+<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
+<% if assigned_issues.length > 0 %>
+<p><%=lwr(:label_last_updates, assigned_issues.length)%></p>
+<% end %>
diff --git a/app/views/my/blocks/_issuesreportedbyme.rhtml b/app/views/my/blocks/_issuesreportedbyme.rhtml
index 9b40b3606..4e173d3c5 100644
--- a/app/views/my/blocks/_issuesreportedbyme.rhtml
+++ b/app/views/my/blocks/_issuesreportedbyme.rhtml
@@ -1,10 +1,10 @@
-<h3><%=l(:label_reported_issues)%></h3>
-<% reported_issues = Issue.find(:all, 
-                                :conditions => ["author_id=?", user.id],
-                                :limit => 10, 
-                                :include => [ :status, :project, :tracker ], 
-                                :order => 'issues.updated_on DESC') %>
-<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
-<% if reported_issues.length > 0 %>
-<p><%=lwr(:label_last_updates, reported_issues.length)%></p>
+<h3><%=l(:label_reported_issues)%></h3>
+<% reported_issues = Issue.find(:all, 
+                                :conditions => ["author_id=?", user.id],
+                                :limit => 10, 
+                                :include => [ :status, :project, :tracker ], 
+                                :order => 'issues.updated_on DESC') %>
+<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
+<% if reported_issues.length > 0 %>
+<p><%=lwr(:label_last_updates, reported_issues.length)%></p>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/my/blocks/_news.rhtml b/app/views/my/blocks/_news.rhtml
index 4bad9a542..30085cf45 100644
--- a/app/views/my/blocks/_news.rhtml
+++ b/app/views/my/blocks/_news.rhtml
@@ -1,8 +1,8 @@
-<h3><%=l(:label_news_latest)%></h3>
-
-<%= render (:partial => 'news/news', 
-            :collection => News.find(:all,
-                                     :limit => 10,
-                                     :order => 'news.created_on DESC',
-                                     :conditions => "news.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
+<h3><%=l(:label_news_latest)%></h3>
+
+<%= render (:partial => 'news/news', 
+            :collection => News.find(:all,
+                                     :limit => 10,
+                                     :order => 'news.created_on DESC',
+                                     :conditions => "news.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
                                      :include => [:project, :author])) unless @user.projects.empty? %>
 \ No newline at end of file
diff --git a/app/views/my/page.rhtml b/app/views/my/page.rhtml
index 0c7920d69..5c6c906db 100644
--- a/app/views/my/page.rhtml
+++ b/app/views/my/page.rhtml
@@ -1,33 +1,33 @@
-<div class="contextual">
-    <%= link_to l(:label_personalize_page), :action => 'page_layout' %>
-</div>
-
-<h2><%=l(:label_my_page)%></h2>
-
-<div id="list-top">
-	<% @blocks['top'].each do |b| 
-	   next unless MyController::BLOCKS.keys.include? b	%>
-	<div class="mypage-box">        
-		<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
-	</div>
-	<% end if @blocks['top'] %>
-</div>
-
-<div id="list-left" class="splitcontentleft">
-	<% @blocks['left'].each do |b| 
-	   next unless MyController::BLOCKS.keys.include? b %>
-	<div class="mypage-box">        
-		<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
-	</div>
-	<% end if @blocks['left'] %>
-</div>
-
-<div id="list-right" class="splitcontentright">
-	<% @blocks['right'].each do |b| 
-	   next unless MyController::BLOCKS.keys.include? b %>
-	<div class="mypage-box">        
-		<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
-	</div>
-	<% end if @blocks['right'] %>
-</div>
-
+<div class="contextual">
+    <%= link_to l(:label_personalize_page), :action => 'page_layout' %>
+</div>
+
+<h2><%=l(:label_my_page)%></h2>
+
+<div id="list-top">
+	<% @blocks['top'].each do |b| 
+	   next unless MyController::BLOCKS.keys.include? b	%>
+	<div class="mypage-box">        
+		<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
+	</div>
+	<% end if @blocks['top'] %>
+</div>
+
+<div id="list-left" class="splitcontentleft">
+	<% @blocks['left'].each do |b| 
+	   next unless MyController::BLOCKS.keys.include? b %>
+	<div class="mypage-box">        
+		<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
+	</div>
+	<% end if @blocks['left'] %>
+</div>
+
+<div id="list-right" class="splitcontentright">
+	<% @blocks['right'].each do |b| 
+	   next unless MyController::BLOCKS.keys.include? b %>
+	<div class="mypage-box">        
+		<%= render :partial => "my/blocks/#{b}", :locals => { :user => @user } %>
+	</div>
+	<% end if @blocks['right'] %>
+</div>
+
diff --git a/app/views/my/page_layout.rhtml b/app/views/my/page_layout.rhtml
index 2fe944748..8cb09a554 100644
--- a/app/views/my/page_layout.rhtml
+++ b/app/views/my/page_layout.rhtml
@@ -1,117 +1,117 @@
-<script language="JavaScript">
-//<![CDATA[
-function recreateSortables() {
-    Sortable.destroy('list-top');
-    Sortable.destroy('list-left');
-    Sortable.destroy('list-right');
-    
-	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'})
-	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'})
-	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'})
-}
-
-function updateSelect() {
-    s = $('block-select')
-    for (var i = 0; i < s.options.length; i++) {
-        if ($('block_' + s.options[i].value)) {
-            s.options[i].disabled = true;
-        } else {
-            s.options[i].disabled = false;
-        }
-    }
-    s.options[0].selected = true;
-}
-
-function afterAddBlock() {
-    recreateSortables();
-    updateSelect();
-}
-
-function removeBlock(block) {
-    $(block).parentNode.removeChild($(block));
-    updateSelect();
-}
-//]]>
-</script>
-
-<div class="contextual">
-<span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
-<% form_tag({:action => "add_block"}, :id => "block-form") do %>
-<%= select_tag 'block', "<option></option>" + options_for_select(@block_options), :id => "block-select" %>
-<%= link_to_remote l(:button_add),
-           {:url => { :action => "add_block" },
-            :with => "Form.serialize('block-form')",
-            :update => "list-top",
-            :position => :top,
-            :complete => "afterAddBlock();",
-            :loading => "Element.show('indicator')",
-            :loaded => "Element.hide('indicator')"
-           }, :class => 'icon icon-add'
-             %>
-<% end %>
-<%= link_to l(:button_save), {:action => 'page_layout_save'}, :class => 'icon icon-save' %>
-<%= link_to l(:button_cancel), {:action => 'page'}, :class => 'icon icon-cancel' %>
-</div>
-
-<h2><%=l(:label_my_page)%></h2>
-
-<div id="list-top" class="block-receiver">
-	<% @blocks['top'].each do |b| 
-	   next unless MyController::BLOCKS.keys.include? b %>
-	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
-	<% end if @blocks['top'] %>
-</div>
-
-<div id="list-left" class="splitcontentleft block-receiver">
-	<% @blocks['left'].each do |b| 
-	   next unless MyController::BLOCKS.keys.include? b %>
-	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
-	<% end if @blocks['left'] %>
-</div>
-
-<div id="list-right" class="splitcontentright block-receiver">
-	<% @blocks['right'].each do |b| 
-	   next unless MyController::BLOCKS.keys.include? b %>
-	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
-	<% end if @blocks['right'] %>
-</div>
-
-<%= sortable_element 'list-top',
-      :tag => 'div',
-      :only => 'mypage-box',
-      :handle => "handle",
-      :dropOnEmpty => true,
-      :containment => ['list-top', 'list-left', 'list-right'],
-      :constraint => false,
-      :complete => visual_effect(:highlight, 'list-top'), 
-      :url => { :action => "order_blocks", :group => "top" },
-      :loading => "Element.show('indicator')",
-      :loaded => "Element.hide('indicator')"
-       %>
-      
-      
-<%= sortable_element 'list-left', 
-      :tag => 'div',
-      :only => 'mypage-box',
-      :handle => "handle",
-      :dropOnEmpty => true,
-      :containment => ['list-top', 'list-left', 'list-right'],
-      :constraint => false,
-      :complete => visual_effect(:highlight, 'list-left'), 
-      :url => { :action => "order_blocks", :group => "left" },
-      :loading => "Element.show('indicator')",
-      :loaded => "Element.hide('indicator')" %>
-      
-<%= sortable_element 'list-right', 
-      :tag => 'div',
-      :only => 'mypage-box',
-      :handle => "handle",
-      :dropOnEmpty => true,
-      :containment => ['list-top', 'list-left', 'list-right'],
-      :constraint => false,
-      :complete => visual_effect(:highlight, 'list-right'), 
-      :url => { :action => "order_blocks", :group => "right" },
-      :loading => "Element.show('indicator')",
-      :loaded => "Element.hide('indicator')" %>
-      
+<script language="JavaScript">
+//<![CDATA[
+function recreateSortables() {
+    Sortable.destroy('list-top');
+    Sortable.destroy('list-left');
+    Sortable.destroy('list-right');
+    
+	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'})
+	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'})
+	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'})
+}
+
+function updateSelect() {
+    s = $('block-select')
+    for (var i = 0; i < s.options.length; i++) {
+        if ($('block_' + s.options[i].value)) {
+            s.options[i].disabled = true;
+        } else {
+            s.options[i].disabled = false;
+        }
+    }
+    s.options[0].selected = true;
+}
+
+function afterAddBlock() {
+    recreateSortables();
+    updateSelect();
+}
+
+function removeBlock(block) {
+    $(block).parentNode.removeChild($(block));
+    updateSelect();
+}
+//]]>
+</script>
+
+<div class="contextual">
+<span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
+<% form_tag({:action => "add_block"}, :id => "block-form") do %>
+<%= select_tag 'block', "<option></option>" + options_for_select(@block_options), :id => "block-select" %>
+<%= link_to_remote l(:button_add),
+           {:url => { :action => "add_block" },
+            :with => "Form.serialize('block-form')",
+            :update => "list-top",
+            :position => :top,
+            :complete => "afterAddBlock();",
+            :loading => "Element.show('indicator')",
+            :loaded => "Element.hide('indicator')"
+           }, :class => 'icon icon-add'
+             %>
+<% end %>
+<%= link_to l(:button_save), {:action => 'page_layout_save'}, :class => 'icon icon-save' %>
+<%= link_to l(:button_cancel), {:action => 'page'}, :class => 'icon icon-cancel' %>
+</div>
+
+<h2><%=l(:label_my_page)%></h2>
+
+<div id="list-top" class="block-receiver">
+	<% @blocks['top'].each do |b| 
+	   next unless MyController::BLOCKS.keys.include? b %>
+	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
+	<% end if @blocks['top'] %>
+</div>
+
+<div id="list-left" class="splitcontentleft block-receiver">
+	<% @blocks['left'].each do |b| 
+	   next unless MyController::BLOCKS.keys.include? b %>
+	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
+	<% end if @blocks['left'] %>
+</div>
+
+<div id="list-right" class="splitcontentright block-receiver">
+	<% @blocks['right'].each do |b| 
+	   next unless MyController::BLOCKS.keys.include? b %>
+	<%= render :partial => 'block', :locals => {:user => @user, :block_name => b} %>
+	<% end if @blocks['right'] %>
+</div>
+
+<%= sortable_element 'list-top',
+      :tag => 'div',
+      :only => 'mypage-box',
+      :handle => "handle",
+      :dropOnEmpty => true,
+      :containment => ['list-top', 'list-left', 'list-right'],
+      :constraint => false,
+      :complete => visual_effect(:highlight, 'list-top'), 
+      :url => { :action => "order_blocks", :group => "top" },
+      :loading => "Element.show('indicator')",
+      :loaded => "Element.hide('indicator')"
+       %>
+      
+      
+<%= sortable_element 'list-left', 
+      :tag => 'div',
+      :only => 'mypage-box',
+      :handle => "handle",
+      :dropOnEmpty => true,
+      :containment => ['list-top', 'list-left', 'list-right'],
+      :constraint => false,
+      :complete => visual_effect(:highlight, 'list-left'), 
+      :url => { :action => "order_blocks", :group => "left" },
+      :loading => "Element.show('indicator')",
+      :loaded => "Element.hide('indicator')" %>
+      
+<%= sortable_element 'list-right', 
+      :tag => 'div',
+      :only => 'mypage-box',
+      :handle => "handle",
+      :dropOnEmpty => true,
+      :containment => ['list-top', 'list-left', 'list-right'],
+      :constraint => false,
+      :complete => visual_effect(:highlight, 'list-right'), 
+      :url => { :action => "order_blocks", :group => "right" },
+      :loading => "Element.show('indicator')",
+      :loaded => "Element.hide('indicator')" %>
+      
 <%= javascript_tag "updateSelect()" %>
 \ No newline at end of file
diff --git a/app/views/news/_news.rhtml b/app/views/news/_news.rhtml
index 75a80d634..e48e5041b 100644
--- a/app/views/news/_news.rhtml
+++ b/app/views/news/_news.rhtml
@@ -1,4 +1,4 @@
-<p><%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %><br />
-<% unless news.summary.empty? %><%=h news.summary %><br /><% end %>
-<em><%= news.author.name %>, <%= format_time(news.created_on) %></em><br />
-<%= news.comments_count %> <%= lwr(:label_comment, news.comments_count).downcase %><br /></p>
+<p><%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %><br />
+<% unless news.summary.empty? %><%=h news.summary %><br /><% end %>
+<em><%= news.author.name %>, <%= format_time(news.created_on) %></em><br />
+<%= news.comments_count %> <%= lwr(:label_comment, news.comments_count).downcase %><br /></p>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index cf283aae0..92e664452 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -1,33 +1,33 @@
-<div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'icon icon-edit' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-</div>
-
-<h2><%=h @news.title %></h2>
-
-<p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %>
-<%= @news.author.display_name %>, <%= format_time(@news.created_on) %></em></p>
-<br />
+<div class="contextual">
+<%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'icon icon-edit' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+</div>
+
+<h2><%=h @news.title %></h2>
+
+<p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %>
+<%= @news.author.display_name %>, <%= format_time(@news.created_on) %></em></p>
+<br />
 <%= textilizable auto_link @news.description %>
-<br />
-
-<div id="comments" style="margin-bottom:16px;">
-<h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3>
-<% @news.comments.each do |comment| %>
-    <% next if comment.new_record? %>
-    <h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
-    <div class="contextual">
-        <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-    </div>
-    <%= simple_format(auto_link(h comment.comment))%>
-<% end if @news.comments_count > 0 %>
-</div>
-
-<% if authorize_for 'news', 'add_comment' %>
-<% form_tag({:action => 'add_comment', :id => @news}) do %>
-<%= error_messages_for 'comment' %>
-<p><label for="comment_comment"><%= l(:label_comment_add) %></label><br />
-<%= text_area 'comment', 'comment', :cols => 60, :rows => 6 %></p>
-<%= submit_tag l(:button_add) %>
-<% end %>
+<br />
+
+<div id="comments" style="margin-bottom:16px;">
+<h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3>
+<% @news.comments.each do |comment| %>
+    <% next if comment.new_record? %>
+    <h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
+    <div class="contextual">
+        <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+    </div>
+    <%= simple_format(auto_link(h comment.comment))%>
+<% end if @news.comments_count > 0 %>
+</div>
+
+<% if authorize_for 'news', 'add_comment' %>
+<% form_tag({:action => 'add_comment', :id => @news}) do %>
+<%= error_messages_for 'comment' %>
+<p><label for="comment_comment"><%= l(:label_comment_add) %></label><br />
+<%= text_area 'comment', 'comment', :cols => 60, :rows => 6 %></p>
+<%= submit_tag l(:button_add) %>
+<% end %>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index 0bb7ebfb5..85f3f2966 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -11,18 +11,18 @@
 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 3 %></p>
 <p><%= f.text_field :homepage, :size => 40 %></p>
 <p><%= f.check_box :is_public %></p>
-
+
 <% for @custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label @custom_value %></p>
-<% end %>
+<% end %>
 
 <% unless @custom_fields.empty? %>
 <p><label><%=l(:label_custom_field_plural)%></label>
 <% for custom_field in @custom_fields %>
-	<%= check_box_tag "custom_field_ids[]", custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
-	<%= custom_field.name %>	
+	<%= check_box_tag "custom_field_ids[]", custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
+	<%= custom_field.name %>	
 <% end %></p>
-<% end %>
+<% end %>
 <!--[eoform:project]-->
 </div>
 
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index 2eef3e7b1..80386b9e1 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -1,59 +1,59 @@
-<h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
-
-<div>
-<div class="rightbox">
-<% form_tag do %>
-<p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
-<%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
-<p>
-    <%= check_box_tag 'show_issues', 1, @show_issues %><%= hidden_field_tag 'show_issues', 0, :id => nil %> <%=l(:label_issue_plural)%><br />
-    <%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0, :id => nil %> <%=l(:label_news_plural)%><br />
-    <%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0, :id => nil %> <%=l(:label_attachment_plural)%><br />
-    <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0, :id => nil %> <%=l(:label_document_plural)%>
-</p>
-<p class="textcenter"><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
-<% end %>
-</div>
-
-<% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
-  <h3><%= day_name(day.cwday) %> <%= day.day %></h3>
-  <ul>
-  <% @events_by_day[day].sort {|x,y| y.created_on <=> x.created_on }.each do |e| %>
-    <li><p>
-    <% if e.is_a? Issue %>
-      <%= e.created_on.strftime("%H:%M") %> <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %> (<%= e.status.name %>): <%=h e.subject %><br />
-          <i><%= e.author.name %></i>
-    <% elsif e.is_a? News %>
-      <%= e.created_on.strftime("%H:%M") %> <%=l(:label_news)%>: <%= link_to h(e.title), :controller => 'news', :action => 'show', :id => e %><br />
-          <% unless e.summary.empty? %><%=h e.summary %><br /><% end %>
-          <i><%= e.author.name %></i>
-    <% elsif (e.is_a? Attachment) and (e.container.is_a? Version) %>
-      <%= e.created_on.strftime("%H:%M") %> <%=l(:label_attachment)%> (<%=h e.container.name %>): <%= link_to e.filename, :controller => 'projects', :action => 'list_files', :id => @project %><br />
-        <i><%= e.author.name %></i>
-    <% elsif (e.is_a? Attachment) and (e.container.is_a? Document) %>
-      <%= e.created_on.strftime("%H:%M") %> <%=l(:label_attachment)%>: <%= e.filename %> (<%= link_to h(e.container.title), :controller => 'documents', :action => 'show', :id => e.container %>)<br />
-        <i><%= e.author.name %></i>
-    <% elsif e.is_a? Document %>
-      <%= e.created_on.strftime("%H:%M") %> <%=l(:label_document)%>: <%= link_to h(e.title), :controller => 'documents', :action => 'show', :id => e %><br />
-    <% end %>
-    </p></li>
-  
-  <% end %>
-  </ul>
-<% end %>
-<% if @events_by_day.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
-
-<div style="float:left;">
-<%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), 
-                    {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
-                    {:href => url_for(:action => 'activity', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
-                    %>
-</div>
-<div style="float:right;">
-<%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
-                    {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
-                    {:href => url_for(:action => 'activity', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
-                    %>&nbsp;
-</div>
-<br />
+<h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
+
+<div>
+<div class="rightbox">
+<% form_tag do %>
+<p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
+<%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
+<p>
+    <%= check_box_tag 'show_issues', 1, @show_issues %><%= hidden_field_tag 'show_issues', 0, :id => nil %> <%=l(:label_issue_plural)%><br />
+    <%= check_box_tag 'show_news', 1, @show_news %><%= hidden_field_tag 'show_news', 0, :id => nil %> <%=l(:label_news_plural)%><br />
+    <%= check_box_tag 'show_files', 1, @show_files %><%= hidden_field_tag 'show_files', 0, :id => nil %> <%=l(:label_attachment_plural)%><br />
+    <%= check_box_tag 'show_documents', 1, @show_documents %><%= hidden_field_tag 'show_documents', 0, :id => nil %> <%=l(:label_document_plural)%>
+</p>
+<p class="textcenter"><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+<% end %>
+</div>
+
+<% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
+  <h3><%= day_name(day.cwday) %> <%= day.day %></h3>
+  <ul>
+  <% @events_by_day[day].sort {|x,y| y.created_on <=> x.created_on }.each do |e| %>
+    <li><p>
+    <% if e.is_a? Issue %>
+      <%= e.created_on.strftime("%H:%M") %> <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %> (<%= e.status.name %>): <%=h e.subject %><br />
+          <i><%= e.author.name %></i>
+    <% elsif e.is_a? News %>
+      <%= e.created_on.strftime("%H:%M") %> <%=l(:label_news)%>: <%= link_to h(e.title), :controller => 'news', :action => 'show', :id => e %><br />
+          <% unless e.summary.empty? %><%=h e.summary %><br /><% end %>
+          <i><%= e.author.name %></i>
+    <% elsif (e.is_a? Attachment) and (e.container.is_a? Version) %>
+      <%= e.created_on.strftime("%H:%M") %> <%=l(:label_attachment)%> (<%=h e.container.name %>): <%= link_to e.filename, :controller => 'projects', :action => 'list_files', :id => @project %><br />
+        <i><%= e.author.name %></i>
+    <% elsif (e.is_a? Attachment) and (e.container.is_a? Document) %>
+      <%= e.created_on.strftime("%H:%M") %> <%=l(:label_attachment)%>: <%= e.filename %> (<%= link_to h(e.container.title), :controller => 'documents', :action => 'show', :id => e.container %>)<br />
+        <i><%= e.author.name %></i>
+    <% elsif e.is_a? Document %>
+      <%= e.created_on.strftime("%H:%M") %> <%=l(:label_document)%>: <%= link_to h(e.title), :controller => 'documents', :action => 'show', :id => e %><br />
+    <% end %>
+    </p></li>
+  
+  <% end %>
+  </ul>
+<% end %>
+<% if @events_by_day.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+
+<div style="float:left;">
+<%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), 
+                    {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
+                    {:href => url_for(:action => 'activity', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
+                    %>
+</div>
+<div style="float:right;">
+<%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
+                    {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
+                    {:href => url_for(:action => 'activity', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
+                    %>&nbsp;
+</div>
+<br />
 </div>
 \ No newline at end of file
diff --git a/app/views/projects/add_document.rhtml b/app/views/projects/add_document.rhtml
index 4beb7a94d..dc3103a7b 100644
--- a/app/views/projects/add_document.rhtml
+++ b/app/views/projects/add_document.rhtml
@@ -1,15 +1,15 @@
 <h2><%=l(:label_document_new)%></h2>
-
-<% form_tag( { :action => 'add_document', :id => @project }, :class => "tabular", :multipart => true) do %>
+
+<% form_tag( { :action => 'add_document', :id => @project }, :class => "tabular", :multipart => true) do %>
 <%= render :partial => 'documents/form' %>
 
-<div class="box">
+<div class="box">
 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
 <%= image_to_function "add.png", "addFileField();return false" %></label>
 <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
 </div>
-
+
 <%= submit_tag l(:button_create) %>
 <% end %>
-
+
 
diff --git a/app/views/projects/add_file.rhtml b/app/views/projects/add_file.rhtml
index 4df71e9d0..f39018cc8 100644
--- a/app/views/projects/add_file.rhtml
+++ b/app/views/projects/add_file.rhtml
@@ -1,15 +1,15 @@
-<h2><%=l(:label_attachment_new)%></h2>
-
-<%= error_messages_for 'attachment' %>
-<div class="box">
-<% form_tag({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") do %>
-
-<p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>
-<%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
-
-<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
-<%= image_to_function "add.png", "addFileField();return false" %></label>
-<%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
-</div>
-<%= submit_tag l(:button_add) %>
+<h2><%=l(:label_attachment_new)%></h2>
+
+<%= error_messages_for 'attachment' %>
+<div class="box">
+<% form_tag({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") do %>
+
+<p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>
+<%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
+
+<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
+<%= image_to_function "add.png", "addFileField();return false" %></label>
+<%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+</div>
+<%= submit_tag l(:button_add) %>
 <% end %> 
 \ No newline at end of file
diff --git a/app/views/projects/add_issue.rhtml b/app/views/projects/add_issue.rhtml
index f35bb4159..1c51f1fc0 100644
--- a/app/views/projects/add_issue.rhtml
+++ b/app/views/projects/add_issue.rhtml
@@ -1,5 +1,5 @@
 <h2><%=l(:label_issue_new)%>: <%= @tracker.name %></h2>
-
+
 <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'add_issue'}, :html => {:multipart => true} do |f| %>
 <%= error_messages_for 'issue' %>
 <div class="box">
@@ -7,9 +7,9 @@
 <%= hidden_field_tag 'tracker_id', @tracker.id %>
 
 <div class="splitcontentleft">
-<p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
-<p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
-<p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %></p>
+<p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
+<p><%= f.select :assigned_to_id, (@issue.project.members.collect {|m| [m.name, m.user_id]}), :include_blank => true %></p>
+<p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %></p>
 </div>
 <div class="splitcontentright">
 <p><%= f.text_field :start_date, :size => 10 %><%= calendar_for('issue_start_date') %></p>
@@ -20,11 +20,11 @@
 <div class="clear">
 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
 <p><%= f.text_area :description, :cols => 60, :rows => 10, :required => true, :class => 'wiki-edit' %></p>
-
+
 <% for @custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label @custom_value %></p>
-<% end %>
-
+<% end %>
+
 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
 <%= image_to_function "add.png", "addFileField();return false" %></label>
 <%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
@@ -32,7 +32,7 @@
 </div>
 <!--[eoform:issue]-->
 </div>
-<%= submit_tag l(:button_create) %>
+<%= submit_tag l(:button_create) %>
 <% end %>
 
 <% if Setting.text_formatting == 'textile' %>
diff --git a/app/views/projects/add_query.rhtml b/app/views/projects/add_query.rhtml
index 5dbf881d4..1de027a44 100644
--- a/app/views/projects/add_query.rhtml
+++ b/app/views/projects/add_query.rhtml
@@ -1,6 +1,6 @@
-<h2><%= l(:label_query_new) %></h2>
-
-<% form_tag({:action => 'add_query', :id => @project}) do %>
-  <%= render :partial => 'queries/form', :locals => {:query => @query} %>
-  <%= submit_tag l(:button_create) %>
+<h2><%= l(:label_query_new) %></h2>
+
+<% form_tag({:action => 'add_query', :id => @project}) do %>
+  <%= render :partial => 'queries/form', :locals => {:query => @query} %>
+  <%= submit_tag l(:button_create) %>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index ec7d485e7..154c5618a 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -1,74 +1,74 @@
-<h2><%= l(:label_calendar) %></h2>
-
-<% form_tag({:action => 'calendar', :id => @project}) do %>
-<table width="100%">
-<tr>
-<td align="left" style="width:150px">
-    <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), 
-                        {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
-                        {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
-                        %>
-</td>
-<td align="center">
-    <%= select_month(@month, :prefix => "month", :discard_type => true) %>
-    <%= select_year(@year, :prefix => "year", :discard_type => true) %>
-    <%= submit_tag l(:button_submit), :class => "button-small" %>
-</td>
-<td align="right" style="width:150px">
-    <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
-                        {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
-                        {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
-                        %>&nbsp;
-</td>
-</tr>
-</table>
-<% end %>
-<br />
-
-<table class="list with-cells">
-<thead>
-<tr>
-<th></th>
-<% 1.upto(7) do |d| %>
-    <th style="width:14%"><%= day_name(d) %></th>
-<% end %>
-</tr>
-</thead>
-<tbody>
-<tr style="height:100px">
-<% day = @date_from
-while day <= @date_to
-	if day.cwday == 1 %>
-	<th><%= day.cweek %></th>
-	<% end %>	
-	<td valign="top" class="<%= day.month==@month ? "even" : "odd" %>" style="width:14%; <%= Date.today == day ? 'background:#FDFED0;' : '' %>">
-	<p class="textright"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>	
-	<% day_issues = []
-	@issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day } 
-	day_issues.each do |i| %>
-	    <div class="tooltip">
-		<%= if day == i.start_date and day == i.due_date
-		    image_tag('arrow_bw.png')
-		elsif day == i.start_date
-		    image_tag('arrow_from.png') 
-		elsif day == i.due_date
-		    image_tag('arrow_to.png') 
-		end %>
-		<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i } %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
-        <span class="tip">
-        <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
-        </span>		
-		</div>
-	<% end %>
-    </td>
-	<%= '</tr><tr style="height:100px">' if day.cwday >= 7 and day!=@date_to %>
-	<%
-	day = day + 1
-end %>
-</tr>
-</tbody>
-</table>
-
-<%= image_tag 'arrow_from.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
-<%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
+<h2><%= l(:label_calendar) %></h2>
+
+<% form_tag({:action => 'calendar', :id => @project}) do %>
+<table width="100%">
+<tr>
+<td align="left" style="width:150px">
+    <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), 
+                        {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) }},
+                        {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1))}
+                        %>
+</td>
+<td align="center">
+    <%= select_month(@month, :prefix => "month", :discard_type => true) %>
+    <%= select_year(@year, :prefix => "year", :discard_type => true) %>
+    <%= submit_tag l(:button_submit), :class => "button-small" %>
+</td>
+<td align="right" style="width:150px">
+    <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
+                        {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) }},
+                        {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1))}
+                        %>&nbsp;
+</td>
+</tr>
+</table>
+<% end %>
+<br />
+
+<table class="list with-cells">
+<thead>
+<tr>
+<th></th>
+<% 1.upto(7) do |d| %>
+    <th style="width:14%"><%= day_name(d) %></th>
+<% end %>
+</tr>
+</thead>
+<tbody>
+<tr style="height:100px">
+<% day = @date_from
+while day <= @date_to
+	if day.cwday == 1 %>
+	<th><%= day.cweek %></th>
+	<% end %>	
+	<td valign="top" class="<%= day.month==@month ? "even" : "odd" %>" style="width:14%; <%= Date.today == day ? 'background:#FDFED0;' : '' %>">
+	<p class="textright"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>	
+	<% day_issues = []
+	@issues.each { |i| day_issues << i if i.start_date == day or i.due_date == day } 
+	day_issues.each do |i| %>
+	    <div class="tooltip">
+		<%= if day == i.start_date and day == i.due_date
+		    image_tag('arrow_bw.png')
+		elsif day == i.start_date
+		    image_tag('arrow_from.png') 
+		elsif day == i.due_date
+		    image_tag('arrow_to.png') 
+		end %>
+		<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i } %>: <%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
+        <span class="tip">
+        <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
+        </span>		
+		</div>
+	<% end %>
+    </td>
+	<%= '</tr><tr style="height:100px">' if day.cwday >= 7 and day!=@date_to %>
+	<%
+	day = day + 1
+end %>
+</tr>
+</tbody>
+</table>
+
+<%= image_tag 'arrow_from.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
+<%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
 <%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
 \ No newline at end of file
diff --git a/app/views/projects/changelog.rhtml b/app/views/projects/changelog.rhtml
index c2a727639..9cebd409e 100644
--- a/app/views/projects/changelog.rhtml
+++ b/app/views/projects/changelog.rhtml
@@ -1,30 +1,30 @@
-<h2><%=l(:label_change_log)%></h2>
-
-<div>
-
-<div class="rightbox" style="width:140px;">
-<% form_tag do %>
-<p><strong><%=l(:label_tracker_plural)%></strong></p>
-<% @trackers.each do |tracker| %>
-  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-  <%= tracker.name %><br />
-<% end %>
-<p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
-<% end %>
-</div>
-
-<% if @fixed_issues.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
-
-<% ver_id = nil
-   @fixed_issues.each do |issue| %>   
-    <% unless ver_id == issue.fixed_version_id %>
-    <% if ver_id %></ul><% end %>
-    <h3 class="icon22 icon22-package"><%= issue.fixed_version.name %></h3>
-    <p><%= format_date(issue.fixed_version.effective_date) %><br />
-    <%=h issue.fixed_version.description %></p>
-    <ul>
-    <% ver_id = issue.fixed_version_id
-    end %>
-    <li><%= link_to "#{issue.tracker.name} #{issue.id}", :controller => 'issues', :action => 'show', :id => issue %>: <%=h issue.subject %></li>
-<% end %>
+<h2><%=l(:label_change_log)%></h2>
+
+<div>
+
+<div class="rightbox" style="width:140px;">
+<% form_tag do %>
+<p><strong><%=l(:label_tracker_plural)%></strong></p>
+<% @trackers.each do |tracker| %>
+  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
+  <%= tracker.name %><br />
+<% end %>
+<p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
+<% end %>
+</div>
+
+<% if @fixed_issues.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+
+<% ver_id = nil
+   @fixed_issues.each do |issue| %>   
+    <% unless ver_id == issue.fixed_version_id %>
+    <% if ver_id %></ul><% end %>
+    <h3 class="icon22 icon22-package"><%= issue.fixed_version.name %></h3>
+    <p><%= format_date(issue.fixed_version.effective_date) %><br />
+    <%=h issue.fixed_version.description %></p>
+    <ul>
+    <% ver_id = issue.fixed_version_id
+    end %>
+    <li><%= link_to "#{issue.tracker.name} #{issue.id}", :controller => 'issues', :action => 'show', :id => issue %>: <%=h issue.subject %></li>
+<% end %>
 </div>
 \ No newline at end of file
diff --git a/app/views/projects/destroy.rhtml b/app/views/projects/destroy.rhtml
index 22b27e317..cb159216d 100644
--- a/app/views/projects/destroy.rhtml
+++ b/app/views/projects/destroy.rhtml
@@ -1,14 +1,14 @@
-<h2><%=l(:label_confirmation)%></h2>
-<div class="box">
-<center>
-<p><strong><%= @project.name %></strong><br />
-<%=l(:text_project_destroy_confirmation)%></p>
-
-<p>
-    <% form_tag({:controller => 'projects', :action => 'destroy', :id => @project}) do %>
-    <%= hidden_field_tag "confirm", 1 %>
-    <%= submit_tag l(:button_delete) %>
-    <% end %>
-</p>
-</center>
+<h2><%=l(:label_confirmation)%></h2>
+<div class="box">
+<center>
+<p><strong><%= @project.name %></strong><br />
+<%=l(:text_project_destroy_confirmation)%></p>
+
+<p>
+    <% form_tag({:controller => 'projects', :action => 'destroy', :id => @project}) do %>
+    <%= hidden_field_tag "confirm", 1 %>
+    <%= submit_tag l(:button_delete) %>
+    <% end %>
+</p>
+</center>
 </div>
 \ No newline at end of file
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 18e025f22..a846507aa 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -1,215 +1,215 @@
-<div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf'}, :class => 'icon icon-pdf' %>
-</div>
-
-<h2><%= l(:label_gantt) %></h2>
-
-<table width="100%">
-<tr>
-<td align="left">
-<% form_tag do %>
-<p>
-<input type="text" name="months" size="2" value="<%= @months %>" />
-<%= l(:label_months_from) %>
-<%= select_month(@month_from, :prefix => "month", :discard_type => true) %>
-<%= select_year(@year_from, :prefix => "year", :discard_type => true) %>
-<%= hidden_field_tag 'zoom', @zoom %>
-<%= submit_tag l(:button_submit), :class => "button-small" %>
-</p>
-<% end %>
-</td>
-<td align="right">
-<%= if @zoom < 4
-    link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months}
-  else
-    image_tag 'zoom_in_g.png'
-  end %>
-<%= if @zoom > 1
-    link_to image_tag('zoom_out.png'), :zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months
-  else
-    image_tag 'zoom_out_g.png'
-  end %>
-</td>
-</tr>
-</table>
-<br />
-
-<% zoom = 1
-@zoom.times { zoom = zoom * 2 }
-
-subject_width = 260
-header_heigth = 18
-
-headers_heigth = header_heigth
-show_weeks = false
-show_days = false
-
-if @zoom >1
-    show_weeks = true
-    headers_heigth = 2*header_heigth
-    if @zoom > 2
-        show_days = true
-        headers_heigth = 3*header_heigth
-    end
-end
-
-g_width = (@date_to - @date_from + 1)*zoom
-g_height = [(20 * @issues.length + 6)+150, 206].max
-t_height = g_height + headers_heigth
-%>
-
-<table width="100%" style="border:0; border-collapse: collapse;">
-<tr>
-<td style="width:260px;">
-
-<div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
-<div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_heigth %>px;background: #eee;" class="gantt_hdr"></div>
-<div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
-<%
-#
-# Tasks subjects
-#
-top = headers_heigth + 8
-@issues.each do |i| %>
-	<div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;">
-	<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>:
-	<%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
-	</div>
-<% top = top + 20
-end %>
-</div>
-</td>
-<td>
-
-<div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
-<div style="width:<%= g_width-1 %>px;height:<%= headers_heigth %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
-<% 
-#
-# Months headers
-#
-month_f = @date_from
-left = 0
-height = (show_weeks ? header_heigth : header_heigth + g_height)
-@months.times do 
-	width = ((month_f >> 1) - month_f) * zoom - 1
-	%>
-	<div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
-	<%= link_to "#{month_f.year}-#{month_f.month}", { :year => month_f.year, :month => month_f.month, :zoom => @zoom, :months => @months }, :title => "#{month_name(month_f.month)} #{month_f.year}"%>
-	</div>
-	<% 
-	left = left + width + 1
-	month_f = month_f >> 1
-end %>
-
-<% 
-#
-# Weeks headers
-#
-if show_weeks
-	left = 0
-	height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
-	if @date_from.cwday == 1
-	    # @date_from is monday
-        week_f = @date_from
-	else
-	    # find next monday after @date_from
-		week_f = @date_from + (7 - @date_from.cwday + 1)
-		width = (7 - @date_from.cwday + 1) * zoom-1
-		%>
-		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
-		<% 
-		left = left + width+1
-	end %>
-	<%
-	while week_f <= @date_to
-		width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
-		%>
-		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
-		<small><%= week_f.cweek if width >= 16 %></small>
-		</div>
-		<% 
-		left = left + width+1
-		week_f = week_f+7
-	end
-end %>
-
-<% 
-#
-# Days headers
-#
-if show_days
-	left = 0
-	height = g_height + header_heigth - 1
-	wday = @date_from.cwday
-	(@date_to - @date_from + 1).to_i.times do 
-	width =  zoom - 1
-	%>
-	<div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
-	<%= day_name(wday)[0,1] %>
-	</div>
-	<% 
-	left = left + width+1
-	wday = wday + 1
-	wday = 1 if wday > 7
-	end
-end %>
-
-<%
-#
-# Today red line
-#
-if Date.today >= @date_from and Date.today <= @date_to %>
-    <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_heigth + 1 %>px;left:<%= ((Date.today-@date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
-<% end %>
-
-<%
-#
-# Tasks
-#
-top = headers_heigth + 10
-@issues.each do |i| %>
-	<%
-	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
-	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
-	
-	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
-	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
-	i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
-	
-	i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
-	
-	i_left = ((i_start_date - @date_from)*zoom).floor 	
-	i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2                  # total width of the issue (- 2 for left and right borders)
-	d_width = ((i_done_date - i_start_date)*zoom).floor - 2                     # done width
-	l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
-	%>
-	<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
-	<% if l_width > 0 %>
-	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
-	<% end %>
-	<% if d_width > 0 %>
-	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
-	<% end %>
-	<div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
-	<%= i.status.name %>
-	<%= (i.done_ratio).to_i %>%
-	</div>
-	<% # === tooltip === %>
-	<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
-	<span class="tip">
-    <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
-	</span></div>
-	<% top = top + 20
-end %>
-</div>
-</td>
-</tr>
-</table>
-
-<table width="100%">
-<tr>
-<td align="left"><%= link_to ('&#171; ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months %></td>
-<td align="right"><%= link_to (l(:label_next) + ' &#187;'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months %></td>
-</tr>
+<div class="contextual">
+<%= l(:label_export_to) %>
+<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf'}, :class => 'icon icon-pdf' %>
+</div>
+
+<h2><%= l(:label_gantt) %></h2>
+
+<table width="100%">
+<tr>
+<td align="left">
+<% form_tag do %>
+<p>
+<input type="text" name="months" size="2" value="<%= @months %>" />
+<%= l(:label_months_from) %>
+<%= select_month(@month_from, :prefix => "month", :discard_type => true) %>
+<%= select_year(@year_from, :prefix => "year", :discard_type => true) %>
+<%= hidden_field_tag 'zoom', @zoom %>
+<%= submit_tag l(:button_submit), :class => "button-small" %>
+</p>
+<% end %>
+</td>
+<td align="right">
+<%= if @zoom < 4
+    link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months}
+  else
+    image_tag 'zoom_in_g.png'
+  end %>
+<%= if @zoom > 1
+    link_to image_tag('zoom_out.png'), :zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months
+  else
+    image_tag 'zoom_out_g.png'
+  end %>
+</td>
+</tr>
+</table>
+<br />
+
+<% zoom = 1
+@zoom.times { zoom = zoom * 2 }
+
+subject_width = 260
+header_heigth = 18
+
+headers_heigth = header_heigth
+show_weeks = false
+show_days = false
+
+if @zoom >1
+    show_weeks = true
+    headers_heigth = 2*header_heigth
+    if @zoom > 2
+        show_days = true
+        headers_heigth = 3*header_heigth
+    end
+end
+
+g_width = (@date_to - @date_from + 1)*zoom
+g_height = [(20 * @issues.length + 6)+150, 206].max
+t_height = g_height + headers_heigth
+%>
+
+<table width="100%" style="border:0; border-collapse: collapse;">
+<tr>
+<td style="width:260px;">
+
+<div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
+<div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_heigth %>px;background: #eee;" class="gantt_hdr"></div>
+<div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
+<%
+#
+# Tasks subjects
+#
+top = headers_heigth + 8
+@issues.each do |i| %>
+	<div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;">
+	<small><%= link_to "#{i.tracker.name} ##{i.id}", { :controller => 'issues', :action => 'show', :id => i }, :title => "#{i.subject}" %>:
+	<%=h i.subject.sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)') %></small>
+	</div>
+<% top = top + 20
+end %>
+</div>
+</td>
+<td>
+
+<div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
+<div style="width:<%= g_width-1 %>px;height:<%= headers_heigth %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
+<% 
+#
+# Months headers
+#
+month_f = @date_from
+left = 0
+height = (show_weeks ? header_heigth : header_heigth + g_height)
+@months.times do 
+	width = ((month_f >> 1) - month_f) * zoom - 1
+	%>
+	<div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
+	<%= link_to "#{month_f.year}-#{month_f.month}", { :year => month_f.year, :month => month_f.month, :zoom => @zoom, :months => @months }, :title => "#{month_name(month_f.month)} #{month_f.year}"%>
+	</div>
+	<% 
+	left = left + width + 1
+	month_f = month_f >> 1
+end %>
+
+<% 
+#
+# Weeks headers
+#
+if show_weeks
+	left = 0
+	height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
+	if @date_from.cwday == 1
+	    # @date_from is monday
+        week_f = @date_from
+	else
+	    # find next monday after @date_from
+		week_f = @date_from + (7 - @date_from.cwday + 1)
+		width = (7 - @date_from.cwday + 1) * zoom-1
+		%>
+		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
+		<% 
+		left = left + width+1
+	end %>
+	<%
+	while week_f <= @date_to
+		width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
+		%>
+		<div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
+		<small><%= week_f.cweek if width >= 16 %></small>
+		</div>
+		<% 
+		left = left + width+1
+		week_f = week_f+7
+	end
+end %>
+
+<% 
+#
+# Days headers
+#
+if show_days
+	left = 0
+	height = g_height + header_heigth - 1
+	wday = @date_from.cwday
+	(@date_to - @date_from + 1).to_i.times do 
+	width =  zoom - 1
+	%>
+	<div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
+	<%= day_name(wday)[0,1] %>
+	</div>
+	<% 
+	left = left + width+1
+	wday = wday + 1
+	wday = 1 if wday > 7
+	end
+end %>
+
+<%
+#
+# Today red line
+#
+if Date.today >= @date_from and Date.today <= @date_to %>
+    <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_heigth + 1 %>px;left:<%= ((Date.today-@date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
+<% end %>
+
+<%
+#
+# Tasks
+#
+top = headers_heigth + 10
+@issues.each do |i| %>
+	<%
+	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
+	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
+	
+	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
+	i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
+	
+	i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
+	
+	i_left = ((i_start_date - @date_from)*zoom).floor 	
+	i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2                  # total width of the issue (- 2 for left and right borders)
+	d_width = ((i_done_date - i_start_date)*zoom).floor - 2                     # done width
+	l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
+	%>
+	<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
+	<% if l_width > 0 %>
+	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
+	<% end %>
+	<% if d_width > 0 %>
+	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
+	<% end %>
+	<div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
+	<%= i.status.name %>
+	<%= (i.done_ratio).to_i %>%
+	</div>
+	<% # === tooltip === %>
+	<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
+	<span class="tip">
+    <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
+	</span></div>
+	<% top = top + 20
+end %>
+</div>
+</td>
+</tr>
+</table>
+
+<table width="100%">
+<tr>
+<td align="left"><%= link_to ('&#171; ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months %></td>
+<td align="right"><%= link_to (l(:label_next) + ' &#187;'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months %></td>
+</tr>
 </table>
 \ No newline at end of file
diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml
index 0723a7081..5e1a63f95 100644
--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
@@ -2,20 +2,20 @@
 
 <table class="list">
   <thead><tr>
-	<%= sort_header_tag('name', :caption => l(:label_project)) %>
-	<th><%=l(:field_description)%></th>
+	<%= sort_header_tag('name', :caption => l(:label_project)) %>
+	<th><%=l(:field_description)%></th>
 	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
   </tr></thead>
   <tbody>
 <% for project in @projects %>
-  <tr class="<%= cycle("odd", "even") %>">
-	<td><%= link_to project.name, :action => 'show', :id => project %></td>
-	<td><%=h project.description %></td>
-	<td align="center"><%= format_date(project.created_on) %></td>
+  <tr class="<%= cycle("odd", "even") %>">
+	<td><%= link_to project.name, :action => 'show', :id => project %></td>
+	<td><%=h project.description %></td>
+	<td align="center"><%= format_date(project.created_on) %></td>
   </tr>
 <% end %>
   </tbody>
-</table>
-
+</table>
+
 <%= pagination_links_full @project_pages %>
 [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]
 \ No newline at end of file
diff --git a/app/views/projects/list_documents.rhtml b/app/views/projects/list_documents.rhtml
index ab48badae..b692808b7 100644
--- a/app/views/projects/list_documents.rhtml
+++ b/app/views/projects/list_documents.rhtml
@@ -1,13 +1,13 @@
-<div class="contextual">
-<%= link_to_if_authorized l(:label_document_new), {:controller => 'projects', :action => 'add_document', :id => @project}, :class => 'icon icon-add' %>
-</div>
-
-<h2><%=l(:label_document_plural)%></h2>
-
-<% if @documents.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
-
-<% documents = @documents.group_by {|d| d.category } %>
-<% documents.each do |category, docs| %>
-    <h3><%= category.name %></h3>
-    <%= render :partial => 'documents/document', :collection => docs %>
+<div class="contextual">
+<%= link_to_if_authorized l(:label_document_new), {:controller => 'projects', :action => 'add_document', :id => @project}, :class => 'icon icon-add' %>
+</div>
+
+<h2><%=l(:label_document_plural)%></h2>
+
+<% if @documents.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+
+<% documents = @documents.group_by {|d| d.category } %>
+<% documents.each do |category, docs| %>
+    <h3><%= category.name %></h3>
+    <%= render :partial => 'documents/document', :collection => docs %>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index 0236b2ea1..288afae23 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -1,44 +1,44 @@
-<div class="contextual">
-<%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'icon icon-add' %>
-</div>
-
-<h2><%=l(:label_attachment_plural)%></h2>
-
-<% delete_allowed = authorize_for('versions', 'destroy_file') %>
-
-<table class="list">
-  <thead><tr>
-    <th><%=l(:field_version)%></th>
-    <th><%=l(:field_filename)%></th>
-    <th><%=l(:label_date)%></th>
-    <th><%=l(:field_filesize)%></th>
-    <th>D/L</th>
-    <th>MD5</th>
-    <% if delete_allowed %><th></th><% end %>
-  </tr></thead>
-  <tbody>
-<% for version in @versions %>	
-  <% unless version.attachments.empty? %>
-  <tr><th colspan="7" align="left"><span class="icon icon-package"><b><%= version.name %></b></span></th></tr>
+<div class="contextual">
+<%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'icon icon-add' %>
+</div>
+
+<h2><%=l(:label_attachment_plural)%></h2>
+
+<% delete_allowed = authorize_for('versions', 'destroy_file') %>
+
+<table class="list">
+  <thead><tr>
+    <th><%=l(:field_version)%></th>
+    <th><%=l(:field_filename)%></th>
+    <th><%=l(:label_date)%></th>
+    <th><%=l(:field_filesize)%></th>
+    <th>D/L</th>
+    <th>MD5</th>
+    <% if delete_allowed %><th></th><% end %>
+  </tr></thead>
+  <tbody>
+<% for version in @versions %>	
+  <% unless version.attachments.empty? %>
+  <tr><th colspan="7" align="left"><span class="icon icon-package"><b><%= version.name %></b></span></th></tr>
   <% for file in version.attachments %>		
-  <tr class="<%= cycle("odd", "even") %>">
-    <td></td>
-    <td><%= link_to file.filename, :controller => 'versions', :action => 'download', :id => version, :attachment_id => file %></td>
-    <td align="center"><%= format_date(file.created_on) %></td>
-    <td align="center"><%= number_to_human_size(file.filesize) %></td>
+  <tr class="<%= cycle("odd", "even") %>">
+    <td></td>
+    <td><%= link_to file.filename, :controller => 'versions', :action => 'download', :id => version, :attachment_id => file %></td>
+    <td align="center"><%= format_date(file.created_on) %></td>
+    <td align="center"><%= number_to_human_size(file.filesize) %></td>
     <td align="center"><%= file.downloads %></td>
-    <td align="center"><small><%= file.digest %></small></td>
-    <% if delete_allowed %>
-    <td align="center">
-        <div class="contextual">
-        <%= link_to_if_authorized '', {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-        </div>
-    </td>
+    <td align="center"><small><%= file.digest %></small></td>
+    <% if delete_allowed %>
+    <td align="center">
+        <div class="contextual">
+        <%= link_to_if_authorized '', {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+        </div>
+    </td>
     <% end %>
   </tr>		
-  <% end
-  reset_cycle %>
-  <% end %>
-<% end %>
-  </tbody>
+  <% end
+  reset_cycle %>
+  <% end %>
+<% end %>
+  </tbody>
 </table>
 \ No newline at end of file
diff --git a/app/views/projects/list_issues.rhtml b/app/views/projects/list_issues.rhtml
index c3bd13fe2..6f6e031f4 100644
--- a/app/views/projects/list_issues.rhtml
+++ b/app/views/projects/list_issues.rhtml
@@ -1,84 +1,84 @@
-<% if @query.new_record? %>
-    <div class="contextual">
-    <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
-    </div>
-    <h2><%=l(:label_issue_plural)%></h2>
-    
-    <% form_tag({:action => 'list_issues'}, :id => 'query_form') do %>
-    <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-    <% end %>
-    <div class="contextual">
-    <%= link_to_remote l(:button_apply), 
-                       { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 },
-                         :update => "content",
-                         :with => "Form.serialize('query_form')"
-                       }, :class => 'icon icon-edit' %> 
-    
-    <%= link_to l(:button_clear), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1}, :class => 'icon icon-del'  %>
-    <% if authorize_for('projects', 'add_query') %>
-    
-    <%= link_to_remote l(:button_save), 
-                       { :url => { :controller => 'projects', :action => "add_query", :id => @project },
-                         :method => 'get',
-                         :update => "content",
-                         :with => "Form.serialize('query_form')"
-                       }, :class => 'icon icon-save' %>
-    <% end %>
-    </div>
-    <br />
-<% else %>
-    <div class="contextual">
-        <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
-        <% if authorize_for('projects', 'add_query') %>
-            <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
-            <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-        <% end %>
-    </div>    
-    <h2><%= @query.name %></h2>
-<% end %>
-<%= error_messages_for 'query' %>
-<% if @query.valid? %>
-<% if @issues.empty? %>
-<p><i><%= l(:label_no_data) %></i></p>
-<% else %>
-&nbsp;
-<% form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) do %>	
-<table class="list">
-    <thead><tr>
-        <th></th>
-		<%= sort_header_tag('issues.id', :caption => '#') %>
-		<%= sort_header_tag('issues.tracker_id', :caption => l(:field_tracker)) %>
-		<%= sort_header_tag('issue_statuses.name', :caption => l(:field_status)) %>
-		<%= sort_header_tag('issues.priority_id', :caption => l(:field_priority)) %>
-		<th><%=l(:field_subject)%></th>
-		<%= sort_header_tag('users.lastname', :caption => l(:field_author)) %>
-		<%= sort_header_tag('issues.updated_on', :caption => l(:field_updated_on)) %>
-	</tr></thead>
-	<tbody>
+<% if @query.new_record? %>
+    <div class="contextual">
+    <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
+    </div>
+    <h2><%=l(:label_issue_plural)%></h2>
+    
+    <% form_tag({:action => 'list_issues'}, :id => 'query_form') do %>
+    <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+    <% end %>
+    <div class="contextual">
+    <%= link_to_remote l(:button_apply), 
+                       { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 },
+                         :update => "content",
+                         :with => "Form.serialize('query_form')"
+                       }, :class => 'icon icon-edit' %> 
+    
+    <%= link_to l(:button_clear), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1}, :class => 'icon icon-del'  %>
+    <% if authorize_for('projects', 'add_query') %>
+    
+    <%= link_to_remote l(:button_save), 
+                       { :url => { :controller => 'projects', :action => "add_query", :id => @project },
+                         :method => 'get',
+                         :update => "content",
+                         :with => "Form.serialize('query_form')"
+                       }, :class => 'icon icon-save' %>
+    <% end %>
+    </div>
+    <br />
+<% else %>
+    <div class="contextual">
+        <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
+        <% if authorize_for('projects', 'add_query') %>
+            <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
+            <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+        <% end %>
+    </div>    
+    <h2><%= @query.name %></h2>
+<% end %>
+<%= error_messages_for 'query' %>
+<% if @query.valid? %>
+<% if @issues.empty? %>
+<p><i><%= l(:label_no_data) %></i></p>
+<% else %>
+&nbsp;
+<% form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) do %>	
+<table class="list">
+    <thead><tr>
+        <th></th>
+		<%= sort_header_tag('issues.id', :caption => '#') %>
+		<%= sort_header_tag('issues.tracker_id', :caption => l(:field_tracker)) %>
+		<%= sort_header_tag('issue_statuses.name', :caption => l(:field_status)) %>
+		<%= sort_header_tag('issues.priority_id', :caption => l(:field_priority)) %>
+		<th><%=l(:field_subject)%></th>
+		<%= sort_header_tag('users.lastname', :caption => l(:field_author)) %>
+		<%= sort_header_tag('issues.updated_on', :caption => l(:field_updated_on)) %>
+	</tr></thead>
+	<tbody>
 	<% for issue in @issues %>
-	<tr class="<%= cycle("odd", "even") %>">
-	    <th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th>
-		<td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
-		<td align="center"><%= issue.tracker.name %></td>
-		<td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
-		<td align="center"><%= issue.priority.name %></td>
+	<tr class="<%= cycle("odd", "even") %>">
+	    <th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th>
+		<td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
+		<td align="center"><%= issue.tracker.name %></td>
+		<td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
+		<td align="center"><%= issue.priority.name %></td>
 		<td><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>
 		<td align="center"><%= issue.author.display_name %></td>
 		<td align="center"><%= format_time(issue.updated_on) %></td>
 	</tr>
-	<% end %>
+	<% end %>
 	</tbody>
-</table>
-<div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>,
-<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %>
-</div>
-<p><%= submit_tag l(:button_move), :class => "button-small" %>
-&nbsp;
-<%= pagination_links_full @issue_pages %>
-[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
-</p>
-<% end %>
-<% end %>
+</table>
+<div class="contextual">
+<%= l(:label_export_to) %>
+<%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>,
+<%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %>
+</div>
+<p><%= submit_tag l(:button_move), :class => "button-small" %>
+&nbsp;
+<%= pagination_links_full @issue_pages %>
+[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
+</p>
+<% end %>
+<% end %>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/projects/list_members.rhtml b/app/views/projects/list_members.rhtml
index e98a8c678..c4d3ec466 100644
--- a/app/views/projects/list_members.rhtml
+++ b/app/views/projects/list_members.rhtml
@@ -1,13 +1,13 @@
-<h2><%=l(:label_member_plural)%></h2>
-
-<% if @members.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
-
-<% members = @members.group_by {|m| m.role } %>
-<% members.keys.sort{|x,y| x.position <=> y.position}.each do |role| %>
-<h3><%= role.name %></h3>
-<ul>
-<% members[role].each do |m| %>
-<li><%= link_to m.user.display_name, :controller => 'account', :action => 'show', :id => m.user %> (<%= format_date m.created_on %>)</li>
-<% end %>
-</ul>
-<% end %>
+<h2><%=l(:label_member_plural)%></h2>
+
+<% if @members.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+
+<% members = @members.group_by {|m| m.role } %>
+<% members.keys.sort{|x,y| x.position <=> y.position}.each do |role| %>
+<h3><%= role.name %></h3>
+<ul>
+<% members[role].each do |m| %>
+<li><%= link_to m.user.display_name, :controller => 'account', :action => 'show', :id => m.user %> (<%= format_date m.created_on %>)</li>
+<% end %>
+</ul>
+<% end %>
diff --git a/app/views/projects/list_news.rhtml b/app/views/projects/list_news.rhtml
index 6cdf75c4a..17a786260 100644
--- a/app/views/projects/list_news.rhtml
+++ b/app/views/projects/list_news.rhtml
@@ -6,4 +6,4 @@
 
 <% if @news.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
 <%= render :partial => 'news/news', :collection => @news %>
-<%= pagination_links_full @news_pages %>
+<%= pagination_links_full @news_pages %>
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index 2fb1df028..0aac5a7e2 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -1,28 +1,28 @@
-<h2><%=l(:label_roadmap)%></h2>
-
-<div>
-
-<div class="rightbox" style="width:140px;">
-<% form_tag do %>
-<p><strong><%=l(:label_tracker_plural)%></strong></p>
-<% @trackers.each do |tracker| %>
-  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
-  <%= tracker.name %><br />
-<% end %>
-<p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
-<% end %>
-</div>
-
-<% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
-
-<% @versions.each do |version| %>   
-    <h3 class="icon22 icon22-package"><%= version.name %></h3>
-    <p><%= format_date(version.effective_date) %><br />
-    <%=h version.description %></p>
-    <ul>
-    <% version.fixed_issues.find(:all, :conditions => ["issues.tracker_id in (#{@selected_tracker_ids.join(',')})"]).each do |issue| %>
-    <li><%= link_to "#{issue.tracker.name} #{issue.id}", :controller => 'issues', :action => 'show', :id => issue %>: <%=h issue.subject %></li>
-    <% end %>
-    </ul>
-<% end %>
+<h2><%=l(:label_roadmap)%></h2>
+
+<div>
+
+<div class="rightbox" style="width:140px;">
+<% form_tag do %>
+<p><strong><%=l(:label_tracker_plural)%></strong></p>
+<% @trackers.each do |tracker| %>
+  <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
+  <%= tracker.name %><br />
+<% end %>
+<p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
+<% end %>
+</div>
+
+<% if @versions.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+
+<% @versions.each do |version| %>   
+    <h3 class="icon22 icon22-package"><%= version.name %></h3>
+    <p><%= format_date(version.effective_date) %><br />
+    <%=h version.description %></p>
+    <ul>
+    <% version.fixed_issues.find(:all, :conditions => ["issues.tracker_id in (#{@selected_tracker_ids.join(',')})"]).each do |issue| %>
+    <li><%= link_to "#{issue.tracker.name} #{issue.id}", :controller => 'issues', :action => 'show', :id => issue %>: <%=h issue.subject %></li>
+    <% end %>
+    </ul>
+<% end %>
 </div>
 \ No newline at end of file
diff --git a/app/views/projects/search.rhtml b/app/views/projects/search.rhtml
index d38cb3b45..056effd47 100644
--- a/app/views/projects/search.rhtml
+++ b/app/views/projects/search.rhtml
@@ -1,43 +1,43 @@
-<h2><%= l(:label_search) %></h2>
-
-<div class="box">
-<% form_tag({:action => 'search', :id => @project}, :method => :get) do %>
-<p><%= text_field_tag 'q', @question, :size => 30 %>
-<%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>
-<%= check_box_tag 'scope[]', 'news', (@scope.include? 'news') %> <label><%= l(:label_news_plural) %></label>
-<%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label>
-<% if @project.wiki %>
-<%= check_box_tag 'scope[]', 'wiki', (@scope.include? 'wiki') %> <label><%= l(:label_wiki) %></label>
-<% end %>
-<br />
-<%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>
-<%= submit_tag l(:button_submit), :name => 'submit' %>
-<% end %>
-</div>
-
-<% if @results %>
-    <h3><%= lwr(:label_result, @results.length) %></h3>
-    <ul>
-      <% @results.each do |e| %>
-        <li><p>
-        <% if e.is_a? Issue %>
-            <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />
-            <%= highlight_tokens(e.description, @tokens) %><br />
-            <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
-        <% elsif e.is_a? News %>
-            <%=l(:label_news)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'news', :action => 'show', :id => e %><br />
-            <%= highlight_tokens(e.description, @tokens) %><br />
-            <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
-        <% elsif e.is_a? Document %>
-            <%=l(:label_document)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'documents', :action => 'show', :id => e %><br />
-            <%= highlight_tokens(e.description, @tokens) %><br />
-            <i><%= format_time(e.created_on) %></i>
-        <% elsif e.is_a? WikiPage %>
-            <%=l(:label_wiki)%>: <%= link_to highlight_tokens(h(e.pretty_title), @tokens), :controller => 'wiki', :action => 'index', :id => @project, :page => e.title %><br />
-            <%= highlight_tokens(e.content.text, @tokens) %><br />
-            <i><%= e.content.author ? e.content.author.name : "Anonymous" %>, <%= format_time(e.content.updated_on) %></i>
-        <% end %>
-        </p></li>  
-      <% end %>
-    </ul>
+<h2><%= l(:label_search) %></h2>
+
+<div class="box">
+<% form_tag({:action => 'search', :id => @project}, :method => :get) do %>
+<p><%= text_field_tag 'q', @question, :size => 30 %>
+<%= check_box_tag 'scope[]', 'issues', (@scope.include? 'issues') %> <label><%= l(:label_issue_plural) %></label>
+<%= check_box_tag 'scope[]', 'news', (@scope.include? 'news') %> <label><%= l(:label_news_plural) %></label>
+<%= check_box_tag 'scope[]', 'documents', (@scope.include? 'documents') %> <label><%= l(:label_document_plural) %></label>
+<% if @project.wiki %>
+<%= check_box_tag 'scope[]', 'wiki', (@scope.include? 'wiki') %> <label><%= l(:label_wiki) %></label>
+<% end %>
+<br />
+<%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></p>
+<%= submit_tag l(:button_submit), :name => 'submit' %>
+<% end %>
+</div>
+
+<% if @results %>
+    <h3><%= lwr(:label_result, @results.length) %></h3>
+    <ul>
+      <% @results.each do |e| %>
+        <li><p>
+        <% if e.is_a? Issue %>
+            <%= link_to "#{e.tracker.name} ##{e.id}", :controller => 'issues', :action => 'show', :id => e %>: <%= highlight_tokens(h(e.subject), @tokens) %><br />
+            <%= highlight_tokens(e.description, @tokens) %><br />
+            <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
+        <% elsif e.is_a? News %>
+            <%=l(:label_news)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'news', :action => 'show', :id => e %><br />
+            <%= highlight_tokens(e.description, @tokens) %><br />
+            <i><%= e.author.name %>, <%= format_time(e.created_on) %></i>
+        <% elsif e.is_a? Document %>
+            <%=l(:label_document)%>: <%= link_to highlight_tokens(h(e.title), @tokens), :controller => 'documents', :action => 'show', :id => e %><br />
+            <%= highlight_tokens(e.description, @tokens) %><br />
+            <i><%= format_time(e.created_on) %></i>
+        <% elsif e.is_a? WikiPage %>
+            <%=l(:label_wiki)%>: <%= link_to highlight_tokens(h(e.pretty_title), @tokens), :controller => 'wiki', :action => 'index', :id => @project, :page => e.title %><br />
+            <%= highlight_tokens(e.content.text, @tokens) %><br />
+            <i><%= e.content.author ? e.content.author.name : "Anonymous" %>, <%= format_time(e.content.updated_on) %></i>
+        <% end %>
+        </p></li>  
+      <% end %>
+    </ul>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml
index d5f9fab49..aaa4e6522 100644
--- a/app/views/projects/settings.rhtml
+++ b/app/views/projects/settings.rhtml
@@ -10,7 +10,7 @@
 </div>
 
 <div id="tab-content-info" class="tab-content">
-<% if authorize_for('projects', 'edit') %>
+<% if authorize_for('projects', 'edit') %>
 	<% labelled_tabular_form_for :project, @project, :url => { :action => "edit", :id => @project } do |f| %>
 	<%= render :partial => 'form', :locals => { :f => f } %>
 	<%= submit_tag l(:button_save) %>
@@ -18,98 +18,98 @@
 <% end %>
 </div>
 
-<div id="tab-content-members" class="tab-content" style="display:none;">
-<%= error_messages_for 'member' %>
-<table class="list">
+<div id="tab-content-members" class="tab-content" style="display:none;">
+<%= error_messages_for 'member' %>
+<table class="list">
 	<thead><th><%= l(:label_user) %></th><th><%= l(:label_role) %></th><th></th></thead>
 	<tbody>
-	<% @project.members.find(:all, :include => [:role, :user]).sort{|x,y| x.role.position <=> y.role.position}.each do |member| %>
-	<% unless member.new_record? %>
-	<tr class="<%= cycle 'odd', 'even' %>">
-	<td><%= member.user.display_name %></td>
-    <td align="center">
+	<% @project.members.find(:all, :include => [:role, :user]).sort{|x,y| x.role.position <=> y.role.position}.each do |member| %>
+	<% unless member.new_record? %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+	<td><%= member.user.display_name %></td>
+    <td align="center">
         <% if authorize_for('members', 'edit') %>
-        <% form_tag({:controller => 'members', :action => 'edit', :id => member}) do %>
-        <select name="member[role_id]">
+        <% form_tag({:controller => 'members', :action => 'edit', :id => member}) do %>
+        <select name="member[role_id]">
         <%= options_from_collection_for_select @roles, "id", "name", member.role_id %>
-        </select>
+        </select>
         <%= submit_tag l(:button_change), :class => "button-small" %>
         <% end %>
         <% end %>
-    </td>
+    </td>
     <td align="center">
         <%= link_to_if_authorized l(:button_delete), {:controller => 'members', :action => 'destroy', :id => member}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-    </td>
-	</tr>	
+    </td>
+	</tr>	
 	<% end %>
-	</tbody>
-<% end; reset_cycle %>
+	</tbody>
+<% end; reset_cycle %>
 </table>
-<% if authorize_for('projects', 'add_member') %>
-    <label><%=l(:label_member_new)%></label><br/>
-    <% form_tag({:controller => 'projects', :action => 'add_member', :tab => 'members', :id => @project}) do %>
-    <select name="member[user_id]">
+<% if authorize_for('projects', 'add_member') %>
+    <label><%=l(:label_member_new)%></label><br/>
+    <% form_tag({:controller => 'projects', :action => 'add_member', :tab => 'members', :id => @project}) do %>
+    <select name="member[user_id]">
     <%= options_from_collection_for_select @users, "id", "display_name", @member.user_id %>
-    </select>
-    <select name="member[role_id]">
+    </select>
+    <select name="member[role_id]">
     <%= options_from_collection_for_select @roles, "id", "name", @member.role_id %>
-    </select>
-    <%= submit_tag l(:button_add) %>
+    </select>
+    <%= submit_tag l(:button_add) %>
     <% end %>
-<% end %>
+<% end %>
 </div>
 
 <div id="tab-content-versions" class="tab-content" style="display:none;">
 <table class="list">
 	<thead><th><%= l(:label_version) %></th><th><%= l(:field_effective_date) %></th><th><%= l(:field_description) %></th><th></th><th></th></thead>
-	<tbody>
-<% for version in @project.versions %>
-    <tr class="<%= cycle 'odd', 'even' %>">
-    <td><%=h version.name %></td>
-    <td align="center"><%= format_date(version.effective_date) %></td>
+	<tbody>
+<% for version in @project.versions %>
+    <tr class="<%= cycle 'odd', 'even' %>">
+    <td><%=h version.name %></td>
+    <td align="center"><%= format_date(version.effective_date) %></td>
     <td><%=h version.description %></td>
     <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></td>
     <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
-    </td>
-    </tr>
+    </td>
+    </tr>
 <% end; reset_cycle %>
-    </tbody>
-</table>
-<%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %>
-</div>
+    </tbody>
+</table>
+<%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %>
+</div>
 
 <div id="tab-content-categories" class="tab-content" style="display:none;">
 <table class="list">
 	<thead><th><%= l(:label_issue_category) %></th><th></th></thead>
-	<tbody>
-<% for @category in @project.issue_categories %>
-	<% unless @category.new_record? %>
-	<tr class="<%= cycle 'odd', 'even' %>">
-    <td>
-        <% form_tag({:controller => 'issue_categories', :action => 'edit', :id => @category}) do %>
-        <%= text_field 'category', 'name', :size => 25  %>
-        <% if authorize_for('issue_categories', 'edit') %>
-        <%= submit_tag l(:button_save), :class => "button-small" %>
+	<tbody>
+<% for @category in @project.issue_categories %>
+	<% unless @category.new_record? %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+    <td>
+        <% form_tag({:controller => 'issue_categories', :action => 'edit', :id => @category}) do %>
+        <%= text_field 'category', 'name', :size => 25  %>
+        <% if authorize_for('issue_categories', 'edit') %>
+        <%= submit_tag l(:button_save), :class => "button-small" %>
+        <% end %>
         <% end %>
-        <% end %>
-    </td>
+    </td>
     <td align="center">
         <%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => @category}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-    </td>
-	</tr>
-	<% end %>
-<% end %>
+    </td>
+	</tr>
+	<% end %>
+<% end %>
     </tbody>
 </table>
-<% if authorize_for('projects', 'add_issue_category') %>
+<% if authorize_for('projects', 'add_issue_category') %>
     <% form_tag({:action => 'add_issue_category', :tab => 'categories', :id => @project}) do %>
     <label for="issue_category_name"><%=l(:label_issue_category_new)%></label><br/>
-    <%= error_messages_for 'issue_category' %>
+    <%= error_messages_for 'issue_category' %>
     <%= text_field 'issue_category', 'name', :size => 25 %>
-    <%= submit_tag l(:button_create) %>
-    <% end %>
-<% end %>
-</div>
+    <%= submit_tag l(:button_create) %>
+    <% end %>
+<% end %>
+</div>
 
 <%= tab = params[:tab] ? h(params[:tab]) : 'info'
 javascript_tag "showTab('#{tab}');" %>
 \ No newline at end of file
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 4c9e4e04a..b38eceaac 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -1,55 +1,55 @@
-<h2><%=l(:label_overview)%></h2> 
-	
-<div class="splitcontentleft">
-	<%= simple_format(auto_link(h(@project.description))) %>	
-	<ul>
-	<% unless @project.homepage.empty? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
-	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
-	<% for custom_value in @custom_values %>
-	<% if !custom_value.value.empty? %>
-	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
-	<% end %>
-	<% end %>
-	</ul>	
-
-  <div class="box">
-    <div class="contextual">
-    <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
-    </div>
-    <h3 class="icon22 icon22-tracker"><%=l(:label_tracker_plural)%></h3>
-    <ul>
-    <% for tracker in @trackers %>    
-      <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "tracker_id" => tracker.id %>:
-      <%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %>
-      <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
-    <% end %>
-    </ul>
-    <p class="textcenter"><small><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></small></p>
+<h2><%=l(:label_overview)%></h2> 
+	
+<div class="splitcontentleft">
+	<%= simple_format(auto_link(h(@project.description))) %>	
+	<ul>
+	<% unless @project.homepage.empty? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
+	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
+	<% for custom_value in @custom_values %>
+	<% if !custom_value.value.empty? %>
+	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
+	<% end %>
+	<% end %>
+	</ul>	
+
+  <div class="box">
+    <div class="contextual">
+    <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
+    </div>
+    <h3 class="icon22 icon22-tracker"><%=l(:label_tracker_plural)%></h3>
+    <ul>
+    <% for tracker in @trackers %>    
+      <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "tracker_id" => tracker.id %>:
+      <%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %>
+      <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
+    <% end %>
+    </ul>
+    <p class="textcenter"><small><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></small></p>
   </div>
-</div>
-
-<div class="splitcontentright">
-	<div class="box">
-		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>	
-		<% for member in @members %>
-		<%= link_to_user member.user %> (<%= member.role.name %>)<br />		
-		<% end %>		
-	</div>
-  
-  <% if @subprojects %>
- 	<div class="box">
-		<h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>	
-		<% for subproject in @subprojects %>
-		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />		
-		<% end %>		
-	</div>
-  <% end %>
-  
-  <div class="box">
-    <h3><%=l(:label_news_latest)%></h3>  
+</div>
+
+<div class="splitcontentright">
+	<div class="box">
+		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>	
+		<% for member in @members %>
+		<%= link_to_user member.user %> (<%= member.role.name %>)<br />		
+		<% end %>		
+	</div>
+  
+  <% if @subprojects %>
+ 	<div class="box">
+		<h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>	
+		<% for subproject in @subprojects %>
+		<%= link_to subproject.name, :action => 'show', :id => subproject %><br />		
+		<% end %>		
+	</div>
+  <% end %>
+  
+  <div class="box">
+    <h3><%=l(:label_news_latest)%></h3>  
     <%= render :partial => 'news/news', :collection => @news %>
-    <p class="textcenter"><small><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></small></p>
-  </div>  
+    <p class="textcenter"><small><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></small></p>
+  </div>  
 </div>
 \ No newline at end of file
diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index 3b73a9d7a..aa64dbb8f 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -1,100 +1,100 @@
-<script type="text/javascript">
-//<![CDATA[
-function add_filter() {
-    select = $('add_filter_select');
-    field = select.value
-    Element.show('tr_' +  field);
-    check_box = $('cb_' + field);
-    check_box.checked = true;
-    toggle_filter(field);
-    select.selectedIndex = 0;
-    
-    for (i=0; i<select.options.length; i++) {
-        if (select.options[i].value == field) {
-            select.options[i].disabled = true;
-        }    
-    }
-}
-
-function toggle_filter(field) {
-    check_box = $('cb_' + field);
-    
-    if (check_box.checked) {
-        Element.show("operators_" + field);
-        toggle_operator(field);
-    } else {
-        Element.hide("operators_" + field);
-        Element.hide("div_values_" + field);
-  }
-}
-
-function toggle_operator(field) {
-  operator = $("operators_" + field);
-  switch (operator.value) {
-    case "!*":
-    case "*":
-    case "t":
-    case "o":
-    case "c":
-      Element.hide("div_values_" + field);
-      break;
-    default:
-      Element.show("div_values_" + field);
-      break;
-  }
-}
-
-function toggle_multi_select(field) {
-    select = $('values_' + field);
-    if (select.multiple == true) {
-        select.multiple = false;
-    } else {
-        select.multiple = true;
-    }
-}
-//]]>
-</script>
-
-<fieldset style="margin:0;"><legend><%= l(:label_filter_plural) %></legend>
-<table width="100%">
-<tr>
-<td>
-<table style="padding:0;">
-<% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
-    <% field = filter[0]
-       options = filter[1] %>
-    <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>">
-    <td valign="top" style="width:200px;">
-        <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
-        <label for="cb_<%= field %>"><%= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
-    </td>
-    <td valign="top" style="width:150px;">
-        <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
-    </td>
-    <td valign="top">    
-    <div id="div_values_<%= field %>">
-    <% case options[:type]
-    when :list, :list_optional, :list_status %>
-        <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
-        <%= options_for_select options[:values], query.values_for(field) %>        
-        </select>
-        <%= link_to_function image_tag('expand.png'), "toggle_multi_select('#{field}');" %>
-    <% when :date, :date_past %>
-        <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
-    <% when :text %>
-        <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
-    <% end %>
-    </div>
-    <script type="text/javascript">toggle_filter('<%= field %>');</script>
-    </td>
-    </tr>
-<% end %>
-</table>
-</td>
-<td align="right" valign="top">
-<%= l(:label_filter_add) %>:
-<%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %>
-</td>
-</tr>
-</table>
+<script type="text/javascript">
+//<![CDATA[
+function add_filter() {
+    select = $('add_filter_select');
+    field = select.value
+    Element.show('tr_' +  field);
+    check_box = $('cb_' + field);
+    check_box.checked = true;
+    toggle_filter(field);
+    select.selectedIndex = 0;
+    
+    for (i=0; i<select.options.length; i++) {
+        if (select.options[i].value == field) {
+            select.options[i].disabled = true;
+        }    
+    }
+}
+
+function toggle_filter(field) {
+    check_box = $('cb_' + field);
+    
+    if (check_box.checked) {
+        Element.show("operators_" + field);
+        toggle_operator(field);
+    } else {
+        Element.hide("operators_" + field);
+        Element.hide("div_values_" + field);
+  }
+}
+
+function toggle_operator(field) {
+  operator = $("operators_" + field);
+  switch (operator.value) {
+    case "!*":
+    case "*":
+    case "t":
+    case "o":
+    case "c":
+      Element.hide("div_values_" + field);
+      break;
+    default:
+      Element.show("div_values_" + field);
+      break;
+  }
+}
+
+function toggle_multi_select(field) {
+    select = $('values_' + field);
+    if (select.multiple == true) {
+        select.multiple = false;
+    } else {
+        select.multiple = true;
+    }
+}
+//]]>
+</script>
+
+<fieldset style="margin:0;"><legend><%= l(:label_filter_plural) %></legend>
+<table width="100%">
+<tr>
+<td>
+<table style="padding:0;">
+<% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
+    <% field = filter[0]
+       options = filter[1] %>
+    <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>">
+    <td valign="top" style="width:200px;">
+        <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
+        <label for="cb_<%= field %>"><%= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
+    </td>
+    <td valign="top" style="width:150px;">
+        <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
+    </td>
+    <td valign="top">    
+    <div id="div_values_<%= field %>">
+    <% case options[:type]
+    when :list, :list_optional, :list_status %>
+        <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
+        <%= options_for_select options[:values], query.values_for(field) %>        
+        </select>
+        <%= link_to_function image_tag('expand.png'), "toggle_multi_select('#{field}');" %>
+    <% when :date, :date_past %>
+        <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
+    <% when :text %>
+        <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
+    <% end %>
+    </div>
+    <script type="text/javascript">toggle_filter('<%= field %>');</script>
+    </td>
+    </tr>
+<% end %>
+</table>
+</td>
+<td align="right" valign="top">
+<%= l(:label_filter_add) %>:
+<%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %>
+</td>
+</tr>
+</table>
 </fieldset>
 \ No newline at end of file
diff --git a/app/views/reports/_details.rhtml b/app/views/reports/_details.rhtml
index e52538f73..323816a13 100644
--- a/app/views/reports/_details.rhtml
+++ b/app/views/reports/_details.rhtml
@@ -1,48 +1,48 @@
-<% if @statuses.empty? or rows.empty? %>
-    <p><i><%=l(:label_no_data)%></i></p>
-<% else %>
-<% col_width = 70 / (@statuses.length+3) %>
-<table class="list">
-<thead><tr>
-<th style="width:25%"></th>
-<% for status in @statuses %>
-<th style="text-align:left;width:<%= col_width %>%"><div class="square" style="background:#<%= status.html_color %>;"></div> <small><%= status.name %></small></th>
-<% end %>
-<th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></th>
-<th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></th>
-<th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_total)%></strong></th>
-</tr></thead>
-<tbody>
-<% for row in rows %>
-<tr class="<%= cycle("odd", "even") %>">
-  <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "#{field_name}" => row.id %></td>
-  <% for status in @statuses %>
-    <td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }), 
-                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "status_id" => status.id, 
-                                                "#{field_name}" => row.id %></td>
-  <% end %>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
-                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "o" %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
-                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "c" %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
-                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "*" %></td>  
-</tr>
-<% end %>
-</tbody>
-</table>
-<% end
+<% if @statuses.empty? or rows.empty? %>
+    <p><i><%=l(:label_no_data)%></i></p>
+<% else %>
+<% col_width = 70 / (@statuses.length+3) %>
+<table class="list">
+<thead><tr>
+<th style="width:25%"></th>
+<% for status in @statuses %>
+<th style="text-align:left;width:<%= col_width %>%"><div class="square" style="background:#<%= status.html_color %>;"></div> <small><%= status.name %></small></th>
+<% end %>
+<th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_open_issues_plural)%></strong></th>
+<th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_closed_issues_plural)%></strong></th>
+<th align="center" style="width:<%= col_width %>%"><strong><%=l(:label_total)%></strong></th>
+</tr></thead>
+<tbody>
+<% for row in rows %>
+<tr class="<%= cycle("odd", "even") %>">
+  <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "#{field_name}" => row.id %></td>
+  <% for status in @statuses %>
+    <td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }), 
+                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "status_id" => status.id, 
+                                                "#{field_name}" => row.id %></td>
+  <% end %>
+  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
+                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "o" %></td>
+  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
+                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "c" %></td>
+  <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
+                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "*" %></td>  
+</tr>
+<% end %>
+</tbody>
+</table>
+<% end
   reset_cycle %>
 \ No newline at end of file
diff --git a/app/views/reports/_simple.rhtml b/app/views/reports/_simple.rhtml
index 1e66210f9..0e580fe72 100644
--- a/app/views/reports/_simple.rhtml
+++ b/app/views/reports/_simple.rhtml
@@ -1,37 +1,37 @@
-<% if @statuses.empty? or rows.empty? %>
-    <p><i><%=l(:label_no_data)%></i></p>
-<% else %>
-<table class="list">
-<thead><tr>
-<th style="width:25%"></th>
-<th align="center" style="width:25%"><%=l(:label_open_issues_plural)%></th>
-<th align="center" style="width:25%"><%=l(:label_closed_issues_plural)%></th>
-<th align="center" style="width:25%"><%=l(:label_total)%></th>
-</tr></thead>
-<tbody>
-<% for row in rows %>
-<tr class="<%= cycle("odd", "even") %>">
-  <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "#{field_name}" => row.id %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
-                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "o" %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
-                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "c" %></td>
-  <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
-                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
-                                                :set_filter => 1, 
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "*" %></td>  
-</tr>
-<% end %>
-</tbody>
-</table>
-<% end
+<% if @statuses.empty? or rows.empty? %>
+    <p><i><%=l(:label_no_data)%></i></p>
+<% else %>
+<table class="list">
+<thead><tr>
+<th style="width:25%"></th>
+<th align="center" style="width:25%"><%=l(:label_open_issues_plural)%></th>
+<th align="center" style="width:25%"><%=l(:label_closed_issues_plural)%></th>
+<th align="center" style="width:25%"><%=l(:label_total)%></th>
+</tr></thead>
+<tbody>
+<% for row in rows %>
+<tr class="<%= cycle("odd", "even") %>">
+  <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "#{field_name}" => row.id %></td>
+  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
+                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "o" %></td>
+  <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }),
+                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "c" %></td>
+  <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
+                                                :controller => 'projects', :action => 'list_issues', :id => @project, 
+                                                :set_filter => 1, 
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "*" %></td>  
+</tr>
+<% end %>
+</tbody>
+</table>
+<% end
   reset_cycle %>
 \ No newline at end of file
diff --git a/app/views/reports/issue_report.rhtml b/app/views/reports/issue_report.rhtml
index ebb815a5c..8ad45afcf 100644
--- a/app/views/reports/issue_report.rhtml
+++ b/app/views/reports/issue_report.rhtml
@@ -1,32 +1,32 @@
-<h2><%=l(:label_report_plural)%></h2>
-
-<div class="contextual">
-<%= link_to_if_authorized l(:label_query_new), {:controller => 'projects', :action => 'add_query', :id => @project}, :class => 'icon icon-add' %>
-</div>
-<h3><%= l(:label_query_plural) %></h3>
-
-<% if @queries.empty? %><p><i><%=l(:label_no_data)%></i></p><% end %>
-<ul>
-<% @queries.each do |query| %>
-    <li><%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %></li>
-<% end %>
-</ul>
-
-<div class="splitcontentleft">
-<h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
-<br />
-<h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'author' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
-<br />
-</div>
-
-<div class="splitcontentright">
-<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'priority' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
-<br />
-<h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'category' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
-<br />
-</div>
-
+<h2><%=l(:label_report_plural)%></h2>
+
+<div class="contextual">
+<%= link_to_if_authorized l(:label_query_new), {:controller => 'projects', :action => 'add_query', :id => @project}, :class => 'icon icon-add' %>
+</div>
+<h3><%= l(:label_query_plural) %></h3>
+
+<% if @queries.empty? %><p><i><%=l(:label_no_data)%></i></p><% end %>
+<ul>
+<% @queries.each do |query| %>
+    <li><%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %></li>
+<% end %>
+</ul>
+
+<div class="splitcontentleft">
+<h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
+<br />
+<h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'author' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
+<br />
+</div>
+
+<div class="splitcontentright">
+<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'priority' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
+<br />
+<h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'category' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
+<br />
+</div>
+
diff --git a/app/views/reports/issue_report_details.rhtml b/app/views/reports/issue_report_details.rhtml
index e37d38649..6b4b42232 100644
--- a/app/views/reports/issue_report_details.rhtml
+++ b/app/views/reports/issue_report_details.rhtml
@@ -1,7 +1,7 @@
-<h2><%=l(:label_report_plural)%></h2>
-
-<h3><%=@report_title%></h3>
-<%= render :partial => 'details', :locals => { :data => @data, :field_name => @field, :rows => @rows } %>
-<br />
-<%= link_to l(:button_back), :action => 'issue_report' %>
-
+<h2><%=l(:label_report_plural)%></h2>
+
+<h3><%=@report_title%></h3>
+<%= render :partial => 'details', :locals => { :data => @data, :field_name => @field, :rows => @rows } %>
+<br />
+<%= link_to l(:button_back), :action => 'issue_report' %>
+
diff --git a/app/views/repositories/_dir_list.rhtml b/app/views/repositories/_dir_list.rhtml
index 332987f3f..9a785f8f0 100644
--- a/app/views/repositories/_dir_list.rhtml
+++ b/app/views/repositories/_dir_list.rhtml
@@ -1,23 +1,23 @@
-<table class="list">
-<thead><tr>
-<th><%= l(:field_name) %></th>
-<th><%= l(:field_filesize) %></th>
-<th><%= l(:label_revision) %></th>
-<th><%= l(:field_author) %></th>
-<th><%= l(:label_date) %></th>
-</tr></thead>
-<tbody>
-<% total_size = 0
-@entries.each do |entry| %>
-<tr class="<%= cycle 'odd', 'even' %>">
-<td><%= link_to h(entry.name), { :action => (entry.is_dir? ? 'browse' : 'revisions'), :id => @project, :path => entry.path, :rev => @rev }, :class => ("icon " + (entry.is_dir? ? 'icon-folder' : 'icon-file')) %></td>
-<td align="right"><%= number_to_human_size(entry.size) unless entry.is_dir? %></td>
-<td align="right"><%= link_to entry.lastrev.identifier, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier %></td>
-<td align="center"><em><%=h entry.lastrev.author %></em></td>
-<td align="center"><%= format_time(entry.lastrev.time) %></td>
-</tr>
-<% total_size += entry.size
-end %>
-</tbody>
-</table>
+<table class="list">
+<thead><tr>
+<th><%= l(:field_name) %></th>
+<th><%= l(:field_filesize) %></th>
+<th><%= l(:label_revision) %></th>
+<th><%= l(:field_author) %></th>
+<th><%= l(:label_date) %></th>
+</tr></thead>
+<tbody>
+<% total_size = 0
+@entries.each do |entry| %>
+<tr class="<%= cycle 'odd', 'even' %>">
+<td><%= link_to h(entry.name), { :action => (entry.is_dir? ? 'browse' : 'revisions'), :id => @project, :path => entry.path, :rev => @rev }, :class => ("icon " + (entry.is_dir? ? 'icon-folder' : 'icon-file')) %></td>
+<td align="right"><%= number_to_human_size(entry.size) unless entry.is_dir? %></td>
+<td align="right"><%= link_to entry.lastrev.identifier, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier %></td>
+<td align="center"><em><%=h entry.lastrev.author %></em></td>
+<td align="center"><%= format_time(entry.lastrev.time) %></td>
+</tr>
+<% total_size += entry.size
+end %>
+</tbody>
+</table>
 <p class="textright"><em><%= l(:label_total) %>: <%= number_to_human_size(total_size) %></em></p>
 \ No newline at end of file
diff --git a/app/views/repositories/_navigation.rhtml b/app/views/repositories/_navigation.rhtml
index 3ae0f7612..efc0b9ff9 100644
--- a/app/views/repositories/_navigation.rhtml
+++ b/app/views/repositories/_navigation.rhtml
@@ -1,18 +1,18 @@
-<%= link_to 'root', :action => 'browse', :id => @project, :path => '', :rev => @rev %>
-<% 
-dirs = path.split('/')
-if 'file' == kind
-    filename = dirs.pop
-end
-link_path = ''
-dirs.each do |dir| 
-    link_path << '/' unless link_path.empty?
-    link_path << "#{dir}" 
-    %>
-    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => link_path, :rev => @rev %>
-<% end %>
-<% if filename %>
-    / <%= link_to h(filename), :action => 'revisions', :id => @project, :path => "#{link_path}/#{filename}", :rev => @rev %>
-<% end %>
-
+<%= link_to 'root', :action => 'browse', :id => @project, :path => '', :rev => @rev %>
+<% 
+dirs = path.split('/')
+if 'file' == kind
+    filename = dirs.pop
+end
+link_path = ''
+dirs.each do |dir| 
+    link_path << '/' unless link_path.empty?
+    link_path << "#{dir}" 
+    %>
+    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => link_path, :rev => @rev %>
+<% end %>
+<% if filename %>
+    / <%= link_to h(filename), :action => 'revisions', :id => @project, :path => "#{link_path}/#{filename}", :rev => @rev %>
+<% end %>
+
 <%= "@ #{revision}" if revision %>
 \ No newline at end of file
diff --git a/app/views/repositories/browse.rhtml b/app/views/repositories/browse.rhtml
index 828082e86..dffbe5458 100644
--- a/app/views/repositories/browse.rhtml
+++ b/app/views/repositories/browse.rhtml
@@ -1,14 +1,14 @@
-<div class="contextual">
-<% form_tag do %>
-<p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<%= submit_tag 'OK' %></p>
-<% end %>
-</div>
-
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
-
-<%= render :partial => 'dir_list' %>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
+<div class="contextual">
+<% form_tag do %>
+<p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<%= submit_tag 'OK' %></p>
+<% end %>
+</div>
+
+<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
+
+<%= render :partial => 'dir_list' %>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index 90fbb6025..eb8777de4 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -1,67 +1,67 @@
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
-
-<% parsing = false
-line_num_l = 0
-line_num_r = 0 %>
-<% @diff.each do |line| %>
-<% 
-   if line =~ /^Index: (.*)$/
-     if parsing %>
-       </tbody></table>
-     <%
-     end
-     parsing = false %>
-       <table class="list"><thead>
-         <tr><th colspan="3" class="list-filename"><%= l(:label_attachment) %>: <%= $1 %></th></tr>
-         <tr><th>@<%= @rev %></th><th>@<%= @rev_to %></th><th></th></tr>
-	</thead><tbody>
-     <%
-     next
-   elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
-     line_num_l = $2.to_i
-     line_num_r = $5.to_i
-     parsing = true
-     next
-   elsif line =~ /^_+$/
-     # We have reached the 'Properties' section.
-     parsing = false
-     next
-   end
-   next unless parsing
-%>
-
-<tr>
-
-<% case line[0, 1] 
-   when " " %>
-<th class="line-num"><%= line_num_l %></th>
-<th class="line-num"><%= line_num_r %></th>
-<td class="line-code">
-<% line_num_l = line_num_l + 1
-   line_num_r = line_num_r + 1
-   
-   when "-" %>
-<th class="line-num"></th>
-<th class="line-num"><%= line_num_r %></th>
-<td class="line-code" style="background: #fdd;">
-<% line_num_r = line_num_r + 1
-
-   when "+" %>
-<th class="line-num"><%= line_num_l %></th>
-<th class="line-num"></th>
-<td class="line-code" style="background: #dfd;">
-<% line_num_l = line_num_l + 1
-
-   else
-     next
-   end %>
-   
-<%= h(line[1..-1]).gsub(/\s/, "&nbsp;") %></td></tr>
-
-<% end %>
-</tbody>
-</table>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
-<% end %>
+<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+
+<% parsing = false
+line_num_l = 0
+line_num_r = 0 %>
+<% @diff.each do |line| %>
+<% 
+   if line =~ /^Index: (.*)$/
+     if parsing %>
+       </tbody></table>
+     <%
+     end
+     parsing = false %>
+       <table class="list"><thead>
+         <tr><th colspan="3" class="list-filename"><%= l(:label_attachment) %>: <%= $1 %></th></tr>
+         <tr><th>@<%= @rev %></th><th>@<%= @rev_to %></th><th></th></tr>
+	</thead><tbody>
+     <%
+     next
+   elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
+     line_num_l = $2.to_i
+     line_num_r = $5.to_i
+     parsing = true
+     next
+   elsif line =~ /^_+$/
+     # We have reached the 'Properties' section.
+     parsing = false
+     next
+   end
+   next unless parsing
+%>
+
+<tr>
+
+<% case line[0, 1] 
+   when " " %>
+<th class="line-num"><%= line_num_l %></th>
+<th class="line-num"><%= line_num_r %></th>
+<td class="line-code">
+<% line_num_l = line_num_l + 1
+   line_num_r = line_num_r + 1
+   
+   when "-" %>
+<th class="line-num"></th>
+<th class="line-num"><%= line_num_r %></th>
+<td class="line-code" style="background: #fdd;">
+<% line_num_r = line_num_r + 1
+
+   when "+" %>
+<th class="line-num"><%= line_num_l %></th>
+<th class="line-num"></th>
+<td class="line-code" style="background: #dfd;">
+<% line_num_l = line_num_l + 1
+
+   else
+     next
+   end %>
+   
+<%= h(line[1..-1]).gsub(/\s/, "&nbsp;") %></td></tr>
+
+<% end %>
+</tbody>
+</table>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index e32de5df4..d017a79f7 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -1,38 +1,38 @@
-<div class="contextual">
-<% form_tag do %>
-<p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<%= submit_tag 'OK' %></p>
-<% end %>
-</div>
-
-<h2><%= l(:label_revision) %> <%= @revision.identifier %></h2>
-
-<p><em><%= @revision.author %>, <%= format_time(@revision.time) %></em></p>
-<%= textilizable @revision.message %>
-
-<div style="float:right;">
-<div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %>&nbsp;</div>
-<div class="square action_M"></div> <div style="float:left;"><%= l(:label_modified) %>&nbsp;</div>
-<div class="square action_D"></div> <div style="float:left;"><%= l(:label_deleted) %>&nbsp;</div>
-</div>
-
-<h3><%= l(:label_attachment_plural) %></h3>
-<table class="list">
-<tbody>
-<% @revision.paths.each do |path| %>
-<tr class="<%= cycle 'odd', 'even' %>">
-<td><div class="square action_<%= path[:action] %>"></div> <%= path[:path] %></td>
-<td>
-<% if path[:action] == "M" %>
-<%= link_to 'View diff', :action => 'diff', :id => @project, :path => path[:path].gsub(/^\//, ''), :rev => @revision.identifier %>
-<% end %>
-</td>
-</tr>
-<% end %>
-</tbody>
-</table>
-<p><%= lwr(:label_modification, @revision.paths.length) %></p>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
+<div class="contextual">
+<% form_tag do %>
+<p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<%= submit_tag 'OK' %></p>
+<% end %>
+</div>
+
+<h2><%= l(:label_revision) %> <%= @revision.identifier %></h2>
+
+<p><em><%= @revision.author %>, <%= format_time(@revision.time) %></em></p>
+<%= textilizable @revision.message %>
+
+<div style="float:right;">
+<div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %>&nbsp;</div>
+<div class="square action_M"></div> <div style="float:left;"><%= l(:label_modified) %>&nbsp;</div>
+<div class="square action_D"></div> <div style="float:left;"><%= l(:label_deleted) %>&nbsp;</div>
+</div>
+
+<h3><%= l(:label_attachment_plural) %></h3>
+<table class="list">
+<tbody>
+<% @revision.paths.each do |path| %>
+<tr class="<%= cycle 'odd', 'even' %>">
+<td><div class="square action_<%= path[:action] %>"></div> <%= path[:path] %></td>
+<td>
+<% if path[:action] == "M" %>
+<%= link_to 'View diff', :action => 'diff', :id => @project, :path => path[:path].gsub(/^\//, ''), :rev => @revision.identifier %>
+<% end %>
+</td>
+</tr>
+<% end %>
+</tbody>
+</table>
+<p><%= lwr(:label_modification, @revision.paths.length) %></p>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index bc5a192b2..8e300a9da 100644
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -1,41 +1,41 @@
-<div class="contextual">
-<% form_tag do %>
-<p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<%= submit_tag 'OK' %></p>
-<% end %>
-</div>
-
-<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => @entry.kind, :revision => @rev } %></h2>
-
-<% if @entry.is_file? %>
-<h3><%=h @entry.name %></h3>
-<p><%= link_to 'Download', {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= number_to_human_size @entry.size %>)</p>
-<% end %>
-
-<h3>Revisions</h3>
-
-<table class="list">
-<thead><tr>
-<th>#</th>
-<th><%= l(:field_author) %></th>
-<th><%= l(:label_date) %></th>
-<th><%= l(:field_description) %></th>
-<th></th>
-</tr></thead>
-<tbody>
-<% @revisions.each do |revision| %>
-<tr class="<%= cycle 'odd', 'even' %>">
-<th align="center"><%= link_to revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier %></th>
-<td align="center"><em><%=h revision.author %></em></td>
-<td align="center"><%= format_time(revision.time) %></td>
-<td style="width:70%"><%= textilizable(revision.message) %></td>
-<td align="center"><%= link_to 'Diff', :action => 'diff', :id => @project, :path => @path, :rev => revision.identifier if @entry.is_file? && revision != @revisions.last %></td>
-</tr>
-<% end %>
-</tbody>
-</table>
-<p><%= lwr(:label_modification, @revisions.length) %></p>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
+<div class="contextual">
+<% form_tag do %>
+<p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<%= submit_tag 'OK' %></p>
+<% end %>
+</div>
+
+<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => @entry.kind, :revision => @rev } %></h2>
+
+<% if @entry.is_file? %>
+<h3><%=h @entry.name %></h3>
+<p><%= link_to 'Download', {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }, :class => "icon file" %> (<%= number_to_human_size @entry.size %>)</p>
+<% end %>
+
+<h3>Revisions</h3>
+
+<table class="list">
+<thead><tr>
+<th>#</th>
+<th><%= l(:field_author) %></th>
+<th><%= l(:label_date) %></th>
+<th><%= l(:field_description) %></th>
+<th></th>
+</tr></thead>
+<tbody>
+<% @revisions.each do |revision| %>
+<tr class="<%= cycle 'odd', 'even' %>">
+<th align="center"><%= link_to revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier %></th>
+<td align="center"><em><%=h revision.author %></em></td>
+<td align="center"><%= format_time(revision.time) %></td>
+<td style="width:70%"><%= textilizable(revision.message) %></td>
+<td align="center"><%= link_to 'Diff', :action => 'diff', :id => @project, :path => @path, :rev => revision.identifier if @entry.is_file? && revision != @revisions.last %></td>
+</tr>
+<% end %>
+</tbody>
+</table>
+<p><%= lwr(:label_modification, @revisions.length) %></p>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/roles/_form.rhtml b/app/views/roles/_form.rhtml
index 7cd83fd45..a80d990f9 100644
--- a/app/views/roles/_form.rhtml
+++ b/app/views/roles/_form.rhtml
@@ -1,21 +1,21 @@
 <%= error_messages_for 'role' %> 
 <div class="box">
-<!--[form:role]-->
-<p><%= f.text_field :name, :required => true %></p>
-
-<h3><%=l(:label_permissions)%></h3>
-<% permissions = @permissions.group_by {|p| p.group_id } %>
+<!--[form:role]-->
+<p><%= f.text_field :name, :required => true %></p>
+
+<h3><%=l(:label_permissions)%></h3>
+<% permissions = @permissions.group_by {|p| p.group_id } %>
 <% permissions.keys.sort.each do |group_id| %>
-<fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
-<% permissions[group_id].each do |p| %>
-  <div style="width:170px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>
-  <%= l(p.description.to_sym) %>
-  </div>
+<fieldset style="margin-top: 6px;"><legend><strong><%= l(Permission::GROUPS[group_id]) %></strong></legend>
+<% permissions[group_id].each do |p| %>
+  <div style="width:170px;float:left;"><%= check_box_tag "permission_ids[]", p.id, (@role.permissions.include? p) %>
+  <%= l(p.description.to_sym) %>
+  </div>
+<% end %>
+<div class="clear"></div>
+</fieldset>
 <% end %>
-<div class="clear"></div>
-</fieldset>
-<% end %>
 <br />
-<%= check_all_links 'role_form' %>
+<%= check_all_links 'role_form' %>
 <!--[eoform:role]-->
 </div>
diff --git a/app/views/roles/edit.rhtml b/app/views/roles/edit.rhtml
index ffe117cef..4a591e3e4 100644
--- a/app/views/roles/edit.rhtml
+++ b/app/views/roles/edit.rhtml
@@ -3,4 +3,4 @@
 <% labelled_tabular_form_for :role, @role, :url => { :action => 'edit' }, :html => {:id => 'role_form'} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
-<% end %>
+<% end %>
diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml
index c6c4492b3..872c62ee8 100644
--- a/app/views/roles/list.rhtml
+++ b/app/views/roles/list.rhtml
@@ -21,10 +21,10 @@
     <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => role, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
   </td>
   <td align="center">
-    <%= button_to l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
+    <%= button_to l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
   </tr>
 <% end %>
   </tbody>
 </table>
-
+
 <%= pagination_links_full @role_pages %>
 \ No newline at end of file
diff --git a/app/views/roles/new.rhtml b/app/views/roles/new.rhtml
index a73c36cb1..8f03aefac 100644
--- a/app/views/roles/new.rhtml
+++ b/app/views/roles/new.rhtml
@@ -1,5 +1,5 @@
 <h2><%=l(:label_role_new)%></h2> 
-
+
 <% labelled_tabular_form_for :role, @role, :url => { :action => 'new' }, :html => {:id => 'role_form'} do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml
index 620b37009..f62cca50e 100644
--- a/app/views/roles/workflow.rhtml
+++ b/app/views/roles/workflow.rhtml
@@ -1,69 +1,69 @@
-<h2><%=l(:label_workflow)%></h2>
-
-<p><%=l(:text_workflow_edit)%>:</p>
-
-<% form_tag ({:action => 'workflow'}, :method => 'get') do %>
-<div style="float:left;margin-right:10px;">
-<p><label for="role_id"><%=l(:label_role)%></label><br/>
-<select id="role_id" name="role_id">
-  <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>
-</select></p>
-</div>
-
-<div>
-<p><label for="tracker_id"><%=l(:label_tracker)%></label><br/>
-<select id="tracker_id" name="tracker_id">
-  <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>
-</select>
-
-<%= submit_tag l(:button_edit) %>
-</p>
-</div>
-<% end %>
-  
-  
-
-<% unless @tracker.nil? or @role.nil? %>
-<div class="box">
-  <% form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) do %>
-	<table>
-	<tr>
-	<td align="center"><strong><%=l(:label_current_status)%></strong></td>
-	<td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td>
-	</tr>
-	<tr>
-	<td></td>
-	<% for new_status in @statuses %>
-		<td width="80" align="center"><%= new_status.name %></td>
-	<% end %>
-	</tr>
-	
-	<% for old_status in @statuses %>
-		<tr>
-		<td><div class="square" style="background:#<%= old_status.html_color %>;"></div> <%= old_status.name %></td>		
-		<% for new_status in @statuses %>
-			<td align="center">
-      
-     <input type="checkbox"
-      name="issue_status[<%= old_status.id %>][]"
-      value="<%= new_status.id %>"
-      <%if old_status.new_statuses_allowed_to(@role, @tracker).include? new_status%>checked="checked"<%end%>
-      <%if old_status==new_status%>disabled<%end%>
-      >			
-			</td>
-		<% end %>		
-		
-		</tr>
-	<% end %>
-	</table>
-<br />
-<p>
-<a href="javascript:checkAll('workflow_form', true)"><%=l(:button_check_all)%></a> |
-<a href="javascript:checkAll('workflow_form', false)"><%=l(:button_uncheck_all)%></a>
-</p>
-<br />
+<h2><%=l(:label_workflow)%></h2>
+
+<p><%=l(:text_workflow_edit)%>:</p>
+
+<% form_tag ({:action => 'workflow'}, :method => 'get') do %>
+<div style="float:left;margin-right:10px;">
+<p><label for="role_id"><%=l(:label_role)%></label><br/>
+<select id="role_id" name="role_id">
+  <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>
+</select></p>
+</div>
+
+<div>
+<p><label for="tracker_id"><%=l(:label_tracker)%></label><br/>
+<select id="tracker_id" name="tracker_id">
+  <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>
+</select>
+
+<%= submit_tag l(:button_edit) %>
+</p>
+</div>
+<% end %>
+  
+  
+
+<% unless @tracker.nil? or @role.nil? %>
+<div class="box">
+  <% form_tag ({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) do %>
+	<table>
+	<tr>
+	<td align="center"><strong><%=l(:label_current_status)%></strong></td>
+	<td align="center" colspan="<%= @statuses.length %>"><strong><%=l(:label_new_statuses_allowed)%></strong></td>
+	</tr>
+	<tr>
+	<td></td>
+	<% for new_status in @statuses %>
+		<td width="80" align="center"><%= new_status.name %></td>
+	<% end %>
+	</tr>
+	
+	<% for old_status in @statuses %>
+		<tr>
+		<td><div class="square" style="background:#<%= old_status.html_color %>;"></div> <%= old_status.name %></td>		
+		<% for new_status in @statuses %>
+			<td align="center">
+      
+     <input type="checkbox"
+      name="issue_status[<%= old_status.id %>][]"
+      value="<%= new_status.id %>"
+      <%if old_status.new_statuses_allowed_to(@role, @tracker).include? new_status%>checked="checked"<%end%>
+      <%if old_status==new_status%>disabled<%end%>
+      >			
+			</td>
+		<% end %>		
+		
+		</tr>
+	<% end %>
+	</table>
+<br />
+<p>
+<a href="javascript:checkAll('workflow_form', true)"><%=l(:button_check_all)%></a> |
+<a href="javascript:checkAll('workflow_form', false)"><%=l(:button_uncheck_all)%></a>
+</p>
+<br />
 <%= submit_tag l(:button_save) %>
-<% end %>
-
-<% end %>
+<% end %>
+
+<% end %>
 </div>
 \ No newline at end of file
diff --git a/app/views/trackers/_form.rhtml b/app/views/trackers/_form.rhtml
index fd79bf5f0..3dea238d8 100644
--- a/app/views/trackers/_form.rhtml
+++ b/app/views/trackers/_form.rhtml
@@ -1,8 +1,8 @@
 <%= error_messages_for 'tracker' %>
 <div class="box">
 <!--[form:tracker]-->
-<p><%= f.text_field :name, :required => true %></p>
+<p><%= f.text_field :name, :required => true %></p>
 <p><%= f.check_box :is_in_chlog %></p>
-<p><%= f.check_box :is_in_roadmap %></p>
+<p><%= f.check_box :is_in_roadmap %></p>
 <!--[eoform:tracker]-->
 </div>
diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml
index a12e50845..05408a1c4 100644
--- a/app/views/trackers/list.rhtml
+++ b/app/views/trackers/list.rhtml
@@ -6,7 +6,7 @@
 
 <table class="list">
   <thead><tr>
-  <th><%=l(:label_tracker)%></th>
+  <th><%=l(:label_tracker)%></th>
   <th><%=l(:button_sort)%></th>
   <th></th>
   </tr></thead>
@@ -21,11 +21,11 @@
     <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => tracker, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
   </td>
   <td align="center">
-    <%= button_to l(:button_delete), { :action => 'destroy', :id => tracker }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
+    <%= button_to l(:button_delete), { :action => 'destroy', :id => tracker }, :confirm => l(:text_are_you_sure), :class => "button-small" %>
   </td>
   </tr>
 <% end %>
   </tbody>
 </table>
-
+
 <%= pagination_links_full @tracker_pages %>
 \ No newline at end of file
diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index e486c1042..18c849257 100644
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -4,17 +4,17 @@
 <div class="box">
 <h3><%=l(:label_information_plural)%></h3>
 <p><%= f.text_field :login, :required => true, :size => 25  %></p>
-<p><%= f.text_field :firstname, :required => true %></p>
+<p><%= f.text_field :firstname, :required => true %></p>
 <p><%= f.text_field :lastname, :required => true %></p>
-<p><%= f.text_field :mail, :required => true %></p>
-<p><%= f.select :language, lang_options_for_select %></p>
-
+<p><%= f.text_field :mail, :required => true %></p>
+<p><%= f.select :language, lang_options_for_select %></p>
+
 <% for @custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label @custom_value %></p>
-<% end if @custom_values%>
-
-<p><%= f.check_box :admin %></p>
-<p><%= f.check_box :mail_notification %></p>
+<% end if @custom_values%>
+
+<p><%= f.check_box :admin %></p>
+<p><%= f.check_box :mail_notification %></p>
 </div>
 
 <div class="box">
diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index 098ba83b1..2499ba387 100644
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -1,29 +1,29 @@
-<div class="box" style="margin-top: 16px;">
-<h3><%= l(:label_project_plural) %></h3>
-
-<% @user.memberships.each do |membership| %>
-<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>
-<p style="margin:0;padding-top:0;">
-    <label><%= membership.project.name %></label>
-    <select name="membership[role_id]">
-    <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
-    </select>
-    <%= submit_tag l(:button_change), :class => "button-small" %>
-    <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-</p>
-<% end %>
-<% end %>
-<hr />
-<p>
-<label><%=l(:label_project_new)%></label><br/>
-<% form_tag({ :action => 'edit_membership', :id => @user }) do %>
-<select name="membership[project_id]">
-<%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
-</select>
-<select name="membership[role_id]">
-<%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
-</select>
-<%= submit_tag l(:button_add) %>
-<% end %>
-</p>
+<div class="box" style="margin-top: 16px;">
+<h3><%= l(:label_project_plural) %></h3>
+
+<% @user.memberships.each do |membership| %>
+<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>
+<p style="margin:0;padding-top:0;">
+    <label><%= membership.project.name %></label>
+    <select name="membership[role_id]">
+    <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
+    </select>
+    <%= submit_tag l(:button_change), :class => "button-small" %>
+    <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+</p>
+<% end %>
+<% end %>
+<hr />
+<p>
+<label><%=l(:label_project_new)%></label><br/>
+<% form_tag({ :action => 'edit_membership', :id => @user }) do %>
+<select name="membership[project_id]">
+<%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
+</select>
+<select name="membership[role_id]">
+<%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
+</select>
+<%= submit_tag l(:button_add) %>
+<% end %>
+</p>
 </div>
 \ No newline at end of file
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 36d0c438c..87d42391c 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -3,49 +3,49 @@
 </div>
 
 <h2><%=l(:label_user_plural)%></h2>
-
-<table class="list">		
+
+<table class="list">		
   <thead><tr>
-	<%= sort_header_tag('login', :caption => l(:field_login)) %>
-	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
-	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
-	<th><%=l(:field_mail)%></th>
-	<%= sort_header_tag('admin', :caption => l(:field_admin)) %>
-	<%= sort_header_tag('status', :caption => l(:field_status)) %>
-	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
-	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %>
-    <th></th>
+	<%= sort_header_tag('login', :caption => l(:field_login)) %>
+	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
+	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
+	<th><%=l(:field_mail)%></th>
+	<%= sort_header_tag('admin', :caption => l(:field_admin)) %>
+	<%= sort_header_tag('status', :caption => l(:field_status)) %>
+	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
+	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %>
+    <th></th>
   </tr></thead>
   <tbody>
 <% for user in @users %>
-  <tr class="<%= cycle("odd", "even") %>">
-	<td><%= link_to user.login, :action => 'edit', :id => user %></td>
-	<td><%= user.firstname %></td>
-	<td><%= user.lastname %></td>
-	<td><%= user.mail %></td>
-	<td align="center"><%= image_tag 'true.png' if user.admin? %></td>
-	<td align="center"><%= image_tag 'locked.png' if user.locked? %><%= image_tag 'user_new.png' if user.registered? %></td>
-	<td align="center"><%= format_time(user.created_on) %></td>
-	<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-  <td align="center">
-    <% form_tag({:action => 'edit', :id => user}) do %>
-    <% if user.locked? %>
-      <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
-      <%= submit_tag l(:button_unlock), :class => "button-small"  %>
+  <tr class="<%= cycle("odd", "even") %>">
+	<td><%= link_to user.login, :action => 'edit', :id => user %></td>
+	<td><%= user.firstname %></td>
+	<td><%= user.lastname %></td>
+	<td><%= user.mail %></td>
+	<td align="center"><%= image_tag 'true.png' if user.admin? %></td>
+	<td align="center"><%= image_tag 'locked.png' if user.locked? %><%= image_tag 'user_new.png' if user.registered? %></td>
+	<td align="center"><%= format_time(user.created_on) %></td>
+	<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+  <td align="center">
+    <% form_tag({:action => 'edit', :id => user}) do %>
+    <% if user.locked? %>
+      <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
+      <%= submit_tag l(:button_unlock), :class => "button-small"  %>
     <% elsif user.registered? %>
       <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
       <%= submit_tag l(:button_activate), :class => "button-small"  %>
-    <% else %>
-      <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>
-      <%= submit_tag l(:button_lock), :class => "button-small"  %>
-    <% end %>
-    <% end %>  
+    <% else %>
+      <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>
+      <%= submit_tag l(:button_lock), :class => "button-small"  %>
+    <% end %>
+    <% end %>  
   </td>
   </tr>
 <% end %>
   </tbody>
 </table>
-
-<p><%= pagination_links_full @user_pages %>
-[ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
+
+<p><%= pagination_links_full @user_pages %>
+[ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
 </p>
 \ No newline at end of file
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index 95683c849..9c73ab863 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -1,27 +1,27 @@
-<h2><%= l(:label_home) %></h2>
-
-<div class="splitcontentleft">
-  <p><%= Setting.welcome_text %></p>
-  <div class="box">
+<h2><%= l(:label_home) %></h2>
+
+<div class="splitcontentleft">
+  <p><%= Setting.welcome_text %></p>
+  <div class="box">
 	<h3><%=l(:label_news_latest)%></h3>
-		<%= render :partial => 'news/news', :collection => @news %>
-	</div>
-</div>
-
-<div class="splitcontentright">
-	<div class="box">
-	<h3 class="icon22 icon22-projects"><%=l(:label_project_latest)%></h3>
+		<%= render :partial => 'news/news', :collection => @news %>
+	</div>
+</div>
+
+<div class="splitcontentright">
+	<div class="box">
+	<h3 class="icon22 icon22-projects"><%=l(:label_project_latest)%></h3>
 		<ul>
-		<% for project in @projects %>
-			<li>
-			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)<br />
-			<%=h project.description %>
-			</li>
-		<% end %>
-		</ul>
-	</div>  
-</div>	
-
-<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:rss, {:controller => 'feeds' , :action => 'news' }) %>
+		<% for project in @projects %>
+			<li>
+			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)<br />
+			<%=h project.description %>
+			</li>
+		<% end %>
+		</ul>
+	</div>  
+</div>	
+
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:rss, {:controller => 'feeds' , :action => 'news' }) %>
 <% end %>
 \ No newline at end of file
diff --git a/app/views/wiki/_preview.rhtml b/app/views/wiki/_preview.rhtml
index c17200ab1..7865d9159 100644
--- a/app/views/wiki/_preview.rhtml
+++ b/app/views/wiki/_preview.rhtml
@@ -1,3 +1,3 @@
-<fieldset class="preview"><legend><%= l(:label_preview) %></legend>
-<%= textilizable @text %>
-</fieldset>
+<fieldset class="preview"><legend><%= l(:label_preview) %></legend>
+<%= textilizable @text %>
+</fieldset>
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 1fc79bdc4..48025b368 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -1,44 +1,44 @@
-<div class="contextual">
-<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
-</div>
-
-<h2><%= @page.pretty_title %></h2>
-
-<% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
-<%= error_messages_for 'content' %>
-<div class="contextual">
-<%= l(:setting_text_formatting) %>:
-<%= link_to l(:label_help), {:controller => 'help', :ctrl => 'wiki', :page => 'syntax' },
-                            :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %>
-</div>
-<p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit' %></p>
-<p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p>
-<p><%= submit_tag l(:button_save) %>
-   <%= link_to_remote l(:label_preview), 
-                       { :url => { :controller => 'wiki', :action => 'preview', :id => @project },
-                         :method => 'get',
-                         :update => 'preview',
-                         :with => "Form.serialize('wiki_form')",
-                         :loading => "Element.show('indicator')",
-                         :loaded => "Element.hide('indicator')"
-                       } %>
-   <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
-</p>
-
-<% end %>
-
-<% if Setting.text_formatting == 'textile' %>
-<%= javascript_include_tag 'jstoolbar' %>
-<script type="text/javascript">
-//<![CDATA[
-if (document.getElementById) { 
-	if (document.getElementById('content_text')) { 
-		var commentTb = new jsToolBar(document.getElementById('content_text')); 
-		commentTb.draw(); 
-	}
-}
-//]]>
-</script>
-<% end %>
-
+<div class="contextual">
+<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
+</div>
+
+<h2><%= @page.pretty_title %></h2>
+
+<% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
+<%= error_messages_for 'content' %>
+<div class="contextual">
+<%= l(:setting_text_formatting) %>:
+<%= link_to l(:label_help), {:controller => 'help', :ctrl => 'wiki', :page => 'syntax' },
+                            :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %>
+</div>
+<p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit' %></p>
+<p><label><%= l(:field_comment) %></label><br /><%= f.text_field :comment, :size => 120 %></p>
+<p><%= submit_tag l(:button_save) %>
+   <%= link_to_remote l(:label_preview), 
+                       { :url => { :controller => 'wiki', :action => 'preview', :id => @project },
+                         :method => 'get',
+                         :update => 'preview',
+                         :with => "Form.serialize('wiki_form')",
+                         :loading => "Element.show('indicator')",
+                         :loaded => "Element.hide('indicator')"
+                       } %>
+   <span id="indicator" style="display:none"><%= image_tag "loading.gif", :align => "absmiddle" %></span>
+</p>
+
+<% end %>
+
+<% if Setting.text_formatting == 'textile' %>
+<%= javascript_include_tag 'jstoolbar' %>
+<script type="text/javascript">
+//<![CDATA[
+if (document.getElementById) { 
+	if (document.getElementById('content_text')) { 
+		var commentTb = new jsToolBar(document.getElementById('content_text')); 
+		commentTb.draw(); 
+	}
+}
+//]]>
+</script>
+<% end %>
+
 <div id="preview" class="wiki"></div>
 \ No newline at end of file
diff --git a/app/views/wiki/export.rhtml b/app/views/wiki/export.rhtml
index c31568246..561e9b000 100644
--- a/app/views/wiki/export.rhtml
+++ b/app/views/wiki/export.rhtml
@@ -1,14 +1,14 @@
-<!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><%=h @page.pretty_title %></title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<style>
-body { font:80% Verdana,Tahoma,Arial,sans-serif; }
-h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
-</style>
-</head>
-<body>
-<%= textilizable @content.text, :wiki_links => :local %>
-</body>
-</html>
+<!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><%=h @page.pretty_title %></title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<style>
+body { font:80% Verdana,Tahoma,Arial,sans-serif; }
+h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+</style>
+</head>
+<body>
+<%= textilizable @content.text, :wiki_links => :local %>
+</body>
+</html>
diff --git a/app/views/wiki/export_multiple.rhtml b/app/views/wiki/export_multiple.rhtml
index cecb40b42..fe3e87e7f 100644
--- a/app/views/wiki/export_multiple.rhtml
+++ b/app/views/wiki/export_multiple.rhtml
@@ -1,26 +1,26 @@
-<!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><%=h @wiki.project.name %></title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<style>
-body { font:80% Verdana,Tahoma,Arial,sans-serif; }
-h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
-</style>
-</head>
-<body>
-
-<strong><%= l(:label_page_index) %></strong>
-<ul>
-<% @pages.each do |page| %>
-    <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
-<% end %>
-</ul>
-
-<% @pages.each do |page| %>
-<hr />
-<%= textilizable page.content.text, :wiki_links => :anchor %>
-<% end %>
-
-</body>
-</html>
+<!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><%=h @wiki.project.name %></title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<style>
+body { font:80% Verdana,Tahoma,Arial,sans-serif; }
+h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+</style>
+</head>
+<body>
+
+<strong><%= l(:label_page_index) %></strong>
+<ul>
+<% @pages.each do |page| %>
+    <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
+<% end %>
+</ul>
+
+<% @pages.each do |page| %>
+<hr />
+<%= textilizable page.content.text, :wiki_links => :anchor %>
+<% end %>
+
+</body>
+</html>
diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
index e44a08168..dd9e590be 100644
--- a/app/views/wiki/history.rhtml
+++ b/app/views/wiki/history.rhtml
@@ -1,28 +1,28 @@
-<div class="contextual">
-<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
-</div>
-
-<h2><%= @page.pretty_title %></h2>
-
-<h3><%= l(:label_history) %></h3>
-
-<table class="list">
-<thead><tr>
-    <th>#</th>
-    <th><%= l(:field_updated_on) %></th>
-    <th><%= l(:field_author) %></th>
-    <th><%= l(:field_comment) %></th>
-</tr></thead>
-<tbody>
-<% @versions.each do |ver| %>
-<tr class="<%= cycle("odd", "even") %>">
-    <th align="center"><%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %></th>
-    <td align="center"><%= format_time(ver.updated_on) %></td>
-    <td><em><%= ver.author ? ver.author.name : "anonyme" %></em></td>
-    <td><%=h ver.comment %></td>
-</tr>
-<% end %>
-</tbody>
-</table>
-
+<div class="contextual">
+<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
+</div>
+
+<h2><%= @page.pretty_title %></h2>
+
+<h3><%= l(:label_history) %></h3>
+
+<table class="list">
+<thead><tr>
+    <th>#</th>
+    <th><%= l(:field_updated_on) %></th>
+    <th><%= l(:field_author) %></th>
+    <th><%= l(:field_comment) %></th>
+</tr></thead>
+<tbody>
+<% @versions.each do |ver| %>
+<tr class="<%= cycle("odd", "even") %>">
+    <th align="center"><%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %></th>
+    <td align="center"><%= format_time(ver.updated_on) %></td>
+    <td><em><%= ver.author ? ver.author.name : "anonyme" %></em></td>
+    <td><%=h ver.comment %></td>
+</tr>
+<% end %>
+</tbody>
+</table>
+
 <p><%= link_to l(:button_back), :action => 'index', :page => @page.title %></p>
 \ No newline at end of file
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index e0369ed30..2e8ee4089 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -1,30 +1,30 @@
-<div class="contextual">
-<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %>
-<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
-<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
-</div>
-
-<% if @content.version != @page.content.version %>
-    <p>    
-    <%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
-    <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}"  %> - 
-    <%= link_to((l(:label_next) + ' &#187;'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
-    <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %>
-    <br />
-    <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
-    <%=h @content.comment %>
-    </p>
-    <hr />
-<% end %>
-
-<div class="wiki">
-<% cache "wiki/show/#{@page.id}/#{@content.version}" do %>
-<%= textilizable @content.text %>
-<% end %>
-</div>
-
-<div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'HTML', {:export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
-<%= link_to 'TXT', {:export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
+<div class="contextual">
+<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') if @content.version == @page.content.version %>
+<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
+<%= link_to(l(:label_page_index), {:action => 'special', :page => 'Page_index'}, :class => 'icon icon-index') %>
+</div>
+
+<% if @content.version != @page.content.version %>
+    <p>    
+    <%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
+    <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}"  %> - 
+    <%= link_to((l(:label_next) + ' &#187;'), :action => 'index', :page => @page.title, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
+    <%= link_to(l(:label_current_version), :action => 'index', :page => @page.title) %>
+    <br />
+    <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
+    <%=h @content.comment %>
+    </p>
+    <hr />
+<% end %>
+
+<div class="wiki">
+<% cache "wiki/show/#{@page.id}/#{@content.version}" do %>
+<%= textilizable @content.text %>
+<% end %>
+</div>
+
+<div class="contextual">
+<%= l(:label_export_to) %>
+<%= link_to 'HTML', {:export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
+<%= link_to 'TXT', {:export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
 </div>
 \ No newline at end of file
diff --git a/app/views/wiki/special_page_index.rhtml b/app/views/wiki/special_page_index.rhtml
index e6e3e7020..ba3cfeed1 100644
--- a/app/views/wiki/special_page_index.rhtml
+++ b/app/views/wiki/special_page_index.rhtml
@@ -1,13 +1,13 @@
-<div class="contextual">
-<% unless @pages.empty? %>
-<%= l(:label_export_to) %> <%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'icon icon-html' %>
-<% end %>
-</div>
-
-<h2><%= l(:label_page_index) %></h2>
-
-<% if @pages.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
-<ul><% @pages.each do |page| %>
-    <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %> -
-    <%= l(:label_last_updates) %>: <%= format_time(page.updated_on) %></li>
+<div class="contextual">
+<% unless @pages.empty? %>
+<%= l(:label_export_to) %> <%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'icon icon-html' %>
+<% end %>
+</div>
+
+<h2><%= l(:label_page_index) %></h2>
+
+<% if @pages.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
+<ul><% @pages.each do |page| %>
+    <li><%= link_to page.pretty_title, :action => 'index', :page => page.title %> -
+    <%= l(:label_last_updates) %>: <%= format_time(page.updated_on) %></li>
 <% end %></ul>
 \ No newline at end of file