Merge branch 'develop' into 0valt/1941/community-assets-settings

Author: Oaphi

app/assets/stylesheets/application.scss

@@ -84,24 +84,6 @@ a.header--site-name {
   }
 }
 
-/* Copied from Co-Design for compatibility purposes */
-ul.pagination li.active {
-  border-color:#293338;
-  background-color:#3f4e56;
-  box-shadow:2px 3px 2px -2px #344147;
-  color:#fff;
-  font-weight:600
-}
-
-ul.pagination li.active a:hover {
-  background-color:transparent
-}
-
-ul.pagination li.disabled {
-  box-shadow:none
-}
-/* *** */
-
 .notice__dev-mode {
   font-size: 14px;
 }

app/assets/stylesheets/pagination.scss

@@ -0,0 +1,25 @@
+@import 'variables';
+
+ul {
+  &.pagination {
+    li {
+      &.active {
+        border-color: #293338;
+        background-color: #3f4e56;
+        box-shadow: 2px 3px 2px -2px #344147;
+        color: #fff;
+        font-weight: 600;
+
+        a:hover {
+          background-color: transparent;
+        }
+      }
+
+      &.disabled {
+        box-shadow: none;
+        filter: grayscale(1) opacity(0.7);
+        cursor: not-allowed;
+      }
+    }
+  }
+}

app/controllers/users/sessions_controller.rb

@@ -106,14 +106,17 @@ def post_sign_in(user, remember_me = false)
 
   def handle_2fa_login(user, remember_me = false)
     sign_out user
+
+    # prevents premature sign in confirmation
+    flash[:notice] = nil
+
     case user.two_factor_method
     when 'app'
       id = user.id
       @@first_factor << id
       redirect_to login_verify_2fa_path(uid: id, remember_me: remember_me)
     when 'email'
       TwoFactorMailer.with(user: user, host: request.hostname).login_email.deliver_now
-      flash[:notice] = nil
       flash[:info] = 'Please check your email inbox for a link to sign in.'
       redirect_to after_sign_in_path_for(user)
     end

app/helpers/tags_helper.rb

@@ -15,6 +15,13 @@ def category_sort_tags(tags, required_ids, topic_ids, moderator_ids)
       end
   end
 
+  # Renders wiki for a given tag
+  # @param tag [Tag] tag to render the wiki for
+  # @return [ActiveSupport::SafeBuffer] rendered usage wiki
+  def rendered_wiki(tag)
+    sanitize(tag.wiki, scrubber: scrubber)
+  end
+
   ##
   # Generate a list of classes to be applied to a tag.
   # @param tag [Tag]
@@ -38,4 +45,14 @@ def post_ids_for_tags(tag_ids)
     sql = "SELECT post_id FROM posts_tags WHERE tag_id IN #{ApplicationRecord.sanitize_sql_in(tag_ids)}"
     ActiveRecord::Base.connection.execute(sql).to_a.flatten
   end
+
+  class TagWikiScrubber < PostsHelper::PostScrubber
+    def allowed_node?(node)
+      super && !node.matches?("a[href=''], p:only-child:empty")
+    end
+  end
+
+  def scrubber
+    TagsHelper::TagWikiScrubber.new
+  end
 end

app/views/tags/show.html.erb

@@ -1,5 +1,9 @@
 <% content_for :title, "Posts tagged #{@tag.name}" %>
 
+<%
+  wiki = rendered_wiki(@tag)
+%>
+
 <h1 class="has-margin-0 has-margin-top-4">
   Posts tagged <span class="<%= tag_classes(@tag, @category) %> is-large wrap-anywhere"><%= @tag.name %></span>
   <% if at_least_moderator? %>
@@ -60,17 +64,17 @@
     <% end %>
   </div>
   <div class="widget--body">
-    <% if @tag.wiki.present? %>
-      <% if @tag.wiki.length < 600 %>
-        <%= raw(sanitize(@tag.wiki, scrubber: scrubber)) %>
+    <% if wiki.present? %>
+      <% if wiki.length < 600 %>
+        <%= wiki %>
       <% else %>
         <details>
           <summary>Tag Wiki</summary>
-          <%= raw(sanitize(@tag.wiki, scrubber: scrubber)) %>
+          <%= wiki %>
         </details>
       <% end %>
     <% end %>
-    <% unless @tag.wiki.present? %>
+    <% unless wiki.present? %>
       <p class="has-font-size-caption has-margin-0">
         <em>
           This tag doesn't have a detailed wiki yet.

app/views/users/notices/_suspension.html.erb

@@ -0,0 +1,17 @@
+<%#
+   "Renders suspension notice for a given user
+
+    Variables:
+      user: User to show the notice for
+"%>
+
+<div class="notice is-danger h-m-b-4">
+  <p>
+    <% if user.community_user.suspension_public_comment.blank? %>
+      This user has been <strong>temporarily suspended</strong>.
+    <% else %>
+      This user has been <strong>temporarily suspended</strong> <%= user.community_user.suspension_public_comment %>.
+    <% end %>
+
+    The suspension ends <span title="<%= user.community_user.suspension_end.iso8601 %>">in <%= time_ago_in_words(user.community_user.suspension_end) %></span>.</p>
+</div>

app/views/users/show.html.erb

@@ -9,15 +9,7 @@
 <h1><span dir="ltr"><%= rtl_safe_username(@user) %></span></h1>
 
 <% if @user.community_user.suspended? %>
-  <div class="notice is-danger h-m-b-4">
-  <% if @user.community_user.suspension_public_comment.nil? %>
-    <p>This user has been <strong>temporarily suspended</strong>.
-  <% else %>
-    <p>This user has been <strong>temporarily suspended</strong> <%= @user.community_user.suspension_public_comment %>.
-  <% end %>
-
-    The suspension ends <span title="<%= @user.community_user.suspension_end.iso8601 %>">in <%= time_ago_in_words(@user.community_user.suspension_end) %></span>.</p>
-  </div>
+  <%= render 'users/notices/suspension', user: @user %>
 <% end %>
 
 <% is_me = @user.same_as?(current_user) %>