biovision-post 0.21.190513.0 → 0.26.191013.0

data/app/views/admin/posts/show.html.erb

@@ -1,11 +1,10 @@
 <% content_for :meta_title, t('.title', name: @entity.title) %>
 <% content_for :breadcrumbs do %>
+  <%= admin_biovision_component_link(component_handler.component) %>
   <%= link_to(t('admin.posts.nav_item.text'), admin_posts_path) %>
   <span><%= @entity.title %></span>
 <% end %>
 
-<% handler = PostManager.new(@entity) %>
-
 <article>
   <h1><%= @entity.title %></h1>
 
@@ -22,10 +21,10 @@
   <ul class="actions">
     <li><%= back_icon(admin_posts_path) %></li>
     <% if @entity.visible? %>
-      <li><%= world_icon(handler.post_path) %></li>
+      <li><%= world_icon(@entity.url) %></li>
     <% end %>
-    <% if @entity.editable_by?(current_user) && !@entity.locked? %>
-      <li><%= edit_icon(handler.edit_path) %></li>
+    <% if component_handler.editable?(@entity) && !@entity.locked? %>
+      <li><%= edit_icon(component_handler.edit_path(@entity)) %></li>
       <li class="danger"><%= destroy_icon(@entity) %></li>
     <% end %>
   </ul>
@@ -51,7 +50,7 @@
       <dt><%= t('.post_categories') %></dt>
       <dd>
         <ul>
-          <% chief = current_user_has_privilege?(:chief_editor) %>
+          <% chief = component_handler.allow?('chief_editor') %>
           <% @entity.post_categories.each do |post_category| %>
             <li>
               <% if chief %>
@@ -130,7 +129,7 @@
     <dt><%= t('activerecord.attributes.post.body') %></dt>
     <dd>
       <div class="text">
-        <%= raw(@entity.parsed_body) %>
+        <%= raw(@entity.body) %>
       </div>
     </dd>
 

data/app/views/authors/show.html.erb

@@ -10,7 +10,7 @@
   <section class="post-author">
     <h2><%= @entity.name %></h2>
 
-    <% if @entity.editable_by?(current_user) %>
+    <% if component_handler.editable?(@entity) %>
       <ul class="actions">
         <li><%= gear_icon(admin_editorial_member_path(id: @entity.id)) %></li>
       </ul>

data/app/views/blog_posts/index.html.erb

@@ -3,7 +3,7 @@
   <link rel="alternate" type="application/rss+xml" href="<%= rss_posts_path %>" />
 <% end %>
 <% content_for :breadcrumbs do %>
-    <span><%= t('blog_posts.index.nav_text') %></span>
+  <span><%= t('blog_posts.index.nav_text') %></span>
 <% end %>
 
 <%=
@@ -11,7 +11,9 @@
       partial: 'posts/post_type/posts',
       locals: {
           heading: t('.heading'),
-          collection: @collection
+          collection: @collection,
+          path_for_new: my_new_blog_post_path,
+          allow_new: component_handler.allow_post_type?('blog_post')
       }
   )
 %>

data/app/views/editorial_members/edit.html.erb

@@ -1,5 +1,6 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
+  <%= admin_biovision_component_link(component_handler.component) %>
   <%= link_to(t('admin.editorial_members.nav_item.text'), admin_editorial_members_path) %>
   <%= admin_editorial_member_link(@entity) %>
   <span><%= t('.nav_text') %></span>

data/app/views/editorial_members/new.html.erb

@@ -1,7 +1,8 @@
 <% content_for :meta_title, t('.title') %>
 <% content_for :breadcrumbs do %>
-    <%= link_to(t('admin.editorial_members.nav_item.text'), admin_editorial_members_path) %>
-    <span><%= t('.nav_text') %></span>
+  <%= admin_biovision_component_link(component_handler.component) %>
+  <%= link_to(t('admin.editorial_members.nav_item.text'), admin_editorial_members_path) %>
+  <span><%= t('.nav_text') %></span>
 <% end %>
 
 <article>

data/app/views/my/index/dashboard/_biovision_post.html.erb

@@ -1,19 +1,20 @@
-<% if current_user_in_group?(:editors) %>
+<% handler = Biovision::Components::BaseComponent.handler('posts', current_user) %>
+<% if handler.show_dashboard? %>
   <section class="dashboard" id="biovision-post-my-dashboard">
     <h2><%= t('.heading') %></h2>
 
     <nav>
-      <% if current_user_has_privilege?(:editor) %>
+      <% if handler.allow_post_type?('article') %>
         <div>
           <%= link_to(t('my.posts.new_article.nav_text'), my_new_article_path) %>
         </div>
       <% end %>
-      <% if current_user_has_privilege?(:reporter) %>
+      <% if handler.allow_post_type?('news') %>
         <div>
           <%= link_to(t('my.posts.new_news.nav_text'), my_new_news_path) %>
         </div>
       <% end %>
-      <% if current_user_has_privilege?(:blogger) %>
+      <% if handler.allow_post_type?('blog_post') %>
         <div>
           <%= link_to(t('my.posts.new_blog_post.nav_text'), my_new_blog_post_path) %>
         </div>

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

@@ -11,9 +11,6 @@
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
   <dl>
-    <dt><%= f.label :language_id %></dt>
-    <dd><%= f.select :language_id, languages_for_select(false) %></dd>
-
     <dt><%= f.label :publication_time %></dt>
     <dd>
       <%=
@@ -30,39 +27,28 @@
       <%=
         f.text_field(
             :title,
-            id:        "#{model_name}_title",
-            size:      nil,
+            id: "#{model_name}_title",
+            size: nil,
             maxlength: Post::TITLE_LIMIT,
-            required:  true,
-            data:      { transliterate: "#{model_name}_slug" }
+            required: true,
+            data: { transliterate: "#{model_name}_slug" }
         )
       %>
       <div class="guideline"><%= t('posts.form.guidelines.title') %></div>
     </dd>
 
-    <dt><%= f.label :slug %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :slug,
-            id:        "#{model_name}_slug",
-            size:      nil,
-            maxlength: Post::SLUG_LIMIT,
-            required:  true,
-            pattern:   Post::SLUG_PATTERN_HTML,
-            title:     t('posts.form.guidelines.slug')
-        )
-      %>
-      <div class="guideline"><%= t('posts.form.guidelines.slug') %></div>
-    </dd>
-
-    <% if entity.post_type.post_categories.any? %>
-      <dt><%= f.label :post_category_id %></dt>
+    <% categories = PostCategory.list_for_tree(entity.post_type_id) %>
+    <% if categories.any? %>
+      <dt><label><%= t('.categories') %></label></dt>
       <dd>
         <%=
-          f.select(
-              :post_category_id,
-              post_categories_for_select(entity.post_type_id)
+          render(
+              partial: 'posts/form/category_links',
+              locals: {
+                  entity: entity,
+                  collection: categories.select { |_, i| i[:parent_id].nil? },
+                  categories: categories
+              }
           )
         %>
       </dd>
@@ -73,9 +59,9 @@
       <%=
         f.text_area(
             :lead,
-            id:        "#{model_name}_lead",
-            cols:      80,
-            rows:      3,
+            id: "#{model_name}_lead",
+            cols: 80,
+            rows: 3,
             maxlength: Post::LEAD_LIMIT
         )
       %>
@@ -87,72 +73,15 @@
       <%=
         f.text_area(
             :body,
-            id:       "#{model_name}_body",
-            cols:     20,
-            rows:     25,
+            id: "#{model_name}_body",
+            cols: 20,
+            rows: 25,
             required: true,
-            data:     { wysiwyg: 1 }
-        )
-      %>
-    </dd>
-
-    <dt><%= label_tag(:tags_string, t('posts.form.tags')) %></dt>
-    <dd>
-      <%=
-        text_field_tag(:tags_string, entity.tags_string)
-      %>
-    </dd>
-
-    <dt><%= f.label :time_required %></dt>
-    <dd>
-      <%=
-        f.number_field(
-            :time_required,
-            id:   "#{model_name}_time_required",
-            size: nil,
-            in:   Post::TIME_RANGE
-        )
-      %>
-      <div class="guideline"><%= t('posts.form.guidelines.time_required') %></div>
-    </dd>
-
-    <dt><%= f.label :author_name %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :author_name,
-            id:        "#{model_name}_author_name",
-            size:      nil,
-            maxlength: Post::META_LIMIT
-        )
-      %>
-      <div class="guideline"><%= t('posts.form.guidelines.author_name') %></div>
-    </dd>
-
-    <dt><%= f.label :author_title %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :author_title,
-            id:        "#{model_name}_author_title",
-            size:      nil,
-            maxlength: Post::META_LIMIT
-        )
-      %>
-      <div class="guideline"><%= t('posts.form.guidelines.author_title') %></div>
-    </dd>
-
-    <dt><%= f.label :author_url %></dt>
-    <dd>
-      <%=
-        f.url_field(
-            :author_url,
-            id:        "#{model_name}_author_url",
-            size:      nil,
-            maxlength: Post::META_LIMIT
+            data: {
+                wysiwyg: 1
+            }
         )
       %>
-      <div class="guideline"><%= t('posts.form.guidelines.author_url') %></div>
     </dd>
 
     <dt><%= f.label :image %></dt>
@@ -160,7 +89,7 @@
       <% figure_id = "#{model_name}-image" %>
       <figure role="group" class="preview" id="<%= figure_id %>">
         <% if entity.image.blank? %>
-          <%= f.label :image, image_tag('biovision/base/placeholders/image.svg') %>
+          <%= f.label :image, image_tag('biovision/base/placeholders/3x2.svg') %>
         <% else %>
           <%= f.label :image, image_tag(entity.image.big.url) %>
         <% end %>
@@ -168,9 +97,9 @@
           <%=
             f.file_field(
                 :image,
-                id:     "#{model_name}_image",
                 accept: 'image/jpeg,image/png',
-                data:   { image: figure_id }
+                data: { image: figure_id },
+                id: "#{model_name}_image"
             )
           %>
         </figcaption>
@@ -183,8 +112,8 @@
       <%=
         f.text_field(
             :image_alt_text,
-            id:        "#{model_name}_image_alt_text",
-            size:      nil,
+            id: "#{model_name}_image_alt_text",
+            size: nil,
             maxlength: Post::META_LIMIT
         )
       %>
@@ -196,8 +125,8 @@
       <%=
         f.text_field(
             :image_name,
-            id:        "#{model_name}_image_name",
-            size:      nil,
+            id: "#{model_name}_image_name",
+            size: nil,
             maxlength: Post::IMAGE_NAME_LIMIT
         )
       %>
@@ -209,8 +138,8 @@
       <%=
         f.text_field(
             :image_source_name,
-            id:        "#{model_name}_image_source_name",
-            size:      nil,
+            id: "#{model_name}_image_source_name",
+            size: nil,
             maxlength: Post::META_LIMIT
         )
       %>
@@ -222,94 +151,29 @@
       <%=
         f.url_field(
             :image_source_link,
-            id:          "#{model_name}_image_source_link",
-            size:        nil,
-            maxlength:   Post::META_LIMIT,
+            id: "#{model_name}_image_source_link",
+            size: nil,
+            maxlength: Post::META_LIMIT,
             placeholder: t('posts.form.placeholders.image_source_link')
         )
       %>
       <div class="guideline"><%= t('posts.form.guidelines.image_source_link') %></div>
     </dd>
 
-    <dt><%= f.label :source_name %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :source_name,
-            id:        "#{model_name}_source_name",
-            size:      nil,
-            maxlength: Post::META_LIMIT
-        )
-      %>
-      <div class="guideline"><%= t('posts.form.guidelines.source') %></div>
-    </dd>
-
-    <dt><%= f.label :original_title %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :original_title,
-            id:        "#{model_name}_original_title",
-            size:      nil,
-            maxlength: Post::META_LIMIT
-        )
-      %>
-      <div class="guideline"><%= t('posts.form.guidelines.original_title') %></div>
-    </dd>
-
     <dt><%= f.label :source_link %></dt>
     <dd>
       <%=
         f.url_field(
             :source_link,
-            id:          "#{model_name}_source_link",
-            size:        nil,
-            maxlength:   Post::META_LIMIT,
+            id: "#{model_name}_source_link",
+            size: nil,
+            maxlength: Post::META_LIMIT,
             placeholder: t('posts.form.placeholders.source_link')
         )
       %>
       <div class="guideline"><%= t('posts.form.guidelines.source_link') %></div>
     </dd>
 
-    <dt><%= f.label :meta_title %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :meta_title,
-            id:        "#{model_name}_meta_title",
-            size:      nil,
-            maxlength: Post::META_LIMIT
-        )
-      %>
-      <div class="guideline"><%= t('posts.form.guidelines.meta_title') %></div>
-    </dd>
-
-    <dt><%= f.label :meta_description %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :meta_description,
-            id:        "#{model_name}_meta_description",
-            size:      nil,
-            maxlength: Post::META_LIMIT
-        )
-      %>
-      <div class="guideline"><%= t('posts.form.guidelines.meta_description') %></div>
-    </dd>
-
-    <dt><%= f.label :meta_keywords %></dt>
-    <dd>
-      <%=
-        f.text_field(
-            :meta_keywords,
-            id:        "#{model_name}_meta_keywords",
-            size:      nil,
-            maxlength: Post::META_LIMIT
-        )
-      %>
-      <div class="guideline"><%= t('posts.form.guidelines.meta_keywords') %></div>
-    </dd>
-
     <dt><%= t(:flags) %></dt>
     <dd>
       <ul class="flags">
@@ -317,25 +181,6 @@
           <%= f.check_box :visible, id: "#{model_name}_visible" %>
           <%= f.label :visible %>
         </li>
-        <li>
-          <%= f.check_box :show_owner, id: "#{model_name}_show_owner" %>
-          <%= f.label :show_owner %>
-        </li>
-        <li>
-          <%= f.check_box :translation, id: "#{model_name}_translation" %>
-          <%= f.label :translation %>
-          <div>
-            <%= f.label :translator_name %><br/>
-            <%=
-              f.text_field(
-                  :translator_name,
-                  id: "#{model_name}_translator_name",
-                  size: nil,
-                  maxlength: Post::META_LIMIT
-              )
-            %>
-          </div>
-        </li>
         <% if Gem.loaded_specs.key?('biovision-comment') %>
           <li>
             <%= f.check_box :allow_comments, id: :post_allow_comments %>
@@ -349,9 +194,10 @@
   <%= render 'shared/forms/state_container' %>
 
   <div class="buttons">
+    <%= f.hidden_field :language_id %>
     <%= f.hidden_field :post_type_id if entity.id.nil? %>
     <%= f.button t(:save), type: :submit, class: 'button-save' %>
   </div>
 <% end %>
 
-<%= render partial: 'posts/wysiwyg' %>
+<%= render partial: 'shared/forms/wysiwyg' %>