thredded 0.11.1 → 0.12.0

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/_standalone.html.erb

@@ -1,12 +1,12 @@
-<li class="thredded--user-navigation--standalone thredded--user-navigation--item">
+<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/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:

data/config/locales/es.yml

@@ -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:

data/config/locales/pl.yml

@@ -82,6 +82,7 @@ pl:
         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.
+      quote_btn: Zacytować
     preferences:
       edit:
         page_title: :thredded.nav.settings
@@ -93,7 +94,6 @@ pl:
         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.
@@ -103,14 +103,15 @@ pl:
           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: Powiadomienia z obserwowanych tematów
         notifications_for_private_topics:
           label: Powiadomienia z prywatnych wiadomości
         submit_btn: Zaktualizuj ustawienia
-        title: Ustawienia
         update_btn_submitting: :thredded.form.update_btn_submitting
+      global_preferences_title: Ustawienia powiadomień
+      messageboard_preferences_nav_title: Ustawienia na tablicę
+      messageboard_preferences_title_html: Notification Settings for <em>%{messageboard}</em>
       updated_notice: Twoje ustawienia zostały zaktualizowane.
     private_posts:
       form:

data/config/locales/pt-BR.yml

@@ -82,6 +82,7 @@ pt-BR:
         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.
+      quote_btn: Citar
     preferences:
       edit:
         page_title: :thredded.nav.settings
@@ -94,7 +95,6 @@ pt-BR:
             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.
@@ -106,14 +106,15 @@ pt-BR:
           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: Configurações de Notificação para <em>%{messageboard}</em>
         notifications_for_followed_topics:
           label: Notificações para tópicos seguido
         notifications_for_private_topics:
           label: Notificações de mensagens privadas
         submit_btn: Atualizar Configurações
-        title: Configurações
         update_btn_submitting: :thredded.form.update_btn_submitting
+      global_preferences_title: Configurações Globais
+      messageboard_preferences_nav_title: Configurações por Fórum de Mensagem
+      messageboard_preferences_title_html: Configurações de Notificação para <em>%{messageboard}</em>
       updated_notice: Suas configurações foram atualizadas.
     private_posts:
       form:

data/config/locales/ru.yml

@@ -66,7 +66,7 @@ ru:
       moderation_pending: В ожидании
       moderation_users: Пользователи
       private_topics: Личное
-      settings: Уведомления
+      settings: Настройки
     null_user_name: Пользователь удален
     posts:
       delete: Удалить пост
@@ -81,6 +81,7 @@ ru:
         update_btn: Обновить пост
         update_btn_submitting: :thredded.form.update_btn_submitting
       pending_moderation_notice: Ваш пост будет опубликован, когда будет одобрен модератором.
+      quote_btn: Цитировать
     preferences:
       edit:
         page_title: :thredded.nav.settings
@@ -92,7 +93,6 @@ ru:
         follow_topics_on_mention:
           hint: 'Когда кто-то упоминает вас на форуме (например: @sam), Вы будете наблюдать за этой темой.'
           label: Наблюдать за темой, в которой Вы упомянуты
-        global_preferences_label: Настройки форума
         messageboard_auto_follow_topics:
           hint: Автоматически следовать все новые темы в этом ОБЪЯВЛЕНИЯ. Это отменяет соответствующую настройку
             выше.
@@ -102,14 +102,15 @@ ru:
           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: Настройки уведомлений для <em>%{messageboard}</em>
         notifications_for_followed_topics:
           label: Уведомления для отслеживаемых тем
         notifications_for_private_topics:
           label: Уведомления для личных сообщений
         submit_btn: Сохранить настройки
-        title: Настройки
         update_btn_submitting: :thredded.form.update_btn_submitting
+      global_preferences_title: Общие настройки
+      messageboard_preferences_nav_title: Настройки форума
+      messageboard_preferences_title_html: Настройки уведомлений для <em>%{messageboard}</em>
       updated_notice: Ваши настройки были обновлены.
     private_posts:
       form:
@@ -188,12 +189,16 @@ ru:
       last_active_html: Последняя активность %{time_ago}
       posted_in_topic_html: Сделан пост в %{topic_link}
       posts_count:
-        one: Сделан пост
-        other: Сделано постов %{count} раз
+        few: Сделано %{count} поста
+        many: Сделано %{count} постов
+        one: Сделан %{count} пост
+        other: Сделано %{count} постов
       recent_activity: :thredded.recent_activity
       started_topic_html: Начато %{topic_link}
       started_topics_count:
-        one: Начата тема
+        few: Начато %{count} темы
+        many: Начато %{count} тем
+        one: Начата %{count} тема
         other: Начато %{count} тем
       user_posted_in_topic_html: "%{user_link} сделал запись в %{topic_link}"
       user_since_html: Пользователь был %{time_ago}