thredded 0.2.2 → 0.3.0

data/app/views/thredded/post_mailer/at_notification.html.erb

@@ -1,11 +1,11 @@
-<%= @post.filtered_content(self) %>
+<blockquote><%= @post.filtered_content(self) %></blockquote>
 
 <hr />
 
 <p>
   This email was sent to you because <%= @post.user %> mentioned you in
-  "<%= link_to @post.postable.title, messageboard_topic_posts_url(@post.messageboard, @post.postable, anchor: "post_#{@post.id}") %>".
-  <%= link_to 'View the conversation here.', messageboard_topic_posts_url(@post.messageboard, @post.postable) %>
+  "<%= link_to @post.postable.title, post_url(@post) %>".
+  <%= link_to 'View the conversation here', topic_url(@post.postable) %>.
 </p>
 
 <p>

data/app/views/thredded/post_mailer/at_notification.text.erb

@@ -4,7 +4,7 @@
 
 This email was sent to you because <%= @post.user %> mentioned you in
 "<%= @post.postable.title %>". Go here to view the conversation:
-<%= messageboard_topic_posts_url @post.messageboard, @post.postable, anchor: "post_#{@post.id}" %>
+<%= post_url @post %>
 
 To unsubscribe from these emails, update your preferences here:
   <%= edit_messageboard_preferences_url @post.messageboard %>

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

@@ -1,4 +1,4 @@
 <li>
-  <%= form.label :content %>
+  <%= form.label :content, content_label %>
   <%= form.text_area :content, { rows: 5, required: true }  %>
 </li>

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

@@ -1 +1,5 @@
-<%= render 'thredded/posts_common/form', topic: topic, post: post, button_text: button_text %>
+<%= render 'thredded/posts_common/form',
+           topic: topic,
+           post: post,
+           content_label: t('thredded.posts.form.content_label'),
+           button_text: button_text %>

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

@@ -1 +1,3 @@
-<%= render 'thredded/posts_common/post', post: post %>
+<% cache(post, expires_in: 1.week) do %>
+  <%= render 'thredded/posts_common/post', post: post %>
+<% end %>

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

@@ -1,13 +1,17 @@
 <% content_for :thredded_page_title, 'Edit Post' %>
 <% 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>
+  </ul>
+<% end %>
+
 <%= thredded_page do %>
   <section class="thredded--main-section">
-    <h3 class="thredded--post-form--title">Edit Post</h3>
-
     <%= render 'thredded/posts/form',
                messageboard: messageboard,
                topic:        topic,
                post:         @post,
-               button_text:  'Update Post' %>
+               button_text:  t('thredded.posts.form.update_btn') %>
   </section>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= form_for (post.private_topic_post? ? [topic, post] : [messageboard, topic, post]), as: :post,
              html: { class: 'thredded--form thredded--post-form', 'data-thredded-post-form' => true } do |form| %>
   <ul class="thredded--form-list">
-    <%= render 'thredded/posts/content_field', form: form %>
+    <%= render 'thredded/posts/content_field', form: form, content_label: content_label %>
 
     <li>
       <%= form.submit button_text, class: 'thredded--form--submit' %>

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

@@ -1,20 +1,26 @@
-<% post = Thredded::PostDecorator.new(post) %>
-
-<%= content_tag_for :article, post, class: 'thredded--post' do %>
+<%# @param post [Thredded::PostView] %>
+<%= content_tag :article, id: dom_id(post), class: 'thredded--post' do %>
   <header>
-    <%= image_tag post.avatar_url, class: 'thredded--post--avatar' unless post.user_anonymous? %>
+    <%= 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>
-
   </header>
 
   <div class="thredded--post--content">
-    <% cache [post, 'content'] do %>
+    <% cache [post, 'content'], expires_in: 1.week do %>
       <%= post.filtered_content(self) %>
     <% end %>
   </div>
 
-  <% if current_ability.can? :edit, post.original %>
-    <%= link_to 'Edit Post', edit_post_path(post.original), class: 'thredded--post--edit' %>
+  <% if post.can_update? %>
+    <%= link_to t('thredded.posts.edit'), post.edit_path, class: 'thredded--post--edit' %>
+  <% end %>
+
+  <% if post.can_destroy? %>
+    <%= link_to t('thredded.posts.delete'), post.destroy_path,
+                method: :delete,
+                class:  'thredded--post--delete',
+                data:   { confirm: I18n.t('thredded.posts.delete_confirm') }
+    %>
   <% end %>
 <% end %>

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

@@ -1,28 +1,50 @@
-<%= form_for [messageboard, preference], url: messageboard_preferences_path(messageboard),
-             html: { class: 'thredded--form thredded--notification-preferences-form' } do |f| %>
+<%= form_for(
+        preferences,
+        method: :patch,
+        url:    (preferences.messageboard ? messageboard_preferences_path(preferences.messageboard) : preferences_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 :notify_on_mention do %>
-        <%= f.check_box :notify_on_mention %>
-        @ Notifications
+      <%= f.label :notify_on_message do %>
+        <%= f.check_box :notify_on_message %>
+        <%= t 'thredded.preferences.form.notify_on_message.label' %>
         <p class="thredded--form-list--hint">
-          When someone mentions you by your username (eg: @sam)
-          you will receive an email with the contents of that post.
+          <%= t 'thredded.preferences.form.notify_on_message.hint' %>
         </p>
       <% end %>
     </li>
     <li>
-      <%= f.label :notify_on_message do %>
-        <%= f.check_box :notify_on_message %>
-        Private Topic Notification
+      <%= f.label :notify_on_mention do %>
+        <%= f.check_box :notify_on_mention %>
+        <%= t 'thredded.preferences.form.notify_on_mention.label' %>
         <p class="thredded--form-list--hint">
-          When you are first added to a private topic's discussion
-          you will receive an email with the contents of that initial
-          post.
+          <%= t 'thredded.preferences.form.notify_on_mention.hint' %>
         </p>
       <% end %>
     </li>
-    <li><%= f.submit 'Update Settings', class: 'thredded--form--submit' %></li>
   </ul>
+  <% if preferences.messageboard %>
+    <h3>
+      <%= 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_notify_on_mention do %>
+          <%= f.check_box :messageboard_notify_on_mention %>
+          <%= t 'thredded.preferences.form.messageboard_notify_on_mention.label' %>
+          <p class="thredded--form-list--hint">
+            <%= t 'thredded.preferences.form.messageboard_notify_on_mention.hint' %>
+          </p>
+        <% end %>
+      </li>
+    </ul>
+  <% end %>
+  <button type="submit" class="thredded--form--submit">
+    <%= t 'thredded.preferences.form.submit_btn' %>
+  </button>
 <% end %>
-

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

@@ -1 +1 @@
-<h1 class="thredded--preferences-header--title">Notification Settings For <em><%= messageboard.name %></em></h1>
+<h1 class="thredded--preferences-header--title"><%= t 'thredded.preferences.form.title' %></h1>

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

@@ -1,12 +1,10 @@
-<% content_for :thredded_page_title, 'Notification Preferences' %>
-<% content_for :thredded_page_id, 'thredded--preferences-new' %>
-<% content_for :thredded_breadcrumbs, render('thredded/shared/messageboard_topics_breadcrumbs') %>
+<% content_for :thredded_page_title, t('thredded.preferences.edit.page_title') %>
+<% content_for :thredded_page_id, 'thredded--preferences' %>
+<% 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',
-               messageboard: messageboard,
-               preference:   preference %>
+    <%= render 'thredded/preferences/form', preferences: @preferences %>
   </section>
 <% end %>

data/app/views/thredded/private_post_mailer/at_notification.html.erb

@@ -1,11 +1,13 @@
-<%= @post.filtered_content(self) %>
+<blockquote><%= @post.filtered_content(self) %></blockquote>
 
 <hr />
 
 <p>
   This email was sent to you because <%= @post.user %> mentioned you in
-  "<%= link_to @post.postable.title, private_topic_private_post_url(@post.postable, @post, anchor: "post_#{@post.id}") %>".
-  <%= link_to 'View the conversation here.', private_topic_url(@post.postable) %>
+  "<%= link_to @post.postable.title, post_url(@post) %>".
+  <%= link_to 'View the conversation here', topic_url(@post.postable) %>.
 </p>
 
-<% # TODO: implement global notification preferences for private topics. %>
+<p>
+  To unsubscribe from these emails, update your <%= link_to 'preferences', edit_preferences_url %>.
+</p>

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

@@ -1 +1,5 @@
-<%= render 'thredded/posts_common/form', topic: topic, post: post, button_text: button_text %>
+<%= render 'thredded/posts_common/form',
+           topic: topic,
+           post: post,
+           button_text: t('thredded.private_posts.form.create_btn'),
+           content_label: t('thredded.private_posts.form.content_label') %>

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

@@ -1 +1,3 @@
-<%= render 'thredded/posts_common/post', post: private_post %>
+<% cache(private_post, expires_in: 1.week) do %>
+  <%= render 'thredded/posts_common/post', post: private_post %>
+<% end %>

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

@@ -1,17 +1,13 @@
-<%= @topic.posts.first.filtered_content(self) %>
+<blockquote><%= @topic.posts.first.filtered_content(self) %></blockquote>
 
 <hr />
 
 <p>
   This email was sent to you because <%= @topic.user %> included you in a
   private topic, "<%= link_to @topic.title, @topic %>".
-  <%= link_to 'Go here', @topic %>
-  to view the conversation.
+  <%= link_to 'Go here', @topic %> to view the conversation.
 </p>
 
-<% if false # TODO: implement global notification preferences for private topics. %>
 <p>
-  To unsubscribe from these emails, update your
-  <%= link_to 'preferences', edit_messageboard_preferences_url(@topic.messageboard) %>.
+  To unsubscribe from these emails, update your <%= link_to 'preferences', edit_preferences_url %>.
 </p>
-<% end %>

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

@@ -7,7 +7,5 @@ included you in the private topic "<%= @topic.title %>".
 Go here to view the conversation:
   <%= url_for @topic %>
 
-<% if false # TODO: implement global notification preferences for private topics. %>
 To unsubscribe from these emails, update your preferences here:
-  <%= edit_messageboard_preferences_url(@topic.messageboard) %>
-<% end %>
+  <%= edit_preferences_url %>

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

@@ -1,4 +1,4 @@
 <ul class="thredded--navigation-breadcrumbs">
-  <li><%= link_to 'All Message Boards', messageboards_path %></li>
-  <li><%= link_to 'Private Topics', private_topics_path %></li>
+  <li><%= link_to t('thredded.nav.all_messageboards'), messageboards_path -%></li>
+  <li><%= link_to t('thredded.nav.private_topics'), private_topics_path -%></li>
 </ul>

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

@@ -4,21 +4,26 @@
 
   <ul class="thredded--form-list on-top">
     <li class="title">
-      <%= form.label :title, 'Private Topic Title' %>
-      <%= form.text_field :title, { placeholder: placeholder, required: true, 'data-thredded-topic-form-title' => true } %>
+      <%= form.label :title, t('thredded.private_topics.form.title_label') %>
+      <%= form.text_field :title, placeholder: placeholder, required: true %>
     </li>
-
     <li>
-      <%= form.label :user_id, 'Users in Private Topic' %>
-      <%= form.select :user_ids,
-                      form.object.users_for_select,
-                      form.object.users_selected_options,
-                      form.object.users_select_html_options %>
+      <%= form.label :user_ids, t('thredded.private_topics.form.users_label') %>
+      <%= form.text_field :user_ids,
+                          placeholder:                 t('thredded.private_topics.form.users_placeholder'),
+                          'data-thredded-users-select' => true,
+                          'data-autocomplete-url'      => autocomplete_users_path %>
     </li>
 
-    <%= render 'thredded/posts/content_field', form: form %>
+    <%= render 'thredded/posts/content_field',
+               form:          form,
+               content_label: t('thredded.private_topics.form.content_label') %>
 
-    <li><%= form.submit button_text, class: 'thredded--form--submit' %></li>
+    <li>
+      <button type="submit" class="thredded--form--submit">
+        <%= t('thredded.private_topics.form.create_btn') %>
+      </button>
+    </li>
   </ul>
 <% end %>
 

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

@@ -0,0 +1,12 @@
+<header class="thredded--topic-header">
+  <h1 class="thredded--topic-header--title"><%= topic.title %></h1>
+  <cite class="thredded--topic-header--started-by">
+    <%= t 'thredded.topics.started_by_html',
+          time_ago: time_ago(topic.created_at),
+          user:     user_link(topic.user) %>
+  </cite>
+  <% if topic.can_update? %>
+    <%= link_to t('thredded.private_topics.edit'), topic.edit_path,
+                class: 'thredded--topic-header--edit-topic' %>
+  <% end %>
+</header>

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

@@ -1,6 +1,6 @@
 <div class="thredded--empty">
-  <h3 class="thredded--empty--title">You have no private topics.</h3>
+  <h3 class="thredded--empty--title"><%= t 'thredded.private_topics.no_private_topics.title' %></h3>
   <a class="thredded--button" href="<%= new_private_topic_path(messageboard) %>">
-    Create your first private topic
+    <%= t 'thredded.private_topics.no_private_topics.create_btn' %>
   </a>
 </div>

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

@@ -1,8 +1,10 @@
-<%= content_tag_for :article, private_topic, class: "thredded--topics--topic #{private_topic.css_class}" do %>
+<%= content_tag :article,
+                id: dom_id(private_topic),
+                class: ['thredded--topics--topic', *topic_css_classes(private_topic)] do %>
   <div class="thredded--topics--posts-count"><%= private_topic.posts_count %></div>
 
   <h1 class="thredded--topics--title">
-    <%= link_to private_topic.title, private_topic.original %>
+    <%= link_to private_topic.title, private_topic.path %>
   </h1>
 
   <cite class="thredded--topics--updated-by">
@@ -14,9 +16,5 @@
     <%= time_ago private_topic.created_at %>
     <%= user_link private_topic.user %>
   </cite>
-
-  <ul class="thredded--topics--categories">
-    <%= render private_topic.categories %>
-  </ul>
 <% end %>
 

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

@@ -0,0 +1,32 @@
+<% content_for :thredded_page_title, t('thredded.nav.edit_private_topic') %>
+<% content_for :thredded_page_id, 'thredded--edit-private-topic' %>
+<% content_for :thredded_breadcrumbs do %>
+  <ul class="thredded--navigation-breadcrumbs">
+    <li><%= link_to t('thredded.nav.all_messageboards'), messageboards_path %></li>
+    <li><%= link_to t('thredded.nav.private_topics'), private_topics_path %></li>
+    <li><%= link_to @private_topic.title, topic_path(@private_topic) %></li>
+    <li><%= link_to t('thredded.nav.edit_private_topic'), edit_private_topic_path(@private_topic) %></li>
+  </ul>
+<% end %>
+
+
+<%= 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">
+          <%= t('thredded.private_topics.form.update_btn') %>
+        </button>
+      </li>
+    </ul>
+  <% end %>
+<% end %>

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

@@ -1,9 +1,10 @@
-<% content_for :thredded_page_title, 'Private Topics' %>
+<% content_for :thredded_page_title, t('thredded.nav.private_topics') %>
 <% content_for :thredded_page_id, 'thredded--private-topics-index' %>
 <% content_for :thredded_breadcrumbs, render('thredded/private_topics/breadcrumbs') %>
 
 <%= thredded_page do %>
-  <%= content_tag :section, class: 'thredded--main-section thredded--private-topics' do %>
+  <%= content_tag :section, class: 'thredded--main-section thredded--private-topics',
+                  'data-thredded-topics' => true do %>
     <% if @private_topics.empty? -%>
       <%= render 'thredded/private_topics/no_private_topics' %>
     <% else -%>
@@ -11,9 +12,8 @@
                  messageboard:  messageboard,
                  private_topic: @new_private_topic,
                  css_class:     'thredded--is-compact',
-                 placeholder:   'Start a New Private Topic',
-                 button_text:   'Create New Private Topic' %>
-      <%= render @decorated_private_topics %>
+                 placeholder:   t('thredded.private_topics.form.title_placeholder_start') %>
+      <%= render @private_topics %>
     <% end -%>
   <% end %>
 

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

@@ -7,7 +7,6 @@
     <%= render 'thredded/private_topics/form',
                messageboard:  messageboard,
                private_topic: @private_topic,
-               placeholder:   'New Private Topic Title',
-               button_text:   'Create New Private Topic' %>
+               placeholder:   t('thredded.private_topics.form.title_placeholder_new') if @private_topic %>
   </section>
 <% end %>

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

@@ -1,14 +1,19 @@
+<% private_topic = @posts.topic %>
 <% content_for :thredded_page_title, private_topic.title %>
-<% content_for :thredded_page_id, 'thredded--posts' %>
+<% content_for :thredded_page_id, 'thredded--private-topic-show' %>
 <% content_for :thredded_breadcrumbs, render('thredded/private_topics/breadcrumbs') %>
 
 <%= thredded_page do %>
-  <%= content_tag_for :section, private_topic, class: 'thredded--main-section thredded--topic thredded--private-topic' do %>
-    <%= render 'thredded/topics_common/header', topic: private_topic %>
-    <%= render @posts %>
+  <%= content_tag :section,
+                  id: dom_id(private_topic),
+                  class: ['thredded--main-section', 'thredded--topic', *topic_css_classes(private_topic)] do %>
+    <%= render 'thredded/private_topics/header', topic: private_topic %>
+    <%= render partial: 'thredded/private_posts/private_post', collection: @posts, cached: true %>
     <%= render 'thredded/private_posts/form',
-               topic:        private_topic,
-               post:         @post,
-               button_text:  'Submit Reply' %>
+               topic: private_topic,
+               post:  @post %>
   <% end %>
+  <footer>
+    <%= paginate @posts %>
+  </footer>
 <% end %>