2 files changed, 23 insertions, 1 deletions
diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb
index 62c53dfbb..3b2f95798 100644
--- a/app/views/settings/_display.html.erb
+++ b/app/views/settings/_display.html.erb
@@ -22,7 +22,12 @@
 <p><%= setting_check_box :gravatar_enabled, :data => {:enables => '#settings_gravatar_default'} %>
 <em class="info"><%= t(:text_avatar_server_config_html, :url => Redmine::Configuration['avatar_server_url']) %></em></p>
 
-<p><%= setting_select :gravatar_default, gravatar_default_setting_options, :blank => :label_none %></p>
+<p>
+  <%= setting_select :gravatar_default, gravatar_default_setting_options, :blank => :label_none %>
+  <em class="<%= Setting.gravatar_default == "initials" ? "info" : "hidden" %>">
+    <%= t(:text_setting_gravatar_default_initials_html) %>
+  </em>
+</p>
 
 <p><%= setting_check_box :thumbnails_enabled, :data => {:enables => '#settings_thumbnails_size'} %></p>
 
@@ -35,3 +40,18 @@
 
 <%= submit_tag l(:button_save) %>
 <% end %>
+
+<%= javascript_tag do %>
+  $('#settings_gravatar_default').on('change', function(e){
+  const gravatar_default = e.target.value;
+  const em = e.target.parentElement.getElementsByTagName('em')[0];
+
+  if (gravatar_default === 'initials') {
+    em.classList.remove('hidden');
+    em.classList.add('info');
+  } else {
+    em.classList.add('hidden');
+    em.classList.remove('info');
+  }
+  });
+<% end %>
+\ No newline at end of file
diff --git a/app/views/settings/_general.html.erb b/app/views/settings/_general.html.erb
index 043067f18..44206b6c2 100644
--- a/app/views/settings/_general.html.erb
+++ b/app/views/settings/_general.html.erb
@@ -37,6 +37,8 @@
 
 <p><%= setting_text_field :feeds_limit, :size => 6 %></p>
 
+<p><%= setting_check_box :reactions_enabled %></p>
+
 <%= call_hook(:view_settings_general_form) %>
 </div>