biovision-post 0.2.180325 → 0.21.190513.0

data/app/views/posts/_list.html.erb

@@ -1,5 +1,5 @@
 <% if collection.any? %>
-    <div class="list">
+    <div class="posts-list">
       <% collection.each do |entity| %>
           <%= render partial: 'posts/preview', locals: { entity: entity } %>
       <% end %>

data/app/views/{articles/index.jbuilder → posts/_list.jbuilder}

@@ -1,11 +1,11 @@
-json.data @collection do |entity|
+json.data collection do |entity|
   json.id entity.id
   json.type entity.class.table_name
   json.attributes do
-    json.(entity, :title, :lead, :post_category_id)
+    json.call(entity, :title, :lead, :post_category_id)
   end
   json.meta do
     json.html_preview render(partial: 'posts/preview', formats: [:html], locals: { entity: entity })
   end
 end
-json.partial! 'shared/pagination', locals: { collection: @collection }
+json.partial! 'shared/pagination', locals: { collection: collection }

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

@@ -1,20 +1,29 @@
-<% handler = PostManager.handler(post) %>
+<% handler = PostManager.new(post) %>
 <article class="post" itemscope itemtype="http://schema.org/Article" itemprop="mainEntityOfPage">
   <h1 itemprop="headline"><%= post.title %></h1>
   <% if post.editable_by? current_user %>
     <ul class="actions">
-      <% if UserPrivilege.user_in_group?(current_user, :editors) %>
+      <% if post.owned_by?(current_user) %>
+        <li><%= gear_icon(my_post_path(id: post.id)) %></li>
+      <% elsif UserPrivilege.user_in_group?(current_user, :editors) %>
         <li><%= gear_icon(admin_post_path(id: post.id)) %></li>
       <% end %>
       <% unless post.locked? %>
-        <li><%= edit_icon(handler.edit_path) %></li>
+        <% if post.owned_by?(current_user) %>
+          <li><%= edit_icon(edit_my_post_path(id: post.id)) %></li>
+        <% else %>
+          <li><%= edit_icon(handler.edit_path) %></li>
+        <% end %>
       <% end %>
     </ul>
   <% end %>
 
   <% unless post.image.blank? %>
     <figure itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="group">
-      <%= post_image_medium(post, { itemprop: 'about' }) %>
+      <div class="post-image-main">
+        <%= post_image_large(post, { itemprop: 'about' }) %>
+        <meta itemprop="url" content="<%= request.protocol + request.host_with_port + post.image.url %>"/>
+      </div>
       <% if post.has_image_data? %>
         <figcaption>
           <% unless post.image_name.blank? %>
@@ -22,13 +31,13 @@
               <%= post.image_name %>
             </div>
           <% end %>
-          <% unless post.image_author_name.blank? %>
-            <div class="image_author" itemprop="author">
-              <span><%= t('activerecord.attributes.post.image_author_name') %></span>
-              <% if post.image_author_link.blank? %>
-                <%= post.image_author_name %>
+          <% unless post.image_source_name.blank? %>
+            <div class="image_source" itemprop="author">
+              <span><%= t('.image_credit') %></span>
+              <% if post.image_source_link.blank? %>
+                <%= post.image_source_name %>
               <% else %>
-                <%= link_to(post.image_author_name, post.image_author_link, rel: 'external nofollow noopener noreferrer', itemprop: 'url', target: '_blank') %>
+                <%= link_to(post.image_source_name, post.image_source_link, rel: 'external nofollow noopener noreferrer', itemprop: 'url', target: '_blank') %>
               <% end %>
             </div>
           <% end %>
@@ -37,14 +46,29 @@
     </figure>
   <% end %>
 
-  <div class="body" itemprop="articleBody mainEntityOfPage">
-    <%= raw(post.parsed_body || post.body) %>
+  <div class="text" itemprop="articleBody mainEntityOfPage">
+    <div class="lead"><%= post.lead %></div>
+
+    <div class="body">
+      <%= raw(post.parsed_body || post.body) %>
+    </div>
   </div>
 
+  <%=
+    render(
+        partial: 'posts/entity/gallery',
+        locals: {
+            collection: post.post_images.list_for_visitors
+        }
+    )
+  %>
+
   <% if post.tags_cache.any? %>
-    <div class="tags" aria-label="<%= t('activerecord.attributes.post.tags_cache') %>">
-      <%= post.tags_cache.join(', ') %>
-    </div>
+    <ul class="post-tags" aria-label="<%= t('activerecord.attributes.post.tags_cache') %>">
+      <% post.tags_cache.each do |tag_name| %>
+        <li><%= tagged_posts_link(tag_name, post) %></li>
+      <% end %>
+    </ul>
   <% end %>
 
   <footer>
@@ -74,9 +98,12 @@
     <% end %>
 
     <div class="time">
-      <%= time_tag post.created_at, itemProp: 'datePublished', aria: { label: t('activerecord.attributes.post.created_at') } %>
+      <%= time_tag post.publication_time, itemProp: 'datePublished', aria: { label: t('activerecord.attributes.post.created_at') } %>
     </div>
 
+    <% unless post.time_required.blank? %>
+      <meta itemprop="timeRequired" content="P<%= post.time_required %>M"/>
+    <% end %>
     <meta itemprop="commentCount" content="<%= post.comments_count %>"/>
     <meta itemprop="dateModified" content="<%= post.updated_at.strftime('%Y-%m-%d') %>"/>
     <%= render partial: 'posts/entity/publisher', locals: { entity: post } %>

data/app/views/posts/_preview.html.erb

@@ -1,35 +1,46 @@
 <div class="post-preview" role="group">
   <div class="image">
-    <%= post_image_small(entity) %>
+    <%=
+      post_link(
+          entity,
+          post_image_small(entity),
+          class: 'covered proportional-container r-16x9'
+      )
+    %>
   </div>
-  <div class="title">
-    <%= post_link(entity) %>
+  <div class="text">
+    <div class="title"><%= post_link(entity) %></div>
+    <div class="lead"><%= post_link(entity, entity.lead) %></div>
   </div>
-  <div class="info">
-    <% if entity.show_owner? %>
-      <% if entity.author_name.blank? %>
-        <%= user_link(entity.user) %>
-      <% else %>
-        <%= post_author_link(entity) %>
-        <% unless entity.author_title.blank? %>
-          <div class="author-title"><%= entity.author_title %></div>
+  <div class="meta">
+    <div class="time-and-author">
+      <% if entity.show_owner? %>
+        <% if entity.author_name.blank? %>
+          <%= user_link(entity.user) %>
+        <% else %>
+          <%= post_author_link(entity) %>
         <% end %>
       <% end %>
-    <% end %>
-    <%= time_tag(entity.created_at) %>
-  </div>
-  <div class="lead"><%= entity.lead %></div>
-  <% unless entity.post_category.nil? %>
+      <%= time_tag(entity.publication_time.to_date, format: :default) %>
+    </div>
     <div class="category" aria-label="<%= t('activerecord.attributes.post.post_category_id') %>">
-      <%= entity.post_category.full_title %>
+      <%= post_category_link(entity) %>
     </div>
-  <% end %>
+    <% if entity.tags_cache.any? %>
+      <ul class="post-tags">
+        <% entity.tags_cache.each do |tag_name| %>
+          <li><%= tagged_posts_link(tag_name, entity) %></li>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
   <div class="counters">
+    <span class="view_count"><%= entity.view_count %></span>
     <% if entity.allow_comments? && 'CommentableItem'.safe_constantize %>
       <span class="comment_count"><%= entity.comments_count %></span>
     <% end %>
-    <span class="view_count" aria-label="<%= t('activerecord.attributes.post.view_count') %>">
-      <%= entity.view_count %>
-    </span>
+    <% if entity.time_required.to_i.positive? %>
+      <div class="time_required"><%= entity.time_required %> min</div>
+    <% end %>
   </div>
 </div>

data/app/views/posts/_search.html.erb

@@ -0,0 +1,6 @@
+<%= form_with(url: search_posts_path, local: true, method: :get) do %>
+  <div>
+    <%= search_field_tag(:q) %>
+    <%= button_tag(t('admin.posts.entity.links.search'), type: :submit) %>
+  </div>
+<% end %>

data/app/views/posts/_wysiwyg.html.erb

@@ -0,0 +1,25 @@
+<script src="https://cdn.ckeditor.com/ckeditor5/12.0.0/classic/ckeditor.js"></script>
+<script>
+    "use strict";
+
+    document.addEventListener("DOMContentLoaded", function () {
+        document.querySelectorAll("button.js-wysiwyg-toggle").forEach(function (button) {
+            button.addEventListener("click", function (event) {
+                const button = event.target;
+                button.classList.add("hidden");
+                const editor = document.getElementById(button.getAttribute("data-element"));
+                editor.required = false;
+                ClassicEditor
+                    .create(editor, {
+                        image: {
+                            toolbar: ['imageTextAlternative']
+                        },
+                        ckfinder: {
+                            uploadUrl: editor.getAttribute('data-upload-url')
+                        }
+                    })
+                    .catch(error => console.error(error));
+            });
+        });
+    });
+</script>

data/app/views/posts/archive.jbuilder

@@ -0,0 +1,3 @@
+json.meta do
+  json.partial! 'archive_dates', locals: { dates: @dates }
+end

data/app/views/posts/archive_day.html.erb

@@ -0,0 +1,12 @@
+<% content_for :meta_title, t('.title') %>
+<% content_for :breadcrumbs do %>
+  <span><%= t('posts.index.nav_text') %></span>
+<% end %>
+
+<article>
+  <h1>
+    <%= l(Date.parse("#{params[:year]}-#{params[:month]}-#{params[:day]}")) %>
+  </h1>
+
+  <%= render partial: 'posts/collection', locals: { collection: @collection } %>
+</article>

data/app/views/posts/category.html.erb

@@ -0,0 +1,18 @@
+<% content_for :meta_title, t('.title', category: @category.name, page: current_page) %>
+<% content_for :breadcrumbs do %>
+    <%= link_to(t('posts.index.nav_text'), posts_path) %>
+    <% @category.parents.each do |parent| %>
+        <%= link_to(parent.name, short_category_posts_path(category_slug: parent.long_slug)) %>
+    <% end %>
+    <span><%= @category.name %></span>
+<% end %>
+
+<%=
+  render(
+      partial: 'posts/post_type/category',
+      locals: {
+          category: @category,
+          collection: @collection
+      }
+  )
+%>

data/app/views/posts/entity/_gallery.html.erb

@@ -0,0 +1,54 @@
+<% if collection.any? %>
+  <section class="post-gallery">
+    <h2><%= t('.heading') %></h2>
+
+    <div class="biovision-slider">
+      <button class="prev"></button>
+      <ul class="container">
+        <% collection.each do |post_image| %>
+        <li class="slider-item">
+          <figure itemprop="image" itemscope itemtype="http://schema.org/ImageObject" role="group">
+            <div class="image">
+              <%= post_image_large(post_image, { itemprop: 'about' }) %>
+            </div>
+            <meta itemprop="url" content="<%= request.protocol + request.host_with_port + post_image.image.url %>"/>
+            <% if post_image.has_image_data? %>
+              <figcaption>
+                <% unless post_image.caption.blank? %>
+                  <div class="image_name" itemprop="caption">
+                    <%= post_image.caption %>
+                  </div>
+                <% end %>
+                <% unless post_image.source_name.blank? %>
+                  <div class="image_source" itemprop="author">
+                    <span><%= t('posts.post.image_credit') %></span>
+                    <% if post_image.source_link.blank? %>
+                      <%= post_image.source_name %>
+                    <% else %>
+                      <%=
+                        link_to(
+                            post_image.source_name,
+                            post_image.source_link,
+                            rel: 'external nofollow noopener noreferrer',
+                            itemprop: 'url',
+                            target: '_blank'
+                        )
+                      %>
+                    <% end %>
+                  </div>
+                <% end %>
+              </figcaption>
+            <% end %>
+          </figure>
+          <% unless post_image.description.blank? %>
+          <div class="description">
+            <%= simple_format(post_image.description) %>
+          </div>
+          <% end %>
+        </li>
+        <% end %>
+      </ul>
+      <button class="next"></button>
+    </div>
+  </section>
+<% end %>

data/app/views/posts/entity/_linked_posts.html.erb

@@ -0,0 +1,7 @@
+<% if collection.any? %>
+  <section class="posts-linked">
+    <h2><%= t('.heading') %></h2>
+
+    <%= render partial: 'posts/list', locals: { collection: collection } %>
+  </section>
+<% end %>

data/app/views/posts/entity/_metadata.html.erb

@@ -1,16 +1,39 @@
-<% content_for :meta_description, (entity.meta_description.blank? ? entity.lead : entity.meta_description) %>
-<% content_for :meta_type, 'article' %>
-<% content_for :meta_type_extension do %>
-  <meta property="og:article:published_time" content="<%= entity.created_at.strftime('%Y-%m-%d') %>"/>
-  <meta property="og:article:modified_time" content="<%= entity.updated_at.strftime('%Y-%m-%d') %>"/>
+<%
+  meta_description = entity.meta_description.blank? ? entity.lead : entity.meta_description
+  meta_image = entity.image.blank? ? '' : (request.protocol + request.host_with_port + entity.image.url)
+  meta_title = entity.meta_title.blank? ? entity.title : entity.meta_title
+  content_for :meta_title, meta_title
+  content_for :meta_description, meta_description
+  content_for :meta_keywords, entity.meta_keywords unless entity.meta_keywords.blank?
+%>
+<% content_for :meta_opengraph do %>
+  <meta property="og:url" content="<%= url_for(only_path: false) %>"/>
+  <meta property="og:type" content="article"/>
+  <meta property="og:title" content="<%= meta_title %>"/>
+  <% unless entity.language.nil? %>
+    <meta property="og:locale" content="<%= entity.language.code %>"/>
+  <% end %>
+  <meta property="og:description" content="<%= meta_description %>"/>
+  <meta property="article:published_time" content="<%= entity.publication_time.strftime('%F') %>"/>
+  <meta property="article:updated_time" content="<%= entity.updated_at.strftime('%F') %>"/>
+  <meta property="article:modified_time" content="<%= entity.updated_at.strftime('%F') %>"/>
   <% if entity.show_owner? %>
-    <meta property="og:article:author" content="<%= entity.user.screen_name %>"/>
+    <meta property="article:author" content="<%= entity.author_name.blank? ? entity.user.screen_name : entity.author_name %>"/>
+  <% end %>
+  <% unless entity.post_category.nil? %>
+    <meta property="article:section" content="<%= entity.post_category.name %>"/>
+  <% end %>
+  <% entity.tags_cache.each do |tag| %>
+    <meta property="article:tag" content="<%= tag %>"/>
+  <% end %>
+  <% unless meta_image.blank? %>
+    <meta property="og:image" content="<%= meta_image %>"/>
+    <meta property="og:image:alt" content="<%= entity.image_alt_text %>"/>
   <% end %>
 <% end %>
-<% content_for :meta_image, (request.protocol + request.host_with_port + entity.image.url) unless entity.image.blank? %>
-<% if entity.meta_title.blank? %>
-  <% content_for :meta_title, entity.title %>
-<% else %>
-  <% content_for :meta_title, entity.meta_title %>
+<% content_for :meta_twitter do %>
+  <meta property="twitter:title" content="<%= content_for :meta_title %>"/>
+  <% unless meta_image.blank? %>
+    <meta name="twitter:image" content="<%= meta_image %>"/>
+  <% end %>
 <% end %>
-<% content_for :meta_keywords, entity.meta_keywords unless entity.meta_keywords.blank? %>

data/app/views/posts/entity/_publisher.html.erb

@@ -1,5 +1,7 @@
 <span itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
   <meta itemprop="url" content="<%= request.protocol + request.host_with_port %>"/>
   <meta itemprop="name" content="<%= t('shared.meta_texts.site_name') %>"/>
-  <meta itemprop="logo" content="<%= image_url('biovision/post/publisher_logo.svg') %>"/>
+  <span itemprop="logo" itemscope itemtype="https://www.schema.org/ImageObject">
+    <link itemprop="url" href="<%= image_url('biovision/post/publisher_logo.png') %>">
+  </span>
 </span>

data/app/views/posts/form/_category_links.html.erb

@@ -0,0 +1,32 @@
+<% if collection.any? %>
+  <ul class="post-category-tree">
+    <% collection.each do |category_id, item| %>
+      <li>
+        <% element_id = "post_category_#{category_id}" %>
+        <%=
+          check_box_tag(
+              "post_category_ids[]",
+              category_id,
+              item[:item].post?(entity),
+              id: element_id
+          )
+        %>
+        <%= label_tag element_id, item[:item].name %>
+        <% categories.delete(category_id) %>
+        <% children = categories.select { |_, i| i[:parent_id] == category_id } %>
+        <% if children.any? %>
+          <%=
+            render(
+                partial: 'posts/form/category_links',
+                locals: {
+                    entity: entity,
+                    collection: children,
+                    categories: categories
+                }
+            )
+          %>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

data/app/views/posts/form/_gallery.html.erb

@@ -0,0 +1,163 @@
+<section class="post-form-gallery">
+  <h2><%= t('.heading') %></h2>
+
+  <% next_number = 1 %>
+  <ol id="post-form-image-gallery" class="list-of-entities">
+    <% entity.post_images.each do |post_image| %>
+      <li data-number="<%= post_image.priority %>" data-id="<%= post_image.id %>">
+        <%=
+          render(
+              partial: 'admin/post_images/entity/in_list',
+              locals:  { entity: post_image }
+          )
+        %>
+      </li>
+    <% end %>
+    <li data-number="<%= next_number %>" class="new-post-image">
+      <%
+        figure_id = "post-item-image-#{next_number}"
+        image_id = "post_images_#{next_number}_image"
+        image_name = "post_images[#{next_number}][image]"
+      %>
+      <div class="image" id="<%= figure_id %>">
+        <%=
+          label_tag(image_id, image_tag('biovision/base/placeholders/3x2.svg'))
+        %>
+      </div>
+      <div class="data">
+        <div class="field">
+          <%=
+            file_field_tag(
+                image_name,
+                id:     image_id,
+                accept: 'image/jpeg,image/png',
+                data:   { image: figure_id }
+            )
+          %>
+          <div class="guideline">
+            <%= t('post_images.form.guidelines.image') %>
+          </div>
+        </div>
+        <div class="field">
+          <div>
+            <%=
+              label_tag(
+                  "post_images_#{next_number}_image_alt_text",
+                  t('activerecord.attributes.post_image.image_alt_text')
+              )
+            %>
+          </div>
+          <div>
+            <%=
+              text_field_tag(
+                  "post_images[#{next_number}][image_alt_text]",
+                  '',
+                  id:        "post_images_#{next_number}_image_alt_text",
+                  size:      nil,
+                  maxlength: PostImage::META_LIMIT
+              )
+            %>
+            <div class="guideline"><%= t('post_images.form.guidelines.image_alt_text') %></div>
+          </div>
+        </div>
+        <div class="field">
+          <div>
+            <%=
+              label_tag(
+                  "post_images_#{next_number}_caption",
+                  t('activerecord.attributes.post_image.caption')
+              )
+            %>
+          </div>
+          <div>
+            <%=
+              text_field_tag(
+                  "post_images[#{next_number}][caption]",
+                  '',
+                  id:        "post_images_#{next_number}_caption",
+                  size:      nil,
+                  maxlength: PostImage::META_LIMIT
+              )
+            %>
+            <div class="guideline"><%= t('post_images.form.guidelines.caption') %></div>
+          </div>
+        </div>
+        <div class="field">
+          <div>
+            <%=
+              label_tag(
+                  "post_images_#{next_number}_description",
+                  t('activerecord.attributes.post_image.description')
+              )
+            %>
+          </div>
+          <div>
+            <%=
+              text_area_tag(
+                  "post_images[#{next_number}][description]",
+                  '',
+                  id:        "post_images_#{next_number}_description",
+                  cols:      80,
+                  rows:      5,
+                  maxlength: PostImage::DESCRIPTION_LIMIT,
+                  class:     'auto-expand',
+                  data:      {
+                      min_rows: 5,
+                      max_rows: 20
+                  }
+              )
+            %>
+            <div class="guideline"><%= t('post_images.form.guidelines.description') %></div>
+          </div>
+        </div>
+        <div class="field">
+          <div>
+            <%=
+              label_tag(
+                  "post_images_#{next_number}_source_name",
+                  t('activerecord.attributes.post_image.source_name')
+              )
+            %>
+          </div>
+          <div>
+            <%=
+              text_field_tag(
+                  "post_images[#{next_number}][source_name]",
+                  '',
+                  id:        "post_images_#{next_number}_source_name",
+                  size:      nil,
+                  maxlength: PostImage::META_LIMIT
+              )
+            %>
+            <div class="guideline"><%= t('post_images.form.guidelines.source_name') %></div>
+          </div>
+        </div>
+        <div class="field">
+          <div>
+            <%=
+              label_tag(
+                  "post_images_#{next_number}_source_link",
+                  t('activerecord.attributes.post_image.source_link')
+              )
+            %>
+          </div>
+          <div>
+            <%=
+              url_field_tag(
+                  "post_images[#{next_number}][source_link]",
+                  '',
+                  id:        "post_images_#{next_number}_source_link",
+                  size:      nil,
+                  maxlength: PostImage::META_LIMIT
+              )
+            %>
+            <div class="guideline"><%= t('post_images.form.guidelines.source_link') %></div>
+          </div>
+        </div>
+      </div>
+    </li>
+  </ol>
+  <div class="image-adder">
+    <%= button_tag(t('.add_image'), type: :button, class: 'button-action') %>
+  </div>
+</section>