thredded 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e08209cc4846d358cb9cf977e394ab14e553571
-  data.tar.gz: dc0b3eb3302a5fd5b9a3d7d01abfcb25af8635a9
+  metadata.gz: 584af3429d4903d4e71c2a9c6ade98a1ce121505
+  data.tar.gz: 0c4a78eaeb21357be674af2a152bf0e72a35ad9c
 SHA512:
-  metadata.gz: 7f14c1568bc33b5264b04c97e1ac8500d2215c6dd5f9e0002fd052baff8e722b7f691960db5ac47f85f45a828988762ba8f4eb09b2eb9a82ec8fa5c78a5c7f18
-  data.tar.gz: 1e41c3ff6c705a77a5a9856a5c2cb1216d0ccb291796562fd0ca2be87a5a45877e08c7972f39f6c2d2a56ff4c3ffa05f944119d3bf1a78b086a6e400af2d0383
+  metadata.gz: 4fca75e1a3052d79bb58f55202add9746e393418a04d5afca1e07cfa95fd90301eaced3f63189493f94639722d1a689f06170e586388a06ba12fadbee65c0a72
+  data.tar.gz: 4bb3d36a5fa56b0180e5f73c6c4de8cd5130805e07d0057dabef25d580d1a1de178441b96df0321c8f9c5cd700759a72caf006b7abe7783e51dc2be77fa16501

data/README.md

@@ -56,7 +56,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.10.0'
+gem 'thredded', '~> 0.10.1'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -105,27 +105,14 @@ rails g thredded:install
 
 But then compare this with the previous version to decide what to keep.
 
-2) To upgrade the database:
-
-Latest version (in this example from v0.6 to v0.7):
+2) To upgrade the database (in this example from v0.9 to v0.10):
 
 ```console
-# Note that for guaranteed best results you will want to run this with the gem checked out with v0.7.0
-cp `bundle show thredded`/db/upgrade_migrations/20160723012349_upgrade_v0_6_to_v0_7.rb db/migrate
+# 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
 rake db:migrate
 ```
 
-
-To upgrade the database (in this example from v0.7 to v0.8):
-
-```console
-# Note that for guaranteed best results you will want to run this with the gem checked out with v0.8.0.
-cp `bundle show thredded`/db/upgrade_migrations/20161019150201_upgrade_v0_7_to_v0_8.rb db/migrate
-rake db:migrate
-```
-
-
-
 ### Migrating from Forem
 
 Are you currently using [Forem]? Thredded provides [a migration][forem-to-thredded] to copy all of your existing data from Forem over

data/app/assets/images/thredded/three-dot-menu.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="408px" height="408px" viewBox="0 0 408 408">
+		<path d="M204,102c28.05,0,51-22.95,51-51S232.05,0,204,0s-51,22.95-51,51S175.95,102,204,102z M204,153c-28.05,0-51,22.95-51,51    s22.95,51,51,51s51-22.95,51-51S232.05,153,204,153z M204,306c-28.05,0-51,22.95-51,51s22.95,51,51,51s51-22.95,51-51    S232.05,306,204,306z"/>
+</svg>

data/app/assets/stylesheets/thredded/base/_tables.scss

@@ -8,6 +8,7 @@
     padding: 0.5rem 0.75rem;
     border-bottom: $thredded-base-border;
     vertical-align: middle;
+    word-break: break-word;
   }
 
   th {

data/app/assets/stylesheets/thredded/base/_variables.scss

@@ -31,6 +31,8 @@ $thredded-action-transition: color 0.1s linear !default;
 $thredded-nav-color: $thredded-text-color !default;
 $thredded-nav-hover-color: $thredded-action-color !default;
 $thredded-nav-current-color: $thredded-action-color !default;
+$thredded-overlay-background-color: $thredded-background-color !default;
+$thredded-overlay-box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12) !default;
 $thredded-secondary-nav-color: $thredded-secondary-text-color !default;
 $thredded-spoiler-hidden-color: $thredded-light-gray !default;
 $thredded-spoiler-shown-color: black !default;
@@ -85,7 +87,28 @@ $thredded-badge-inactive-color: $thredded-button-color !default;
 $thredded-badge-inactive-background: rgba($thredded-text-color, 0.3) !default;
 
 // Layout features
+
+// Messageboards grid
 // Whether to display messageboards as a grid on the desktop screen sizes.
 $thredded-messageboards-grid: true !default;
+// Paddings within a grid item
+$thredded-messageboards-grid-item-padding-x: ($thredded-base-spacing * 0.8) !default;
+$thredded-messageboards-grid-item-padding-y: $thredded-base-spacing !default;
+// Spacing between grid items, must be set in the same unit as the border width
+$thredded-messageboards-grid-item-gutter-x: 0 !default;
+$thredded-messageboards-grid-item-gutter-y: 0 !default;
+// The width of the border around a grid item
+$thredded-messageboards-grid-item-border-width: 1px !default;
+$thredded-messageboards-grid-item-border-color:
+    // If one of the gutters is 0 the borders will be collapsed by overlap.
+    // Ensure their color does not have and alpha component:
+    if($thredded-messageboards-grid-item-gutter-x == 0 or $thredded-messageboards-grid-item-gutter-y == 0,
+       // Use the closest non-transparent color
+       mix(opacify($thredded-base-border-color, 1), $thredded-background-color,
+           percentage(alpha($thredded-base-border-color))),
+       $thredded-base-border-color) !default;
 // Minimum width of a grid item
-$thredded-messageboards-grid-item-flex-basis: map-get($thredded-grid-breakpoint-max-widths, tablet) / 3 !default;
+$thredded-messageboards-grid-item-flex-basis: 21.5rem !default;
+
+// Topics list
+$thredded-topics-list-gutter-y: $thredded-base-spacing !default;

data/app/assets/stylesheets/thredded/components/_currently-online.scss

@@ -1,6 +1,7 @@
 .thredded--currently-online {
   background-color: $thredded-base-border-color;
   bottom: -1.25rem;
+  box-sizing: content-box;
   padding: $thredded-base-spacing;
   position: fixed;
   right: 0;

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

@@ -1,16 +1,18 @@
 .thredded--messageboards-group {
+  box-sizing: border-box;
   margin-bottom: $thredded-base-spacing;
 }
 
 .thredded--messageboard {
   @extend %thredded--link;
+  box-sizing: border-box;
   display: block;
-  margin-bottom: 1px;
+  margin-bottom: -$thredded-messageboards-grid-item-border-width;
   padding: $thredded-base-spacing;
   position: relative;
 
   &, &:focus, &:hover, &:active {
-    outline: 1px solid $thredded-base-border-color;
+    border: $thredded-messageboards-grid-item-border-width solid $thredded-messageboards-grid-item-border-color;
   }
 
   &:hover {
@@ -95,13 +97,18 @@
 
   @if $thredded-messageboards-grid {
     @include thredded-media-desktop-and-up {
-      $item-border-width: 1px;
-      $item-padding-x: ($thredded-base-spacing * 0.8);
-      $item-padding-y: $thredded-base-spacing;
+      $gutter-x: $thredded-messageboards-grid-item-gutter-x;
+      $gutter-y: $thredded-messageboards-grid-item-gutter-y;
+      $border-width: $thredded-messageboards-grid-item-border-width;
+      // Collapse borders when there is no gutter
+      $margin-x: $gutter-x / 2 - if($gutter-x == 0, $border-width / 2, 0);
+      $margin-y: $gutter-y / 2 - if($gutter-y == 0, $border-width / 2, 0);
 
       %thredded--messageboards-cell-flex {
         flex-basis: $thredded-messageboards-grid-item-flex-basis;
         flex-grow: 1;
+        margin-left: $margin-x;
+        margin-right: $margin-x;
       }
 
       .thredded--messageboards-group {
@@ -109,14 +116,14 @@
         flex-direction: row;
         flex-wrap: wrap;
         justify-content: space-between;
-        margin-left: $item-border-width;
+        margin: (-$margin-y) (-$margin-x);
 
         // Size incomplete last rows with up to two missing items.
         &::after, &::before {
           @extend %thredded--messageboards-cell-flex;
+          box-sizing: border-box;
           content: "";
-          margin-right: $item-border-width;
-          padding: 0 $item-padding-x;
+          padding: 0 $thredded-messageboards-grid-item-padding-x;
         }
 
         &::before {
@@ -126,8 +133,9 @@
 
       .thredded--messageboard {
         @extend %thredded--messageboards-cell-flex;
-        margin-left: 1px;
-        padding: $item-padding-y $item-padding-x;
+        margin-top: $margin-y;
+        margin-bottom: $margin-y;
+        padding: $thredded-messageboards-grid-item-padding-y $thredded-messageboards-grid-item-padding-x;
       }
 
     }

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

@@ -6,6 +6,90 @@
   }
 }
 
+.thredded--post--dropdown--toggle {
+  fill: currentColor;
+  color: $thredded-action-color;
+  display: inline-block;
+  width: 1rem;
+  height: 1rem;
+  padding: 0.875rem 0.875rem 0.875rem 1.5rem;
+  margin-right: -0.875rem;
+  -webkit-tap-highlight-color: transparent;
+}
+
+.thredded--post--dropdown {
+  position: relative;
+  display: inline-block;
+  float: right;
+  cursor: pointer;
+  @media print {
+    display: none;
+  }
+}
+
+.thredded--post--dropdown--actions {
+  position: absolute;
+  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-action-color;
+    color: $thredded-background-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--avatar {
   border-radius: 50%;
   display: inline-block;
@@ -59,19 +143,6 @@
   display: inline-block;
 }
 
-.thredded--post--edit,
-.thredded--post--delete {
-  font-size: $thredded-font-size-small;
-  @extend %thredded--link;
-  @media print {
-    display: none;
-  }
-}
-
-.thredded--post--delete {
-  margin-left: 0.4rem;
-}
-
 .thredded--post--content {
   font-size: 1.063rem; // 17px
   line-height: 1.65;

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

@@ -1,5 +1,5 @@
 .thredded--topics--topic {
-  margin-bottom: $thredded-base-spacing;
+  margin-bottom: $thredded-topics-list-gutter-y;
   position: relative;
 
   @media (max-width: $thredded-grid-container-max-width) {
@@ -8,7 +8,13 @@
   @include thredded-media-mobile {
     margin-right: 2rem;
   }
+}
 
+.thredded--topics--sticky-topics-divider {
+  margin-top: -$thredded-topics-list-gutter-y / 2;
+  margin-bottom: $thredded-topics-list-gutter-y / 2;
+  border: 0;
+  border-top: $thredded-base-border;
 }
 
 .thredded--topics--title {

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

@@ -1,6 +1,7 @@
 .thredded--main-container {
   @include thredded--clearfix;
   -webkit-font-smoothing: antialiased;
+  box-sizing: content-box;
   color: $thredded-text-color;
   font-family: $thredded-base-font-family;
   font-size: $thredded-base-font-size;

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

@@ -30,18 +30,15 @@
       width: auto;
       padding: 0.9375rem 0.75rem 0.875rem 0.75rem;
       margin: -1px (-$padding-x) 0 0;
-      // Webkit adds an extra padding that we need to remove.
-      -webkit-margin-end: -($padding-x + 0.75rem);
 
       &, &:focus {
         transition: background, border-color, box-shadow, min-width 0.15s ease-out 0s;
       }
 
-      &:focus {
+      &:focus, &:not(:placeholder-shown) {
         background: $thredded-background-color;
         box-shadow: none;
         margin-right: 0;
-        -webkit-margin-end: 0;
         min-width: 16rem;
         text-align: left;
       }
@@ -59,6 +56,16 @@
         max-height: $line-height;
       }
 
+      &:placeholder-shown, &:not(:focus) {
+        // On Chrome, the search [x] takes up space even when invisible,
+        // breaking the placeholder positioning. Remove it:
+        &::-webkit-search-cancel-button,
+        &::-webkit-search-decoration {
+          -webkit-appearance: none;
+          margin: 0;
+        }
+      }
+
       &::placeholder {
         color: $thredded-secondary-nav-color;
         transition: $thredded-action-transition;
@@ -70,13 +77,15 @@
       }
 
       &:hover:not(:focus) {
-        cursor: pointer;
+        &:placeholder-shown {
+          cursor: pointer;
+        }
         &::placeholder {
           color: $thredded-nav-hover-color;
         }
       }
 
-      &:focus {
+      &:focus, &:not(:placeholder-shown) {
         border-color: $thredded-base-border-color;
       }
     }

data/app/controllers/thredded/application_controller.rb

@@ -12,7 +12,7 @@ module Thredded
       :messageboard,
       :messageboard_or_nil,
       :preferences,
-      :signed_in?
+      :thredded_signed_in?
 
     rescue_from Thredded::Errors::MessageboardNotFound,
                 Thredded::Errors::PrivateTopicNotFound,
@@ -40,11 +40,14 @@ module Thredded
 
     protected
 
+    # The `current_user` and `signed_in?` methods are prefixed with `thredded_`
+    # to avoid conflicts with methods from the parent controller.
+
     def thredded_current_user
       send(Thredded.current_user_method) || NullUser.new
     end
 
-    def signed_in?
+    def thredded_signed_in?
       !thredded_current_user.thredded_anonymous?
     end
 
@@ -76,7 +79,7 @@ module Thredded
     end
 
     def update_user_activity
-      return if !messageboard_or_nil || !signed_in?
+      return if !messageboard_or_nil || !thredded_signed_in?
 
       Thredded::ActivityUpdaterJob.perform_later(
         thredded_current_user.id,

data/app/controllers/thredded/moderation_controller.rb

@@ -76,7 +76,7 @@ module Thredded
 
     def maybe_set_last_moderated_record_flash
       return unless flash[:last_moderated_record_id]
-      @last_moderated_record = accessible_post_moderation_records.find(flash[:last_moderated_record_id].to_i)
+      @last_moderated_record = accessible_post_moderation_records.find(flash[:last_moderated_record_id].to_s)
     end
 
     def moderatable_posts

data/app/controllers/thredded/posts_controller.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Thredded
-  # This currently handles both {Post}s and {PrivatePost}s.
-  # TODO: split up the PrivatePost functionality into a separate controller.
+  # A controller for managing {Post}s.
   class PostsController < Thredded::ApplicationController
     include ActionView::RecordIdentifier
 
@@ -37,40 +36,38 @@ module Thredded
                     notice: I18n.t('thredded.posts.deleted_notice')
     end
 
+    def mark_as_unread
+      authorize post, :read?
+      page = post.page(user: thredded_current_user)
+      post.mark_as_unread(thredded_current_user, page)
+      after_mark_as_unread # customization hook
+    end
+
     private
 
+    def after_mark_as_unread
+      redirect_to messageboard_topics_path(messageboard)
+    end
+
     def topic
       post.postable
     end
 
     def post_params
-      p = params.require(:post)
+      params.require(:post)
         .permit(:content)
-        .merge(user: thredded_current_user, ip: request.remote_ip)
-      p = p.merge(messageboard: messageboard) unless for_a_private_topic?
-      p
+        .merge(user: thredded_current_user, ip: request.remote_ip, messageboard: messageboard)
     end
 
     def parent_topic
-      if for_a_private_topic?
-        PrivateTopic
-          .includes(:private_users)
-          .friendly
-          .find(params[:private_topic_id])
-      else
-        Topic
-          .where(messageboard: messageboard)
-          .friendly
-          .find(params[:topic_id])
-      end
-    end
-
-    def for_a_private_topic?
-      params[:private_topic_id].present?
+      Topic
+        .where(messageboard: messageboard)
+        .friendly
+        .find(params[:topic_id])
     end
 
     def post
-      @post ||= (for_a_private_topic? ? Thredded::PrivatePost : Thredded::Post).find(params[:id])
+      @post ||= Thredded::Post.find(params[:id])
     end
 
     def current_page