thredded 0.11.0 → 0.12.0

data/app/views/thredded/moderation/user.html.erb

@@ -14,17 +14,19 @@
     <% end %>
     <%= view_hooks.moderation_user_page.user_info.render self, user: user do %>
       <ul class="thredded--moderation--user--info">
-        <li><%= t 'thredded.users.user_since_html', time_ago: time_ago(user.created_at) %></li>
-        <% if user_detail.last_seen_at %>
-          <li><%= t 'thredded.users.last_active_html', time_ago: time_ago(user_detail.last_seen_at) %></li>
-        <% end %>
-        <% if user_detail.topics_count > 0 %>
-          <li><%= t 'thredded.users.started_topics_count', count: user_detail.topics_count %></li>
-        <% end %>
-        <% if user_detail.posts_count > 0 %>
-          <li><%= t 'thredded.users.posts_count', count: user_detail.posts_count %></li>
-        <% end %>
-        <li><%= render 'user_moderation_state', user: @user %></li>
+        <%= view_hooks.moderation_user_page.user_info_list_items.render self, user: user do %>
+          <li><%= t 'thredded.users.user_since_html', time_ago: time_ago(user.created_at) %></li>
+          <% if user_detail.last_seen_at %>
+            <li><%= t 'thredded.users.last_active_html', time_ago: time_ago(user_detail.last_seen_at) %></li>
+          <% end %>
+          <% if user_detail.topics_count > 0 %>
+            <li><%= t 'thredded.users.started_topics_count', count: user_detail.topics_count %></li>
+          <% end %>
+          <% if user_detail.posts_count > 0 %>
+            <li><%= t 'thredded.users.posts_count', count: user_detail.posts_count %></li>
+          <% end %>
+          <li><%= render 'user_moderation_state', user: @user %></li>
+        <% end  %>
       </ul>
     <% end %>
     <%= view_hooks.moderation_user_page.user_moderation_actions.render self, user: user do %>

data/app/views/thredded/moderation/users.html.erb

@@ -11,6 +11,7 @@
         </p>
       <% end %>
       <table class="thredded--moderation--users-table thredded--table">
+        <caption><%= page_entries_info @users %></caption>
         <thead>
         <tr>
           <th>User</th>

data/app/views/thredded/posts/_form.html.erb

@@ -1,7 +1,5 @@
 <%= render 'thredded/posts_common/form',
-           topic: topic,
            post: post,
-           preview_url: preview_url,
            content_label: t('thredded.posts.form.content_label'),
            button_text: button_text,
            button_submitting_text: local_assigns.key?(:button_submitting_text) ? button_submitting_text : nil %>

data/app/views/thredded/posts/edit.html.erb

@@ -2,17 +2,14 @@
 <% content_for :thredded_page_id, 'thredded--edit-post' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
-    <li><%= link_to t('thredded.nav.edit_post'), edit_post_path(@post) %></li>
+    <li><%= link_to t('thredded.nav.edit_post'), edit_post_path(@post_form.post) %></li>
   </ul>
 <% end %>
 
 <%= thredded_page do %>
   <section class="thredded--main-section">
     <%= render 'thredded/posts/form',
-               messageboard: messageboard,
-               topic:        topic,
-               post:         @post,
-               preview_url:  messageboard_topic_post_preview_path(messageboard, @post.postable, @post),
+               post:         @post_form,
                button_text:  t('thredded.posts.form.update_btn'),
                button_submitting_text: t('thredded.posts.form.update_btn_submitting')%>
   </section>

data/app/views/thredded/posts/new.html.erb

@@ -0,0 +1,15 @@
+<% content_for :thredded_page_title, @post_form.topic.title %>
+<% content_for :thredded_page_id, 'thredded--topic--new-post' %>
+<% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <div class="thredded--post-form--wrapper">
+      <h3 class="thredded--post-form--title"><%= t('thredded.posts.form.title_label') %></h3>
+      <%= render 'thredded/posts/form',
+                 post: @post_form,
+                 button_text: t('thredded.posts.form.create_btn'),
+                 button_submitting_text: t('thredded.posts.form.create_btn_submitting') %>
+    </div>
+  </section>
+<% end %>

data/app/views/thredded/posts_common/_actions.html.erb

@@ -1,5 +1,8 @@
 <% actions = capture do %>
   <%= view_hooks.post_common.actions.render self, post: post do %>
+    <% if post.can_reply? %>
+      <%= render 'thredded/posts_common/actions/quote', post: post %>
+    <% end  %>
     <% if post.can_update? %>
       <%= render 'thredded/posts_common/actions/edit', post: post %>
     <% end %>

data/app/views/thredded/posts_common/_form.html.erb

@@ -1,5 +1,7 @@
-<%# locals: messageboard, topic, post, preview_url, content_label, button_text, button_submitting_text. %>
-<%= form_for (post.private_topic_post? ? [topic, post] : [messageboard, topic, post]), as: :post,
+<%# locals: post, content_label, button_text, button_submitting_text. %>
+<%= form_for post,
+             url: post.submit_path,
+             as: :post,
              html: {
                  class: 'thredded--form thredded--post-form',
                  'data-thredded-post-form' => true,
@@ -8,7 +10,7 @@
              } do |form| %>
   <ul class="thredded--form-list">
     <%= render 'thredded/posts_common/form/content',
-               form: form, content_label: content_label, preview_url: preview_url %>
+               form: form, content_label: content_label, preview_url: post.preview_path %>
     <li>
       <% button_submitting_text ||=
              post.persisted? ? t('thredded.form.update_btn_submitting') : t('thredded.form.create_btn_submitting') %>

data/app/views/thredded/posts_common/_header.html.erb

@@ -2,5 +2,7 @@
 <header>
   <%= image_tag post.avatar_url, class: 'thredded--post--avatar' if post.user %>
   <h2 class="thredded--post--user"><%= user_link post.user %></h2>
-  <p class="thredded--post--created-at"><%= time_ago post.created_at %></p>
+  <a href="<%= post.permalink_path %>" rel="nofollow" class="thredded--link thredded--post--created-at">
+    <%= time_ago post.created_at %>
+  </a>
 </header>

data/app/views/thredded/posts_common/actions/_quote.html.erb

@@ -0,0 +1,4 @@
+<%= link_to t('thredded.posts.quote_btn'), url_for(post.quote_url_params),
+            'data-thredded-quote-post' => post.quote_path,
+            class: 'thredded--post--quote thredded--post--dropdown--actions--item',
+            rel: 'nofollow' %>

data/app/views/thredded/preferences/_form.html.erb

@@ -3,8 +3,6 @@
     class: 'thredded--form thredded--notification-preferences-form',
     'data-thredded-user-preferences-form' => true
 }) do |f| %>
-
-  <h3><%= t 'thredded.preferences.form.global_preferences_label' %></h3>
   <ul class="thredded--form-list">
     <li>
       <%= f.label :auto_follow_topics do %>
@@ -52,9 +50,9 @@
     <% end %>
   </ul>
   <% if preferences.messageboard %>
-    <h3>
-      <%= t 'thredded.preferences.form.messageboard_preferences_label_html', messageboard: messageboard.name %>
-    </h3>
+    <h2 class="thredded--preferences--title">
+      <%= t 'thredded.preferences.messageboard_preferences_title_html', messageboard: messageboard.name %>
+    </h2>
     <ul class="thredded--form-list" data-thredded-user-preferences-form-messageboard-fields>
       <li>
         <%= f.label :messageboard_auto_follow_topics do %>

data/app/views/thredded/preferences/_messageboards_nav.html.erb

@@ -0,0 +1,8 @@
+<% preferences.messageboard_groups.each do |group| %>
+  <h3 class="thredded--messageboards-group--title"><%= group.name %></h3>
+  <div class="thredded--messageboards-group">
+    <%= render partial: 'thredded/preferences/messageboards_nav_item',
+               collection: group.messageboards,
+               as: :messageboard %>
+  </div>
+<% end %>

data/app/views/thredded/preferences/_messageboards_nav_item.html.erb

@@ -0,0 +1,2 @@
+<%= link_to messageboard.name, edit_messageboard_preferences_path(messageboard),
+            class: 'thredded--preferences--messageboards-nav--item thredded--messageboard' %>

data/app/views/thredded/preferences/edit.html.erb

@@ -3,8 +3,18 @@
 <% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 
 <%= thredded_page do %>
-  <section class="thredded--main-section preferences">
-    <%= render 'thredded/preferences/header' %>
-    <%= render 'thredded/preferences/form', preferences: @preferences %>
+  <section class="thredded--main-section thredded--preferences">
+    <section class="thredded--preferences--form">
+      <h2 class="thredded--preferences--title"><%= t 'thredded.preferences.global_preferences_title' %></h2>
+      <%= render 'thredded/preferences/form', preferences: @preferences %>
+    </section>
+    <% unless preferences.messageboard %>
+      <section class="thredded--preferences--messageboards-nav">
+        <h2 class="thredded--preferences--title">
+          <%= t 'thredded.preferences.messageboard_preferences_nav_title' %>
+        </h2>
+        <%= render 'thredded/preferences/messageboards_nav', preferences: @preferences %>
+      </section>
+    <% end %>
   </section>
 <% end %>

data/app/views/thredded/private_posts/_form.html.erb

@@ -1,8 +1,6 @@
 <%# TODO: For private topics, only autocomplete users in this private topic %>
 <%= render 'thredded/posts_common/form',
-           topic: topic,
            post: post,
-           preview_url: preview_url,
            button_text: t('thredded.private_posts.form.create_btn'),
            button_submitting_text: t('thredded.private_posts.form.create_btn_submitting'),
            content_label: t('thredded.private_posts.form.content_label') %>

data/app/views/thredded/private_posts/edit.html.erb

@@ -2,16 +2,14 @@
 <% content_for :thredded_page_id, 'thredded--edit-post' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
-    <li><%= link_to t('thredded.nav.edit_post'), edit_post_path(@post) %></li>
+    <li><%= link_to t('thredded.nav.edit_post'), edit_post_path(@post_form.post) %></li>
   </ul>
 <% end %>
 
 <%= thredded_page do %>
   <section class="thredded--main-section">
     <%= render 'thredded/posts/form',
-               topic:        topic,
-               post:         @post,
-               preview_url:  private_topic_private_post_preview_path(@post.postable, @post),
+               post:         @post_form,
                button_text:  t('thredded.posts.form.update_btn'),
                button_submitting_text: t('thredded.posts.form.update_btn_submitting')%>
   </section>

data/app/views/thredded/private_posts/new.html.erb

@@ -0,0 +1,11 @@
+<% private_topic = @post_form.topic %>
+<% content_for :thredded_page_title, private_topic.title %>
+<% content_for :thredded_page_id, 'thredded--private-topic--new_post' %>
+<% content_for :thredded_breadcrumbs, render('thredded/private_topics/breadcrumbs') %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <%= render 'thredded/private_posts/form',
+               post: @post_form %>
+  </section>
+<% end %>

data/app/views/thredded/private_topics/_form.html.erb

@@ -1,5 +1,5 @@
 <%= form_for private_topic,
-             url: private_topics_path(@private_topic),
+             url: private_topic.submit_path,
              html: {
                  class: "thredded--form thredded--new-private-topic-form #{local_assigns[:css_class]}",
                  'data-thredded-topic-form' => true,
@@ -25,7 +25,7 @@
     <%= render 'thredded/posts_common/form/content',
                form: form,
                content_label: t('thredded.private_topics.form.content_label'),
-               preview_url: preview_url %>
+               preview_url: private_topic.preview_path %>
 
     <li>
       <button type="submit" class="thredded--form--submit"

data/app/views/thredded/private_topics/index.html.erb

@@ -12,9 +12,8 @@
     <% else -%>
       <%= render 'thredded/private_topics/form',
                  private_topic: @new_private_topic,
-                 preview_url: preview_new_private_topic_path,
                  css_class: 'thredded--is-compact',
-                 placeholder: t('thredded.private_topics.form.title_placeholder_start') %>
+                 placeholder: t('thredded.private_topics.form.title_placeholder_start') if @new_private_topic %>
 
       <%= render @private_topics %>
 

data/app/views/thredded/private_topics/new.html.erb

@@ -6,7 +6,6 @@
   <section class="thredded--main-section">
     <%= render 'thredded/private_topics/form',
                private_topic: @private_topic,
-               preview_url: preview_new_private_topic_path,
                placeholder:   t('thredded.private_topics.form.title_placeholder_new') if @private_topic %>
   </section>
 <% end %>

data/app/views/thredded/private_topics/show.html.erb

@@ -17,9 +17,11 @@
     <%= view_hooks.posts_common.pagination_bottom.render(self, posts: @posts) do %>
       <footer class="thredded--pagination-bottom"><%= paginate @posts %></footer>
     <% end %>
-    <%= render 'thredded/private_posts/form',
+
+    <% if policy(@new_post.post).create? %>
+      <%= render 'thredded/private_posts/form',
                topic: private_topic,
-               post: @post,
-               preview_url: private_topic.new_post_preview_path %>
+               post: @new_post %>
+    <% end %>
   <% end %>
 <% end %>

data/app/views/thredded/shared/_nav.html.erb

@@ -1,16 +1,10 @@
 <nav class="thredded--navigation">
   <ul class="thredded--user-navigation<%= ' thredded--user-navigation-standalone' if Thredded.standalone_layout? %>">
-    <% if thredded_signed_in? && Thredded.standalone_layout? %>
-      <li class="thredded--user-navigation--profile thredded--user-navigation--item">
-        <%= link_to thredded_current_user.thredded_display_name, user_path(thredded_current_user) %>
-      </li>
-    <% end %>
-
     <%= render 'thredded/shared/nav/moderation' %>
     <%= render 'thredded/shared/nav/notification_preferences', messageboard: messageboard_or_nil %>
     <%= render 'thredded/shared/nav/private_topics' %>
-
     <% if Thredded.standalone_layout? %>
+      <%= render 'thredded/shared/nav/standalone_profile' if thredded_signed_in? %>
       <%= render 'thredded/shared/nav/standalone' %>
     <% end %>
   </ul>

data/app/views/thredded/shared/nav/_notification_preferences.html.erb

@@ -1,7 +1,7 @@
 <% current = current_page_preferences? %>
 <li class="thredded--user-navigation--settings thredded--user-navigation--item<%= ' thredded--is-current' if current %>">
   <%= link_to current ? (messageboard ? messageboard_topics_path(messageboard) : messageboards_path)
-                      : edit_preferences_path(messageboard) do %>
+                      : edit_preferences_path(messageboard), rel: 'nofollow' do %>
     <%= inline_svg 'thredded/settings.svg', class: 'thredded--icon', title: t('thredded.nav.settings') %>
     <span class="thredded--nav-text"><%= t('thredded.nav.settings') %></span>
   <% end %>

data/app/views/thredded/shared/nav/_standalone.html.erb

@@ -1,12 +1,12 @@
-<li class="thredded--user-navigation--standalone thredded--user-navigation--item">
-  <% resource_name = Thredded.user_class.name.underscore %>
+<li class="thredded--user-navigation--standalone--session thredded--user-navigation--item">
+  <% resource_name = Thredded.user_class_name.underscore %>
   <% if thredded_signed_in? %>
     <%= link_to main_app.send(:"destroy_#{resource_name}_session_path"), method: :delete do %>
-      <span>Sign Out</span>
+      Sign Out
     <% end %>
   <% else %>
     <%= link_to main_app.send(:"new_#{resource_name}_session_path") do %>
-      <span>Sign In / Register</span>
+      Sign In / Register
     <% end %>
   <% end %>
 </li>

data/app/views/thredded/shared/nav/_standalone_profile.html.erb

@@ -0,0 +1,3 @@
+<li class="thredded--user-navigation--standalone--profile thredded--user-navigation--item">
+  <%= link_to thredded_current_user.thredded_display_name, user_path(thredded_current_user) %>
+</li>

data/app/views/thredded/theme_previews/show.html.erb

@@ -19,9 +19,7 @@
   <%= render 'section_title', label: 'topics#index', href: messageboard_topics_path(@messageboard) %>
   <%= content_tag :section, class: 'thredded--thredded--main-section topics' do %>
     <%= render 'thredded/topics/form',
-               messageboard: @messageboard,
                topic:        @new_topic,
-               preview_url:  preview_new_messageboard_topic_path(@messageboard),
                css_class:    'thredded--is-compact',
                placeholder:  'Start a New Topic' %>
     <%= render @topics %>
@@ -37,19 +35,14 @@
     <%= render 'thredded/topics/header', topic: @topic %>
     <%= render @posts %>
     <%= render 'thredded/posts/form',
-               messageboard: @messageboard,
-               topic:        @topic,
                post:         @new_post,
-               preview_url:  @topic.new_post_preview_path,
                button_text:  t('thredded.posts.form.create_btn')
     %>
   <% end %>
 
   <%= render 'section_title', label: 'topics#new', href: new_messageboard_topic_path(@messageboard) %>
   <%= render 'thredded/topics/form',
-             messageboard: @messageboard,
              topic:        @new_topic,
-             preview_url:  preview_new_messageboard_topic_path(@messageboard),
              placeholder:  'Start a New Topic' %>
 
   <%= render 'section_title', label: 'posts#edit', href: edit_messageboard_topic_post_path(@messageboard, @post.postable, @post) %>
@@ -57,10 +50,7 @@
     <h3 class="thredded--post-form--title">Edit Post</h3>
 
     <%= render 'thredded/posts/form',
-               messageboard: @messageboard,
-               topic:        @topic,
-               post:         @post,
-               preview_url:  @topic.new_post_preview_path,
+               post:         @post_form,
                button_text:  t('thredded.posts.form.update_btn')
     %>
   <% end %>
@@ -76,7 +66,6 @@
     <%= render 'thredded/private_topics/form',
                private_topic: @new_private_topic,
                css_class:     'thredded--is-compact',
-               preview_url:   preview_new_private_topic_path,
                placeholder:   t('thredded.private_topics.form.title_placeholder_start') %>
     <%= render @private_topics %>
   <% end %>
@@ -85,7 +74,6 @@
   <section class="thredded--thredded--main-section">
     <%= render 'thredded/private_topics/form',
                private_topic: @new_private_topic,
-               preview_url:   preview_new_private_topic_path,
                placeholder:   t('thredded.private_topics.form.title_placeholder_new') %>
   </section>
 
@@ -94,16 +82,14 @@
     <%= render 'thredded/private_topics/header', topic: @private_topic %>
     <%= render @private_posts %>
     <%= render 'thredded/private_posts/form',
-               topic:       @private_topic,
-               post:        @private_post,
-               preview_url: @private_topic.new_post_preview_path,
+               post:        @private_post_form,
                button_text: t('thredded.private_posts.form.create_btn')
     %>
   </section>
 
   <%= render 'section_title', label: 'preferences#edit', href: edit_messageboard_preferences_path(@messageboard) %>
   <%= content_tag :section, class: 'thredded--thredded--main-section preferences' do %>
-    <%= render 'thredded/preferences/header' %>
+    <h2 class="thredded--preferences-header--title"><%= t 'thredded.preferences.global_preferences_title' %></h2>
     <%= render 'thredded/preferences/form', preferences: @preferences %>
   <% end %>
 

data/app/views/thredded/topics/_form.html.erb

@@ -1,4 +1,5 @@
-<%= form_for [messageboard, topic],
+<%= form_for topic,
+             url: topic.submit_path,
              html: {
                  class: "thredded--form thredded--new-topic-form #{local_assigns[:css_class]}",
                  'data-thredded-topic-form' => true,
@@ -23,7 +24,7 @@
     <%= render 'thredded/posts_common/form/content',
                form: form,
                content_label: t('thredded.topics.form.content_label'),
-               preview_url: preview_url %>
+               preview_url: topic.preview_path %>
     <%= render 'thredded/topics/topic_form_admin_options', form: form %>
 
     <li><%= form.submit t('thredded.topics.form.create_btn'), class: 'thredded--form--submit' %></li>

data/app/views/thredded/topics/index.html.erb

@@ -10,10 +10,8 @@
 
   <%= content_tag :section, class: 'thredded--main-section thredded--topics', 'data-thredded-topics' => true do %>
     <%= render 'thredded/topics/form',
-               messageboard: messageboard,
                topic: @new_topic,
                css_class: 'thredded--is-compact',
-               preview_url: preview_new_messageboard_topic_path(messageboard),
                placeholder: t('thredded.topics.form.title_placeholder_start') if @new_topic %>
     <%= render partial: 'thredded/topics/topic', collection: @topics, locals: {topics: @topics} %>
   <% end %>

data/app/views/thredded/topics/new.html.erb

@@ -5,10 +5,8 @@
 <%= thredded_page do %>
   <section class="thredded--main-section">
     <%= render 'thredded/topics/form',
-               messageboard: messageboard,
                topic: @new_topic,
                css_class: 'thredded--is-expanded',
-               preview_url: preview_new_messageboard_topic_path(messageboard),
                placeholder: t('thredded.topics.form.title_placeholder_start') %>
   </section>
 <% end %>

data/app/views/thredded/topics/search.html.erb

@@ -5,7 +5,16 @@
 <%= thredded_page do %>
   <% if @topics.present? %>
     <p class="thredded--alert thredded--alert-success">
-      <%= t 'thredded.topics.search.results_message', query: "'#{@query}'" %>
+      <% if messageboard_or_nil %>
+        <%= t 'thredded.topics.search.results_in_messageboard_message_html',
+              query: @query, messageboard: messageboard.name %>
+        <br>
+        <a href="<%= messageboards_search_path(q: @query) %>">
+          <%= t('thredded.topics.search.search_in_all_messageboards_btn') -%>
+        </a>
+      <% else %>
+        <%= t 'thredded.topics.search.results_message_html', query: @query %>
+      <% end %>
     </p>
     <section class="thredded--main-section thredded--topics">
       <%= render @topics %>
@@ -15,7 +24,16 @@
     </footer>
   <% else %>
     <p class="thredded--alert thredded--alert-danger">
-      <%= t 'thredded.topics.search.no_results_message', query: "'#{@query}'" %>
+      <% if messageboard_or_nil %>
+        <%= t 'thredded.topics.search.no_results_in_messageboard_message_html',
+              query: @query, messageboard: messageboard.name -%>
+        <br>
+        <a href="<%= messageboards_search_path(q: @query) %>">
+          <%= t('thredded.topics.search.search_in_all_messageboards_btn') -%>
+        </a>
+      <% else %>
+        <%= t 'thredded.topics.search.no_results_message_html', query: @query %>
+      <% end %>
     </p>
   <% end %>
 <% end %>

data/app/views/thredded/topics/show.html.erb

@@ -17,13 +17,11 @@
       <footer class="thredded--pagination-bottom"><%= paginate @posts %></footer>
     <% end %>
 
-    <% if policy(@new_post).create? %>
+    <% if policy(@new_post.post).create? %>
       <div class="thredded--post-form--wrapper">
         <h3 class="thredded--post-form--title"><%= t('thredded.posts.form.title_label') %></h3>
         <%= render 'thredded/posts/form',
-                   topic:       topic,
                    post:        @new_post,
-                   preview_url: topic.new_post_preview_path,
                    button_text: t('thredded.posts.form.create_btn'),
                    button_submitting_text: t('thredded.posts.form.create_btn_submitting') %>
       </div>

data/config/locales/en.yml

@@ -82,6 +82,7 @@ en:
         update_btn: Update Post
         update_btn_submitting: :thredded.form.update_btn_submitting
       pending_moderation_notice: Your post will be published when it has been reviewed by a moderator.
+      quote_btn: Quote
     preferences:
       edit:
         page_title: :thredded.nav.settings
@@ -92,7 +93,6 @@ en:
         follow_topics_on_mention:
           hint: 'When someone mentions you by your username (eg: @sam) you will follow the topic.'
           label: Follow topics you are mentioned in
-        global_preferences_label: Global Settings
         messageboard_auto_follow_topics:
           hint: Automatically follow all new topics in this messageboard. This overrides the respective setting
             above.
@@ -103,14 +103,15 @@ en:
           label: :thredded.preferences.form.follow_topics_on_mention.label
         messageboard_notifications_for_followed_topics:
           label: :thredded.preferences.form.notifications_for_followed_topics.label
-        messageboard_preferences_label_html: Notification Settings for <em>%{messageboard}</em>
         notifications_for_followed_topics:
           label: Notifications for followed topics
         notifications_for_private_topics:
           label: Notifications for private messages
         submit_btn: Update Settings
-        title: Settings
         update_btn_submitting: :thredded.form.update_btn_submitting
+      global_preferences_title: Global Settings
+      messageboard_preferences_nav_title: Messageboard Settings
+      messageboard_preferences_title_html: Settings for <em>%{messageboard}</em>
       updated_notice: Your settings have been updated.
     private_posts:
       form:
@@ -172,9 +173,12 @@ en:
       mark_as_unread: Mark unread from here
       not_following: You are not following this topic.
       search:
-        no_results_message: There are no results for your search - %{query}
+        no_results_in_messageboard_message_html: There are no results for your search <q>%{query}</q> in %{messageboard}
+        no_results_message_html: There are no results for your search <q>%{query}</q>
         page_title: Topics Search Results
-        results_message: Search Results for %{query}
+        results_in_messageboard_message_html: Search results for <q>%{query}</q> in %{messageboard}
+        results_message_html: Search results for <q>%{query}</q>
+        search_in_all_messageboards_btn: Search everywhere
       started_by_html: Started %{time_ago} by %{user}
       sticky:
         label: Sticky

data/config/locales/es.yml

@@ -27,7 +27,7 @@ es:
         update_btn_submitting: :thredded.form.update_btn_submitting
       index:
         page_title: Foros
-      last_updated_by_html: Actualizado hace %{time_ago} <cite>por %{user}</cite>
+      last_updated_by_html: Actualizado %{time_ago} <cite>por %{user}</cite>
       topics_and_posts_counts: "%{topics_count} temas / %{posts_count} mensajes"
       update: :thredded.form.update
       updated_notice: Foro actualizado
@@ -82,6 +82,7 @@ es:
         update_btn: Actualizar Mensaje
         update_btn_submitting: :thredded.form.update_btn_submitting
       pending_moderation_notice: Tu post será publicado cuando haya sido revisado por un moderador.
+      quote_btn: Citar
     preferences:
       edit:
         page_title: :thredded.nav.settings
@@ -93,7 +94,6 @@ es:
         follow_topics_on_mention:
           hint: 'Cuando alguien te menciona usando tu nombre de usuario (por ejemplo: @sam), seguirás el tema.'
           label: Sigue temas en los que seas mencionado
-        global_preferences_label: Ajustes Generales
         messageboard_auto_follow_topics:
           hint: >-
             Sigue automáticamente todos los nuevos temas en este tablero de mensajes. Esto anula la configuración
@@ -105,14 +105,15 @@ es:
           label: :thredded.preferences.form.follow_topics_on_mention.label
         messageboard_notifications_for_followed_topics:
           label: :thredded.preferences.form.notifications_for_followed_topics.label
-        messageboard_preferences_label_html: Ajustes de Notificaciones para <em>%{messageboard}</em>
         notifications_for_followed_topics:
           label: Notificaciones de temas seguidos
         notifications_for_private_topics:
           label: Notificaciones de mensajes privados
         submit_btn: Actualizar Ajustes
-        title: Ajustes
         update_btn_submitting: :thredded.form.update_btn_submitting
+      global_preferences_title: Ajustes Generales
+      messageboard_preferences_nav_title: Ajustes por foro
+      messageboard_preferences_title_html: Ajustes de Notificaciones para <em>%{messageboard}</em>
       updated_notice: Tus ajustes han sido actualizados.
     private_posts:
       form:
@@ -174,9 +175,12 @@ es:
       mark_as_unread: Marcar sin leer desde aquí
       not_following: No estás siguiendo este tema.
       search:
-        no_results_message: No hay resultados para tu búsqueda - %{query}
+        no_results_in_messageboard_message_html: No hay resultados para tu búsqueda <q>%{query}</q> en %{messageboard}
+        no_results_message_html: No hay resultados para tu búsqueda - <q>%{query}</q>
         page_title: Temas encontrados
-        results_message: Resultados de búsqueda para %{query}
+        results_in_messageboard_message_html: Resultados de la búsqueda para <q>%{query}</q> en %{messageboard}
+        results_message_html: Resultados de búsqueda para <q>%{query}</q>
+        search_in_all_messageboards_btn: Buscar en todas partes
       started_by_html: Empezado hace %{time_ago} por %{user}
       sticky:
         label: Fijado