Redmine 4.1.1

app/views/my/account.api.rsb

@@ -0,0 +1,13 @@
+api.user do
+  api.id         @user.id
+  api.login      @user.login
+  api.admin      @user.admin?
+  api.firstname  @user.firstname
+  api.lastname   @user.lastname
+  api.mail       @user.mail
+  api.created_on @user.created_on
+  api.last_login_on @user.last_login_on
+  api.api_key    @user.api_key
+
+  render_api_custom_values @user.visible_custom_field_values, api
+end

app/views/my/account.html.erb

@@ -14,7 +14,8 @@
 <%= labelled_form_for :user, @user,
                      :url => { :action => "account" },
                      :html => { :id => 'my_account_form',
-                                :method => :post, :multipart => true } do |f| %>
+                                :method => :put, :multipart => true } do |f| %>
+<div class="splitcontent">
 <div class="splitcontentleft">
 <fieldset class="box tabular">
   <legend><%=l(:label_information_plural)%></legend>
@@ -51,6 +52,7 @@
 
 <p class="mobile-show"><%= submit_tag l(:button_save) %></p>
 </div>
+</div>
 <% end %>
 
 <% content_for :sidebar do %>

app/views/my/blocks/_activity.html.erb

@@ -0,0 +1,5 @@
+<h3><%= link_to l(:label_activity), :controller => 'activities',
+                :action => 'index', :id => nil, :user_id => User.current,
+                :from => events_by_day.keys.first %></h3>
+
+<%= render :partial => 'activities/activities', :locals => {:events_by_day => events_by_day} %>

app/views/my/blocks/_timelog.html.erb

@@ -35,13 +35,15 @@
 <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| %>
+<% entries_by_day.keys.sort.reverse_each do |day| %>
   <tr class="odd">
     <td><strong><%= day == User.current.today ? l(:label_today).titleize : format_date(day) %></strong></td>
     <td colspan="2"></td>
     <td class="hours"><em><%= html_hours(format_hours(entries_by_day[day].sum(&:hours))) %></em></td>
+    <td></td>
   </tr>
   <% entries_by_day[day].each do |entry| -%>
   <tr id="time-entry-<%= entry.id %>" class="time-entry hascontextmenu">
@@ -52,6 +54,7 @@
     <td class="subject"><%= entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
     <td class="comments"><%= entry.comments %></td>
     <td class="hours"><%= html_hours(format_hours(entry.hours)) %></td>
+    <td class="buttons"><%= link_to_context_menu %></td>
   </tr>
   <% end -%>
 <% end -%>

app/views/my/page.html.erb

@@ -1,5 +1,5 @@
 <div class="contextual">
-  <%= form_tag({:action => "add_block"}, :remote => true, :id => "block-form") do %>
+  <%= form_tag({:action => "add_block"}, :remote => true, :id => "block-form", authenticity_token: true) do %>
     <%= label_tag('block-select', l(:button_add)) %>:
     <%= block_select_tag(@user) %>
   <% end %>
@@ -7,9 +7,9 @@
 
 <h2><%=l(:label_my_page)%></h2>
 
-<div id="my-page">
+<div id="my-page" class="splitcontent">
 <% @groups.each do |group| %>
-  <div id="list-<%= group %>" class="block-receiver">
+  <div id="list-<%= group %>" class="block-receiver splitcontent<%= group %>">
     <%= render_blocks(@blocks[group], @user) %>
   </div>
 <% end %>

app/views/my/password.html.erb

@@ -9,7 +9,11 @@
 
 <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
 <%= password_field_tag 'new_password', nil, :size => 25 %>
-<em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
+  <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
+  <% if Setting.password_required_char_classes.any? %>
+    <em class="info"><%= l(:text_characters_must_contain, :character_classes => Setting.password_required_char_classes.collect{|c| l("label_password_char_class_#{c}")}.join(", ")) %></em>
+  <% end %>
+</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>