thredded 0.2.2 → 0.3.0

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

@@ -1,7 +1,10 @@
-<% if messageboard.try(:persisted?) %>
-  <%= form_tag messageboard_topics_path(messageboard), method: 'get' do %>
-    <%= label :q, :search, 'Search', for: 'q', class: 'show-for-small', data: {toggle: '#q'} %>
-    <%= text_field_tag(:q, params[:q], { placeholder: 'Search Topics and Posts', type: 'search', class: 'input-search' }) %>
-    <%= submit_tag('Search', name: '') %>
-  <% end %>
+<%= form_tag search_path(messageboard), class: 'thredded--form thredded--navigation--search', method: 'get' do %>
+  <%= label_tag :q, t('thredded.search.form.label') %>
+  <%= text_field_tag :q, @query,
+                     type:        'search',
+                     required:    true,
+                     # If there are no results the user will likely want to change the query, so auto-focus.
+                     autofocus:   @query.presence && !@topics.presence,
+                     placeholder: t('thredded.search.form.placeholder') %>
+  <button type="submit"><%= t 'thredded.search.form.btn_submit' %></button>
 <% end %>

data/app/views/thredded/shared/{_messageboard_topics_breadcrumbs.html.erb → _breadcrumbs.html.erb}

@@ -1,6 +1,6 @@
 <ul class="thredded--navigation-breadcrumbs">
-  <li><%= link_to 'All Message Boards', messageboards_path %></li>
-  <% if messageboard %>
+  <li><%= link_to t('thredded.nav.all_messageboards'), messageboards_path %></li>
+  <% if messageboard_or_nil.try(:persisted?) %>
     <li><%= link_to messageboard.name, messageboard_topics_path(messageboard) %></li>
   <% end %>
 </ul>

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

@@ -1,4 +1,3 @@
-<header class="thredded--navigation" role="banner">
-  <%= render 'thredded/shared/top_nav' %>
-  <%= render 'thredded/shared/topic_nav' %>
+<header role="banner">
+  <%= render 'thredded/shared/nav' %>
 </header>

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

@@ -0,0 +1,20 @@
+<nav class="thredded--navigation" role="navigation">
+  <ul class="thredded--user-navigation<%= ' thredded--user-navigation-standalone' if Thredded.standalone_layout? %>">
+    <% if signed_in? && Thredded.standalone_layout? %>
+      <li class="thredded--user-navigation--profile thredded--user-navigation--item">
+        <%= link_to thredded_current_user, user_path(thredded_current_user) %>
+      </li>
+    <% end %>
+
+    <%= 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' %>
+    <% end %>
+  </ul>
+  <div class="thredded--main-navigation">
+    <%= yield :thredded_breadcrumbs %>
+    <%= render 'thredded/search/form', messageboard: messageboard_or_nil %>
+  </div>
+</nav>

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

@@ -0,0 +1,6 @@
+<li class="thredded--user-navigation--settings thredded--user-navigation--item">
+  <%= link_to edit_preferences_path(messageboard) do %>
+    <%= inline_svg 'thredded/settings.svg', class: 'thredded--icon' %>
+    <%= t('thredded.nav.settings') %>
+<% end %>
+</li>

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

@@ -0,0 +1,11 @@
+<li class="thredded--user-navigation--item thredded--user-navigation--private-topics">
+  <%= link_to private_topics_path do %>
+    <%= inline_svg 'thredded/private-messages.svg', class: 'thredded--icon' %>
+    <%= t('thredded.nav.private_topics') %>
+    <% if unread_private_topics_count > 0 -%>
+          <span class="thredded--user-navigation--private-topics--unread">
+            <%= unread_private_topics_count %>
+          </span>
+    <% end -%>
+  <% end -%>
+</li>

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

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

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

@@ -1,3 +1,3 @@
-<h2 style="margin-top: 4em" id="<%= label.parameterize %>">
-  <a href="<%= href %>"><code><%= label %></code></a>
+<h2 style="margin-top: 2rem" id="<%= label.parameterize %>">
+  <a class="thredded--link" href="<%= href %>"><code><%= label %></code></a>
 </h2>

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

@@ -23,7 +23,7 @@
                topic:        @new_topic,
                css_class:    'thredded--is-compact',
                placeholder:  'Start a New Topic' %>
-    <%= render @decorated_topics %>
+    <%= render @topics %>
   <% end %>
   <footer>
     <%= paginate @topics %>
@@ -31,15 +31,15 @@
   <br>
 
 
-  <%= render 'section_title', label: 'topics#show', href: messageboard_topic_posts_path(@messageboard, @topic) %>
-  <%= content_tag_for :section, @topic, class: "thredded--thredded--main-section #{@user_topic.css_class}" do %>
-    <%= render 'thredded/topics_common/header', topic: @topic %>
+  <%= render 'section_title', label: 'topics#show', href: @topic.path %>
+  <%= content_tag :section, id: dom_id(@topic), class: ['thredded--thredded--main-section', topic_css_classes(@topic)] do %>
+    <%= render 'thredded/topics/header', topic: @topic %>
     <%= render @posts %>
     <%= render 'thredded/posts/form',
                messageboard: @messageboard,
                topic:        @topic,
                post:         @new_post,
-               button_text:  'Submit Reply'
+               button_text:  t('thredded.posts.form.create_btn')
     %>
   <% end %>
 
@@ -57,7 +57,7 @@
                messageboard: @messageboard,
                topic:        @topic,
                post:         @post,
-               button_text:  'Update Post'
+               button_text:  t('thredded.posts.form.update_btn')
     %>
   <% end %>
 
@@ -72,36 +72,32 @@
     <%= render 'thredded/private_topics/form',
                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 %>
 
   <%= render 'section_title', label: 'private_topics#new', href: new_private_topic_path %>
   <section class="thredded--thredded--main-section">
     <%= render 'thredded/private_topics/form',
                private_topic: @new_private_topic,
-               placeholder:   'New Private Topic Title',
-               button_text:   'Create New Private Topic' %>
+               placeholder:   t('thredded.private_topics.form.title_placeholder_new') %>
   </section>
 
   <%= render 'section_title', label: 'private_topics#show', href: private_topic_path(@private_topic) %>
   <section class="thredded--thredded--main-section">
-    <%= render 'thredded/topics_common/header', topic: @private_topic %>
-    <%= render @private_topic.posts.first(3) %>
+    <%= render 'thredded/private_topics/header', topic: @private_topic %>
+    <%= render @private_posts %>
     <%= render 'thredded/private_posts/form',
                topic:       @private_topic,
                post:        @private_post,
-               button_text: 'Submit Reply'
+               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' %>
-    <%= render 'thredded/preferences/form',
-               messageboard: @messageboard,
-               preference:   @preference %>
+    <%= render 'thredded/preferences/form', preferences: @preferences %>
   <% end %>
 
   <%= render 'thredded/shared/currently_online' %>

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

@@ -2,20 +2,22 @@
              html: { class: "thredded--form #{local_assigns[:css_class]}", 'data-thredded-topic-form' => true } do |form| %>
   <ul class="thredded--form-list on-top">
     <li class="title">
-      <%= form.label :title %>
-      <%= form.text_field :title, { placeholder: placeholder, required: true, 'data-thredded-topic-form-title' => true } %>
+      <%= form.label :title, t('thredded.topics.form.title_label') %>
+      <%= form.text_field :title, placeholder: placeholder, required: true %>
     </li>
 
     <% if form.object.categories.any? %>
       <li class="category">
         <%= form.select :category_ids,
-          form.object.category_options,
-          {},
-          { multiple: true, 'data-placeholder' => 'Categories' } %>
+                        form.object.category_options,
+                        {},
+                        { multiple: true, 'data-placeholder' => t('thredded.topics.form.categories_placeholder') } %>
       </li>
     <% end %>
 
-    <%= render 'thredded/posts/content_field', form: form %>
+    <%= render 'thredded/posts/content_field',
+               form:          form,
+               content_label: t('thredded.topics.form.content_label') %>
     <%= render 'thredded/topics/topic_form_admin_options', form: form %>
 
     <li><%= form.submit 'Create New Topic', class: 'thredded--form--submit' %></li>

data/app/views/thredded/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.topics.edit'), topic.edit_path,
+                class: 'thredded--topic-header--edit-topic' %>
+  <% end %>
+</header>

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

@@ -1,14 +1,10 @@
-<%= content_tag_for :article, topic, class: "thredded--topics--topic #{topic.css_class}" do %>
+<%= content_tag :article,
+                id:    dom_id(topic),
+                class: ['thredded--topics--topic', topic_css_classes(topic)] do %>
   <div class="thredded--topics--posts-count"><%= topic.posts_count %></div>
 
   <h1 class="thredded--topics--title">
-    <%= link_to topic.title,
-      paged_messageboard_topic_posts_path(
-        messageboard.slug,
-        topic.slug,
-        topic.farthest_page
-      )
-    %>
+    <%= link_to topic.title, topic.path %>
   </h1>
 
   <% if topic.categories.any? %>

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

@@ -1,5 +1,5 @@
 <% topic = form.object.respond_to?(:topic) ? form.object.topic : form.object %>
-<% if current_ability.can? :admin, topic %>
+<% if policy(topic).moderate? %>
   <li class="thredded--form-list--admin-options">
     <%= form.label :locked do %>
       <%= form.check_box :locked %> Locked

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

@@ -1,38 +1,42 @@
-<% content_for :thredded_page_title, "Edit \"#{topic.title}\"" %>
+<% content_for :thredded_page_title, t('thredded.nav.edit_private_topic') %>
 <% content_for :thredded_page_id, 'thredded--edit-topic' %>
-
-<% content_for :thredded_breadcrumbs, capture { %>
+<% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
-    <li><%= link_to 'All Message Boards', messageboards_path %></li>
-    <li><%= link_to messageboard.name, messageboard_topics_path(messageboard, topic) %></li>
-    <li>
-      <a href="<%= edit_messageboard_topic_path(messageboard, topic) %>">Editing Topic <em><%= topic.title %></em></a>
-    </li>
+    <li><%= link_to t('thredded.nav.all_messageboards'), messageboards_path %></li>
+    <li><%= link_to messageboard.name, messageboard_topics_path(@topic.messageboard, @topic) %></li>
+    <li><%= link_to @topic.title, topic_path(@topic) %></li>
+    <li><%= link_to t('thredded.nav.edit_topic'), edit_messageboard_topic_path(@topic.messageboard, @topic) %></li>
   </ul>
-<% } %>
+<% end %>
 
 <%= thredded_page do %>
-  <%= form_for [messageboard, @topic],
+  <%= form_for [@topic.messageboard, @topic],
                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 %>
-        <%= form.text_field :title, { placeholder: 'Title', autofocus: 'autofocus', } %>
+        <%= 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 messageboard.categories.any? %>
+      <% if form.object.categories.any? %>
         <li class="category">
-          <%= form.select :category_ids,
-                          form.object.decorate.category_options,
-                          {},
-                          { multiple: true, 'data-placeholder' => 'Categories' } %>
+          <%= 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.submit 'Update Topic', class: 'thredded--form--submit' %></li>
+      <li>
+        <button type="submit" class="thredded--form--submit">
+          <%= t('thredded.topics.form.update_btn') %>
+        </button>
+      </li>
   <% end %>
   </ul>
 <% end %>

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

@@ -1,15 +1,15 @@
 <% content_for :thredded_page_title, 'Topics' %>
 <% content_for :thredded_page_id, 'thredded--topics-index' %>
-<% content_for :thredded_breadcrumbs, render('thredded/shared/messageboard_topics_breadcrumbs') %>
+<% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 
 <%= thredded_page do %>
-  <%= content_tag :section, class: 'thredded--main-section thredded--topics' do %>
+  <%= 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',
                placeholder:  'Start a New Topic' if @new_topic %>
-    <%= render @decorated_topics %>
+    <%= render @topics %>
   <% end %>
 
   <footer>

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

@@ -1,6 +1,6 @@
 <% content_for :thredded_page_title, 'Create a New Topic' %>
 <% content_for :thredded_page_id, 'thredded--new-topic' %>
-<% content_for :thredded_breadcrumbs, render('thredded/shared/messageboard_topics_breadcrumbs') %>
+<% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 
 <%= thredded_page do %>
   <%= render 'thredded/topics/form',

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

@@ -1,9 +1,21 @@
-<% content_for :thredded_page_title, 'Topics Search Results' %>
+<% content_for :thredded_page_title, t('thredded.topics.search.page_title') %>
 <% content_for :thredded_page_id, 'thredded--topic-search-results' %>
-<% content_for :thredded_breadcrumbs, render('thredded/shared/messageboard_topics_breadcrumbs') %>
+<% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 
 <%= thredded_page do %>
-  <section class="thredded--main-section thredded--topics">
-    <%= render @decorated_topics %>
-  </section>
+  <% if @topics.present? %>
+    <p class="thredded--alert thredded--alert-success">
+      <%= t 'thredded.topics.search.results_message', query: "'#{@query}'" %>
+    </p>
+    <section class="thredded--main-section thredded--topics">
+      <%= render @topics %>
+    </section>
+    <footer>
+      <%= paginate @topics %>
+    </footer>
+  <% else %>
+    <p class="thredded--alert thredded--alert-danger">
+      <%= t 'thredded.topics.search.no_results_message', query: "'#{@query}'" %>
+    </p>
+  <% end %>
 <% end %>

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

@@ -1,24 +1,27 @@
+<% topic = @posts.topic %>
 <% content_for :thredded_page_title, topic.title %>
-<% content_for :thredded_page_id, 'thredded--posts' %>
-<% content_for :thredded_breadcrumbs, render('thredded/shared/messageboard_topics_breadcrumbs') %>
+<% content_for :thredded_page_id, 'thredded--topic-show' %>
+<% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 
 <%= thredded_page do %>
-  <%= content_tag_for :section, topic, class: "thredded--main-section thredded--topic #{user_topic.css_class}" do %>
-    <%= render 'thredded/topics_common/header', topic: topic %>
-    <%= render @posts %>
-    <% if can?(:create, @new_post) %>
+  <%= content_tag :section,
+                  id: dom_id(topic),
+                  class: ['thredded--main-section', 'thredded--topic', *topic_css_classes(topic)] do %>
+    <%= render 'thredded/topics/header', topic: topic %>
+    <%= render partial: 'thredded/posts/post', collection: @posts, cached: true %>
+    <% if policy(@new_post).create? %>
       <div class="thredded--post-form--wrapper">
         <h3 class="thredded--post-form--title">Add a post</h3>
         <%= render 'thredded/posts/form',
-                   topic:        topic,
-                   post:         @new_post,
-                   button_text:  'Submit Reply' %>
+                   topic:       topic,
+                   post:        @new_post,
+                   button_text: t('thredded.posts.form.create_btn') %>
       </div>
     <% end %>
 
-    <% if current_ability.can? :destroy, topic %>
+    <% if topic.can_destroy? %>
       <div class="thredded--topic-delete--wrapper">
-        <%= form_tag messageboard_topic_path(messageboard, topic), method: :delete, class: 'thredded--topic-delete-form' do %>
+        <%= form_tag topic.destroy_path, method: :delete, class: 'thredded--topic-delete-form' do %>
           <%= submit_tag 'Delete Topic', class: 'thredded--form--submit' %>
         <% end %>
       </div>

data/bin/rails

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+APP_PATH = File.expand_path('../../spec/dummy/config/application', __FILE__)
+require    File.expand_path('../../spec/dummy/config/boot', __FILE__)
+require    'rails/commands'

data/config.ru

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+require ::File.expand_path('../spec/dummy/config/environment', __FILE__)
+run Dummy::Application

data/config/i18n-tasks.yml

@@ -0,0 +1,16 @@
+# i18n-tasks finds and manages missing and unused translations
+# See https://github.com/glebm/i18n-tasks/blob/master/templates/config/i18n-tasks.yml
+
+# Do not consider these keys missing:
+ignore_missing:
+# The kaminari gem keys
+- views.pagination.*
+
+search:
+  paths:
+    - app/
+    - lib/
+data:
+  yaml:
+    write:
+      line_width: 110

data/config/locales/en.yml

@@ -0,0 +1,90 @@
+---
+en:
+  thredded:
+    errors:
+      login_required: Please sign in first.
+      not_authorized: You are not authorized to access this page.
+      private_topic_create_denied: You are not authorized to create private topics.
+      private_topic_not_found: This private topic does not exist.
+    messageboard:
+      last_updated_by_html: Updated %{time_ago} <cite>by %{user}</cite>
+      topics_and_posts_counts: "%{topics_count} topics / %{posts_count} posts"
+    nav:
+      all_messageboards: All Messageboards
+      edit_post: Edit Post
+      edit_private_topic: :thredded.nav.edit_topic
+      edit_topic: Edit
+      private_topics: Private Messages
+      settings: Notification Settings
+    posts:
+      delete: Delete Post
+      delete_confirm: Are you sure you want to delete this post?
+      deleted_notice: Your post has been deleted.
+      edit: :thredded.nav.edit_post
+      form:
+        content_label: Content
+        create_btn: Submit Reply
+        update_btn: Update Post
+    preferences:
+      edit:
+        page_title: :thredded.nav.settings
+      form:
+        global_preferences_label: Global Settings
+        messageboard_notify_on_mention:
+          hint: >-
+            When someone mentions you by your username (eg: @sam) in this messageboard you will receive an email
+            with the contents of that post.
+          label: :thredded.preferences.form.notify_on_mention.label
+        messageboard_preferences_label_html: Notification Settings for <em>%{messageboard}</em>
+        notify_on_mention:
+          hint: >-
+            When someone mentions you by your username (eg: @sam) you will receive an email with the contents of
+            that post.
+          label: "@ Notifications"
+        notify_on_message:
+          hint: When you are added to a private conversation you will receive an email with its content.
+          label: Private Message Notifications
+        submit_btn: Update Settings
+        title: Settings
+      updated_notice: Your settings have been updated.
+    private_posts:
+      form:
+        content_label: Message
+        create_btn: Send Message
+    private_topics:
+      edit: Edit
+      errors:
+        user_ids_length: Please specify at least one other user.
+      form:
+        content_label: :thredded.private_posts.form.content_label
+        create_btn: :thredded.private_posts.form.create_btn
+        title_label: :thredded.topics.form.title_label
+        title_placeholder_new: Write the subject of this conversation
+        title_placeholder_start: Start a new conversation
+        update_btn: Update
+        users_label: Participants
+        users_placeholder: Select users to participate in this conversation
+      no_private_topics:
+        create_btn: Start your first private conversation
+        title: You have no private messages.
+      updated_notice: Title updated
+    search:
+      form:
+        btn_submit: :thredded.search.form.label
+        label: Search
+        placeholder: Search Topics and Posts
+    topics:
+      deleted_notice: Topic deleted
+      edit: Edit Topic
+      form:
+        categories_placeholder: Categories
+        content_label: :thredded.posts.form.content_label
+        title_label: Title
+        title_placeholder: :thredded.topics.form.title_label
+        update_btn: Update Topic
+      search:
+        no_results_message: There are no results for your search - %{query}
+        page_title: Topics Search Results
+        results_message: Search Results for %{query}
+      started_by_html: Started %{time_ago} by %{user}
+      updated_notice: Topic updated