thredded 0.10.1 → 0.11.0

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

@@ -1 +1 @@
-<%= render 'thredded/posts_common/content', post: post %>
+<%= render 'thredded/posts_common/content', post: post, options: local_assigns[:options] || {} %>

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

@@ -1,5 +1,3 @@
 <div class="thredded--post--content">
-  <% cache [post, 'content'], expires_in: 1.week do %>
-    <%= post.filtered_content(self) %>
-  <% end %>
+  <%= post.filtered_content(self, local_assigns[:options] || {}) %>
 </div>

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

@@ -1,14 +1,22 @@
-<%= form_for(
-        preferences,
-        method: :patch,
-        url:    (preferences.messageboard ? messageboard_preferences_path(preferences.messageboard) : global_preferences_path),
-        html:   {
-            class:                                'thredded--form thredded--notification-preferences-form',
-            'data-thredded-user-preferences-form' => true
-        }) do |f| %>
+<%# @type preferences [Thredded::UserPreferencesForm] %>
+<%= form_for(preferences, method: :patch, url: preferences.update_path, html: {
+    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 %>
+        <%= f.check_box :auto_follow_topics,
+                        'data-thredded-update-checkbox-on-change' =>
+                            'user_preferences_form[messageboard_auto_follow_topics]' %>
+        <%= t 'thredded.preferences.form.auto_follow_topics.label' %>
+        <p class="thredded--form-list--hint">
+          <%= t 'thredded.preferences.form.auto_follow_topics.hint' %>
+        </p>
+      <% end %>
+    </li>
     <li>
       <%= f.label :follow_topics_on_mention do %>
         <%= f.check_box :follow_topics_on_mention, 'data-thredded-bound-messageboard-pref' => 'user_preferences_form[messageboard_follow_topics_on_mention]' %>
@@ -48,6 +56,15 @@
       <%= t 'thredded.preferences.form.messageboard_preferences_label_html', messageboard: messageboard.name %>
     </h3>
     <ul class="thredded--form-list" data-thredded-user-preferences-form-messageboard-fields>
+      <li>
+        <%= f.label :messageboard_auto_follow_topics do %>
+          <%= f.check_box :messageboard_auto_follow_topics %>
+          <%= t 'thredded.preferences.form.messageboard_auto_follow_topics.label' %>
+          <p class="thredded--form-list--hint">
+            <%= t 'thredded.preferences.form.messageboard_auto_follow_topics.hint' %>
+          </p>
+        <% end %>
+      </li>
       <li>
         <%= f.label :messageboard_follow_topics_on_mention do %>
           <%= f.check_box :messageboard_follow_topics_on_mention %>

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

@@ -1 +1 @@
-<%= render 'thredded/posts_common/content', post: post %>
+<%= render 'thredded/posts_common/content', post: post, options: local_assigns[:options] || {} %>

data/app/views/thredded/private_topic_mailer/message_notification.html.erb

@@ -1,17 +1,20 @@
-<figure>
-    <figcaption>
+<div class="thredded--email">
+  <figure class="thredded--email-post">
+    <figcaption class="thredded--email-post--author">
       <%= @post.user.thredded_display_name %> <%= link_to 'said', private_post_permalink_url(@post) %>:
     </figcaption>
-    <blockquote>
-        <%= @post.filtered_content(self) %>
-    </blockquote>
-</figure>
-<hr />
-<p>
-  This email was sent to you because <%= @topic.user.thredded_display_name %> included you in a
-  private topic, "<%= link_to @topic.title, private_topic_url(@topic) %>".
-</p>
+    <% cache [@post, 'content-onebox-placeholders'] do %>
+      <%= render partial: 'thredded/private_posts/content',
+                 locals: { post: @post, options: {onebox_placeholders: true} } %>
+    <% end %>
+  </figure>
+  <hr/>
+  <p>
+    This email was sent to you because <%= @topic.user.thredded_display_name %> included you in a
+    private topic, "<%= link_to @topic.title, private_topic_url(@topic) %>".
+  </p>
 
-<p>
-  To unsubscribe from these emails, update your <%= link_to 'preferences', edit_preferences_url %>.
-</p>
+  <p>
+    To unsubscribe from these emails, update your <%= link_to 'preferences', edit_preferences_url %>.
+  </p>
+</div>

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

@@ -11,23 +11,25 @@
 
 
 <%= thredded_page do %>
-  <%= form_for @private_topic,
-               url:  private_topic_path(@private_topic),
-               html: { class: 'thredded--form', 'data-thredded-topic-form' => true } do |form| %>
-    <ul class="thredded--form-list on-top">
-      <li class="title">
-        <%= form.label :title, t('thredded.private_topics.form.title_label') %>
-        <%= form.text_field :title,
-                            placeholder: t('thredded.private_topics.form.title_placeholder_new'),
-                            autofocus:   true,
-                            required:    true %>
-      </li>
-      <li>
-        <button type="submit" class="thredded--form--submit"
-                data-disable-with="<%= t 'thredded.private_topics.form.update_btn_submitting' %>">
-          <%= t('thredded.private_topics.form.update_btn') %>
-        </button>
-      </li>
-    </ul>
-  <% end %>
+  <section class="thredded--main-section">
+    <%= form_for @private_topic,
+                 url: private_topic_path(@private_topic),
+                 html: { class: 'thredded--form', 'data-thredded-topic-form' => true } do |form| %>
+      <ul class="thredded--form-list on-top">
+        <li class="title">
+          <%= form.label :title, t('thredded.private_topics.form.title_label') %>
+          <%= form.text_field :title,
+                              placeholder: t('thredded.private_topics.form.title_placeholder_new'),
+                              autofocus: true,
+                              required: true %>
+        </li>
+        <li>
+          <button type="submit" class="thredded--form--submit"
+                  data-disable-with="<%= t 'thredded.private_topics.form.update_btn_submitting' %>">
+            <%= t('thredded.private_topics.form.update_btn') %>
+          </button>
+        </li>
+      </ul>
+    <% end %>
+  </section>
 <% end %>

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

@@ -10,39 +10,41 @@
 <% end %>
 
 <%= thredded_page do %>
-  <%= form_for @edit_topic,
-               url: @edit_topic.path,
-               html: { class: 'thredded--form thredded--is-expanded', 'data-thredded-topic-form' => true } do |form| %>
-    <ul class="thredded--form-list on-top">
+  <section class="thredded--main-section">
+    <%= form_for @edit_topic,
+                 url: @edit_topic.path,
+                 html: { class: 'thredded--form thredded--is-expanded', 'data-thredded-topic-form' => true } do |form| %>
+      <ul class="thredded--form-list on-top">
 
-      <li class="title">
-        <%= form.label :title, t('thredded.topics.form.title_label') %>
-        <%= form.text_field :title,
-                            placeholder: t('thredded.topics.form.title_placeholder'),
-                            autofocus:   true,
-                            required:    true %>
-      </li>
-
-      <% if form.object.category_options.any? %>
-        <li class="category">
-          <%= form.select :category_ids, form.object.category_options, {},
-                          multiple:          true,
-                          'data-placeholder' => t('thredded.topics.form.categories_placeholder') %>
+        <li class="title">
+          <%= form.label :title, t('thredded.topics.form.title_label') %>
+          <%= form.text_field :title,
+                              placeholder: t('thredded.topics.form.title_placeholder'),
+                              autofocus: true,
+                              required: true %>
         </li>
-      <% end %>
 
-      <li>
-        <%= form.label :messageboard_id, t('thredded.topics.form.messageboard_label') %>
-        <%= form.select :messageboard_id, form.object.messageboard_options %>
-      </li>
+        <% if form.object.category_options.any? %>
+          <li class="category">
+            <%= form.select :category_ids, form.object.category_options, {},
+                            multiple: true,
+                            'data-placeholder' => t('thredded.topics.form.categories_placeholder') %>
+          </li>
+        <% end %>
 
-      <%= render 'thredded/topics/topic_form_admin_options', form: form %>
+        <li>
+          <%= form.label :messageboard_id, t('thredded.topics.form.messageboard_label') %>
+          <%= form.select :messageboard_id, form.object.messageboard_options %>
+        </li>
 
-      <li>
-        <button type="submit" class="thredded--form--submit">
-          <%= t('thredded.topics.form.update_btn') %>
-        </button>
-      </li>
-  <% end %>
-  </ul>
+        <%= render 'thredded/topics/topic_form_admin_options', form: form %>
+
+        <li>
+          <button type="submit" class="thredded--form--submit">
+            <%= t('thredded.topics.form.update_btn') %>
+          </button>
+        </li>
+    <% end %>
+    </ul>
+  </section>
 <% end %>

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

@@ -3,10 +3,12 @@
 <% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 
 <%= thredded_page do %>
-  <%= 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 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/show.html.erb

@@ -19,7 +19,7 @@
 
     <% if policy(@new_post).create? %>
       <div class="thredded--post-form--wrapper">
-        <h3 class="thredded--post-form--title">Add a post</h3>
+        <h3 class="thredded--post-form--title"><%= t('thredded.posts.form.title_label') %></h3>
         <%= render 'thredded/posts/form',
                    topic:       topic,
                    post:        @new_post,

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

@@ -1,6 +1,6 @@
 <% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
 <%= content_tag :article, id: dom_id(post), class: 'thredded--post' do %>
+  <%= render 'thredded/posts_common/actions', post: post %>
   <%= render 'thredded/posts_common/header_with_topic', post: post %>
   <%= content || render('thredded/posts/content', post: post) %>
-  <%= render 'thredded/posts_common/actions', post: post %>
 <% end %>

data/bin/rubocop

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
+                                           Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rubocop', 'rubocop')

data/config/locales/en.yml

@@ -13,14 +13,17 @@ en:
       private_topic_not_found: This private topic does not exist.
     form:
       create_btn_submitting: Creating...
+      preview: Preview
       update: Update
       update_btn_submitting: Updating...
-      preview: Preview
     messageboard:
       create: Create a New Messageboard
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        description_label: Description
+        messageboard_group_id_label: Messageboard group
         no_group: No Group
+        title_label: Name
         update_btn_submitting: :thredded.form.update_btn_submitting
       index:
         page_title: Messageboards
@@ -75,6 +78,7 @@ en:
         content_label: Content
         create_btn: Submit Reply
         create_btn_submitting: Posting...
+        title_label: Add a post
         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.
@@ -82,10 +86,17 @@ en:
       edit:
         page_title: :thredded.nav.settings
       form:
+        auto_follow_topics:
+          hint: Automatically follow all new topics. Changing this setting will change it for all messageboards.
+          label: Follow all new topics
         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.
+          label: Follow all new topics
         messageboard_follow_topics_on_mention:
           hint: 'When someone mentions you by your username (eg: @sam) in this messageboard you will follow the
             topic.'
@@ -143,6 +154,7 @@ en:
       followed_by_noone: No one is following this topic
       followed_notice: You are now following this topic
       following:
+        auto: You are following this topic because auto-follow is enabled.
         manual: You are following this topic.
         mentioned: You are following this topic because you were mentioned on it.
         posted: You are following this topic because you posted to it.

data/config/locales/es.yml

@@ -20,7 +20,10 @@ es:
       create: Crear un nuevo foro
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        description_label: Descripción
+        messageboard_group_id_label: grupo messageboard
         no_group: Sin grupo
+        title_label: Nombre
         update_btn_submitting: :thredded.form.update_btn_submitting
       index:
         page_title: Foros
@@ -75,6 +78,7 @@ es:
         content_label: Contenido
         create_btn: Responder
         create_btn_submitting: Enviando...
+        title_label: Añadir una publicación
         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.
@@ -82,10 +86,19 @@ es:
       edit:
         page_title: :thredded.nav.settings
       form:
+        auto_follow_topics:
+          hint: Sigue automáticamente todos los temas nuevos. El cambio de este ajuste se cambiará en todos los
+            messageboards.
+          label: Siga todos los temas nuevos
         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
+            respectiva anteriormente.
+          label: Siga todos los temas nuevos
         messageboard_follow_topics_on_mention:
           hint: 'Cuando alguien te menciona usando tu nombre de usuario (por ejemplo: @sam) en este foro, seguirás
             el tema.'
@@ -143,6 +156,7 @@ es:
       followed_by_noone: Nadie está siguiendo este tema
       followed_notice: Estás siguiendo este tema
       following:
+        auto: Estás siguiendo este tema porque seguimiento automático está activado.
         manual: Estás siguiendo este tema.
         mentioned: Estás siguiendo este tema porque alguien te ha mencionado en él.
         posted: Estás siguiendo este tema porque has escrito en él.

data/config/locales/pl.yml

@@ -20,7 +20,10 @@ pl:
       create: Stwórz nową tablicę
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        description_label: Opis
+        messageboard_group_id_label: messageboard grupa
         no_group: Brak grupy
+        title_label: Nazwa
         update_btn_submitting: :thredded.form.update_btn_submitting
       index:
         page_title: Tablice
@@ -75,6 +78,7 @@ pl:
         content_label: Treść
         create_btn: Wyślij odpowiedź
         create_btn_submitting: Wysyłanie...
+        title_label: Dodaj posta
         update_btn: Zaktualizuj post
         update_btn_submitting: :thredded.form.update_btn_submitting
       pending_moderation_notice: Twój post zostanie zamieszczony po zweryfikowaniu go przez moderatora.
@@ -82,10 +86,18 @@ pl:
       edit:
         page_title: :thredded.nav.settings
       form:
+        auto_follow_topics:
+          hint: >-
+            Automatycznie śledzić wszystkie nowe tematy. Zmiana tego ustawienia powoduje zmianę dla wszystkich messageboards.
+          label: Śledź wszystkie nowe tematy
         follow_topics_on_mention:
           hint: 'Gdy ktoś w temacie wspomni o Tobie (np.: @sam) zaczniesz obserwować ten temat.'
           label: Obserwuj tematy, w których zostałeś wspomiany
         global_preferences_label: Ustawienia powiadomień
+        messageboard_auto_follow_topics:
+          hint: Automatycznie śledzić wszystkie nowe tematy na tym messageboard. To zastępuje odpowiednie ustawienie
+            powyżej.
+          label: Śledź wszystkie nowe tematy
         messageboard_follow_topics_on_mention:
           hint: 'Gdy ktoś w temacie wspomni o Tobie (np.: @sam) zaczniesz obserwować ten temat.'
           label: :thredded.preferences.form.follow_topics_on_mention.label
@@ -142,6 +154,7 @@ pl:
       followed_by_noone: Nikt nie obserwuje tego tematu
       followed_notice: Obserwujesz ten temat
       following:
+        auto: Osoby stosujące ten temat, ponieważ auto naśladowania jest włączony.
         manual: Obserwujesz ten temat.
         mentioned: Obserwujesz ten temat, ponieważ ktoś wspomniał w nim o tobie.
         posted: Obserwujesz ten temat, ponieważ w nim napisałeś.

data/config/locales/pt-BR.yml

@@ -20,7 +20,10 @@ pt-BR:
       create: Criar um novo Fórum de Mensagem
       form:
         create_btn_submitting: :thredded.form.create_btn_submitting
+        description_label: Descrição
+        messageboard_group_id_label: grupo messageboard
         no_group: Sem Grupo
+        title_label: Nome
         update_btn_submitting: :thredded.form.update_btn_submitting
       index:
         page_title: Fóruns de Mensagens
@@ -75,6 +78,7 @@ pt-BR:
         content_label: Conteúdo
         create_btn: Enviar Resposta
         create_btn_submitting: Postando...
+        title_label: Adicionar um post
         update_btn: Atualizar Post
         update_btn_submitting: :thredded.form.update_btn_submitting
       pending_moderation_notice: O envio da mensagem será publicada quando foi revisado por um moderador.
@@ -82,12 +86,19 @@ pt-BR:
       edit:
         page_title: :thredded.nav.settings
       form:
+        auto_follow_topics:
+          hint: siga automaticamente todos os novos temas. Alterar essa configuração vai mudá-lo para todos os messageboards.
+          label: Siga todos os novos temas
         follow_topics_on_mention:
           hint: >-
             Quando alguém mencionar você através do seu usuário (ex.: @sam) você irá receber um e-mail com o conteúdo
             deste post.
           label: Siga os tópicos que são mencionados na
         global_preferences_label: Configurações Globais
+        messageboard_auto_follow_topics:
+          hint: siga automaticamente todos os novos tópicos neste messageboard. Isso substitui a respectiva definição
+            acima.
+          label: Siga todos os novos temas
         messageboard_follow_topics_on_mention:
           hint: >-
             Quando alguém mencionar você através do seu usuário (ex.: @sam) neste fórum de mensagens, você irá receber
@@ -146,6 +157,7 @@ pt-BR:
       followed_by_noone: Ninguém está seguindo este tópico
       followed_notice: Você agora está seguindo este tópico
       following:
+        auto: Você está seguindo este tópico porque o auto-follow está ativado.
         manual: Você está seguindo este tópico.
         mentioned: Você está seguindo este tópico porque você foi mencionado nele.
         posted: Você está seguindo este tópico porque foi você que o publicou.