Redmine 4.1.7

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/custom_fields/formats/_list.html.erb

@@ -1,5 +1,5 @@
 <p>
-  <%= f.text_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15 %>
+  <%= f.text_area :possible_values, :value => @custom_field.possible_values.to_a.join("\n"), :rows => 15, :required => true %>
   <em class="info"><%= l(:text_custom_field_possible_values_info) %></em>
 </p>
 <p><%= f.text_field(:default_value) %></p>

app/views/documents/_form.html.erb

@@ -1,24 +1,22 @@
 <%= error_messages_for @document %>
 
 <div class="box tabular">
-<p><%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %></p>
-<p><%= f.text_field :title, :required => true, :size => 60 %></p>
-<p><%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit',
-                  :data => {
-                      :auto_complete => true,
-                      :issues_url => auto_complete_issues_path(:project_id => @project, :q => '')
-                  }
-%></p>
+  <p><%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %></p>
+  <p><%= f.text_field :title, :required => true, :size => 60 %></p>
+  <p><%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit',
+                    :data => {
+                        :auto_complete => true,
+                        :issues_url => auto_complete_issues_path(:project_id => @project, :q => '')
+                    }
+  %></p>
 
-<% @document.custom_field_values.each do |value| %>
-  <p><%= custom_field_tag_with_label :document, value %></p>
-<% end %>
+  <% @document.custom_field_values.each do |value| %>
+    <p><%= custom_field_tag_with_label :document, value %></p>
+  <% end %>
+
+  <% if @document.new_record? %>
+    <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', :locals => {:container => @document} %></p>
+  <% end %>
 </div>
 
 <%= wikitoolbar_for 'document_description' %>
-
-<% if @document.new_record? %>
-<div class="box tabular">
-<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', :locals => {:container => @document} %></p>
-</div>
-<% end %>

app/views/gantts/show.html.erb

@@ -177,14 +177,17 @@
     <% end %>
   <% end %>
 </td>
-<% @query.columns.each do |column| %>
-  <% next if Redmine::Helpers::Gantt::UNAVAILABLE_COLUMNS.include?(column.name) %>
-  <td class="gantt_<%= column.name %>_column gantt_selected_column <%= 'last_gantt_selected_column' if @query.columns.last == column %>" id="<%= column.name %>">
+<%
+  @query.columns.each do |column|
+    next if Redmine::Helpers::Gantt::UNAVAILABLE_COLUMNS.include?(column.name)
+    column_name = column.name.to_s.tr('.', '_')
+%>
+  <td class="gantt_<%= column_name %>_column gantt_selected_column <%= 'last_gantt_selected_column' if @query.columns.last == column %>" id="<%= column_name %>">
     <%
       style = "position: relative;"
       style += "height: #{t_height + 24}px;"
     %>
-    <%= content_tag(:div, :style => style, :class => "gantt_#{column.name}_container gantt_selected_column_container") do %>
+    <%= content_tag(:div, :style => style, :class => "gantt_#{column_name}_container gantt_selected_column_container") do %>
       <%
         style = "height: #{t_height}px;"
         style += 'overflow: hidden;'
@@ -195,7 +198,7 @@
         style += 'background: #eee;'
       %>
       <%= content_tag(:div, content_tag(:p, column.caption, :class => 'gantt_hdr_selected_column_name'), :style => style, :class => "gantt_hdr") %>
-      <%= content_tag(:div, :class => "gantt_#{column.name} gantt_selected_column_content") do %>
+      <%= content_tag(:div, :class => "gantt_#{column_name} gantt_selected_column_content") do %>
         <%= @gantt.selected_column_content({:column => column, :top => headers_height + 8, :zoom => zoom, :g_width => g_width}).html_safe %>
       <% end %>
     <% end %>

app/views/issues/_edit.html.erb

@@ -21,7 +21,7 @@
         </div>
         </div>
         <p><%= time_entry.text_field :comments, :size => 60 %></p>
-        <% @time_entry.custom_field_values.each do |value| %>
+        <% @time_entry.editable_custom_field_values.each do |value| %>
           <p><%= custom_field_tag_with_label :time_entry, value %></p>
         <% end %>
         <% end %>

app/views/issues/index.html.erb

@@ -13,7 +13,7 @@
 
     <%= link_to_if_authorized l(:label_settings),
               {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'issues'},
-              :class => 'icon icon-settings' if User.current.allowed_to?(:manage_categories, @project) %>
+              :class => 'icon icon-settings' if User.current.allowed_to?(:edit_project, @project) %>
   <% end %>
 </div>
 

app/views/issues/tabs/_changesets.html.erb

@@ -16,7 +16,9 @@
            :rev    => changeset.identifier) %>)
     <% end %></p>
 
-    <div class="wiki changeset-comments"><%= format_changeset_comments changeset %></div>
+    <div class="wiki changeset-comments">
+      <%= format_changeset_comments changeset %>
+    </div>
   </div>
   <%= call_hook(:view_issues_history_changeset_bottom, { :changeset => changeset }) %>
 <% end %>

app/views/layouts/base.html.erb

@@ -2,27 +2,22 @@
 <html lang="<%= current_language %>">
 <head>
 <meta charset="utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 <title><%= html_title %></title>
-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
+<meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'cookieconsent.min', 'tribute-3.7.3', 'application', 'responsive', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'tribute-3.7.3', 'application', 'responsive', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
-
-<% is_welcome = !User.current.logged? && current_page?(:controller => 'welcome', :action => 'index') %>
-<%= stylesheet_link_tag 'frontpage', :media => 'all' if is_welcome %>
-
 <%= javascript_heads %>
-<script src="/themes/circlepro/javascripts/cookieconsent.min.js"></script>
 <%= heads_for_theme %>
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
 </head>
-<body class="<%= body_css_classes %><%= ' is-preload' if is_welcome %>">
+<body class="<%= body_css_classes %>">
 <%= call_hook :view_layouts_base_body_top %>
 <div id="wrapper">
 
@@ -65,31 +60,20 @@
 
 <div id="wrapper2">
 <div id="wrapper3">
-
 <div id="top-menu">
-    <div id="wrapper-top-menu">
-    <ul class="social-menu">
-        <li class="social-link-blog"><a href="https://manuel.cillero.es" title="<%= l(:link_my_blog) %>" class="icon-blog"><span><%= l(:link_my_blog) %></span></a></li>
-        <li class="social-link-mastodon"><a href="https://noc.social/@manuelcillero" title="Mastodon" target="_blank" class="icon-mastodon"><span>Mastodon</span></a></li>
-        <li class="social-link-linkedin"><a href="https://es.linkedin.com/in/manuelcillero" title="Linkedin" target="_blank" class="icon-linkedin"><span>Linkedin</span></a></li>
-        <li class="social-link-github"><a href="https://github.com/manuelcillero" title="Github" target="_blank" class="icon-github"><span>Github</span></a></li>
-        <li class="social-link-mail"><a href="https://manuel.cillero.es/contacto/#suitepro" title="Mail" class="icon-mail"><span>Mail</span></a></li>
-    </ul>
     <div id="account">
         <%= render_menu :account_menu -%>
     </div>
     <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %>
     <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
-    </div>
 </div>
 
 <div id="header">
 
     <a href="#" class="mobile-toggle-button js-flyout-menu-toggle-button"></a>
 
-    <div id="wrapper-header">
     <% if User.current.logged? || !Setting.login_required? %>
-    <div id="quick-search" class="hide-when-print">
+    <div id="quick-search">
         <%= form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
         <%= hidden_field_tag 'scope', default_search_project_scope, :id => nil %>
         <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
@@ -107,17 +91,14 @@
     <% end %>
 
     <h1><%= page_header_title %></h1>
-    </div>
 
     <% if display_main_menu?(@project) %>
     <div id="main-menu" class="tabs">
-        <div id="wrapper-main-menu">
         <%= render_main_menu(@project) %>
         <div class="tabs-buttons" style="display:none;">
             <button class="tab-left" onclick="moveTabLeft(this); return false;"></button>
             <button class="tab-right" onclick="moveTabRight(this); return false;"></button>
         </div>
-        </div>
     </div>
     <% end %>
 </div>
@@ -135,54 +116,16 @@
         <div style="clear:both;"></div>
     </div>
 </div>
-
-</div> <!-- #wrapper3 -->
-
-<a href="#" id="scrollup" class="hide-when-print" style="display: none;"><%=l(:label_sort_higher)%></a><%= javascript_tag "$('#scrollup').click(function(){$('html,body').animate({scrollTop:0},600);return false;});" %>
+<div id="footer">
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2022 Jean-Philippe Lang
+</div>
+</div>
 
 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
 <div id="ajax-modal" style="display:none;"></div>
 
-<div id="footer">
-<div id="wrapper-footer">
-
-    <ul class="social-menu">
-        <li class="social-link-blog"><a href="https://manuel.cillero.es" title="<%= l(:link_my_blog) %>" class="icon-blog"><span><%= l(:link_my_blog) %></span></a></li>
-        <li class="social-link-mastodon"><a href="https://noc.social/@manuelcillero" title="Mastodon" target="_blank" class="icon-mastodon"><span>Mastodon</span></a></li>
-        <li class="social-link-linkedin"><a href="https://es.linkedin.com/in/manuelcillero" title="Linkedin" target="_blank" class="icon-linkedin"><span>Linkedin</span></a></li>
-        <li class="social-link-github"><a href="https://github.com/manuelcillero" title="Github" target="_blank" class="icon-github"><span>Github</span></a></li>
-        <li class="social-link-mail"><a href="https://manuel.cillero.es/contacto/#suitepro" title="Mail" class="icon-mail"><span>Mail</span></a></li>
-    </ul>
-    <div class="bgl"><div class="bgr">
-        <%= Time.current.year %> &copy; SuitePro (powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %>)
-        <div id="legal">
-        <span class="legal-legal"><a href="/projects/suitepro/wiki/Legal"><%= l(:label_legal) %></a></span>
-        <span class="legal-terms"> &nbsp;|&nbsp; <a href="/projects/suitepro/wiki/Condiciones_de_uso"><%= l(:label_legal_terms) %></a></span>
-        <span class="legal-privacy"> &nbsp;|&nbsp; <a href="/projects/suitepro/wiki/Política_de_privacidad"><%= l(:label_legal_privacy) %></a></span>
-        <span class="legal-cookies"> &nbsp;|&nbsp; <a href="/projects/suitepro/wiki/Política_de_cookies"><%= l(:label_legal_cookies) %></a></span>
-        </div>
-    </div></div>
-
 </div>
 </div>
-
-</div> <!-- #wrapper2 -->
-
-</div> <!-- #wrapper -->
-
 <%= call_hook :view_layouts_base_body_bottom %>
-
-<script>
-//<![CDATA[
-window.addEventListener("load", function(){
-window.cookieconsent.initialise({
-  "palette": { "popup": { "background": "rgba(20,20,20,0.8)" }, "button": { "background": "#fff" } },
-  "theme": "classic",
-  "position": "bottom-left",
-  "content": { "message": "<a href='https://suitepro.cillero.es'>SuitePro</a> requiere el uso de cookies para ofrecer la mejor experiencia de acceso a sus contenidos. Puedes aceptar su uso o abandonar la página si lo deseas.", "dismiss": "ACEPTO SU USO", "link": "Más información", "href": "/projects/suitepro/wiki/Pol%C3%ADtica_de_cookies", "target": "_self" }
-})});
-//]]>
-</script>
-
 </body>
 </html>

app/views/projects/show.html.erb

@@ -31,7 +31,7 @@
     <%= textilizable @project.description %>
   </div>
   <% end %>
-  <% if @project.homepage.present? || @project.visible_custom_field_values.any?(&:present?) %>
+  <% if @project.homepage.present? || @project.visible_custom_field_values.any? { |o| o.value.present? } %>
   <ul>
   <% unless @project.homepage.blank? %>
     <li><span class="label"><%=l(:field_homepage)%>:</span> <%= link_to_if uri_with_safe_scheme?(@project.homepage), @project.homepage, @project.homepage %></li>

app/views/queries/_columns.html.erb

@@ -36,7 +36,7 @@
 <%= javascript_tag do %>
 $(document).ready(function(){
   $('.query-columns').closest('form').submit(function(){
-    $('#<%= selected_tag_id %> option').prop('selected', true);
+    $('#<%= selected_tag_id %> option:not(:disabled)').prop('selected', true);
   });
 });
 <% end %>

app/views/reports/_details.html.erb

@@ -25,10 +25,10 @@
 <% end %>
 </tbody>
 </table>
-<div class="issue-report-graph">
+<div class="issue-report-graph hide-when-print">
   <canvas id="issues_by_<%= params[:detail] %>"></canvas>
 </div>
-<div class="issue-report-graph">
+<div class="issue-report-graph hide-when-print">
   <canvas id="issues_by_status"></canvas>
 </div>
 <%= javascript_tag do %>

app/views/repositories/_changeset.html.erb

@@ -33,7 +33,9 @@
 
 </div>
 
-<div class="wiki changeset-comments"><%= format_changeset_comments @changeset %></div>
+<div class="wiki changeset-comments">
+  <%= format_changeset_comments @changeset %>
+</div>
 
 <% if @changeset.issues.visible.any? || User.current.allowed_to?(:manage_related_issues, @repository.project) %>
   <%= render :partial => 'related_issues' %>

app/views/users/_form.html.erb

@@ -32,13 +32,13 @@
   <% end %>
   <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
   <p>
-    <%= f.password_field :password, :required => true, :size => 25  %>
+    <%= f.password_field :password, :required => @user.new_record?, :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><%= f.password_field :password_confirmation, :required => true, :size => 25  %></p>
+  <p><%= f.password_field :password_confirmation, :required => @user.new_record?, :size => 25  %></p>
   <p><%= f.check_box :generate_password %></p>
   <p><%= f.check_box :must_change_passwd %></p>
   </div>

app/views/users/edit.html.erb

@@ -7,7 +7,7 @@
 
 <%=
   page_title = title [l(:label_user_plural), users_path], @user.login
-  page_title.insert(page_title.rindex(' ') + 1, avatar(@user))
+  page_title.insert(page_title.rindex(' ') + 1, avatar(@user).to_s)
 %>
 
 <%= render_tabs user_settings_tabs %>

app/views/welcome/robots.text.erb

@@ -10,3 +10,6 @@ Disallow: <%= url_for(issues_gantt_path) %>
 Disallow: <%= url_for(issues_calendar_path) %>
 Disallow: <%= url_for(activity_path) %>
 Disallow: <%= url_for(search_path) %>
+Disallow: <%= url_for(issues_path(:sort => '')) %>
+Disallow: <%= url_for(issues_path(:query_id => '')) %>
+Disallow: <%= url_for(issues_path) %>?*set_filter=

app/views/wiki/show.api.rsb

@@ -5,7 +5,7 @@ api.wiki_page do
   end
   api.text @content.text
   api.version @content.version
-  api.author(:id => @content.author_id, :name => @content.author.name)
+  api.author(:id => @content.author_id, :name => @content.author.name) unless @content.author_id.nil?
   api.comments @content.comments
   api.created_on @page.created_on
   api.updated_on @content.updated_on

app/views/wiki/show.html.erb

@@ -61,8 +61,7 @@
 
 <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
 
-<% if @page.attachments.length > 0 || (@editable && authorize_for('wiki', 'add_attachment')) %>
-<fieldset class="collapsible collapsed<% if @page.attachments.length == 0 %> hide-when-print<% end %>">
+<fieldset class="collapsible collapsed hide-when-print">
   <legend onclick="toggleFieldset(this);" class="icon icon-collapsed"><%= l(:label_attachment_plural) %> (<%= @page.attachments.length %>)</legend>
   <div style="display: none;">
 
@@ -82,7 +81,6 @@
   <% end %>
 </div>
 </fieldset>
-<% end %>
 
 <p class="wiki-update-info">
   <% if User.current.allowed_to?(:view_wiki_edits, @project) %>

app/views/workflows/_form.html.erb

@@ -4,7 +4,7 @@
     <th>
       <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]:not(:disabled)')",
                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                           :class => 'icon-only icon-checked') %>
+                           :class => 'no-tooltip icon-only icon-checked') %>
       <%=l(:label_current_status)%>
     </th>
     <th colspan="<%= @statuses.length %>"><%=l(:label_new_statuses_allowed)%></th>
@@ -15,7 +15,7 @@
     <td style="width:<%= 75 / @statuses.size %>%;">
       <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]:not(:disabled).new-status-#{new_status.id}')",
                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                           :class => 'icon-only icon-checked') %>
+                           :class => 'no-tooltip icon-only icon-checked') %>
       <%= new_status.name %>
     </td>
     <% end %>
@@ -29,7 +29,7 @@
     <td class="name">
       <%= link_to_function('', "toggleCheckboxesBySelector('table.transitions-#{name} input[type=checkbox]:not(:disabled).old-status-#{old_status.try(:id) || 0}')",
                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}",
-                           :class => 'icon-only icon-checked') %>
+                           :class => 'no-tooltip icon-only icon-checked') %>
       <% if old_status %>
         <% old_status_name = old_status.name %>
         <%= old_status_name %>
@@ -40,7 +40,7 @@
     </td>
     <% for new_status in @statuses -%>
     <% checked = (old_status == new_status) || (transition_counts[[old_status, new_status]] > 0) %>
-    <td class="<%= checked ? 'enabled' : '' %>" title="<%= old_status_name %> &#187; <%= new_status.name %>">
+    <td class="no-tooltip <%= checked ? 'enabled' : '' %>" title="<%= old_status_name %> &#187; <%= new_status.name %>">
       <%= transition_tag transition_counts[[old_status, new_status]], old_status, new_status, name %>
     </td>
     <% end -%>

app/views/workflows/permissions.html.erb

@@ -67,7 +67,7 @@
         <% for status in @statuses -%>
         <td class="<%= @permissions[status.id][field].try(:join, ' ') %>" title="<%= name %> (<%= status.name %>)">
           <%= field_permission_tag(@permissions, status, field, @roles) %>
-          <% unless status == @statuses.last %><a href="#" class="repeat-value">&#187;</a><% end %>
+          <% unless status == @statuses.last %><a href="#" class="repeat-value" title="<%= l(:button_copy) %>">&#187;</a><% end %>
         </td>
         <% end -%>
       </tr>