Redmine 4.1.1

app/views/account/login.html.erb

@@ -1,28 +1,27 @@
 <%= call_hook :view_account_login_top %>
 
 <div id="login-form">
-  <h2><%= l(:label_login) %></h2>
   <%= form_tag(signin_path, onsubmit: 'return keepAnchorOnSignIn(this);') do %>
   <%= back_url_hidden_field_tag %>
-
+  
   <label for="username"><%=l(:field_login)%></label>
   <%= text_field_tag 'username', params[:username], :tabindex => '1' %>
-
+  
   <label for="password">
     <%=l(:field_password)%>
     <%= link_to l(:label_password_lost), lost_password_path, :class => "lost_password" if Setting.lost_password? %>
   </label>
   <%= password_field_tag 'password', nil, :tabindex => '2' %>
-
+  
   <% if Setting.openid? %>
     <label for="openid_url"><%=l(:field_identity_url)%></label>
     <%= text_field_tag "openid_url", nil, :tabindex => '3' %>
   <% end %>
-
+  
   <% if Setting.autologin? %>
     <label for="autologin"><%= check_box_tag 'autologin', 1, false, :tabindex => 4 %> <%= l(:label_stay_logged_in) %></label>
   <% end %>
-
+  
   <input type="submit" name="login" value="<%=l(:button_login)%>" tabindex="5" id="login-submit" />
   <% end %>
 </div>

app/views/account/password_recovery.html.erb

@@ -9,6 +9,9 @@
       <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>
+      <% 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>

app/views/account/register.html.erb

@@ -8,8 +8,11 @@
   <p><%= f.text_field :login, :size => 25, :required => true %></p>
 
   <p><%= f.password_field :password, :size => 25, :required => true %>
-  <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><%= f.password_field :password_confirmation, :size => 25, :required => true %></p>
 <% end %>