thredded 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ce9beaa49ff6dabd99f962836ab829e691de0bf
-  data.tar.gz: a2760f759370094628101ac41ab618a16f358393
+  metadata.gz: 267a7718fa00308d076699e3970f2e3d74946f28
+  data.tar.gz: 40e40286c2af13e04f3af5b72b376d5a3e3a8209
 SHA512:
-  metadata.gz: fa1e55d7ef10e1bfc8404746b7773bd3652c9f78b73ddb6300d698c32dd8f58f5ac09bf4eea6d0a4b84295e4d7d8efb50cbe0f5c6be0dbb28a8de80e89358c1b
-  data.tar.gz: be8da3f5f1ac118215a12b5122069b2c801c5e6941e8d8ec014cef9acdbb31f5ef09afb8185430e8287877983cf9e01bf6ec2daf9f0c26a3baeec06e3f2eca2a
+  metadata.gz: 0b2074d057c58a048c9cb3bba55de02e95099f604a95fc75b843cd0c48fb71a81d04b8c2d18a89e0e0a71e193039cacec83aa27eb0d9ea9f09b75e85efe6fb5d
+  data.tar.gz: 2ebee2bec698ce19036b4845ff4ca1ec04ecf0c5848d71ad5f67593fac08e979997cae369739cfdbc04fcbf6a71295372eee7da8df881f6085ce0eb62bb3e043

data/README.md

@@ -33,6 +33,49 @@ application and not an engine like Thredded.
 
 [Discourse]: http://www.discourse.org/
 
+Table of Contents
+=================
+
+* [Installation](#installation)
+  * [Creating a new Rails app with Thredded](#creating-a-new-rails-app-with-thredded)
+  * [Adding Thredded to an existing Rails app](#adding-thredded-to-an-existing-rails-app)
+  * [Upgrading an existing install](#upgrading-an-existing-install)
+  * [Migrating from Forem](#migrating-from-forem)
+* [Views and other assets](#views-and-other-assets)
+  * [Standalone layout](#standalone-layout)
+  * [Application layout](#application-layout)
+    * [Reference your paths so that Thredded can find them](#reference-your-paths-so-that-thredded-can-find-them)
+    * [Add Thredded styles](#add-thredded-styles)
+    * [Add Thredded JavaScripts](#add-thredded-javascripts)
+      * [jQuery version](#jquery-version)
+  * [User profile page](#user-profile-page)
+  * [Customizing views](#customizing-views)
+    * [View hooks](#view-hooks)
+  * [Theming](#theming)
+    * [Styles](#styles)
+* [Email and other notifications](#email-and-other-notifications)
+  * [Enabling auto-follow](#enabling-auto-follow)
+* [I18n](#i18n)
+* [Permissions](#permissions)
+  * [Permission methods](#permission-methods)
+    * [Reading messageboards](#reading-messageboards)
+    * [Posting to messageboards](#posting-to-messageboards)
+    * [Messaging other users (posting to private topics)](#messaging-other-users-posting-to-private-topics)
+    * [Moderating messageboards](#moderating-messageboards)
+    * [Admin permissions](#admin-permissions)
+  * [Default permissions](#default-permissions)
+  * [Handling "Permission denied" and "Not found" errors](#handling-permission-denied-and-not-found-errors)
+* [Moderation](#moderation)
+  * [Disabling moderation](#disabling-moderation)
+* [Plugins](#plugins)
+* [Development](#development)
+  * [Testing](#testing)
+  * [Ruby](#ruby)
+  * [JavaScript](#javascript)
+  * [Testing with all the databases and Rails versions locally.](#testing-with-all-the-databases-and-rails-versions-locally)
+  * [Developing and Testing with Docker Compose](#developing-and-testing-with-docker-compose)
+
+
 ## Installation
 
 ### Creating a new Rails app with Thredded
@@ -56,7 +99,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.11.0'
+gem 'thredded', '~> 0.11.1'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -105,11 +148,11 @@ rails g thredded:install
 
 But then compare this with the previous version to decide what to keep.
 
-2) To upgrade the database (in this example from v0.9 to v0.10):
+2) To upgrade the database (in this example from v0.10 to v0.11):
 
 ```console
 # Note that for guaranteed best results you will want to run this with the gem checked out with v0.10.0
-cp `bundle show thredded`/db/upgrade_migrations/20170125033319_upgrade_v0_9_to_v0_10.rb db/migrate
+cp `bundle show thredded`/db/upgrade_migrations/20170312131417_upgrade_thredded_v0_10_to_v0_11.rb db/migrate
 rake db:migrate
 ```
 
@@ -261,13 +304,13 @@ To see the complete list of view hooks and their arguments, run:
 grep view_hooks -R --include '*.html.erb' "$(bundle show thredded)"
 ```
 
-## Theming
+### Theming
 
 The engine comes by default with a light and effective implementation of the
 views, styles, and javascript. Once you mount the engine you will be presented
 with a "themed" version of thredded.
 
-### Styles
+#### Styles
 
 Thredded comes with a light Sass theme controlled by a handful of variables that can be found here:
 https://github.com/thredded/thredded/blob/master/app/assets/stylesheets/thredded/base/_variables.scss.
@@ -307,8 +350,18 @@ If you use [Rails Email Preview], you can include Thredded emails into the list
 
 [Rails Email Preview]: https://github.com/glebm/rails_email_preview
 
-You can also turn off the email notifier totally, or add other notifiers (e.g. Pushover, possibly Slack) by adjusting the
- `Thredded.notifiers` configuration in your initializer. See the default initializer for examples.
+You can also turn off the email notifier totally, or add other notifiers (e.g. Pushover, possibly Slack) by adjusting
+the `Thredded.notifiers` configuration in your initializer. See the default initializer for examples.
+
+### Enabling auto-follow
+
+In some cases, you'll want all users to auto-follow new messageboard topics by default. This might be useful
+for a team messageboard or a company announcements board, for example. To enable user auto-follow of new topics,
+run the following migration(s):
+
+```ruby
+change_column_default :thredded_user_preferences, :auto_follow_topics, 1
+```
 
 ## I18n
 
@@ -318,7 +371,7 @@ We welcome PRs adding support for new languages.
 
 Here are the steps to ensure the best support for your language if it isn't English:
 
-1. Add `rails-i18n` to your Gemfile.
+1. Add `rails-i18n` and `kaminari-i18n` to your Gemfile.
 
 2. Require the translations for rails-timeago in your JavaScript before `thredded` but after `jquery.timeago`
    (included in `thredded/dependencies`). E.g. for Brazilian Portuguese:
@@ -504,16 +557,6 @@ To disable moderation, e.g. if you run internal forums that do not need moderati
 change_column_default :thredded_user_details, :moderation_state, 1 # approved
 ```
 
-### Enabling auto-follow
-
-In some cases, you'll want all users to auto-follow new messageboard topics by default. This might be useful
-for a team messageboard or a company announcements board, for example. To enable user auto-follow of new topics,
-run the following migration(s):
-
-```ruby
-change_column_default :thredded_user_preferences, :auto_follow_topics, 1
-```
-
 ## Plugins
 
 The following official plugins are available for Thredded:
@@ -544,12 +587,18 @@ Then, start the dummy app server:
 rake dev:server
 ```
 
+### Testing
+
 To run the tests, just run `rspec`. The test suite will re-create the test database on every run, so there is no need to
 run tasks that maintain the test database.
 
 By default, SQLite is used in development and test. On Travis, the tests will run using SQLite, PostgreSQL, MySQL,
 and all the supported Rails versions.
 
+The test suite requires [PhantomJS](http://phantomjs.org) to be present in the path.
+To install it, run `sudo apt-get install phantomjs` on Ubuntu or Debian, or `brew install phantomjs` on Mac.
+For other operating systems, refer to the [PhantomJS documentation](http://phantomjs.org/download.html).
+
 ### Ruby
 
 Thredded Ruby code formatting is ensured by [Rubocop](https://github.com/bbatsov/rubocop). Run `rubocop -a` to ensure a
@@ -635,7 +684,7 @@ To test all combinations of supported databases and Rails versions, run:
 rake test_all
 ```
 
-## Developing and Testing with [Docker Compose](http://docs.docker.com/compose/)
+### Developing and Testing with [Docker Compose](http://docs.docker.com/compose/)
 
 To quickly try out _Thredded_ with the included dummy app, clone the source and
 start the included docker-compose.yml file with:

data/app/assets/stylesheets/thredded/_base.scss

@@ -5,6 +5,7 @@
 
 @import "base/alerts";
 @import "base/buttons";
+@import "base/dropdown-menu";
 @import "base/forms";
 @import "base/lists";
 @import "base/nav";

data/app/assets/stylesheets/thredded/base/_dropdown-menu.scss

@@ -0,0 +1,83 @@
+%thredded--dropdown-menu--container {
+  position: relative;
+  display: inline-block;
+  cursor: pointer;
+
+  &:hover {
+    %thredded--dropdown-menu--toggle {
+      color: $thredded-action-hover-color;
+    }
+
+    %thredded--dropdown-menu--actions {
+      transform: scale(1);
+      opacity: 1;
+    }
+  }
+}
+
+%thredded--dropdown-menu--toggle {
+  color: $thredded-action-color;
+}
+
+%thredded--dropdown-menu--actions {
+  position: absolute;
+  background-color: $thredded-overlay-background-color;
+  border-radius: 2px;
+  overflow: hidden;
+  min-width: 8.5rem;
+  z-index: 3;
+  cursor: pointer;
+  box-shadow: $thredded-overlay-box-shadow;
+  transform: scale(0);
+  opacity: 0;
+  transition: transform .3s cubic-bezier(.4, 0, .2, 1), opacity .2s cubic-bezier(.4, 0, .2, 1);
+  will-change: transform;
+}
+
+%thredded--dropdown-menu--actions-bottom-left {
+  @extend %thredded--dropdown-menu--actions;
+  right: 0;
+  transform-origin: 100% 0;
+}
+
+%thredded--dropdown-menu--actions-bottom-right {
+  @extend %thredded--dropdown-menu--actions;
+  left: 0;
+  transform-origin: 0 0;
+}
+
+%thredded--dropdown-menu--actions--item,
+// This specific selector protects from global button rules
+form.button_to > %thredded--dropdown-menu--actions--item {
+  // Override potential global rules
+  background: none;
+  border-radius: 0;
+  border: 0;
+  box-sizing: border-box;
+  font: inherit;
+  margin: 0;
+  text-align: left;
+  transition: none;
+  width: 100%;
+
+  font-size: $thredded-font-size-small;
+  color: $thredded-text-color;
+  text-decoration: none;
+  padding: 1rem 0.75rem;
+  display: block;
+  white-space: nowrap;
+
+  &:active,
+  &:focus,
+  &:hover {
+    background-color: $thredded-button-background;
+    color: $thredded-button-color;
+    text-decoration: none;
+    cursor: pointer;
+  }
+
+  &:active,
+  &:focus {
+    outline: none;
+  }
+}

data/app/assets/stylesheets/thredded/components/_post.scss

@@ -7,6 +7,7 @@
 }
 
 .thredded--post--dropdown--toggle {
+  @extend %thredded--dropdown-menu--toggle;
   fill: currentColor;
   box-sizing: content-box;
   color: $thredded-action-color;
@@ -22,76 +23,20 @@
 }
 
 .thredded--post--dropdown {
-  position: relative;
-  display: inline-block;
+  @extend %thredded--dropdown-menu--container;
   float: right;
-  cursor: pointer;
   @media print {
     display: none;
   }
 }
 
 .thredded--post--dropdown--actions {
-  position: absolute;
+  @extend %thredded--dropdown-menu--actions-bottom-left;
   margin-top: -0.875rem;
-  right: 0;
-  background-color: $thredded-overlay-background-color;
-  border-radius: 2px;
-  overflow: hidden;
-  min-width: 10rem;
-  z-index: 1;
-  cursor: pointer;
-  box-shadow: $thredded-overlay-box-shadow;
-  transform: scale(0);
-  opacity: 0;
-  transform-origin: 100% 0;
-  transition: transform .3s cubic-bezier(.4, 0, .2, 1), opacity .2s cubic-bezier(.4, 0, .2, 1);
-  will-change: transform;
-}
-
-.thredded--post--dropdown--actions--item,
-// This specific selector protects from global button rules
-form.button_to > .thredded--post--dropdown--actions--item {
-  // Override potential global rules
-  background: none;
-  border-radius: 0;
-  border: 0;
-  box-sizing: border-box;
-  font: inherit;
-  margin: 0;
-  text-align: left;
-  transition: none;
-  width: 100%;
-
-  font-size: $thredded-font-size-small;
-  color: $thredded-text-color;
-  text-decoration: none;
-  padding: 1rem 0.75rem;
-  display: block;
-  white-space: nowrap;
-
-  &:active,
-  &:focus,
-  &:hover {
-    background-color: $thredded-button-background;
-    color: $thredded-button-color;
-    text-decoration: none;
-    cursor: pointer;
-  }
-
-  &:active,
-  &:focus {
-    outline: none;
-  }
-}
-
-.thredded--post--dropdown:hover .thredded--post--dropdown--actions {
-  transform: scale(1);
-  opacity: 1;
 }
 
-.thredded--post--dropdown:hover .thredded--post--dropdown--toggle {
-  color: $thredded-action-hover-color;
+.thredded--post--dropdown--actions--item {
+  @extend %thredded--dropdown-menu--actions--item;
 }
 
 .thredded--post--avatar {

data/app/assets/stylesheets/thredded/layout/_main-navigation.scss

@@ -18,12 +18,15 @@
 
   li {
     display: block;
-    font-weight: bold;
 
     a {
       display: block;
     }
 
+    @include thredded-media-tablet-and-down {
+      font-weight: bold;
+    }
+
     @include thredded-media-mobile {
       a {
         position: relative;

data/app/assets/stylesheets/thredded/layout/_search-navigation.scss

@@ -1,9 +1,10 @@
 .thredded--navigation--search {
-  margin-right: 0;
+  $input-padding-x: 0.75rem;
+
+  margin: 0;
   padding: 0;
   position: absolute;
   top: 0;
-  right: 0;
 
   @include thredded-media-tablet-and-down {
     position: initial;
@@ -20,16 +21,15 @@
 
     @include thredded-media-desktop-and-up {
       $line-height: 1rem;
-      $padding-x: 0.75rem;
       background: transparent;
       border-color: transparent;
       font-size: $thredded-font-size-small;
       line-height: $line-height;
       min-width: 13rem;
-      text-align: right;
       width: auto;
-      padding: 0.9375rem 0.75rem 0.875rem 0.75rem;
-      margin: -1px (-$padding-x) 0 0;
+      padding: 0.9375rem $input-padding-x 0.875rem $input-padding-x;
+      margin-top: -1px;
+      margin-bottom: 0;
 
       &, &:focus {
         transition: background, border-color, box-shadow, min-width 0.15s ease-out 0s;
@@ -39,6 +39,7 @@
         background: $thredded-background-color;
         box-shadow: none;
         margin-right: 0;
+        margin-left: 0;
         min-width: 16rem;
         text-align: left;
       }
@@ -98,4 +99,28 @@
   @media print {
     display: none;
   }
+
+  // On the left:
+  right: auto;
+  left: 0;
+  @include thredded-media-desktop-and-up {
+    input[type="search"] {
+      text-align: left;
+      margin-right: 0;
+      margin-left: -$input-padding-x;
+    }
+  }
+
+  // On the right:
+  &--right {
+    right: 0;
+    left: auto;
+    @include thredded-media-desktop-and-up {
+      input[type="search"] {
+        text-align: right;
+        margin-right: -$input-padding-x;
+        margin-left: 0;
+      }
+    }
+  }
 }

data/app/assets/stylesheets/thredded/layout/_user-navigation.scss

@@ -1,5 +1,6 @@
 .thredded--user-navigation {
   @extend %thredded--nav-tabs;
+  text-align: right;
   @media print {
     display: none;
   }

data/app/controllers/thredded/application_controller.rb

@@ -60,6 +60,12 @@ module Thredded
       end
     end
 
+    # @param given [Hash]
+    # @return [Boolean] whether the given params are a subset of the controller's {#params}.
+    def params_match?(given = {})
+      given.all? { |k, v| v == params[k] }
+    end
+
     private
 
     def thredded_layout

data/app/controllers/thredded/posts_controller.rb

@@ -19,6 +19,8 @@ module Thredded
 
     def edit
       authorize post, :update?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
+      render
     end
 
     def update
@@ -45,6 +47,10 @@ module Thredded
 
     private
 
+    def canonical_topic_params
+      { messageboard_id: messageboard.slug, topic_id: topic.slug }
+    end
+
     def after_mark_as_unread
       redirect_to messageboard_topics_path(messageboard)
     end

data/app/controllers/thredded/private_posts_controller.rb

@@ -19,6 +19,8 @@ module Thredded
 
     def edit
       authorize post, :update?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
+      render
     end
 
     def update
@@ -45,6 +47,10 @@ module Thredded
 
     private
 
+    def canonical_topic_params
+      { private_topic_id: topic.slug }
+    end
+
     def after_mark_as_unread
       redirect_to private_topics_path
     end

data/app/controllers/thredded/private_topics_controller.rb

@@ -22,6 +22,7 @@ module Thredded
 
     def show
       authorize private_topic, :read?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
 
       page_scope = private_topic
         .posts
@@ -55,6 +56,8 @@ module Thredded
 
     def edit
       authorize private_topic, :update?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
+      render
     end
 
     def update
@@ -69,6 +72,10 @@ module Thredded
 
     private
 
+    def canonical_topic_params
+      { id: private_topic.slug }
+    end
+
     def current_page
       (params[:page] || 1).to_i
     end

data/app/controllers/thredded/topics_controller.rb

@@ -12,6 +12,10 @@ module Thredded
 
     def index
       authorize_reading messageboard
+      unless params_match?(canonical_messageboard_params)
+        skip_policy_scope
+        return redirect_to(canonical_messageboard_params)
+      end
 
       @topics = Thredded::TopicsPageView.new(
         thredded_current_user,
@@ -26,6 +30,7 @@ module Thredded
 
     def show
       authorize topic, :read?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
       page_scope = policy_scope(topic.posts)
         .order_oldest_first
         .includes(:user, :messageboard, :postable)
@@ -43,7 +48,13 @@ module Thredded
 
     def search
       in_messageboard = params.key?(:messageboard_id)
-      authorize_reading messageboard if in_messageboard
+      if in_messageboard
+        authorize_reading messageboard
+        unless params_match?(canonical_messageboard_params)
+          skip_policy_scope
+          return redirect_to(canonical_messageboard_params)
+        end
+      end
       @query = params[:q].to_s
       topics_scope = policy_scope(
         if in_messageboard
@@ -65,6 +76,8 @@ module Thredded
     def new
       @new_topic = Thredded::TopicForm.new(new_topic_params)
       authorize_creating @new_topic.topic
+      return redirect_to(canonical_messageboard_params) unless params_match?(canonical_messageboard_params)
+      render
     end
 
     def category
@@ -92,6 +105,7 @@ module Thredded
 
     def edit
       authorize topic, :update?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
       @edit_topic = Thredded::EditTopicForm.new(user: thredded_current_user, topic: topic)
     end
 
@@ -136,6 +150,14 @@ module Thredded
 
     private
 
+    def canonical_messageboard_params
+      { messageboard_id: messageboard.slug }
+    end
+
+    def canonical_topic_params
+      { messageboard_id: messageboard.slug, id: topic.slug }
+    end
+
     def follow_change_response(following:)
       notice = following ? t('thredded.topics.followed_notice') : t('thredded.topics.unfollowed_notice')
       respond_to do |format|

data/app/policies/thredded/post_policy.rb

@@ -53,7 +53,7 @@ module Thredded
     end
 
     def own_post?
-      @user.id == @post.user_id
+      !anonymous? && @user.id == @post.user_id
     end
   end
 end

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -94,11 +94,14 @@ module Thredded
       # @return [Thredded::AllViewHooks::ViewHook]
       attr_reader :user_info
       # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :user_info_list_items
+      # @return [Thredded::AllViewHooks::ViewHook]
       attr_reader :user_moderation_actions
 
       def initialize
         @user_title = ViewHook.new
         @user_info = ViewHook.new
+        @user_info_list_items = ViewHook.new
         @user_moderation_actions = ViewHook.new
       end
     end

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

@@ -1,6 +1,6 @@
 <%= form_tag users_moderation_path,
              method: 'get',
-             class: 'thredded--form thredded--navigation--search',
+             class: 'thredded--form thredded--navigation--search thredded--navigation--search--right',
              'data-thredded-turboform' => true do %>
   <%= label_tag :q, t('thredded.moderation.search_users.form_label') %>
   <%= text_field_tag :q, @query,

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/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,5 +1,5 @@
 <li class="thredded--user-navigation--standalone thredded--user-navigation--item">
-  <% resource_name = Thredded.user_class.name.underscore %>
+  <% 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>

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/config/locales/en.yml

@@ -172,9 +172,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
@@ -174,9 +174,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

data/config/locales/pl.yml

@@ -172,9 +172,12 @@ pl:
       mark_as_unread: Oznacz jako nieprzeczytane stąd
       not_following: Nie obserwujesz tego tematu.
       search:
-        no_results_message: 'Nie odnaleziono żadnych wyników dla frazy: %{query}'
+        no_results_in_messageboard_message_html: Nie odnaleziono żadnych wyników dla frazy <q>%{query}</q> w %{messageboard}
+        no_results_message_html: 'Nie odnaleziono żadnych wyników dla frazy: <q>%{query}</q>'
         page_title: Wyniki wyszukiwania
-        results_message: 'Wyniki wyszukiwania dla: %{query}'
+        results_in_messageboard_message_html: Wyniki wyszukiwania dla <q>%{query}</q> w %{messageboard}
+        results_message_html: 'Wyniki wyszukiwania dla: <q>%{query}</q>'
+        search_in_all_messageboards_btn: Szukaj wszędzie
       started_by_html: Rozpoczęty %{time_ago} przez %{user}
       sticky:
         label: Przyklejony

data/config/locales/pt-BR.yml

@@ -175,9 +175,12 @@ pt-BR:
       mark_as_unread: Marca não lida a partir daqui
       not_following: Você não está seguindo este tema.
       search:
-        no_results_message: Nenhum resultado encontrado para sua busca - %{query}
+        no_results_in_messageboard_message_html: Não há resultados para sua busca <q>%{query}</q> em %{messageboard}
+        no_results_message_html: Nenhum resultado encontrado para sua busca <q>%{query}</q>
         page_title: Tópicos dos Resultados da Busca
-        results_message: Resultados de Busca para %{query}
+        results_in_messageboard_message_html: Resultados da pesquisa para <q>%{query}</q> em %{messageboard}
+        results_message_html: Resultados de busca para <q>%{query}</q>
+        search_in_all_messageboards_btn: Buscar em todos os lugares
       started_by_html: Iniciado %{time_ago} por %{user}
       sticky:
         label: Pegajoso

data/config/locales/ru.yml

@@ -171,9 +171,12 @@ ru:
       mark_as_unread: Пометить как непрочитанное
       not_following: не отслеживаю
       search:
-        no_results_message: Там нет никаких результатов для этой категории - %{query}
-        page_title: Темы Результаты поиска
-        results_message: Результаты поиска для %{query}
+        no_results_in_messageboard_message_html: Не найдо результатов по запросу <q>%{query}</q> в %{messageboard}
+        no_results_message_html: Не найдо результатов по запросу <q>%{query}</q>
+        page_title: Результаты поиска
+        results_in_messageboard_message_html: Результаты поиска для <q>%{query}</q> в %{messageboard}
+        results_message_html: Результаты поиска для <q>%{query}</q>
+        search_in_all_messageboards_btn: Искать везде
       started_by_html: Начат %{user} %{time_ago}
       sticky:
         label: Закрепить

data/lib/generators/thredded/install/templates/initializer.rb

@@ -7,7 +7,7 @@
 # for your user class - change it here.
 Thredded.user_class = 'User'
 
-# User name column, used in @mention syntax and should be unique.
+# User name column, used in @mention syntax and *must* be unique.
 # This is the column used to search for users' names if/when someone is @ mentioned.
 Thredded.user_name_column = :name
 
@@ -19,12 +19,12 @@ Thredded.user_name_column = :name
 # When linking to a user, Thredded will use this lambda to spit out
 # the path or url to your user. This lambda is evaluated in the view context.
 Thredded.user_path = lambda do |user|
-  user_path = :"#{Thredded.user_class.name.underscore}_path"
+  user_path = :"#{Thredded.user_class_name.underscore}_path"
   main_app.respond_to?(user_path) ? main_app.send(user_path, user) : "/users/#{user.to_param}"
 end
 
 # This method is used by Thredded controllers and views to fetch the currently signed-in user
-Thredded.current_user_method = :"current_#{Thredded.user_class.name.underscore}"
+Thredded.current_user_method = :"current_#{Thredded.user_class_name.underscore}"
 
 # User avatar URL. rb-gravatar gem is used by default:
 Thredded.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
@@ -83,7 +83,7 @@ Thredded.layout = 'thredded/application'
 # Thredded.slugifier = ->(input) { input.parameterize }
 
 # If your forum is in a language other than English, you might want to use the babosa gem instead
-# Thredded.slugifier = ->(input) { Babosa::Identifier.new(input).normalize.to_s }
+# Thredded.slugifier = ->(input) { Babosa::Identifier.new(input).normalize.transliterate(:russian).to_s }
 
 # ==> Post Content Formatting
 # Customize the way Thredded handles post formatting.

data/lib/thredded.rb

@@ -52,7 +52,6 @@ module Thredded
     :layout,
     :messageboards_order,
     :routes_id_constraint,
-    :user_class,
     :user_display_name_method,
     :user_name_column,
     :user_path
@@ -94,6 +93,9 @@ module Thredded
   mattr_accessor :auto_follow_when_posting_in_topic
   self.auto_follow_when_posting_in_topic = true
 
+  # @return [String] The name of the user class
+  mattr_reader :user_class_name
+
   self.active_user_threshold = 5.minutes
   self.admin_column = :admin
   self.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
@@ -138,17 +140,19 @@ module Thredded
     end
   end
 
+  # @param user_class_name [String]
+  def self.user_class=(user_class_name)
+    unless user_class_name.is_a?(String)
+      fail "Thredded.user_class must be set to a String, got #{user_class_name.inspect}"
+    end
+    @@user_class_name = user_class_name # rubocop:disable Style/ClassVars
+  end
+
   # @return [Class<Thredded::UserExtender>] the user class from the host application.
   def self.user_class
     # This is nil before the initializer is installed.
-    return nil if @@user_class.nil?
-    fail 'Please use a String instead of a Class' if @@user_class.is_a?(Class)
-    fail "user_class must be a String, got #{@@user_class.inspect}" unless @@user_class.is_a?(String)
-    begin
-      Object.const_get(@@user_class)
-    rescue NameError
-      @@user_class.constantize
-    end
+    return nil if @@user_class_name.nil?
+    @@user_class_name.constantize
   end
 
   # @param view_context [Object] context to execute the lambda in.

data/lib/thredded/content_formatter.rb

@@ -6,7 +6,7 @@ module Thredded
     mattr_accessor :whitelist
 
     self.whitelist = HTML::Pipeline::SanitizationFilter::WHITELIST.deep_merge(
-      elements: HTML::Pipeline::SanitizationFilter::WHITELIST[:elements] + %w(iframe span figure figcaption),
+      elements: HTML::Pipeline::SanitizationFilter::WHITELIST[:elements] + %w(abbr iframe span figure figcaption),
       transformers: HTML::Pipeline::SanitizationFilter::WHITELIST[:transformers] + [
         lambda do |env|
           next unless env[:node_name] == 'a'
@@ -20,8 +20,11 @@ module Thredded
       ],
       attributes: {
         'a'      => %w(href rel),
+        'abbr'   => %w(title),
         'span'   => %w(class),
-        'div'    => %w(class)
+        'div'    => %w(class),
+        :all     => HTML::Pipeline::SanitizationFilter::WHITELIST[:attributes][:all] +
+          %w(aria-label aria-labelledby aria-hidden),
       }
     )
 
@@ -89,7 +92,7 @@ module Thredded
     # @param content [String]
     # @return [String] formatted and sanitized html-safe content.
     def format_content(content)
-      pipeline = HTML::Pipeline.new(content_pipeline_filters, content_pipeline_options.merge(@pipeline_options))
+      pipeline = HTML::Pipeline.new(content_pipeline_filters, content_pipeline_options.deep_merge(@pipeline_options))
       result = pipeline.call(content, view_context: @view_context)
       # rubocop:disable Rails/OutputSafety
       result[:output].to_s.html_safe

data/lib/thredded/html_pipeline/kramdown_filter.rb

@@ -29,7 +29,7 @@ module Thredded
       # Convert Markdown to HTML using the best available implementation
       # and convert into a DocumentFragment.
       def call
-        result = Kramdown::Document.new(@text, self.class.options).to_html
+        result = Kramdown::Document.new(@text, self.class.options.deep_merge(context[:kramdown_options] || {})).to_html
         result.rstrip!
         result
       end

data/lib/thredded/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Thredded
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -493,6 +493,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: http_accept_language
   requirement: !ruby/object:Gem::Requirement
@@ -732,6 +746,7 @@ files:
 - app/assets/stylesheets/thredded/_thredded.scss
 - app/assets/stylesheets/thredded/base/_alerts.scss
 - app/assets/stylesheets/thredded/base/_buttons.scss
+- app/assets/stylesheets/thredded/base/_dropdown-menu.scss
 - app/assets/stylesheets/thredded/base/_forms.scss
 - app/assets/stylesheets/thredded/base/_grid.scss
 - app/assets/stylesheets/thredded/base/_lists.scss
@@ -1044,7 +1059,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The best Rails forums engine ever.