threddedDANIEL 0.14.5

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

@@ -0,0 +1,13 @@
+<div class="thredded--messageboard--meta">
+  <% if messageboard.locked? %>
+    <span class="thredded--messageboard--meta--locked"
+          title="<%= t('thredded.messageboard.form.locked_notice') %>">
+      <%= inline_svg('thredded/lock.svg', class: 'thredded--messageboard--meta--icon') %>
+    </span>
+  <% end %>
+  <h3 class="thredded--messageboard--meta--counts">
+    <%= t 'thredded.messageboard.topics_and_posts_counts',
+          topics_count: number_with_delimiter(messageboard.topics_count),
+          posts_count: number_with_delimiter(messageboard.posts_count) %>
+  </h3>
+</div>

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

@@ -0,0 +1,15 @@
+<% content_for :thredded_page_title, t('thredded.nav.edit_messageboard') %>
+<% content_for :thredded_page_id, 'thredded--messageboard-edit' %>
+<% content_for :thredded_breadcrumbs do %>
+  <ul class="thredded--navigation-breadcrumbs">
+    <li class="thredded--navigation-breadcrumbs--item-no-link">
+      <%= t('thredded.nav.edit_messageboard') %>
+    </li>
+  </ul>
+<% end %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <%= render 'form', messageboard: @messageboard %>
+  </section>
+<% end %>

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

@@ -0,0 +1,34 @@
+<% content_for :thredded_page_title, t('thredded.messageboard.index.page_title') %>
+<% content_for :thredded_page_id, 'thredded--messageboards-index' %>
+<% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
+<%= thredded_page do %>
+  <%= view_hooks.messageboards_index.container.render self, groups: @groups do %>
+    <section class="thredded--main-section thredded--messageboards">
+      <%= view_hooks.messageboards_index.list.render self, groups: @groups do %>
+        <% @groups.each do |group| %>
+          <% if group.name.present? %>
+            <h3 class="thredded--messageboards-group--title"><%= group.name %></h3>
+          <% end %>
+          <div class="thredded--messageboards-group">
+            <%= view_hooks.messageboards_index.group.render self, group: group do %>
+              <%= render group.messageboards %>
+            <% end %>
+          </div>
+        <% end %>
+      <% end %>
+
+      <div class="thredded--messageboards--actions">
+        <% if policy(Thredded::Messageboard.new).create? %>
+          <a class="thredded--button" href="<%= new_messageboard_path %>" rel="nofollow">
+            <%= t('thredded.messageboard.create') %>
+          </a>
+        <% end %>
+        <% if policy(Thredded::MessageboardGroup.new).create? %>
+          <a class="thredded--button" href="<%= new_messageboard_group_path %>" rel="nofollow">
+            <%= t('thredded.messageboard_group.create') %>
+          </a>
+        <% end %>
+      </div>
+    </section>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,15 @@
+<% content_for :thredded_page_title, t('thredded.messageboard.create') %>
+<% content_for :thredded_page_id, 'thredded--messageboards-new' %>
+<% content_for :thredded_breadcrumbs do %>
+  <ul class="thredded--navigation-breadcrumbs">
+    <li class="thredded--navigation-breadcrumbs--item-no-link">
+      <%= t('thredded.messageboard.create') %>
+    </li>
+  </ul>
+<% end %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <%= render 'form', messageboard: @messageboard %>
+  </section>
+<% end %>

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

@@ -0,0 +1,19 @@
+<% content_for :thredded_main_navigation do %>
+  <nav class="thredded--moderation-navigation">
+    <ul class="thredded--moderation-navigation--items">
+      <li class="thredded--moderation-navigation--item thredded--moderation-navigation--pending">
+        <%= link_to t('thredded.nav.moderation_pending'), pending_moderation_path %>
+      </li>
+      <li class="thredded--moderation-navigation--item thredded--moderation-navigation--history">
+        <%= link_to t('thredded.nav.moderation_history'), moderation_history_path %>
+      </li>
+      <li class="thredded--moderation-navigation--item thredded--moderation-navigation--activity">
+        <%= link_to t('thredded.nav.moderation_activity'), moderation_activity_path %>
+      </li>
+      <li class="thredded--moderation-navigation--item thredded--moderation-navigation--users">
+        <%= link_to t('thredded.nav.moderation_users'), users_moderation_path %>
+      </li>
+    </ul>
+    <%= render 'users_search_form' %>
+  </nav>
+<% end %>

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

@@ -0,0 +1,19 @@
+<% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
+<%= content_tag :article, id: dom_id(post), class: 'thredded--post thredded--post-moderation' do %>
+  <%= render 'thredded/posts_common/actions', post: post %>
+  <%= render 'thredded/posts_common/header_with_user_and_topic',
+             post:           post,
+             post_user_link: if post.user
+                               link_to(post.user.thredded_display_name, user_moderation_path(post.user.id))
+                             else
+                               content_tag :em, t('thredded.null_user_name')
+                             end
+  %>
+  <%= content || render('thredded/posts/content', post: post) %>
+  <% if post.blocked? %>
+    <p class="thredded--alert thredded--alert-danger">
+      <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: post.last_moderation_record %>
+    </p>
+  <% end %>
+  <%= render 'post_moderation_actions', post: post %>
+<% end %>

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

@@ -0,0 +1,12 @@
+<div class="thredded--post-moderation-actions">
+  <% unless post.approved? %>
+    <%= button_to t('thredded.moderation.approve_btn'), moderate_post_path,
+                  class:  'thredded--button',
+                  params: { id: post.to_model.id, moderation_state: 'approved' } %>
+  <% end %>
+  <% unless post.blocked? %>
+    <%= button_to t('thredded.moderation.block_btn'), moderate_post_path,
+                  class:  'thredded--button',
+                  params: { id: post.to_model.id, moderation_state: 'blocked' } %>
+  <% end %>
+</div>

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

@@ -0,0 +1,46 @@
+<%
+  record = post_moderation_record
+  post = record.post
+  if post
+    post_view = Thredded::PostView.new(post, policy(post))
+  end
+  moderation_state_notice_args = {
+      moderator: user_link(record.moderator),
+      time_ago:  time_ago(record.created_at)
+  }
+%>
+<article class="thredded--post-moderation-record thredded--post-moderation-record-<%= record.moderation_state %>">
+  <header class="thredded--post-moderation-record--header">
+    <p class="thredded--post-moderation-record--moderation-state-notice">
+      <% if record.approved? %>
+        <%= t('thredded.moderation.post_approved_html', moderation_state_notice_args) %>
+      <% elsif record.blocked? %>
+        <%= t('thredded.moderation.post_blocked_html', moderation_state_notice_args) %>
+      <% end %>
+    </p>
+    <% if post && post.content != record.post_content %>
+      <p class="thredded--post-moderation-record--content-changed-notice">
+        <%= t('thredded.moderation.posts_content_changed_since_moderation_html', post_url: post_permalink_path(post)) %>
+      </p>
+    <% end %>
+    <%= content_tag :em, t('thredded.moderation.post_deleted_notice') unless post %>
+  </header>
+  <article class="thredded--post">
+    <% post_user_link = capture do %>
+      <% if record.post_user %>
+        <%= link_to record.post_user.thredded_display_name, user_moderation_path(record.post_user.id) %>
+      <% else %>
+        <%= safe_join [record.post_user_name, content_tag(:em, t('thredded.null_user_name'))].compact, ', ' %>
+      <% end %>
+    <% end %>
+    <% if post %>
+      <%= render 'thredded/posts_common/header_with_user_and_topic', post: post_view, post_user_link: post_user_link %>
+    <% else %>
+      <header><h2 class="thredded--post--user"><%= post_user_link %></h2></header>
+    <% end %>
+    <div class="thredded--post--content">
+      <%= Thredded::ContentFormatter.new(self).format_content(record.post_content) %>
+    </div>
+  </article>
+  <%= render 'post_moderation_actions', post: post if post %>
+</article>

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

@@ -0,0 +1,3 @@
+<% user_detail = user.thredded_user_detail %>
+<%= user_detail.moderation_state.to_s.humanize %>
+<%= time_ago user_detail.moderation_state_changed_at, default: '' %>

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

@@ -0,0 +1,12 @@
+<% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
+<%= content_tag :article, id: dom_id(post), class: 'thredded--post thredded--post-moderation' do %>
+  <%= render 'thredded/posts_common/actions', post: post %>
+  <%= render 'thredded/posts_common/header_with_topic', post: post %>
+  <%= content || render('thredded/posts/content', post: post) %>
+  <% if post.blocked? %>
+    <p class="thredded--alert thredded--alert-danger">
+      <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: post.last_moderation_record %>
+    </p>
+  <% end %>
+  <%= render 'post_moderation_actions', post: post %>
+<% end %>

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

@@ -0,0 +1,13 @@
+<%= form_tag users_moderation_path,
+             method: 'get',
+             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,
+                     type:        'search',
+                     required:    true,
+                     # If there are no results the user will likely want to change the query, so auto-focus.
+                     autofocus:   @query.presence && !@users.presence,
+                     placeholder: t('thredded.moderation.search_users.form_placeholder') %>
+  <button type="submit"><%= t 'thredded.search.form.btn_submit' %></button>
+<% end %>

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

@@ -0,0 +1,20 @@
+<% content_for :thredded_page_title, t('thredded.nav.moderation') %>
+<% content_for :thredded_page_id, 'thredded--moderation-activity' %>
+<%= render 'nav' %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <h1><%= t 'thredded.recent_activity' %></h1>
+    <% if @last_moderated_record %>
+      <div class="thredded--moderated-notice">
+        <%= render 'post_moderation_record', post_moderation_record: @last_moderated_record %>
+      </div>
+    <% end %>
+    <% if @posts.present? %>
+      <%= render_posts @posts,
+                       partial: 'thredded/moderation/post',
+                       content_partial: 'thredded/posts/content' %>
+      <%= paginate @posts %>
+    <% end %>
+  </section>
+<% end %>

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

@@ -0,0 +1,13 @@
+<% content_for :thredded_page_title,
+               safe_join([t('thredded.nav.moderation'), t('thredded.nav.moderation_history')], ': ') %>
+<% content_for :thredded_page_id, 'thredded--moderation-history' %>
+<%= render 'nav' %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <% if @post_moderation_records.present? %>
+      <%= render partial: 'post_moderation_record', collection: @post_moderation_records %>
+      <%= paginate @post_moderation_records %>
+    <% end %>
+  </section>
+<% end %>

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

@@ -0,0 +1,24 @@
+<% content_for :thredded_page_title, t('thredded.nav.moderation') %>
+<% content_for :thredded_page_id, 'thredded--pending-moderation' %>
+<%= render 'nav' %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <% if @last_moderated_record %>
+      <div class="thredded--moderated-notice">
+        <%= render 'post_moderation_record', post_moderation_record: @last_moderated_record %>
+      </div>
+    <% end %>
+    <% if @posts.present? %>
+      <%= render_posts @posts,
+                       partial: 'thredded/moderation/post',
+                       content_partial: 'thredded/posts/content' %>
+      <%= paginate @posts %>
+    <% else %>
+      <div class="thredded--empty">
+        <h3 class="thredded--empty--title"><%= t 'thredded.moderation.pending.empty.title' %></h3>
+        <p><%= t 'thredded.moderation.pending.empty.content' %></p>
+      </div>
+    <% end %>
+  </section>
+<% end %>

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

@@ -0,0 +1,54 @@
+<%
+  user = @user
+  user_detail = user.thredded_user_detail
+%>
+<% content_for :thredded_page_title, t('thredded.nav.moderation') %>
+<% content_for :thredded_page_id, 'thredded--moderation-user' %>
+<%= render 'nav' %>
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <%= view_hooks.moderation_user_page.user_title.render self, user: user do %>
+      <h1 class="thredded--moderation--user--title">
+        <%= image_tag Thredded.avatar_url.call(user), class: 'thredded--user--avatar' %><%= user.thredded_display_name %>
+      </h1>
+    <% end %>
+    <%= view_hooks.moderation_user_page.user_info.render self, user: user do %>
+      <ul class="thredded--moderation--user--info">
+        <%= 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 %>
+      <div class="thredded--user--moderation-actions">
+        <% unless user_detail.approved? %>
+          <%= button_to t('thredded.moderation.approve_btn'), moderate_user_path,
+                        class: 'thredded--button',
+                        params: { id: user.to_model.id, moderation_state: 'approved' } %>
+        <% end %>
+        <% unless user_detail.blocked? %>
+          <%= button_to t('thredded.moderation.block_btn'), moderate_user_path,
+                        class: 'thredded--button',
+                        params: { id: user.to_model.id, moderation_state: 'blocked' } %>
+        <% end %>
+      </div>
+    <% end %>
+    <% if @posts.present? %>
+      <h2><%= t 'thredded.users.recent_activity' %></h2>
+      <%= render_posts @posts,
+                       partial: 'thredded/moderation/user_post',
+                       content_partial: 'thredded/posts/content' %>
+      <%= paginate @posts %>
+    <% end %>
+  </section>
+<% end %>

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

@@ -0,0 +1,41 @@
+<% content_for :thredded_page_title, t('thredded.nav.moderation') %>
+<% content_for :thredded_page_id, 'thredded--moderation-users' %>
+<%= render 'nav' %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <% if @users.present? %>
+      <% if @query.present? %>
+        <p class="thredded--alert thredded--alert-success">
+          <%= t 'thredded.moderation.search_users.results_message', query: "'#{@query}'" %>
+        </p>
+      <% end %>
+      <table class="thredded--moderation--users-table thredded--table">
+        <caption><%= page_entries_info @users %></caption>
+        <thead>
+        <tr>
+          <th><%= t 'thredded.moderation.user.name' %></th>
+          <th><%= t 'thredded.moderation.moderation_state.name' %></th>
+        </tr>
+        </thead>
+        <tbody>
+        <% @users.each do |user| %>
+          <tr>
+            <td>
+              <%= link_to user.thredded_display_name, user_moderation_path(user.id), class: 'thredded--link' %>
+            </td>
+            <td>
+              <%= render 'user_moderation_state', user: user %>
+            </td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+      <%= paginate @users %>
+    <% else %>
+      <p class="thredded--alert thredded--alert-danger">
+        <%= t 'thredded.moderation.search_users.no_results_message', query: "'#{@query}'" %>
+      </p>
+    <% end %>
+  </section>
+<% end %>

data/app/views/thredded/post_mailer/post_notification.html.erb

@@ -0,0 +1,26 @@
+<div class="thredded--email">
+  <figure class="thredded--email-post">
+    <figcaption class="thredded--email-post--author">
+      <%= t 'thredded.emails.post_notification.html.post_lead_html',
+            user: @post.user.thredded_display_name,
+            post_url: post_permalink_url(@post.id),
+            topic_title: @post.postable.title %>
+    </figcaption>
+    <% cache [@post, 'content-onebox-placeholders'] do %>
+      <%= render partial: 'thredded/posts/content',
+                 locals: { post: @post, options: {onebox_placeholders: true} } %>
+    <% end %>
+  </figure>
+  <hr/>
+
+  <p>
+    <%= t 'thredded.emails.post_notification.html.email_sent_reason_html',
+          post_url: post_permalink_url(@post.id),
+          topic_title: @post.postable.title %>
+  </p>
+
+  <p>
+    <%= t 'thredded.emails.post_notification.html.unsubscribe_instructions_html',
+          preferences_url: edit_messageboard_preferences_url(@post.messageboard) %>
+  </p>
+</div>

data/app/views/thredded/post_mailer/post_notification.text.erb

@@ -0,0 +1,14 @@
+<%= t 'thredded.emails.post_notification.text.post_lead',
+      user: @post.user.thredded_display_name,
+      topic_title: @post.postable.title %>
+
+<%= @post.content %>
+
+---
+
+<%= t 'thredded.emails.post_notification.text.email_sent_reason',
+      topic_title: @post.postable.title,
+      post_url: post_permalink_url(@post.id) %>
+
+<%= t 'thredded.emails.post_notification.text.unsubscribe_instructions',
+      unsubscribe_url: edit_messageboard_preferences_url(@post.messageboard) %>

data/app/views/thredded/post_previews/preview.html.erb

@@ -0,0 +1 @@
+<%= @post.filtered_content(self) %>

data/app/views/thredded/post_previews/update.html.erb

@@ -0,0 +1 @@
+<%= @post.filtered_content(self) %>

data/app/views/thredded/posts/_content.html.erb

@@ -0,0 +1 @@
+<%= render 'thredded/posts_common/content', post: post, options: local_assigns[:options] || {} %>

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

@@ -0,0 +1,5 @@
+<%= render 'thredded/posts_common/form',
+           post: post,
+           content_label: t('thredded.posts.form.content_label'),
+           button_text: button_text,
+           button_submitting_text: local_assigns.key?(:button_submitting_text) ? button_submitting_text : nil %>

data/app/views/thredded/posts/_post.html.erb

@@ -0,0 +1,13 @@
+<% post, content = post_and_content if local_assigns.key?(:post_and_content) %>
+<%= content_tag :article, id: dom_id(post), class: "thredded--post thredded--#{post.read_state}--post" do %>
+  <%= render 'thredded/posts_common/actions', post: post, actions: local_assigns[:actions] %>
+  <%= render 'thredded/posts_common/header', post: post %>
+  <%= content || render('thredded/posts/content', post: post) %>
+  <% if post.pending_moderation? && !Thredded.content_visible_while_pending_moderation %>
+    <p class="thredded--alert thredded--alert-warning"><%= t 'thredded.posts.pending_moderation_notice' %></p>
+  <% elsif post.blocked? && post.can_moderate? %>
+    <p class="thredded--alert thredded--alert-danger">
+      <%= render 'thredded/shared/content_moderation_blocked_state', moderation_record: post.last_moderation_record %>
+    </p>
+  <% end %>
+<% end %>