# HG changeset patch
# User Chris Cannam
# Date 1330108589 0
# Node ID c6c2cbd0afeeabdfb867edac511cb9f84bdb791e
# Parent  df51e8ff578d8ac46015aec8a8fbd57ec6c46f09
Rename .rhtml files to .html.erb in preparation for merge

diff -r df51e8ff578d -r c6c2cbd0afee app/views/account/login.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/account/login.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,42 @@
+<%= call_hook :view_account_login_top %>
+<div id="login-form">
+<% form_tag({:action=> "login"}) do %>
+<%= back_url_hidden_field_tag %>
+<table>
+<tr>
+    <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
+    <td align="left"><%= text_field_tag 'username', nil, :tabindex => '1' %></td>
+</tr>
+<tr>
+    <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
+    <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
+</tr>
+<% if Setting.openid? %>
+<tr>
+  <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
+  <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
+</tr>
+<% end %>
+<tr>
+    <td></td>
+    <td align="left">
+        <% if Setting.autologin? %>
+        <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
+        <% end %>
+    </td>
+</tr>
+<tr>
+    <td align="left">
+        <% if Setting.lost_password? %>
+            <%= link_to l(:label_password_lost), :controller => 'account', :action => 'lost_password' %>
+        <% end %>
+    </td>
+    <td align="right">
+        <input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/>
+    </td>
+</tr>
+</table>
+<%= javascript_tag "Form.Element.focus('username');" %>
+<% end %>
+</div>
+<%= call_hook :view_account_login_bottom %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/account/login.rhtml
--- a/app/views/account/login.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<%= call_hook :view_account_login_top %>
-<div id="login-form">
-<% form_tag({:action=> "login"}) do %>
-<%= back_url_hidden_field_tag %>
-<table>
-<tr>
-    <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
-    <td align="left"><%= text_field_tag 'username', nil, :tabindex => '1' %></td>
-</tr>
-<tr>
-    <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
-    <td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
-</tr>
-<% if Setting.openid? %>
-<tr>
-  <td align="right"><label for="openid_url"><%=l(:field_identity_url)%></label></td>
-  <td align="left"><%= text_field_tag "openid_url", nil, :tabindex => '3' %></td>
-</tr>
-<% end %>
-<tr>
-    <td></td>
-    <td align="left">
-        <% if Setting.autologin? %>
-        <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
-        <% end %>
-    </td>
-</tr>
-<tr>
-    <td align="left">
-        <% if Setting.lost_password? %>
-            <%= link_to l(:label_password_lost), :controller => 'account', :action => 'lost_password' %>
-        <% end %>
-    </td>
-    <td align="right">
-        <input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/>
-    </td>
-</tr>
-</table>
-<%= javascript_tag "Form.Element.focus('username');" %>
-<% end %>
-</div>
-<%= call_hook :view_account_login_bottom %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/account/lost_password.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/account/lost_password.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,11 @@
+<h2><%=l(:label_password_lost)%></h2>
+
+<div class="box">
+<% 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 %>
+<%= submit_tag l(:button_submit) %></p>
+
+<% end %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/account/lost_password.rhtml
--- a/app/views/account/lost_password.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<h2><%=l(:label_password_lost)%></h2>
-
-<div class="box">
-<% 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 %>
-<%= submit_tag l(:button_submit) %></p>
-
-<% end %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/account/password_recovery.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/account/password_recovery.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<h2><%=l(:label_password_lost)%></h2>
+
+<%= error_messages_for 'user' %>
+
+<% form_tag({:token => @token.value}) do %>
+<div class="box tabular">
+<p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
+<%= password_field_tag 'new_password', nil, :size => 25 %><br />
+<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></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>
+</div>
+<p><%= submit_tag l(:button_save) %></p>
+<% end %>  
diff -r df51e8ff578d -r c6c2cbd0afee app/views/account/password_recovery.rhtml
--- a/app/views/account/password_recovery.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<h2><%=l(:label_password_lost)%></h2>
-
-<%= error_messages_for 'user' %>
-
-<% form_tag({:token => @token.value}) do %>
-<div class="box tabular">
-<p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
-<%= password_field_tag 'new_password', nil, :size => 25 %><br />
-<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></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>
-</div>
-<p><%= submit_tag l(:button_save) %></p>
-<% end %>  
diff -r df51e8ff578d -r c6c2cbd0afee app/views/account/register.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/account/register.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,44 @@
+<h2><%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h2>
+
+<% form_tag({:action => 'register'}, :class => "tabular") do %>
+<%= error_messages_for 'user' %>
+
+<div class="box">
+<!--[form:user]-->
+<% if @user.auth_source_id.nil? %>
+<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  %><br />
+<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
+
+<p><label for="password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
+<%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
+<% end %>
+
+<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>
+
+<p><label for="user_language"><%=l(:field_language)%></label>
+<%= select("user", "language", lang_options_for_select) %></p>
+
+<% if Setting.openid? %>
+<p><label for="user_identity_url"><%=l(:field_identity_url)%></label>
+<%= text_field 'user', 'identity_url'  %></p>
+<% end %>
+
+<% @user.custom_field_values.select {|v| v.editable? || v.required?}.each do |value| %>
+	<p><%= custom_field_tag_with_label :user, value %></p>
+<% end %>
+<!--[eoform:user]-->
+</div>
+
+<%= submit_tag l(:button_submit) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/account/register.rhtml
--- a/app/views/account/register.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<h2><%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h2>
-
-<% form_tag({:action => 'register'}, :class => "tabular") do %>
-<%= error_messages_for 'user' %>
-
-<div class="box">
-<!--[form:user]-->
-<% if @user.auth_source_id.nil? %>
-<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  %><br />
-<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
-
-<p><label for="password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
-<%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
-<% end %>
-
-<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>
-
-<p><label for="user_language"><%=l(:field_language)%></label>
-<%= select("user", "language", lang_options_for_select) %></p>
-
-<% if Setting.openid? %>
-<p><label for="user_identity_url"><%=l(:field_identity_url)%></label>
-<%= text_field 'user', 'identity_url'  %></p>
-<% end %>
-
-<% @user.custom_field_values.select {|v| v.editable? || v.required?}.each do |value| %>
-	<p><%= custom_field_tag_with_label :user, value %></p>
-<% end %>
-<!--[eoform:user]-->
-</div>
-
-<%= submit_tag l(:button_submit) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/_menu.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/admin/_menu.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<div id="admin-menu">
+  <ul>
+    <%= render_menu :admin_menu %>
+  </ul>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/_menu.rhtml
--- a/app/views/admin/_menu.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<div id="admin-menu">
-  <ul>
-    <%= render_menu :admin_menu %>
-  </ul>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/_no_data.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/admin/_no_data.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<div class="nodata">
+<% form_tag({:action => 'default_configuration'}) do %>
+    <%= simple_format(l(:text_no_configuration_data)) %>
+    <p><%= l(:field_language) %>:
+    <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s) %>
+    <%= submit_tag l(:text_load_default_configuration) %></p>
+<% end %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/_no_data.rhtml
--- a/app/views/admin/_no_data.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<div class="nodata">
-<% form_tag({:action => 'default_configuration'}) do %>
-    <%= simple_format(l(:text_no_configuration_data)) %>
-    <p><%= l(:field_language) %>:
-    <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s) %>
-    <%= submit_tag l(:text_load_default_configuration) %></p>
-<% end %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/admin/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<h2><%=l(:label_administration)%></h2>
+
+<div id="admin-index">
+	<%= render :partial => 'no_data' if @no_configuration_data %>
+	<%= render :partial => 'menu' %>
+</div>
+
+<% html_title(l(:label_administration)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/index.rhtml
--- a/app/views/admin/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<h2><%=l(:label_administration)%></h2>
-
-<div id="admin-index">
-	<%= render :partial => 'no_data' if @no_configuration_data %>
-	<%= render :partial => 'menu' %>
-</div>
-
-<% html_title(l(:label_administration)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/info.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/admin/info.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<h2><%=l(:label_information_plural)%></h2>
+
+<p><strong><%= Redmine::Info.versioned_name %></strong> (<%= @db_adapter_name %>)</p>
+
+<table class="list">
+<% @checklist.each do |label, result| %>
+  <tr class="<%= cycle 'odd', 'even' %>">
+    <td><%= l(label) %></td>
+    <td width="30px"><%= image_tag((result ? 'true.png' : 'exclamation.png'),
+                                    :style => "vertical-align:bottom;") %></td>
+  </tr>
+<% end %>
+</table>
+
+<% html_title(l(:label_information_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/info.rhtml
--- a/app/views/admin/info.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<h2><%=l(:label_information_plural)%></h2>
-
-<p><strong><%= Redmine::Info.versioned_name %></strong> (<%= @db_adapter_name %>)</p>
-
-<table class="list">
-<% @checklist.each do |label, result| %>
-  <tr class="<%= cycle 'odd', 'even' %>">
-    <td><%= l(label) %></td>
-    <td width="30px"><%= image_tag((result ? 'true.png' : 'exclamation.png'),
-                                    :style => "vertical-align:bottom;") %></td>
-  </tr>
-<% end %>
-</table>
-
-<% html_title(l(:label_information_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/plugins.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/admin/plugins.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,19 @@
+<h2><%= l(:label_plugins) %></h2>
+
+<% if @plugins.any? %>
+<table class="list plugins">
+    <% @plugins.each do |plugin| %>
+        <tr class="<%= cycle('odd', 'even') %>">
+        <td><span class="name"><%=h plugin.name %></span>
+            <%= content_tag('span', h(plugin.description), :class => 'description') unless plugin.description.blank? %>
+						<%= content_tag('span', link_to(h(plugin.url), plugin.url), :class => 'url') unless plugin.url.blank? %>
+				</td>
+        <td class="author"><%= plugin.author_url.blank? ? h(plugin.author) : link_to(h(plugin.author), plugin.author_url) %></td>
+        <td class="version"><%=h plugin.version %></td>
+        <td class="configure"><%= link_to(l(:button_configure), :controller => 'settings', :action => 'plugin', :id => plugin.id) if plugin.configurable? %></td>
+        </tr>
+    <% end %>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/plugins.rhtml
--- a/app/views/admin/plugins.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<h2><%= l(:label_plugins) %></h2>
-
-<% if @plugins.any? %>
-<table class="list plugins">
-    <% @plugins.each do |plugin| %>
-        <tr class="<%= cycle('odd', 'even') %>">
-        <td><span class="name"><%=h plugin.name %></span>
-            <%= content_tag('span', h(plugin.description), :class => 'description') unless plugin.description.blank? %>
-						<%= content_tag('span', link_to(h(plugin.url), plugin.url), :class => 'url') unless plugin.url.blank? %>
-				</td>
-        <td class="author"><%= plugin.author_url.blank? ? h(plugin.author) : link_to(h(plugin.author), plugin.author_url) %></td>
-        <td class="version"><%=h plugin.version %></td>
-        <td class="configure"><%= link_to(l(:button_configure), :controller => 'settings', :action => 'plugin', :id => plugin.id) if plugin.configurable? %></td>
-        </tr>
-    <% end %>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/projects.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/admin/projects.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,45 @@
+<div class="contextual">
+<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
+</div>
+
+<h2><%=l(:label_project_plural)%></h2>
+
+<% form_tag({}, :method => :get) do %>
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
+<label><%= l(:field_status) %> :</label>
+<%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+<label><%= l(:label_project) %>:</label>
+<%= text_field_tag 'name', params[:name], :size => 30 %>
+<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+<%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %>
+</fieldset>
+<% end %>
+&nbsp;
+
+<div class="autoscroll">
+<table class="list">
+  <thead><tr>
+	<th><%=l(:label_project)%></th>
+	<th><%=l(:field_is_public)%></th>
+	<th><%=l(:field_created_on)%></th>
+  <th></th>
+  </tr></thead>
+  <tbody>
+<% project_tree(@projects) do |project, level| %>
+  <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+	<td class="name"><span><%= link_to_project(project, {:action => 'settings'}, :title => project.short_description) %></span></td>
+	<td align="center"><%= checked_image project.is_public? %></td>
+	<td align="center"><%= format_date(project.created_on) %></td>
+  <td class="buttons">
+    <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
+    <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
+    <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
+    <%= link_to(l(:button_delete), project_destroy_confirm_path(project), :class => 'icon icon-del') %>
+  </td>
+  </tr>
+<% end %>
+  </tbody>
+</table>
+</div>
+
+<% html_title(l(:label_project_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/admin/projects.rhtml
--- a/app/views/admin/projects.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<div class="contextual">
-<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
-</div>
-
-<h2><%=l(:label_project_plural)%></h2>
-
-<% form_tag({}, :method => :get) do %>
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
-<label><%= l(:field_status) %> :</label>
-<%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
-<label><%= l(:label_project) %>:</label>
-<%= text_field_tag 'name', params[:name], :size => 30 %>
-<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
-<%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %>
-</fieldset>
-<% end %>
-&nbsp;
-
-<div class="autoscroll">
-<table class="list">
-  <thead><tr>
-	<th><%=l(:label_project)%></th>
-	<th><%=l(:field_is_public)%></th>
-	<th><%=l(:field_created_on)%></th>
-  <th></th>
-  </tr></thead>
-  <tbody>
-<% project_tree(@projects) do |project, level| %>
-  <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-	<td class="name"><span><%= link_to_project(project, {:action => 'settings'}, :title => project.short_description) %></span></td>
-	<td align="center"><%= checked_image project.is_public? %></td>
-	<td align="center"><%= format_date(project.created_on) %></td>
-  <td class="buttons">
-    <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project, :status => params[:status] }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
-    <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project, :status => params[:status] }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
-    <%= link_to(l(:button_copy), { :controller => 'projects', :action => 'copy', :id => project }, :class => 'icon icon-copy') %>
-    <%= link_to(l(:button_delete), project_destroy_confirm_path(project), :class => 'icon icon-del') %>
-  </td>
-  </tr>
-<% end %>
-  </tbody>
-</table>
-</div>
-
-<% html_title(l(:label_project_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/attachments/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/attachments/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<span id="attachments_fields">
+<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil  -%><label class="inline"><span id="attachment_description_label_content"><%= l(:label_optional_description) %></span><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil %>
+</label>
+</span>
+<br />
+<small><%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %>
+(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+</small>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/attachments/_form.rhtml
--- a/app/views/attachments/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<span id="attachments_fields">
-<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil  -%><label class="inline"><span id="attachment_description_label_content"><%= l(:label_optional_description) %></span><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil %>
-</label>
-</span>
-<br />
-<small><%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %>
-(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
-</small>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/attachments/_links.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/attachments/_links.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,18 @@
+<div class="attachments">
+<% for attachment in attachments %>
+<p><%= link_to_attachment attachment, :class => 'icon icon-attachment' -%>
+<%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+  <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
+  <% if options[:deletable] %>
+    <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => attachment},
+                                         :confirm => l(:text_are_you_sure),
+                                         :method => :post,
+                                         :class => 'delete',
+                                         :title => l(:button_delete) %>
+  <% end %>
+  <% if options[:author] %>
+    <span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
+  <% end %>
+  </p>
+<% end %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/attachments/_links.rhtml
--- a/app/views/attachments/_links.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<div class="attachments">
-<% for attachment in attachments %>
-<p><%= link_to_attachment attachment, :class => 'icon icon-attachment' -%>
-<%= h(" - #{attachment.description}") unless attachment.description.blank? %>
-  <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
-  <% if options[:deletable] %>
-    <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => attachment},
-                                         :confirm => l(:text_are_you_sure),
-                                         :method => :post,
-                                         :class => 'delete',
-                                         :title => l(:button_delete) %>
-  <% end %>
-  <% if options[:author] %>
-    <span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
-  <% end %>
-  </p>
-<% end %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/attachments/diff.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/attachments/diff.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,17 @@
+<h2><%=h @attachment.filename %></h2>
+
+<div class="attachments">
+<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
+   <span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
+<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
+   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
+
+</div>
+&nbsp;
+<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
+
+<% html_title @attachment.filename %>
+
+<% content_for :header_tags do -%>
+    <%= stylesheet_link_tag "scm" -%>
+<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/attachments/diff.rhtml
--- a/app/views/attachments/diff.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<h2><%=h @attachment.filename %></h2>
-
-<div class="attachments">
-<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
-   <span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
-<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
-
-</div>
-&nbsp;
-<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
-
-<% html_title @attachment.filename %>
-
-<% content_for :header_tags do -%>
-    <%= stylesheet_link_tag "scm" -%>
-<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/attachments/file.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/attachments/file.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,17 @@
+<h2><%=h @attachment.filename %></h2>
+
+<div class="attachments">
+<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
+   <span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
+<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
+   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
+
+</div>
+&nbsp;
+<%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
+
+<% html_title @attachment.filename %>
+
+<% content_for :header_tags do -%>
+    <%= stylesheet_link_tag "scm" -%>
+<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/attachments/file.rhtml
--- a/app/views/attachments/file.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<h2><%=h @attachment.filename %></h2>
-
-<div class="attachments">
-<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
-   <span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
-<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
-
-</div>
-&nbsp;
-<%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
-
-<% html_title @attachment.filename %>
-
-<% content_for :header_tags do -%>
-    <%= stylesheet_link_tag "scm" -%>
-<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/auth_sources/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/auth_sources/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,7 @@
+<h2><%=l(:label_auth_source)%> (<%= @auth_source.auth_method_name %>)</h2>
+
+<% form_tag({:action => 'update', :id => @auth_source}, :class => "tabular") do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag l(:button_save) %>
+<% end %>
+
diff -r df51e8ff578d -r c6c2cbd0afee app/views/auth_sources/edit.rhtml
--- a/app/views/auth_sources/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<h2><%=l(:label_auth_source)%> (<%= @auth_source.auth_method_name %>)</h2>
-
-<% form_tag({:action => 'update', :id => @auth_source}, :class => "tabular") do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:button_save) %>
-<% end %>
-
diff -r df51e8ff578d -r c6c2cbd0afee app/views/auth_sources/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/auth_sources/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%=l(:label_auth_source_new)%> (<%= @auth_source.auth_method_name %>)</h2>
+
+<% form_tag({:action => 'create'}, :class => "tabular") do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag l(:button_create) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/auth_sources/new.rhtml
--- a/app/views/auth_sources/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%=l(:label_auth_source_new)%> (<%= @auth_source.auth_method_name %>)</h2>
-
-<% form_tag({:action => 'create'}, :class => "tabular") do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:button_create) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/boards/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<%= error_messages_for 'board' %>
+
+<!--[form:board]-->
+<div class="box">
+<p><%= f.text_field :name, :required => true %></p>
+<p><%= f.text_field :description, :required => true, :size => 80 %></p>
+</div>
+<!--[eoform:board]-->
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/_form.rhtml
--- a/app/views/boards/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<%= error_messages_for 'board' %>
-
-<!--[form:board]-->
-<div class="box">
-<p><%= f.text_field :name, :required => true %></p>
-<p><%= f.text_field :description, :required => true, :size => 80 %></p>
-</div>
-<!--[eoform:board]-->
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/boards/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%= l(:label_board) %></h2>
+
+<% labelled_tabular_form_for :board, @board, :url => {:action => 'edit', :id => @board} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
+  <%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/edit.rhtml
--- a/app/views/boards/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%= l(:label_board) %></h2>
-
-<% labelled_tabular_form_for :board, @board, :url => {:action => 'edit', :id => @board} do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
-  <%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/boards/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,40 @@
+<h2><%= l(:label_board_plural) %></h2>
+
+<table class="list boards">
+  <thead><tr>
+    <th><%= l(:label_board) %></th>
+    <th><%= l(:label_topic_plural) %></th>
+    <th><%= l(:label_message_plural) %></th>
+    <th><%= l(:label_message_last) %></th>
+  </tr></thead>
+  <tbody>
+<% for board in @boards %>
+  <tr class="<%= cycle 'odd', 'even' %>">
+    <td>
+      <%= link_to h(board.name), {:action => 'show', :id => board}, :class => "board"  %><br />
+      <%=h board.description %>
+    </td>
+    <td align="center"><%= board.topics_count %></td>
+    <td align="center"><%= board.messages_count %></td>
+    <td>
+    <small>
+      <% if board.last_message %>
+      <%= authoring board.last_message.created_on, board.last_message.author %><br />
+      <%= link_to_message board.last_message %>  
+      <% end %>
+    </small>
+    </td>
+  </tr>
+<% end %>
+  </tbody>
+</table>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
+<% end %>
+
+<% content_for :header_tags do %>
+  <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
+<% end %>
+
+<% html_title l(:label_board_plural) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/index.rhtml
--- a/app/views/boards/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<h2><%= l(:label_board_plural) %></h2>
-
-<table class="list boards">
-  <thead><tr>
-    <th><%= l(:label_board) %></th>
-    <th><%= l(:label_topic_plural) %></th>
-    <th><%= l(:label_message_plural) %></th>
-    <th><%= l(:label_message_last) %></th>
-  </tr></thead>
-  <tbody>
-<% for board in @boards %>
-  <tr class="<%= cycle 'odd', 'even' %>">
-    <td>
-      <%= link_to h(board.name), {:action => 'show', :id => board}, :class => "board"  %><br />
-      <%=h board.description %>
-    </td>
-    <td align="center"><%= board.topics_count %></td>
-    <td align="center"><%= board.messages_count %></td>
-    <td>
-    <small>
-      <% if board.last_message %>
-      <%= authoring board.last_message.created_on, board.last_message.author %><br />
-      <%= link_to_message board.last_message %>  
-      <% end %>
-    </small>
-    </td>
-  </tr>
-<% end %>
-  </tbody>
-</table>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => @project, :show_messages => 1, :key => User.current.rss_key} %>
-<% end %>
-
-<% content_for :header_tags do %>
-  <%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
-<% end %>
-
-<% html_title l(:label_board_plural) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/boards/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%= l(:label_board_new) %></h2>
+
+<% labelled_tabular_form_for :board, @board, :url => {:action => 'new'} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
+  <%= submit_tag l(:button_create) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/new.rhtml
--- a/app/views/boards/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%= l(:label_board_new) %></h2>
-
-<% labelled_tabular_form_for :board, @board, :url => {:action => 'new'} do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
-  <%= submit_tag l(:button_create) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/boards/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,73 @@
+<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}) %>
+
+<div class="contextual">
+<%= link_to_if_authorized l(:label_message_new),
+                          {:controller => 'messages', :action => 'new', :board_id => @board},
+                          :class => 'icon icon-add',
+                          :onclick => 'Element.show("add-message"); Form.Element.focus("message_subject"); return false;' %>
+<%= watcher_tag(@board, User.current) %>
+</div>
+
+<div id="add-message" style="display:none;">
+<% if authorize_for('messages', 'new') %>
+<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
+<% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+  <%= render :partial => 'messages/form', :locals => {:f => f} %>
+  <p><%= submit_tag l(:button_create) %>
+  <%= link_to_remote l(:label_preview), 
+                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
+                       :method => 'post',
+                       :update => 'preview',
+                       :with => "Form.serialize('message-form')",
+                       :complete => "Element.scrollTo('preview')"
+                     }, :accesskey => accesskey(:preview) %> |
+  <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-message")' %></p>
+<% end %>
+<div id="preview" class="wiki"></div>
+<% end %>
+</div>
+
+<h2><%=h @board.name %></h2>
+<p class="subtitle"><%=h @board.description %></p>
+
+<% if @topics.any? %>
+<table class="list messages">
+  <thead><tr>
+    <th><%= l(:field_subject) %></th>
+    <th><%= l(:field_author) %></th>
+    <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
+    <%= sort_header_tag('replies', :caption => l(:label_reply_plural)) %>
+    <%= sort_header_tag('updated_on', :caption => l(:label_message_last)) %>
+  </tr></thead>  
+  <tbody>
+  <% @topics.each do |topic| %>
+    <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
+      <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic } %></td>
+      <td class="author" align="center"><%= topic.author %></td>
+      <td class="created_on" align="center"><%= format_time(topic.created_on) %></td>
+      <td class="replies" align="center"><%= topic.replies_count %></td>
+      <td class="last_message">
+        <% if topic.last_reply %>
+        <%= authoring topic.last_reply.created_on, topic.last_reply.author %><br />
+        <%= link_to_message topic.last_reply %>
+        <% end %>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
+<p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<% end %>
+
+<% html_title h(@board.name) %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
+    <%= stylesheet_link_tag 'scm' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/boards/show.rhtml
--- a/app/views/boards/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}) %>
-
-<div class="contextual">
-<%= link_to_if_authorized l(:label_message_new),
-                          {:controller => 'messages', :action => 'new', :board_id => @board},
-                          :class => 'icon icon-add',
-                          :onclick => 'Element.show("add-message"); Form.Element.focus("message_subject"); return false;' %>
-<%= watcher_tag(@board, User.current) %>
-</div>
-
-<div id="add-message" style="display:none;">
-<% if authorize_for('messages', 'new') %>
-<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
-<% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
-  <%= render :partial => 'messages/form', :locals => {:f => f} %>
-  <p><%= submit_tag l(:button_create) %>
-  <%= link_to_remote l(:label_preview), 
-                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
-                       :method => 'post',
-                       :update => 'preview',
-                       :with => "Form.serialize('message-form')",
-                       :complete => "Element.scrollTo('preview')"
-                     }, :accesskey => accesskey(:preview) %> |
-  <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-message")' %></p>
-<% end %>
-<div id="preview" class="wiki"></div>
-<% end %>
-</div>
-
-<h2><%=h @board.name %></h2>
-<p class="subtitle"><%=h @board.description %></p>
-
-<% if @topics.any? %>
-<table class="list messages">
-  <thead><tr>
-    <th><%= l(:field_subject) %></th>
-    <th><%= l(:field_author) %></th>
-    <%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
-    <%= sort_header_tag('replies', :caption => l(:label_reply_plural)) %>
-    <%= sort_header_tag('updated_on', :caption => l(:label_message_last)) %>
-  </tr></thead>  
-  <tbody>
-  <% @topics.each do |topic| %>
-    <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-      <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic } %></td>
-      <td class="author" align="center"><%= topic.author %></td>
-      <td class="created_on" align="center"><%= format_time(topic.created_on) %></td>
-      <td class="replies" align="center"><%= topic.replies_count %></td>
-      <td class="last_message">
-        <% if topic.last_reply %>
-        <%= authoring topic.last_reply.created_on, topic.last_reply.author %><br />
-        <%= link_to_message topic.last_reply %>
-        <% end %>
-      </td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
-<p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<% end %>
-
-<% html_title h(@board.name) %>
-
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
-    <%= stylesheet_link_tag 'scm' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_calendar.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/common/_calendar.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,32 @@
+<table class="cal">
+<thead>
+<tr><th scope="col" title="<%= l(:label_week) %>" class="week-number"></th><% 7.times do |i| %><th scope="col"><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
+</thead>
+<tbody>
+<tr>
+<% day = calendar.startdt
+while day <= calendar.enddt %>
+<%= "<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>" if day.cwday == calendar.first_wday %>
+<td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
+<p class="day-num"><%= day.day %></p>	
+<% calendar.events_on(day).each do |i| %>
+  <% if i.is_a? Issue %>
+  <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
+  <%= h("#{i.project} -") unless @project && @project == i.project %>
+  <%= link_to_issue i, :truncate => 30 %>
+  <span class="tip"><%= render_issue_tooltip i %></span>
+  </div>
+  <% else %>
+  <span class="icon icon-package">  
+    <%= h("#{i.project} -") unless @project && @project == i.project %>
+    <%= link_to_version i%>
+  </span>
+  <% end %>
+<% end %>
+</td>
+<%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %>
+<% day = day + 1
+end %>
+</tr>
+</tbody>
+</table>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_calendar.rhtml
--- a/app/views/common/_calendar.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<table class="cal">
-<thead>
-<tr><th scope="col" title="<%= l(:label_week) %>" class="week-number"></th><% 7.times do |i| %><th scope="col"><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
-</thead>
-<tbody>
-<tr>
-<% day = calendar.startdt
-while day <= calendar.enddt %>
-<%= "<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>" if day.cwday == calendar.first_wday %>
-<td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
-<p class="day-num"><%= day.day %></p>	
-<% calendar.events_on(day).each do |i| %>
-  <% if i.is_a? Issue %>
-  <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
-  <%= h("#{i.project} -") unless @project && @project == i.project %>
-  <%= link_to_issue i, :truncate => 30 %>
-  <span class="tip"><%= render_issue_tooltip i %></span>
-  </div>
-  <% else %>
-  <span class="icon icon-package">  
-    <%= h("#{i.project} -") unless @project && @project == i.project %>
-    <%= link_to_version i%>
-  </span>
-  <% end %>
-<% end %>
-</td>
-<%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %>
-<% day = day + 1
-end %>
-</tr>
-</tbody>
-</table>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_diff.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/common/_diff.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,57 @@
+<% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
+
+<% diff.each do |table_file| -%>
+<div class="autoscroll">
+<% if diff.diff_type == 'sbs' -%>
+<table class="filecontent">
+<thead>
+<tr><th colspan="4" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
+</thead>
+<tbody>
+<% table_file.each_line do |spacing, line| -%>
+<% if spacing -%>
+<tr class="spacing">
+  <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
+</tr>
+<% end -%>
+<tr>
+  <th class="line-num"><%= line.nb_line_left %></th>
+  <td class="line-code <%= line.type_diff_left %>">
+    <pre><%=to_utf8 line.html_line_left %></pre>
+  </td>
+  <th class="line-num"><%= line.nb_line_right %></th>
+  <td class="line-code <%= line.type_diff_right %>">
+    <pre><%=to_utf8 line.html_line_right %></pre>
+  </td>
+</tr>
+<% end -%>
+</tbody>
+</table>
+
+<% else -%>
+<table class="filecontent">
+<thead>
+<tr><th colspan="3" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
+</thead>
+<tbody>
+<% table_file.each_line do |spacing, line| %>
+<% if spacing -%>
+<tr class="spacing">
+  <th class="line-num">...</th><th class="line-num">...</th><td></td>
+</tr>
+<% end -%>
+<tr>
+  <th class="line-num"><%= line.nb_line_left %></th>
+  <th class="line-num"><%= line.nb_line_right %></th>
+  <td class="line-code <%= line.type_diff %>">
+    <pre><%=to_utf8 line.html_line %></pre>
+  </td>
+</tr>
+<% end -%>
+</tbody>
+</table>
+<% end -%>
+</div>
+<% end -%>
+
+<%= l(:text_diff_truncated) if diff.truncated? %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_diff.rhtml
--- a/app/views/common/_diff.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-<% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
-
-<% diff.each do |table_file| -%>
-<div class="autoscroll">
-<% if diff.diff_type == 'sbs' -%>
-<table class="filecontent">
-<thead>
-<tr><th colspan="4" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
-</thead>
-<tbody>
-<% table_file.each_line do |spacing, line| -%>
-<% if spacing -%>
-<tr class="spacing">
-  <th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
-</tr>
-<% end -%>
-<tr>
-  <th class="line-num"><%= line.nb_line_left %></th>
-  <td class="line-code <%= line.type_diff_left %>">
-    <pre><%=to_utf8 line.html_line_left %></pre>
-  </td>
-  <th class="line-num"><%= line.nb_line_right %></th>
-  <td class="line-code <%= line.type_diff_right %>">
-    <pre><%=to_utf8 line.html_line_right %></pre>
-  </td>
-</tr>
-<% end -%>
-</tbody>
-</table>
-
-<% else -%>
-<table class="filecontent">
-<thead>
-<tr><th colspan="3" class="filename"><%=to_utf8 table_file.file_name %></th></tr>
-</thead>
-<tbody>
-<% table_file.each_line do |spacing, line| %>
-<% if spacing -%>
-<tr class="spacing">
-  <th class="line-num">...</th><th class="line-num">...</th><td></td>
-</tr>
-<% end -%>
-<tr>
-  <th class="line-num"><%= line.nb_line_left %></th>
-  <th class="line-num"><%= line.nb_line_right %></th>
-  <td class="line-code <%= line.type_diff %>">
-    <pre><%=to_utf8 line.html_line %></pre>
-  </td>
-</tr>
-<% end -%>
-</tbody>
-</table>
-<% end -%>
-</div>
-<% end -%>
-
-<%= l(:text_diff_truncated) if diff.truncated? %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_file.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/common/_file.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,11 @@
+<div class="autoscroll">
+<table class="filecontent syntaxhl">
+<tbody>
+<% line_num = 1 %>
+<% syntax_highlight(filename, to_utf8(content)).each_line do |line| %>
+<tr><th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th><td class="line-code"><pre><%= line %></pre></td></tr>
+<% line_num += 1 %>
+<% end %>
+</tbody>
+</table>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_file.rhtml
--- a/app/views/common/_file.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<div class="autoscroll">
-<table class="filecontent syntaxhl">
-<tbody>
-<% line_num = 1 %>
-<% syntax_highlight(filename, to_utf8(content)).each_line do |line| %>
-<tr><th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th><td class="line-code"><pre><%= line %></pre></td></tr>
-<% line_num += 1 %>
-<% end %>
-</tbody>
-</table>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_preview.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/common/_preview.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,3 @@
+<fieldset class="preview"><legend><%= l(:label_preview) %></legend>
+<%= textilizable @text, :attachments => @attachements, :object => @previewed %>
+</fieldset>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_preview.rhtml
--- a/app/views/common/_preview.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<fieldset class="preview"><legend><%= l(:label_preview) %></legend>
-<%= textilizable @text, :attachments => @attachements, :object => @previewed %>
-</fieldset>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_tabs.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/common/_tabs.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,28 @@
+<% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
+
+<div class="tabs">
+  <ul>
+  <% tabs.each do |tab| -%>
+    <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
+                                    :id => "tab-#{tab[:name]}",
+                                    :class => (tab[:name] != selected_tab ? nil : 'selected'),
+                                    :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
+  <% end -%>
+  </ul>
+  <div class="tabs-buttons" style="display:none;">
+  	<button class="tab-left" onclick="moveTabLeft(this);"></button>
+  	<button class="tab-right" onclick="moveTabRight(this);"></button>
+  </div>
+</div>
+
+<script>
+	Event.observe(window, 'load', function() { displayTabsButtons(); });
+	Event.observe(window, 'resize', function() { displayTabsButtons(); }); 
+</script>
+
+<% tabs.each do |tab| -%>
+  <%= content_tag('div', render(:partial => tab[:partial], :locals => {:tab => tab} ), 
+                       :id => "tab-content-#{tab[:name]}",
+                       :style => (tab[:name] != selected_tab ? 'display:none' : nil),
+                       :class => 'tab-content') %>
+<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/common/_tabs.rhtml
--- a/app/views/common/_tabs.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
-
-<div class="tabs">
-  <ul>
-  <% tabs.each do |tab| -%>
-    <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
-                                    :id => "tab-#{tab[:name]}",
-                                    :class => (tab[:name] != selected_tab ? nil : 'selected'),
-                                    :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
-  <% end -%>
-  </ul>
-  <div class="tabs-buttons" style="display:none;">
-  	<button class="tab-left" onclick="moveTabLeft(this);"></button>
-  	<button class="tab-right" onclick="moveTabRight(this);"></button>
-  </div>
-</div>
-
-<script>
-	Event.observe(window, 'load', function() { displayTabsButtons(); });
-	Event.observe(window, 'resize', function() { displayTabsButtons(); }); 
-</script>
-
-<% tabs.each do |tab| -%>
-  <%= content_tag('div', render(:partial => tab[:partial], :locals => {:tab => tab} ), 
-                       :id => "tab-content-#{tab[:name]}",
-                       :style => (tab[:name] != selected_tab ? 'display:none' : nil),
-                       :class => 'tab-content') %>
-<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/custom_fields/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,114 @@
+<%= error_messages_for 'custom_field' %>
+
+<script type="text/javascript">
+//<![CDATA[
+function toggle_custom_field_format() {
+  format = $("custom_field_field_format");
+  p_length = $("custom_field_min_length");
+  p_regexp = $("custom_field_regexp");
+  p_values = $("custom_field_possible_values");
+  p_searchable = $("custom_field_searchable");
+  p_default = $("custom_field_default_value");
+  
+  p_default.setAttribute('type','text');
+  Element.show(p_default.parentNode);
+  
+  switch (format.value) {
+    case "list":
+      Element.hide(p_length.parentNode);
+      Element.hide(p_regexp.parentNode);
+      if (p_searchable) Element.show(p_searchable.parentNode);
+      Element.show(p_values.parentNode);
+      break;
+    case "bool":
+      p_default.setAttribute('type','checkbox');
+      Element.hide(p_length.parentNode);
+      Element.hide(p_regexp.parentNode);
+      if (p_searchable) Element.hide(p_searchable.parentNode);
+      Element.hide(p_values.parentNode);
+      break;
+    case "date":
+      Element.hide(p_length.parentNode);
+      Element.hide(p_regexp.parentNode);
+      if (p_searchable) Element.hide(p_searchable.parentNode);
+      Element.hide(p_values.parentNode);
+      break;
+    case "float":
+    case "int":
+      Element.show(p_length.parentNode);
+      Element.show(p_regexp.parentNode);
+      if (p_searchable) Element.hide(p_searchable.parentNode);
+      Element.hide(p_values.parentNode);
+      break;
+		case "user":
+    case "version":
+      Element.hide(p_length.parentNode);
+      Element.hide(p_regexp.parentNode);
+      if (p_searchable) Element.hide(p_searchable.parentNode);
+      Element.hide(p_values.parentNode);
+      Element.hide(p_default.parentNode);
+		  break;
+    default:
+      Element.show(p_length.parentNode);
+      Element.show(p_regexp.parentNode);
+      if (p_searchable) Element.show(p_searchable.parentNode);
+      Element.hide(p_values.parentNode);
+      break;
+  }
+}
+
+//]]>
+</script>
+
+<div class="box">
+<p><%= f.text_field :name, :required => true %></p>
+<p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :onchange => "toggle_custom_field_format();",
+																																		:disabled => !@custom_field.new_record? %></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_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15 %>
+  <br /><em><%= l(:text_custom_field_possible_values_info) %></em>
+</p>
+<p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
+<%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
+</div>
+
+<div class="box">
+<% case @custom_field.class.name
+when "IssueCustomField" %>
+    
+    <fieldset><legend><%=l(:label_tracker_plural)%></legend>
+    <% for tracker in @trackers %>
+        <%= check_box_tag "custom_field[tracker_ids][]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
+    <% end %>
+		<%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
+    </fieldset>
+    &nbsp;
+    <p><%= f.check_box :is_required %></p>
+    <p><%= f.check_box :is_for_all %></p>
+    <p><%= f.check_box :is_filter %></p>
+    <p><%= f.check_box :searchable %></p>
+    
+<% when "UserCustomField" %>
+    <p><%= f.check_box :is_required %></p>
+    <p><%= f.check_box :visible %></p>
+    <p><%= f.check_box :editable %></p>
+
+<% when "ProjectCustomField" %>
+    <p><%= f.check_box :is_required %></p>
+    <p><%= f.check_box :visible %></p>
+    <p><%= f.check_box :searchable %></p>
+
+<% when "TimeEntryCustomField" %>
+    <p><%= f.check_box :is_required %></p>
+
+<% else %>
+    <p><%= f.check_box :is_required %></p>
+    
+<% end %>
+<%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
+</div>
+<%= javascript_tag "toggle_custom_field_format();" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/_form.rhtml
--- a/app/views/custom_fields/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-<%= error_messages_for 'custom_field' %>
-
-<script type="text/javascript">
-//<![CDATA[
-function toggle_custom_field_format() {
-  format = $("custom_field_field_format");
-  p_length = $("custom_field_min_length");
-  p_regexp = $("custom_field_regexp");
-  p_values = $("custom_field_possible_values");
-  p_searchable = $("custom_field_searchable");
-  p_default = $("custom_field_default_value");
-  
-  p_default.setAttribute('type','text');
-  Element.show(p_default.parentNode);
-  
-  switch (format.value) {
-    case "list":
-      Element.hide(p_length.parentNode);
-      Element.hide(p_regexp.parentNode);
-      if (p_searchable) Element.show(p_searchable.parentNode);
-      Element.show(p_values.parentNode);
-      break;
-    case "bool":
-      p_default.setAttribute('type','checkbox');
-      Element.hide(p_length.parentNode);
-      Element.hide(p_regexp.parentNode);
-      if (p_searchable) Element.hide(p_searchable.parentNode);
-      Element.hide(p_values.parentNode);
-      break;
-    case "date":
-      Element.hide(p_length.parentNode);
-      Element.hide(p_regexp.parentNode);
-      if (p_searchable) Element.hide(p_searchable.parentNode);
-      Element.hide(p_values.parentNode);
-      break;
-    case "float":
-    case "int":
-      Element.show(p_length.parentNode);
-      Element.show(p_regexp.parentNode);
-      if (p_searchable) Element.hide(p_searchable.parentNode);
-      Element.hide(p_values.parentNode);
-      break;
-		case "user":
-    case "version":
-      Element.hide(p_length.parentNode);
-      Element.hide(p_regexp.parentNode);
-      if (p_searchable) Element.hide(p_searchable.parentNode);
-      Element.hide(p_values.parentNode);
-      Element.hide(p_default.parentNode);
-		  break;
-    default:
-      Element.show(p_length.parentNode);
-      Element.show(p_regexp.parentNode);
-      if (p_searchable) Element.show(p_searchable.parentNode);
-      Element.hide(p_values.parentNode);
-      break;
-  }
-}
-
-//]]>
-</script>
-
-<div class="box">
-<p><%= f.text_field :name, :required => true %></p>
-<p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :onchange => "toggle_custom_field_format();",
-																																		:disabled => !@custom_field.new_record? %></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_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15 %>
-  <br /><em><%= l(:text_custom_field_possible_values_info) %></em>
-</p>
-<p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
-<%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
-</div>
-
-<div class="box">
-<% case @custom_field.class.name
-when "IssueCustomField" %>
-    
-    <fieldset><legend><%=l(:label_tracker_plural)%></legend>
-    <% for tracker in @trackers %>
-        <%= check_box_tag "custom_field[tracker_ids][]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= tracker.name %>
-    <% end %>
-		<%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
-    </fieldset>
-    &nbsp;
-    <p><%= f.check_box :is_required %></p>
-    <p><%= f.check_box :is_for_all %></p>
-    <p><%= f.check_box :is_filter %></p>
-    <p><%= f.check_box :searchable %></p>
-    
-<% when "UserCustomField" %>
-    <p><%= f.check_box :is_required %></p>
-    <p><%= f.check_box :visible %></p>
-    <p><%= f.check_box :editable %></p>
-
-<% when "ProjectCustomField" %>
-    <p><%= f.check_box :is_required %></p>
-    <p><%= f.check_box :visible %></p>
-    <p><%= f.check_box :searchable %></p>
-
-<% when "TimeEntryCustomField" %>
-    <p><%= f.check_box :is_required %></p>
-
-<% else %>
-    <p><%= f.check_box :is_required %></p>
-    
-<% end %>
-<%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
-</div>
-<%= javascript_tag "toggle_custom_field_format();" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/_index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/custom_fields/_index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,35 @@
+<table class="list">
+  <thead><tr>
+	<th width="30%"><%=l(:field_name)%></th>
+	<th><%=l(:field_field_format)%></th>
+	<th><%=l(:field_is_required)%></th>
+	<% if tab[:name] == 'IssueCustomField' %>
+	<th><%=l(:field_is_for_all)%></th>
+	<th><%=l(:label_used_by)%></th>
+	<% end %>
+	<th><%=l(:button_sort)%></th>
+	<th width="10%"></th>
+  </tr></thead>
+  <tbody>
+	<% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
+		<tr class="<%= cycle("odd", "even") %>">
+			<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
+			<td align="center"><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %></td>
+			<td align="center"><%= checked_image custom_field.is_required? %></td>
+			<% if tab[:name] == 'IssueCustomField' %>
+			<td align="center"><%= checked_image custom_field.is_for_all? %></td>
+			<td align="center"><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
+			<% end %>
+		  <td align="center" style="width:15%;"><%= reorder_links('custom_field', {:action => 'edit', :id => custom_field}) %></td>
+			<td class="buttons">
+				<%= link_to(l(:button_delete), { :action => 'destroy', :id => custom_field },
+																			 :method => :post,
+																			 :confirm => l(:text_are_you_sure),
+																			 :class => 'icon icon-del') %>
+		  </td>
+		</tr>
+	<% end; reset_cycle %>
+  </tbody>
+</table>
+
+<p><%= link_to l(:label_custom_field_new), {:action => 'new', :type => tab[:name]}, :class => 'icon icon-add' %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/_index.rhtml
--- a/app/views/custom_fields/_index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<table class="list">
-  <thead><tr>
-	<th width="30%"><%=l(:field_name)%></th>
-	<th><%=l(:field_field_format)%></th>
-	<th><%=l(:field_is_required)%></th>
-	<% if tab[:name] == 'IssueCustomField' %>
-	<th><%=l(:field_is_for_all)%></th>
-	<th><%=l(:label_used_by)%></th>
-	<% end %>
-	<th><%=l(:button_sort)%></th>
-	<th width="10%"></th>
-  </tr></thead>
-  <tbody>
-	<% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
-		<tr class="<%= cycle("odd", "even") %>">
-			<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
-			<td align="center"><%= l(Redmine::CustomFieldFormat.label_for(custom_field.field_format)) %></td>
-			<td align="center"><%= checked_image custom_field.is_required? %></td>
-			<% if tab[:name] == 'IssueCustomField' %>
-			<td align="center"><%= checked_image custom_field.is_for_all? %></td>
-			<td align="center"><%= l(:label_x_projects, :count => custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
-			<% end %>
-		  <td align="center" style="width:15%;"><%= reorder_links('custom_field', {:action => 'edit', :id => custom_field}) %></td>
-			<td class="buttons">
-				<%= link_to(l(:button_delete), { :action => 'destroy', :id => custom_field },
-																			 :method => :post,
-																			 :confirm => l(:text_are_you_sure),
-																			 :class => 'icon icon-del') %>
-		  </td>
-		</tr>
-	<% end; reset_cycle %>
-  </tbody>
-</table>
-
-<p><%= link_to l(:label_custom_field_new), {:action => 'new', :type => tab[:name]}, :class => 'icon icon-add' %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/custom_fields/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %> 
+  &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.type %>
+  &#187; <%=h @custom_field.name %></h2>
+
+<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "edit", :id => @custom_field } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/edit.rhtml
--- a/app/views/custom_fields/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %> 
-  &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.type %>
-  &#187; <%=h @custom_field.name %></h2>
-
-<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "edit", :id => @custom_field } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/custom_fields/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<h2><%=l(:label_custom_field_plural)%></h2>
+
+<%= render_tabs custom_fields_tabs %>
+
+<% html_title(l(:label_custom_field_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/index.rhtml
--- a/app/views/custom_fields/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<h2><%=l(:label_custom_field_plural)%></h2>
-
-<%= render_tabs custom_fields_tabs %>
-
-<% html_title(l(:label_custom_field_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/custom_fields/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,9 @@
+<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %>
+  &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.type %>
+  &#187; <%= l(:label_custom_field_new) %></h2>
+
+<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "new" } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= hidden_field_tag 'type', @custom_field.type %>
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/custom_fields/new.rhtml
--- a/app/views/custom_fields/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %>
-  &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.type %>
-  &#187; <%= l(:label_custom_field_new) %></h2>
-
-<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "new" } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= hidden_field_tag 'type', @custom_field.type %>
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/_document.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/documents/_document.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h4><%= link_to h(document.title), :controller => 'documents', :action => 'show', :id => document %></h4>
+<p><em><%= format_time(document.updated_on) %></em></p>
+
+<div class="wiki">
+	<%= textilizable(truncate_lines(document.description)) %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/_document.rhtml
--- a/app/views/documents/_document.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h4><%= link_to h(document.title), :controller => 'documents', :action => 'show', :id => document %></h4>
-<p><em><%= format_time(document.updated_on) %></em></p>
-
-<div class="wiki">
-	<%= textilizable(truncate_lines(document.description)) %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/documents/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<%= error_messages_for 'document' %>
+<div class="box">
+<!--[form:document]-->
+<p><label for="document_category_id"><%=l(:field_category)%></label>
+<%= select('document', 'category_id', DocumentCategory.all.collect {|c| [c.name, c.id]}) %></p>
+
+<p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label>
+<%= text_field 'document', 'title', :size => 60 %></p>
+
+<p><label for="document_description"><%=l(:field_description)%></label>
+<%= text_area 'document', 'description', :cols => 60, :rows => 15, :class => 'wiki-edit' %></p>
+<!--[eoform:document]-->
+</div>
+
+<%= wikitoolbar_for 'document_description' %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/_form.rhtml
--- a/app/views/documents/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<%= error_messages_for 'document' %>
-<div class="box">
-<!--[form:document]-->
-<p><label for="document_category_id"><%=l(:field_category)%></label>
-<%= select('document', 'category_id', DocumentCategory.all.collect {|c| [c.name, c.id]}) %></p>
-
-<p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label>
-<%= text_field 'document', 'title', :size => 60 %></p>
-
-<p><label for="document_description"><%=l(:field_description)%></label>
-<%= text_area 'document', 'description', :cols => 60, :rows => 15, :class => 'wiki-edit' %></p>
-<!--[eoform:document]-->
-</div>
-
-<%= wikitoolbar_for 'document_description' %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/documents/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<h2><%=l(:label_document)%></h2>
+
+<% form_tag({:action => 'edit', :id => @document}, :class => "tabular") do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag l(:button_save) %>
+<% end %>
+
+
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/edit.rhtml
--- a/app/views/documents/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<h2><%=l(:label_document)%></h2>
-
-<% form_tag({:action => 'edit', :id => @document}, :class => "tabular") do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:button_save) %>
-<% end %>
-
-
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/documents/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,39 @@
+<div class="contextual">
+<%= link_to_if_authorized l(:label_document_new),
+                          {:controller => 'documents', :action => 'new', :project_id => @project},
+                          :class => 'icon icon-add',
+                          :onclick => 'Element.show("add-document"); Form.Element.focus("document_title"); return false;' %>
+</div>
+
+<div id="add-document" style="display:none;">
+<h2><%=l(:label_document_new)%></h2>
+<% form_tag({:controller => 'documents', :action => 'new', :project_id => @project}, :class => "tabular", :multipart => true) do %>
+<%= render :partial => 'documents/form' %>
+<div class="box">
+<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
+</div>
+<%= submit_tag l(:button_create) %>
+<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-document")' %>
+<% end %>
+</div>
+
+<h2><%=l(:label_document_plural)%></h2>
+
+<% if @grouped.empty? %><p class="nodata"><%= l(:label_no_data) %></p><% end %>
+
+<% @grouped.keys.sort.each do |group| %>
+    <h3><%= group %></h3>
+    <%= render :partial => 'documents/document', :collection => @grouped[group] %>
+<% end %>
+
+<% content_for :sidebar do %>
+    <h3><%= l(:label_sort_by, '') %></h3>
+    <% form_tag({}, :method => :get) do %>
+    <label><%= radio_button_tag 'sort_by', 'category', (@sort_by == 'category'), :onclick => 'this.form.submit();' %> <%= l(:field_category) %></label><br />
+    <label><%= radio_button_tag 'sort_by', 'date', (@sort_by == 'date'), :onclick => 'this.form.submit();' %> <%= l(:label_date) %></label><br />
+    <label><%= radio_button_tag 'sort_by', 'title', (@sort_by == 'title'), :onclick => 'this.form.submit();' %> <%= l(:field_title) %></label><br />
+    <label><%= radio_button_tag 'sort_by', 'author', (@sort_by == 'author'), :onclick => 'this.form.submit();' %> <%= l(:field_author) %></label>
+    <% end %>
+<% end %>
+
+<% html_title(l(:label_document_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/index.rhtml
--- a/app/views/documents/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-<div class="contextual">
-<%= link_to_if_authorized l(:label_document_new),
-                          {:controller => 'documents', :action => 'new', :project_id => @project},
-                          :class => 'icon icon-add',
-                          :onclick => 'Element.show("add-document"); Form.Element.focus("document_title"); return false;' %>
-</div>
-
-<div id="add-document" style="display:none;">
-<h2><%=l(:label_document_new)%></h2>
-<% form_tag({:controller => 'documents', :action => 'new', :project_id => @project}, :class => "tabular", :multipart => true) do %>
-<%= render :partial => 'documents/form' %>
-<div class="box">
-<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
-</div>
-<%= submit_tag l(:button_create) %>
-<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-document")' %>
-<% end %>
-</div>
-
-<h2><%=l(:label_document_plural)%></h2>
-
-<% if @grouped.empty? %><p class="nodata"><%= l(:label_no_data) %></p><% end %>
-
-<% @grouped.keys.sort.each do |group| %>
-    <h3><%= group %></h3>
-    <%= render :partial => 'documents/document', :collection => @grouped[group] %>
-<% end %>
-
-<% content_for :sidebar do %>
-    <h3><%= l(:label_sort_by, '') %></h3>
-    <% form_tag({}, :method => :get) do %>
-    <label><%= radio_button_tag 'sort_by', 'category', (@sort_by == 'category'), :onclick => 'this.form.submit();' %> <%= l(:field_category) %></label><br />
-    <label><%= radio_button_tag 'sort_by', 'date', (@sort_by == 'date'), :onclick => 'this.form.submit();' %> <%= l(:label_date) %></label><br />
-    <label><%= radio_button_tag 'sort_by', 'title', (@sort_by == 'title'), :onclick => 'this.form.submit();' %> <%= l(:field_title) %></label><br />
-    <label><%= radio_button_tag 'sort_by', 'author', (@sort_by == 'author'), :onclick => 'this.form.submit();' %> <%= l(:field_author) %></label>
-    <% end %>
-<% end %>
-
-<% html_title(l(:label_document_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/documents/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,13 @@
+<h2><%=l(:label_document_new)%></h2>
+
+<% form_tag({:controller => 'documents', :action => 'new', :project_id => @project}, :class => "tabular", :multipart => true) do %>
+<%= render :partial => 'documents/form' %>
+
+<div class="box">
+<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
+</div>
+
+<%= submit_tag l(:button_create) %>
+<% end %>
+
+
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/new.rhtml
--- a/app/views/documents/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<h2><%=l(:label_document_new)%></h2>
-
-<% form_tag({:controller => 'documents', :action => 'new', :project_id => @project}, :class => "tabular", :multipart => true) do %>
-<%= render :partial => 'documents/form' %>
-
-<div class="box">
-<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
-</div>
-
-<%= submit_tag l(:button_create) %>
-<% end %>
-
-
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/documents/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,32 @@
+<div class="contextual">
+<%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'icon icon-edit', :accesskey => accesskey(: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><%=h @document.title %></h2>
+
+<p><em><%=h @document.category.name %><br />
+<%= format_date @document.created_on %></em></p>
+<div class="wiki">
+<%= textilizable @document.description, :attachments => @document.attachments %>
+</div>
+
+<h3><%= l(:label_attachment_plural) %></h3>
+<%= link_to_attachments @document %>
+
+<% if authorize_for('documents', 'add_attachment') %>
+<p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
+                                             :id => 'attach_files_link' %></p>
+  <% form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+  <div class="box">
+  <p><%= render :partial => 'attachments/form' %></p>
+  </div>
+  <%= submit_tag l(:button_add) %>
+  <% end %> 
+<% end %>
+
+<% html_title @document.title -%>
+
+<% content_for :header_tags do %>
+    <%= stylesheet_link_tag 'scm' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/documents/show.rhtml
--- a/app/views/documents/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'icon icon-edit', :accesskey => accesskey(: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><%=h @document.title %></h2>
-
-<p><em><%=h @document.category.name %><br />
-<%= format_date @document.created_on %></em></p>
-<div class="wiki">
-<%= textilizable @document.description, :attachments => @document.attachments %>
-</div>
-
-<h3><%= l(:label_attachment_plural) %></h3>
-<%= link_to_attachments @document %>
-
-<% if authorize_for('documents', 'add_attachment') %>
-<p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
-                                             :id => 'attach_files_link' %></p>
-  <% form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
-  <div class="box">
-  <p><%= render :partial => 'attachments/form' %></p>
-  </div>
-  <%= submit_tag l(:button_add) %>
-  <% end %> 
-<% end %>
-
-<% html_title @document.title -%>
-
-<% content_for :header_tags do %>
-    <%= stylesheet_link_tag 'scm' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/enumerations/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,19 @@
+<%= error_messages_for 'enumeration' %>
+<div class="box">
+<!--[form:optvalue]-->
+<%= hidden_field 'enumeration', 'type'  %>
+
+<p><label for="enumeration_name"><%=l(:field_name)%></label>
+<%= text_field 'enumeration', 'name'  %></p>
+
+<p><label for="enumeration_active"><%=l(:field_active)%></label>
+<%= check_box 'enumeration', 'active'  %></p>
+
+<p><label for="enumeration_is_default"><%=l(:field_is_default)%></label>
+<%= check_box 'enumeration', 'is_default'  %></p>
+<!--[eoform:optvalue]-->
+
+<% @enumeration.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :enumeration, value %></p>
+<% end %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/_form.rhtml
--- a/app/views/enumerations/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<%= error_messages_for 'enumeration' %>
-<div class="box">
-<!--[form:optvalue]-->
-<%= hidden_field 'enumeration', 'type'  %>
-
-<p><label for="enumeration_name"><%=l(:field_name)%></label>
-<%= text_field 'enumeration', 'name'  %></p>
-
-<p><label for="enumeration_active"><%=l(:field_active)%></label>
-<%= check_box 'enumeration', 'active'  %></p>
-
-<p><label for="enumeration_is_default"><%=l(:field_is_default)%></label>
-<%= check_box 'enumeration', 'is_default'  %></p>
-<!--[eoform:optvalue]-->
-
-<% @enumeration.custom_field_values.each do |value| %>
-	<p><%= custom_field_tag_with_label :enumeration, value %></p>
-<% end %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/destroy.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/enumerations/destroy.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,12 @@
+<h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
+
+<% form_tag({}) do %>
+<div class="box">
+<p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
+<p><%= l(:text_enumeration_category_reassign_to) %>
+<%= select_tag 'reassign_to_id', ("<option>--- #{l(:actionview_instancetag_blank_option)} ---</option>" + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
+</div>
+
+<%= submit_tag l(:button_apply) %>
+<%= link_to l(:button_cancel), :controller => 'enumerations', :action => 'index' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/destroy.rhtml
--- a/app/views/enumerations/destroy.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
-
-<% form_tag({}) do %>
-<div class="box">
-<p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
-<p><%= l(:text_enumeration_category_reassign_to) %>
-<%= select_tag 'reassign_to_id', ("<option>--- #{l(:actionview_instancetag_blank_option)} ---</option>" + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
-</div>
-
-<%= submit_tag l(:button_apply) %>
-<%= link_to l(:button_cancel), :controller => 'enumerations', :action => 'index' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/enumerations/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,10 @@
+<h2><%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> &#187; <%=h @enumeration %></h2>
+
+<% form_tag({:action => 'update', :id => @enumeration}, :class => "tabular") do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag l(:button_save) %>
+<% end %>
+
+<% form_tag({:action => 'destroy', :id => @enumeration}) do %>
+  <%= submit_tag l(:button_delete) %>
+<% end %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/edit.rhtml
--- a/app/views/enumerations/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<h2><%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> &#187; <%=h @enumeration %></h2>
-
-<% form_tag({:action => 'update', :id => @enumeration}, :class => "tabular") do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:button_save) %>
-<% end %>
-
-<% form_tag({:action => 'destroy', :id => @enumeration}) do %>
-  <%= submit_tag l(:button_delete) %>
-<% end %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/list.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/enumerations/list.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,37 @@
+<h2><%=l(:label_enumerations)%></h2>
+
+<% Enumeration.get_subclasses.each do |klass| %>
+<h3><%= l(klass::OptionName) %></h3>
+
+<% enumerations = klass.shared %>
+<% if enumerations.any? %>
+<table class="list"><thead>
+<tr>
+    <th><%= l(:field_name) %></th>
+    <th style="width:15%;"><%= l(:field_is_default) %></th>
+    <th style="width:15%;"><%= l(:field_active) %></th>
+    <th style="width:15%;"></th>
+    <th align="center" style="width:10%;"> </th>
+</tr></thead>
+<% enumerations.each do |enumeration| %>
+<tr class="<%= cycle('odd', 'even') %>">
+    <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
+    <td class="center" style="width:15%;"><%= checked_image enumeration.is_default? %></td>
+    <td class="center" style="width:15%;"><%= checked_image enumeration.active? %></td>
+    <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
+    <td class="buttons">
+    <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration }, 
+    															 :method => :post,
+    															 :confirm => l(:text_are_you_sure),
+    															 :class => 'icon icon-del' %>
+    </td>
+</tr>
+<% end %>
+</table>
+<% reset_cycle %>
+<% end %>
+
+<p><%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %></p>
+<% end %>
+
+<% html_title(l(:label_enumerations)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/list.rhtml
--- a/app/views/enumerations/list.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<h2><%=l(:label_enumerations)%></h2>
-
-<% Enumeration.get_subclasses.each do |klass| %>
-<h3><%= l(klass::OptionName) %></h3>
-
-<% enumerations = klass.shared %>
-<% if enumerations.any? %>
-<table class="list"><thead>
-<tr>
-    <th><%= l(:field_name) %></th>
-    <th style="width:15%;"><%= l(:field_is_default) %></th>
-    <th style="width:15%;"><%= l(:field_active) %></th>
-    <th style="width:15%;"></th>
-    <th align="center" style="width:10%;"> </th>
-</tr></thead>
-<% enumerations.each do |enumeration| %>
-<tr class="<%= cycle('odd', 'even') %>">
-    <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
-    <td class="center" style="width:15%;"><%= checked_image enumeration.is_default? %></td>
-    <td class="center" style="width:15%;"><%= checked_image enumeration.active? %></td>
-    <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
-    <td class="buttons">
-    <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration }, 
-    															 :method => :post,
-    															 :confirm => l(:text_are_you_sure),
-    															 :class => 'icon icon-del' %>
-    </td>
-</tr>
-<% end %>
-</table>
-<% reset_cycle %>
-<% end %>
-
-<p><%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %></p>
-<% end %>
-
-<% html_title(l(:label_enumerations)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/enumerations/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> &#187; <%=l(:label_enumeration_new)%></h2>
+
+<% form_tag({:action => 'create'}, :class => "tabular") do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag l(:button_create) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/enumerations/new.rhtml
--- a/app/views/enumerations/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> &#187; <%=l(:label_enumeration_new)%></h2>
-
-<% form_tag({:action => 'create'}, :class => "tabular") do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:button_create) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_categories/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issue_categories/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<%= error_messages_for 'category' %>
+
+<div class="box">
+<p><%= f.text_field :name, :size => 30, :required => true %></p>
+<p><%= f.select :assigned_to_id, @project.users.sort.collect{|u| [u.name, u.id]}, :include_blank => true %></p>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_categories/_form.rhtml
--- a/app/views/issue_categories/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<%= error_messages_for 'category' %>
-
-<div class="box">
-<p><%= f.text_field :name, :size => 30, :required => true %></p>
-<p><%= f.select :assigned_to_id, @project.users.sort.collect{|u| [u.name, u.id]}, :include_blank => true %></p>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_categories/destroy.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issue_categories/destroy.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<h2><%=l(:label_issue_category)%>: <%=h @category.name %></h2>
+
+<% form_tag({}) do %>
+<div class="box">
+<p><strong><%= l(:text_issue_category_destroy_question, @issue_count) %></strong></p>
+<p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_issue_category_destroy_assignments) %></label><br />
+<% if @categories.size > 0 %>
+<label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_issue_category_reassign_to) %></label>:
+<%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %></p>
+<% end %>
+</div>
+
+<%= submit_tag l(:button_apply) %>
+<%= link_to l(:button_cancel), :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_categories/destroy.rhtml
--- a/app/views/issue_categories/destroy.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<h2><%=l(:label_issue_category)%>: <%=h @category.name %></h2>
-
-<% form_tag({}) do %>
-<div class="box">
-<p><strong><%= l(:text_issue_category_destroy_question, @issue_count) %></strong></p>
-<p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_issue_category_destroy_assignments) %></label><br />
-<% if @categories.size > 0 %>
-<label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_issue_category_reassign_to) %></label>:
-<%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %></p>
-<% end %>
-</div>
-
-<%= submit_tag l(:button_apply) %>
-<%= link_to l(:button_cancel), :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_categories/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issue_categories/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%=l(:label_issue_category)%></h2>
+
+<% labelled_tabular_form_for :category, @category, :url => { :action => 'edit', :id => @category } do |f| %>
+<%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_categories/edit.rhtml
--- a/app/views/issue_categories/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%=l(:label_issue_category)%></h2>
-
-<% labelled_tabular_form_for :category, @category, :url => { :action => 'edit', :id => @category } do |f| %>
-<%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_moves/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issue_moves/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,79 @@
+<h2><%= @copy ? l(:button_copy) : l(:button_move) %></h2>
+
+<ul>
+<% @issues.each do |issue| -%>
+	<li><%= link_to_issue issue %></li>
+<% end -%>
+</ul>
+
+<% form_tag({:action => 'create'}, :id => 'move_form') do %>
+<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
+
+<div class="box tabular">
+<fieldset class="attributes">
+<legend><%= l(:label_change_properties) %></legend>
+
+<div class="splitcontentleft">
+<p><label for="new_project_id"><%=l(:field_project)%>:</label>
+<%= select_tag "new_project_id",
+               project_tree_options_for_select(@allowed_projects, :selected => @target_project),
+               :onchange => remote_function(:url => { :action => 'new' },
+                                            :method => :get,
+                                            :update => 'content',
+                                            :with => "Form.serialize('move_form')") %></p>
+
+<p><label for="new_tracker_id"><%=l(:field_tracker)%>:</label>
+<%= select_tag "new_tracker_id", "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, "id", "name") %></p>
+
+<p>
+  <label><%= l(:field_status) %></label>
+  <%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
+</p>
+
+<p>
+  <label><%= l(:field_priority) %></label>
+  <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
+</p>
+
+<p>
+  <label><%= l(:field_assigned_to) %></label>
+  <%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') +
+                                   content_tag('option', l(:label_nobody), :value => 'none') +
+                                   options_from_collection_for_select(@target_project.assignable_users, :id, :name)) %>
+</p>
+</div>
+
+<div class="splitcontentright">
+<p>
+  <label><%= l(:field_start_date) %></label>
+  <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
+</p>
+
+<p>
+  <label><%= l(:field_due_date) %></label>
+  <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
+</p>
+</div>
+
+</fieldset>
+
+<fieldset><legend><%= l(:field_notes) %></legend>
+<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
+<%= wikitoolbar_for 'notes' %>
+</fieldset>
+
+<%= call_hook(:view_issues_move_bottom, :issues => @issues, :target_project => @target_project, :copy => !!@copy) %>
+</div>
+
+<% if @copy %>
+	<%= hidden_field_tag("copy_options[copy]", "1") %>
+	<%= submit_tag l(:button_copy) %>
+	<%= submit_tag l(:button_copy_and_follow), :name => 'follow' %>
+<% else %>
+	<%= submit_tag l(:button_move) %>
+	<%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
+<% end %>
+<% end %>
+<% content_for :header_tags do %>
+	<%= robot_exclusion_tag %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_moves/new.rhtml
--- a/app/views/issue_moves/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-<h2><%= @copy ? l(:button_copy) : l(:button_move) %></h2>
-
-<ul>
-<% @issues.each do |issue| -%>
-	<li><%= link_to_issue issue %></li>
-<% end -%>
-</ul>
-
-<% form_tag({:action => 'create'}, :id => 'move_form') do %>
-<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
-
-<div class="box tabular">
-<fieldset class="attributes">
-<legend><%= l(:label_change_properties) %></legend>
-
-<div class="splitcontentleft">
-<p><label for="new_project_id"><%=l(:field_project)%>:</label>
-<%= select_tag "new_project_id",
-               project_tree_options_for_select(@allowed_projects, :selected => @target_project),
-               :onchange => remote_function(:url => { :action => 'new' },
-                                            :method => :get,
-                                            :update => 'content',
-                                            :with => "Form.serialize('move_form')") %></p>
-
-<p><label for="new_tracker_id"><%=l(:field_tracker)%>:</label>
-<%= select_tag "new_tracker_id", "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, "id", "name") %></p>
-
-<p>
-  <label><%= l(:field_status) %></label>
-  <%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
-</p>
-
-<p>
-  <label><%= l(:field_priority) %></label>
-  <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
-</p>
-
-<p>
-  <label><%= l(:field_assigned_to) %></label>
-  <%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') +
-                                   content_tag('option', l(:label_nobody), :value => 'none') +
-                                   options_from_collection_for_select(@target_project.assignable_users, :id, :name)) %>
-</p>
-</div>
-
-<div class="splitcontentright">
-<p>
-  <label><%= l(:field_start_date) %></label>
-  <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>
-</p>
-
-<p>
-  <label><%= l(:field_due_date) %></label>
-  <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>
-</p>
-</div>
-
-</fieldset>
-
-<fieldset><legend><%= l(:field_notes) %></legend>
-<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
-<%= wikitoolbar_for 'notes' %>
-</fieldset>
-
-<%= call_hook(:view_issues_move_bottom, :issues => @issues, :target_project => @target_project, :copy => !!@copy) %>
-</div>
-
-<% if @copy %>
-	<%= hidden_field_tag("copy_options[copy]", "1") %>
-	<%= submit_tag l(:button_copy) %>
-	<%= submit_tag l(:button_copy_and_follow), :name => 'follow' %>
-<% else %>
-	<%= submit_tag l(:button_move) %>
-	<%= submit_tag l(:button_move_and_follow), :name => 'follow' %>
-<% end %>
-<% end %>
-<% content_for :header_tags do %>
-	<%= robot_exclusion_tag %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_relations/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issue_relations/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,14 @@
+<%= error_messages_for 'relation' %>
+
+<p><%= f.select :relation_type, collection_for_relation_type_select, {}, :onchange => "setPredecessorFieldsVisibility();" %>
+<%= l(:label_issue) %> #<%= f.text_field :issue_to_id, :size => 10 %>
+<div id="related_issue_candidates" class="autocomplete"></div>
+<%= javascript_tag "observeRelatedIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
+<span id="predecessor_fields" style="display:none;">
+<%= l(:field_delay) %>: <%= f.text_field :delay, :size => 3 %> <%= l(:label_day_plural) %>
+</span>
+<%= submit_tag l(:button_add) %>
+<%= toggle_link l(:button_cancel), 'new-relation-form'%>
+</p>
+
+<%= javascript_tag "setPredecessorFieldsVisibility();" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_relations/_form.rhtml
--- a/app/views/issue_relations/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<%= error_messages_for 'relation' %>
-
-<p><%= f.select :relation_type, collection_for_relation_type_select, {}, :onchange => "setPredecessorFieldsVisibility();" %>
-<%= l(:label_issue) %> #<%= f.text_field :issue_to_id, :size => 10 %>
-<div id="related_issue_candidates" class="autocomplete"></div>
-<%= javascript_tag "observeRelatedIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
-<span id="predecessor_fields" style="display:none;">
-<%= l(:field_delay) %>: <%= f.text_field :delay, :size => 3 %> <%= l(:label_day_plural) %>
-</span>
-<%= submit_tag l(:button_add) %>
-<%= toggle_link l(:button_cancel), 'new-relation-form'%>
-</p>
-
-<%= javascript_tag "setPredecessorFieldsVisibility();" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_statuses/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issue_statuses/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,22 @@
+<%= error_messages_for 'issue_status' %>
+
+<div class="box">
+<!--[form:issue_status]-->
+<p><label for="issue_status_name"><%=l(:field_name)%><span class="required"> *</span></label>
+<%= text_field 'issue_status', 'name'  %></p>
+
+<% if Issue.use_status_for_done_ratio? %>
+<p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label>
+<%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :include_blank => true %></p>
+<% end %>
+
+<p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label>
+<%= 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>
+
+<%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %>
+
+<!--[eoform:issue_status]-->
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_statuses/_form.rhtml
--- a/app/views/issue_statuses/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<%= error_messages_for 'issue_status' %>
-
-<div class="box">
-<!--[form:issue_status]-->
-<p><label for="issue_status_name"><%=l(:field_name)%><span class="required"> *</span></label>
-<%= text_field 'issue_status', 'name'  %></p>
-
-<% if Issue.use_status_for_done_ratio? %>
-<p><label for="issue_done_ratio"><%=l(:field_done_ratio)%></label>
-<%= select 'issue_status', :default_done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }), :include_blank => true %></p>
-<% end %>
-
-<p><label for="issue_status_is_closed"><%=l(:field_is_closed)%></label>
-<%= 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>
-
-<%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %>
-
-<!--[eoform:issue_status]-->
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_statuses/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issue_statuses/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> &#187; <%=h @issue_status %></h2>
+
+<% form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_statuses/edit.rhtml
--- a/app/views/issue_statuses/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> &#187; <%=h @issue_status %></h2>
-
-<% form_tag({:action => 'update', :id => @issue_status}, :class => "tabular") do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_statuses/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issue_statuses/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> &#187; <%=l(:label_issue_status_new)%></h2>
+
+<% form_tag({:action => 'create'}, :class => "tabular") do %>
+  <%= render :partial => 'form' %>
+  <%= submit_tag l(:button_create) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issue_statuses/new.rhtml
--- a/app/views/issue_statuses/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses', :action => 'index' %> &#187; <%=l(:label_issue_status_new)%></h2>
-
-<% form_tag({:action => 'create'}, :class => "tabular") do %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag l(:button_create) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_action_menu.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_action_menu.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,9 @@
+<div class="contextual">
+<%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
+<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-time-add' %>
+<%= watcher_tag(@issue, User.current) %>
+<%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
+<%= link_to_if_authorized l(:button_copy), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %>
+<%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %>
+<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => issues_destroy_confirmation_message(@issue), :method => :post, :class => 'icon icon-del' %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_action_menu.rhtml
--- a/app/views/issues/_action_menu.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<div class="contextual">
-<%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
-<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-time-add' %>
-<%= watcher_tag(@issue, User.current) %>
-<%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %>
-<%= link_to_if_authorized l(:button_copy), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %>
-<%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => issues_destroy_confirmation_message(@issue), :method => :post, :class => 'icon icon-del' %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_attributes.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_attributes.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,50 @@
+<% fields_for :issue, @issue, :builder => TabularFormBuilder do |f| %>
+
+<div class="splitcontentleft">
+<% if @issue.new_record? || @allowed_statuses.any? %>
+<p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
+<% else %>
+<p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>
+<% end %>
+
+<p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %></p>
+<p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
+<% unless @project.issue_categories.empty? %>
+<p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
+<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
+                     l(:label_issue_category_new),
+                     'category[name]', 
+                     {:controller => 'issue_categories', :action => 'new', :project_id => @project},
+                     :title => l(:label_issue_category_new), 
+                     :tabindex => 199) if authorize_for('issue_categories', 'new') %></p>
+<% end %>
+<% unless @issue.assignable_versions.empty? %>
+<p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %>
+<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
+                     l(:label_version_new),
+                     'version[name]', 
+                     {:controller => 'versions', :action => 'create', :project_id => @project},
+                     :title => l(:label_version_new), 
+                     :tabindex => 200) if authorize_for('versions', 'new') %>
+</p>
+<% end %>
+</div>
+
+<div class="splitcontentright">
+<% if User.current.allowed_to?(:manage_subtasks, @project) %>
+<p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p>
+<div id="parent_issue_candidates" class="autocomplete"></div>
+<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
+<% end %>
+<p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %></p>
+<p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %></p>
+<p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %></p>
+<% if @issue.leaf? && Issue.use_field_for_done_ratio? %>
+<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
+<% end %>
+</div>
+
+<div style="clear:both;"> </div>
+<%= render :partial => 'issues/form_custom_fields' %>
+
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_attributes.rhtml
--- a/app/views/issues/_attributes.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<% fields_for :issue, @issue, :builder => TabularFormBuilder do |f| %>
-
-<div class="splitcontentleft">
-<% if @issue.new_record? || @allowed_statuses.any? %>
-<p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
-<% else %>
-<p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>
-<% end %>
-
-<p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), {:required => true}, :disabled => !@issue.leaf? %></p>
-<p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
-<% unless @project.issue_categories.empty? %>
-<p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
-<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
-                     l(:label_issue_category_new),
-                     'category[name]', 
-                     {:controller => 'issue_categories', :action => 'new', :project_id => @project},
-                     :title => l(:label_issue_category_new), 
-                     :tabindex => 199) if authorize_for('issue_categories', 'new') %></p>
-<% end %>
-<% unless @issue.assignable_versions.empty? %>
-<p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %>
-<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
-                     l(:label_version_new),
-                     'version[name]', 
-                     {:controller => 'versions', :action => 'create', :project_id => @project},
-                     :title => l(:label_version_new), 
-                     :tabindex => 200) if authorize_for('versions', 'new') %>
-</p>
-<% end %>
-</div>
-
-<div class="splitcontentright">
-<% if User.current.allowed_to?(:manage_subtasks, @project) %>
-<p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p>
-<div id="parent_issue_candidates" class="autocomplete"></div>
-<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %>
-<% end %>
-<p><%= f.text_field :start_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_start_date') if @issue.leaf? %></p>
-<p><%= f.text_field :due_date, :size => 10, :disabled => !@issue.leaf? %><%= calendar_for('issue_due_date') if @issue.leaf? %></p>
-<p><%= f.text_field :estimated_hours, :size => 3, :disabled => !@issue.leaf? %> <%= l(:field_hours) %></p>
-<% if @issue.leaf? && Issue.use_field_for_done_ratio? %>
-<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
-<% end %>
-</div>
-
-<div style="clear:both;"> </div>
-<%= render :partial => 'issues/form_custom_fields' %>
-
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_changesets.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_changesets.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,10 @@
+<% changesets.each do |changeset| %>
+    <div class="changeset <%= cycle('odd', 'even') %>">
+    <p><%= link_to_revision(changeset, changeset.project,
+                            :text => "#{l(:label_revision)} #{changeset.format_identifier}") %><br />
+        <span class="author"><%= authoring(changeset.committed_on, changeset.author) %></span></p>
+    <div class="wiki">
+        <%= textilizable(changeset, :comments) %>
+    </div>
+    </div>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_changesets.rhtml
--- a/app/views/issues/_changesets.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<% changesets.each do |changeset| %>
-    <div class="changeset <%= cycle('odd', 'even') %>">
-    <p><%= link_to_revision(changeset, changeset.project,
-                            :text => "#{l(:label_revision)} #{changeset.format_identifier}") %><br />
-        <span class="author"><%= authoring(changeset.committed_on, changeset.author) %></span></p>
-    <div class="wiki">
-        <%= textilizable(changeset, :comments) %>
-    </div>
-    </div>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,55 @@
+<% labelled_tabular_form_for :issue, @issue,
+                             :url => {:action => 'update', :id => @issue},
+                             :html => {:id => 'issue-form',
+                                       :class => nil,
+                                       :method => :put,
+                                       :multipart => true} do |f| %>
+    <%= error_messages_for 'issue', 'time_entry' %>
+    <div class="box">
+    <% if @edit_allowed || !@allowed_statuses.empty? %>
+        <fieldset class="tabular"><legend><%= l(:label_change_properties) %>
+        <% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %>
+        <small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small>
+        <% end %>
+        </legend>
+        <%= render :partial => (@edit_allowed ? 'form' : 'form_update'), :locals => {:f => f} %>
+        </fieldset>
+    <% end %>
+    <% if authorize_for('timelog', 'edit') %>
+        <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
+        <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
+        <div class="splitcontentleft">
+        <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
+        </div>
+        <div class="splitcontentright">
+        <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p>
+        </div>
+        <p><%= time_entry.text_field :comments, :size => 60 %></p>
+        <% @time_entry.custom_field_values.each do |value| %>
+        	<p><%= custom_field_tag_with_label :time_entry, value %></p>
+        <% end %>
+        <% end %>
+    </fieldset>
+    <% end %>
+    
+    <fieldset><legend><%= l(:field_notes) %></legend>
+    <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
+    <%= wikitoolbar_for 'notes' %>
+    <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
+    
+    <p><%=l(:label_attachment_plural)%><br /><%= render :partial => 'attachments/form' %></p>
+    </fieldset>
+    </div>
+    
+    <%= f.hidden_field :lock_version %>
+    <%= submit_tag l(:button_submit) %>
+    <%= link_to_remote l(:label_preview), 
+                       { :url => preview_issue_path(:project_id => @project, :id => @issue),
+                         :method => 'post',
+                         :update => 'preview',
+                         :with => 'Form.serialize("issue-form")',
+                         :complete => "Element.scrollTo('preview')"
+                       }, :accesskey => accesskey(:preview) %>
+<% end %>
+
+<div id="preview" class="wiki"></div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_edit.rhtml
--- a/app/views/issues/_edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-<% labelled_tabular_form_for :issue, @issue,
-                             :url => {:action => 'update', :id => @issue},
-                             :html => {:id => 'issue-form',
-                                       :class => nil,
-                                       :method => :put,
-                                       :multipart => true} do |f| %>
-    <%= error_messages_for 'issue', 'time_entry' %>
-    <div class="box">
-    <% if @edit_allowed || !@allowed_statuses.empty? %>
-        <fieldset class="tabular"><legend><%= l(:label_change_properties) %>
-        <% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %>
-        <small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small>
-        <% end %>
-        </legend>
-        <%= render :partial => (@edit_allowed ? 'form' : 'form_update'), :locals => {:f => f} %>
-        </fieldset>
-    <% end %>
-    <% if authorize_for('timelog', 'edit') %>
-        <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
-        <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
-        <div class="splitcontentleft">
-        <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
-        </div>
-        <div class="splitcontentright">
-        <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p>
-        </div>
-        <p><%= time_entry.text_field :comments, :size => 60 %></p>
-        <% @time_entry.custom_field_values.each do |value| %>
-        	<p><%= custom_field_tag_with_label :time_entry, value %></p>
-        <% end %>
-        <% end %>
-    </fieldset>
-    <% end %>
-    
-    <fieldset><legend><%= l(:field_notes) %></legend>
-    <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
-    <%= wikitoolbar_for 'notes' %>
-    <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
-    
-    <p><%=l(:label_attachment_plural)%><br /><%= render :partial => 'attachments/form' %></p>
-    </fieldset>
-    </div>
-    
-    <%= f.hidden_field :lock_version %>
-    <%= submit_tag l(:button_submit) %>
-    <%= link_to_remote l(:label_preview), 
-                       { :url => preview_issue_path(:project_id => @project, :id => @issue),
-                         :method => 'post',
-                         :update => 'preview',
-                         :with => 'Form.serialize("issue-form")',
-                         :complete => "Element.scrollTo('preview')"
-                       }, :accesskey => accesskey(:preview) %>
-<% end %>
-
-<div id="preview" class="wiki"></div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,40 @@
+<%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
+
+<div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
+<% if @issue.safe_attribute_names.include?('is_private') %>
+<p style="float:right; margin-right:1em;">
+  <label class="inline" for="issue_is_private"><%= f.check_box :is_private, :no_label => true %> <%= l(:field_is_private) %></label>
+</p>
+<% end %>
+<p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
+<%= observe_field :issue_tracker_id, :url => { :action => :new, :project_id => @project, :id => @issue },
+                                     :update => :attributes,
+                                     :with => "Form.serialize('issue-form')" %>
+
+<p><%= f.text_field :subject, :size => 80, :required => true %></p>
+<p><%= f.text_area :description,
+                   :cols => 60,
+                   :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
+                   :accesskey => accesskey(:edit),
+                   :class => 'wiki-edit' %></p>
+</div>
+
+<div id="attributes" class="attributes">
+	<%= render :partial => 'issues/attributes' %>
+</div>
+
+<% if @issue.new_record? %>
+<p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
+<% end %>
+
+<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
+<p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
+<% @issue.project.users.sort.each do |user| -%>
+<label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
+<% end -%>
+</p>
+<% end %>
+
+<%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
+
+<%= wikitoolbar_for 'issue_description' %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_form.rhtml
--- a/app/views/issues/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<%= call_hook(:view_issues_form_details_top, { :issue => @issue, :form => f }) %>
-
-<div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
-<% if @issue.safe_attribute_names.include?('is_private') %>
-<p style="float:right; margin-right:1em;">
-  <label class="inline" for="issue_is_private"><%= f.check_box :is_private, :no_label => true %> <%= l(:field_is_private) %></label>
-</p>
-<% end %>
-<p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
-<%= observe_field :issue_tracker_id, :url => { :action => :new, :project_id => @project, :id => @issue },
-                                     :update => :attributes,
-                                     :with => "Form.serialize('issue-form')" %>
-
-<p><%= f.text_field :subject, :size => 80, :required => true %></p>
-<p><%= f.text_area :description,
-                   :cols => 60,
-                   :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
-                   :accesskey => accesskey(:edit),
-                   :class => 'wiki-edit' %></p>
-</div>
-
-<div id="attributes" class="attributes">
-	<%= render :partial => 'issues/attributes' %>
-</div>
-
-<% if @issue.new_record? %>
-<p id="attachments_form"><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
-<% end %>
-
-<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
-<p id="watchers_form"><label><%= l(:label_issue_watchers) %></label>
-<% @issue.project.users.sort.each do |user| -%>
-<label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
-<% end -%>
-</p>
-<% end %>
-
-<%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
-
-<%= wikitoolbar_for 'issue_description' %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_form_custom_fields.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_form_custom_fields.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,12 @@
+<div class="splitcontentleft">
+<% i = 0 %>
+<% split_on = (@issue.custom_field_values.size / 2.0).ceil - 1 %>
+<% @issue.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :issue, value %></p>
+<% if i == split_on -%>
+</div><div class="splitcontentright">
+<% end -%>
+<% i += 1 -%>
+<% end -%>
+</div>
+<div style="clear:both;"> </div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_form_custom_fields.rhtml
--- a/app/views/issues/_form_custom_fields.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<div class="splitcontentleft">
-<% i = 0 %>
-<% split_on = (@issue.custom_field_values.size / 2.0).ceil - 1 %>
-<% @issue.custom_field_values.each do |value| %>
-	<p><%= custom_field_tag_with_label :issue, value %></p>
-<% if i == split_on -%>
-</div><div class="splitcontentright">
-<% end -%>
-<% i += 1 -%>
-<% end -%>
-</div>
-<div style="clear:both;"> </div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_form_update.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_form_update.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,14 @@
+<div class="attributes">
+<div class="splitcontentleft">
+<p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
+<p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
+</div>
+<div class="splitcontentright">
+<% if Issue.use_field_for_done_ratio? %>
+<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
+<% end %>
+<% unless @issue.assignable_versions.empty? %>
+<p><%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), :include_blank => true %></p>
+<% end %>
+</div>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_form_update.rhtml
--- a/app/views/issues/_form_update.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<div class="attributes">
-<div class="splitcontentleft">
-<p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
-<p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
-</div>
-<div class="splitcontentright">
-<% if Issue.use_field_for_done_ratio? %>
-<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
-<% end %>
-<% unless @issue.assignable_versions.empty? %>
-<p><%= f.select :fixed_version_id, (@issue.assignable_versions.collect {|v| [v.name, v.id]}), :include_blank => true %></p>
-<% end %>
-</div>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_history.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_history.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,21 @@
+<% reply_links = authorize_for('issues', 'edit') -%>
+<% for journal in journals %>
+  <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>">
+    <h4><div class="journal-link"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
+    <%= avatar(journal.user, :size => "24") %>
+    <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
+		<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4>
+    
+    <% if journal.details.any? %>
+    <ul class="details">
+      <% for detail in journal.details %>
+       <li><%= show_detail(detail) %></li>
+      <% end %>
+    </ul>
+    <% end %>
+    <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %>
+  </div>
+  <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
+<% end %>
+
+<% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_history.rhtml
--- a/app/views/issues/_history.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<% reply_links = authorize_for('issues', 'edit') -%>
-<% for journal in journals %>
-  <div id="change-<%= journal.id %>" class="<%= journal.css_classes %>">
-    <h4><div class="journal-link"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
-    <%= avatar(journal.user, :size => "24") %>
-    <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
-		<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4>
-    
-    <% if journal.details.any? %>
-    <ul class="details">
-      <% for detail in journal.details %>
-       <li><%= show_detail(detail) %></li>
-      <% end %>
-    </ul>
-    <% end %>
-    <%= render_notes(issue, journal, :reply_links => reply_links) unless journal.notes.blank? %>
-  </div>
-  <%= call_hook(:view_issues_history_journal_bottom, { :journal => journal }) %>
-<% end %>
-
-<% heads_for_wiki_formatter if User.current.allowed_to?(:edit_issue_notes, issue.project) || User.current.allowed_to?(:edit_own_issue_notes, issue.project) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_list.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_list.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,37 @@
+<% form_tag({}) do -%>	
+<%= hidden_field_tag 'back_url', url_for(params) %>
+<div class="autoscroll">
+<table class="list issues">
+    <thead><tr>
+        <th class="checkbox hide-when-print"><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
+                                                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+        </th>
+		<%= sort_header_tag('id', :caption => '#', :default_order => 'desc') %>
+        <% query.columns.each do |column| %>
+          <%= column_header(column) %>
+        <% end %>
+	</tr></thead>
+	<% previous_group = false %>
+	<tbody>
+	<% issue_list(issues) do |issue, level| -%>
+  <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
+    <% reset_cycle %>
+    <tr class="group open">
+    	<td colspan="<%= query.columns.size + 2 %>">
+    		<span class="expander" onclick="toggleRowGroup(this); return false;">&nbsp;</span>
+      	<%= group.blank? ? 'None' : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
+        <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %>
+    	</td>
+		</tr>
+		<% previous_group = group %>
+  <% end %>
+	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
+	  <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
+		<td class="id"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
+        <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.css_classes %><% end %>
+	</tr>
+	<% end -%>
+	</tbody>
+</table>
+</div>
+<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_list.rhtml
--- a/app/views/issues/_list.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<% form_tag({}) do -%>	
-<%= hidden_field_tag 'back_url', url_for(params) %>
-<div class="autoscroll">
-<table class="list issues">
-    <thead><tr>
-        <th class="checkbox hide-when-print"><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
-                                                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
-        </th>
-		<%= sort_header_tag('id', :caption => '#', :default_order => 'desc') %>
-        <% query.columns.each do |column| %>
-          <%= column_header(column) %>
-        <% end %>
-	</tr></thead>
-	<% previous_group = false %>
-	<tbody>
-	<% issue_list(issues) do |issue, level| -%>
-  <% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
-    <% reset_cycle %>
-    <tr class="group open">
-    	<td colspan="<%= query.columns.size + 2 %>">
-    		<span class="expander" onclick="toggleRowGroup(this); return false;">&nbsp;</span>
-      	<%= group.blank? ? 'None' : column_content(@query.group_by_column, issue) %> <span class="count">(<%= @issue_count_by_group[group] %>)</span>
-        <%= link_to_function("#{l(:button_collapse_all)}/#{l(:button_expand_all)}", "toggleAllRowGroups(this)", :class => 'toggle-all') %>
-    	</td>
-		</tr>
-		<% previous_group = group %>
-  <% end %>
-	<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
-	  <td class="checkbox hide-when-print"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
-		<td class="id"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
-        <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.css_classes %><% end %>
-	</tr>
-	<% end -%>
-	</tbody>
-</table>
-</div>
-<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_list_simple.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_list_simple.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,29 @@
+<% if issues && issues.any? %>
+<% form_tag({}) do %>
+	<table class="list issues">		
+		<thead><tr>
+		<th>#</th>
+		<th><%=l(:field_project)%></th>
+		<th><%=l(:field_tracker)%></th>
+		<th><%=l(:field_subject)%></th>
+		</tr></thead>
+		<tbody>	
+		<% for issue in issues %>
+		<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
+			<td class="id">
+			  <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;') %>
+				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
+			</td>
+			<td class="project"><%= link_to_project(issue.project) %></td>
+			<td class="tracker"><%=h issue.tracker %></td>
+			<td class="subject">
+        <%= link_to h(truncate(issue.subject, :length => 60)), :controller => 'issues', :action => 'show', :id => issue %> (<%=h issue.status %>)
+      </td>
+		</tr>
+		<% end %>
+		</tbody>
+	</table>
+<% end %>
+<% else %>
+	<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_list_simple.rhtml
--- a/app/views/issues/_list_simple.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<% if issues && issues.any? %>
-<% form_tag({}) do %>
-	<table class="list issues">		
-		<thead><tr>
-		<th>#</th>
-		<th><%=l(:field_project)%></th>
-		<th><%=l(:field_tracker)%></th>
-		<th><%=l(:field_subject)%></th>
-		</tr></thead>
-		<tbody>	
-		<% for issue in issues %>
-		<tr id="issue-<%= issue.id %>" class="hascontextmenu <%= cycle('odd', 'even') %> <%= issue.css_classes %>">
-			<td class="id">
-			  <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;') %>
-				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
-			</td>
-			<td class="project"><%= link_to_project(issue.project) %></td>
-			<td class="tracker"><%=h issue.tracker %></td>
-			<td class="subject">
-        <%= link_to h(truncate(issue.subject, :length => 60)), :controller => 'issues', :action => 'show', :id => issue %> (<%=h issue.status %>)
-      </td>
-		</tr>
-		<% end %>
-		</tbody>
-	</table>
-<% end %>
-<% else %>
-	<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_relations.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_relations.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,37 @@
+<div class="contextual">
+<% if User.current.allowed_to?(:manage_issue_relations, @project) %>
+  <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %>
+<% end %>
+</div>
+
+<p><strong><%=l(:label_related_issues)%></strong></p>
+
+<% if @relations.present? %>
+<form>
+<table class="list issues">
+<% @relations.each do |relation| %>
+<tr class="issue hascontextmenu">
+<td class="checkbox"><%= check_box_tag("ids[]", relation.other_issue(@issue).id, false, :id => nil) %></td>
+<td class="subject"><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
+    <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
+    <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %>
+</td>
+<td class="status"><%= relation.other_issue(@issue).status.name %></td>
+<td class="start_date"><%= format_date(relation.other_issue(@issue).start_date) %></td>
+<td class="due_date"><%= format_date(relation.other_issue(@issue).due_date) %></td>
+<td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :issue_id => @issue, :id => relation},                                              
+                                                  :method => :post
+                                                }, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
+</tr>
+<% end %>
+</table>
+</form>
+<% end %>
+
+<% remote_form_for(:relation, @relation, 
+                 :url => {:controller => 'issue_relations', :action => 'new', :issue_id => @issue},
+                 :method => :post,
+                 :complete => "Form.Element.focus('relation_issue_to_id');",
+                 :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %>
+<%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_relations.rhtml
--- a/app/views/issues/_relations.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<div class="contextual">
-<% if User.current.allowed_to?(:manage_issue_relations, @project) %>
-  <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %>
-<% end %>
-</div>
-
-<p><strong><%=l(:label_related_issues)%></strong></p>
-
-<% if @relations.present? %>
-<form>
-<table class="list issues">
-<% @relations.each do |relation| %>
-<tr class="issue hascontextmenu">
-<td class="checkbox"><%= check_box_tag("ids[]", relation.other_issue(@issue).id, false, :id => nil) %></td>
-<td class="subject"><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
-    <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
-    <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %>
-</td>
-<td class="status"><%= relation.other_issue(@issue).status.name %></td>
-<td class="start_date"><%= format_date(relation.other_issue(@issue).start_date) %></td>
-<td class="due_date"><%= format_date(relation.other_issue(@issue).due_date) %></td>
-<td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :issue_id => @issue, :id => relation},                                              
-                                                  :method => :post
-                                                }, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
-</tr>
-<% end %>
-</table>
-</form>
-<% end %>
-
-<% remote_form_for(:relation, @relation, 
-                 :url => {:controller => 'issue_relations', :action => 'new', :issue_id => @issue},
-                 :method => :post,
-                 :complete => "Form.Element.focus('relation_issue_to_id');",
-                 :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %>
-<%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_sidebar.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/_sidebar.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,17 @@
+<h3><%= l(:label_issue_plural) %></h3>
+<%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
+<% if @project %>
+<%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
+<% end %>
+<%= call_hook(:view_issues_sidebar_issues_bottom) %>
+
+<% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
+	<%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %><br />
+<% end %>
+<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
+	<%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %><br />
+<% end %>
+<%= call_hook(:view_issues_sidebar_planning_bottom) %>
+
+<%= render_sidebar_queries %>
+<%= call_hook(:view_issues_sidebar_queries_bottom) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/_sidebar.rhtml
--- a/app/views/issues/_sidebar.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<h3><%= l(:label_issue_plural) %></h3>
-<%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
-<% if @project %>
-<%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
-<% end %>
-<%= call_hook(:view_issues_sidebar_issues_bottom) %>
-
-<% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
-	<%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %><br />
-<% end %>
-<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
-	<%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %><br />
-<% end %>
-<%= call_hook(:view_issues_sidebar_planning_bottom) %>
-
-<%= render_sidebar_queries %>
-<%= call_hook(:view_issues_sidebar_queries_bottom) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/bulk_edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/bulk_edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,91 @@
+<h2><%= l(:label_bulk_edit_selected_issues) %></h2>
+
+<ul><%= @issues.collect {|i| content_tag('li', link_to(h("#{i.tracker} ##{i.id}"), { :action => 'show', :id => i }) + h(": #{i.subject}")) }.join("\n") %></ul>
+
+<% form_tag(:action => 'bulk_update') do %>
+<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
+<div class="box tabular">
+<fieldset class="attributes">
+<legend><%= l(:label_change_properties) %></legend>
+
+<div class="splitcontentleft">
+<p>
+	<label><%= l(:field_tracker) %></label>
+	<%= select_tag('issue[tracker_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, :id, :name)) %>
+</p>
+<% if @available_statuses.any? %>
+<p>
+	<label><%= l(:field_status) %></label>
+	<%= select_tag('issue[status_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
+</p>
+<% end %>
+<p>
+	<label><%= l(:field_priority) %></label> 
+	<%= select_tag('issue[priority_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
+</p>
+<p>
+	<label><%= l(:field_assigned_to) %></label> 
+	<%= select_tag('issue[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') +
+                                 content_tag('option', l(:label_nobody), :value => 'none') +
+                                 options_from_collection_for_select(@assignables, :id, :name)) %>
+</p>
+<% if @project %>
+<p>
+	<label><%= l(:field_category) %></label> 
+	<%= select_tag('issue[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
+                                content_tag('option', l(:label_none), :value => 'none') +
+                                options_from_collection_for_select(@project.issue_categories, :id, :name)) %>
+</p>
+<% end %>
+<% #TODO: allow editing versions when multiple projects %>
+<% if @project %>
+<p>
+	<label><%= l(:field_fixed_version) %></label> 
+	<%= select_tag('issue[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
+                                   content_tag('option', l(:label_none), :value => 'none') +
+                                   version_options_for_select(@project.shared_versions.open.sort)) %>
+</p>
+<% end %>
+
+<% @custom_fields.each do |custom_field| %>
+	<p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('issue', custom_field, @projects) %></p>
+<% end %>
+
+<%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
+</div>
+
+<div class="splitcontentright">
+<% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>
+<p>
+	<label><%= l(:field_parent_issue) %></label>
+	<%= text_field_tag 'issue[parent_issue_id]', '', :size => 10 %>
+</p>
+<div id="parent_issue_candidates" class="autocomplete"></div>
+<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:project_id => @project) }')" %>
+<% end %>
+<p>
+	<label><%= l(:field_start_date) %></label>
+	<%= text_field_tag 'issue[start_date]', '', :size => 10 %><%= calendar_for('issue_start_date') %>
+</p>
+<p>
+	<label><%= l(:field_due_date) %></label> 
+	<%= text_field_tag 'issue[due_date]', '', :size => 10 %><%= calendar_for('issue_due_date') %>
+</p>
+<% if Issue.use_field_for_done_ratio? %>
+<p>
+	<label><%= l(:field_done_ratio) %></label> 
+	<%= select_tag 'issue[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
+</p>
+<% end %>
+</div>
+
+</fieldset>
+
+<fieldset><legend><%= l(:field_notes) %></legend>
+<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
+<%= wikitoolbar_for 'notes' %>
+</fieldset>
+</div>
+
+<p><%= submit_tag l(:button_submit) %></p>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/bulk_edit.rhtml
--- a/app/views/issues/bulk_edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-<h2><%= l(:label_bulk_edit_selected_issues) %></h2>
-
-<ul><%= @issues.collect {|i| content_tag('li', link_to(h("#{i.tracker} ##{i.id}"), { :action => 'show', :id => i }) + h(": #{i.subject}")) }.join("\n") %></ul>
-
-<% form_tag(:action => 'bulk_update') do %>
-<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
-<div class="box tabular">
-<fieldset class="attributes">
-<legend><%= l(:label_change_properties) %></legend>
-
-<div class="splitcontentleft">
-<p>
-	<label><%= l(:field_tracker) %></label>
-	<%= select_tag('issue[tracker_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, :id, :name)) %>
-</p>
-<% if @available_statuses.any? %>
-<p>
-	<label><%= l(:field_status) %></label>
-	<%= select_tag('issue[status_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %>
-</p>
-<% end %>
-<p>
-	<label><%= l(:field_priority) %></label> 
-	<%= select_tag('issue[priority_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>
-</p>
-<p>
-	<label><%= l(:field_assigned_to) %></label> 
-	<%= select_tag('issue[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') +
-                                 content_tag('option', l(:label_nobody), :value => 'none') +
-                                 options_from_collection_for_select(@assignables, :id, :name)) %>
-</p>
-<% if @project %>
-<p>
-	<label><%= l(:field_category) %></label> 
-	<%= select_tag('issue[category_id]', content_tag('option', l(:label_no_change_option), :value => '') +
-                                content_tag('option', l(:label_none), :value => 'none') +
-                                options_from_collection_for_select(@project.issue_categories, :id, :name)) %>
-</p>
-<% end %>
-<% #TODO: allow editing versions when multiple projects %>
-<% if @project %>
-<p>
-	<label><%= l(:field_fixed_version) %></label> 
-	<%= select_tag('issue[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') +
-                                   content_tag('option', l(:label_none), :value => 'none') +
-                                   version_options_for_select(@project.shared_versions.open.sort)) %>
-</p>
-<% end %>
-
-<% @custom_fields.each do |custom_field| %>
-	<p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('issue', custom_field, @projects) %></p>
-<% end %>
-
-<%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
-</div>
-
-<div class="splitcontentright">
-<% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>
-<p>
-	<label><%= l(:field_parent_issue) %></label>
-	<%= text_field_tag 'issue[parent_issue_id]', '', :size => 10 %>
-</p>
-<div id="parent_issue_candidates" class="autocomplete"></div>
-<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:project_id => @project) }')" %>
-<% end %>
-<p>
-	<label><%= l(:field_start_date) %></label>
-	<%= text_field_tag 'issue[start_date]', '', :size => 10 %><%= calendar_for('issue_start_date') %>
-</p>
-<p>
-	<label><%= l(:field_due_date) %></label> 
-	<%= text_field_tag 'issue[due_date]', '', :size => 10 %><%= calendar_for('issue_due_date') %>
-</p>
-<% if Issue.use_field_for_done_ratio? %>
-<p>
-	<label><%= l(:field_done_ratio) %></label> 
-	<%= select_tag 'issue[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>
-</p>
-<% end %>
-</div>
-
-</fieldset>
-
-<fieldset><legend><%= l(:field_notes) %></legend>
-<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
-<%= wikitoolbar_for 'notes' %>
-</fieldset>
-</div>
-
-<p><%= submit_tag l(:button_submit) %></p>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/destroy.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/destroy.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<h2><%= l(:label_confirmation) %></h2>
+
+<% form_tag do %>
+<%= @issues.collect {|i| hidden_field_tag 'ids[]', i.id } %>
+<div class="box">
+<p><strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(@hours, :precision => 2)) %></strong></p>
+<p>
+<label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br />
+<label><%= radio_button_tag 'todo', 'nullify', false %> <%= l(:text_assign_time_entries_to_project) %></label><br />
+<label><%= radio_button_tag 'todo', 'reassign', false, :onchange => 'if (this.checked) { $("reassign_to_id").focus(); }' %> <%= l(:text_reassign_time_entries) %></label>
+<%= text_field_tag 'reassign_to_id', params[:reassign_to_id], :size => 6, :onfocus => '$("todo_reassign").checked=true;' %>
+</p>
+</div>
+<%= submit_tag l(:button_apply) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/destroy.rhtml
--- a/app/views/issues/destroy.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<h2><%= l(:label_confirmation) %></h2>
-
-<% form_tag do %>
-<%= @issues.collect {|i| hidden_field_tag 'ids[]', i.id } %>
-<div class="box">
-<p><strong><%= l(:text_destroy_time_entries_question, :hours => number_with_precision(@hours, :precision => 2)) %></strong></p>
-<p>
-<label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br />
-<label><%= radio_button_tag 'todo', 'nullify', false %> <%= l(:text_assign_time_entries_to_project) %></label><br />
-<label><%= radio_button_tag 'todo', 'reassign', false, :onchange => 'if (this.checked) { $("reassign_to_id").focus(); }' %> <%= l(:text_reassign_time_entries) %></label>
-<%= text_field_tag 'reassign_to_id', params[:reassign_to_id], :size => 6, :onfocus => '$("todo_reassign").checked=true;' %>
-</p>
-</div>
-<%= submit_tag l(:button_apply) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%=h "#{@issue.tracker.name} ##{@issue.id}" %></h2>
+
+<%= render :partial => 'edit' %>
+<% content_for :header_tags do %>
+    <%= robot_exclusion_tag %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/edit.rhtml
--- a/app/views/issues/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%=h "#{@issue.tracker.name} ##{@issue.id}" %></h2>
-
-<%= render :partial => 'edit' %>
-<% content_for :header_tags do %>
-    <%= robot_exclusion_tag %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,73 @@
+<div class="contextual">
+<% if !@query.new_record? && @query.editable_by?(User.current) %>
+	<%= 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.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
+<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
+
+<% form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %>
+    <%= hidden_field_tag 'set_filter', '1' %>
+		<div id="query_form_content" class="hide-when-print">
+    <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
+    	<legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
+    	<div style="<%= @query.new_record? ? "" : "display: none;" %>">
+    		<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+    	</div>
+    </fieldset>
+    <fieldset class="collapsible collapsed">
+    	<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
+    	<div style="display: none;">
+    		<table>
+    			<tr>
+    				<td><%= l(:field_column_names) %></td>
+						<td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td>
+					</tr>
+					<tr>
+						<td><%= l(:field_group_by) %></td>
+						<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %></td>
+					</tr>
+				</table>
+			</div>
+		</fieldset>
+		</div>
+    <p class="buttons hide-when-print">
+
+    <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
+    <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
+    <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
+    <%= link_to_function l(:button_save), "$('query_form').action='#{ url_for :controller => 'queries', :action => 'new', :project_id => @project }'; submit_query_form('query_form')", :class => 'icon icon-save' %>
+    <% end %>
+    </p>
+<% end %>
+
+<%= error_messages_for 'query' %>
+<% if @query.valid? %>
+<% if @issues.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% else %>
+<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
+<p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
+<% end %>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
+	<%= f.link_to 'CSV', :url => params %>
+	<%= f.link_to 'PDF', :url => params %>
+<% end %>
+
+<% end %>
+<%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
+
+<% content_for :sidebar do %>
+    <%= render :partial => 'issues/sidebar' %>
+<% end %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
+    <%= auto_discovery_link_tag(:atom, {:controller => 'journals', :action => 'index', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
+<% end %>
+
+<%= context_menu issues_context_menu_path %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/index.rhtml
--- a/app/views/issues/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-<div class="contextual">
-<% if !@query.new_record? && @query.editable_by?(User.current) %>
-	<%= 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.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
-<% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
-
-<% form_tag({ :controller => 'issues', :action => 'index', :project_id => @project }, :method => :get, :id => 'query_form') do %>
-    <%= hidden_field_tag 'set_filter', '1' %>
-		<div id="query_form_content" class="hide-when-print">
-    <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
-    	<legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
-    	<div style="<%= @query.new_record? ? "" : "display: none;" %>">
-    		<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-    	</div>
-    </fieldset>
-    <fieldset class="collapsible collapsed">
-    	<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
-    	<div style="display: none;">
-    		<table>
-    			<tr>
-    				<td><%= l(:field_column_names) %></td>
-						<td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td>
-					</tr>
-					<tr>
-						<td><%= l(:field_group_by) %></td>
-						<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %></td>
-					</tr>
-				</table>
-			</div>
-		</fieldset>
-		</div>
-    <p class="buttons hide-when-print">
-
-    <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
-    <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
-    <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
-    <%= link_to_function l(:button_save), "$('query_form').action='#{ url_for :controller => 'queries', :action => 'new', :project_id => @project }'; submit_query_form('query_form')", :class => 'icon icon-save' %>
-    <% end %>
-    </p>
-<% end %>
-
-<%= error_messages_for 'query' %>
-<% if @query.valid? %>
-<% if @issues.empty? %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% else %>
-<%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
-<p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
-<% end %>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => params.merge(:key => User.current.rss_key) %>
-	<%= f.link_to 'CSV', :url => params %>
-	<%= f.link_to 'PDF', :url => params %>
-<% end %>
-
-<% end %>
-<%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
-
-<% content_for :sidebar do %>
-    <%= render :partial => 'issues/sidebar' %>
-<% end %>
-
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
-    <%= auto_discovery_link_tag(:atom, {:controller => 'journals', :action => 'index', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
-<% end %>
-
-<%= context_menu issues_context_menu_path %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,27 @@
+<h2><%=l(:label_issue_new)%></h2>
+
+<% labelled_tabular_form_for :issue, @issue, :url => {:controller => 'issues', :action => 'create', :project_id => @project},
+                             :html => {:multipart => true, :id => 'issue-form', :class => 'tabular new-issue-form'} do |f| %>
+    <%= error_messages_for 'issue' %>
+    <div class="box">
+    <%= render :partial => 'issues/form', :locals => {:f => f} %>
+    </div>
+    <%= submit_tag l(:button_create) %>
+    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
+    <%= link_to_remote l(:label_preview), 
+                       { :url => preview_issue_path(:project_id => @project),
+                         :method => 'post',
+                         :update => 'preview',
+                         :with => "Form.serialize('issue-form')",
+                         :complete => "Element.scrollTo('preview')"
+                       }, :accesskey => accesskey(:preview) %>
+											 
+		<%= javascript_tag "Form.Element.focus('issue_subject');" %>
+<% end %>
+
+<div id="preview" class="wiki"></div>
+
+<% content_for :header_tags do %>
+    <%= stylesheet_link_tag 'scm' %>
+    <%= robot_exclusion_tag %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/new.rhtml
--- a/app/views/issues/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<h2><%=l(:label_issue_new)%></h2>
-
-<% labelled_tabular_form_for :issue, @issue, :url => {:controller => 'issues', :action => 'create', :project_id => @project},
-                             :html => {:multipart => true, :id => 'issue-form', :class => 'tabular new-issue-form'} do |f| %>
-    <%= error_messages_for 'issue' %>
-    <div class="box">
-    <%= render :partial => 'issues/form', :locals => {:f => f} %>
-    </div>
-    <%= submit_tag l(:button_create) %>
-    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
-    <%= link_to_remote l(:label_preview), 
-                       { :url => preview_issue_path(:project_id => @project),
-                         :method => 'post',
-                         :update => 'preview',
-                         :with => "Form.serialize('issue-form')",
-                         :complete => "Element.scrollTo('preview')"
-                       }, :accesskey => accesskey(:preview) %>
-											 
-		<%= javascript_tag "Form.Element.focus('issue_subject');" %>
-<% end %>
-
-<div id="preview" class="wiki"></div>
-
-<% content_for :header_tags do %>
-    <%= stylesheet_link_tag 'scm' %>
-    <%= robot_exclusion_tag %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/issues/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,137 @@
+<%= render :partial => 'action_menu' %>
+
+<h2><%= issue_heading(@issue) %></h2>
+
+<div class="<%= @issue.css_classes %> details">
+        <%= avatar(@issue.author, :size => "50") %>
+      
+<div class="subject">      
+<%= render_issue_subject_with_tree(@issue) %>
+</div>
+        <p class="author">
+        <%= authoring @issue.created_on, @issue.author %>.
+        <% if @issue.created_on != @issue.updated_on %>
+        <%= l(:label_updated_time, time_tag(@issue.updated_on)) %>.
+        <% end %>
+        </p>
+
+<table class="attributes">
+<tr>
+    <th class="status"><%=l(:field_status)%>:</th><td class="status"><%= @issue.status.name %></td>
+    <th class="start-date"><%=l(:field_start_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %></td>
+</tr>
+<tr>
+    <th class="priority"><%=l(:field_priority)%>:</th><td class="priority"><%= @issue.priority.name %></td>
+    <th class="due-date"><%=l(:field_due_date)%>:</th><td class="due-date"><%= format_date(@issue.due_date) %></td>
+</tr>
+<tr>
+    <th class="assigned-to"><%=l(:field_assigned_to)%>:</th><td class="assigned-to"><%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
+    <th class="progress"><%=l(:field_done_ratio)%>:</th><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
+</tr>
+<tr>
+    <th class="category"><%=l(:field_category)%>:</th><td class="category"><%=h @issue.category ? @issue.category.name : "-" %></td>
+    <% if User.current.allowed_to?(:view_time_entries, @project) %>
+    <th class="spent-time"><%=l(:label_spent_time)%>:</th>
+    <td class="spent-time"><%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %></td>
+    <% end %>
+</tr>
+<tr>
+    <th class="fixed-version"><%=l(:field_fixed_version)%>:</th><td class="fixed-version"><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
+    <% if @issue.estimated_hours %>
+    <th class="estimated-hours"><%=l(:field_estimated_hours)%>:</th><td class="estimated-hours"><%= l_hours(@issue.estimated_hours) %></td>
+    <% end %>
+</tr>
+<%= render_custom_fields_rows(@issue) %>
+<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
+</table>
+
+<% if @issue.description? || @issue.attachments.any? -%>
+<hr />
+<% if @issue.description? %>
+	<div class="contextual">
+	<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:controller => 'journals', :action => 'new', :id => @issue} }, :class => 'icon icon-comment') %>
+	</div>
+	
+	<p><strong><%=l(:field_description)%></strong></p>
+	<div class="wiki">
+	<%= textilizable @issue, :description, :attachments => @issue.attachments %>
+	</div>
+<% end %>
+<%= link_to_attachments @issue %>
+<% end -%>
+
+<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
+
+<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
+<hr />
+<div id="issue_tree">
+<div class="contextual">
+  <%= link_to(l(:button_add), {:controller => 'issues', :action => 'new', :project_id => @project, :issue => {:parent_issue_id => @issue}}) if User.current.allowed_to?(:manage_subtasks, @project) %>
+</div>
+<p><strong><%=l(:label_subtask_plural)%></strong></p>
+<%= render_descendants_tree(@issue) unless @issue.leaf? %>
+</div>
+<% end %>
+
+<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
+<hr />
+<div id="relations">
+<%= render :partial => 'relations' %>
+</div>
+<% end %>
+
+</div>
+
+<% if @changesets.present? %>
+<div id="issue-changesets">
+<h3><%=l(:label_associated_revisions)%></h3>
+<%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
+</div>
+<% end %>
+
+<% if @journals.present? %>
+<div id="history">
+<h3><%=l(:label_history)%></h3>
+<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
+</div>
+<% end %>
+
+
+<div style="clear: both;"></div>
+<%= render :partial => 'action_menu' %>
+
+<div style="clear: both;"></div>
+<% if authorize_for('issues', 'edit') %>
+  <div id="update" style="display:none;">
+  <h3><%= l(:button_update) %></h3>
+  <%= render :partial => 'edit' %>
+  </div>
+<% end %>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+	<%= f.link_to 'PDF' %>
+<% end %>
+
+<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'issues/sidebar' %>
+
+  <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
+    (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
+    <div id="watchers">
+      <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
+    </div>
+  <% end %>
+<% end %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
+    <%= stylesheet_link_tag 'scm' %>
+    <%= javascript_include_tag 'context_menu' %>
+    <%= stylesheet_link_tag 'context_menu' %>
+    <%= stylesheet_link_tag 'context_menu_rtl' if l(:direction) == 'rtl' %>
+<% end %>
+<div id="context-menu" style="display: none;"></div>
+<%= javascript_tag "new ContextMenu('#{issues_context_menu_path}')" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/issues/show.rhtml
--- a/app/views/issues/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-<%= render :partial => 'action_menu' %>
-
-<h2><%= issue_heading(@issue) %></h2>
-
-<div class="<%= @issue.css_classes %> details">
-        <%= avatar(@issue.author, :size => "50") %>
-      
-<div class="subject">      
-<%= render_issue_subject_with_tree(@issue) %>
-</div>
-        <p class="author">
-        <%= authoring @issue.created_on, @issue.author %>.
-        <% if @issue.created_on != @issue.updated_on %>
-        <%= l(:label_updated_time, time_tag(@issue.updated_on)) %>.
-        <% end %>
-        </p>
-
-<table class="attributes">
-<tr>
-    <th class="status"><%=l(:field_status)%>:</th><td class="status"><%= @issue.status.name %></td>
-    <th class="start-date"><%=l(:field_start_date)%>:</th><td class="start-date"><%= format_date(@issue.start_date) %></td>
-</tr>
-<tr>
-    <th class="priority"><%=l(:field_priority)%>:</th><td class="priority"><%= @issue.priority.name %></td>
-    <th class="due-date"><%=l(:field_due_date)%>:</th><td class="due-date"><%= format_date(@issue.due_date) %></td>
-</tr>
-<tr>
-    <th class="assigned-to"><%=l(:field_assigned_to)%>:</th><td class="assigned-to"><%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
-    <th class="progress"><%=l(:field_done_ratio)%>:</th><td class="progress"><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
-</tr>
-<tr>
-    <th class="category"><%=l(:field_category)%>:</th><td class="category"><%=h @issue.category ? @issue.category.name : "-" %></td>
-    <% if User.current.allowed_to?(:view_time_entries, @project) %>
-    <th class="spent-time"><%=l(:label_spent_time)%>:</th>
-    <td class="spent-time"><%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %></td>
-    <% end %>
-</tr>
-<tr>
-    <th class="fixed-version"><%=l(:field_fixed_version)%>:</th><td class="fixed-version"><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
-    <% if @issue.estimated_hours %>
-    <th class="estimated-hours"><%=l(:field_estimated_hours)%>:</th><td class="estimated-hours"><%= l_hours(@issue.estimated_hours) %></td>
-    <% end %>
-</tr>
-<%= render_custom_fields_rows(@issue) %>
-<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
-</table>
-
-<% if @issue.description? || @issue.attachments.any? -%>
-<hr />
-<% if @issue.description? %>
-	<div class="contextual">
-	<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:controller => 'journals', :action => 'new', :id => @issue} }, :class => 'icon icon-comment') %>
-	</div>
-	
-	<p><strong><%=l(:field_description)%></strong></p>
-	<div class="wiki">
-	<%= textilizable @issue, :description, :attachments => @issue.attachments %>
-	</div>
-<% end %>
-<%= link_to_attachments @issue %>
-<% end -%>
-
-<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
-
-<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
-<hr />
-<div id="issue_tree">
-<div class="contextual">
-  <%= link_to(l(:button_add), {:controller => 'issues', :action => 'new', :project_id => @project, :issue => {:parent_issue_id => @issue}}) if User.current.allowed_to?(:manage_subtasks, @project) %>
-</div>
-<p><strong><%=l(:label_subtask_plural)%></strong></p>
-<%= render_descendants_tree(@issue) unless @issue.leaf? %>
-</div>
-<% end %>
-
-<% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
-<hr />
-<div id="relations">
-<%= render :partial => 'relations' %>
-</div>
-<% end %>
-
-</div>
-
-<% if @changesets.present? %>
-<div id="issue-changesets">
-<h3><%=l(:label_associated_revisions)%></h3>
-<%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
-</div>
-<% end %>
-
-<% if @journals.present? %>
-<div id="history">
-<h3><%=l(:label_history)%></h3>
-<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
-</div>
-<% end %>
-
-
-<div style="clear: both;"></div>
-<%= render :partial => 'action_menu' %>
-
-<div style="clear: both;"></div>
-<% if authorize_for('issues', 'edit') %>
-  <div id="update" style="display:none;">
-  <h3><%= l(:button_update) %></h3>
-  <%= render :partial => 'edit' %>
-  </div>
-<% end %>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-	<%= f.link_to 'PDF' %>
-<% end %>
-
-<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
-
-<% content_for :sidebar do %>
-  <%= render :partial => 'issues/sidebar' %>
-
-  <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
-    (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
-    <div id="watchers">
-      <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
-    </div>
-  <% end %>
-<% end %>
-
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
-    <%= stylesheet_link_tag 'scm' %>
-    <%= javascript_include_tag 'context_menu' %>
-    <%= stylesheet_link_tag 'context_menu' %>
-    <%= stylesheet_link_tag 'context_menu_rtl' if l(:direction) == 'rtl' %>
-<% end %>
-<div id="context-menu" style="display: none;"></div>
-<%= javascript_tag "new ContextMenu('#{issues_context_menu_path}')" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/journals/_notes_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/journals/_notes_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,21 @@
+<% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
+    <%= text_area_tag :notes, @journal.notes,
+          :id => "journal_#{@journal.id}_notes",
+          :class => 'wiki-edit', 
+          :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+    <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
+    <p><%= submit_tag l(:button_save) %>
+    <%= link_to_remote l(:label_preview), 
+                       { :url => preview_issue_path(:project_id => @project, :id => @journal.issue),
+                         :method => 'post',
+                         :update => "journal_#{@journal.id}_preview",
+                         :with => "Form.serialize('journal-#{@journal.id}-form')",
+                         :complete => "Element.scrollTo('journal_#{@journal.id}_preview')"
+                       }, :accesskey => accesskey(:preview) %>
+    |
+    <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
+                                                    "Element.show('journal-#{@journal.id}-notes'); return false;" %></p>
+
+    <div id="journal_<%= @journal.id %>_preview" class="wiki"></div>
+<% end %>
+<%= wikitoolbar_for "journal_#{@journal.id}_notes" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/journals/_notes_form.rhtml
--- a/app/views/journals/_notes_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
-    <%= text_area_tag :notes, @journal.notes,
-          :id => "journal_#{@journal.id}_notes",
-          :class => 'wiki-edit', 
-          :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
-    <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %>
-    <p><%= submit_tag l(:button_save) %>
-    <%= link_to_remote l(:label_preview), 
-                       { :url => preview_issue_path(:project_id => @project, :id => @journal.issue),
-                         :method => 'post',
-                         :update => "journal_#{@journal.id}_preview",
-                         :with => "Form.serialize('journal-#{@journal.id}-form')",
-                         :complete => "Element.scrollTo('journal_#{@journal.id}_preview')"
-                       }, :accesskey => accesskey(:preview) %>
-    |
-    <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
-                                                    "Element.show('journal-#{@journal.id}-notes'); return false;" %></p>
-
-    <div id="journal_<%= @journal.id %>_preview" class="wiki"></div>
-<% end %>
-<%= wikitoolbar_for "journal_#{@journal.id}_notes" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/layouts/admin.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/layouts/admin.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<% unless controller_name == 'admin' && action_name == 'index' %>
+	<% content_for :sidebar do %>
+		<h3><%=l(:label_administration)%></h3>
+	  <%= render :partial => 'admin/menu' %>
+	<% end %>
+<% end %>
+
+<%= render :file => "layouts/base" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/layouts/admin.rhtml
--- a/app/views/layouts/admin.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<% unless controller_name == 'admin' && action_name == 'index' %>
-	<% content_for :sidebar do %>
-		<h3><%=l(:label_administration)%></h3>
-	  <%= render :partial => 'admin/menu' %>
-	<% end %>
-<% end %>
-
-<%= render :file => "layouts/base" %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/layouts/base.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/layouts/base.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,81 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title><%=h html_title %></title>
+<meta name="description" content="<%= Redmine::Info.app_name %>" />
+<meta name="keywords" content="issue,bug,tracker" />
+<%= csrf_meta_tag %>
+<%= favicon %>
+<%= stylesheet_link_tag 'application', :media => 'all' %>
+<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
+<%= javascript_heads %>
+<%= heads_for_theme %>
+<!--[if IE 6]>
+    <style type="text/css">
+      * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
+      body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
+    </style>
+<![endif]-->
+<%= call_hook :view_layouts_base_html_head %>
+<!-- page specific tags -->
+<%= yield :header_tags -%>
+</head>
+<body class="<%=h body_css_classes %>">
+<div id="wrapper">
+<div id="wrapper2">
+<div id="top-menu">
+    <div id="account">
+        <%= render_menu :account_menu -%>
+    </div>
+    <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}", :id => 'loggedas') if User.current.logged? %>
+    <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
+</div>
+      
+<div id="header">
+    <% if User.current.logged? || !Setting.login_required? %>
+    <div id="quick-search">
+        <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
+        <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
+        <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>:
+        <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %>
+        <% end %>
+        <%= render_project_jump_box %>
+    </div>
+    <% end %>
+    
+    <h1><%= page_header_title %></h1>
+    
+    <% if display_main_menu?(@project) %>
+    <div id="main-menu">
+        <%= render_main_menu(@project) %>
+    </div>
+    <% end %>
+</div>
+
+<%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
+    <div id="sidebar">        
+        <%= yield :sidebar %>
+        <%= call_hook :view_layouts_base_sidebar %>
+    </div>
+    
+    <div id="content">
+				<%= render_flash_messages %>
+        <%= yield %>
+        <%= call_hook :view_layouts_base_content %>
+				<div style="clear:both;"></div>
+    </div>
+</div>
+
+<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
+	
+<div id="footer">
+  <div class="bgl"><div class="bgr">
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2011 Jean-Philippe Lang
+  </div></div>
+</div>
+</div>
+</div>
+<%= call_hook :view_layouts_base_body_bottom %>
+</body>
+</html>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/layouts/base.rhtml
--- a/app/views/layouts/base.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<title><%=h html_title %></title>
-<meta name="description" content="<%= Redmine::Info.app_name %>" />
-<meta name="keywords" content="issue,bug,tracker" />
-<%= csrf_meta_tag %>
-<%= favicon %>
-<%= stylesheet_link_tag 'application', :media => 'all' %>
-<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
-<%= javascript_heads %>
-<%= heads_for_theme %>
-<!--[if IE 6]>
-    <style type="text/css">
-      * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
-      body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
-    </style>
-<![endif]-->
-<%= call_hook :view_layouts_base_html_head %>
-<!-- page specific tags -->
-<%= yield :header_tags -%>
-</head>
-<body class="<%=h body_css_classes %>">
-<div id="wrapper">
-<div id="wrapper2">
-<div id="top-menu">
-    <div id="account">
-        <%= render_menu :account_menu -%>
-    </div>
-    <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}", :id => 'loggedas') if User.current.logged? %>
-    <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
-</div>
-      
-<div id="header">
-    <% if User.current.logged? || !Setting.login_required? %>
-    <div id="quick-search">
-        <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
-        <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
-        <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>:
-        <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %>
-        <% end %>
-        <%= render_project_jump_box %>
-    </div>
-    <% end %>
-    
-    <h1><%= page_header_title %></h1>
-    
-    <% if display_main_menu?(@project) %>
-    <div id="main-menu">
-        <%= render_main_menu(@project) %>
-    </div>
-    <% end %>
-</div>
-
-<%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
-    <div id="sidebar">        
-        <%= yield :sidebar %>
-        <%= call_hook :view_layouts_base_sidebar %>
-    </div>
-    
-    <div id="content">
-				<%= render_flash_messages %>
-        <%= yield %>
-        <%= call_hook :view_layouts_base_content %>
-				<div style="clear:both;"></div>
-    </div>
-</div>
-
-<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
-	
-<div id="footer">
-  <div class="bgl"><div class="bgr">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2011 Jean-Philippe Lang
-  </div></div>
-</div>
-</div>
-</div>
-<%= call_hook :view_layouts_base_body_bottom %>
-</body>
-</html>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/ldap_auth_sources/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/ldap_auth_sources/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,44 @@
+<%= error_messages_for 'auth_source' %>
+
+<div class="box">
+<!--[form:auth_source]-->
+<p><label for="auth_source_name"><%=l(:field_name)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'name'  %></p>
+
+<p><label for="auth_source_host"><%=l(:field_host)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'host'  %></p>
+
+<p><label for="auth_source_port"><%=l(:field_port)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'port', :size => 6 %> <%= check_box 'auth_source', 'tls'  %> LDAPS</p>
+
+<p><label for="auth_source_account"><%=l(:field_account)%></label>
+<%= text_field 'auth_source', 'account'  %></p>
+
+<p><label for="auth_source_account_password"><%=l(:field_password)%></label>
+<%= password_field 'auth_source', 'account_password', :name => 'ignore',
+                                           :value => ((@auth_source.new_record? || @auth_source.account_password.blank?) ? '' : ('x'*15)),
+                                           :onfocus => "this.value=''; this.name='auth_source[account_password]';",
+                                           :onchange => "this.name='auth_source[account_password]';" %></p>
+
+<p><label for="auth_source_base_dn"><%=l(:field_base_dn)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'base_dn', :size => 60 %></p>
+
+<p><label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label>
+<%= check_box 'auth_source', 'onthefly_register' %></p>
+</div>
+
+<fieldset class="box"><legend><%=l(:label_attribute_plural)%></legend>
+<p><label for="auth_source_attr_login"><%=l(:field_login)%> <span class="required">*</span></label>
+<%= text_field 'auth_source', 'attr_login', :size => 20  %></p>
+
+<p><label for="auth_source_attr_firstname"><%=l(:field_firstname)%></label>
+<%= text_field 'auth_source', 'attr_firstname', :size => 20  %></p>
+
+<p><label for="auth_source_attr_lastname"><%=l(:field_lastname)%></label>
+<%= text_field 'auth_source', 'attr_lastname', :size => 20  %></p>
+
+<p><label for="auth_source_attr_mail"><%=l(:field_mail)%></label>
+<%= text_field 'auth_source', 'attr_mail', :size => 20  %></p>
+</fieldset>
+<!--[eoform:auth_source]-->
+
diff -r df51e8ff578d -r c6c2cbd0afee app/views/ldap_auth_sources/_form.rhtml
--- a/app/views/ldap_auth_sources/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-<%= error_messages_for 'auth_source' %>
-
-<div class="box">
-<!--[form:auth_source]-->
-<p><label for="auth_source_name"><%=l(:field_name)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'name'  %></p>
-
-<p><label for="auth_source_host"><%=l(:field_host)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'host'  %></p>
-
-<p><label for="auth_source_port"><%=l(:field_port)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'port', :size => 6 %> <%= check_box 'auth_source', 'tls'  %> LDAPS</p>
-
-<p><label for="auth_source_account"><%=l(:field_account)%></label>
-<%= text_field 'auth_source', 'account'  %></p>
-
-<p><label for="auth_source_account_password"><%=l(:field_password)%></label>
-<%= password_field 'auth_source', 'account_password', :name => 'ignore',
-                                           :value => ((@auth_source.new_record? || @auth_source.account_password.blank?) ? '' : ('x'*15)),
-                                           :onfocus => "this.value=''; this.name='auth_source[account_password]';",
-                                           :onchange => "this.name='auth_source[account_password]';" %></p>
-
-<p><label for="auth_source_base_dn"><%=l(:field_base_dn)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'base_dn', :size => 60 %></p>
-
-<p><label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label>
-<%= check_box 'auth_source', 'onthefly_register' %></p>
-</div>
-
-<fieldset class="box"><legend><%=l(:label_attribute_plural)%></legend>
-<p><label for="auth_source_attr_login"><%=l(:field_login)%> <span class="required">*</span></label>
-<%= text_field 'auth_source', 'attr_login', :size => 20  %></p>
-
-<p><label for="auth_source_attr_firstname"><%=l(:field_firstname)%></label>
-<%= text_field 'auth_source', 'attr_firstname', :size => 20  %></p>
-
-<p><label for="auth_source_attr_lastname"><%=l(:field_lastname)%></label>
-<%= text_field 'auth_source', 'attr_lastname', :size => 20  %></p>
-
-<p><label for="auth_source_attr_mail"><%=l(:field_mail)%></label>
-<%= text_field 'auth_source', 'attr_mail', :size => 20  %></p>
-</fieldset>
-<!--[eoform:auth_source]-->
-
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/_issue_text_html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/_issue_text_html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<h1><%= link_to(h("#{issue.tracker.name} ##{issue.id}: #{issue.subject}"), issue_url) %></h1>
+
+<ul>
+<li><%=l(:field_author)%>: <%=h issue.author %></li>
+<li><%=l(:field_status)%>: <%=h issue.status %></li>
+<li><%=l(:field_priority)%>: <%=h issue.priority %></li>
+<li><%=l(:field_assigned_to)%>: <%=h issue.assigned_to %></li>
+<li><%=l(:field_category)%>: <%=h issue.category %></li>
+<li><%=l(:field_fixed_version)%>: <%=h issue.fixed_version %></li>
+<% issue.custom_field_values.each do |c| %>
+  <li><%=h c.custom_field.name %>: <%=h show_value(c) %></li>
+<% end %>
+</ul>
+
+<%= textilizable(issue, :description, :only_path => false) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/_issue_text_html.rhtml
--- a/app/views/mailer/_issue_text_html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<h1><%= link_to(h("#{issue.tracker.name} ##{issue.id}: #{issue.subject}"), issue_url) %></h1>
-
-<ul>
-<li><%=l(:field_author)%>: <%=h issue.author %></li>
-<li><%=l(:field_status)%>: <%=h issue.status %></li>
-<li><%=l(:field_priority)%>: <%=h issue.priority %></li>
-<li><%=l(:field_assigned_to)%>: <%=h issue.assigned_to %></li>
-<li><%=l(:field_category)%>: <%=h issue.category %></li>
-<li><%=l(:field_fixed_version)%>: <%=h issue.fixed_version %></li>
-<% issue.custom_field_values.each do |c| %>
-  <li><%=h c.custom_field.name %>: <%=h show_value(c) %></li>
-<% end %>
-</ul>
-
-<%= textilizable(issue, :description, :only_path => false) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/_issue_text_plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/_issue_text_plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,13 @@
+<%= "#{issue.tracker.name} ##{issue.id}: #{issue.subject}" %>
+<%= issue_url %>
+
+<%=l(:field_author)%>: <%= issue.author %>
+<%=l(:field_status)%>: <%= issue.status %>
+<%=l(:field_priority)%>: <%= issue.priority %>
+<%=l(:field_assigned_to)%>: <%= issue.assigned_to %>
+<%=l(:field_category)%>: <%= issue.category %>
+<%=l(:field_fixed_version)%>: <%= issue.fixed_version %>
+<% issue.custom_field_values.each do |c| %><%= c.custom_field.name %>: <%= show_value(c) %>
+<% end %>
+
+<%= issue.description %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/_issue_text_plain.rhtml
--- a/app/views/mailer/_issue_text_plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<%= "#{issue.tracker.name} ##{issue.id}: #{issue.subject}" %>
-<%= issue_url %>
-
-<%=l(:field_author)%>: <%= issue.author %>
-<%=l(:field_status)%>: <%= issue.status %>
-<%=l(:field_priority)%>: <%= issue.priority %>
-<%=l(:field_assigned_to)%>: <%= issue.assigned_to %>
-<%=l(:field_category)%>: <%= issue.category %>
-<%=l(:field_fixed_version)%>: <%= issue.fixed_version %>
-<% issue.custom_field_values.each do |c| %><%= c.custom_field.name %>: <%= show_value(c) %>
-<% end %>
-
-<%= issue.description %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_activated.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/account_activated.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,2 @@
+<p><%= l(:notice_account_activated) %></p>
+<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_activated.text.html.rhtml
--- a/app/views/mailer/account_activated.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<p><%= l(:notice_account_activated) %></p>
-<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_activated.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/account_activated.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,2 @@
+<%= l(:notice_account_activated) %>
+<%= l(:label_login) %>: <%= @login_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_activated.text.plain.rhtml
--- a/app/views/mailer/account_activated.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<%= l(:notice_account_activated) %>
-<%= l(:label_login) %>: <%= @login_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_activation_request.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/account_activation_request.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,2 @@
+<p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
+<p><%= link_to @url, @url %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_activation_request.text.html.rhtml
--- a/app/views/mailer/account_activation_request.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
-<p><%= link_to @url, @url %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_activation_request.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/account_activation_request.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,2 @@
+<%= l(:mail_body_account_activation_request, @user.login) %>
+<%= @url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_activation_request.text.plain.rhtml
--- a/app/views/mailer/account_activation_request.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<%= l(:mail_body_account_activation_request, @user.login) %>
-<%= @url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_information.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/account_information.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,11 @@
+<% if @user.auth_source %>
+<p><%= l(:mail_body_account_information_external, h(@user.auth_source.name)) %></p>
+<% else %>
+<p><%= l(:mail_body_account_information) %>:</p>
+<ul>
+    <li><%= l(:field_login) %>: <%=h @user.login %></li>
+    <li><%= l(:field_password) %>: <%=h @password %></li>
+</ul>
+<% end %>
+
+<p><%= l(:label_login) %>: <%= auto_link(@login_url) %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_information.text.html.rhtml
--- a/app/views/mailer/account_information.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<% if @user.auth_source %>
-<p><%= l(:mail_body_account_information_external, h(@user.auth_source.name)) %></p>
-<% else %>
-<p><%= l(:mail_body_account_information) %>:</p>
-<ul>
-    <li><%= l(:field_login) %>: <%=h @user.login %></li>
-    <li><%= l(:field_password) %>: <%=h @password %></li>
-</ul>
-<% end %>
-
-<p><%= l(:label_login) %>: <%= auto_link(@login_url) %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_information.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/account_information.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %>
+<% else %><%= l(:mail_body_account_information) %>:
+* <%= l(:field_login) %>: <%= @user.login %>
+* <%= l(:field_password) %>: <%= @password %>
+<% end %>
+<%= l(:label_login) %>: <%= @login_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/account_information.text.plain.rhtml
--- a/app/views/mailer/account_information.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<% if @user.auth_source %><%= l(:mail_body_account_information_external, @user.auth_source.name) %>
-<% else %><%= l(:mail_body_account_information) %>:
-* <%= l(:field_login) %>: <%= @user.login %>
-* <%= l(:field_password) %>: <%= @password %>
-<% end %>
-<%= l(:label_login) %>: <%= @login_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/attachments_added.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/attachments_added.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<%= link_to @added_to, @added_to_url %><br />
+
+<ul><% @attachments.each do |attachment | %>
+<li><%=h attachment.filename %></li>
+<% end %></ul>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/attachments_added.text.html.rhtml
--- a/app/views/mailer/attachments_added.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<%= link_to @added_to, @added_to_url %><br />
-
-<ul><% @attachments.each do |attachment | %>
-<li><%=h attachment.filename %></li>
-<% end %></ul>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/attachments_added.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/attachments_added.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,4 @@
+<%= @added_to %><% @attachments.each do |attachment | %>
+- <%= attachment.filename %><% end %>
+
+<%= @added_to_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/attachments_added.text.plain.rhtml
--- a/app/views/mailer/attachments_added.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<%= @added_to %><% @attachments.each do |attachment | %>
-- <%= attachment.filename %><% end %>
-
-<%= @added_to_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/document_added.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/document_added.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,3 @@
+<%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
+<br />
+<%= textilizable(@document, :description, :only_path => false) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/document_added.text.html.rhtml
--- a/app/views/mailer/document_added.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
-<br />
-<%= textilizable(@document, :description, :only_path => false) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/document_added.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/document_added.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,4 @@
+<%= @document.title %> (<%= @document.category.name %>)
+<%= @document_url %>
+
+<%= @document.description %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/document_added.text.plain.rhtml
--- a/app/views/mailer/document_added.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<%= @document.title %> (<%= @document.category.name %>)
-<%= @document_url %>
-
-<%= @document.description %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/issue_add.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/issue_add.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,3 @@
+<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
+<hr />
+<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/issue_add.text.html.rhtml
--- a/app/views/mailer/issue_add.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<%= l(:text_issue_added, :id => "##{@issue.id}", :author => h(@issue.author)) %>
-<hr />
-<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/issue_add.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/issue_add.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,4 @@
+<%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
+
+----------------------------------------
+<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/issue_add.text.plain.rhtml
--- a/app/views/mailer/issue_add.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<%= l(:text_issue_added, :id => "##{@issue.id}", :author => @issue.author) %>
-
-----------------------------------------
-<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/issue_edit.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/issue_edit.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,11 @@
+<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
+
+<ul>
+<% for detail in @journal.details %>
+    <li><%= show_detail(detail, true) %></li>
+<% end %>
+</ul>
+
+<%= textilizable(@journal, :notes, :only_path => false) %>
+<hr />
+<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/issue_edit.text.html.rhtml
--- a/app/views/mailer/issue_edit.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => h(@journal.user)) %>
-
-<ul>
-<% for detail in @journal.details %>
-    <li><%= show_detail(detail, true) %></li>
-<% end %>
-</ul>
-
-<%= textilizable(@journal, :notes, :only_path => false) %>
-<hr />
-<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/issue_edit.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/issue_edit.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,9 @@
+<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
+
+<% for detail in @journal.details -%>
+<%= show_detail(detail, true) %>
+<% end -%>
+
+<%= @journal.notes if @journal.notes? %>
+----------------------------------------
+<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/issue_edit.text.plain.rhtml
--- a/app/views/mailer/issue_edit.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<%= l(:text_issue_updated, :id => "##{@issue.id}", :author => @journal.user) %>
-
-<% for detail in @journal.details -%>
-<%= show_detail(detail, true) %>
-<% end -%>
-
-<%= @journal.notes if @journal.notes? %>
-----------------------------------------
-<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/lost_password.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/lost_password.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,4 @@
+<p><%= l(:mail_body_lost_password) %><br />
+<%= auto_link(@url) %></p>
+
+<p><%= l(:field_login) %>: <b><%=h @token.user.login %></b></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/lost_password.text.html.rhtml
--- a/app/views/mailer/lost_password.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<p><%= l(:mail_body_lost_password) %><br />
-<%= auto_link(@url) %></p>
-
-<p><%= l(:field_login) %>: <b><%=h @token.user.login %></b></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/lost_password.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/lost_password.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,4 @@
+<%= l(:mail_body_lost_password) %>
+<%= @url %>
+
+<%= l(:field_login) %>: <%= @token.user.login %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/lost_password.text.plain.rhtml
--- a/app/views/mailer/lost_password.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<%= l(:mail_body_lost_password) %>
-<%= @url %>
-
-<%= l(:field_login) %>: <%= @token.user.login %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/message_posted.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/message_posted.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,4 @@
+<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
+<em><%=h @message.author %></em>
+
+<%= textilizable(@message, :content, :only_path => false) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/message_posted.text.html.rhtml
--- a/app/views/mailer/message_posted.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
-<em><%=h @message.author %></em>
-
-<%= textilizable(@message, :content, :only_path => false) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/message_posted.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/message_posted.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,4 @@
+<%= @message_url %>
+<%= @message.author %>
+
+<%= @message.content %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/message_posted.text.plain.rhtml
--- a/app/views/mailer/message_posted.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<%= @message_url %>
-<%= @message.author %>
-
-<%= @message.content %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/news_added.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/news_added.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@news.title), @news_url) %></h1>
+<em><%=h @news.author.name %></em>
+
+<%= textilizable(@news, :description, :only_path => false) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/news_added.text.html.rhtml
--- a/app/views/mailer/news_added.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
-<em><%=h @news.author.name %></em>
-
-<%= textilizable(@news, :description, :only_path => false) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/news_added.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/news_added.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<%= @news.title %>
+<%= @news_url %>
+<%= @news.author.name %>
+
+<%= @news.description %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/news_added.text.plain.rhtml
--- a/app/views/mailer/news_added.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<%= @news.title %>
-<%= @news_url %>
-<%= @news.author.name %>
-
-<%= @news.description %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/news_comment_added.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/news_comment_added.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<h1><%= link_to(h(@news.title), @news_url) %></h1>
+
+<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
+
+<%= textilizable @comment, :comments, :only_path => false %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/news_comment_added.text.html.rhtml
--- a/app/views/mailer/news_comment_added.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
-
-<p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
-
-<%= textilizable @comment, :comments, :only_path => false %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/news_comment_added.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/news_comment_added.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<%= @news.title %>
+<%= @news_url %>
+
+<%= l(:text_user_wrote, :value => @comment.author) %>
+
+<%= @comment.comments %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/news_comment_added.text.plain.rhtml
--- a/app/views/mailer/news_comment_added.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<%= @news.title %>
-<%= @news_url %>
-
-<%= l(:text_user_wrote, :value => @comment.author) %>
-
-<%= @comment.comments %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/register.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/register.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,2 @@
+<p><%= l(:mail_body_register) %><br />
+<%= auto_link(@url) %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/register.text.html.rhtml
--- a/app/views/mailer/register.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<p><%= l(:mail_body_register) %><br />
-<%= auto_link(@url) %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/register.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/register.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,2 @@
+<%= l(:mail_body_register) %>
+<%= @url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/register.text.plain.rhtml
--- a/app/views/mailer/register.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<%= l(:mail_body_register) %>
-<%= @url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/reminder.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/reminder.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,9 @@
+<p><%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %></p>
+
+<ul>
+<% @issues.each do |issue| -%>
+  <li><%=h issue.project %> - <%=link_to("#{issue.tracker} ##{issue.id}", :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
+<% end -%>
+</ul>
+
+<p><%= link_to l(:label_issue_view_all), @issues_url %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/reminder.text.html.rhtml
--- a/app/views/mailer/reminder.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<p><%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %></p>
-
-<ul>
-<% @issues.each do |issue| -%>
-  <li><%=h issue.project %> - <%=link_to("#{issue.tracker} ##{issue.id}", :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
-<% end -%>
-</ul>
-
-<p><%= link_to l(:label_issue_view_all), @issues_url %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/reminder.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/reminder.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,7 @@
+<%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %>:
+
+<% @issues.each do |issue| -%>
+* <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %>
+<% end -%>
+
+<%= @issues_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/reminder.text.plain.rhtml
--- a/app/views/mailer/reminder.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<%= l(:mail_body_reminder, :count => @issues.size, :days => @days) %>:
-
-<% @issues.each do |issue| -%>
-* <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %>
-<% end -%>
-
-<%= @issues_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/test.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/test.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,2 @@
+<p>This is a test email sent by Redmine.<br />
+Redmine URL: <%= auto_link(@url) %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/test.text.html.rhtml
--- a/app/views/mailer/test.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<p>This is a test email sent by Redmine.<br />
-Redmine URL: <%= auto_link(@url) %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/test.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/test.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,2 @@
+This is a test email sent by Redmine.
+Redmine URL: <%= @url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/test.text.plain.rhtml
--- a/app/views/mailer/test.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-This is a test email sent by Redmine.
-Redmine URL: <%= @url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/wiki_content_added.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/wiki_content_added.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,3 @@
+<p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), 
+		  																  :author => h(@wiki_content.author)) %><br />
+<em><%=h @wiki_content.comments %></em></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/wiki_content_added.text.html.rhtml
--- a/app/views/mailer/wiki_content_added.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), 
-		  																  :author => h(@wiki_content.author)) %><br />
-<em><%=h @wiki_content.comments %></em></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/wiki_content_added.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/wiki_content_added.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<%= l(:mail_body_wiki_content_added, :id => h(@wiki_content.page.pretty_title), 
+																		 :author => h(@wiki_content.author)) %>
+<%= @wiki_content.comments %>
+
+<%= @wiki_content_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/wiki_content_added.text.plain.rhtml
--- a/app/views/mailer/wiki_content_added.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<%= l(:mail_body_wiki_content_added, :id => h(@wiki_content.page.pretty_title), 
-																		 :author => h(@wiki_content.author)) %>
-<%= @wiki_content.comments %>
-
-<%= @wiki_content_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/wiki_content_updated.text.html.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/wiki_content_updated.text.html.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), 
+  	    														      :author => h(@wiki_content.author)) %><br />
+<em><%=h @wiki_content.comments %></em></p>
+
+<p><%= l(:label_view_diff) %>:<br />
+<%= link_to @wiki_diff_url, @wiki_diff_url %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/wiki_content_updated.text.html.rhtml
--- a/app/views/mailer/wiki_content_updated.text.html.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url), 
-  	    														      :author => h(@wiki_content.author)) %><br />
-<em><%=h @wiki_content.comments %></em></p>
-
-<p><%= l(:label_view_diff) %>:<br />
-<%= link_to @wiki_diff_url, @wiki_diff_url %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/wiki_content_updated.text.plain.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/mailer/wiki_content_updated.text.plain.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<%= l(:mail_body_wiki_content_updated, :id => h(@wiki_content.page.pretty_title), 
+																			 :author => h(@wiki_content.author)) %>
+<%= @wiki_content.comments %>
+
+<%= @wiki_content.page.pretty_title %>:
+<%= @wiki_content_url %>
+<%= l(:label_view_diff) %>:
+<%= @wiki_diff_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/mailer/wiki_content_updated.text.plain.rhtml
--- a/app/views/mailer/wiki_content_updated.text.plain.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<%= l(:mail_body_wiki_content_updated, :id => h(@wiki_content.page.pretty_title), 
-																			 :author => h(@wiki_content.author)) %>
-<%= @wiki_content.comments %>
-
-<%= @wiki_content.page.pretty_title %>:
-<%= @wiki_content_url %>
-<%= l(:label_view_diff) %>:
-<%= @wiki_diff_url %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/members/autocomplete_for_member.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/members/autocomplete_for_member.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,1 @@
+<%= principals_check_box_tags 'member[user_ids][]', @principals %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/members/autocomplete_for_member.rhtml
--- a/app/views/members/autocomplete_for_member.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<%= principals_check_box_tags 'member[user_ids][]', @principals %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/messages/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/messages/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,26 @@
+<%= error_messages_for 'message' %>
+<% replying ||= false %>
+
+<div class="box">
+<!--[form:message]-->
+<p><label><%= l(:field_subject) %></label><br />
+<%= f.text_field :subject, :size => 120 %>
+
+<% if !replying && User.current.allowed_to?(:edit_messages, @project) %>
+    <label><%= f.check_box :sticky %><%= l(:label_board_sticky) %></label>
+    <label><%= f.check_box :locked %><%= l(:label_board_locked) %></label>
+<% end %>
+</p>
+
+<% if !replying && !@message.new_record? && User.current.allowed_to?(:edit_messages, @project) %>
+	<p><label><%= l(:label_board) %></label><br />
+  <%= f.select :board_id, @project.boards.collect {|b| [b.name, b.id]} %></p>
+<% end %>
+
+<p><%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content' %></p>
+<%= wikitoolbar_for 'message_content' %>
+<!--[eoform:message]-->
+
+<p><%= l(:label_attachment_plural) %><br />
+<%= render :partial => 'attachments/form' %></p>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/messages/_form.rhtml
--- a/app/views/messages/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<%= error_messages_for 'message' %>
-<% replying ||= false %>
-
-<div class="box">
-<!--[form:message]-->
-<p><label><%= l(:field_subject) %></label><br />
-<%= f.text_field :subject, :size => 120 %>
-
-<% if !replying && User.current.allowed_to?(:edit_messages, @project) %>
-    <label><%= f.check_box :sticky %><%= l(:label_board_sticky) %></label>
-    <label><%= f.check_box :locked %><%= l(:label_board_locked) %></label>
-<% end %>
-</p>
-
-<% if !replying && !@message.new_record? && User.current.allowed_to?(:edit_messages, @project) %>
-	<p><label><%= l(:label_board) %></label><br />
-  <%= f.select :board_id, @project.boards.collect {|b| [b.name, b.id]} %></p>
-<% end %>
-
-<p><%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content' %></p>
-<%= wikitoolbar_for 'message_content' %>
-<!--[eoform:message]-->
-
-<p><%= l(:label_attachment_plural) %><br />
-<%= render :partial => 'attachments/form' %></p>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/messages/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/messages/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,18 @@
+<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
+
+<% form_for :message, @message, :url => {:action => 'edit'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f, :replying => !@message.parent.nil?} %>
+  <%= submit_tag l(:button_save) %>
+  <%= link_to_remote l(:label_preview), 
+                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
+                       :method => 'post',
+                       :update => 'preview',
+                       :with => "Form.serialize('message-form')",
+                       :complete => "Element.scrollTo('preview')"
+                     }, :accesskey => accesskey(:preview) %>
+<% end %>
+<div id="preview" class="wiki"></div>
+
+<% content_for :header_tags do %>
+    <%= stylesheet_link_tag 'scm' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/messages/edit.rhtml
--- a/app/views/messages/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
-
-<% form_for :message, @message, :url => {:action => 'edit'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f, :replying => !@message.parent.nil?} %>
-  <%= submit_tag l(:button_save) %>
-  <%= link_to_remote l(:label_preview), 
-                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
-                       :method => 'post',
-                       :update => 'preview',
-                       :with => "Form.serialize('message-form')",
-                       :complete => "Element.scrollTo('preview')"
-                     }, :accesskey => accesskey(:preview) %>
-<% end %>
-<div id="preview" class="wiki"></div>
-
-<% content_for :header_tags do %>
-    <%= stylesheet_link_tag 'scm' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/messages/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/messages/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
+
+<% form_for :message, @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
+  <%= submit_tag l(:button_create) %>
+  <%= link_to_remote l(:label_preview), 
+                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
+                       :method => 'post',
+                       :update => 'preview',
+                       :with => "Form.serialize('message-form')",
+                       :complete => "Element.scrollTo('preview')"
+                     }, :accesskey => accesskey(:preview) %>
+<% end %>
+
+<div id="preview" class="wiki"></div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/messages/new.rhtml
--- a/app/views/messages/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
-
-<% form_for :message, @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
-  <%= submit_tag l(:button_create) %>
-  <%= link_to_remote l(:label_preview), 
-                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
-                       :method => 'post',
-                       :update => 'preview',
-                       :with => "Form.serialize('message-form')",
-                       :complete => "Element.scrollTo('preview')"
-                     }, :accesskey => accesskey(:preview) %>
-<% end %>
-
-<div id="preview" class="wiki"></div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/messages/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/messages/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,66 @@
+<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}),
+               link_to(h(@board.name), {:controller => 'boards', :action => 'show', :project_id => @project, :id => @board}) %>
+
+<div class="contextual">
+    <%= watcher_tag(@topic, User.current) %>
+    <%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'quote', :id => @topic} }, :class => 'icon icon-comment') unless @topic.locked? %>
+    <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'icon icon-edit') if @message.editable_by?(User.current) %>
+    <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') if @message.destroyable_by?(User.current) %>
+</div>
+
+<h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
+
+<div class="message">
+<p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
+<div class="wiki">
+<%= textilizable(@topic.content, :attachments => @topic.attachments) %>
+</div>
+<%= link_to_attachments @topic, :author => false %>
+</div>
+<br />
+
+<% unless @replies.empty? %>
+<h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
+<% @replies.each do |message| %>
+  <div class="message reply" id="<%= "message-#{message.id}" %>">
+    <div class="contextual">
+      <%= link_to_remote_if_authorized(image_tag('comment.png'), { :url => {:action => 'quote', :id => message} }, :title => l(:button_quote)) unless @topic.locked? %>
+      <%= link_to(image_tag('edit.png'), {:action => 'edit', :id => message}, :title => l(:button_edit)) if message.editable_by?(User.current) %>
+      <%= link_to(image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if message.destroyable_by?(User.current) %>
+    </div>
+  <h4>
+  	<%= avatar(message.author, :size => "24") %>
+    <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %>
+    -
+    <%= authoring message.created_on, message.author %>
+  </h4>
+  <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
+  <%= link_to_attachments message, :author => false %>
+  </div>
+<% end %>
+<p class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></p>
+<% end %>
+
+<% if !@topic.locked? && authorize_for('messages', 'reply') %>
+<p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
+<div id="reply" style="display:none;">
+<% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
+  <%= submit_tag l(:button_submit) %>
+  <%= link_to_remote l(:label_preview), 
+                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
+                       :method => 'post',
+                       :update => 'preview',
+                       :with => "Form.serialize('message-form')",
+                       :complete => "Element.scrollTo('preview')"
+                     }, :accesskey => accesskey(:preview) %>
+<% end %>
+<div id="preview" class="wiki"></div>
+</div>
+<% end %>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
+
+<% html_title h(@topic.subject) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/messages/show.rhtml
--- a/app/views/messages/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}),
-               link_to(h(@board.name), {:controller => 'boards', :action => 'show', :project_id => @project, :id => @board}) %>
-
-<div class="contextual">
-    <%= watcher_tag(@topic, User.current) %>
-    <%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'quote', :id => @topic} }, :class => 'icon icon-comment') unless @topic.locked? %>
-    <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'icon icon-edit') if @message.editable_by?(User.current) %>
-    <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') if @message.destroyable_by?(User.current) %>
-</div>
-
-<h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
-
-<div class="message">
-<p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
-<div class="wiki">
-<%= textilizable(@topic.content, :attachments => @topic.attachments) %>
-</div>
-<%= link_to_attachments @topic, :author => false %>
-</div>
-<br />
-
-<% unless @replies.empty? %>
-<h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
-<% @replies.each do |message| %>
-  <div class="message reply" id="<%= "message-#{message.id}" %>">
-    <div class="contextual">
-      <%= link_to_remote_if_authorized(image_tag('comment.png'), { :url => {:action => 'quote', :id => message} }, :title => l(:button_quote)) unless @topic.locked? %>
-      <%= link_to(image_tag('edit.png'), {:action => 'edit', :id => message}, :title => l(:button_edit)) if message.editable_by?(User.current) %>
-      <%= link_to(image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if message.destroyable_by?(User.current) %>
-    </div>
-  <h4>
-  	<%= avatar(message.author, :size => "24") %>
-    <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %>
-    -
-    <%= authoring message.created_on, message.author %>
-  </h4>
-  <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
-  <%= link_to_attachments message, :author => false %>
-  </div>
-<% end %>
-<p class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></p>
-<% end %>
-
-<% if !@topic.locked? && authorize_for('messages', 'reply') %>
-<p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
-<div id="reply" style="display:none;">
-<% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
-  <%= submit_tag l(:button_submit) %>
-  <%= link_to_remote l(:label_preview), 
-                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
-                       :method => 'post',
-                       :update => 'preview',
-                       :with => "Form.serialize('message-form')",
-                       :complete => "Element.scrollTo('preview')"
-                     }, :accesskey => accesskey(:preview) %>
-<% end %>
-<div id="preview" class="wiki"></div>
-</div>
-<% end %>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
-
-<% html_title h(@topic.subject) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/_block.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/_block.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,14 @@
+<div id="block_<%= block_name.dasherize %>" 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.dasherize}')" },
+        :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 -r df51e8ff578d -r c6c2cbd0afee app/views/my/_block.rhtml
--- a/app/views/my/_block.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<div id="block_<%= block_name.dasherize %>" 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.dasherize}')" },
-        :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 -r df51e8ff578d -r c6c2cbd0afee app/views/my/_sidebar.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/_sidebar.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,33 @@
+<h3><%=l(:label_my_account)%></h3>
+
+<p><%=l(:field_login)%>: <strong><%= link_to_user(@user, :format => :username) %></strong><br />
+<%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p>
+
+
+<h4><%= l(:label_feeds_access_key) %></h4>
+
+<p>
+<% if @user.rss_token %>
+<%= l(:label_feeds_access_key_created_on, distance_of_time_in_words(Time.now, @user.rss_token.created_on)) %>
+<% else %>
+<%= l(:label_missing_feeds_access_key) %>
+<% end %>
+(<%= link_to l(:button_reset), {:action => 'reset_rss_key'}, :method => :post %>)
+</p>
+
+<% if Setting.rest_api_enabled? %>
+<h4><%= l(:label_api_access_key) %></h4>
+<div>
+  <%= link_to_function(l(:button_show), "$('api-access-key').toggle();")%>
+  <pre id='api-access-key' class='autoscroll'><%= h(@user.api_key) %></pre>
+</div>
+<%= javascript_tag("$('api-access-key').hide();") %>
+<p>
+<% if @user.api_token %>
+<%= l(:label_api_access_key_created_on, distance_of_time_in_words(Time.now, @user.api_token.created_on)) %>
+<% else %>
+<%= l(:label_missing_api_access_key) %>
+<% end %>
+(<%= link_to l(:button_reset), {:action => 'reset_api_key'}, :method => :post %>)
+</p>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/_sidebar.rhtml
--- a/app/views/my/_sidebar.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<h3><%=l(:label_my_account)%></h3>
-
-<p><%=l(:field_login)%>: <strong><%= link_to_user(@user, :format => :username) %></strong><br />
-<%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p>
-
-
-<h4><%= l(:label_feeds_access_key) %></h4>
-
-<p>
-<% if @user.rss_token %>
-<%= l(:label_feeds_access_key_created_on, distance_of_time_in_words(Time.now, @user.rss_token.created_on)) %>
-<% else %>
-<%= l(:label_missing_feeds_access_key) %>
-<% end %>
-(<%= link_to l(:button_reset), {:action => 'reset_rss_key'}, :method => :post %>)
-</p>
-
-<% if Setting.rest_api_enabled? %>
-<h4><%= l(:label_api_access_key) %></h4>
-<div>
-  <%= link_to_function(l(:button_show), "$('api-access-key').toggle();")%>
-  <pre id='api-access-key' class='autoscroll'><%= h(@user.api_key) %></pre>
-</div>
-<%= javascript_tag("$('api-access-key').hide();") %>
-<p>
-<% if @user.api_token %>
-<%= l(:label_api_access_key_created_on, distance_of_time_in_words(Time.now, @user.api_token.created_on)) %>
-<% else %>
-<%= l(:label_missing_api_access_key) %>
-<% end %>
-(<%= link_to l(:button_reset), {:action => 'reset_api_key'}, :method => :post %>)
-</p>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/account.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/account.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,50 @@
+<div class="contextual">
+<%= link_to(l(:button_change_password), :action => 'password') if @user.change_password_allowed? %>
+<%= call_hook(:view_my_account_contextual, :user => @user)%>
+</div>
+<h2><%=l(:label_my_account)%></h2>
+<%= error_messages_for 'user' %>
+
+<% form_for :user, @user, :url => { :action => "account" }, 
+                          :builder => TabularFormBuilder, 
+                          :lang => current_language,
+                          :html => { :id => 'my_account_form' } do |f| %>
+<div class="splitcontentleft">
+<h3><%=l(:label_information_plural)%></h3>
+<div class="box tabular">
+<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>
+<% if Setting.openid? %>
+<p><%= f.text_field :identity_url  %></p>
+<% end %>
+
+<% @user.custom_field_values.select(&:editable?).each do |value| %>
+	<p><%= custom_field_tag_with_label :user, value %></p>
+<% end %>
+<%= call_hook(:view_my_account, :user => @user, :form => f) %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+</div>
+
+<div class="splitcontentright">
+<h3><%=l(:field_mail_notification)%></h3>
+<div class="box">
+<%= render :partial => 'users/mail_notifications' %>
+</div>
+
+<h3><%=l(:label_preferences)%></h3>
+<div class="box tabular">
+<%= render :partial => 'users/preferences' %>
+</div>
+
+</div>
+<% end %>
+
+<% content_for :sidebar do %>
+<%= render :partial => 'sidebar' %>
+<% end %>
+
+<% html_title(l(:label_my_account)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/account.rhtml
--- a/app/views/my/account.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<div class="contextual">
-<%= link_to(l(:button_change_password), :action => 'password') if @user.change_password_allowed? %>
-<%= call_hook(:view_my_account_contextual, :user => @user)%>
-</div>
-<h2><%=l(:label_my_account)%></h2>
-<%= error_messages_for 'user' %>
-
-<% form_for :user, @user, :url => { :action => "account" }, 
-                          :builder => TabularFormBuilder, 
-                          :lang => current_language,
-                          :html => { :id => 'my_account_form' } do |f| %>
-<div class="splitcontentleft">
-<h3><%=l(:label_information_plural)%></h3>
-<div class="box tabular">
-<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>
-<% if Setting.openid? %>
-<p><%= f.text_field :identity_url  %></p>
-<% end %>
-
-<% @user.custom_field_values.select(&:editable?).each do |value| %>
-	<p><%= custom_field_tag_with_label :user, value %></p>
-<% end %>
-<%= call_hook(:view_my_account, :user => @user, :form => f) %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-</div>
-
-<div class="splitcontentright">
-<h3><%=l(:field_mail_notification)%></h3>
-<div class="box">
-<%= render :partial => 'users/mail_notifications' %>
-</div>
-
-<h3><%=l(:label_preferences)%></h3>
-<div class="box tabular">
-<%= render :partial => 'users/preferences' %>
-</div>
-
-</div>
-<% end %>
-
-<% content_for :sidebar do %>
-<%= render :partial => 'sidebar' %>
-<% end %>
-
-<% html_title(l(:label_my_account)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_calendar.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/blocks/_calendar.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<h3><%= l(:label_calendar) %></h3>
+
+<% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week)
+   calendar.events = Issue.visible.find :all,
+                     :conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt],
+                     :include => [:project, :tracker, :priority, :assigned_to] unless @user.projects.empty? %>
+
+<%= render :partial => 'common/calendar', :locals => {:calendar => calendar } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_calendar.rhtml
--- a/app/views/my/blocks/_calendar.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<h3><%= l(:label_calendar) %></h3>
-
-<% calendar = Redmine::Helpers::Calendar.new(Date.today, current_language, :week)
-   calendar.events = Issue.visible.find :all,
-                     :conditions => ["#{Issue.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')}) AND ((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", calendar.startdt, calendar.enddt, calendar.startdt, calendar.enddt],
-                     :include => [:project, :tracker, :priority, :assigned_to] unless @user.projects.empty? %>
-
-<%= render :partial => 'common/calendar', :locals => {:calendar => calendar } %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_documents.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/blocks/_documents.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,9 @@
+<h3><%=l(:label_document_plural)%></h3>
+
+<% project_ids = @user.projects.select {|p| @user.allowed_to?(:view_documents, p)}.collect(&:id) %>
+<%= render(:partial => 'documents/document',
+           :collection => Document.find(:all,
+                         :limit => 10,
+                         :order => "#{Document.table_name}.created_on DESC",
+                         :conditions => "#{Document.table_name}.project_id in (#{project_ids.join(',')})",
+                         :include => [:project])) unless project_ids.empty? %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_documents.rhtml
--- a/app/views/my/blocks/_documents.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<h3><%=l(:label_document_plural)%></h3>
-
-<% project_ids = @user.projects.select {|p| @user.allowed_to?(:view_documents, p)}.collect(&:id) %>
-<%= render(:partial => 'documents/document',
-           :collection => Document.find(:all,
-                         :limit => 10,
-                         :order => "#{Document.table_name}.created_on DESC",
-                         :conditions => "#{Document.table_name}.project_id in (#{project_ids.join(',')})",
-                         :include => [:project])) unless project_ids.empty? %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_issuesassignedtome.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/blocks/_issuesassignedtome.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,22 @@
+<h3><%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => User.current.id})%>)</h3>
+
+<% assigned_issues = Issue.visible.open.find(:all, 
+                                :conditions => {:assigned_to_id => User.current.id},
+                                :limit => 10, 
+                                :include => [ :status, :project, :tracker, :priority ], 
+                                :order => "#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC") %>
+<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
+<% if assigned_issues.length > 0 %>
+<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
+																											 :action => 'index',
+																											 :set_filter => 1,
+																											 :assigned_to_id => 'me',
+																											 :sort => 'priority:desc,updated_on:desc' %></p>
+<% end %>
+
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom, 
+                            {:controller => 'issues', :action => 'index', :set_filter => 1,
+                             :assigned_to_id => 'me', :format => 'atom', :key => User.current.rss_key},
+                            {:title => l(:label_assigned_to_me_issues)}) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_issuesassignedtome.rhtml
--- a/app/views/my/blocks/_issuesassignedtome.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<h3><%=l(:label_assigned_to_me_issues)%> (<%= Issue.visible.open.count(:conditions => {:assigned_to_id => User.current.id})%>)</h3>
-
-<% assigned_issues = Issue.visible.open.find(:all, 
-                                :conditions => {:assigned_to_id => User.current.id},
-                                :limit => 10, 
-                                :include => [ :status, :project, :tracker, :priority ], 
-                                :order => "#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC") %>
-<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
-<% if assigned_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
-																											 :action => 'index',
-																											 :set_filter => 1,
-																											 :assigned_to_id => 'me',
-																											 :sort => 'priority:desc,updated_on:desc' %></p>
-<% end %>
-
-<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, 
-                            {:controller => 'issues', :action => 'index', :set_filter => 1,
-                             :assigned_to_id => 'me', :format => 'atom', :key => User.current.rss_key},
-                            {:title => l(:label_assigned_to_me_issues)}) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_issuesreportedbyme.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/blocks/_issuesreportedbyme.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,23 @@
+<h3><%=l(:label_reported_issues)%> (<%= Issue.visible.count(:conditions => { :author_id => User.current.id }) %>)</h3>
+
+<% reported_issues = Issue.visible.find(:all, 
+                                :conditions => { :author_id => User.current.id },
+                                :limit => 10, 
+                                :include => [ :status, :project, :tracker ], 
+                                :order => "#{Issue.table_name}.updated_on DESC") %>
+<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
+<% if reported_issues.length > 0 %>
+<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
+																											 :action => 'index',
+																											 :set_filter => 1,
+																											 :status_id => '*',
+																											 :author_id => 'me',
+																											 :sort => 'updated_on:desc' %></p>
+<% end %>
+
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom, 
+                            {:controller => 'issues', :action => 'index', :set_filter => 1,
+                             :author_id => 'me', :format => 'atom', :key => User.current.rss_key},
+                            {:title => l(:label_reported_issues)}) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_issuesreportedbyme.rhtml
--- a/app/views/my/blocks/_issuesreportedbyme.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<h3><%=l(:label_reported_issues)%> (<%= Issue.visible.count(:conditions => { :author_id => User.current.id }) %>)</h3>
-
-<% reported_issues = Issue.visible.find(:all, 
-                                :conditions => { :author_id => User.current.id },
-                                :limit => 10, 
-                                :include => [ :status, :project, :tracker ], 
-                                :order => "#{Issue.table_name}.updated_on DESC") %>
-<%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
-<% if reported_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
-																											 :action => 'index',
-																											 :set_filter => 1,
-																											 :status_id => '*',
-																											 :author_id => 'me',
-																											 :sort => 'updated_on:desc' %></p>
-<% end %>
-
-<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, 
-                            {:controller => 'issues', :action => 'index', :set_filter => 1,
-                             :author_id => 'me', :format => 'atom', :key => User.current.rss_key},
-                            {:title => l(:label_reported_issues)}) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_issueswatched.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/blocks/_issueswatched.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,11 @@
+<h3><%=l(:label_watched_issues)%> (<%= Issue.visible.watched_by(user.id).count %>)</h3>
+<% watched_issues = Issue.visible.on_active_project.watched_by(user.id).recently_updated.with_limit(10) %>
+
+<%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
+<% if watched_issues.length > 0 %>
+<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
+																											 :action => 'index',
+																											 :set_filter => 1,
+																											 :watcher_id => 'me',
+																											 :sort => 'updated_on:desc' %></p>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_issueswatched.rhtml
--- a/app/views/my/blocks/_issueswatched.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<h3><%=l(:label_watched_issues)%> (<%= Issue.visible.watched_by(user.id).count %>)</h3>
-<% watched_issues = Issue.visible.on_active_project.watched_by(user.id).recently_updated.with_limit(10) %>
-
-<%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
-<% if watched_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
-																											 :action => 'index',
-																											 :set_filter => 1,
-																											 :watcher_id => 'me',
-																											 :sort => 'updated_on:desc' %></p>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_news.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/blocks/_news.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<h3><%=l(:label_news_latest)%></h3>
+
+<%= render(:partial => 'news/news', 
+            :collection => News.find(:all,
+                                     :limit => 10,
+                                     :order => "#{News.table_name}.created_on DESC",
+                                     :conditions => "#{News.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
+                                     :include => [:project, :author])) unless @user.projects.empty? %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_news.rhtml
--- a/app/views/my/blocks/_news.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<h3><%=l(:label_news_latest)%></h3>
-
-<%= render(:partial => 'news/news', 
-            :collection => News.find(:all,
-                                     :limit => 10,
-                                     :order => "#{News.table_name}.created_on DESC",
-                                     :conditions => "#{News.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
-                                     :include => [:project, :author])) unless @user.projects.empty? %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_timelog.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/blocks/_timelog.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,52 @@
+<h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
+<% 
+entries = TimeEntry.find(:all,
+				:conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
+				:include => [:activity, :project, {:issue => [:tracker, :status]}],
+				:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
+entries_by_day = entries.group_by(&:spent_on)
+%>
+
+<div class="total-hours">
+<p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
+</div>
+
+<% if entries.any? %>
+<table class="list time-entries">
+<thead><tr>
+<th><%= l(:label_activity) %></th>
+<th><%= l(:label_project) %></th>
+<th><%= l(:field_comments) %></th>
+<th><%= l(:field_hours) %></th>
+<th></th>
+</tr></thead>
+<tbody>
+<% entries_by_day.keys.sort.reverse.each do |day| %>
+    <tr class="odd">
+    <td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
+    <td colspan="2"></td>
+    <td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
+    <td></td>
+    </tr>
+    <% entries_by_day[day].each do |entry| -%>
+    <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
+    <td class="activity"><%=h entry.activity %></td>
+    <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
+    <td class="comments"><%=h entry.comments %></td>
+    <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
+    <td align="center">
+    <% if entry.editable_by?(@user) -%>
+        <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
+                                           :title => l(:button_edit) %>
+        <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
+                                             :confirm => l(:text_are_you_sure),
+                                             :method => :delete,
+                                             :title => l(:button_delete) %>
+    <% end -%>
+    </td>
+    </tr>
+    <% end -%>
+<% end -%>
+</tbody>
+</table>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/blocks/_timelog.rhtml
--- a/app/views/my/blocks/_timelog.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-<h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
-<% 
-entries = TimeEntry.find(:all,
-				:conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
-				:include => [:activity, :project, {:issue => [:tracker, :status]}],
-				:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
-entries_by_day = entries.group_by(&:spent_on)
-%>
-
-<div class="total-hours">
-<p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
-</div>
-
-<% if entries.any? %>
-<table class="list time-entries">
-<thead><tr>
-<th><%= l(:label_activity) %></th>
-<th><%= l(:label_project) %></th>
-<th><%= l(:field_comments) %></th>
-<th><%= l(:field_hours) %></th>
-<th></th>
-</tr></thead>
-<tbody>
-<% entries_by_day.keys.sort.reverse.each do |day| %>
-    <tr class="odd">
-    <td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
-    <td colspan="2"></td>
-    <td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
-    <td></td>
-    </tr>
-    <% entries_by_day[day].each do |entry| -%>
-    <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
-    <td class="activity"><%=h entry.activity %></td>
-    <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
-    <td class="comments"><%=h entry.comments %></td>
-    <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
-    <td align="center">
-    <% if entry.editable_by?(@user) -%>
-        <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
-                                           :title => l(:button_edit) %>
-        <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
-                                             :confirm => l(:text_are_you_sure),
-                                             :method => :delete,
-                                             :title => l(:button_delete) %>
-    <% end -%>
-    </td>
-    </tr>
-    <% end -%>
-<% end -%>
-</tbody>
-</table>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/page.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/page.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,36 @@
+<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>
+
+<%= context_menu :controller => 'issues', :action => 'context_menu' %>
+
+<% html_title(l(:label_my_page)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/page.rhtml
--- a/app/views/my/page.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<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>
-
-<%= context_menu :controller => 'issues', :action => 'context_menu' %>
-
-<% html_title(l(:label_my_page)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/page_layout.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/page_layout.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,108 @@
+<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('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'top') %>', {asynchronous:true, evalScripts:true, 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('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'left') %>', {asynchronous:true, evalScripts:true, 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('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'right') %>', {asynchronous:true, evalScripts:true, 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) {
+    Effect.DropOut(block);
+    updateSelect();
+}
+//]]>
+</script>
+
+<div class="contextual">
+<% form_tag({:action => "add_block"}, :id => "block-form") do %>
+<%= label_tag('block-select', l(:label_my_page_block)) %>:
+<%= 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();"
+           }, :class => 'icon icon-add'
+             %>
+<% end %>
+<%= link_to l(:button_back), {: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,
+      :url => { :action => "order_blocks", :group => "top" }
+       %>
+      
+      
+<%= sortable_element 'list-left', 
+      :tag => 'div',
+      :only => 'mypage-box',
+      :handle => "handle",
+      :dropOnEmpty => true,
+      :containment => ['list-top', 'list-left', 'list-right'],
+      :constraint => false,
+      :url => { :action => "order_blocks", :group => "left" }
+       %>
+      
+<%= sortable_element 'list-right', 
+      :tag => 'div',
+      :only => 'mypage-box',
+      :handle => "handle",
+      :dropOnEmpty => true,
+      :containment => ['list-top', 'list-left', 'list-right'],
+      :constraint => false,
+      :url => { :action => "order_blocks", :group => "right" }
+       %>
+      
+<%= javascript_tag "updateSelect()" %>
+<% html_title(l(:label_my_page)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/page_layout.rhtml
--- a/app/views/my/page_layout.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +0,0 @@
-<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('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'top') %>', {asynchronous:true, evalScripts:true, 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('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'left') %>', {asynchronous:true, evalScripts:true, 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('<%= url_for(:controller => 'my', :action => 'order_blocks', :group => 'right') %>', {asynchronous:true, evalScripts:true, 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) {
-    Effect.DropOut(block);
-    updateSelect();
-}
-//]]>
-</script>
-
-<div class="contextual">
-<% form_tag({:action => "add_block"}, :id => "block-form") do %>
-<%= label_tag('block-select', l(:label_my_page_block)) %>:
-<%= 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();"
-           }, :class => 'icon icon-add'
-             %>
-<% end %>
-<%= link_to l(:button_back), {: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,
-      :url => { :action => "order_blocks", :group => "top" }
-       %>
-      
-      
-<%= sortable_element 'list-left', 
-      :tag => 'div',
-      :only => 'mypage-box',
-      :handle => "handle",
-      :dropOnEmpty => true,
-      :containment => ['list-top', 'list-left', 'list-right'],
-      :constraint => false,
-      :url => { :action => "order_blocks", :group => "left" }
-       %>
-      
-<%= sortable_element 'list-right', 
-      :tag => 'div',
-      :only => 'mypage-box',
-      :handle => "handle",
-      :dropOnEmpty => true,
-      :containment => ['list-top', 'list-left', 'list-right'],
-      :constraint => false,
-      :url => { :action => "order_blocks", :group => "right" }
-       %>
-      
-<%= javascript_tag "updateSelect()" %>
-<% html_title(l(:label_my_page)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/password.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/my/password.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,22 @@
+<h2><%=l(:button_change_password)%></h2>
+
+<%= error_messages_for 'user' %>
+
+<% form_tag({}, :class => "tabular") do %>
+<div class="box">
+<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 %><br />
+<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></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>
+</div>
+<%= submit_tag l(:button_apply) %>
+<% end %>
+
+<% content_for :sidebar do %>
+<%= render :partial => 'sidebar' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/my/password.rhtml
--- a/app/views/my/password.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<h2><%=l(:button_change_password)%></h2>
-
-<%= error_messages_for 'user' %>
-
-<% form_tag({}, :class => "tabular") do %>
-<div class="box">
-<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 %><br />
-<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></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>
-</div>
-<%= submit_tag l(:button_apply) %>
-<% end %>
-
-<% content_for :sidebar do %>
-<%= render :partial => 'sidebar' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/news/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,8 @@
+<%= error_messages_for 'news' %>
+<div class="box tabular">
+<p><%= f.text_field :title, :required => true, :size => 60 %></p>
+<p><%= f.text_area :summary, :cols => 60, :rows => 2 %></p>
+<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit' %></p>
+</div>
+
+<%= wikitoolbar_for 'news_description' %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/_form.rhtml
--- a/app/views/news/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<%= error_messages_for 'news' %>
-<div class="box tabular">
-<p><%= f.text_field :title, :required => true, :size => 60 %></p>
-<p><%= f.text_area :summary, :cols => 60, :rows => 2 %></p>
-<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 15, :class => 'wiki-edit' %></p>
-</div>
-
-<%= wikitoolbar_for 'news_description' %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/_news.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/news/_news.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<p><%= link_to_project(news.project) + ': ' unless @project %>
+<%= link_to h(news.title), news_path(news) %>
+<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
+<br />
+<% unless news.summary.blank? %><span class="summary"><%=h news.summary %></span><br /><% end %>
+<span class="author"><%= authoring news.created_on, news.author %></span></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/_news.rhtml
--- a/app/views/news/_news.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<p><%= link_to_project(news.project) + ': ' unless @project %>
-<%= link_to h(news.title), news_path(news) %>
-<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %>
-<br />
-<% unless news.summary.blank? %><span class="summary"><%=h news.summary %></span><br /><% end %>
-<span class="author"><%= authoring news.created_on, news.author %></span></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/news/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,18 @@
+<h2><%=l(:label_news)%></h2>
+
+<% labelled_tabular_form_for :news, @news, :url => news_path(@news),
+                                           :html => { :id => 'news-form', :method => :put } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => preview_news_path(:project_id => @project),
+                     :method => 'get',
+                     :update => 'preview',
+                     :with => "Form.serialize('news-form')"
+                   }, :accesskey => accesskey(:preview) %>
+<% end %>
+<div id="preview" class="wiki"></div>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/edit.rhtml
--- a/app/views/news/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<h2><%=l(:label_news)%></h2>
-
-<% labelled_tabular_form_for :news, @news, :url => news_path(@news),
-                                           :html => { :id => 'news-form', :method => :put } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<%= link_to_remote l(:label_preview), 
-                   { :url => preview_news_path(:project_id => @project),
-                     :method => 'get',
-                     :update => 'preview',
-                     :with => "Form.serialize('news-form')"
-                   }, :accesskey => accesskey(:preview) %>
-<% end %>
-<div id="preview" class="wiki"></div>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/news/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,51 @@
+<div class="contextual">
+<%= link_to(l(:label_news_new),
+            new_project_news_path(@project),
+            :class => 'icon icon-add',
+            :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
+</div>
+
+<div id="add-news" style="display:none;">
+<h2><%=l(:label_news_new)%></h2>
+<% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
+                                           :html => { :id => 'news-form' } do |f| %>
+<%= render :partial => 'news/form', :locals => { :f => f } %>
+<%= submit_tag l(:button_create) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => preview_news_path(:project_id => @project),
+                     :method => 'get',
+                     :update => 'preview',
+                     :with => "Form.serialize('news-form')"
+                   }, :accesskey => accesskey(:preview) %> |
+<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
+<% end if @project %>
+<div id="preview" class="wiki"></div>
+</div>
+
+<h2><%=l(:label_news_plural)%></h2>
+
+<% if @newss.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% else %>
+<% @newss.each do |news| %>
+    <h3><%= link_to_project(news.project) + ': ' unless news.project == @project %>
+    <%= link_to h(news.title), news_path(news) %>
+    <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
+    <p class="author"><%= authoring news.created_on, news.author %></p>
+    <div class="wiki">
+    <%= textilizable(news.description) %>
+    </div>
+<% end %>
+<% end %>
+<p class="pagination"><%= pagination_links_full @news_pages %></p>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
+<% end %>
+
+<% content_for :header_tags do %>
+  <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
+
+<% html_title(l(:label_news_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/index.rhtml
--- a/app/views/news/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<div class="contextual">
-<%= link_to(l(:label_news_new),
-            new_project_news_path(@project),
-            :class => 'icon icon-add',
-            :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
-</div>
-
-<div id="add-news" style="display:none;">
-<h2><%=l(:label_news_new)%></h2>
-<% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
-                                           :html => { :id => 'news-form' } do |f| %>
-<%= render :partial => 'news/form', :locals => { :f => f } %>
-<%= submit_tag l(:button_create) %>
-<%= link_to_remote l(:label_preview), 
-                   { :url => preview_news_path(:project_id => @project),
-                     :method => 'get',
-                     :update => 'preview',
-                     :with => "Form.serialize('news-form')"
-                   }, :accesskey => accesskey(:preview) %> |
-<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
-<% end if @project %>
-<div id="preview" class="wiki"></div>
-</div>
-
-<h2><%=l(:label_news_plural)%></h2>
-
-<% if @newss.empty? %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% else %>
-<% @newss.each do |news| %>
-    <h3><%= link_to_project(news.project) + ': ' unless news.project == @project %>
-    <%= link_to h(news.title), news_path(news) %>
-    <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
-    <p class="author"><%= authoring news.created_on, news.author %></p>
-    <div class="wiki">
-    <%= textilizable(news.description) %>
-    </div>
-<% end %>
-<% end %>
-<p class="pagination"><%= pagination_links_full @news_pages %></p>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
-<% end %>
-
-<% content_for :header_tags do %>
-  <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
-
-<% html_title(l(:label_news_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/news/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,14 @@
+<h2><%=l(:label_news_new)%></h2>
+
+<% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
+                                           :html => { :id => 'news-form' } do |f| %>
+<%= render :partial => 'news/form', :locals => { :f => f } %>
+<%= submit_tag l(:button_create) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => preview_news_path(:project_id => @project),
+                     :method => 'get',
+                     :update => 'preview',
+                     :with => "Form.serialize('news-form')"
+                   }, :accesskey => accesskey(:preview) %>
+<% end %>
+<div id="preview" class="wiki"></div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/new.rhtml
--- a/app/views/news/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-<h2><%=l(:label_news_new)%></h2>
-
-<% labelled_tabular_form_for :news, @news, :url => project_news_index_path(@project),
-                                           :html => { :id => 'news-form' } do |f| %>
-<%= render :partial => 'news/form', :locals => { :f => f } %>
-<%= submit_tag l(:button_create) %>
-<%= link_to_remote l(:label_preview), 
-                   { :url => preview_news_path(:project_id => @project),
-                     :method => 'get',
-                     :update => 'preview',
-                     :with => "Form.serialize('news-form')"
-                   }, :accesskey => accesskey(:preview) %>
-<% end %>
-<div id="preview" class="wiki"></div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/news/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,70 @@
+<div class="contextual">
+<%= watcher_tag(@news, User.current) %>
+<%= link_to(l(:button_edit), 
+      edit_news_path(@news),
+      :class => 'icon icon-edit',
+      :accesskey => accesskey(:edit),
+      :onclick => 'Element.show("edit-news"); return false;') if User.current.allowed_to?(:manage_news, @project) %>
+<%= link_to(l(:button_delete), 
+      news_path(@news),
+      :confirm => l(:text_are_you_sure),
+      :method => :delete,
+      :class => 'icon icon-del') if User.current.allowed_to?(:manage_news, @project) %>
+</div>
+
+<h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
+
+<% if authorize_for('news', 'edit') %>
+<div id="edit-news" style="display:none;">
+<% labelled_tabular_form_for :news, @news, :url => news_path(@news),
+                                           :html => { :id => 'news-form', :method => :put } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => preview_news_path(:project_id => @project),
+                     :method => 'get',
+                     :update => 'preview',
+                     :with => "Form.serialize('news-form')"
+                   }, :accesskey => accesskey(:preview) %> |
+<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news"); return false;' %>
+<% end %>
+<div id="preview" class="wiki"></div>
+</div>
+<% end %>
+
+<p><% unless @news.summary.blank? %><em><%=h @news.summary %></em><br /><% end %>
+<span class="author"><%= authoring @news.created_on, @news.author %></span></p>
+<div class="wiki">
+<%= textilizable(@news.description) %>
+</div>
+<br />
+
+<div id="comments" style="margin-bottom:16px;">
+<h3 class="comments"><%= l(:label_comment_plural) %></h3>
+<% @comments.each do |comment| %>
+    <% next if comment.new_record? %>
+    <div class="contextual">
+    <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
+                                                       :confirm => l(:text_are_you_sure), :method => :delete, :title => l(:button_delete) %>
+    </div>
+    <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
+    <%= textilizable(comment.comments) %>
+<% end if @comments.any? %>
+</div>
+
+<% if authorize_for 'comments', 'create' %>
+<p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>
+<% form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
+<div class="box">
+    <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
+    <%= wikitoolbar_for 'comment_comments' %>
+</div>
+<p><%= submit_tag l(:button_add) %></p>
+<% end %>
+<% end %>
+
+<% html_title @news.title -%>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/news/show.rhtml
--- a/app/views/news/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-<div class="contextual">
-<%= watcher_tag(@news, User.current) %>
-<%= link_to(l(:button_edit), 
-      edit_news_path(@news),
-      :class => 'icon icon-edit',
-      :accesskey => accesskey(:edit),
-      :onclick => 'Element.show("edit-news"); return false;') if User.current.allowed_to?(:manage_news, @project) %>
-<%= link_to(l(:button_delete), 
-      news_path(@news),
-      :confirm => l(:text_are_you_sure),
-      :method => :delete,
-      :class => 'icon icon-del') if User.current.allowed_to?(:manage_news, @project) %>
-</div>
-
-<h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
-
-<% if authorize_for('news', 'edit') %>
-<div id="edit-news" style="display:none;">
-<% labelled_tabular_form_for :news, @news, :url => news_path(@news),
-                                           :html => { :id => 'news-form', :method => :put } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<%= link_to_remote l(:label_preview), 
-                   { :url => preview_news_path(:project_id => @project),
-                     :method => 'get',
-                     :update => 'preview',
-                     :with => "Form.serialize('news-form')"
-                   }, :accesskey => accesskey(:preview) %> |
-<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news"); return false;' %>
-<% end %>
-<div id="preview" class="wiki"></div>
-</div>
-<% end %>
-
-<p><% unless @news.summary.blank? %><em><%=h @news.summary %></em><br /><% end %>
-<span class="author"><%= authoring @news.created_on, @news.author %></span></p>
-<div class="wiki">
-<%= textilizable(@news.description) %>
-</div>
-<br />
-
-<div id="comments" style="margin-bottom:16px;">
-<h3 class="comments"><%= l(:label_comment_plural) %></h3>
-<% @comments.each do |comment| %>
-    <% next if comment.new_record? %>
-    <div class="contextual">
-    <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
-                                                       :confirm => l(:text_are_you_sure), :method => :delete, :title => l(:button_delete) %>
-    </div>
-    <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
-    <%= textilizable(comment.comments) %>
-<% end if @comments.any? %>
-</div>
-
-<% if authorize_for 'comments', 'create' %>
-<p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>
-<% form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
-<div class="box">
-    <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
-    <%= wikitoolbar_for 'comment_comments' %>
-</div>
-<p><%= submit_tag l(:button_add) %></p>
-<% end %>
-<% end %>
-
-<% html_title @news.title -%>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/_edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/_edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,4 @@
+<% labelled_tabular_form_for :project, @project, :url => project_path(@project), :html => {:method => (@project.new_record? ? :post : :put) } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/_edit.rhtml
--- a/app/views/projects/_edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<% labelled_tabular_form_for :project, @project, :url => project_path(@project), :html => {:method => (@project.new_record? ? :post : :put) } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,64 @@
+<%= error_messages_for 'project' %>
+
+<div class="box">
+<!--[form:project]-->
+<p><%= f.text_field :name, :required => true, :size => 60 %></p>
+
+<% unless @project.allowed_parents.compact.empty? %>
+    <p><%= label(:project, :parent_id, l(:field_parent)) %><%= parent_project_select_tag(@project) %></p>
+<% end %>
+
+<p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
+<p><%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen? %>
+<% unless @project.identifier_frozen? %>
+<br /><em><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info) %></em>
+<% end %></p>
+<p><%= f.text_field :homepage, :size => 60 %></p>
+<p><%= f.check_box :is_public %></p>
+<%= wikitoolbar_for 'project_description' %>
+
+<% @project.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :project, value %></p>
+<% end %>
+<%= call_hook(:view_projects_form, :project => @project, :form => f) %>
+</div>
+
+<% if @project.new_record? %>
+<fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
+<% Redmine::AccessControl.available_project_modules.each do |m| %>
+    <label class="floating">
+    <%= check_box_tag 'project[enabled_module_names][]', m, @project.module_enabled?(m), :id => "project_enabled_module_names_#{m}" %>
+    <%= l_or_humanize(m, :prefix => "project_module_") %>
+    </label>
+<% end %>
+<%= hidden_field_tag 'project[enabled_module_names][]', '' %>
+<%= javascript_tag 'observeProjectModules()' %>
+</fieldset>
+<% end %>
+
+<% if @project.new_record? || @project.module_enabled?('issue_tracking') %>
+<% unless @trackers.empty? %>
+<fieldset class="box" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
+<% @trackers.each do |tracker| %>
+    <label class="floating">
+    <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
+    <%= tracker %>
+    </label>
+<% end %>
+<%= hidden_field_tag 'project[tracker_ids][]', '' %>
+</fieldset>
+<% end %>
+
+<% unless @issue_custom_fields.empty? %>
+<fieldset class="box" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
+<% @issue_custom_fields.each do |custom_field| %>
+    <label class="floating">
+	<%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
+	<%= custom_field.name %>
+	</label>
+<% end %>
+<%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
+</fieldset>
+<% end %>
+<% end %>
+<!--[eoform:project]-->
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/_form.rhtml
--- a/app/views/projects/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<%= error_messages_for 'project' %>
-
-<div class="box">
-<!--[form:project]-->
-<p><%= f.text_field :name, :required => true, :size => 60 %></p>
-
-<% unless @project.allowed_parents.compact.empty? %>
-    <p><%= label(:project, :parent_id, l(:field_parent)) %><%= parent_project_select_tag(@project) %></p>
-<% end %>
-
-<p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
-<p><%= f.text_field :identifier, :required => true, :size => 60, :disabled => @project.identifier_frozen? %>
-<% unless @project.identifier_frozen? %>
-<br /><em><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info) %></em>
-<% end %></p>
-<p><%= f.text_field :homepage, :size => 60 %></p>
-<p><%= f.check_box :is_public %></p>
-<%= wikitoolbar_for 'project_description' %>
-
-<% @project.custom_field_values.each do |value| %>
-	<p><%= custom_field_tag_with_label :project, value %></p>
-<% end %>
-<%= call_hook(:view_projects_form, :project => @project, :form => f) %>
-</div>
-
-<% if @project.new_record? %>
-<fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
-<% Redmine::AccessControl.available_project_modules.each do |m| %>
-    <label class="floating">
-    <%= check_box_tag 'project[enabled_module_names][]', m, @project.module_enabled?(m), :id => "project_enabled_module_names_#{m}" %>
-    <%= l_or_humanize(m, :prefix => "project_module_") %>
-    </label>
-<% end %>
-<%= hidden_field_tag 'project[enabled_module_names][]', '' %>
-<%= javascript_tag 'observeProjectModules()' %>
-</fieldset>
-<% end %>
-
-<% if @project.new_record? || @project.module_enabled?('issue_tracking') %>
-<% unless @trackers.empty? %>
-<fieldset class="box" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
-<% @trackers.each do |tracker| %>
-    <label class="floating">
-    <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
-    <%= tracker %>
-    </label>
-<% end %>
-<%= hidden_field_tag 'project[tracker_ids][]', '' %>
-</fieldset>
-<% end %>
-
-<% unless @issue_custom_fields.empty? %>
-<fieldset class="box" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
-<% @issue_custom_fields.each do |custom_field| %>
-    <label class="floating">
-	<%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
-	<%= custom_field.name %>
-	</label>
-<% end %>
-<%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
-</fieldset>
-<% end %>
-<% end %>
-<!--[eoform:project]-->
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/copy.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/copy.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,20 @@
+<h2><%=l(:label_project_new)%></h2>
+
+<% labelled_tabular_form_for :project, @project, :url => { :action => "copy" } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+
+<fieldset class="box"><legend><%= l(:button_copy) %></legend>
+  <label class="block"><%= check_box_tag 'only[]', 'members', true %> <%= l(:label_member_plural) %> (<%= @source_project.members.count %>)</label>
+  <label class="block"><%= check_box_tag 'only[]', 'versions', true %> <%= l(:label_version_plural) %> (<%= @source_project.versions.count %>)</label>
+  <label class="block"><%= check_box_tag 'only[]', 'issue_categories', true %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label>
+  <label class="block"><%= check_box_tag 'only[]', 'issues', true %> <%= l(:label_issue_plural) %> (<%= @source_project.issues.count %>)</label>
+  <label class="block"><%= check_box_tag 'only[]', 'queries', true %> <%= l(:label_query_plural) %> (<%= @source_project.queries.count %>)</label>
+  <label class="block"><%= check_box_tag 'only[]', 'boards', true %> <%= l(:label_board_plural) %> (<%= @source_project.boards.count %>)</label>
+  <label class="block"><%= check_box_tag 'only[]', 'wiki', true %> <%= l(:label_wiki_page_plural) %> (<%= @source_project.wiki.nil? ? 0 : @source_project.wiki.pages.count %>)</label>
+  <%= hidden_field_tag 'only[]', '' %>
+  <br />
+	<label class="block"><%= check_box_tag 'notifications', 1, params[:notifications] %> <%= l(:label_project_copy_notifications) %></label>
+</fieldset>
+
+<%= submit_tag l(:button_copy) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/copy.rhtml
--- a/app/views/projects/copy.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-<h2><%=l(:label_project_new)%></h2>
-
-<% labelled_tabular_form_for :project, @project, :url => { :action => "copy" } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-
-<fieldset class="box"><legend><%= l(:button_copy) %></legend>
-  <label class="block"><%= check_box_tag 'only[]', 'members', true %> <%= l(:label_member_plural) %> (<%= @source_project.members.count %>)</label>
-  <label class="block"><%= check_box_tag 'only[]', 'versions', true %> <%= l(:label_version_plural) %> (<%= @source_project.versions.count %>)</label>
-  <label class="block"><%= check_box_tag 'only[]', 'issue_categories', true %> <%= l(:label_issue_category_plural) %> (<%= @source_project.issue_categories.count %>)</label>
-  <label class="block"><%= check_box_tag 'only[]', 'issues', true %> <%= l(:label_issue_plural) %> (<%= @source_project.issues.count %>)</label>
-  <label class="block"><%= check_box_tag 'only[]', 'queries', true %> <%= l(:label_query_plural) %> (<%= @source_project.queries.count %>)</label>
-  <label class="block"><%= check_box_tag 'only[]', 'boards', true %> <%= l(:label_board_plural) %> (<%= @source_project.boards.count %>)</label>
-  <label class="block"><%= check_box_tag 'only[]', 'wiki', true %> <%= l(:label_wiki_page_plural) %> (<%= @source_project.wiki.nil? ? 0 : @source_project.wiki.pages.count %>)</label>
-  <%= hidden_field_tag 'only[]', '' %>
-  <br />
-	<label class="block"><%= check_box_tag 'notifications', 1, params[:notifications] %> <%= l(:label_project_copy_notifications) %></label>
-</fieldset>
-
-<%= submit_tag l(:button_copy) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/destroy.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/destroy.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,16 @@
+<h2><%=l(:label_confirmation)%></h2>
+<div class="warning">
+<p><strong><%=h @project_to_destroy %></strong><br />
+<%=l(:text_project_destroy_confirmation)%>
+
+<% if @project_to_destroy.descendants.any? %>
+<br /><%= l(:text_subprojects_destroy_warning, content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))) %>
+<% end %>
+</p>
+<p>
+    <% form_tag(project_path(@project_to_destroy), :method => :delete) do %>
+    <label><%= check_box_tag 'confirm', 1 %> <%= l(:general_text_Yes) %></label>
+    <%= submit_tag l(:button_delete) %>
+    <% end %>
+</p>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/destroy.rhtml
--- a/app/views/projects/destroy.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<h2><%=l(:label_confirmation)%></h2>
-<div class="warning">
-<p><strong><%=h @project_to_destroy %></strong><br />
-<%=l(:text_project_destroy_confirmation)%>
-
-<% if @project_to_destroy.descendants.any? %>
-<br /><%= l(:text_subprojects_destroy_warning, content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))) %>
-<% end %>
-</p>
-<p>
-    <% form_tag(project_path(@project_to_destroy), :method => :delete) do %>
-    <label><%= check_box_tag 'confirm', 1 %> <%= l(:general_text_Yes) %></label>
-    <%= submit_tag l(:button_delete) %>
-    <% end %>
-</p>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,26 @@
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
+<% end %>
+
+<div class="contextual">
+    <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
+    <%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
+    <%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
+    <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
+</div>
+
+<h2><%=l(:label_project_plural)%></h2>
+
+<%= render_project_hierarchy(@projects)%>
+
+<% if User.current.logged? %>
+<p style="text-align:right;">
+<span class="my-project"><%= l(:label_my_projects) %></span>
+</p>
+<% end %>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<% end %>
+
+<% html_title(l(:label_project_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/index.rhtml
--- a/app/views/projects/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<% content_for :header_tags do %>
-    <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
-<% end %>
-
-<div class="contextual">
-    <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
-    <%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
-    <%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
-    <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
-</div>
-
-<h2><%=l(:label_project_plural)%></h2>
-
-<%= render_project_hierarchy(@projects)%>
-
-<% if User.current.logged? %>
-<p style="text-align:right;">
-<span class="my-project"><%= l(:label_my_projects) %></span>
-</p>
-<% end %>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<% end %>
-
-<% html_title(l(:label_project_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/list_members.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/list_members.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +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_user m.user %> (<%= format_date m.created_on %>)</li>
+<% end %>
+</ul>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/list_members.rhtml
--- a/app/views/projects/list_members.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<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_user m.user %> (<%= format_date m.created_on %>)</li>
-<% end %>
-</ul>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/settings.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<h2><%=l(:label_settings)%></h2>
+
+<%= render_tabs project_settings_tabs %>
+
+<% html_title(l(:label_settings)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings.rhtml
--- a/app/views/projects/settings.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<h2><%=l(:label_settings)%></h2>
-
-<%= render_tabs project_settings_tabs %>
-
-<% html_title(l(:label_settings)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_activities.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/settings/_activities.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,42 @@
+<% form_tag(project_project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
+
+<table class="list">
+  <thead><tr>
+    <th><%= l(:field_name) %></th>
+    <th><%= l(:enumeration_system_activity) %></th>
+    <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
+	<th><%= h value.name %></th>
+    <% end %>
+    <th style="width:15%;"><%= l(:field_active) %></th>
+  </tr></thead>
+
+  <% @project.activities(true).each do |enumeration| %>
+  <% fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
+  <tr class="<%= cycle('odd', 'even') %>">
+    <td>
+      <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
+      <%= h(enumeration) %>
+    </td>
+    <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td>
+    <% enumeration.custom_field_values.each do |value| %>
+	<td align="center">
+      <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
+    </td>
+    <% end %>
+    <td align="center" style="width:15%;">
+      <%= ff.check_box :active %>
+    </td>
+  </tr>
+  <% end %>
+  <% end %>
+</table>
+
+<div class="contextual">
+<%= link_to(l(:button_reset), project_project_enumerations_path(@project),
+						:method => :delete,
+						:confirm => l(:text_are_you_sure),
+            :class => 'icon icon-del') %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_activities.rhtml
--- a/app/views/projects/settings/_activities.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<% form_tag(project_project_enumerations_path(@project), :method => :put, :class => "tabular") do %>
-
-<table class="list">
-  <thead><tr>
-    <th><%= l(:field_name) %></th>
-    <th><%= l(:enumeration_system_activity) %></th>
-    <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
-	<th><%= h value.name %></th>
-    <% end %>
-    <th style="width:15%;"><%= l(:field_active) %></th>
-  </tr></thead>
-
-  <% @project.activities(true).each do |enumeration| %>
-  <% fields_for "enumerations[#{enumeration.id}]", enumeration do |ff| %>
-  <tr class="<%= cycle('odd', 'even') %>">
-    <td>
-      <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
-      <%= h(enumeration) %>
-    </td>
-    <td align="center" style="width:15%;"><%= checked_image !enumeration.project %></td>
-    <% enumeration.custom_field_values.each do |value| %>
-	<td align="center">
-      <%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
-    </td>
-    <% end %>
-    <td align="center" style="width:15%;">
-      <%= ff.check_box :active %>
-    </td>
-  </tr>
-  <% end %>
-  <% end %>
-</table>
-
-<div class="contextual">
-<%= link_to(l(:button_reset), project_project_enumerations_path(@project),
-						:method => :delete,
-						:confirm => l(:text_are_you_sure),
-            :class => 'icon icon-del') %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_boards.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/settings/_boards.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,32 @@
+<% if @project.boards.any? %>
+<table class="list">
+	<thead><tr>
+		<th><%= l(:label_board) %></th>
+		<th><%= l(:field_description) %></th>
+		<th></th>
+		<th></th>
+	</tr></thead>
+	<tbody>
+<% @project.boards.each do |board|
+	next if board.new_record? %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+    <td><%=h board.name %></td>
+    <td><%=h board.description %></td>
+    <td align="center">
+    <% if authorize_for("boards", "edit") %>
+			<%= reorder_links('board', {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}) %>
+    <% end %>
+    </td>
+    <td class="buttons">
+    	<%= link_to_if_authorized l(:button_edit), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %>
+    	<%= link_to_if_authorized l(:button_delete), {:controller => 'boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+    </td>
+	</tr>
+<% end %>
+	</tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<p><%= link_to_if_authorized l(:label_board_new), {:controller => 'boards', :action => 'new', :project_id => @project} %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_boards.rhtml
--- a/app/views/projects/settings/_boards.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<% if @project.boards.any? %>
-<table class="list">
-	<thead><tr>
-		<th><%= l(:label_board) %></th>
-		<th><%= l(:field_description) %></th>
-		<th></th>
-		<th></th>
-	</tr></thead>
-	<tbody>
-<% @project.boards.each do |board|
-	next if board.new_record? %>
-	<tr class="<%= cycle 'odd', 'even' %>">
-    <td><%=h board.name %></td>
-    <td><%=h board.description %></td>
-    <td align="center">
-    <% if authorize_for("boards", "edit") %>
-			<%= reorder_links('board', {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}) %>
-    <% end %>
-    </td>
-    <td class="buttons">
-    	<%= link_to_if_authorized l(:button_edit), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %>
-    	<%= link_to_if_authorized l(:button_delete), {:controller => 'boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-    </td>
-	</tr>
-<% end %>
-	</tbody>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
-<p><%= link_to_if_authorized l(:label_board_new), {:controller => 'boards', :action => 'new', :project_id => @project} %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_issue_categories.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/settings/_issue_categories.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,27 @@
+<% if @project.issue_categories.any? %>
+<table class="list">
+	<thead><tr>
+	<th><%= l(:label_issue_category) %></th>
+	<th><%= l(:field_assigned_to) %></th>
+	<th></th>
+	</tr></thead>
+	<tbody>
+<% for category in @project.issue_categories %>
+	<% unless category.new_record? %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+    <td><%=h(category.name) %></td>
+    <td><%=h(category.assigned_to.name) if category.assigned_to %></td>
+    <td class="buttons">
+    	<%= link_to_if_authorized l(:button_edit), { :controller => 'issue_categories', :action => 'edit', :id => category }, :class => 'icon icon-edit' %>
+    	<%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => category}, :method => :post, :class => 'icon icon-del' %>
+    </td>
+	</tr>
+	<% end %>
+<% end %>
+    </tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<p><%= link_to_if_authorized l(:label_issue_category_new), :controller => 'issue_categories', :action => 'new', :project_id => @project %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_issue_categories.rhtml
--- a/app/views/projects/settings/_issue_categories.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<% if @project.issue_categories.any? %>
-<table class="list">
-	<thead><tr>
-	<th><%= l(:label_issue_category) %></th>
-	<th><%= l(:field_assigned_to) %></th>
-	<th></th>
-	</tr></thead>
-	<tbody>
-<% for category in @project.issue_categories %>
-	<% unless category.new_record? %>
-	<tr class="<%= cycle 'odd', 'even' %>">
-    <td><%=h(category.name) %></td>
-    <td><%=h(category.assigned_to.name) if category.assigned_to %></td>
-    <td class="buttons">
-    	<%= link_to_if_authorized l(:button_edit), { :controller => 'issue_categories', :action => 'edit', :id => category }, :class => 'icon icon-edit' %>
-    	<%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => category}, :method => :post, :class => 'icon icon-del' %>
-    </td>
-	</tr>
-	<% end %>
-<% end %>
-    </tbody>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
-<p><%= link_to_if_authorized l(:label_issue_category_new), :controller => 'issue_categories', :action => 'new', :project_id => @project %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_members.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/settings/_members.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,84 @@
+<%= error_messages_for 'member' %>
+<% roles = Role.find_all_givable
+   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
+
+<div class="splitcontentleft">
+<% if members.any? %>
+<table class="list members">
+	<thead><tr>
+	  <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
+	  <th><%= l(:label_role_plural) %></th>
+	  <th style="width:15%"></th>
+          <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
+	</tr></thead>
+	<tbody>
+	<% members.each do |member| %>
+	<% next if member.new_record? %>
+	<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
+	<td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+  <td class="roles">
+    <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
+    <% if authorize_for('members', 'edit') %>
+      <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
+      																		:method => :post,
+      																		:html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
+      	<p><% roles.each do |role| %>
+        <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role),
+        																							 :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
+        <% end %></p>
+        <%= hidden_field_tag 'member[role_ids][]', '' %>
+        <p><%= submit_tag l(:button_change), :class => "small" %>
+        <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %></p>
+      <% end %>
+    <% end %>
+  </td>
+  <td class="buttons">
+      <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
+      <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
+                                              :method => :post,
+                                              :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
+                                            }, :title => l(:button_delete),
+                                               :class => 'icon icon-del') if member.deletable? %>
+  </td>
+  <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
+	</tr>
+<% end; reset_cycle %>
+	</tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+</div>
+
+
+<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
+
+<div class="splitcontentright">
+<% if roles.any? && principals.any? %>
+  <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
+									   :loading => '$(\'member-add-submit\').disable();',
+									   :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
+    <fieldset><legend><%=l(:label_member_new)%></legend>
+    
+		<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
+		<%= observe_field(:principal_search,
+                 :frequency => 0.5,
+                 :update => :principals,
+                 :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
+                 :with => 'q')
+                  %>
+		
+		<div id="principals">
+			<%= principals_check_box_tags 'member[user_ids][]', principals %>
+		</div>
+		
+    <p><%= l(:label_role_plural) %>:
+    <% roles.each do |role| %>
+    	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %></label>
+   	<% end %></p>
+   	
+    <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
+		</fieldset>
+  <% end %>
+<% end %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_members.rhtml
--- a/app/views/projects/settings/_members.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-<%= error_messages_for 'member' %>
-<% roles = Role.find_all_givable
-   members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
-
-<div class="splitcontentleft">
-<% if members.any? %>
-<table class="list members">
-	<thead><tr>
-	  <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
-	  <th><%= l(:label_role_plural) %></th>
-	  <th style="width:15%"></th>
-          <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
-	</tr></thead>
-	<tbody>
-	<% members.each do |member| %>
-	<% next if member.new_record? %>
-	<tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-	<td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
-  <td class="roles">
-    <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
-    <% if authorize_for('members', 'edit') %>
-      <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
-      																		:method => :post,
-      																		:html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
-      	<p><% roles.each do |role| %>
-        <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role),
-        																							 :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
-        <% end %></p>
-        <%= hidden_field_tag 'member[role_ids][]', '' %>
-        <p><%= submit_tag l(:button_change), :class => "small" %>
-        <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %></p>
-      <% end %>
-    <% end %>
-  </td>
-  <td class="buttons">
-      <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
-      <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},                                              
-                                              :method => :post,
-                                              :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
-                                            }, :title => l(:button_delete),
-                                               :class => 'icon icon-del') if member.deletable? %>
-  </td>
-  <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
-	</tr>
-<% end; reset_cycle %>
-	</tbody>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-</div>
-
-
-<% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
-
-<div class="splitcontentright">
-<% if roles.any? && principals.any? %>
-  <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
-									   :loading => '$(\'member-add-submit\').disable();',
-									   :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %>
-    <fieldset><legend><%=l(:label_member_new)%></legend>
-    
-		<p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
-		<%= observe_field(:principal_search,
-                 :frequency => 0.5,
-                 :update => :principals,
-                 :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
-                 :with => 'q')
-                  %>
-		
-		<div id="principals">
-			<%= principals_check_box_tags 'member[user_ids][]', principals %>
-		</div>
-		
-    <p><%= l(:label_role_plural) %>:
-    <% roles.each do |role| %>
-    	<label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %></label>
-   	<% end %></p>
-   	
-    <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
-		</fieldset>
-  <% end %>
-<% end %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_modules.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/settings/_modules.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,19 @@
+<% form_for :project, @project,
+            :url => { :action => 'modules', :id => @project },
+            :html => {:id => 'modules-form'} do |f| %>
+            
+<div class="box">
+<fieldset>
+<legend><%= l(:text_select_project_modules) %></legend>
+
+<% Redmine::AccessControl.available_project_modules.each do |m| %>
+<p><label><%= check_box_tag 'enabled_module_names[]', m, @project.module_enabled?(m) -%>
+ <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
+<% end %>
+</fieldset>
+</div>
+
+<p><%= check_all_links 'modules-form' %></p>
+<p><%= submit_tag l(:button_save) %></p>
+
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_modules.rhtml
--- a/app/views/projects/settings/_modules.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<% form_for :project, @project,
-            :url => { :action => 'modules', :id => @project },
-            :html => {:id => 'modules-form'} do |f| %>
-            
-<div class="box">
-<fieldset>
-<legend><%= l(:text_select_project_modules) %></legend>
-
-<% Redmine::AccessControl.available_project_modules.each do |m| %>
-<p><label><%= check_box_tag 'enabled_module_names[]', m, @project.module_enabled?(m) -%>
- <%= l_or_humanize(m, :prefix => "project_module_") %></label></p>
-<% end %>
-</fieldset>
-</div>
-
-<p><%= check_all_links 'modules-form' %></p>
-<p><%= submit_tag l(:button_save) %></p>
-
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_repository.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/settings/_repository.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,41 @@
+<% remote_form_for :repository, @repository,
+                   :url => { :controller => 'repositories', :action => 'edit', :id => @project },
+                   :builder => TabularFormBuilder,
+                   :lang => current_language do |f| %>
+
+<%= error_messages_for 'repository' %>
+
+<div class="box tabular">
+<p>
+<%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %>
+<% if @repository && ! @repository.class.scm_available %>
+	<br />
+	<em><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em>
+<% end %>
+</p>
+<% button_disabled = true %>
+<% if @repository %>
+<%   button_disabled = ! @repository.class.scm_available %>
+<%=    repository_field_tags(f, @repository)%>
+<% end %>
+</div>
+
+<div class="contextual">
+<% if @repository && !@repository.new_record? %>
+<%= link_to(l(:label_user_plural),
+                {
+                :controller => 'repositories',
+                :action     => 'committers',
+                :id         => @project
+                },
+             :class => 'icon icon-user') %>
+<%= link_to(l(:button_delete), {:controller => 'repositories', :action => 'destroy', :id => @project},
+            :confirm => l(:text_are_you_sure),
+            :method  => :post,
+            :class   => 'icon icon-del') %>
+<% end %>
+</div>
+
+<%= submit_tag((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save),
+               :disabled => button_disabled) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_repository.rhtml
--- a/app/views/projects/settings/_repository.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<% remote_form_for :repository, @repository,
-                   :url => { :controller => 'repositories', :action => 'edit', :id => @project },
-                   :builder => TabularFormBuilder,
-                   :lang => current_language do |f| %>
-
-<%= error_messages_for 'repository' %>
-
-<div class="box tabular">
-<p>
-<%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %>
-<% if @repository && ! @repository.class.scm_available %>
-	<br />
-	<em><%= content_tag 'span', l(:text_scm_command_not_available), :class => 'error' %></em>
-<% end %>
-</p>
-<% button_disabled = true %>
-<% if @repository %>
-<%   button_disabled = ! @repository.class.scm_available %>
-<%=    repository_field_tags(f, @repository)%>
-<% end %>
-</div>
-
-<div class="contextual">
-<% if @repository && !@repository.new_record? %>
-<%= link_to(l(:label_user_plural),
-                {
-                :controller => 'repositories',
-                :action     => 'committers',
-                :id         => @project
-                },
-             :class => 'icon icon-user') %>
-<%= link_to(l(:button_delete), {:controller => 'repositories', :action => 'destroy', :id => @project},
-            :confirm => l(:text_are_you_sure),
-            :method  => :post,
-            :class   => 'icon icon-del') %>
-<% end %>
-</div>
-
-<%= submit_tag((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save),
-               :disabled => button_disabled) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_versions.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/settings/_versions.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,41 @@
+<% if @project.shared_versions.any? %>
+<table class="list versions">
+	<thead><tr>
+    <th><%= l(:label_version) %></th>
+    <th><%= l(:field_effective_date) %></th>
+    <th><%= l(:field_description) %></th>
+    <th><%= l(:field_status) %></th>
+    <th><%= l(:field_sharing) %></th>
+    <th><%= l(:label_wiki_page) %></th>
+    <th style="width:15%"></th>
+    </tr></thead>
+	<tbody>
+<% for version in @project.shared_versions.sort %>
+    <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
+    <td class="name"><%= link_to_version version %></td>
+    <td class="date"><%= format_date(version.effective_date) %></td>
+    <td class="description"><%=h version.description %></td>
+    <td class="status"><%= l("version_status_#{version.status}") %></td>
+    <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
+    <td><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td>
+    <td class="buttons">
+    	<% if version.project == @project %>
+    		<%= link_to_if_authorized l(:button_edit),   {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %>
+    		<%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+    	<% end %>
+   	</td>
+    </tr>
+<% end; reset_cycle %>
+    </tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+
+<div class="contextual">
+<% if @project.versions.any? %>
+	<%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
+<% end %>
+</div>
+
+<p><%= link_to_if_authorized l(:label_version_new), :controller => 'versions', :action => 'new', :project_id => @project %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_versions.rhtml
--- a/app/views/projects/settings/_versions.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<% if @project.shared_versions.any? %>
-<table class="list versions">
-	<thead><tr>
-    <th><%= l(:label_version) %></th>
-    <th><%= l(:field_effective_date) %></th>
-    <th><%= l(:field_description) %></th>
-    <th><%= l(:field_status) %></th>
-    <th><%= l(:field_sharing) %></th>
-    <th><%= l(:label_wiki_page) %></th>
-    <th style="width:15%"></th>
-    </tr></thead>
-	<tbody>
-<% for version in @project.shared_versions.sort %>
-    <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
-    <td class="name"><%= link_to_version version %></td>
-    <td class="date"><%= format_date(version.effective_date) %></td>
-    <td class="description"><%=h version.description %></td>
-    <td class="status"><%= l("version_status_#{version.status}") %></td>
-    <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
-    <td><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td>
-    <td class="buttons">
-    	<% if version.project == @project %>
-    		<%= link_to_if_authorized l(:button_edit),   {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %>
-    		<%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
-    	<% end %>
-   	</td>
-    </tr>
-<% end; reset_cycle %>
-    </tbody>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
-<div class="contextual">
-<% if @project.versions.any? %>
-	<%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %>
-<% end %>
-</div>
-
-<p><%= link_to_if_authorized l(:label_version_new), :controller => 'versions', :action => 'new', :project_id => @project %></p>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_wiki.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/settings/_wiki.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,19 @@
+<% remote_form_for :wiki, @wiki,
+                   :url => { :controller => 'wikis', :action => 'edit', :id => @project },
+                   :builder => TabularFormBuilder,
+                   :lang => current_language do |f| %>
+
+<%= error_messages_for 'wiki' %>
+
+<div class="box tabular">
+<p><%= f.text_field :start_page, :size => 60, :required => true %><br />
+<em><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em></p>
+</div>
+
+<div class="contextual">
+<%= link_to(l(:button_delete), {:controller => 'wikis', :action => 'destroy', :id => @project},
+            :class => 'icon icon-del') if @wiki && !@wiki.new_record? %>
+</div>
+
+<%= submit_tag((@wiki.nil? || @wiki.new_record?) ? l(:button_create) : l(:button_save)) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/settings/_wiki.rhtml
--- a/app/views/projects/settings/_wiki.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<% remote_form_for :wiki, @wiki,
-                   :url => { :controller => 'wikis', :action => 'edit', :id => @project },
-                   :builder => TabularFormBuilder,
-                   :lang => current_language do |f| %>
-
-<%= error_messages_for 'wiki' %>
-
-<div class="box tabular">
-<p><%= f.text_field :start_page, :size => 60, :required => true %><br />
-<em><%= l(:text_unallowed_characters) %>: , . / ? ; : |</em></p>
-</div>
-
-<div class="contextual">
-<%= link_to(l(:button_delete), {:controller => 'wikis', :action => 'destroy', :id => @project},
-            :class => 'icon icon-del') if @wiki && !@wiki.new_record? %>
-</div>
-
-<%= submit_tag((@wiki.nil? || @wiki.new_record?) ? l(:button_create) : l(:button_save)) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/projects/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,80 @@
+<div class="contextual">
+	<% if User.current.allowed_to?(:add_subprojects, @project) %>
+		<%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
+	<% end %>
+</div>
+
+<h2><%=l(:label_overview)%></h2> 
+	
+<div class="splitcontentleft">
+	<div class="wiki">
+		<%= textilizable @project.description %>
+	</div>	
+	<ul>
+	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %></li><% end %>
+  <% if @subprojects.any? %>
+ 	<li><%=l(:label_subproject_plural)%>:
+	    <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li>
+  <% end %>
+	<% @project.visible_custom_field_values.each do |custom_value| %>
+	<% if !custom_value.value.blank? %>
+	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
+	<% end %>
+	<% end %>
+	</ul>	
+
+  <% if User.current.allowed_to?(:view_issues, @project) %>
+  <div class="issues box">    
+    <h3><%=l(:label_issue_tracking)%></h3>
+    <ul>
+    <% for tracker in @trackers %>    
+      <li><%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project, 
+                                                :set_filter => 1, 
+                                                "tracker_id" => tracker.id %>:
+					<%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
+																										:total => @total_issues_by_tracker[tracker].to_i) %>
+			</li>
+    <% end %>
+    </ul>
+    <p>
+    	<%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %>
+	    <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
+				| <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %>
+			<% end %>
+			<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
+				| <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %>
+			<% end %>
+		</p>
+  </div>
+  <% end %>
+  <%= call_hook(:view_projects_show_left, :project => @project) %>
+</div>
+
+<div class="splitcontentright">
+  <%= render :partial => 'members_box' %>
+    
+  <% if @news.any? && authorize_for('news', 'index') %>
+  <div class="news box">
+    <h3><%=l(:label_news_latest)%></h3>  
+    <%= render :partial => 'news/news', :collection => @news %>
+    <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
+  </div>  
+  <% end %>
+  <%= call_hook(:view_projects_show_right, :project => @project) %>
+</div>
+
+<% content_for :sidebar do %>
+    <% if @total_hours.present? %>
+    <h3><%= l(:label_spent_time) %></h3>
+    <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
+    <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> |
+    <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %></p>
+    <% end %>
+    <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
+<% end %>
+
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
+<% end %>
+
+<% html_title(l(:label_overview)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/projects/show.rhtml
--- a/app/views/projects/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-<div class="contextual">
-	<% if User.current.allowed_to?(:add_subprojects, @project) %>
-		<%= link_to l(:label_subproject_new), {:controller => 'projects', :action => 'new', :parent_id => @project}, :class => 'icon icon-add' %>
-	<% end %>
-</div>
-
-<h2><%=l(:label_overview)%></h2> 
-	
-<div class="splitcontentleft">
-	<div class="wiki">
-		<%= textilizable @project.description %>
-	</div>	
-	<ul>
-	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %></li><% end %>
-  <% if @subprojects.any? %>
- 	<li><%=l(:label_subproject_plural)%>:
-	    <%= @subprojects.collect{|p| link_to(h(p), :action => 'show', :id => p)}.join(", ") %></li>
-  <% end %>
-	<% @project.visible_custom_field_values.each do |custom_value| %>
-	<% if !custom_value.value.blank? %>
-	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
-	<% end %>
-	<% end %>
-	</ul>	
-
-  <% if User.current.allowed_to?(:view_issues, @project) %>
-  <div class="issues box">    
-    <h3><%=l(:label_issue_tracking)%></h3>
-    <ul>
-    <% for tracker in @trackers %>    
-      <li><%= link_to tracker.name, :controller => 'issues', :action => 'index', :project_id => @project, 
-                                                :set_filter => 1, 
-                                                "tracker_id" => tracker.id %>:
-					<%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
-																										:total => @total_issues_by_tracker[tracker].to_i) %>
-			</li>
-    <% end %>
-    </ul>
-    <p>
-    	<%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %>
-	    <% if User.current.allowed_to?(:view_calendar, @project, :global => true) %>
-				| <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %>
-			<% end %>
-			<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
-				| <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %>
-			<% end %>
-		</p>
-  </div>
-  <% end %>
-  <%= call_hook(:view_projects_show_left, :project => @project) %>
-</div>
-
-<div class="splitcontentright">
-  <%= render :partial => 'members_box' %>
-    
-  <% if @news.any? && authorize_for('news', 'index') %>
-  <div class="news box">
-    <h3><%=l(:label_news_latest)%></h3>  
-    <%= render :partial => 'news/news', :collection => @news %>
-    <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
-  </div>  
-  <% end %>
-  <%= call_hook(:view_projects_show_right, :project => @project) %>
-</div>
-
-<% content_for :sidebar do %>
-    <% if @total_hours.present? %>
-    <h3><%= l(:label_spent_time) %></h3>
-    <p><span class="icon icon-time"><%= l_hours(@total_hours) %></span></p>
-    <p><%= link_to(l(:label_details), {:controller => 'timelog', :action => 'index', :project_id => @project}) %> |
-    <%= link_to(l(:label_report), {:controller => 'time_entry_reports', :action => 'report', :project_id => @project}) %></p>
-    <% end %>
-    <%= call_hook(:view_projects_show_sidebar_bottom, :project => @project) %>
-<% end %>
-
-<% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
-<% end %>
-
-<% html_title(l(:label_overview)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/_columns.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/queries/_columns.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,26 @@
+<table style="border-collapse: collapse; border:0;">
+	<tr>
+		<td style="padding-left:0"><%= select_tag 'available_columns',
+		          options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
+		          :multiple => true, :size => 10, :style => "width:150px" %>
+		</td>
+		<td align="center" valign="middle">
+			<input type="button" value="&#8594;"
+			 onclick="moveOptions(this.form.available_columns, this.form.selected_columns);" /><br />
+			<input type="button" value="&#8592;"
+			 onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
+		</td>
+		<td><%= select_tag 'c[]',
+		          options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
+		          :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px" %>
+		</td>
+		<td align="center" valign="middle">
+			<input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
+			<input type="button" value="&#8595;" onclick="moveOptionDown(this.form.selected_columns);" />
+		</td>
+	</tr>
+</table>
+
+<% content_for :header_tags do %>
+<%= javascript_include_tag 'select_list_move' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/_columns.rhtml
--- a/app/views/queries/_columns.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<table style="border-collapse: collapse; border:0;">
-	<tr>
-		<td style="padding-left:0"><%= select_tag 'available_columns',
-		          options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
-		          :multiple => true, :size => 10, :style => "width:150px" %>
-		</td>
-		<td align="center" valign="middle">
-			<input type="button" value="&#8594;"
-			 onclick="moveOptions(this.form.available_columns, this.form.selected_columns);" /><br />
-			<input type="button" value="&#8592;"
-			 onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
-		</td>
-		<td><%= select_tag 'c[]',
-		          options_for_select(query.columns.collect {|column| [column.caption, column.name]}),
-		          :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px" %>
-		</td>
-		<td align="center" valign="middle">
-			<input type="button" value="&#8593;" onclick="moveOptionUp(this.form.selected_columns);" /><br />
-			<input type="button" value="&#8595;" onclick="moveOptionDown(this.form.selected_columns);" />
-		</td>
-	</tr>
-</table>
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'select_list_move' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/_filters.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/queries/_filters.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,123 @@
+<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);
+				Form.Element.enable("operators_" + field);
+        Form.Element.enable("values_" + field);
+        toggle_operator(field);
+    } else {
+        Element.hide("operators_" + field);
+        Element.hide("div_values_" + field);
+        Form.Element.disable("operators_" + field);
+        Form.Element.disable("values_" + field);
+  }
+}
+
+function toggle_operator(field) {
+  operator = $("operators_" + field);
+  switch (operator.value) {
+    case "!*":
+    case "*":
+    case "t":
+    case "w":
+    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;
+    }
+}
+
+function submit_query_form(id) {
+  selectAllOptions("selected_columns");
+  $(id).submit();
+}
+
+function apply_filters_observer() {
+  $$("#query_form input[type=text]").invoke("observe", "keypress", function(e){
+    if(e.keyCode == Event.KEY_RETURN) {
+      submit_query_form("query_form");
+    }
+  });
+}
+Event.observe(document,"dom:loaded", apply_filters_observer);
+//]]>
+</script>
+
+<table width="100%">
+<tr>
+<td>
+<table>
+<% 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 %>" class="filter">
+    <td style="width:200px;">
+        <%= check_box_tag 'f[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
+        <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
+    </td>
+    <td style="width:150px;">
+        <%= select_tag "op[#{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>    
+    <div id="div_values_<%= field %>" style="display:none;">
+    <% case options[:type]
+    when :list, :list_optional, :list_status, :list_subprojects %>
+        <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="v[<%= 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('bullet_toggle_plus.png'), "toggle_multi_select('#{field}');", :style => "vertical-align: bottom;" %>
+    <% when :date, :date_past %>
+        <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
+    <% when :string, :text %>
+        <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
+    <% when :integer %>
+        <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %>
+    <% end %>
+    </div>
+    <script type="text/javascript">toggle_filter('<%= field %>');</script>
+    </td>
+    </tr>
+<% end %>
+</table>
+</td>
+<td class="add-filter">
+<%= label_tag('add_filter_select', 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| [ field[1][:name] || 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",
+																		:name => nil %>
+</td>
+</tr>
+</table>
+<%= hidden_field_tag 'f[]', '' %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/_filters.rhtml
--- a/app/views/queries/_filters.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-<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);
-				Form.Element.enable("operators_" + field);
-        Form.Element.enable("values_" + field);
-        toggle_operator(field);
-    } else {
-        Element.hide("operators_" + field);
-        Element.hide("div_values_" + field);
-        Form.Element.disable("operators_" + field);
-        Form.Element.disable("values_" + field);
-  }
-}
-
-function toggle_operator(field) {
-  operator = $("operators_" + field);
-  switch (operator.value) {
-    case "!*":
-    case "*":
-    case "t":
-    case "w":
-    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;
-    }
-}
-
-function submit_query_form(id) {
-  selectAllOptions("selected_columns");
-  $(id).submit();
-}
-
-function apply_filters_observer() {
-  $$("#query_form input[type=text]").invoke("observe", "keypress", function(e){
-    if(e.keyCode == Event.KEY_RETURN) {
-      submit_query_form("query_form");
-    }
-  });
-}
-Event.observe(document,"dom:loaded", apply_filters_observer);
-//]]>
-</script>
-
-<table width="100%">
-<tr>
-<td>
-<table>
-<% 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 %>" class="filter">
-    <td style="width:200px;">
-        <%= check_box_tag 'f[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
-        <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
-    </td>
-    <td style="width:150px;">
-        <%= select_tag "op[#{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>    
-    <div id="div_values_<%= field %>" style="display:none;">
-    <% case options[:type]
-    when :list, :list_optional, :list_status, :list_subprojects %>
-        <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="v[<%= 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('bullet_toggle_plus.png'), "toggle_multi_select('#{field}');", :style => "vertical-align: bottom;" %>
-    <% when :date, :date_past %>
-        <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
-    <% when :string, :text %>
-        <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
-    <% when :integer %>
-        <%= text_field_tag "v[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %>
-    <% end %>
-    </div>
-    <script type="text/javascript">toggle_filter('<%= field %>');</script>
-    </td>
-    </tr>
-<% end %>
-</table>
-</td>
-<td class="add-filter">
-<%= label_tag('add_filter_select', 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| [ field[1][:name] || 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",
-																		:name => nil %>
-</td>
-</tr>
-</table>
-<%= hidden_field_tag 'f[]', '' %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/queries/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,45 @@
+<%= error_messages_for 'query' %>
+<%= hidden_field_tag 'confirm', 1 %>
+
+<div class="box">
+<div class="tabular">
+<p><label for="query_name"><%=l(:field_name)%></label>
+<%= text_field 'query', 'name', :size => 80 %></p>
+
+<% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @project) %>
+<p><label for="query_is_public"><%=l(:field_is_public)%></label>
+<%= check_box 'query', 'is_public',
+      :onchange => (User.current.admin? ? nil : 'if (this.checked) {$("query_is_for_all").checked = false; $("query_is_for_all").disabled = true;} else {$("query_is_for_all").disabled = false;}') %></p>
+<% end %>
+
+<p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
+<%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
+      :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
+
+<p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
+<%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
+      :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
+
+<p><label for="query_group_by"><%= l(:field_group_by) %></label>
+<%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p>
+</div>
+
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
+<%= render :partial => 'queries/filters', :locals => {:query => query}%>
+</fieldset>
+
+<fieldset><legend><%= l(:label_sort) %></legend>
+<% 3.times do |i| %>
+<%= i+1 %>: <%= select_tag("query[sort_criteria][#{i}][]",
+									options_for_select([[]] + query.available_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i))) %>
+				    <%= select_tag("query[sort_criteria][#{i}][]",
+							    		  		options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc']], @query.sort_criteria_order(i))) %><br />
+<% end %>
+</fieldset>
+
+<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
+<legend><%= l(:field_column_names) %></legend>
+<%= render :partial => 'queries/columns', :locals => {:query => query}%>
+<% end %>
+
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/_form.rhtml
--- a/app/views/queries/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-<%= error_messages_for 'query' %>
-<%= hidden_field_tag 'confirm', 1 %>
-
-<div class="box">
-<div class="tabular">
-<p><label for="query_name"><%=l(:field_name)%></label>
-<%= text_field 'query', 'name', :size => 80 %></p>
-
-<% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @project) %>
-<p><label for="query_is_public"><%=l(:field_is_public)%></label>
-<%= check_box 'query', 'is_public',
-      :onchange => (User.current.admin? ? nil : 'if (this.checked) {$("query_is_for_all").checked = false; $("query_is_for_all").disabled = true;} else {$("query_is_for_all").disabled = false;}') %></p>
-<% end %>
-
-<p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
-<%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
-      :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
-
-<p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
-<%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
-      :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
-
-<p><label for="query_group_by"><%= l(:field_group_by) %></label>
-<%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p>
-</div>
-
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
-<%= render :partial => 'queries/filters', :locals => {:query => query}%>
-</fieldset>
-
-<fieldset><legend><%= l(:label_sort) %></legend>
-<% 3.times do |i| %>
-<%= i+1 %>: <%= select_tag("query[sort_criteria][#{i}][]",
-									options_for_select([[]] + query.available_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i))) %>
-				    <%= select_tag("query[sort_criteria][#{i}][]",
-							    		  		options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc']], @query.sort_criteria_order(i))) %><br />
-<% end %>
-</fieldset>
-
-<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
-<legend><%= l(:field_column_names) %></legend>
-<%= render :partial => 'queries/columns', :locals => {:query => query}%>
-<% end %>
-
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/queries/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%= l(:label_query) %></h2>
+
+<% form_tag({:action => 'edit', :id => @query}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
+  <%= render :partial => 'form', :locals => {:query => @query} %>
+  <%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/edit.rhtml
--- a/app/views/queries/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%= l(:label_query) %></h2>
-
-<% form_tag({:action => 'edit', :id => @query}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
-  <%= render :partial => 'form', :locals => {:query => @query} %>
-  <%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/queries/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,27 @@
+<div class="contextual">
+<%= link_to_if_authorized l(:label_query_new), {:controller => 'queries', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %>
+</div>
+
+<h2><%= l(:label_query_plural) %></h2>
+
+<% if @queries.empty? %>
+  <p><i><%=l(:label_no_data)%></i></p>
+<% else %>
+  <table class="list">
+  <% @queries.each do |query| %>
+    <tr class="<%= cycle('odd', 'even') %>">
+      <td>
+        <%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %>
+      </td>
+      <td align="right">
+        <small>
+        <% if query.editable_by?(User.current) %>    
+        <%= 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' %>
+        </small>
+      <% end %>
+      </td>
+    </tr>
+  <% end %>
+  </table>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/index.rhtml
--- a/app/views/queries/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<div class="contextual">
-<%= link_to_if_authorized l(:label_query_new), {:controller => 'queries', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %>
-</div>
-
-<h2><%= l(:label_query_plural) %></h2>
-
-<% if @queries.empty? %>
-  <p><i><%=l(:label_no_data)%></i></p>
-<% else %>
-  <table class="list">
-  <% @queries.each do |query| %>
-    <tr class="<%= cycle('odd', 'even') %>">
-      <td>
-        <%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %>
-      </td>
-      <td align="right">
-        <small>
-        <% if query.editable_by?(User.current) %>    
-        <%= 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' %>
-        </small>
-      <% end %>
-      </td>
-    </tr>
-  <% end %>
-  </table>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/queries/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%= l(:label_query_new) %></h2>
+
+<% form_tag({:action => 'new', :project_id => @query.project}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
+  <%= render :partial => 'form', :locals => {:query => @query} %>
+  <%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/queries/new.rhtml
--- a/app/views/queries/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%= l(:label_query_new) %></h2>
-
-<% form_tag({:action => 'new', :project_id => @query.project}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
-  <%= render :partial => 'form', :locals => {:query => @query} %>
-  <%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/reports/_details.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/reports/_details.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,53 @@
+<% 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="width:<%= col_width %>%"><%= status.name %></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 => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
+                                                :set_filter => 1, 
+                                                :subproject_id => '!*',
+                                                "#{field_name}" => row.id %></td>
+  <% for status in @statuses %>
+    <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, 
+                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
+                                                :set_filter => 1, 
+                                                :subproject_id => '!*',
+                                                "status_id" => status.id, 
+                                                "#{field_name}" => row.id %></td>
+  <% end %>
+  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
+                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
+                                                :set_filter => 1, 
+                                                :subproject_id => '!*',
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "o" %></td>
+  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
+                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
+                                                :set_filter => 1, 
+                                                :subproject_id => '!*',
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "c" %></td>
+  <td align="center"><%= aggregate_link data, { field_name => row.id },
+                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
+                                                :set_filter => 1, 
+                                                :subproject_id => '!*',
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "*" %></td>  
+</tr>
+<% end %>
+</tbody>
+</table>
+<% end
+  reset_cycle %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/reports/_details.rhtml
--- a/app/views/reports/_details.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<% 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="width:<%= col_width %>%"><%= status.name %></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 => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
-                                                :set_filter => 1, 
-                                                :subproject_id => '!*',
-                                                "#{field_name}" => row.id %></td>
-  <% for status in @statuses %>
-    <td align="center"><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, 
-                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
-                                                :set_filter => 1, 
-                                                :subproject_id => '!*',
-                                                "status_id" => status.id, 
-                                                "#{field_name}" => row.id %></td>
-  <% end %>
-  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
-                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
-                                                :set_filter => 1, 
-                                                :subproject_id => '!*',
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "o" %></td>
-  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
-                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
-                                                :set_filter => 1, 
-                                                :subproject_id => '!*',
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "c" %></td>
-  <td align="center"><%= aggregate_link data, { field_name => row.id },
-                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
-                                                :set_filter => 1, 
-                                                :subproject_id => '!*',
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "*" %></td>  
-</tr>
-<% end %>
-</tbody>
-</table>
-<% end
-  reset_cycle %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/reports/_simple.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/reports/_simple.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,41 @@
+<% 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 => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
+                                                :set_filter => 1, 
+                                                :subproject_id => '!*',
+                                                "#{field_name}" => row.id %></td>
+  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
+                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
+                                                :set_filter => 1, 
+                                                :subproject_id => '!*',
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "o" %></td>
+  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
+                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
+                                                :set_filter => 1, 
+                                                :subproject_id => '!*',
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "c" %></td>
+  <td align="center"><%= aggregate_link data, { field_name => row.id },
+                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
+                                                :set_filter => 1, 
+                                                :subproject_id => '!*',
+                                                "#{field_name}" => row.id,
+                                                "status_id" => "*" %></td>  
+</tr>
+<% end %>
+</tbody>
+</table>
+<% end
+  reset_cycle %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/reports/_simple.rhtml
--- a/app/views/reports/_simple.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<% 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 => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
-                                                :set_filter => 1, 
-                                                :subproject_id => '!*',
-                                                "#{field_name}" => row.id %></td>
-  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 0 },
-                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
-                                                :set_filter => 1, 
-                                                :subproject_id => '!*',
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "o" %></td>
-  <td align="center"><%= aggregate_link data, { field_name => row.id, "closed" => 1 },
-                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
-                                                :set_filter => 1, 
-                                                :subproject_id => '!*',
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "c" %></td>
-  <td align="center"><%= aggregate_link data, { field_name => row.id },
-                                                :controller => 'issues', :action => 'index', :project_id => ((row.is_a?(Project) ? row : @project)), 
-                                                :set_filter => 1, 
-                                                :subproject_id => '!*',
-                                                "#{field_name}" => row.id,
-                                                "status_id" => "*" %></td>  
-</tr>
-<% end %>
-</tbody>
-</table>
-<% end
-  reset_cycle %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/reports/issue_report.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/reports/issue_report.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,33 @@
+<h2><%=l(:label_report_plural)%></h2>
+
+<div class="splitcontentleft">
+<h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'tracker' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
+<br />
+<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'priority' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
+<br />
+<h3><%=l(:field_assigned_to)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'assigned_to' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_assigned_to, :field_name => "assigned_to_id", :rows => @assignees } %>
+<br />
+<h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'author' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
+<br />
+<%= call_hook(:view_reports_issue_report_split_content_left, :project => @project) %>
+</div>
+
+<div class="splitcontentright">
+<h3><%=l(:field_version)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'version' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %>
+<br />
+<% if @project.children.any? %>
+<h3><%=l(:field_subproject)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'subproject' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_subproject, :field_name => "project_id", :rows => @subprojects } %>
+<br />
+<% end %>
+<h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'category' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
+<br />
+<%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>
+</div>
+
diff -r df51e8ff578d -r c6c2cbd0afee app/views/reports/issue_report.rhtml
--- a/app/views/reports/issue_report.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<h2><%=l(:label_report_plural)%></h2>
-
-<div class="splitcontentleft">
-<h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'tracker' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
-<br />
-<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'priority' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
-<br />
-<h3><%=l(:field_assigned_to)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'assigned_to' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_assigned_to, :field_name => "assigned_to_id", :rows => @assignees } %>
-<br />
-<h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'author' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
-<br />
-<%= call_hook(:view_reports_issue_report_split_content_left, :project => @project) %>
-</div>
-
-<div class="splitcontentright">
-<h3><%=l(:field_version)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'version' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %>
-<br />
-<% if @project.children.any? %>
-<h3><%=l(:field_subproject)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'subproject' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_subproject, :field_name => "project_id", :rows => @subprojects } %>
-<br />
-<% end %>
-<h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :action => 'issue_report_details', :detail => 'category' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
-<br />
-<%= call_hook(:view_reports_issue_report_split_content_right, :project => @project) %>
-</div>
-
diff -r df51e8ff578d -r c6c2cbd0afee app/views/reports/issue_report_details.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/reports/issue_report_details.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +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' %>
+
diff -r df51e8ff578d -r c6c2cbd0afee app/views/reports/issue_report_details.rhtml
--- a/app/views/reports/issue_report_details.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<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 -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_breadcrumbs.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/_breadcrumbs.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,28 @@
+<%= link_to 'root', :action => 'show', :id => @project, :path => '', :rev => @rev %>
+<% 
+dirs = path.split('/')
+if 'file' == kind
+    filename = dirs.pop
+end
+link_path = ''
+dirs.each do |dir|
+    next if dir.blank?
+    link_path << '/' unless link_path.empty?
+    link_path << "#{dir}" 
+    %>
+    / <%= link_to h(dir), :action => 'show', :id => @project,
+                :path => to_path_param(link_path), :rev => @rev %>
+<% end %>
+<% if filename %>
+    / <%= link_to h(filename),
+                   :action => 'changes', :id => @project,
+                   :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
+<% end %>
+<%
+  # @rev is revsion or Git and Mercurial branch or tag.
+  # For Mercurial *tip*, @rev and @changeset are nil.
+  rev_text = @changeset.nil? ? @rev : format_revision(@changeset)
+%>
+<%= "@ #{h rev_text}" unless rev_text.blank? %>
+
+<% html_title(with_leading_slash(path)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_breadcrumbs.rhtml
--- a/app/views/repositories/_breadcrumbs.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<%= link_to 'root', :action => 'show', :id => @project, :path => '', :rev => @rev %>
-<% 
-dirs = path.split('/')
-if 'file' == kind
-    filename = dirs.pop
-end
-link_path = ''
-dirs.each do |dir|
-    next if dir.blank?
-    link_path << '/' unless link_path.empty?
-    link_path << "#{dir}" 
-    %>
-    / <%= link_to h(dir), :action => 'show', :id => @project,
-                :path => to_path_param(link_path), :rev => @rev %>
-<% end %>
-<% if filename %>
-    / <%= link_to h(filename),
-                   :action => 'changes', :id => @project,
-                   :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
-<% end %>
-<%
-  # @rev is revsion or Git and Mercurial branch or tag.
-  # For Mercurial *tip*, @rev and @changeset are nil.
-  rev_text = @changeset.nil? ? @rev : format_revision(@changeset)
-%>
-<%= "@ #{h rev_text}" unless rev_text.blank? %>
-
-<% html_title(with_leading_slash(path)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_dir_list.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/_dir_list.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,17 @@
+<table class="list entries" id="browser">
+<thead>
+<tr id="root">
+<th><%= l(:field_name) %></th>
+<th><%= l(:field_filesize) %></th>
+<% if @repository.report_last_commit %>
+<th><%= l(:label_revision)  %></th>
+<th><%= l(:label_age)       %></th>
+<th><%= l(:field_author)    %></th>
+<th><%= l(:field_comments)  %></th>
+<% end %>
+</tr>
+</thead>
+<tbody>
+<%= render :partial => 'dir_list_content' %>
+</tbody>
+</table>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_dir_list.rhtml
--- a/app/views/repositories/_dir_list.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<table class="list entries" id="browser">
-<thead>
-<tr id="root">
-<th><%= l(:field_name) %></th>
-<th><%= l(:field_filesize) %></th>
-<% if @repository.report_last_commit %>
-<th><%= l(:label_revision)  %></th>
-<th><%= l(:label_age)       %></th>
-<th><%= l(:field_author)    %></th>
-<th><%= l(:field_comments)  %></th>
-<% end %>
-</tr>
-</thead>
-<tbody>
-<%= render :partial => 'dir_list_content' %>
-</tbody>
-</table>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_dir_list_content.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/_dir_list_content.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,30 @@
+<% @entries.each do |entry| %>
+<% tr_id = Digest::MD5.hexdigest(entry.path)
+   depth = params[:depth].to_i %>
+<%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
+<%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
+<tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
+<td style="padding-left: <%=18 * depth%>px;" class="<%=
+           @repository.report_last_commit ? "filename" : "filename_no_report" %>";>
+<% if entry.is_dir? %>
+<span class="expander" onclick="<%=  remote_function :url => {:action => 'show', :id => @project, :path => to_path_param(ent_path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
+                  :method => :get,
+                  :update => { :success => tr_id },
+                  :position => :after,
+                  :success => "scmEntryLoaded('#{tr_id}')",
+                  :condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
+<% end %>
+<%=  link_to h(ent_name),
+          {:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :path => to_path_param(ent_path), :rev => @rev},
+          :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
+</td>
+<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
+<% changeset = @project.repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
+<% if @repository.report_last_commit %>
+<td class="revision"><%= link_to_revision(changeset, @project) if changeset %></td>
+<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
+<td class="author"><%= changeset.nil? ? h(Redmine::CodesetUtil.replace_invalid_utf8(entry.lastrev.author.to_s.split('<').first)) : changeset.author if entry.lastrev %></td>
+<td class="comments"><%=h truncate(changeset.comments, :length => 50) unless changeset.nil? %></td>
+<% end %>
+</tr>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_dir_list_content.rhtml
--- a/app/views/repositories/_dir_list_content.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<% @entries.each do |entry| %>
-<% tr_id = Digest::MD5.hexdigest(entry.path)
-   depth = params[:depth].to_i %>
-<%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
-<%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
-<tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
-<td style="padding-left: <%=18 * depth%>px;" class="<%=
-           @repository.report_last_commit ? "filename" : "filename_no_report" %>";>
-<% if entry.is_dir? %>
-<span class="expander" onclick="<%=  remote_function :url => {:action => 'show', :id => @project, :path => to_path_param(ent_path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
-                  :method => :get,
-                  :update => { :success => tr_id },
-                  :position => :after,
-                  :success => "scmEntryLoaded('#{tr_id}')",
-                  :condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
-<% end %>
-<%=  link_to h(ent_name),
-          {:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :path => to_path_param(ent_path), :rev => @rev},
-          :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
-</td>
-<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
-<% changeset = @project.repository.find_changeset_by_name(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
-<% if @repository.report_last_commit %>
-<td class="revision"><%= link_to_revision(changeset, @project) if changeset %></td>
-<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-<td class="author"><%= changeset.nil? ? h(Redmine::CodesetUtil.replace_invalid_utf8(entry.lastrev.author.to_s.split('<').first)) : changeset.author if entry.lastrev %></td>
-<td class="comments"><%=h truncate(changeset.comments, :length => 50) unless changeset.nil? %></td>
-<% end %>
-</tr>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_link_to_functions.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/_link_to_functions.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<% if @entry && @entry.kind == 'file' %>
+
+<p>
+<%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
+<% if @repository.supports_cat? %>
+    <%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
+<% end %>
+<% if @repository.supports_annotate? %>
+    <%= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
+<% end %>
+<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
+<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
+</p>
+
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_link_to_functions.rhtml
--- a/app/views/repositories/_link_to_functions.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<% if @entry && @entry.kind == 'file' %>
-
-<p>
-<%= link_to_if action_name != 'changes', l(:label_history), {:action => 'changes', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% if @repository.supports_cat? %>
-    <%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
-<% if @repository.supports_annotate? %>
-    <%= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
-<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
-<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
-</p>
-
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_navigation.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/_navigation.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,21 @@
+<% content_for :header_tags do %>
+  <%= javascript_include_tag 'repository_navigation' %>
+<% end %>
+
+<%= link_to l(:label_statistics), {:action => 'stats', :id => @project}, :class => 'icon icon-stats' %>
+
+<% form_tag({:action => controller.action_name, :id => @project, :path => to_path_param(@path), :rev => ''}, {:method => :get, :id => 'revision_selector'}) do -%>
+  <!-- Branches Dropdown -->
+  <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
+    | <%= l(:label_branch) %>: 
+    <%= select_tag :branch, options_for_select([''] + @repository.branches,@rev), :id => 'branch' %>
+  <% end -%>
+
+  <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
+    | <%= l(:label_tag) %>: 
+    <%= select_tag :tag, options_for_select([''] + @repository.tags,@rev), :id => 'tag' %>
+  <% end -%>
+
+  | <%= l(:label_revision) %>: 
+  <%= text_field_tag 'rev', @rev, :size => 8 %>
+<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_navigation.rhtml
--- a/app/views/repositories/_navigation.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<% content_for :header_tags do %>
-  <%= javascript_include_tag 'repository_navigation' %>
-<% end %>
-
-<%= link_to l(:label_statistics), {:action => 'stats', :id => @project}, :class => 'icon icon-stats' %>
-
-<% form_tag({:action => controller.action_name, :id => @project, :path => to_path_param(@path), :rev => ''}, {:method => :get, :id => 'revision_selector'}) do -%>
-  <!-- Branches Dropdown -->
-  <% if !@repository.branches.nil? && @repository.branches.length > 0 -%>
-    | <%= l(:label_branch) %>: 
-    <%= select_tag :branch, options_for_select([''] + @repository.branches,@rev), :id => 'branch' %>
-  <% end -%>
-
-  <% if !@repository.tags.nil? && @repository.tags.length > 0 -%>
-    | <%= l(:label_tag) %>: 
-    <%= select_tag :tag, options_for_select([''] + @repository.tags,@rev), :id => 'tag' %>
-  <% end -%>
-
-  | <%= l(:label_revision) %>: 
-  <%= text_field_tag 'rev', @rev, :size => 8 %>
-<% end -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_revisions.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/_revisions.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,28 @@
+<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => to_path_param(path)}, :method => :get) do %>
+<table class="list changesets">
+<thead><tr>
+<th>#</th>
+<th></th>
+<th></th>
+<th><%= l(:label_date) %></th>
+<th><%= l(:field_author) %></th>
+<th><%= l(:field_comments) %></th>
+</tr></thead>
+<tbody>
+<% show_diff = revisions.size > 1 %>
+<% line_num = 1 %>
+<% revisions.each do |changeset| %>
+<tr class="changeset <%= cycle 'odd', 'even' %>">
+<td class="id"><%= link_to_revision(changeset, project) %></td>
+<td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
+<td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
+<td class="committed_on"><%= format_time(changeset.committed_on) %></td>
+<td class="author"><%=h changeset.author %></td>
+<td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
+</tr>
+<% line_num += 1 %>
+<% end %>
+</tbody>
+</table>
+<%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/_revisions.rhtml
--- a/app/views/repositories/_revisions.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => to_path_param(path)}, :method => :get) do %>
-<table class="list changesets">
-<thead><tr>
-<th>#</th>
-<th></th>
-<th></th>
-<th><%= l(:label_date) %></th>
-<th><%= l(:field_author) %></th>
-<th><%= l(:field_comments) %></th>
-</tr></thead>
-<tbody>
-<% show_diff = revisions.size > 1 %>
-<% line_num = 1 %>
-<% revisions.each do |changeset| %>
-<tr class="changeset <%= cycle 'odd', 'even' %>">
-<td class="id"><%= link_to_revision(changeset, project) %></td>
-<td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
-<td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
-<td class="committed_on"><%= format_time(changeset.committed_on) %></td>
-<td class="author"><%=h changeset.author %></td>
-<td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
-</tr>
-<% line_num += 1 %>
-<% end %>
-</tbody>
-</table>
-<%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/annotate.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/annotate.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,36 @@
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+
+<p><%= render :partial => 'link_to_functions' %></p>
+
+<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
+
+<div class="autoscroll">
+<table class="filecontent annotate syntaxhl">
+  <tbody>
+    <% line_num = 1 %>
+    <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
+    <% revision = @annotate.revisions[line_num-1] %>
+    <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
+      <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
+      <td class="revision">
+      <%= (revision.identifier ? link_to_revision(revision, @project) : format_revision(revision)) if revision %></td>
+      <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
+      <td class="line-code"><pre><%= line %></pre></td>
+    </tr>
+    <% line_num += 1 %>
+    <% end %>
+  </tbody>
+</table>
+</div>
+
+<% html_title(l(:button_annotate)) -%>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag 'scm' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/annotate.rhtml
--- a/app/views/repositories/annotate.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
-
-<div class="contextual">
-  <%= render :partial => 'navigation' %>
-</div>
-
-<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
-
-<p><%= render :partial => 'link_to_functions' %></p>
-
-<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
-
-<div class="autoscroll">
-<table class="filecontent annotate syntaxhl">
-  <tbody>
-    <% line_num = 1 %>
-    <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
-    <% revision = @annotate.revisions[line_num-1] %>
-    <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
-      <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
-      <td class="revision">
-      <%= (revision.identifier ? link_to_revision(revision, @project) : format_revision(revision)) if revision %></td>
-      <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
-      <td class="line-code"><pre><%= line %></pre></td>
-    </tr>
-    <% line_num += 1 %>
-    <% end %>
-  </tbody>
-</table>
-</div>
-
-<% html_title(l(:button_annotate)) -%>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag 'scm' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/changes.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/changes.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,18 @@
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2>
+  <%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %>
+</h2>
+
+<p><%= render :partial => 'link_to_functions' %></p>
+
+<%= render_properties(@properties) %>
+
+<%= render(:partial => 'revisions', 
+           :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
+
+<% html_title(l(:label_change_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/changes.rhtml
--- a/app/views/repositories/changes.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
-
-<div class="contextual">
-  <%= render :partial => 'navigation' %>
-</div>
-
-<h2>
-  <%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %>
-</h2>
-
-<p><%= render :partial => 'link_to_functions' %></p>
-
-<%= render_properties(@properties) %>
-
-<%= render(:partial => 'revisions', 
-           :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
-
-<% html_title(l(:label_change_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/committers.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/committers.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,34 @@
+<h2><%= l(:label_repository) %></h2>
+
+<%= simple_format(l(:text_repository_usernames_mapping)) %>
+
+<% if @committers.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% else %>
+
+<% form_tag({}) do %>
+<table class="list">
+<thead>
+	<tr>
+		<th><%= l(:field_login) %></th>
+		<th><%= l(:label_user) %></th>
+	</tr>
+</thead>
+<tbody>
+<% i = 0 -%>
+<% @committers.each do |committer, user_id| -%>
+	<tr class="<%= cycle 'odd', 'even' %>">
+		<td><%=h committer %></td>
+		<td>
+			<%= hidden_field_tag "committers[#{i}][]", committer %>
+			<%= select_tag "committers[#{i}][]", content_tag('option', "-- #{l :actionview_instancetag_blank_option} --", :value => '') + options_from_collection_for_select(@users, 'id', 'name', user_id.to_i) %>
+		</td>
+	</tr>
+	<% i += 1 -%>
+<% end -%>
+</tbody>
+</table>
+<p><%= submit_tag(l(:button_update)) %></p>
+<% end %>
+
+<% end %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/committers.rhtml
--- a/app/views/repositories/committers.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<h2><%= l(:label_repository) %></h2>
-
-<%= simple_format(l(:text_repository_usernames_mapping)) %>
-
-<% if @committers.empty? %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% else %>
-
-<% form_tag({}) do %>
-<table class="list">
-<thead>
-	<tr>
-		<th><%= l(:field_login) %></th>
-		<th><%= l(:label_user) %></th>
-	</tr>
-</thead>
-<tbody>
-<% i = 0 -%>
-<% @committers.each do |committer, user_id| -%>
-	<tr class="<%= cycle 'odd', 'even' %>">
-		<td><%=h committer %></td>
-		<td>
-			<%= hidden_field_tag "committers[#{i}][]", committer %>
-			<%= select_tag "committers[#{i}][]", content_tag('option', "-- #{l :actionview_instancetag_blank_option} --", :value => '') + options_from_collection_for_select(@users, 'id', 'name', user_id.to_i) %>
-		</td>
-	</tr>
-	<% i += 1 -%>
-<% end -%>
-</tbody>
-</table>
-<p><%= submit_tag(l(:button_update)) %></p>
-<% end %>
-
-<% end %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/diff.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/diff.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,23 @@
+<h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
+
+<!-- Choose view type -->
+<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
+  <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
+  <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
+  <p><label><%= l(:label_view_diff) %></label>
+  <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
+<% end %>
+
+<% cache(@cache_key) do -%>
+<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
+<% end -%>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
+<% end %>
+
+<% html_title(with_leading_slash(@path), 'Diff') -%>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/diff.rhtml
--- a/app/views/repositories/diff.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<h2><%= l(:label_revision) %> <%= @diff_format_revisions %> <%=h @path %></h2>
-
-<!-- Choose view type -->
-<% form_tag({:path => to_path_param(@path)}, :method => 'get') do %>
-  <%= hidden_field_tag('rev', params[:rev]) if params[:rev] %>
-  <%= hidden_field_tag('rev_to', params[:rev_to]) if params[:rev_to] %>
-  <p><label><%= l(:label_view_diff) %></label>
-  <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
-<% end %>
-
-<% cache(@cache_key) do -%>
-<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
-<% end -%>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Diff', :url => params, :caption => 'Unified diff' %>
-<% end %>
-
-<% html_title(with_leading_slash(@path), 'Diff') -%>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/entry.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/entry.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+
+<p><%= render :partial => 'link_to_functions' %></p>
+
+<%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/entry.rhtml
--- a/app/views/repositories/entry.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
-
-<div class="contextual">
-  <%= render :partial => 'navigation' %>
-</div>
-
-<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
-
-<p><%= render :partial => 'link_to_functions' %></p>
-
-<%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/revision.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/revision.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,67 @@
+<div class="contextual">
+  &#171;
+  <% unless @changeset.previous.nil? -%>
+    <%= link_to_revision(@changeset.previous, @project, :text => l(:label_previous)) %>
+  <% else -%>
+    <%= l(:label_previous) %>
+  <% end -%>
+|
+  <% unless @changeset.next.nil? -%>
+    <%= link_to_revision(@changeset.next, @project, :text => l(:label_next)) %>
+  <% else -%>
+    <%= l(:label_next) %>
+  <% end -%>
+  &#187;&nbsp;
+
+  <% form_tag({:controller => 'repositories',
+               :action     => 'revision',
+               :id         => @project,
+               :rev        => nil},
+               :method     => :get) do %>
+    <%= text_field_tag 'rev', @rev, :size => 8 %>
+    <%= submit_tag 'OK', :name => nil %>
+  <% end %>
+</div>
+
+<h2><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
+
+<p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
+<span class="author"><%= authoring(@changeset.committed_on, @changeset.author) %></span></p>
+
+<%= textilizable @changeset.comments %>
+
+<% if @changeset.issues.visible.any? %>
+<h3><%= l(:label_related_issues) %></h3>
+<ul>
+<% @changeset.issues.visible.each do |issue| %>
+  <li><%= link_to_issue issue %></li>
+<% end %>
+</ul>
+<% end %>
+
+<% if User.current.allowed_to?(:browse_repository, @project) %>
+<h3><%= l(:label_attachment_plural) %></h3>
+<ul id="changes-legend">
+<li class="change change-A"><%= l(:label_added)    %></li>
+<li class="change change-M"><%= l(:label_modified) %></li>
+<li class="change change-C"><%= l(:label_copied)   %></li>
+<li class="change change-R"><%= l(:label_renamed)  %></li>
+<li class="change change-D"><%= l(:label_deleted)  %></li>
+</ul>
+
+<p><%= link_to(l(:label_view_diff),
+               :action => 'diff',
+               :id     => @project,
+               :path   => "",
+               :rev    => @changeset.identifier) if @changeset.changes.any? %></p>
+
+<div class="changeset-changes">
+<%= render_changeset_changes %>
+</div>
+<% end %>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
+
+<% html_title("#{l(:label_revision)} #{format_revision(@changeset)}") -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/revision.rhtml
--- a/app/views/repositories/revision.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-<div class="contextual">
-  &#171;
-  <% unless @changeset.previous.nil? -%>
-    <%= link_to_revision(@changeset.previous, @project, :text => l(:label_previous)) %>
-  <% else -%>
-    <%= l(:label_previous) %>
-  <% end -%>
-|
-  <% unless @changeset.next.nil? -%>
-    <%= link_to_revision(@changeset.next, @project, :text => l(:label_next)) %>
-  <% else -%>
-    <%= l(:label_next) %>
-  <% end -%>
-  &#187;&nbsp;
-
-  <% form_tag({:controller => 'repositories',
-               :action     => 'revision',
-               :id         => @project,
-               :rev        => nil},
-               :method     => :get) do %>
-    <%= text_field_tag 'rev', @rev, :size => 8 %>
-    <%= submit_tag 'OK', :name => nil %>
-  <% end %>
-</div>
-
-<h2><%= l(:label_revision) %> <%= format_revision(@changeset) %></h2>
-
-<p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
-<span class="author"><%= authoring(@changeset.committed_on, @changeset.author) %></span></p>
-
-<%= textilizable @changeset.comments %>
-
-<% if @changeset.issues.visible.any? %>
-<h3><%= l(:label_related_issues) %></h3>
-<ul>
-<% @changeset.issues.visible.each do |issue| %>
-  <li><%= link_to_issue issue %></li>
-<% end %>
-</ul>
-<% end %>
-
-<% if User.current.allowed_to?(:browse_repository, @project) %>
-<h3><%= l(:label_attachment_plural) %></h3>
-<ul id="changes-legend">
-<li class="change change-A"><%= l(:label_added)    %></li>
-<li class="change change-M"><%= l(:label_modified) %></li>
-<li class="change change-C"><%= l(:label_copied)   %></li>
-<li class="change change-R"><%= l(:label_renamed)  %></li>
-<li class="change change-D"><%= l(:label_deleted)  %></li>
-</ul>
-
-<p><%= link_to(l(:label_view_diff),
-               :action => 'diff',
-               :id     => @project,
-               :path   => "",
-               :rev    => @changeset.identifier) if @changeset.changes.any? %></p>
-
-<div class="changeset-changes">
-<%= render_changeset_changes %>
-</div>
-<% end %>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
-<% end %>
-
-<% html_title("#{l(:label_revision)} #{format_revision(@changeset)}") -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/revisions.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/revisions.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,30 @@
+<div class="contextual">
+<% form_tag({:action => 'revision', :id => @project}) do %>
+<%=   l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
+<%=   submit_tag 'OK' %>
+<% end %>
+</div>
+
+<h2><%= l(:label_revision_plural) %></h2>
+
+<%= render :partial => 'revisions',
+           :locals => {:project   => @project,
+                       :path      => '', 
+                       :revisions => @changesets,
+                       :entry     => nil } %>
+
+<p class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></p>
+
+<% content_for :header_tags do %>
+<%=   stylesheet_link_tag "scm" %>
+<%=   auto_discovery_link_tag(
+               :atom,
+               params.merge(
+                 {:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+<% end %>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<% end %>
+
+<% html_title(l(:label_revision_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/revisions.rhtml
--- a/app/views/repositories/revisions.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<div class="contextual">
-<% form_tag({:action => 'revision', :id => @project}) do %>
-<%=   l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 8 %>
-<%=   submit_tag 'OK' %>
-<% end %>
-</div>
-
-<h2><%= l(:label_revision_plural) %></h2>
-
-<%= render :partial => 'revisions',
-           :locals => {:project   => @project,
-                       :path      => '', 
-                       :revisions => @changesets,
-                       :entry     => nil } %>
-
-<p class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></p>
-
-<% content_for :header_tags do %>
-<%=   stylesheet_link_tag "scm" %>
-<%=   auto_discovery_link_tag(
-               :atom,
-               params.merge(
-                 {:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
-<% end %>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
-<% end %>
-
-<% html_title(l(:label_revision_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,64 @@
+<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
+
+<div class="contextual">
+  <%= render :partial => 'navigation' %>
+</div>
+
+<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
+
+<% if !@entries.nil? && authorize_for('repositories', 'browse') %>
+<%= render :partial => 'dir_list' %>
+<% end %>
+
+<%= render_properties(@properties) %>
+
+<% if authorize_for('repositories', 'revisions') %>
+<%   if @changesets && !@changesets.empty? %>
+<h3><%= l(:label_latest_revision_plural) %></h3>
+<%=    render :partial => 'revisions',
+              :locals => {:project => @project, :path => @path,
+                          :revisions => @changesets, :entry => nil }%>
+<%   end %>
+<p>
+<%
+     has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
+     sep = ''
+ %>
+<%   if @repository.supports_all_revisions? && @path.blank? %>
+<%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project %>
+<%   sep = '|' %>
+<%   end %>
+<%
+     if @repository.supports_directory_revisions? &&
+         ( has_branches || !@path.blank? || !@rev.blank? )
+ %>
+<%= sep %>
+<%=
+    link_to l(:label_view_revisions),
+                   :action => 'changes',
+                   :path   => to_path_param(@path),
+                   :id     => @project,
+                   :rev    => @rev
+                   %>
+<%   end %>
+</p>
+
+<%   if true # @path.blank? %>
+<%     content_for :header_tags do %>
+  <%= auto_discovery_link_tag(
+                   :atom, params.merge(
+                      {:format => 'atom', :action => 'revisions',
+                       :id => @project, :page => nil, :key => User.current.rss_key})) %>
+<%     end %>
+
+<%     other_formats_links do |f| %>
+  <%= f.link_to 'Atom', :url => {:action => 'revisions', :id => @project, :key => User.current.rss_key} %>
+<%     end %>
+<%   end %>
+<% end %>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag "scm" %>
+<% end %>
+
+<% html_title(l(:label_repository)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/show.rhtml
--- a/app/views/repositories/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<%= call_hook(:view_repositories_show_contextual, { :repository => @repository, :project => @project }) %>
-
-<div class="contextual">
-  <%= render :partial => 'navigation' %>
-</div>
-
-<h2><%= render :partial => 'breadcrumbs', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
-
-<% if !@entries.nil? && authorize_for('repositories', 'browse') %>
-<%= render :partial => 'dir_list' %>
-<% end %>
-
-<%= render_properties(@properties) %>
-
-<% if authorize_for('repositories', 'revisions') %>
-<%   if @changesets && !@changesets.empty? %>
-<h3><%= l(:label_latest_revision_plural) %></h3>
-<%=    render :partial => 'revisions',
-              :locals => {:project => @project, :path => @path,
-                          :revisions => @changesets, :entry => nil }%>
-<%   end %>
-<p>
-<%
-     has_branches = (!@repository.branches.nil? && @repository.branches.length > 0)
-     sep = ''
- %>
-<%   if @repository.supports_all_revisions? && @path.blank? %>
-<%= link_to l(:label_view_all_revisions), :action => 'revisions', :id => @project %>
-<%   sep = '|' %>
-<%   end %>
-<%
-     if @repository.supports_directory_revisions? &&
-         ( has_branches || !@path.blank? || !@rev.blank? )
- %>
-<%= sep %>
-<%=
-    link_to l(:label_view_revisions),
-                   :action => 'changes',
-                   :path   => to_path_param(@path),
-                   :id     => @project,
-                   :rev    => @rev
-                   %>
-<%   end %>
-</p>
-
-<%   if true # @path.blank? %>
-<%     content_for :header_tags do %>
-  <%= auto_discovery_link_tag(
-                   :atom, params.merge(
-                      {:format => 'atom', :action => 'revisions',
-                       :id => @project, :page => nil, :key => User.current.rss_key})) %>
-<%     end %>
-
-<%     other_formats_links do |f| %>
-  <%= f.link_to 'Atom', :url => {:action => 'revisions', :id => @project, :key => User.current.rss_key} %>
-<%     end %>
-<%   end %>
-<% end %>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag "scm" %>
-<% end %>
-
-<% html_title(l(:label_repository)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/stats.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/repositories/stats.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,12 @@
+<h2><%= l(:label_statistics) %></h2>
+
+<p>
+<%= tag("embed", :width => 800, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :graph => "commits_per_month")) %>
+</p>
+<p>
+<%= tag("embed", :width => 800, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :graph => "commits_per_author")) %>
+</p>
+
+<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
+
+<% html_title(l(:label_repository), l(:label_statistics)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/repositories/stats.rhtml
--- a/app/views/repositories/stats.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<h2><%= l(:label_statistics) %></h2>
-
-<p>
-<%= tag("embed", :width => 800, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :graph => "commits_per_month")) %>
-</p>
-<p>
-<%= tag("embed", :width => 800, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :graph => "commits_per_author")) %>
-</p>
-
-<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
-
-<% html_title(l(:label_repository), l(:label_statistics)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/roles/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/roles/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,30 @@
+<%= error_messages_for 'role' %> 
+
+<div class="box">
+<% unless @role.builtin? %>
+<p><%= f.text_field :name, :required => true %></p>
+<p><%= f.check_box :assignable %></p>
+<% end %>
+<p><%= f.select :issues_visibility, Role::ISSUES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
+<% if @role.new_record? && @roles.any? %>
+<p><label><%= l(:label_copy_workflow_from) %></label>
+<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name)) %></p>
+<% end %>
+</div>
+
+<h3><%= l(:label_permissions) %></h3>
+<div class="box" id="permissions">
+<% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
+<% perms_by_module.keys.sort.each do |mod| %>
+    <fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
+    <% perms_by_module[mod].each do |permission| %>
+        <label class="floating">
+        <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
+        <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+        </label>
+    <% end %>
+    </fieldset>
+<% end %>
+<br /><%= check_all_links 'permissions' %>
+<%= hidden_field_tag 'role[permissions][]', '' %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/roles/_form.rhtml
--- a/app/views/roles/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-<%= error_messages_for 'role' %> 
-
-<div class="box">
-<% unless @role.builtin? %>
-<p><%= f.text_field :name, :required => true %></p>
-<p><%= f.check_box :assignable %></p>
-<% end %>
-<p><%= f.select :issues_visibility, Role::ISSUES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
-<% if @role.new_record? && @roles.any? %>
-<p><label><%= l(:label_copy_workflow_from) %></label>
-<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name)) %></p>
-<% end %>
-</div>
-
-<h3><%= l(:label_permissions) %></h3>
-<div class="box" id="permissions">
-<% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
-<% perms_by_module.keys.sort.each do |mod| %>
-    <fieldset><legend><%= mod.blank? ? l(:label_project) : l_or_humanize(mod, :prefix => 'project_module_') %></legend>
-    <% perms_by_module[mod].each do |permission| %>
-        <label class="floating">
-        <%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name) %>
-        <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
-        </label>
-    <% end %>
-    </fieldset>
-<% end %>
-<br /><%= check_all_links 'permissions' %>
-<%= hidden_field_tag 'role[permissions][]', '' %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/roles/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/roles/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=h @role.name %></h2> 
+
+<% 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 %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/roles/edit.rhtml
--- a/app/views/roles/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=h @role.name %></h2> 
-
-<% 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 %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/roles/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/roles/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,6 @@
+<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=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) %>
+<% end %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/roles/new.rhtml
--- a/app/views/roles/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=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) %>
-<% end %>
\ No newline at end of file
diff -r df51e8ff578d -r c6c2cbd0afee app/views/roles/report.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/roles/report.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,52 @@
+<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=l(:label_permissions_report)%></h2>
+
+<% form_tag({:action => 'report'}, :id => 'permissions_form') do %>
+<%= hidden_field_tag 'permissions[0]', '', :id => nil %>
+<div class="autoscroll">
+<table class="list">
+<thead>
+    <tr>
+    <th><%=l(:label_permissions)%></th>
+    <% @roles.each do |role| %>
+    <th>
+        <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %>
+        <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.role-#{role.id}')",
+                                                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+    </th>
+    <% end %>
+    </tr>
+</thead>
+<tbody>
+<% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
+<% perms_by_module.keys.sort.each do |mod| %>
+    <% unless mod.blank? %>
+        <tr class="group open">
+        	<td colspan="<%= @roles.size + 1 %>">
+        		<span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
+        		<%= l_or_humanize(mod, :prefix => 'project_module_') %>
+        	</td>
+        </tr>
+    <% end %>
+    <% perms_by_module[mod].each do |permission| %>
+        <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
+        <td>
+            <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
+                                                                :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+            <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
+        </td>
+        <% @roles.each do |role| %>
+        <td align="center">
+        <% if role.setable_permissions.include? permission %>
+          <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
+        <% end %>
+        </td>
+        <% end %>
+        </tr>
+    <% end %>
+<% end %>
+</tbody>
+</table>
+</div>
+<p><%= check_all_links 'permissions_form' %></p>
+<p><%= submit_tag l(:button_save) %></p>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/roles/report.rhtml
--- a/app/views/roles/report.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-<h2><%= link_to l(:label_role_plural), :controller => 'roles', :action => 'index' %> &#187; <%=l(:label_permissions_report)%></h2>
-
-<% form_tag({:action => 'report'}, :id => 'permissions_form') do %>
-<%= hidden_field_tag 'permissions[0]', '', :id => nil %>
-<div class="autoscroll">
-<table class="list">
-<thead>
-    <tr>
-    <th><%=l(:label_permissions)%></th>
-    <% @roles.each do |role| %>
-    <th>
-        <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %>
-        <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.role-#{role.id}')",
-                                                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
-    </th>
-    <% end %>
-    </tr>
-</thead>
-<tbody>
-<% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
-<% perms_by_module.keys.sort.each do |mod| %>
-    <% unless mod.blank? %>
-        <tr class="group open">
-        	<td colspan="<%= @roles.size + 1 %>">
-        		<span class="expander" onclick="toggleRowGroup(this);">&nbsp;</span>
-        		<%= l_or_humanize(mod, :prefix => 'project_module_') %>
-        	</td>
-        </tr>
-    <% end %>
-    <% perms_by_module[mod].each do |permission| %>
-        <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
-        <td>
-            <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
-                                                                :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
-            <%= l_or_humanize(permission.name, :prefix => 'permission_') %>
-        </td>
-        <% @roles.each do |role| %>
-        <td align="center">
-        <% if role.setable_permissions.include? permission %>
-          <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
-        <% end %>
-        </td>
-        <% end %>
-        </tr>
-    <% end %>
-<% end %>
-</tbody>
-</table>
-</div>
-<p><%= check_all_links 'permissions_form' %></p>
-<p><%= submit_tag l(:button_save) %></p>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/search/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/search/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,49 @@
+<h2><%= l(:label_search) %></h2>
+
+<div class="box">
+<% form_tag({}, :method => :get) do %>
+<p><%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
+<%= javascript_tag "Field.focus('search-input')" %>
+<%= project_select_tag %>
+<%= hidden_field_tag 'all_words', '', :id => nil %>
+<label><%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></label>
+<%= hidden_field_tag 'titles_only', '', :id => nil %>
+<label><%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %></label>
+</p>
+<p>
+<% @object_types.each do |t| %>
+<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %></label>
+<% end %>
+</p>
+
+<p><%= submit_tag l(:button_submit), :name => 'submit' %></p>
+<% end %>
+</div>
+
+<% if @results %>
+    <div id="search-results-counts">
+    <%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
+    </div>
+    
+    <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
+    <dl id="search-results">
+      <% @results.each do |e| %>
+        <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, :length => 255), @tokens), e.event_url %></dt>
+        <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
+        <span class="author"><%= format_time(e.event_datetime) %></span></dd>
+      <% end %>
+    </dl>
+<% end %>
+
+<p><center>
+<% if @pagination_previous_date %>
+<%= link_to_content_update('&#171; ' + l(:label_previous),
+      params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))) %>&nbsp;
+<% end %>
+<% if @pagination_next_date %>
+<%= link_to_content_update(l(:label_next) + ' &#187;',
+      params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
+<% end %>
+</center></p>
+
+<% html_title(l(:label_search)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/search/index.rhtml
--- a/app/views/search/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<h2><%= l(:label_search) %></h2>
-
-<div class="box">
-<% form_tag({}, :method => :get) do %>
-<p><%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
-<%= javascript_tag "Field.focus('search-input')" %>
-<%= project_select_tag %>
-<%= hidden_field_tag 'all_words', '', :id => nil %>
-<label><%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></label>
-<%= hidden_field_tag 'titles_only', '', :id => nil %>
-<label><%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %></label>
-</p>
-<p>
-<% @object_types.each do |t| %>
-<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %></label>
-<% end %>
-</p>
-
-<p><%= submit_tag l(:button_submit), :name => 'submit' %></p>
-<% end %>
-</div>
-
-<% if @results %>
-    <div id="search-results-counts">
-    <%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
-    </div>
-    
-    <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
-    <dl id="search-results">
-      <% @results.each do |e| %>
-        <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, :length => 255), @tokens), e.event_url %></dt>
-        <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
-        <span class="author"><%= format_time(e.event_datetime) %></span></dd>
-      <% end %>
-    </dl>
-<% end %>
-
-<p><center>
-<% if @pagination_previous_date %>
-<%= link_to_content_update('&#171; ' + l(:label_previous),
-      params.merge(:previous => 1, :offset => @pagination_previous_date.strftime("%Y%m%d%H%M%S"))) %>&nbsp;
-<% end %>
-<% if @pagination_next_date %>
-<%= link_to_content_update(l(:label_next) + ' &#187;',
-      params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
-<% end %>
-</center></p>
-
-<% html_title(l(:label_search)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_authentication.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/_authentication.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,27 @@
+<% form_tag({:action => 'edit', :tab => 'authentication'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_check_box :login_required %></p>
+
+<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
+
+<p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
+							                             [l(:label_registration_activation_by_email), "1"],
+							                             [l(:label_registration_manual_activation), "2"],
+							                             [l(:label_registration_automatic_activation), "3"]] %></p>
+
+<p><%= setting_text_field :password_min_length, :size => 6 %></p>
+
+<p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
+
+<p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
+
+<p><%= setting_check_box :rest_api_enabled %></p>
+</div>
+
+<div style="float:right;">
+    <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-authentication' %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_authentication.rhtml
--- a/app/views/settings/_authentication.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'authentication'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_check_box :login_required %></p>
-
-<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
-
-<p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
-							                             [l(:label_registration_activation_by_email), "1"],
-							                             [l(:label_registration_manual_activation), "2"],
-							                             [l(:label_registration_automatic_activation), "3"]] %></p>
-
-<p><%= setting_text_field :password_min_length, :size => 6 %></p>
-
-<p><%= setting_check_box :lost_password, :label => :label_password_lost %></p>
-
-<p><%= setting_check_box :openid, :disabled => !Object.const_defined?(:OpenID) %></p>
-
-<p><%= setting_check_box :rest_api_enabled %></p>
-</div>
-
-<div style="float:right;">
-    <%= link_to l(:label_ldap_authentication), {:controller => 'ldap_auth_sources', :action => 'index'}, :class => 'icon icon-server-authentication' %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_display.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/_display.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,22 @@
+<% form_tag({:action => 'edit', :tab => 'display'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_select :ui_theme, Redmine::Themes.themes.collect {|t| [t.name, t.id]}, :blank => :label_default, :label => :label_theme %></p>
+
+<p><%= setting_select :default_language, lang_options_for_select(false) %></p>
+
+<p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
+
+<p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, :blank => :label_language_based %></p>
+
+<p><%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, :blank => :label_language_based %></p>
+
+<p><%= setting_select :user_format, @options[:user_format] %></p>
+
+<p><%= setting_check_box :gravatar_enabled %></p>
+
+<p><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid'], ["Retro", 'retro'], ["Mystery man", 'mm']], :blank => :label_none %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_display.rhtml
--- a/app/views/settings/_display.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'display'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_select :ui_theme, Redmine::Themes.themes.collect {|t| [t.name, t.id]}, :blank => :label_default, :label => :label_theme %></p>
-
-<p><%= setting_select :default_language, lang_options_for_select(false) %></p>
-
-<p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
-
-<p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, :blank => :label_language_based %></p>
-
-<p><%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, :blank => :label_language_based %></p>
-
-<p><%= setting_select :user_format, @options[:user_format] %></p>
-
-<p><%= setting_check_box :gravatar_enabled %></p>
-
-<p><%= setting_select :gravatar_default, [["Wavatars", 'wavatar'], ["Identicons", 'identicon'], ["Monster ids", 'monsterid'], ["Retro", 'retro'], ["Mystery man", 'mm']], :blank => :label_none %></p>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_general.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/_general.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,37 @@
+<% form_tag({:action => 'edit'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_text_field :app_title, :size => 30 %></p>
+
+<p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
+<%= wikitoolbar_for 'settings_welcome_text' %>
+
+<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
+
+<p><%= setting_text_field :per_page_options, :size => 20 %><br />
+<em><%= l(:text_comma_separated) %></em></p>
+
+<p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
+
+<p><%= setting_text_field :host_name, :size => 60 %><br />
+<em><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
+
+<p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
+
+<p><%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %></p>
+
+<p><%= setting_check_box :cache_formatted_text %></p>
+
+<p><%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %></p>
+
+<p><%= setting_text_field :feeds_limit, :size => 6 %></p>
+
+<p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
+
+<p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
+
+<%= call_hook(:view_settings_general_form) %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_general.rhtml
--- a/app/views/settings/_general.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<% form_tag({:action => 'edit'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_text_field :app_title, :size => 30 %></p>
-
-<p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
-<%= wikitoolbar_for 'settings_welcome_text' %>
-
-<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
-
-<p><%= setting_text_field :per_page_options, :size => 20 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
-
-<p><%= setting_text_field :activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
-
-<p><%= setting_text_field :host_name, :size => 60 %><br />
-<em><%= l(:label_example) %>: <%= @guessed_host_and_path %></em></p>
-
-<p><%= setting_select :protocol, [['HTTP', 'http'], ['HTTPS', 'https']] %></p>
-
-<p><%= setting_select :text_formatting, Redmine::WikiFormatting.format_names.collect{|name| [name, name.to_s]}, :blank => :label_none %></p>
-
-<p><%= setting_check_box :cache_formatted_text %></p>
-
-<p><%= setting_select :wiki_compression, [['Gzip', 'gzip']], :blank => :label_none %></p>
-
-<p><%= setting_text_field :feeds_limit, :size => 6 %></p>
-
-<p><%= setting_text_field :file_max_size_displayed, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
-
-<p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
-
-<%= call_hook(:view_settings_general_form) %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_issues.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/_issues.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,21 @@
+<% form_tag({:action => 'edit', :tab => 'issues'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_check_box :cross_project_issue_relations %></p>
+
+<p><%= setting_check_box :display_subprojects_issues %></p>
+
+<p><%= setting_select :issue_done_ratio, Issue::DONE_RATIO_OPTIONS.collect {|i| [l("setting_issue_done_ratio_#{i}"), i]} %></p>
+
+<p><%= setting_text_field :issues_export_limit, :size => 6 %></p>
+
+<p><%= setting_text_field :gantt_items_limit, :size => 6 %></p>
+</div>
+
+<fieldset class="box settings"><legend><%= l(:setting_issue_list_default_columns) %></legend>
+<%= setting_multiselect(:issue_list_default_columns, 
+        Query.new.available_columns.collect {|c| [c.caption, c.name.to_s]}, :label => false) %>
+</fieldset>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_issues.rhtml
--- a/app/views/settings/_issues.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'issues'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_check_box :cross_project_issue_relations %></p>
-
-<p><%= setting_check_box :display_subprojects_issues %></p>
-
-<p><%= setting_select :issue_done_ratio, Issue::DONE_RATIO_OPTIONS.collect {|i| [l("setting_issue_done_ratio_#{i}"), i]} %></p>
-
-<p><%= setting_text_field :issues_export_limit, :size => 6 %></p>
-
-<p><%= setting_text_field :gantt_items_limit, :size => 6 %></p>
-</div>
-
-<fieldset class="box settings"><legend><%= l(:setting_issue_list_default_columns) %></legend>
-<%= setting_multiselect(:issue_list_default_columns, 
-        Query.new.available_columns.collect {|c| [c.caption, c.name.to_s]}, :label => false) %>
-</fieldset>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_mail_handler.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/_mail_handler.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,23 @@
+<% form_tag({:action => 'edit', :tab => 'mail_handler'}) do %>
+
+<div class="box tabular settings">
+  <p>
+    <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
+    <br /><em><%= l(:text_line_separated) %></em>
+  </p>
+</div>
+
+<div class="box tabular settings">
+<p><%= setting_check_box :mail_handler_api_enabled, 
+				 :onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }"%></p>
+
+<p><%= setting_text_field :mail_handler_api_key, :size => 30,
+																								 :id => 'settings_mail_handler_api_key',
+																								 :disabled => !Setting.mail_handler_api_enabled? %>
+  <%= link_to_function l(:label_generate_key), "if ($('settings_mail_handler_api_key').disabled == false) { $('settings_mail_handler_api_key').value = randomKey(20) }" %>
+</p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_mail_handler.rhtml
--- a/app/views/settings/_mail_handler.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'mail_handler'}) do %>
-
-<div class="box tabular settings">
-  <p>
-    <%= setting_text_area :mail_handler_body_delimiters, :rows => 5 %>
-    <br /><em><%= l(:text_line_separated) %></em>
-  </p>
-</div>
-
-<div class="box tabular settings">
-<p><%= setting_check_box :mail_handler_api_enabled, 
-				 :onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }"%></p>
-
-<p><%= setting_text_field :mail_handler_api_key, :size => 30,
-																								 :id => 'settings_mail_handler_api_key',
-																								 :disabled => !Setting.mail_handler_api_enabled? %>
-  <%= link_to_function l(:label_generate_key), "if ($('settings_mail_handler_api_key').disabled == false) { $('settings_mail_handler_api_key').value = randomKey(20) }" %>
-</p>
-</div>
-
-<%= submit_tag l(:button_save) %>
-
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_notifications.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/_notifications.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,42 @@
+<% if @deliveries %>
+<% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_text_field :mail_from, :size => 60 %></p>
+
+<p><%= setting_check_box :bcc_recipients %></p>
+
+<p><%= setting_check_box :plain_text_mail %></p>
+
+<p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>
+
+</div>
+
+<fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
+<%= hidden_field_tag 'settings[notified_events][]', '' %>
+<% @notifiables.each do |notifiable| %>
+<%= notification_field notifiable %>
+<br />
+<% end %>
+<p><%= check_all_links('notified_events') %></p>
+</fieldset>
+
+<fieldset class="box"><legend><%= l(:setting_emails_header) %></legend>
+<%= setting_text_area :emails_header, :label => false, :class => 'wiki-edit', :rows => 5 %>
+</fieldset>
+
+<fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
+<%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %>
+</fieldset>
+
+<div style="float:right;">
+<%= link_to l(:label_send_test_email), :controller => 'admin', :action => 'test_email' %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
+<% else %>
+<div class="nodata">
+<%= simple_format(l(:text_email_delivery_not_configured)) %>
+</div>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_notifications.rhtml
--- a/app/views/settings/_notifications.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-<% if @deliveries %>
-<% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_text_field :mail_from, :size => 60 %></p>
-
-<p><%= setting_check_box :bcc_recipients %></p>
-
-<p><%= setting_check_box :plain_text_mail %></p>
-
-<p><%= setting_select(:default_notification_option, User.valid_notification_options.collect {|o| [l(o.last), o.first.to_s]}) %></p>
-
-</div>
-
-<fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
-<%= hidden_field_tag 'settings[notified_events][]', '' %>
-<% @notifiables.each do |notifiable| %>
-<%= notification_field notifiable %>
-<br />
-<% end %>
-<p><%= check_all_links('notified_events') %></p>
-</fieldset>
-
-<fieldset class="box"><legend><%= l(:setting_emails_header) %></legend>
-<%= setting_text_area :emails_header, :label => false, :class => 'wiki-edit', :rows => 5 %>
-</fieldset>
-
-<fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
-<%= setting_text_area :emails_footer, :label => false, :class => 'wiki-edit', :rows => 5 %>
-</fieldset>
-
-<div style="float:right;">
-<%= link_to l(:label_send_test_email), :controller => 'admin', :action => 'test_email' %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
-<% else %>
-<div class="nodata">
-<%= simple_format(l(:text_email_delivery_not_configured)) %>
-</div>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_projects.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/_projects.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,17 @@
+<% form_tag({:action => 'edit', :tab => 'projects'}) do %>
+
+<div class="box tabular settings">
+<p><%= setting_check_box :default_projects_public %></p>
+
+<p><%= setting_multiselect(:default_projects_modules, 
+        Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %></p>
+
+<p><%= setting_check_box :sequential_project_identifiers %></p>
+
+<p><%= setting_select :new_project_user_role_id,
+											Role.find_all_givable.collect {|r| [r.name, r.id.to_s]}, 
+											:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_projects.rhtml
--- a/app/views/settings/_projects.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'projects'}) do %>
-
-<div class="box tabular settings">
-<p><%= setting_check_box :default_projects_public %></p>
-
-<p><%= setting_multiselect(:default_projects_modules, 
-        Redmine::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, :prefix => "project_module_"), m.to_s]}) %></p>
-
-<p><%= setting_check_box :sequential_project_identifiers %></p>
-
-<p><%= setting_select :new_project_user_role_id,
-											Role.find_all_givable.collect {|r| [r.name, r.id.to_s]}, 
-											:blank => "--- #{l(:actionview_instancetag_blank_option)} ---" %></p>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_repositories.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/_repositories.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,96 @@
+<% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
+
+<fieldset class="box tabular settings enabled_scm">
+<legend><%= l(:setting_enabled_scm) %></legend>
+<table>
+  <tr>
+    <th></th>
+    <th><%= l(:text_scm_command)         %></th>
+    <th><%= l(:text_scm_command_version) %></th>
+  </tr>
+  <% Redmine::Scm::Base.all.collect do |choice| %>
+    <% scm_class = "Repository::#{choice}".constantize %>
+    <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
+    <% setting = :enabled_scm %>
+    <tr>
+      <td class="scm_name">
+        <%= 
+          check_box_tag(
+              "settings[#{setting}][]",
+               value,
+               Setting.send(setting).include?(value))
+         %>
+        <%= text.to_s %>
+      </td>
+      <td>
+         <%=
+           image_tag(
+              (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
+              :style => "vertical-align:bottom;"
+           )
+           %>
+          <%= scm_class.scm_command %>
+       </td>
+       <td>
+          <%= scm_class.scm_version_string %>
+       </td>
+     </tr>
+  <% end %>
+</table>
+<p class="scm_config">
+<%= l(:text_scm_config) %>
+</p>
+</fieldset>
+
+<div class="box tabular settings">
+<p><%= setting_check_box :autofetch_changesets %></p>
+
+<p><%= setting_check_box :sys_api_enabled,
+                         :onclick =>
+                             "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
+
+<p><%= setting_text_field :sys_api_key,
+                          :size     => 30,
+                          :id       => 'settings_sys_api_key',
+                          :disabled => !Setting.sys_api_enabled?,
+                          :label    => :setting_mail_handler_api_key %>
+  <%= link_to_function l(:label_generate_key),
+                       "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
+</p>
+
+<p><%= setting_text_field :repositories_encodings, :size => 60 %><br />
+<em><%= l(:text_comma_separated) %></em></p>
+
+<p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
+</div>
+
+<fieldset class="box tabular settings">
+<legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
+<p><%= setting_text_field :commit_ref_keywords, :size => 30 %><br />
+<em><%= l(:text_comma_separated) %></em></p>
+
+<p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
+&nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
+                                                          [["", 0]] +
+                                                              IssueStatus.find(:all).collect{
+                                                                 |status| [status.name, status.id.to_s]
+                                                              },
+                                                          :label => false %>
+&nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio,
+                                                       (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
+                                                       :blank => :label_no_change_option,
+                                                       :label => false %>
+<br /><em><%= l(:text_comma_separated) %></em></p>
+
+<p><%= setting_check_box :commit_logtime_enabled,
+                         :onclick =>
+                            "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
+
+<p><%= setting_select :commit_logtime_activity_id,
+                      [[l(:label_default), 0]] +
+                          TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]},
+                      :disabled => !Setting.commit_logtime_enabled?%></p>
+</fieldset>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/_repositories.rhtml
--- a/app/views/settings/_repositories.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-<% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
-
-<fieldset class="box tabular settings enabled_scm">
-<legend><%= l(:setting_enabled_scm) %></legend>
-<table>
-  <tr>
-    <th></th>
-    <th><%= l(:text_scm_command)         %></th>
-    <th><%= l(:text_scm_command_version) %></th>
-  </tr>
-  <% Redmine::Scm::Base.all.collect do |choice| %>
-    <% scm_class = "Repository::#{choice}".constantize %>
-    <% text, value = (choice.is_a?(Array) ? choice : [choice, choice]) %>
-    <% setting = :enabled_scm %>
-    <tr>
-      <td class="scm_name">
-        <%= 
-          check_box_tag(
-              "settings[#{setting}][]",
-               value,
-               Setting.send(setting).include?(value))
-         %>
-        <%= text.to_s %>
-      </td>
-      <td>
-         <%=
-           image_tag(
-              (scm_class.scm_available ? 'true.png' : 'exclamation.png'),
-              :style => "vertical-align:bottom;"
-           )
-           %>
-          <%= scm_class.scm_command %>
-       </td>
-       <td>
-          <%= scm_class.scm_version_string %>
-       </td>
-     </tr>
-  <% end %>
-</table>
-<p class="scm_config">
-<%= l(:text_scm_config) %>
-</p>
-</fieldset>
-
-<div class="box tabular settings">
-<p><%= setting_check_box :autofetch_changesets %></p>
-
-<p><%= setting_check_box :sys_api_enabled,
-                         :onclick =>
-                             "if (this.checked) { Form.Element.enable('settings_sys_api_key'); } else { Form.Element.disable('settings_sys_api_key'); }" %></p>
-
-<p><%= setting_text_field :sys_api_key,
-                          :size     => 30,
-                          :id       => 'settings_sys_api_key',
-                          :disabled => !Setting.sys_api_enabled?,
-                          :label    => :setting_mail_handler_api_key %>
-  <%= link_to_function l(:label_generate_key),
-                       "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
-</p>
-
-<p><%= setting_text_field :repositories_encodings, :size => 60 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
-
-<p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
-</div>
-
-<fieldset class="box tabular settings">
-<legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
-<p><%= setting_text_field :commit_ref_keywords, :size => 30 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
-
-<p><%= setting_text_field :commit_fix_keywords, :size => 30 %>
-&nbsp;<%= l(:label_applied_status) %>: <%= setting_select :commit_fix_status_id,
-                                                          [["", 0]] +
-                                                              IssueStatus.find(:all).collect{
-                                                                 |status| [status.name, status.id.to_s]
-                                                              },
-                                                          :label => false %>
-&nbsp;<%= l(:field_done_ratio) %>: <%= setting_select :commit_fix_done_ratio,
-                                                       (0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] },
-                                                       :blank => :label_no_change_option,
-                                                       :label => false %>
-<br /><em><%= l(:text_comma_separated) %></em></p>
-
-<p><%= setting_check_box :commit_logtime_enabled,
-                         :onclick =>
-                            "if (this.checked) { Form.Element.enable('settings_commit_logtime_activity_id'); } else { Form.Element.disable('settings_commit_logtime_activity_id'); }"%></p>
-
-<p><%= setting_select :commit_logtime_activity_id,
-                      [[l(:label_default), 0]] +
-                          TimeEntryActivity.shared.all.collect{|activity| [activity.name, activity.id.to_s]},
-                      :disabled => !Setting.commit_logtime_enabled?%></p>
-</fieldset>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<h2><%= l(:label_settings) %></h2>
+
+<%= render_tabs administration_settings_tabs %>
+
+<% html_title(l(:label_settings), l(:label_administration)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/edit.rhtml
--- a/app/views/settings/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<h2><%= l(:label_settings) %></h2>
-
-<%= render_tabs administration_settings_tabs %>
-
-<% html_title(l(:label_settings), l(:label_administration)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/plugin.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/settings/plugin.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,10 @@
+<h2><%= l(:label_settings) %>: <%=h @plugin.name %></h2>
+
+<div id="settings">
+<% form_tag({:action => 'plugin'}) do %>
+<div class="box tabular">
+<%= render :partial => @partial, :locals => {:settings => @settings}%>
+</div>
+<%= submit_tag l(:button_apply) %>
+<% end %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/settings/plugin.rhtml
--- a/app/views/settings/plugin.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<h2><%= l(:label_settings) %>: <%=h @plugin.name %></h2>
-
-<div id="settings">
-<% form_tag({:action => 'plugin'}) do %>
-<div class="box tabular">
-<%= render :partial => @partial, :locals => {:settings => @settings}%>
-</div>
-<%= submit_tag l(:button_apply) %>
-<% end %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/time_entry_reports/_report_criteria.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/time_entry_reports/_report_criteria.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,19 @@
+<% @hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %>
+<% hours_for_value = select_hours(hours, criterias[level], value) -%>
+<% next if hours_for_value.empty? -%>
+<tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>">
+<%= '<td></td>' * level %>
+<td><%= h(format_criteria_value(criterias[level], value)) %></td>
+<%= '<td></td>' * (criterias.length - level - 1) -%>
+  <% total = 0 -%>
+  <% @periods.each do |period| -%>
+    <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)); total += sum -%>
+    <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
+  <% end -%>
+  <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
+</tr>
+<% if criterias.length > level+1 -%>
+  <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
+<% end -%>
+
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/time_entry_reports/_report_criteria.rhtml
--- a/app/views/time_entry_reports/_report_criteria.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<% @hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %>
-<% hours_for_value = select_hours(hours, criterias[level], value) -%>
-<% next if hours_for_value.empty? -%>
-<tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>">
-<%= '<td></td>' * level %>
-<td><%= h(format_criteria_value(criterias[level], value)) %></td>
-<%= '<td></td>' * (criterias.length - level - 1) -%>
-  <% total = 0 -%>
-  <% @periods.each do |period| -%>
-    <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)); total += sum -%>
-    <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
-  <% end -%>
-  <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
-</tr>
-<% if criterias.length > level+1 -%>
-  <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
-<% end -%>
-
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/time_entry_reports/report.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/time_entry_reports/report.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,70 @@
+<div class="contextual">
+<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
+</div>
+
+<%= render_timelog_breadcrumb %>
+
+<h2><%= l(:label_spent_time) %></h2>
+
+<% form_tag({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
+  <% @criterias.each do |criteria| %>
+    <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
+  <% end %>
+  <%= render :partial => 'timelog/date_range' %>
+
+  <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
+                                                                            [l(:label_month), 'month'],
+                                                                            [l(:label_week), 'week'],
+                                                                            [l(:label_day_plural).titleize, 'day']], @columns),
+                                                        :onchange => "this.form.onsubmit();" %>
+
+  <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
+                                                          :onchange => "this.form.submit();",
+                                                          :style => 'width: 200px',
+                                                          :id => nil,
+                                                          :disabled => (@criterias.length >= 3)) %>
+     <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-reload' %></p>
+<% end %>
+
+<% unless @criterias.empty? %>
+<div class="total-hours">
+<p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
+</div>
+
+<% unless @hours.empty? %>
+<table class="list" id="time-report">
+<thead>
+<tr>
+<% @criterias.each do |criteria| %>
+  <th><%= l_or_humanize(@available_criterias[criteria][:label]) %></th>
+<% end %>
+<% columns_width = (40 / (@periods.length+1)).to_i %>
+<% @periods.each do |period| %>
+  <th class="period" width="<%= columns_width %>%"><%= period %></th>
+<% end %>
+  <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
+</tr>
+</thead>
+<tbody>
+<%= render :partial => 'report_criteria', :locals => {:criterias => @criterias, :hours => @hours, :level => 0} %>
+  <tr class="total">
+  <td><%= l(:label_total) %></td>
+  <%= '<td></td>' * (@criterias.size - 1) %>
+  <% total = 0 -%>
+  <% @periods.each do |period| -%>
+    <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)); total += sum -%>
+    <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
+  <% end -%>
+  <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
+  </tr>
+</tbody>
+</table>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'CSV', :url => params %>
+<% end %>
+<% end %>
+<% end %>
+
+<% html_title l(:label_spent_time), l(:label_report) %>
+
diff -r df51e8ff578d -r c6c2cbd0afee app/views/time_entry_reports/report.rhtml
--- a/app/views/time_entry_reports/report.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-<div class="contextual">
-<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time-add' %>
-</div>
-
-<%= render_timelog_breadcrumb %>
-
-<h2><%= l(:label_spent_time) %></h2>
-
-<% form_tag({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}, :method => :get, :id => 'query_form') do %>
-  <% @criterias.each do |criteria| %>
-    <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
-  <% end %>
-  <%= render :partial => 'timelog/date_range' %>
-
-  <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
-                                                                            [l(:label_month), 'month'],
-                                                                            [l(:label_week), 'week'],
-                                                                            [l(:label_day_plural).titleize, 'day']], @columns),
-                                                        :onchange => "this.form.onsubmit();" %>
-
-  <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l_or_humanize(@available_criterias[k][:label]), k]}),
-                                                          :onchange => "this.form.submit();",
-                                                          :style => 'width: 200px',
-                                                          :id => nil,
-                                                          :disabled => (@criterias.length >= 3)) %>
-     <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns}, :class => 'icon icon-reload' %></p>
-<% end %>
-
-<% unless @criterias.empty? %>
-<div class="total-hours">
-<p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
-</div>
-
-<% unless @hours.empty? %>
-<table class="list" id="time-report">
-<thead>
-<tr>
-<% @criterias.each do |criteria| %>
-  <th><%= l_or_humanize(@available_criterias[criteria][:label]) %></th>
-<% end %>
-<% columns_width = (40 / (@periods.length+1)).to_i %>
-<% @periods.each do |period| %>
-  <th class="period" width="<%= columns_width %>%"><%= period %></th>
-<% end %>
-  <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
-</tr>
-</thead>
-<tbody>
-<%= render :partial => 'report_criteria', :locals => {:criterias => @criterias, :hours => @hours, :level => 0} %>
-  <tr class="total">
-  <td><%= l(:label_total) %></td>
-  <%= '<td></td>' * (@criterias.size - 1) %>
-  <% total = 0 -%>
-  <% @periods.each do |period| -%>
-    <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)); total += sum -%>
-    <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
-  <% end -%>
-  <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
-  </tr>
-</tbody>
-</table>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'CSV', :url => params %>
-<% end %>
-<% end %>
-<% end %>
-
-<% html_title l(:label_spent_time), l(:label_report) %>
-
diff -r df51e8ff578d -r c6c2cbd0afee app/views/timelog/_date_range.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/timelog/_date_range.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,33 @@
+<fieldset id="date-range" class="collapsible">
+<legend onclick="toggleFieldset(this);"><%= l(:label_date_range) %></legend>
+<div>
+<p>
+<%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");' %>
+<%= select_tag 'period', options_for_period_select(params[:period]),
+                         :onchange => 'this.form.submit();',
+                         :onfocus => '$("period_type_1").checked = true;',
+                         :disabled => @free_period %>
+</p>
+<p>
+<%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");' %>
+<span onclick="$('period_type_2').checked = true;">
+<%= l(:label_date_from_to, :start => (text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),
+													 :end => (text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))) %>
+</span>
+</p>
+</div>
+</fieldset>
+<p class="buttons">
+	<%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
+  <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %>
+</p>
+
+<div class="tabs">
+<% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
+<ul>
+    <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
+                                       :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
+    <li><%= link_to(l(:label_report), url_params.merge({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}),
+                                       :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
+</ul>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/timelog/_date_range.rhtml
--- a/app/views/timelog/_date_range.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<fieldset id="date-range" class="collapsible">
-<legend onclick="toggleFieldset(this);"><%= l(:label_date_range) %></legend>
-<div>
-<p>
-<%= radio_button_tag 'period_type', '1', !@free_period, :onclick => 'Form.Element.disable("from");Form.Element.disable("to");Form.Element.enable("period");' %>
-<%= select_tag 'period', options_for_period_select(params[:period]),
-                         :onchange => 'this.form.submit();',
-                         :onfocus => '$("period_type_1").checked = true;',
-                         :disabled => @free_period %>
-</p>
-<p>
-<%= radio_button_tag 'period_type', '2', @free_period, :onclick => 'Form.Element.enable("from");Form.Element.enable("to");Form.Element.disable("period");' %>
-<span onclick="$('period_type_2').checked = true;">
-<%= l(:label_date_from_to, :start => (text_field_tag('from', @from, :size => 10, :disabled => !@free_period) + calendar_for('from')),
-													 :end => (text_field_tag('to', @to, :size => 10, :disabled => !@free_period) + calendar_for('to'))) %>
-</span>
-</p>
-</div>
-</fieldset>
-<p class="buttons">
-	<%= link_to_function l(:button_apply), '$("query_form").submit()', :class => 'icon icon-checked' %>
-  <%= link_to l(:button_clear), {:controller => controller_name, :action => action_name, :project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload' %>
-</p>
-
-<div class="tabs">
-<% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
-<ul>
-    <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue }),
-                                       :class => (@controller.action_name == 'index' ? 'selected' : nil)) %></li>
-    <li><%= link_to(l(:label_report), url_params.merge({:controller => 'time_entry_reports', :action => 'report', :project_id => @project, :issue_id => @issue}),
-                                       :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
-</ul>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/timelog/_list.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/timelog/_list.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,53 @@
+<% form_tag({}) do -%>	
+<%= hidden_field_tag 'back_url', url_for(params) %>
+<table class="list time-entries">
+<thead>
+<tr>
+<th class="checkbox hide-when-print">
+  <%= link_to image_tag('toggle_check.png'), 
+    {}, 
+    :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;', 
+    :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+</th>
+<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
+<%= sort_header_tag('user', :caption => l(:label_member)) %>
+<%= sort_header_tag('activity', :caption => l(:label_activity)) %>
+<%= sort_header_tag('project', :caption => l(:label_project)) %>
+<%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
+<th><%= l(:field_comments) %></th>
+<%= sort_header_tag('hours', :caption => l(:field_hours)) %>
+<th></th>
+</tr>
+</thead>
+<tbody>
+<% entries.each do |entry| -%>
+<tr class="time-entry <%= cycle("odd", "even") %> hascontextmenu">
+<td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
+<td class="spent_on"><%= format_date(entry.spent_on) %></td>
+<td class="user"><%=h entry.user %></td>
+<td class="activity"><%=h entry.activity %></td>
+<td class="project"><%=h entry.project %></td>
+<td class="subject">
+<% if entry.issue -%>
+<%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%>
+<% end -%>
+</td>
+<td class="comments"><%=h entry.comments %></td>
+<td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
+<td align="center">
+<% if entry.editable_by?(User.current) -%>
+    <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
+                                       :title => l(:button_edit) %>
+    <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
+                                         :confirm => l(:text_are_you_sure),
+                                         :method => :delete,
+                                         :title => l(:button_delete) %>
+<% end -%>
+</td>
+</tr>
+<% end -%>
+</tbody>
+</table>
+<% end -%>
+
+<%= context_menu time_entries_context_menu_path %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/timelog/_list.rhtml
--- a/app/views/timelog/_list.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-<% form_tag({}) do -%>	
-<%= hidden_field_tag 'back_url', url_for(params) %>
-<table class="list time-entries">
-<thead>
-<tr>
-<th class="checkbox hide-when-print">
-  <%= link_to image_tag('toggle_check.png'), 
-    {}, 
-    :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;', 
-    :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
-</th>
-<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
-<%= sort_header_tag('user', :caption => l(:label_member)) %>
-<%= sort_header_tag('activity', :caption => l(:label_activity)) %>
-<%= sort_header_tag('project', :caption => l(:label_project)) %>
-<%= sort_header_tag('issue', :caption => l(:label_issue), :default_order => 'desc') %>
-<th><%= l(:field_comments) %></th>
-<%= sort_header_tag('hours', :caption => l(:field_hours)) %>
-<th></th>
-</tr>
-</thead>
-<tbody>
-<% entries.each do |entry| -%>
-<tr class="time-entry <%= cycle("odd", "even") %> hascontextmenu">
-<td class="checkbox hide-when-print"><%= check_box_tag("ids[]", entry.id, false, :id => nil) %></td>
-<td class="spent_on"><%= format_date(entry.spent_on) %></td>
-<td class="user"><%=h entry.user %></td>
-<td class="activity"><%=h entry.activity %></td>
-<td class="project"><%=h entry.project %></td>
-<td class="subject">
-<% if entry.issue -%>
-<%= entry.issue.visible? ? link_to_issue(entry.issue, :truncate => 50) : "##{entry.issue.id}" -%>
-<% end -%>
-</td>
-<td class="comments"><%=h entry.comments %></td>
-<td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
-<td align="center">
-<% if entry.editable_by?(User.current) -%>
-    <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
-                                       :title => l(:button_edit) %>
-    <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
-                                         :confirm => l(:text_are_you_sure),
-                                         :method => :delete,
-                                         :title => l(:button_delete) %>
-<% end -%>
-</td>
-</tr>
-<% end -%>
-</tbody>
-</table>
-<% end -%>
-
-<%= context_menu time_entries_context_menu_path %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/timelog/bulk_edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/timelog/bulk_edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,49 @@
+<h2><%= l(:label_bulk_edit_selected_time_entries) %></h2>
+
+<ul><%= @time_entries.collect {|i| content_tag('li', link_to(h("#{i.spent_on.strftime("%Y-%m-%d")} -- #{i.project}:  #{l(:label_f_hour_plural, :value => i.hours)}"), { :action => 'edit', :id => i }))} %></ul>
+
+<% form_tag(:action => 'bulk_update') do %>
+<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
+<div class="box tabular">
+  <fieldset class="attributes">
+  <legend><%= l(:label_change_properties) %></legend>
+  <div>
+    <p>
+      <label><%= l(:field_issue) %></label>
+      <%= text_field :time_entry, :issue_id, :size => 6 %>
+    </p>
+
+    <p>
+      <label><%= l(:field_spent_on) %></label>
+      <%= text_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %>
+    </p>
+
+    <p>
+      <label><%= l(:field_hours) %></label>
+      <%= text_field :time_entry, :hours, :size => 6 %>
+    </p>
+
+    <% if @available_activities.any? %>
+    <p>
+      <label><%= l(:field_activity) %></label>
+      <%= select_tag('time_entry[activity_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_activities, :id, :name)) %>
+    </p>
+    <% end %>
+
+    <p>
+      <label><%= l(:field_comments) %></label>
+      <%= text_field(:time_entry, :comments, :size => 100) %>
+    </p>
+
+    <% @custom_fields.each do |custom_field| %>
+      <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('time_entry', custom_field, @projects) %></p>
+    <% end %>
+
+    <%= call_hook(:view_time_entries_bulk_edit_details_bottom, { :time_entries => @time_entries }) %>
+  </div>
+
+  </fieldset>
+</div>
+
+<p><%= submit_tag l(:button_submit) %></p>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/timelog/bulk_edit.rhtml
--- a/app/views/timelog/bulk_edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<h2><%= l(:label_bulk_edit_selected_time_entries) %></h2>
-
-<ul><%= @time_entries.collect {|i| content_tag('li', link_to(h("#{i.spent_on.strftime("%Y-%m-%d")} -- #{i.project}:  #{l(:label_f_hour_plural, :value => i.hours)}"), { :action => 'edit', :id => i }))} %></ul>
-
-<% form_tag(:action => 'bulk_update') do %>
-<%= @time_entries.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
-<div class="box tabular">
-  <fieldset class="attributes">
-  <legend><%= l(:label_change_properties) %></legend>
-  <div>
-    <p>
-      <label><%= l(:field_issue) %></label>
-      <%= text_field :time_entry, :issue_id, :size => 6 %>
-    </p>
-
-    <p>
-      <label><%= l(:field_spent_on) %></label>
-      <%= text_field :time_entry, :spent_on, :size => 10 %><%= calendar_for('time_entry_spent_on') %>
-    </p>
-
-    <p>
-      <label><%= l(:field_hours) %></label>
-      <%= text_field :time_entry, :hours, :size => 6 %>
-    </p>
-
-    <% if @available_activities.any? %>
-    <p>
-      <label><%= l(:field_activity) %></label>
-      <%= select_tag('time_entry[activity_id]', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_activities, :id, :name)) %>
-    </p>
-    <% end %>
-
-    <p>
-      <label><%= l(:field_comments) %></label>
-      <%= text_field(:time_entry, :comments, :size => 100) %>
-    </p>
-
-    <% @custom_fields.each do |custom_field| %>
-      <p><label><%= h(custom_field.name) %></label> <%= custom_field_tag_for_bulk_edit('time_entry', custom_field, @projects) %></p>
-    <% end %>
-
-    <%= call_hook(:view_time_entries_bulk_edit_details_bottom, { :time_entries => @time_entries }) %>
-  </div>
-
-  </fieldset>
-</div>
-
-<p><%= submit_tag l(:button_submit) %></p>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/timelog/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/timelog/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,26 @@
+<h2><%= l(:label_spent_time) %></h2>
+
+<% labelled_tabular_form_for(:time_entry, @time_entry, :url => {
+                               :action => (@time_entry.new_record? ? 'create' : 'update'),
+                               :id => @time_entry,
+                               :project_id => @time_entry.project
+                             },
+                             :html => {:method => @time_entry.new_record? ? :post : :put}) do |f| %>
+<%= error_messages_for 'time_entry' %>
+<%= back_url_hidden_field_tag %>
+
+<div class="box">
+<p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
+<p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
+<p><%= f.text_field :hours, :size => 6, :required => true %></p>
+<p><%= f.text_field :comments, :size => 100 %></p>
+<p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
+<% @time_entry.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :time_entry, value %></p>
+<% end %>
+<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/timelog/edit.rhtml
--- a/app/views/timelog/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<h2><%= l(:label_spent_time) %></h2>
-
-<% labelled_tabular_form_for(:time_entry, @time_entry, :url => {
-                               :action => (@time_entry.new_record? ? 'create' : 'update'),
-                               :id => @time_entry,
-                               :project_id => @time_entry.project
-                             },
-                             :html => {:method => @time_entry.new_record? ? :post : :put}) do |f| %>
-<%= error_messages_for 'time_entry' %>
-<%= back_url_hidden_field_tag %>
-
-<div class="box">
-<p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>
-<p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
-<p><%= f.text_field :hours, :size => 6, :required => true %></p>
-<p><%= f.text_field :comments, :size => 100 %></p>
-<p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
-<% @time_entry.custom_field_values.each do |value| %>
-	<p><%= custom_field_tag_with_label :time_entry, value %></p>
-<% end %>
-<%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
-</div>
-
-<%= submit_tag l(:button_save) %>
-
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/trackers/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/trackers/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,41 @@
+<%= error_messages_for 'tracker' %>
+
+<div class="splitcontentleft">
+<div class="box tabular">
+<!--[form:tracker]-->
+<p><%= f.text_field :name, :required => true %></p>
+<p><%= f.check_box :is_in_roadmap %></p>
+
+<% if IssueCustomField.all.any? %>
+<p>
+	<label><%= l(:label_custom_field_plural) %></label>
+	<% IssueCustomField.all.each do |field| %>
+		<label class="block">
+			<%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.include?(field) %>
+			<%=h field.name %>
+		</label>
+	<% end %>
+</p>
+<%= hidden_field_tag 'tracker[custom_field_ids][]', '' %>
+<% end %>
+
+<% if @tracker.new_record? && @trackers.any? %>
+<p><label><%= l(:label_copy_workflow_from) %></label>
+<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p>
+<% end %>
+<!--[eoform:tracker]-->
+</div>
+<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save) %>
+</div>
+
+<div class="splitcontentright">
+<% if @projects.any? %>
+<fieldset class="box" id="tracker_project_ids"><legend><%= l(:label_project_plural) %></legend>
+<%= project_nested_ul(@projects) do |p|
+  content_tag('label', check_box_tag('tracker[project_ids][]', p.id, @tracker.projects.include?(p), :id => nil) + ' ' + h(p))
+end %>
+<%= hidden_field_tag('tracker[project_ids][]', '', :id => nil) %>
+<p><%= check_all_links 'tracker_project_ids' %></p>
+</fieldset>
+<% end %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/trackers/_form.rhtml
--- a/app/views/trackers/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-<%= error_messages_for 'tracker' %>
-
-<div class="splitcontentleft">
-<div class="box tabular">
-<!--[form:tracker]-->
-<p><%= f.text_field :name, :required => true %></p>
-<p><%= f.check_box :is_in_roadmap %></p>
-
-<% if IssueCustomField.all.any? %>
-<p>
-	<label><%= l(:label_custom_field_plural) %></label>
-	<% IssueCustomField.all.each do |field| %>
-		<label class="block">
-			<%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.include?(field) %>
-			<%=h field.name %>
-		</label>
-	<% end %>
-</p>
-<%= hidden_field_tag 'tracker[custom_field_ids][]', '' %>
-<% end %>
-
-<% if @tracker.new_record? && @trackers.any? %>
-<p><label><%= l(:label_copy_workflow_from) %></label>
-<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p>
-<% end %>
-<!--[eoform:tracker]-->
-</div>
-<%= submit_tag l(@tracker.new_record? ? :button_create : :button_save) %>
-</div>
-
-<div class="splitcontentright">
-<% if @projects.any? %>
-<fieldset class="box" id="tracker_project_ids"><legend><%= l(:label_project_plural) %></legend>
-<%= project_nested_ul(@projects) do |p|
-  content_tag('label', check_box_tag('tracker[project_ids][]', p.id, @tracker.projects.include?(p), :id => nil) + ' ' + h(p))
-end %>
-<%= hidden_field_tag('tracker[project_ids][]', '', :id => nil) %>
-<p><%= check_all_links 'tracker_project_ids' %></p>
-</fieldset>
-<% end %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/trackers/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/trackers/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> &#187; <%=h @tracker %></h2>
+
+<% form_for :tracker, @tracker, :url => { :action => 'edit' }, :builder => TabularFormBuilder do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/trackers/edit.rhtml
--- a/app/views/trackers/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> &#187; <%=h @tracker %></h2>
-
-<% form_for :tracker, @tracker, :url => { :action => 'edit' }, :builder => TabularFormBuilder do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/trackers/new.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/trackers/new.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> &#187; <%=l(:label_tracker_new)%></h2>
+
+<% form_for :tracker, @tracker, :url => { :action => 'new' }, :builder => TabularFormBuilder do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/trackers/new.rhtml
--- a/app/views/trackers/new.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<h2><%= link_to l(:label_tracker_plural), :controller => 'trackers', :action => 'index' %> &#187; <%=l(:label_tracker_new)%></h2>
-
-<% form_for :tracker, @tracker, :url => { :action => 'new' }, :builder => TabularFormBuilder do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/users/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,51 @@
+<%= error_messages_for 'user' %>
+
+<div id="user_form">
+<!--[form:user]-->
+<div class="splitcontentleft">
+<h3><%=l(:label_information_plural)%></h3>
+<div class="box tabular">
+<p><%= f.text_field :login, :required => true, :size => 25  %></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>
+<% if Setting.openid? %>
+<p><%= f.text_field :identity_url  %></p>
+<% end %>
+
+<% @user.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :user, value %></p>
+<% end %>
+
+<p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
+<%= call_hook(:view_users_form, :user => @user, :form => f) %>
+</div>
+
+<h3><%=l(:label_authentication)%></h3>
+<div class="box tabular">
+<% unless @auth_sources.empty? %>
+<p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
+<% end %>
+<div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
+<p><%= f.password_field :password, :required => true, :size => 25  %><br />
+<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
+<p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
+</div>
+</div>
+</div>
+
+<div class="splitcontentright">
+<h3><%=l(:field_mail_notification)%></h3>
+<div class="box">
+<%= render :partial => 'users/mail_notifications' %>
+</div>
+
+<h3><%=l(:label_preferences)%></h3>
+<div class="box tabular">
+<%= render :partial => 'users/preferences' %>
+</div>
+</div>
+</div>
+<div style="clear:left;"></div>
+<!--[eoform:user]-->
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/_form.rhtml
--- a/app/views/users/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-<%= error_messages_for 'user' %>
-
-<div id="user_form">
-<!--[form:user]-->
-<div class="splitcontentleft">
-<h3><%=l(:label_information_plural)%></h3>
-<div class="box tabular">
-<p><%= f.text_field :login, :required => true, :size => 25  %></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>
-<% if Setting.openid? %>
-<p><%= f.text_field :identity_url  %></p>
-<% end %>
-
-<% @user.custom_field_values.each do |value| %>
-	<p><%= custom_field_tag_with_label :user, value %></p>
-<% end %>
-
-<p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
-<%= call_hook(:view_users_form, :user => @user, :form => f) %>
-</div>
-
-<h3><%=l(:label_authentication)%></h3>
-<div class="box tabular">
-<% unless @auth_sources.empty? %>
-<p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
-<% end %>
-<div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
-<p><%= f.password_field :password, :required => true, :size => 25  %><br />
-<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
-<p><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
-</div>
-</div>
-</div>
-
-<div class="splitcontentright">
-<h3><%=l(:field_mail_notification)%></h3>
-<div class="box">
-<%= render :partial => 'users/mail_notifications' %>
-</div>
-
-<h3><%=l(:label_preferences)%></h3>
-<div class="box tabular">
-<%= render :partial => 'users/preferences' %>
-</div>
-</div>
-</div>
-<div style="clear:left;"></div>
-<!--[eoform:user]-->
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/_general.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/users/_general.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,7 @@
+<% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "update", :tab => nil }, :html => { :method => :put, :class => nil } do |f| %>
+	<%= render :partial => 'form', :locals => { :f => f } %>
+	<% if @user.active? -%>
+		<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
+	<% end -%>
+	<p><%= submit_tag l(:button_save) %></p>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/_general.rhtml
--- a/app/views/users/_general.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<% labelled_tabular_form_for :user, @user, :url => { :controller => 'users', :action => "update", :tab => nil }, :html => { :method => :put, :class => nil } do |f| %>
-	<%= render :partial => 'form', :locals => { :f => f } %>
-	<% if @user.active? -%>
-		<p><label><%= check_box_tag 'send_information', 1, true %> <%= l(:label_send_information) %></label></p>
-	<% end -%>
-	<p><%= submit_tag l(:button_save) %></p>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/_groups.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/users/_groups.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,9 @@
+<% form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %>
+<div class="box">
+<% Group.all.sort.each do |group| %>
+<label><%= check_box_tag 'user[group_ids][]', group.id, @user.groups.include?(group) %> <%=h group %></label><br />
+<% end %>
+<%= hidden_field_tag 'user[group_ids][]', '' %>
+</div>
+<%= submit_tag l(:button_save) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/_groups.rhtml
--- a/app/views/users/_groups.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<% form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %>
-<div class="box">
-<% Group.all.sort.each do |group| %>
-<label><%= check_box_tag 'user[group_ids][]', group.id, @user.groups.include?(group) %> <%=h group %></label><br />
-<% end %>
-<%= hidden_field_tag 'user[group_ids][]', '' %>
-</div>
-<%= submit_tag l(:button_save) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/_memberships.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/users/_memberships.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,62 @@
+<% roles = Role.find_all_givable %>
+<% projects = Project.active.find(:all, :order => 'lft') %>
+
+<div class="splitcontentleft">
+<% if @user.memberships.any? %>
+<table class="list memberships">
+	<thead><tr>
+	  <th><%= l(:label_project) %></th>
+	  <th><%= l(:label_role_plural) %></th>
+	  <th style="width:15%"></th>
+      <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
+	</tr></thead>
+	<tbody>
+	<% @user.memberships.each do |membership| %>
+	<% next if membership.new_record? %>
+	<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
+  <td class="project">
+    <%= link_to_project membership.project %>
+  </td>
+  <td class="roles">
+    <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
+    <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user, :membership_id => membership },
+      														  :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
+      	<p><% roles.each do |role| %>
+        <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
+        																									 :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
+        <% end %></p>
+        <%= hidden_field_tag 'membership[role_ids][]', '' %>
+        <p><%= submit_tag l(:button_change) %>
+        <%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;" %></p>
+    <% end %>
+  </td>
+  <td class="buttons">
+      <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
+      <%= link_to_remote(l(:button_delete), { :url => { :controller => 'users', :action => 'destroy_membership', :id => @user, :membership_id => membership },
+      																				:method => :post },
+      																		    :class => 'icon icon-del') if membership.deletable? %>
+  </td>
+      <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
+	</tr>
+  <% end; reset_cycle %>
+	</tbody>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
+</div>
+
+<div class="splitcontentright">
+<% if projects.any? %>
+<fieldset><legend><%=l(:label_project_new)%></legend>
+<% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user }) do %>
+<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
+<p><%= l(:label_role_plural) %>:
+<% roles.each do |role| %>
+  <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
+<% end %></p>
+<p><%= submit_tag l(:button_add) %></p>
+<% end %>
+</fieldset>
+<% end %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/_memberships.rhtml
--- a/app/views/users/_memberships.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-<% roles = Role.find_all_givable %>
-<% projects = Project.active.find(:all, :order => 'lft') %>
-
-<div class="splitcontentleft">
-<% if @user.memberships.any? %>
-<table class="list memberships">
-	<thead><tr>
-	  <th><%= l(:label_project) %></th>
-	  <th><%= l(:label_role_plural) %></th>
-	  <th style="width:15%"></th>
-      <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
-	</tr></thead>
-	<tbody>
-	<% @user.memberships.each do |membership| %>
-	<% next if membership.new_record? %>
-	<tr id="member-<%= membership.id %>" class="<%= cycle 'odd', 'even' %> class">
-  <td class="project">
-    <%= link_to_project membership.project %>
-  </td>
-  <td class="roles">
-    <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
-    <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user, :membership_id => membership },
-      														  :html => { :id => "member-#{membership.id}-roles-form", :style => 'display:none;'}) do %>
-      	<p><% roles.each do |role| %>
-        <label><%= check_box_tag 'membership[role_ids][]', role.id, membership.roles.include?(role),
-        																									 :disabled => membership.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
-        <% end %></p>
-        <%= hidden_field_tag 'membership[role_ids][]', '' %>
-        <p><%= submit_tag l(:button_change) %>
-        <%= link_to_function l(:button_cancel), "$('member-#{membership.id}-roles').show(); $('member-#{membership.id}-roles-form').hide(); return false;" %></p>
-    <% end %>
-  </td>
-  <td class="buttons">
-      <%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
-      <%= link_to_remote(l(:button_delete), { :url => { :controller => 'users', :action => 'destroy_membership', :id => @user, :membership_id => membership },
-      																				:method => :post },
-      																		    :class => 'icon icon-del') if membership.deletable? %>
-  </td>
-      <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
-	</tr>
-  <% end; reset_cycle %>
-	</tbody>
-</table>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-</div>
-
-<div class="splitcontentright">
-<% if projects.any? %>
-<fieldset><legend><%=l(:label_project_new)%></legend>
-<% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @user }) do %>
-<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %>
-<p><%= l(:label_role_plural) %>:
-<% roles.each do |role| %>
-  <label><%= check_box_tag 'membership[role_ids][]', role.id %> <%=h role %></label>
-<% end %></p>
-<p><%= submit_tag l(:button_add) %></p>
-<% end %>
-</fieldset>
-<% end %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/users/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,11 @@
+<div class="contextual">
+<%= link_to l(:label_profile), user_path(@user), :class => 'icon icon-user' %>
+<%= change_status_link(@user) %>
+<%= link_to(l(:button_delete), @user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') if User.current != @user %>
+</div>
+
+<h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> &#187; <%=h @user.login %></h2>
+
+<%= render_tabs user_settings_tabs %>
+
+<% html_title(l(:label_user), @user.login, l(:label_administration)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/edit.rhtml
--- a/app/views/users/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<div class="contextual">
-<%= link_to l(:label_profile), user_path(@user), :class => 'icon icon-user' %>
-<%= change_status_link(@user) %>
-<%= link_to(l(:button_delete), @user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') if User.current != @user %>
-</div>
-
-<h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> &#187; <%=h @user.login %></h2>
-
-<%= render_tabs user_settings_tabs %>
-
-<% html_title(l(:label_user), @user.login, l(:label_administration)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/users/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,58 @@
+<div class="contextual">
+<%= link_to l(:label_user_new), {:action => 'new'}, :class => 'icon icon-add' %>
+</div>
+
+<h2><%=l(:label_user_plural)%></h2>
+
+<% form_tag({}, :method => :get) do %>
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
+<label><%= l(:field_status) %>:</label>
+<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+
+<% if @groups.present? %>
+<label><%= l(:label_group) %>:</label>
+<%= select_tag 'group_id', '<option></option>' + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
+<% end %>
+
+<label><%= l(:label_user) %>:</label>
+<%= text_field_tag 'name', params[:name], :size => 30 %>
+<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+<%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
+</fieldset>
+<% end %>
+&nbsp;
+
+<div class="autoscroll">
+<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)) %>
+	<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
+	<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
+	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
+	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
+    <th></th>
+  </tr></thead>
+  <tbody>
+<% for user in @users -%>
+  <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
+	<td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
+	<td class="firstname"><%= h(user.firstname) %></td>
+	<td class="lastname"><%= h(user.lastname) %></td>
+	<td class="email"><%= mail_to(h(user.mail)) %></td>
+	<td align="center"><%= checked_image user.admin? %></td>
+	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
+	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+    <td class="buttons">
+    	<%= change_status_link(user) %>
+    	<%= link_to(l(:button_delete), user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == user %>
+    </td>
+  </tr>
+<% end -%>
+  </tbody>
+</table>
+</div>
+<p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
+
+<% html_title(l(:label_user_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/index.rhtml
--- a/app/views/users/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-<div class="contextual">
-<%= link_to l(:label_user_new), {:action => 'new'}, :class => 'icon icon-add' %>
-</div>
-
-<h2><%=l(:label_user_plural)%></h2>
-
-<% form_tag({}, :method => :get) do %>
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
-<label><%= l(:field_status) %>:</label>
-<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
-
-<% if @groups.present? %>
-<label><%= l(:label_group) %>:</label>
-<%= select_tag 'group_id', '<option></option>' + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
-<% end %>
-
-<label><%= l(:label_user) %>:</label>
-<%= text_field_tag 'name', params[:name], :size => 30 %>
-<%= submit_tag l(:button_apply), :class => "small", :name => nil %>
-<%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
-</fieldset>
-<% end %>
-&nbsp;
-
-<div class="autoscroll">
-<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)) %>
-	<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
-	<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
-	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
-	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
-    <th></th>
-  </tr></thead>
-  <tbody>
-<% for user in @users -%>
-  <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
-	<td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
-	<td class="firstname"><%= h(user.firstname) %></td>
-	<td class="lastname"><%= h(user.lastname) %></td>
-	<td class="email"><%= mail_to(h(user.mail)) %></td>
-	<td align="center"><%= checked_image user.admin? %></td>
-	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
-	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-    <td class="buttons">
-    	<%= change_status_link(user) %>
-    	<%= link_to(l(:button_delete), user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == user %>
-    </td>
-  </tr>
-<% end -%>
-  </tbody>
-</table>
-</div>
-<p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
-
-<% html_title(l(:label_user_plural)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/users/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,70 @@
+<div class="contextual">
+<%= link_to(l(:button_edit), edit_user_path(@user), :class => 'icon icon-edit') if User.current.admin? %>
+</div>
+
+<h2><%= avatar @user, :size => "50" %> <%=h @user.name %></h2>
+
+<div class="splitcontentleft">
+<ul>
+	<% unless @user.pref.hide_mail %>
+		<li><%=l(:field_mail)%>: <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></li>
+	<% end %>
+	<% @user.visible_custom_field_values.each do |custom_value| %>
+	<% if !custom_value.value.blank? %>
+    <li><%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
+	<% end %>
+	<% end %>
+    <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
+	<% unless @user.last_login_on.nil? %>
+		<li><%=l(:field_last_login_on)%>: <%= format_date(@user.last_login_on) %></li>
+	<% end %>
+</ul>
+
+<% unless @memberships.empty? %>
+<h3><%=l(:label_project_plural)%></h3>
+<ul>
+<% for membership in @memberships %>
+	<li><%= link_to_project(membership.project) %>
+    (<%=h membership.roles.sort.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)</li>
+<% end %>
+</ul>
+<% end %>
+<%= call_hook :view_account_left_bottom, :user => @user %>
+</div>
+
+<div class="splitcontentright">
+
+<% unless @events_by_day.empty? %>
+<h3><%= link_to l(:label_activity), :controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %></h3>
+
+<p>
+<%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
+</p>
+
+<div id="activity">
+<% @events_by_day.keys.sort.reverse.each do |day| %>
+<h4><%= format_activity_day(day) %></h4>
+<dl>
+<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
+  <dt class="<%= e.event_type %>">
+  <span class="time"><%= format_time(e.event_datetime, false) %></span>
+  <%= content_tag('span', h(e.project), :class => 'project') %>
+  <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
+  <dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd>
+<% end -%>
+</dl>
+<% end -%>
+</div>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
+<% end %>
+
+<% content_for :header_tags do %>
+		<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
+<% end %>
+<% end %>
+<%= call_hook :view_account_right_bottom, :user => @user %>
+</div>
+
+<% html_title @user.name %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/users/show.rhtml
--- a/app/views/users/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-<div class="contextual">
-<%= link_to(l(:button_edit), edit_user_path(@user), :class => 'icon icon-edit') if User.current.admin? %>
-</div>
-
-<h2><%= avatar @user, :size => "50" %> <%=h @user.name %></h2>
-
-<div class="splitcontentleft">
-<ul>
-	<% unless @user.pref.hide_mail %>
-		<li><%=l(:field_mail)%>: <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></li>
-	<% end %>
-	<% @user.visible_custom_field_values.each do |custom_value| %>
-	<% if !custom_value.value.blank? %>
-    <li><%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
-	<% end %>
-	<% end %>
-    <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
-	<% unless @user.last_login_on.nil? %>
-		<li><%=l(:field_last_login_on)%>: <%= format_date(@user.last_login_on) %></li>
-	<% end %>
-</ul>
-
-<% unless @memberships.empty? %>
-<h3><%=l(:label_project_plural)%></h3>
-<ul>
-<% for membership in @memberships %>
-	<li><%= link_to_project(membership.project) %>
-    (<%=h membership.roles.sort.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)</li>
-<% end %>
-</ul>
-<% end %>
-<%= call_hook :view_account_left_bottom, :user => @user %>
-</div>
-
-<div class="splitcontentright">
-
-<% unless @events_by_day.empty? %>
-<h3><%= link_to l(:label_activity), :controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :from => @events_by_day.keys.first %></h3>
-
-<p>
-<%=l(:label_reported_issues)%>: <%= Issue.count(:conditions => ["author_id=?", @user.id]) %>
-</p>
-
-<div id="activity">
-<% @events_by_day.keys.sort.reverse.each do |day| %>
-<h4><%= format_activity_day(day) %></h4>
-<dl>
-<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-  <dt class="<%= e.event_type %>">
-  <span class="time"><%= format_time(e.event_datetime, false) %></span>
-  <%= content_tag('span', h(e.project), :class => 'project') %>
-  <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
-  <dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd>
-<% end -%>
-</dl>
-<% end -%>
-</div>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:controller => 'activities', :action => 'index', :id => nil, :user_id => @user, :key => User.current.rss_key} %>
-<% end %>
-
-<% content_for :header_tags do %>
-		<%= auto_discovery_link_tag(:atom, :controller => 'activities', :action => 'index', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
-<% end %>
-<% end %>
-<%= call_hook :view_account_right_bottom, :user => @user %>
-</div>
-
-<% html_title @user.name %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/_form.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/versions/_form.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,15 @@
+<%= error_messages_for 'version' %>
+
+<div class="box">
+<p><%= f.text_field :name, :size => 60, :required => true %></p>
+<p><%= f.text_field :description, :size => 60 %></p>
+<p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
+<p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
+<p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
+<p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
+
+<% @version.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :version, value %></p>
+<% end %>
+
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/_form.rhtml
--- a/app/views/versions/_form.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-<%= error_messages_for 'version' %>
-
-<div class="box">
-<p><%= f.text_field :name, :size => 60, :required => true %></p>
-<p><%= f.text_field :description, :size => 60 %></p>
-<p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
-<p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
-<p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
-<p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
-
-<% @version.custom_field_values.each do |value| %>
-	<p><%= custom_field_tag_with_label :version, value %></p>
-<% end %>
-
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/_issue_counts.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/versions/_issue_counts.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,35 @@
+<form id="status_by_form">
+<fieldset>
+<legend>
+<%= l(:label_issues_by, 
+       select_tag('status_by',
+                   status_by_options_for_select(criteria),
+                   :id => 'status_by_select',
+                   :onchange => remote_function(:url => status_by_project_version_path(version.project, version),
+                                                :with => "Form.serialize('status_by_form')"))) %>
+</legend>
+<% if counts.empty? %>
+    <p><em><%= l(:label_no_data) %></em></p>
+<% else %>
+    <table>
+    <% counts.each do |count| %>
+    <tr>
+        <td width="130px" align="right" >
+            <%= link_to count[:group], {:controller => 'issues', 
+                                        :action => 'index',
+                                        :project_id => version.project,
+                                        :set_filter => 1,
+                                        :status_id => '*',
+                                        :fixed_version_id => version}.merge("#{criteria}_id".to_sym => count[:group]) %>
+        </td>
+        <td width="240px">
+            <%= progress_bar((count[:closed].to_f / count[:total])*100, 
+                  :legend => "#{count[:closed]}/#{count[:total]}",
+                  :width => "#{(count[:total].to_f / max * 200).floor}px;") %>
+        </td>
+    </tr>
+    <% end %>
+    </table>
+<% end %>
+</fieldset>
+</form>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/_issue_counts.rhtml
--- a/app/views/versions/_issue_counts.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<form id="status_by_form">
-<fieldset>
-<legend>
-<%= l(:label_issues_by, 
-       select_tag('status_by',
-                   status_by_options_for_select(criteria),
-                   :id => 'status_by_select',
-                   :onchange => remote_function(:url => status_by_project_version_path(version.project, version),
-                                                :with => "Form.serialize('status_by_form')"))) %>
-</legend>
-<% if counts.empty? %>
-    <p><em><%= l(:label_no_data) %></em></p>
-<% else %>
-    <table>
-    <% counts.each do |count| %>
-    <tr>
-        <td width="130px" align="right" >
-            <%= link_to count[:group], {:controller => 'issues', 
-                                        :action => 'index',
-                                        :project_id => version.project,
-                                        :set_filter => 1,
-                                        :status_id => '*',
-                                        :fixed_version_id => version}.merge("#{criteria}_id".to_sym => count[:group]) %>
-        </td>
-        <td width="240px">
-            <%= progress_bar((count[:closed].to_f / count[:total])*100, 
-                  :legend => "#{count[:closed]}/#{count[:total]}",
-                  :width => "#{(count[:total].to_f / max * 200).floor}px;") %>
-        </td>
-    </tr>
-    <% end %>
-    </table>
-<% end %>
-</fieldset>
-</form>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/_overview.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/versions/_overview.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,27 @@
+<% if version.completed? %>
+  <p><%= format_date(version.effective_date) %></p>
+<% elsif version.effective_date %>
+  <p><strong><%= due_date_distance_in_words(version.effective_date) %></strong> (<%= format_date(version.effective_date) %>)</p>
+<% end %>
+
+<p><%=h version.description %></p>
+<ul>
+	<% version.custom_values.each do |custom_value| %>
+		<% if !custom_value.value.blank? %>
+		   <li><%=h custom_value.custom_field.name %>: <%=h show_value(custom_value) %></li>
+		<% end %>
+	<% end %>
+</ul>
+
+<% if version.fixed_issues.count > 0 %>
+    <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
+    <p class="progress-info">
+        <%= link_to_if(version.closed_issues_count > 0, l(:label_x_closed_issues_abbr, :count => version.closed_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
+        (<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)
+        &#160;
+        <%= link_to_if(version.open_issues_count > 0, l(:label_x_open_issues_abbr, :count => version.open_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
+        (<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)
+    </p>
+<% else %>
+    <p><em><%= l(:label_roadmap_no_issues) %></em></p>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/_overview.rhtml
--- a/app/views/versions/_overview.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-<% if version.completed? %>
-  <p><%= format_date(version.effective_date) %></p>
-<% elsif version.effective_date %>
-  <p><strong><%= due_date_distance_in_words(version.effective_date) %></strong> (<%= format_date(version.effective_date) %>)</p>
-<% end %>
-
-<p><%=h version.description %></p>
-<ul>
-	<% version.custom_values.each do |custom_value| %>
-		<% if !custom_value.value.blank? %>
-		   <li><%=h custom_value.custom_field.name %>: <%=h show_value(custom_value) %></li>
-		<% end %>
-	<% end %>
-</ul>
-
-<% if version.fixed_issues.count > 0 %>
-    <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
-    <p class="progress-info">
-        <%= link_to_if(version.closed_issues_count > 0, l(:label_x_closed_issues_abbr, :count => version.closed_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
-        (<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)
-        &#160;
-        <%= link_to_if(version.open_issues_count > 0, l(:label_x_open_issues_abbr, :count => version.open_issues_count), :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
-        (<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)
-    </p>
-<% else %>
-    <p><em><%= l(:label_roadmap_no_issues) %></em></p>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/versions/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,7 @@
+<h2><%=l(:label_version)%></h2>
+
+<% labelled_tabular_form_for :version, @version, :url => project_version_path(@project, @version), :html => {:method => :put} do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<% end %>
+
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/edit.rhtml
--- a/app/views/versions/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<h2><%=l(:label_version)%></h2>
-
-<% labelled_tabular_form_for :version, @version, :url => project_version_path(@project, @version), :html => {:method => :put} do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<% end %>
-
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/versions/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,54 @@
+<div class="contextual">
+<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
+<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %>
+<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
+</div>
+
+<h2><%= h(@version.name) %></h2>
+
+<div id="roadmap">
+<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
+<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
+
+<div id="version-summary">
+<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
+<fieldset><legend><%= l(:label_time_tracking) %></legend>
+<table>
+<tr>
+    <td width="130px" align="right"><%= l(:field_estimated_hours) %></td>
+    <td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(l_hours(@version.estimated_hours)) %></td>
+</tr>
+<% if User.current.allowed_to?(:view_time_entries, @project) %>
+<tr>
+    <td width="130px" align="right"><%= l(:label_spent_time) %></td>
+    <td width="240px" class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td>
+</tr>
+<% end %>
+</table>
+</fieldset>
+<% end %>
+
+<div id="status_by">
+<%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
+</div>
+</div>
+
+<% if @issues.present? %>
+<% form_tag({}) do -%>
+  <table class="list related-issues">
+  <caption><%= l(:label_related_issues) %></caption>
+  <%- @issues.each do |issue| -%>
+    <tr class="hascontextmenu">
+      <td class="checkbox"><%= check_box_tag 'ids[]', issue.id %></td>
+      <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
+    </tr>
+  <% end %>
+  </table>
+<% end %>
+<%= context_menu issues_context_menu_path %>
+<% end %>
+</div>
+
+<%= call_hook :view_versions_show_bottom, :version => @version %>
+
+<% html_title @version.name %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/versions/show.rhtml
--- a/app/views/versions/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-<div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
-<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %>
-<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
-</div>
-
-<h2><%= h(@version.name) %></h2>
-
-<div id="roadmap">
-<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
-<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
-
-<div id="version-summary">
-<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
-<fieldset><legend><%= l(:label_time_tracking) %></legend>
-<table>
-<tr>
-    <td width="130px" align="right"><%= l(:field_estimated_hours) %></td>
-    <td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(l_hours(@version.estimated_hours)) %></td>
-</tr>
-<% if User.current.allowed_to?(:view_time_entries, @project) %>
-<tr>
-    <td width="130px" align="right"><%= l(:label_spent_time) %></td>
-    <td width="240px" class="total-hours"><%= html_hours(l_hours(@version.spent_hours)) %></td>
-</tr>
-<% end %>
-</table>
-</fieldset>
-<% end %>
-
-<div id="status_by">
-<%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
-</div>
-</div>
-
-<% if @issues.present? %>
-<% form_tag({}) do -%>
-  <table class="list related-issues">
-  <caption><%= l(:label_related_issues) %></caption>
-  <%- @issues.each do |issue| -%>
-    <tr class="hascontextmenu">
-      <td class="checkbox"><%= check_box_tag 'ids[]', issue.id %></td>
-      <td><%= link_to_issue(issue, :project => (@project != issue.project)) %></td>
-    </tr>
-  <% end %>
-  </table>
-<% end %>
-<%= context_menu issues_context_menu_path %>
-<% end %>
-</div>
-
-<%= call_hook :view_versions_show_bottom, :version => @version %>
-
-<% html_title @version.name %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/watchers/_watchers.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/watchers/_watchers.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,26 @@
+<div class="contextual">
+<%= link_to_remote l(:button_add), 
+                   :url => {:controller => 'watchers',
+                            :action => 'new',
+                            :object_type => watched.class.name.underscore,
+                            :object_id => watched} if User.current.allowed_to?(:add_issue_watchers, @project) %>
+</div>
+
+<h3><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</h3>
+
+<% unless @watcher.nil? %>
+	<% remote_form_for(:watcher, @watcher, 
+                	   :url => {:controller => 'watchers',
+              	              :action => 'new',
+            	                :object_type => watched.class.name.underscore,
+         	                    :object_id => watched},
+       	             :method => :post,
+      	             :html => {:id => 'new-watcher-form'}) do |f| %>
+		<p><%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
+
+		<%= submit_tag l(:button_add) %>
+		<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
+	<% end %>
+<% end %>
+
+<%= watchers_list(watched) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/watchers/_watchers.rhtml
--- a/app/views/watchers/_watchers.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<div class="contextual">
-<%= link_to_remote l(:button_add), 
-                   :url => {:controller => 'watchers',
-                            :action => 'new',
-                            :object_type => watched.class.name.underscore,
-                            :object_id => watched} if User.current.allowed_to?(:add_issue_watchers, @project) %>
-</div>
-
-<h3><%= l(:label_issue_watchers) %> (<%= watched.watcher_users.size %>)</h3>
-
-<% unless @watcher.nil? %>
-	<% remote_form_for(:watcher, @watcher, 
-                	   :url => {:controller => 'watchers',
-              	              :action => 'new',
-            	                :object_type => watched.class.name.underscore,
-         	                    :object_id => watched},
-       	             :method => :post,
-      	             :html => {:id => 'new-watcher-form'}) do |f| %>
-		<p><%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
-
-		<%= submit_tag l(:button_add) %>
-		<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
-	<% end %>
-<% end %>
-
-<%= watchers_list(watched) %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/welcome/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/welcome/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,40 @@
+<h2><%= l(:label_home) %></h2>
+
+<div class="splitcontentleft">
+  <%= textilizable Setting.welcome_text %>
+  <% if @news.any? %>
+  <div class="news box">
+	<h3><%=l(:label_news_latest)%></h3>
+		<%= render :partial => 'news/news', :collection => @news %>
+		<%= link_to l(:label_news_view_all), :controller => 'news' %>
+  </div>
+  <% end %>
+  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
+</div>
+
+<div class="splitcontentright">
+    <% if @projects.any? %>
+	<div class="projects box">
+	<h3><%=l(:label_project_latest)%></h3>
+		<ul>
+		<% for project in @projects %>
+		  <% @project = project %>
+			<li>
+			<%= link_to_project project %> (<%= format_time(project.created_on) %>)
+			<%= textilizable project.short_description, :project => project %>
+			</li>
+		<% end %>
+    <% @project = nil %>
+		</ul>
+	</div>
+	<% end %>
+    <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
+</div>	
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag 'scm' %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+                                   :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+                                   :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/welcome/index.rhtml
--- a/app/views/welcome/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<h2><%= l(:label_home) %></h2>
-
-<div class="splitcontentleft">
-  <%= textilizable Setting.welcome_text %>
-  <% if @news.any? %>
-  <div class="news box">
-	<h3><%=l(:label_news_latest)%></h3>
-		<%= render :partial => 'news/news', :collection => @news %>
-		<%= link_to l(:label_news_view_all), :controller => 'news' %>
-  </div>
-  <% end %>
-  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
-</div>
-
-<div class="splitcontentright">
-    <% if @projects.any? %>
-	<div class="projects box">
-	<h3><%=l(:label_project_latest)%></h3>
-		<ul>
-		<% for project in @projects %>
-		  <% @project = project %>
-			<li>
-			<%= link_to_project project %> (<%= format_time(project.created_on) %>)
-			<%= textilizable project.short_description, :project => project %>
-			</li>
-		<% end %>
-    <% @project = nil %>
-		</ul>
-	</div>
-	<% end %>
-    <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
-</div>	
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag 'scm' %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
-                                   :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'activities', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
-                                   :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/welcome/robots.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/welcome/robots.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,9 @@
+User-agent: *
+<% @projects.each do |p| -%>
+Disallow: /projects/<%= p.to_param %>/repository
+Disallow: /projects/<%= p.to_param %>/issues
+Disallow: /projects/<%= p.to_param %>/activity
+<% end -%>
+Disallow: /issues/gantt
+Disallow: /issues/calendar
+Disallow: /activity
diff -r df51e8ff578d -r c6c2cbd0afee app/views/welcome/robots.rhtml
--- a/app/views/welcome/robots.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-User-agent: *
-<% @projects.each do |p| -%>
-Disallow: /projects/<%= p.to_param %>/repository
-Disallow: /projects/<%= p.to_param %>/issues
-Disallow: /projects/<%= p.to_param %>/activity
-<% end -%>
-Disallow: /issues/gantt
-Disallow: /issues/calendar
-Disallow: /activity
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/_content.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/_content.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,3 @@
+<div class="wiki">
+  <%= textilizable content, :text, :attachments => content.page.attachments %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/_content.rhtml
--- a/app/views/wiki/_content.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<div class="wiki">
-  <%= textilizable content, :text, :attachments => content.page.attachments %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/_sidebar.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/_sidebar.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,9 @@
+<% if @wiki && @wiki.sidebar -%>
+  <%= textilizable @wiki.sidebar.content, :text %>
+<% end -%>
+
+<h3><%= l(:label_wiki) %></h3>
+
+<%= link_to l(:field_start_page), {:action => 'show', :id => nil} %><br />
+<%= link_to l(:label_index_by_title), {:action => 'index'} %><br />
+<%= link_to l(:label_index_by_date), {:action => 'date_index'} %><br />
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/_sidebar.rhtml
--- a/app/views/wiki/_sidebar.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<% if @wiki && @wiki.sidebar -%>
-  <%= textilizable @wiki.sidebar.content, :text %>
-<% end -%>
-
-<h3><%= l(:label_wiki) %></h3>
-
-<%= link_to l(:field_start_page), {:action => 'show', :id => nil} %><br />
-<%= link_to l(:label_index_by_title), {:action => 'index'} %><br />
-<%= link_to l(:label_index_by_date), {:action => 'date_index'} %><br />
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/annotate.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/annotate.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,32 @@
+<div class="contextual">
+<%= link_to(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit') %>
+<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
+</div>
+
+<h2><%= @page.pretty_title %></h2>
+
+<p>
+<%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'show', :id => @page.title, :version => @annotate.content.version %>
+<em>(<%= @annotate.content.author ? @annotate.content.author.name : "anonyme" %>, <%= format_time(@annotate.content.updated_on) %>)</em>
+</p>
+
+<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
+
+<table class="filecontent annotate">
+<tbody>
+<% line_num = 1 %>
+<% @annotate.lines.each do |line| -%>
+<tr class="bloc-<%= colors[line[0]] %>">
+    <th class="line-num"><%= line_num %></th>
+    <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title, :version => line[0] %></td>
+    <td class="author"><%= h(line[1]) %></td>
+    <td class="line-code"><pre><%=h line[2] %></pre></td>
+</tr>
+<% line_num += 1 %>
+<% end -%>
+</tbody>
+</table>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag 'scm' %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/annotate.rhtml
--- a/app/views/wiki/annotate.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<div class="contextual">
-<%= link_to(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit') %>
-<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
-</div>
-
-<h2><%= @page.pretty_title %></h2>
-
-<p>
-<%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'show', :id => @page.title, :version => @annotate.content.version %>
-<em>(<%= @annotate.content.author ? @annotate.content.author.name : "anonyme" %>, <%= format_time(@annotate.content.updated_on) %>)</em>
-</p>
-
-<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
-
-<table class="filecontent annotate">
-<tbody>
-<% line_num = 1 %>
-<% @annotate.lines.each do |line| -%>
-<tr class="bloc-<%= colors[line[0]] %>">
-    <th class="line-num"><%= line_num %></th>
-    <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title, :version => line[0] %></td>
-    <td class="author"><%= h(line[1]) %></td>
-    <td class="line-code"><pre><%=h line[2] %></pre></td>
-</tr>
-<% line_num += 1 %>
-<% end -%>
-</tbody>
-</table>
-
-<% content_for :header_tags do %>
-<%= stylesheet_link_tag 'scm' %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/destroy.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/destroy.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,19 @@
+<h2><%=h @page.pretty_title %></h2>
+
+<% form_tag({}, :method => :delete) do %>
+<div class="box">
+<p><strong><%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %></strong></p>
+<p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_wiki_page_nullify_children) %></label><br />
+<label><%= radio_button_tag 'todo', 'destroy', false %> <%= l(:text_wiki_page_destroy_children) %></label>
+<% if @reassignable_to.any? %>
+<br />
+<label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %></label>:
+<%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
+																 :onclick => "$('todo_reassign').checked = true;" %>
+<% end %>
+</p>
+</div>
+
+<%= submit_tag l(:button_apply) %>
+<%= link_to l(:button_cancel), :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/destroy.rhtml
--- a/app/views/wiki/destroy.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<h2><%=h @page.pretty_title %></h2>
-
-<% form_tag({}, :method => :delete) do %>
-<div class="box">
-<p><strong><%= l(:text_wiki_page_destroy_question, :descendants => @descendants_count) %></strong></p>
-<p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_wiki_page_nullify_children) %></label><br />
-<label><%= radio_button_tag 'todo', 'destroy', false %> <%= l(:text_wiki_page_destroy_children) %></label>
-<% if @reassignable_to.any? %>
-<br />
-<label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %></label>:
-<%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
-																 :onclick => "$('todo_reassign').checked = true;" %>
-<% end %>
-</p>
-</div>
-
-<%= submit_tag l(:button_apply) %>
-<%= link_to l(:button_cancel), :controller => 'wiki', :action => 'show', :project_id => @project, :id => @page.title %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/diff.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/diff.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,17 @@
+<div class="contextual">
+<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
+</div>
+
+<h2><%= @page.pretty_title %></h2>
+
+<p>
+<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
+<em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
+&#8594;
+<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %>
+<em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
+</p>
+
+<div class="text-diff">
+<%= simple_format_without_paragraph @diff.to_html %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/diff.rhtml
--- a/app/views/wiki/diff.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<div class="contextual">
-<%= link_to(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
-</div>
-
-<h2><%= @page.pretty_title %></h2>
-
-<p>
-<%= l(:label_version) %> <%= link_to @diff.content_from.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_from.version %>
-<em>(<%= @diff.content_from.author ? @diff.content_from.author.name : "anonyme" %>, <%= format_time(@diff.content_from.updated_on) %>)</em>
-&#8594;
-<%= l(:label_version) %> <%= link_to @diff.content_to.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => @diff.content_to.version %>/<%= @page.content.version %>
-<em>(<%= @diff.content_to.author ? @diff.content_to.author.name : "anonyme" %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
-</p>
-
-<div class="text-diff">
-<%= simple_format_without_paragraph @diff.to_html %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,29 @@
+<h2><%=h @page.pretty_title %></h2>
+
+<% form_for :content, @content, :url => {:action => 'update', :id => @page.title}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
+<%= f.hidden_field :version %>
+<%= error_messages_for 'content' %>
+
+<p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
+<p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
+<p><label><%=l(:label_attachment_plural)%></label><br /><%= render :partial => 'attachments/form' %></p>
+
+<p><%= submit_tag l(:button_save) %>
+   <%= link_to_remote l(:label_preview), 
+                       { :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title },
+                         :method => :post,
+                         :update => 'preview',
+                         :with => "Form.serialize('wiki_form')",
+                         :complete => "Element.scrollTo('preview')"
+                       }, :accesskey => accesskey(:preview) %></p>
+<%= wikitoolbar_for 'content_text' %>
+<% end %>
+
+<div id="preview" class="wiki"></div>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+  <%= robot_exclusion_tag %>
+<% end %>
+
+<% html_title @page.pretty_title %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/edit.rhtml
--- a/app/views/wiki/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-<h2><%=h @page.pretty_title %></h2>
-
-<% form_for :content, @content, :url => {:action => 'update', :id => @page.title}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
-<%= f.hidden_field :version %>
-<%= error_messages_for 'content' %>
-
-<p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
-<p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
-<p><label><%=l(:label_attachment_plural)%></label><br /><%= render :partial => 'attachments/form' %></p>
-
-<p><%= submit_tag l(:button_save) %>
-   <%= link_to_remote l(:label_preview), 
-                       { :url => { :controller => 'wiki', :action => 'preview', :project_id => @project, :id => @page.title },
-                         :method => :post,
-                         :update => 'preview',
-                         :with => "Form.serialize('wiki_form')",
-                         :complete => "Element.scrollTo('preview')"
-                       }, :accesskey => accesskey(:preview) %></p>
-<%= wikitoolbar_for 'content_text' %>
-<% end %>
-
-<div id="preview" class="wiki"></div>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag 'scm' %>
-  <%= robot_exclusion_tag %>
-<% end %>
-
-<% html_title @page.pretty_title %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/export.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/export.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,21 @@
+<!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; }
+ul.toc { padding: 4px; margin-left: 0; }
+ul.toc li { list-style-type:none; }
+ul.toc li.heading2 { margin-left: 1em; }
+ul.toc li.heading3 { margin-left: 2em; }
+a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
+a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
+h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
+</style>
+</head>
+<body>
+<%= textilizable @content, :text, :wiki_links => :local %>
+</body>
+</html>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/export.rhtml
--- a/app/views/wiki/export.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<!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; }
-ul.toc { padding: 4px; margin-left: 0; }
-ul.toc li { list-style-type:none; }
-ul.toc li.heading2 { margin-left: 1em; }
-ul.toc li.heading3 { margin-left: 2em; }
-a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
-a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
-h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
-</style>
-</head>
-<body>
-<%= textilizable @content, :text, :wiki_links => :local %>
-</body>
-</html>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/export_multiple.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/export_multiple.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,34 @@
+<!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; }
+ul.toc { padding: 4px; margin-left: 0; }
+ul.toc li { list-style-type:none; }
+ul.toc li.heading2 { margin-left: 1em; }
+ul.toc li.heading3 { margin-left: 2em; }
+a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
+a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
+h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
+</style>
+</head>
+<body>
+
+<strong><%= l(:label_index_by_title) %></strong>
+<ul>
+<% @pages.each do |page| %>
+    <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
+<% end %>
+</ul>
+
+<% @pages.each do |page| %>
+<hr />
+<a name="<%= page.title %>" />
+<%= textilizable page.content ,:text, :wiki_links => :anchor %>
+<% end %>
+
+</body>
+</html>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/export_multiple.rhtml
--- a/app/views/wiki/export_multiple.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<!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; }
-ul.toc { padding: 4px; margin-left: 0; }
-ul.toc li { list-style-type:none; }
-ul.toc li.heading2 { margin-left: 1em; }
-ul.toc li.heading3 { margin-left: 2em; }
-a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
-a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
-h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
-</style>
-</head>
-<body>
-
-<strong><%= l(:label_index_by_title) %></strong>
-<ul>
-<% @pages.each do |page| %>
-    <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
-<% end %>
-</ul>
-
-<% @pages.each do |page| %>
-<hr />
-<a name="<%= page.title %>" />
-<%= textilizable page.content ,:text, :wiki_links => :anchor %>
-<% end %>
-
-</body>
-</html>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/history.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/history.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,35 @@
+<h2><%= @page.pretty_title %></h2>
+
+<h3><%= l(:label_history) %></h3>
+
+<% form_tag({:action => "diff"}, :method => :get) do %>
+<table class="list wiki-page-versions">
+<thead><tr>
+    <th>#</th>
+    <th></th>
+    <th></th>    
+    <th><%= l(:field_updated_on) %></th>
+    <th><%= l(:field_author) %></th>
+    <th><%= l(:field_comments) %></th>
+    <th></th>
+</tr></thead>
+<tbody>
+<% show_diff = @versions.size > 1 %>
+<% line_num = 1 %>
+<% @versions.each do |ver| %>
+<tr class="wiki-page-version <%= cycle("odd", "even") %>">
+    <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
+    <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
+    <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
+    <td class="updated_on"><%= format_time(ver.updated_on) %></td>
+    <td class="author"><%= link_to_user ver.author %></td>
+    <td class="comments"><%=h ver.comments %></td>
+    <td class="buttons"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
+</tr>
+<% line_num += 1 %>
+<% end %>
+</tbody>
+</table>
+<%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
+<span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/history.rhtml
--- a/app/views/wiki/history.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<h2><%= @page.pretty_title %></h2>
-
-<h3><%= l(:label_history) %></h3>
-
-<% form_tag({:action => "diff"}, :method => :get) do %>
-<table class="list wiki-page-versions">
-<thead><tr>
-    <th>#</th>
-    <th></th>
-    <th></th>    
-    <th><%= l(:field_updated_on) %></th>
-    <th><%= l(:field_author) %></th>
-    <th><%= l(:field_comments) %></th>
-    <th></th>
-</tr></thead>
-<tbody>
-<% show_diff = @versions.size > 1 %>
-<% line_num = 1 %>
-<% @versions.each do |ver| %>
-<tr class="wiki-page-version <%= cycle("odd", "even") %>">
-    <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
-    <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
-    <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
-    <td class="updated_on"><%= format_time(ver.updated_on) %></td>
-    <td class="author"><%= link_to_user ver.author %></td>
-    <td class="comments"><%=h ver.comments %></td>
-    <td class="buttons"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td>
-</tr>
-<% line_num += 1 %>
-<% end %>
-</tbody>
-</table>
-<%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
-<span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/rename.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/rename.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,12 @@
+<h2><%= l(:button_rename) %>: <%= @original_title %></h2>
+
+<%= error_messages_for 'page' %>
+
+<% labelled_tabular_form_for :wiki_page, @page, :url => { :action => 'rename' } do |f| %>
+<div class="box">
+<p><%= f.text_field :title, :required => true, :size => 100  %></p>
+<p><%= f.check_box :redirect_existing_links %></p>
+<p><%= f.select :parent_id, "<option value=''></option>" + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent), :label => :field_parent_title %></p>
+</div>
+<%= submit_tag l(:button_rename) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/rename.rhtml
--- a/app/views/wiki/rename.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<h2><%= l(:button_rename) %>: <%= @original_title %></h2>
-
-<%= error_messages_for 'page' %>
-
-<% labelled_tabular_form_for :wiki_page, @page, :url => { :action => 'rename' } do |f| %>
-<div class="box">
-<p><%= f.text_field :title, :required => true, :size => 100  %></p>
-<p><%= f.check_box :redirect_existing_links %></p>
-<p><%= f.select :parent_id, "<option value=''></option>" + wiki_page_options_for_select(@wiki.pages.all(:include => :parent) - @page.self_and_descendants, @page.parent), :label => :field_parent_title %></p>
-</div>
-<%= submit_tag l(:button_rename) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/show.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wiki/show.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,61 @@
+<div class="contextual">
+<% if @editable %>
+<%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
+<%= watcher_tag(@page, User.current) %>
+<%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
+<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
+<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
+<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
+<%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
+<% end %>
+<%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
+</div>
+
+<%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:id => parent.title, :project_id => parent.project}}) %>
+
+<% if @content.version != @page.content.version %>
+    <p>    
+    <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
+    <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
+    <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :id => @page.title, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> - 
+    <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
+    <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
+    <br />
+    <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
+    <%=h @content.comments %>
+    </p>
+    <hr />
+<% end %>
+
+<%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
+
+<%= link_to_attachments @page %>
+
+<% if @editable && authorize_for('wiki', 'add_attachment') %>
+<div id="wiki_add_attachment">
+<p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
+                                             :id => 'attach_files_link' %></p>
+<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :id => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+  <div class="box">
+  <p><%= render :partial => 'attachments/form' %></p>
+  </div>
+<%= submit_tag l(:button_add) %>
+<%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
+<% end %>
+</div>
+<% end %>
+
+<% other_formats_links do |f| %>
+	<%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
+	<%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
+<% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
+
+<% content_for :sidebar do %>
+  <%= render :partial => 'sidebar' %>
+<% end %>
+
+<% html_title @page.pretty_title %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wiki/show.rhtml
--- a/app/views/wiki/show.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-<div class="contextual">
-<% if @editable %>
-<%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :id => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
-<%= watcher_tag(@page, User.current) %>
-<%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :id => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
-<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
-<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
-<%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
-<%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :id => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
-<% end %>
-<%= link_to_if_authorized(l(:label_history), {:action => 'history', :id => @page.title}, :class => 'icon icon-history') %>
-</div>
-
-<%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:id => parent.title, :project_id => parent.project}}) %>
-
-<% if @content.version != @page.content.version %>
-    <p>    
-    <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
-    <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
-    <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :id => @page.title, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> - 
-    <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
-    <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
-    <br />
-    <em><%= @content.author ? @content.author.name : "anonyme" %>, <%= format_time(@content.updated_on) %> </em><br />
-    <%=h @content.comments %>
-    </p>
-    <hr />
-<% end %>
-
-<%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
-
-<%= link_to_attachments @page %>
-
-<% if @editable && authorize_for('wiki', 'add_attachment') %>
-<div id="wiki_add_attachment">
-<p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
-                                             :id => 'attach_files_link' %></p>
-<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :project_id => @project, :id => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
-  <div class="box">
-  <p><%= render :partial => 'attachments/form' %></p>
-  </div>
-<%= submit_tag l(:button_add) %>
-<%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
-<% end %>
-</div>
-<% end %>
-
-<% other_formats_links do |f| %>
-	<%= f.link_to 'HTML', :url => {:id => @page.title, :version => @content.version} %>
-	<%= f.link_to 'TXT', :url => {:id => @page.title, :version => @content.version} %>
-<% end if User.current.allowed_to?(:export_wiki_pages, @project) %>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag 'scm' %>
-<% end %>
-
-<% content_for :sidebar do %>
-  <%= render :partial => 'sidebar' %>
-<% end %>
-
-<% html_title @page.pretty_title %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wikis/destroy.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/wikis/destroy.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,10 @@
+<h2><%=l(:label_confirmation)%></h2>
+
+<div class="box"><center>
+<p><strong><%= @project.name %></strong><br /><%=l(:text_wiki_destroy_confirmation)%></p>
+
+<% form_tag({:controller => 'wikis', :action => 'destroy', :id => @project}) do %>
+<%= hidden_field_tag "confirm", 1 %>
+<%= submit_tag l(:button_delete) %>
+<% end %>
+</center></div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/wikis/destroy.rhtml
--- a/app/views/wikis/destroy.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<h2><%=l(:label_confirmation)%></h2>
-
-<div class="box"><center>
-<p><strong><%= @project.name %></strong><br /><%=l(:text_wiki_destroy_confirmation)%></p>
-
-<% form_tag({:controller => 'wikis', :action => 'destroy', :id => @project}) do %>
-<%= hidden_field_tag "confirm", 1 %>
-<%= submit_tag l(:button_delete) %>
-<% end %>
-</center></div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/workflows/_action_menu.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/workflows/_action_menu.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<div class="contextual">
+<%= link_to l(:button_edit), {:action => 'edit'}, :class => 'icon icon-edit' %>
+<%= link_to l(:button_copy), {:action => 'copy'}, :class => 'icon icon-copy' %>
+<%= link_to l(:field_summary), {:action => 'index'}, :class => 'icon icon-summary' %>
+</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/workflows/_action_menu.rhtml
--- a/app/views/workflows/_action_menu.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<div class="contextual">
-<%= link_to l(:button_edit), {:action => 'edit'}, :class => 'icon icon-edit' %>
-<%= link_to l(:button_copy), {:action => 'copy'}, :class => 'icon icon-copy' %>
-<%= link_to l(:field_summary), {:action => 'index'}, :class => 'icon icon-summary' %>
-</div>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/workflows/copy.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/workflows/copy.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,33 @@
+<%= render :partial => 'action_menu' %>
+
+<h2><%=l(:label_workflow)%></h2>
+
+<% form_tag({}, :id => 'workflow_copy_form') do %>
+<div class="tabular box">
+<p>
+	<label><%= l(:label_copy_source) %></label>
+	<%= l(:label_tracker) %><br />
+	<%= select_tag('source_tracker_id', 
+									"<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
+									"<option value=\"any\">--- #{ l(:label_copy_same_as_target) } ---</option>" + 
+									options_from_collection_for_select(@trackers, 'id', 'name', @source_tracker && @source_tracker.id)) %><br />
+	<%= l(:label_role) %><br />
+	<%= select_tag('source_role_id',
+									"<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
+									"<option value=\"any\">--- #{ l(:label_copy_same_as_target) } ---</option>" + 
+									options_from_collection_for_select(@roles, 'id', 'name', @source_role && @source_role.id)) %>
+</p>
+<p>
+	<label><%= l(:label_copy_target) %></label>
+	<%= l(:label_tracker) %><br />
+	<%= select_tag 'target_tracker_ids',
+									"<option value=\"\" disabled=\"disabled\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
+									options_from_collection_for_select(@trackers, 'id', 'name', @target_trackers && @target_trackers.map(&:id)), :multiple => true %><br />
+	<%= l(:label_role) %><br />
+	<%= select_tag 'target_role_ids',
+									"<option value=\"\" disabled=\"disabled\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
+									options_from_collection_for_select(@roles, 'id', 'name', @target_roles && @target_roles.map(&:id)), :multiple => true %>
+</p>
+</div>
+<%= submit_tag l(:button_copy) %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/workflows/copy.rhtml
--- a/app/views/workflows/copy.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<%= render :partial => 'action_menu' %>
-
-<h2><%=l(:label_workflow)%></h2>
-
-<% form_tag({}, :id => 'workflow_copy_form') do %>
-<div class="tabular box">
-<p>
-	<label><%= l(:label_copy_source) %></label>
-	<%= l(:label_tracker) %><br />
-	<%= select_tag('source_tracker_id', 
-									"<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
-									"<option value=\"any\">--- #{ l(:label_copy_same_as_target) } ---</option>" + 
-									options_from_collection_for_select(@trackers, 'id', 'name', @source_tracker && @source_tracker.id)) %><br />
-	<%= l(:label_role) %><br />
-	<%= select_tag('source_role_id',
-									"<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
-									"<option value=\"any\">--- #{ l(:label_copy_same_as_target) } ---</option>" + 
-									options_from_collection_for_select(@roles, 'id', 'name', @source_role && @source_role.id)) %>
-</p>
-<p>
-	<label><%= l(:label_copy_target) %></label>
-	<%= l(:label_tracker) %><br />
-	<%= select_tag 'target_tracker_ids',
-									"<option value=\"\" disabled=\"disabled\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
-									options_from_collection_for_select(@trackers, 'id', 'name', @target_trackers && @target_trackers.map(&:id)), :multiple => true %><br />
-	<%= l(:label_role) %><br />
-	<%= select_tag 'target_role_ids',
-									"<option value=\"\" disabled=\"disabled\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" +
-									options_from_collection_for_select(@roles, 'id', 'name', @target_roles && @target_roles.map(&:id)), :multiple => true %>
-</p>
-</div>
-<%= submit_tag l(:button_copy) %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/workflows/edit.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/workflows/edit.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,50 @@
+<%= render :partial => 'action_menu' %>
+
+<h2><%=l(:label_workflow)%></h2>
+
+<p><%=l(:text_workflow_edit)%>:</p>
+
+<% form_tag({}, :method => 'get') do %>
+<p>
+	<label><%=l(:label_role)%>:</label>
+	<%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %>
+
+  <label><%=l(:label_tracker)%>:</label>
+	<%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %>
+  
+  <%= hidden_field_tag 'used_statuses_only', '0' %>
+  <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
+</p>
+<p>
+<%= submit_tag l(:button_edit), :name => nil %>
+</p>
+<% end %>
+
+<% if @tracker && @role && @statuses.any? %>
+  <% form_tag({}, :id => 'workflow_form' ) do %>
+    <%= hidden_field_tag 'tracker_id', @tracker.id %>
+    <%= hidden_field_tag 'role_id', @role.id %>
+    <div class="autoscroll">
+      <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>
+      
+      <fieldset class="collapsible" style="padding: 0; margin-top: 0.5em;">
+        <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_author) %></legend>
+        <div id="author_workflows" style="margin: 0.5em 0 0.5em 0;">
+          <%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %>
+        </div>
+      </fieldset>
+      <%= javascript_tag "hideFieldset($('author_workflows'))" unless @workflows['author'].present? %>
+      
+      <fieldset class="collapsible" style="padding: 0;">
+        <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_assignee) %></legend>
+        <div id="assignee_workflows" style="margin: 0.5em 0 0.5em 0;">
+      <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
+        </div>
+      </fieldset>
+      <%= javascript_tag "hideFieldset($('assignee_workflows'))" unless @workflows['assignee'].present? %>
+    </div>
+    <%= submit_tag l(:button_save) %>
+  <% end %>
+<% end %>
+
+<% html_title(l(:label_workflow)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/workflows/edit.rhtml
--- a/app/views/workflows/edit.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-<%= render :partial => 'action_menu' %>
-
-<h2><%=l(:label_workflow)%></h2>
-
-<p><%=l(:text_workflow_edit)%>:</p>
-
-<% form_tag({}, :method => 'get') do %>
-<p>
-	<label><%=l(:label_role)%>:</label>
-	<%= select_tag 'role_id', options_from_collection_for_select(@roles, "id", "name", @role && @role.id) %>
-
-  <label><%=l(:label_tracker)%>:</label>
-	<%= select_tag 'tracker_id', options_from_collection_for_select(@trackers, "id", "name", @tracker && @tracker.id) %>
-  
-  <%= hidden_field_tag 'used_statuses_only', '0' %>
-  <label><%= check_box_tag 'used_statuses_only', '1', @used_statuses_only %> <%= l(:label_display_used_statuses_only) %></label>
-</p>
-<p>
-<%= submit_tag l(:button_edit), :name => nil %>
-</p>
-<% end %>
-
-<% if @tracker && @role && @statuses.any? %>
-  <% form_tag({}, :id => 'workflow_form' ) do %>
-    <%= hidden_field_tag 'tracker_id', @tracker.id %>
-    <%= hidden_field_tag 'role_id', @role.id %>
-    <div class="autoscroll">
-      <%= render :partial => 'form', :locals => {:name => 'always', :workflows => @workflows['always']} %>
-      
-      <fieldset class="collapsible" style="padding: 0; margin-top: 0.5em;">
-        <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_author) %></legend>
-        <div id="author_workflows" style="margin: 0.5em 0 0.5em 0;">
-          <%= render :partial => 'form', :locals => {:name => 'author', :workflows => @workflows['author']} %>
-        </div>
-      </fieldset>
-      <%= javascript_tag "hideFieldset($('author_workflows'))" unless @workflows['author'].present? %>
-      
-      <fieldset class="collapsible" style="padding: 0;">
-        <legend onclick="toggleFieldset(this);"><%= l(:label_additional_workflow_transitions_for_assignee) %></legend>
-        <div id="assignee_workflows" style="margin: 0.5em 0 0.5em 0;">
-      <%= render :partial => 'form', :locals => {:name => 'assignee', :workflows => @workflows['assignee']} %>
-        </div>
-      </fieldset>
-      <%= javascript_tag "hideFieldset($('assignee_workflows'))" unless @workflows['assignee'].present? %>
-    </div>
-    <%= submit_tag l(:button_save) %>
-  <% end %>
-<% end %>
-
-<% html_title(l(:label_workflow)) -%>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/workflows/index.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/views/workflows/index.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,35 @@
+<%= render :partial => 'action_menu' %>
+
+<h2><%=l(:label_workflow)%></h2>
+
+<% if @workflow_counts.empty? %>
+<p class="nodata"><%= l(:label_no_data) %></p>
+<% else %>
+<div class="autoscroll">
+<table class="list">
+<thead>
+    <tr>
+    <th></th>
+    <% @workflow_counts.first.last.each do |role, count| %>
+    <th>
+        <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %>
+    </th>
+    
+    <% end %>
+    </tr>
+</thead>
+<tbody>
+<% @workflow_counts.each do |tracker, roles| -%>
+<tr class="<%= cycle('odd', 'even') %>">
+  <td><%= h tracker %></td>
+  <% roles.each do |role, count| -%>
+    <td align="center">
+      <%= link_to((count > 0 ? count : image_tag('false.png')), {:action => 'edit', :role_id => role, :tracker_id => tracker}, :title => l(:button_edit)) %>
+    </td>
+  <% end -%>
+</tr>
+<% end -%>
+</tbody>
+</table>
+</div>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee app/views/workflows/index.rhtml
--- a/app/views/workflows/index.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<%= render :partial => 'action_menu' %>
-
-<h2><%=l(:label_workflow)%></h2>
-
-<% if @workflow_counts.empty? %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% else %>
-<div class="autoscroll">
-<table class="list">
-<thead>
-    <tr>
-    <th></th>
-    <% @workflow_counts.first.last.each do |role, count| %>
-    <th>
-        <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %>
-    </th>
-    
-    <% end %>
-    </tr>
-</thead>
-<tbody>
-<% @workflow_counts.each do |tracker, roles| -%>
-<tr class="<%= cycle('odd', 'even') %>">
-  <td><%= h tracker %></td>
-  <% roles.each do |role, count| -%>
-    <td align="center">
-      <%= link_to((count > 0 ? count : image_tag('false.png')), {:action => 'edit', :role_id => role, :tracker_id => tracker}, :title => l(:button_edit)) %>
-    </td>
-  <% end -%>
-</tr>
-<% end -%>
-</tbody>
-</table>
-</div>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee extra/sample_plugin/app/views/example/say_goodbye.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/extra/sample_plugin/app/views/example/say_goodbye.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,5 @@
+<p class="icon icon-example-works"><%= l(:text_say_goodbye) %></p>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag "example.css", :plugin => "sample_plugin", :media => "screen" %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee extra/sample_plugin/app/views/example/say_goodbye.rhtml
--- a/extra/sample_plugin/app/views/example/say_goodbye.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<p class="icon icon-example-works"><%= l(:text_say_goodbye) %></p>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag "example.css", :plugin => "sample_plugin", :media => "screen" %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee extra/sample_plugin/app/views/example/say_hello.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/extra/sample_plugin/app/views/example/say_hello.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,9 @@
+<p class="icon icon-example-works"><%= l(:text_say_hello) %></p>
+
+<p><label>Example setting</label>: <%= @value %></p>
+
+<%= link_to_if_authorized 'Good bye', :action => 'say_goodbye', :id => @project %>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag "example.css", :plugin => "sample_plugin", :media => "screen" %>
+<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee extra/sample_plugin/app/views/example/say_hello.rhtml
--- a/extra/sample_plugin/app/views/example/say_hello.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<p class="icon icon-example-works"><%= l(:text_say_hello) %></p>
-
-<p><label>Example setting</label>: <%= @value %></p>
-
-<%= link_to_if_authorized 'Good bye', :action => 'say_goodbye', :id => @project %>
-
-<% content_for :header_tags do %>
-  <%= stylesheet_link_tag "example.css", :plugin => "sample_plugin", :media => "screen" %>
-<% end %>
diff -r df51e8ff578d -r c6c2cbd0afee extra/sample_plugin/app/views/my/blocks/_sample_block.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/extra/sample_plugin/app/views/my/blocks/_sample_block.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,3 @@
+<h3>Sample block</h3>
+
+You are <strong><%= h(User.current) %></strong> and this is a sample block for My Page added from a plugin.
diff -r df51e8ff578d -r c6c2cbd0afee extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml
--- a/extra/sample_plugin/app/views/my/blocks/_sample_block.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<h3>Sample block</h3>
-
-You are <strong><%= h(User.current) %></strong> and this is a sample block for My Page added from a plugin.
diff -r df51e8ff578d -r c6c2cbd0afee extra/sample_plugin/app/views/settings/_sample_plugin_settings.html.erb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/extra/sample_plugin/app/views/settings/_sample_plugin_settings.html.erb	Fri Feb 24 18:36:29 2012 +0000
@@ -0,0 +1,3 @@
+<p><label>Example setting</label><%= text_field_tag 'settings[sample_setting]', @settings['sample_setting'] %></p>
+
+<p><label>Foo</label><%= text_field_tag 'settings[foo]', @settings['foo'] %></p>
diff -r df51e8ff578d -r c6c2cbd0afee extra/sample_plugin/app/views/settings/_sample_plugin_settings.rhtml
--- a/extra/sample_plugin/app/views/settings/_sample_plugin_settings.rhtml	Fri Feb 24 18:29:34 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-<p><label>Example setting</label><%= text_field_tag 'settings[sample_setting]', @settings['sample_setting'] %></p>
-
-<p><label>Foo</label><%= text_field_tag 'settings[foo]', @settings['foo'] %></p>