thredded 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8f7ee3eae771c92edf97664c74ebbcb42e403521cc09b9c05e7379dc98956f1
-  data.tar.gz: 66ac525459c09f1efd65c947a8df0d41dde083166d857664f7163d0ed0b131b0
+  metadata.gz: bb521ffdf8a0e754e7e55a856a649913e79295cd33799f29efeab2311f7f0f12
+  data.tar.gz: 0c40013b94c70655bb7de0edcb84bae86a6c4a8d66dc9e84a95682f82e568293
 SHA512:
-  metadata.gz: 0516e987e201972234778107cff4be78997dd15580ec0b721f21654510049598216d946966dd6a87d11553a47f7d55f7cf78f41e9fc7d07d1e0ecafd57470370
-  data.tar.gz: 70d7f20e62b6187f1017ceced464e4e0cba2ca2988dd4adc9d1f8e5776f9c0b9b5d75d29ed3d12e7125361e203b549ea44fcfe3fb884a1c9ef25496c03223a5b
+  metadata.gz: bf907ac1caa92e8d6362369c13eb0be750f95237c8a4670426f7973346de420bf6e17fa5bbd54ece98a06acad5522eb601838ea0b0c97e4799d926039be3b95d
+  data.tar.gz: 626752cbba2144434a985f4af447dcf174dd33bf1dbc8e93a28124d34be5177ddcbae74a7232dbbb821419a49e82da2af670f0dc4de4dad8514fdac06213557e

data/README.md

@@ -95,7 +95,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.15.1'
+gem 'thredded', '~> 0.15.2'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

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

@@ -7,6 +7,7 @@
 @import "layout/main-navigation";
 @import "layout/search-navigation";
 @import "layout/user-navigation";
+@import "layout/scoped-navigation";
 @import "layout/navigation";
 @import "layout/moderation";
 @import "layout/user";

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

@@ -23,3 +23,7 @@
 .thredded--embed-16-by-9 {
   @extend %thredded--embed-16-by-9;
 }
+
+.thredded--spacer {
+  flex-grow: 1;
+}

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

@@ -9,8 +9,8 @@
 
 .thredded--main-navigation {
   @extend %thredded--list-unstyled;
-  @include thredded--clearfix;
-  display: block;
+  display: flex;
+  flex-wrap: wrap;
 }
 
 .thredded--navigation-breadcrumbs {

data/app/assets/stylesheets/thredded/layout/_moderation.scss

@@ -3,14 +3,15 @@
   @include thredded-media-desktop-and-up {
     margin-bottom: $thredded-base-spacing;
   }
+}
 
-  &--items {
-    @extend %thredded--nav-tabs;
-    margin-bottom: $thredded-small-spacing;
-  }
-  &--item {
-    @extend %thredded--nav-tabs--item;
-  }
+.thredded--moderation-navigation--items {
+  @extend %thredded--nav-tabs;
+  margin-bottom: $thredded-small-spacing;
+}
+
+.thredded--moderation-navigation--item {
+  @extend %thredded--nav-tabs--item;
 }
 
 .thredded--pending-moderation .thredded--moderation-navigation--pending,

data/app/assets/stylesheets/thredded/layout/_navigation.scss

@@ -1,4 +1,6 @@
 .thredded--navigation {
+  display: flex;
+  flex-direction: column;
   position: relative;
   .thredded--icon {
     display: none;
@@ -6,7 +8,29 @@
 }
 
 @include thredded-media-tablet-and-down {
-  $icon-nav-item-width: 2.625rem;
+  $icon-nav-item-gutter: 0.5rem;
+  $icon-nav-item-width: (2.125rem + $icon-nav-item-gutter);
+  %icon-nav-item {
+    box-sizing: border-box;
+    margin: 0 0 0 $icon-nav-item-gutter;
+    padding: 0;
+    vertical-align: top;
+    a {
+      position: relative;
+      display: block;
+      padding: 0.4375rem 0 0.375rem 0;
+    }
+    .thredded--icon {
+      display: block;
+      width: 2rem;
+      height: 2rem;
+    }
+  }
+  %icon-counter {
+    bottom: 0.3125rem;
+    position: absolute;
+    right: -0.1875rem;
+  }
   .thredded--navigation {
     position: relative;
     width: 100%;
@@ -17,11 +41,18 @@
   }
   .thredded--navigation-breadcrumbs {
     font-size: $thredded-font-size-small;
-    padding-right: $icon-nav-item-width * 2;
-    .thredded--is-moderator & {
+    padding-right: $icon-nav-item-width * 1;
+    .thredded--global-nav-icons-1 & {
+      padding-right: $icon-nav-item-width * 2;
+    }
+    .thredded--global-nav-icons-2 & {
       padding-right: $icon-nav-item-width * 3;
     }
+    .thredded--global-nav-icons-3 & {
+      padding-right: $icon-nav-item-width * 4;
+    }
   }
+
   .thredded--navigation--search-topics {
     display: none;
     .thredded--messageboards-index &,
@@ -29,6 +60,7 @@
     .thredded--topic-search-results & {
       @media screen {
         display: block;
+        width: 100%;
       }
     }
   }
@@ -42,37 +74,22 @@
       display: block;
       margin-bottom: 0;
     }
-    %icon-nav-item {
-      box-sizing: border-box;
-      display: inline-block;
-      margin: 0 0 0 ($thredded-small-spacing/2);
-      padding: 0;
-      vertical-align: top;
-      a {
-        position: relative;
-        display: block;
-        padding: 0.4375rem 0 0.375rem 0;
+    &--item {
+      .thredded--nav-text {
+        display: none;
       }
-      .thredded--icon {
-        display: block;
-        width: 2rem;
-        height: 2rem;
-      }
-    }
-    %icon-counter {
-      bottom: 0.3125rem;
-      position: absolute;
-      right: -0.1875rem;
     }
-    .thredded--nav-text {
-      display: none;
+    &--unread-topics {
+      @extend %icon-nav-item;
+      &--followed-count {
+        @extend %icon-counter;
+      }
     }
     &--settings {
       @extend %icon-nav-item;
     }
     &--private-topics {
       @extend %icon-nav-item;
-      margin-top: 1px;
       &--unread {
         @extend %icon-counter;
       }
@@ -83,5 +100,23 @@
         @extend %icon-counter
       }
     }
+    &--moderation.thredded--is-current ~ &--settings,
+    &--moderation.thredded--is-current ~ &--private-topics {
+      display: none;
+    }
+  }
+  .thredded--scoped-navigation {
+    position: absolute;
+    top: 0;
+    right: 0;
+    .thredded--global-nav-icons-1 & {
+      right: $icon-nav-item-width;
+    }
+    .thredded--global-nav-icons-2 & {
+      right: $icon-nav-item-width * 2;
+    }
+    .thredded--global-nav-icons-3 & {
+      right: $icon-nav-item-width * 3;
+    }
   }
 }

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

@@ -0,0 +1,5 @@
+.thredded--scoped-navigation {
+  @extend %thredded--nav-tabs;
+  border-bottom: 0;
+  display: flex;
+}

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

@@ -1,6 +1,7 @@
 .thredded--user-navigation {
   @extend %thredded--nav-tabs;
-  text-align: right;
+  display: flex;
+  justify-content: flex-end;
   @media print {
     display: none;
   }
@@ -15,6 +16,7 @@
 }
 
 .thredded--user-navigation--private-topics--unread,
-.thredded--user-navigation--moderation--pending-count {
+.thredded--user-navigation--moderation--pending-count,
+.thredded--user-navigation--unread-topics--followed-count {
   @extend %thredded--nav-tabs--item--badge;
 }

data/app/controllers/thredded/application_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Thredded
-  class ApplicationController < ::ApplicationController
+  class ApplicationController < ::ApplicationController # rubocop:disable Metrics/ClassLength
     layout :thredded_layout
     include ::Thredded::UrlsHelper
     include Pundit
@@ -12,6 +12,9 @@ module Thredded
       :thredded_current_user,
       :messageboard,
       :messageboard_or_nil,
+      :unread_private_topics_count,
+      :unread_followed_topics_count,
+      :unread_topics_count,
       :preferences,
       :thredded_signed_in?
 
@@ -124,6 +127,54 @@ module Thredded
       nil
     end
 
+    def in_messageboard?
+      params.key?(:messageboard_id)
+    end
+
+    # @return [ActiveRecord::Relation]
+    def topics_scope
+      @topics_scope ||=
+        if in_messageboard?
+          policy_scope(messageboard.topics)
+        else
+          policy_scope(Thredded::Topic.all).joins(:messageboard).merge(policy_scope(Thredded::Messageboard.all))
+        end
+    end
+
+    def unread_private_topics_count
+      @unread_private_topics_count ||=
+        if thredded_signed_in?
+          Thredded::PrivateTopic
+            .for_user(thredded_current_user)
+            .unread(thredded_current_user)
+            .count
+        else
+          0
+        end
+    end
+
+    def unread_followed_topics_count
+      @unread_followed_topics_count ||=
+        if thredded_signed_in?
+          scope = topics_scope
+          scope = topics_scope.where(messageboard_id: messageboard.id) if in_messageboard?
+          scope.unread_followed_by(thredded_current_user).count
+        else
+          0
+        end
+    end
+
+    def unread_topics_count
+      @unread_topics_count ||=
+        if thredded_signed_in?
+          scope = topics_scope
+          scope = topics_scope.where(messageboard_id: messageboard.id) if in_messageboard?
+          scope.unread(thredded_current_user).count
+        else
+          0
+        end
+    end
+
     def preferences
       @preferences ||= thredded_current_user.thredded_user_preference
     end

data/app/controllers/thredded/topics_controller.rb

@@ -6,67 +6,42 @@ module Thredded
     include Thredded::NewPostParams
 
     before_action :thredded_require_login!,
-                  only: %i[edit new update create destroy follow unfollow]
+                  only: %i[edit new update create destroy follow unfollow unread]
+
+    before_action :verify_messageboard,
+                  only: %i[index search unread]
 
     before_action :use_topic_messageboard,
                   only: %i[show edit update destroy follow unfollow]
 
     after_action :update_user_activity
 
-    after_action :verify_authorized, except: %i[search]
+    after_action :verify_authorized, except: %i[search unread]
     after_action :verify_policy_scoped, except: %i[show new create edit update destroy follow unfollow]
 
     def index
-      authorize_reading messageboard
-      unless params_match?(canonical_messageboard_params)
-        skip_policy_scope
-        return redirect_to(canonical_messageboard_params)
-      end
-
       page_scope = policy_scope(messageboard.topics)
         .order_sticky_first.order_recently_posted_first
+        .includes(:categories, :last_user, :user)
         .page(current_page)
       return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @topics = Thredded::TopicsPageView.new(thredded_current_user, page_scope)
-      Thredded::TopicForm.new(messageboard: messageboard, user: thredded_current_user).tap do |form|
-        @new_topic = form if policy(form.topic).create?
-      end
+      @new_topic = init_new_topic
     end
 
-    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)
+    def unread
+      page_scope = topics_scope
+        .unread(thredded_current_user)
+        .order_followed_first(thredded_current_user).order_recently_posted_first
+        .includes(:categories, :last_user, :user)
         .page(current_page)
       return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
-      @posts = Thredded::TopicPostsPageView.new(thredded_current_user, topic, page_scope)
-
-      if thredded_signed_in?
-        Thredded::UserTopicReadState.touch!(thredded_current_user.id, topic.id, page_scope.last)
-      end
-
-      @new_post = Thredded::PostForm.new(user: thredded_current_user, topic: topic, post_params: new_post_params)
+      @topics = Thredded::TopicsPageView.new(thredded_current_user, page_scope)
+      @new_topic = init_new_topic
     end
 
     def search
-      in_messageboard = params.key?(:messageboard_id)
-      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
-          messageboard.topics
-        else
-          Thredded::Topic.where(messageboard_id: policy_scope(Thredded::Messageboard.all).pluck(:id))
-        end
-      )
       page_scope = topics_scope
         .search_query(@query)
         .order_recently_posted_first
@@ -76,6 +51,19 @@ module Thredded
       @topics = Thredded::TopicsPageView.new(thredded_current_user, page_scope)
     end
 
+    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)
+        .page(current_page)
+      return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
+      @posts = Thredded::TopicPostsPageView.new(thredded_current_user, topic, page_scope)
+      Thredded::UserTopicReadState.touch!(thredded_current_user.id, topic.id, page_scope.last) if thredded_signed_in?
+      @new_post = Thredded::PostForm.new(user: thredded_current_user, topic: topic, post_params: new_post_params)
+    end
+
     def new
       @new_topic = Thredded::TopicForm.new(new_topic_params)
       authorize_creating @new_topic.topic
@@ -153,6 +141,20 @@ module Thredded
 
     private
 
+    def init_new_topic
+      return unless in_messageboard?
+      form = Thredded::TopicForm.new(messageboard: messageboard, user: thredded_current_user)
+      form if policy(form.topic).create?
+    end
+
+    def verify_messageboard
+      return unless in_messageboard?
+      authorize_reading messageboard
+      return if params_match?(canonical_messageboard_params)
+      skip_policy_scope
+      redirect_to(canonical_messageboard_params)
+    end
+
     def canonical_messageboard_params
       { messageboard_id: messageboard.slug }
     end

data/app/helpers/thredded/application_helper.rb

@@ -20,9 +20,20 @@ module Thredded
     end
 
     def thredded_container_classes
-      ['thredded--main-container', content_for(:thredded_page_id)].tap do |classes|
-        classes << 'thredded--is-moderator' unless moderatable_messageboards_ids.empty?
-      end
+      [
+        'thredded--main-container',
+        content_for(:thredded_page_id),
+        "thredded--global-nav-icons-#{global_nav_icons_count}",
+        ('thredded--is-moderator' unless moderatable_messageboards_ids.empty?),
+        ('thredded--private-messaging-enabled' if Thredded.private_messaging_enabled),
+      ].compact
+    end
+
+    def global_nav_icons_count
+      result = 1 # Notification Settings
+      result += 1 if Thredded.private_messaging_enabled
+      result += 1 if moderatable_messageboards_ids.present?
+      result
     end
 
     # Render the page container with the supplied block as content.
@@ -104,18 +115,6 @@ module Thredded
       end
     end
 
-    def unread_private_topics_count
-      @unread_private_topics_count ||=
-        if thredded_signed_in?
-          Thredded::PrivateTopic
-            .for_user(thredded_current_user)
-            .unread(thredded_current_user)
-            .count
-        else
-          0
-        end
-    end
-
     def moderatable_messageboards_ids
       @moderatable_messageboards_ids ||=
         thredded_current_user.thredded_can_moderate_messageboards.pluck(:id)

data/app/helpers/thredded/nav_helper.rb

@@ -27,6 +27,14 @@ module Thredded
       ]
     )
 
+    USER_NAV_UNREAD_TOPICS = Set.new(
+      %w[thredded--unread-topics]
+    )
+
+    def current_page_unread_topics?
+      USER_NAV_UNREAD_TOPICS.include?(content_for(:thredded_page_id))
+    end
+
     def current_page_preferences?
       USER_NAV_PREFERENCES_PAGES.include?(content_for(:thredded_page_id))
     end
@@ -38,5 +46,9 @@ module Thredded
     def current_page_private_topics?
       USER_NAV_PRIVATE_TOPICS_PAGES.include?(content_for(:thredded_page_id))
     end
+
+    def nav_back_path(messageboard = nil)
+      messageboard ? messageboard_topics_path(messageboard) : messageboards_path
+    end
   end
 end

data/app/helpers/thredded/urls_helper.rb

@@ -95,6 +95,17 @@ module Thredded
       edit_preferences_url(messageboard, params.merge(only_path: true))
     end
 
+    # @param [Thredded::Messageboard, nil] messageboard
+    # @param [Hash] params additional params
+    def unread_topics_path(messageboard: nil, **params)
+      params[:only_path] = true
+      if messageboard
+        unread_messageboard_topics_url(messageboard, params)
+      else
+        unread_topics_url(params)
+      end
+    end
+
     # @param messageboard [Thredded::Messageboard, nil]
     # @return [String] the path to the global or messageboard search.
     def search_path(messageboard = nil)

data/app/models/thredded/messageboard.rb

@@ -16,6 +16,7 @@ module Thredded
                     private-posts
                     private-topics
                     theme-preview
+                    unread
                   ]
                 )
 

data/app/models/thredded/topic.rb

@@ -14,6 +14,13 @@ module Thredded
     scope :search_query, ->(query) { ::Thredded::TopicsSearch.new(query, self).search }
 
     scope :order_sticky_first, -> { order(sticky: :desc) }
+    scope :order_followed_first, lambda { |user|
+      user_follows = UserTopicFollow.arel_table
+      joins(arel_table.join(user_follows, Arel::Nodes::OuterJoin)
+              .on(user_follows[:topic_id].eq(arel_table[:id])
+                  .and(user_follows[:user_id].eq(user.id))).join_sources)
+        .order(Arel::Nodes::Ascending.new(user_follows[:id].eq(nil)))
+    }
 
     scope :followed_by, lambda { |user|
       joins(:user_follows)

data/app/views/thredded/messageboards/_messageboard_actions.html.erb

@@ -0,0 +1,7 @@
+<div class="thredded--messageboards--actions">
+  <% if policy(messageboard).update? %>
+    <a class="thredded--button" href="<%= edit_messageboard_path(messageboard) %>" rel="nofollow">
+      <%= t('thredded.nav.edit_messageboard') %>
+    </a>
+  <% end %>
+</div>

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

@@ -11,7 +11,7 @@
   <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: placeholder, required: true %>
+      <%= form.text_field :title, placeholder: placeholder, required: true, autocomplete: 'off' %>
       <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] if form.object.errors.include?(:title) %>
     </li>
     <li>

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

@@ -12,8 +12,13 @@
     <%= yield :thredded_main_navigation %>
   <% else %>
     <div class="thredded--main-navigation">
+      <%# Navigation scoped to the current messageboard if any. %>
       <%= yield :thredded_breadcrumbs %>
       <%= render 'thredded/search/form', messageboard: messageboard_or_nil %>
+      <div class="thredded--spacer"></div>
+      <div class="thredded--scoped-navigation">
+        <%= render 'thredded/shared/nav/unread_topics', messageboard: messageboard_or_nil %>
+      </div>
     </div>
   <% end %>
 </nav>

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

@@ -1,7 +1,7 @@
 <% if moderatable_messageboards_ids.present? %>
   <% current = current_page_moderation? %>
   <li class="thredded--user-navigation--item thredded--user-navigation--moderation<%= ' thredded--is-current' if current %>">
-    <%= link_to (current ? messageboards_path : pending_moderation_path), rel: 'nofollow' do %>
+    <%= link_to current ? nav_back_path : pending_moderation_path, rel: 'nofollow' do %>
       <%= inline_svg 'thredded/moderation.svg',
                      class: 'thredded--icon',
                      title: t('thredded.nav.moderation') %>

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

@@ -1,7 +1,6 @@
 <% 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), rel: 'nofollow' do %>
+  <%= link_to current ? nav_back_path(messageboard) : 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/_private_topics.html.erb

@@ -1,6 +1,6 @@
 <% current = current_page_private_topics? %>
 <li class="thredded--user-navigation--item thredded--user-navigation--private-topics<%= ' thredded--is-current' if current %>">
-  <%= link_to (current ? messageboards_path : private_topics_path), rel: 'nofollow' do %>
+  <%= link_to current ? nav_back_path : private_topics_path, rel: 'nofollow' do %>
     <%= inline_svg 'thredded/private-messages.svg',
                    class: 'thredded--icon',
                    title: t('thredded.nav.private_topics') %>

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

@@ -0,0 +1,12 @@
+<% current = current_page_unread_topics? %>
+<% if unread_topics_count > 0 || current %>
+  <li class="thredded--user-navigation--unread-topics thredded--user-navigation--item<%= ' thredded--is-current' if current %>">
+    <%= link_to current ? nav_back_path(messageboard) : unread_topics_path(messageboard: messageboard), rel: 'nofollow' do %>
+      <%= inline_svg 'thredded/follow.svg', class: 'thredded--icon' %>
+      <span class="thredded--nav-text"><%= t('thredded.nav.unread_topics') %></span>
+      <% if unread_followed_topics_count > 0 -%>
+        <span class="thredded--user-navigation--unread-topics--followed-count"><%= unread_followed_topics_count %></span>
+      <% end -%>
+    <% end %>
+  </li>
+<% end %>

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

@@ -9,7 +9,7 @@
   <ul class="thredded--form-list on-top">
     <li class="title">
       <%= form.label :title, t('thredded.topics.form.title_label') %>
-      <%= form.text_field :title, placeholder: placeholder, required: true %>
+      <%= form.text_field :title, placeholder: placeholder, required: true, autocomplete: 'off' %>
       <%= render 'thredded/shared/field_errors', messages: form.object.errors[:title] if form.object.errors.include?(:title) %>
     </li>
 

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

@@ -3,7 +3,7 @@
 <% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 
 <%= thredded_page do %>
-  <div class="thredded--svg-definitions ">
+  <div class="thredded--svg-definitions">
     <%= inline_svg 'thredded/follow.svg', id: 'thredded-follow-icon', title: nil %>
     <%= inline_svg 'thredded/unfollow.svg', id: 'thredded-unfollow-icon' %>
   </div>
@@ -25,11 +25,5 @@
     <%= paginate @topics %>
   </footer>
 
-  <div class="thredded--messageboards--actions">
-    <% if policy(messageboard).update? %>
-      <a class="thredded--button" href="<%= edit_messageboard_path(messageboard) %>" rel="nofollow">
-        <%= t('thredded.nav.edit_messageboard') %>
-      </a>
-    <% end %>
-  </div>
+  <%= render 'thredded/messageboards/messageboard_actions', messageboard: messageboard %>
 <% end %>

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

@@ -0,0 +1,33 @@
+<% content_for :thredded_page_title,
+               messageboard_or_nil ?
+                   t('thredded.unread_topics.page_title_in_messageboard', messageboard: messageboard.name) :
+                   t('thredded.unread_topics.page_title') %>
+<% content_for :thredded_page_id, 'thredded--unread-topics' %>
+<% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
+
+<%= thredded_page do %>
+  <% if @topics.present? %>
+    <div class="thredded--svg-definitions ">
+      <%= inline_svg 'thredded/follow.svg', id: 'thredded-follow-icon', title: nil %>
+      <%= inline_svg 'thredded/unfollow.svg', id: 'thredded-unfollow-icon' %>
+    </div>
+    <%= content_tag :section, class: 'thredded--main-section thredded--topics', 'data-thredded-topics' => true do %>
+      <%= render 'thredded/topics/form',
+                 topic: @new_topic,
+                 css_class: 'thredded--is-compact',
+                 placeholder: t('thredded.topics.form.title_placeholder_start') if @new_topic %>
+      <%= render partial: 'thredded/topics/topic',
+                 collection: @topics,
+                 locals: { topics: @topics } %>
+    <% end %>
+    <footer class="thredded--pagination-bottom">
+      <%= paginate @topics %>
+    </footer>
+  <% else %>
+    <div class="thredded--empty">
+      <h3 class="thredded--empty--title"><%= t 'thredded.unread_topics.empty.title' %></h3>
+      <p><%= t 'thredded.unread_topics.empty.content' %></p>
+    </div>
+  <% end %>
+  <%= render 'thredded/messageboards/messageboard_actions', messageboard: messageboard if messageboard_or_nil %>
+<% end %>

data/config/locales/de.yml

@@ -117,6 +117,7 @@ de:
       moderation_users: Nutzer
       private_topics: Private Unterhaltungen
       settings: Benachrichtigungseinstellungen
+      unread_topics: Ungelesen
     null_user_name: Gelöschte Nutzer
     posts:
       delete: Beitrag gelöscht
@@ -242,6 +243,12 @@ de:
       unfollow: Nich mehr folgen
       unfollowed_notice: Du folgst der Diskussion nicht mehr
       updated_notice: Beitrag aktualisiert
+    unread_topics:
+      empty:
+        content: Du hast alles gelesen, was es gibt. Komm später wieder für mehr!
+        title: Alles gelesen!
+      page_title: Ungelesene Themen
+      page_title_in_messageboard: "%{messageboard}: Ungelesene Themen"
     users:
       currently_online: Zurzeit Online
       last_active_html: Zuletzt aktiv %{time_ago}

data/config/locales/en.yml

@@ -116,6 +116,7 @@ en:
       moderation_users: Users
       private_topics: Private Messages
       settings: Notification Settings
+      unread_topics: Unread
     null_user_name: Deleted user
     posts:
       delete: Delete Post
@@ -238,6 +239,12 @@ en:
       unfollow: Stop following
       unfollowed_notice: You are no longer following this topic
       updated_notice: Topic updated
+    unread_topics:
+      empty:
+        content: You've read all there is. Come back later for more!
+        title: All read!
+      page_title: Unread topics
+      page_title_in_messageboard: "%{messageboard}: Unread topics"
     users:
       currently_online: Currently Online
       last_active_html: Last active %{time_ago}

data/config/locales/es.yml

@@ -118,6 +118,7 @@ es:
       moderation_users: Usuarios
       private_topics: Mensajes Privados
       settings: Ajuste de Notificaciones
+      unread_topics: No leído
     null_user_name: Usuario eliminado
     posts:
       delete: Eliminar Mensaje
@@ -242,6 +243,12 @@ es:
       unfollow: Deja de seguir
       unfollowed_notice: Has dejado de seguir este tema
       updated_notice: Tema actualizado
+    unread_topics:
+      empty:
+        content: Has leído todo lo que hay. ¡Vuelve más tarde para más!
+        title: "¡Todo leido!"
+      page_title: Temas no leídos
+      page_title_in_messageboard: "%{messageboard}: temas no leídos"
     users:
       currently_online: En línea
       last_active_html: Última vez activo hace %{time_ago}

data/config/locales/fr.yml

@@ -116,6 +116,7 @@ fr:
       moderation_users: Utilisateurs
       private_topics: Messages privés
       settings: Paramètres de notifications
+      unread_topics: Non lu
     null_user_name: Utilisateur effacé
     posts:
       delete: Supprimer le commentaire
@@ -240,6 +241,12 @@ fr:
       unfollow: Arrêter de suivre
       unfollowed_notice: Vous ne suivez dorénavant plus ce sujet
       updated_notice: Sujet mis à jour
+    unread_topics:
+      empty:
+        content: Vous avez lu tout ce qu'il y a. Revenez plus tard pour plus!
+        title: Tout lire!
+      page_title: Sujets non lus
+      page_title_in_messageboard: "%{messageboard}: sujets non lus"
     users:
       currently_online: En ce moment connecté
       last_active_html: 'Actif pour la dernière fois : %{time_ago}'

data/config/locales/it.yml

@@ -116,6 +116,7 @@ it:
       moderation_users: Utenti
       private_topics: Messaggi Privati
       settings: Impostazioni Notifiche
+      unread_topics: Non letto
     null_user_name: Utente cancellato
     posts:
       delete: Cancella messaggio
@@ -242,6 +243,12 @@ it:
       unfollow: Non seguire più questa discussione
       unfollowed_notice: Ora non stai più seguendo questa discussione
       updated_notice: Discussione aggiornata
+    unread_topics:
+      empty:
+        content: Hai letto tutto quello che c'è. Torna più tardi per di più!
+        title: Tutto letto!
+      page_title: Argomenti non letti
+      page_title_in_messageboard: "%{messageboard}: argomenti non letti"
     users:
       currently_online: Attualmente connessi
       last_active_html: Ultima attività %{time_ago}

data/config/locales/pl.yml

@@ -116,6 +116,7 @@ pl:
       moderation_users: Użytkownicy
       private_topics: Prywatne wiadomości
       settings: Ustawienia powiadomień
+      unread_topics: Nieprzeczytane
     null_user_name: Usunięci użytkownicy
     posts:
       delete: Usuń post
@@ -238,6 +239,12 @@ pl:
       unfollow: Przestań obserwować
       unfollowed_notice: Przestałeś obserwować ten temat
       updated_notice: Temat zaktualizowany
+    unread_topics:
+      empty:
+        content: Przeczytałeś wszystko, co istnieje. Przyjdź później po więcej!
+        title: Wszystko przeczytane!
+      page_title: Nieprzeczytane tematy
+      page_title_in_messageboard: "%{messageboard}: Nieprzeczytane tematy"
     users:
       currently_online: Aktualnie online
       last_active_html: Ostatnio aktywny %{time_ago}

data/config/locales/pt-BR.yml

@@ -118,6 +118,7 @@ pt-BR:
       moderation_users: Usuários
       private_topics: Mensagens Privadas
       settings: Configurações de Notificação
+      unread_topics: Não lida
     null_user_name: Usuário deletado
     posts:
       delete: Remover Post
@@ -243,6 +244,12 @@ pt-BR:
       unfollow: Pare de seguir
       unfollowed_notice: Você não está mais seguindo este tópico
       updated_notice: Tópico atualizado
+    unread_topics:
+      empty:
+        content: Você leu tudo o que existe. Volte mais tarde para mais!
+        title: Tudo lido!
+      page_title: Tópicos não lidos
+      page_title_in_messageboard: "%{messageboard}: Tópicos não lidos"
     users:
       currently_online: Atualmente Online
       last_active_html: Última %{time_ago} ativa

data/config/locales/ru.yml

@@ -114,6 +114,7 @@ ru:
       moderation_users: Пользователи
       private_topics: Личное
       settings: Настройки
+      unread_topics: Непрочитанные
     null_user_name: Пользователь удален
     posts:
       delete: Удалить пост
@@ -236,6 +237,12 @@ ru:
       unfollow: Не следить за темой
       unfollowed_notice: Вы не следите за темой
       updated_notice: Тема обновлена
+    unread_topics:
+      empty:
+        content: Вы все прочитали. Вернитесь позже и может будет еще что-нибудь!
+        title: Все прочитано!
+      page_title: Непрочитанные темы
+      page_title_in_messageboard: "%{messageboard}: непрочитанные темы"
     users:
       currently_online: Онлайн
       last_active_html: Последняя активность %{time_ago}

data/config/locales/zh-CN.yml

@@ -111,6 +111,7 @@ zh-CN:
       moderation_users: 用户
       private_topics: 私人对话
       settings: 通知设置
+      unread_topics: 未读
     null_user_name: 删除用户
     posts:
       delete: 删除回复
@@ -231,6 +232,12 @@ zh-CN:
       unfollow: 取消关注
       unfollowed_notice: 你不再关注该帖子
       updated_notice: 帖子已更新
+    unread_topics:
+      empty:
+        content: 你已经读完了。稍后再回来获取更多！
+        title: 全部阅读！
+      page_title: 未读主题
+      page_title_in_messageboard: "%{messageboard}：未读主题"
     users:
       currently_online: 目前在线
       last_active_html: 最后活跃%{time_ago}

data/config/routes.rb

@@ -52,6 +52,12 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
     end
   end
 
+  resources :topics, path: '', only: [] do
+    collection do
+      get '/unread', action: :unread, as: :unread
+    end
+  end
+
   resource :preferences, only: %i[edit update], as: :global_preferences
   resource :messageboard, path: 'messageboards', only: [:new]
   resources :messageboards, only: %i[edit update]
@@ -64,6 +70,7 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
       collection do
         get '(page-:page)', action: :index, as: '', constraints: page_constraint
         get '/category/:category_id', action: :category, as: :categories
+        get '/unread', action: :unread, as: :unread
       end
       member do
         get '(page-:page)', action: :show, as: '', constraints: page_constraint

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '0.15.1'
+  VERSION = '0.15.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -733,6 +733,7 @@ files:
 - app/assets/stylesheets/thredded/layout/_main-navigation.scss
 - app/assets/stylesheets/thredded/layout/_moderation.scss
 - app/assets/stylesheets/thredded/layout/_navigation.scss
+- app/assets/stylesheets/thredded/layout/_scoped-navigation.scss
 - app/assets/stylesheets/thredded/layout/_search-navigation.scss
 - app/assets/stylesheets/thredded/layout/_user-navigation.scss
 - app/assets/stylesheets/thredded/layout/_user.scss
@@ -861,6 +862,7 @@ files:
 - app/views/thredded/messageboard_groups/new.html.erb
 - app/views/thredded/messageboards/_form.html.erb
 - app/views/thredded/messageboards/_messageboard.html.erb
+- app/views/thredded/messageboards/_messageboard_actions.html.erb
 - app/views/thredded/messageboards/_messageboard_meta.html.erb
 - app/views/thredded/messageboards/edit.html.erb
 - app/views/thredded/messageboards/index.html.erb
@@ -945,6 +947,7 @@ files:
 - app/views/thredded/shared/nav/_private_topics.html.erb
 - app/views/thredded/shared/nav/_standalone.html.erb
 - app/views/thredded/shared/nav/_standalone_profile.html.erb
+- app/views/thredded/shared/nav/_unread_topics.html.erb
 - app/views/thredded/shared/preview.html.erb
 - app/views/thredded/theme_previews/_section_title.html.erb
 - app/views/thredded/theme_previews/show.html.erb
@@ -960,6 +963,7 @@ files:
 - app/views/thredded/topics/new.html.erb
 - app/views/thredded/topics/search.html.erb
 - app/views/thredded/topics/show.html.erb
+- app/views/thredded/topics/unread.html.erb
 - app/views/thredded/users/_link.html.erb
 - app/views/thredded/users/_post.html.erb
 - app/views/thredded/users/_posts.html.erb