biovision-post 0.1.180127 → 0.2.180325

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

@@ -15,7 +15,7 @@
                   </div>
                   <ul class="actions">
                     <li>
-                      <%= create_icon(new_post_admin_post_type_path(post_type.id)) %>
+                      <%= create_icon(new_post_admin_post_type_path(id: post_type.id)) %>
                     </li>
                   </ul>
                 </li>

data/app/views/admin/post_categories/entity/_in_list.html.erb

@@ -7,10 +7,10 @@
 
   <ul class="actions">
     <li class="lockable <%= entity.locked? ? 'hidden' : '' %>">
-      <%= edit_icon edit_post_category_path(entity.id) %>
+      <%= edit_icon edit_post_category_path(id: entity.id) %>
     </li>
-    <%= render partial: 'shared/actions/priority_changer', locals: { path: priority_admin_post_category_path(entity.id) } %>
-    <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: lock_admin_post_category_path(entity.id) } %>
+    <%= render partial: 'shared/actions/priority_changer', locals: { path: priority_admin_post_category_path(id: entity.id) } %>
+    <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: lock_admin_post_category_path(id: entity.id) } %>
   </ul>
   
   <% if entity.child_categories.any? %>

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

@@ -5,7 +5,7 @@
   <% @entity.parents.each do |parent| %>
     <%= admin_post_category_link(parent) %>
   <% end %>
-  <%= link_to(t('admin.post_types.post_categories.heading'), post_categories_admin_post_type_path(@entity.post_type_id)) %>
+  <%= link_to(t('admin.post_types.post_categories.heading'), post_categories_admin_post_type_path(id: @entity.post_type_id)) %>
   <span><%= @entity.name %></span>
 <% end %>
 
@@ -13,9 +13,9 @@
   <h1><%= @entity.name %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_post_type_path(@entity.post_type_id)) %></li>
+    <li><%= return_icon(admin_post_type_path(id: @entity.post_type_id)) %></li>
     <% unless @entity.locked? %>
-      <li><%= edit_icon(edit_post_category_path(@entity.id)) %></li>
+      <li><%= edit_icon(edit_post_category_path(id: @entity.id)) %></li>
     <% end %>
   </ul>
 

data/app/views/admin/post_types/entity/_in_list.html.erb

@@ -6,6 +6,6 @@
   </div>
 
   <ul class="actions">
-    <li><%= create_icon(new_post_admin_post_type_path(entity.id)) %></li>
+    <li><%= create_icon(new_post_admin_post_type_path(id: entity.id)) %></li>
   </ul>
 </div>

data/app/views/admin/post_types/new_post.html.erb

@@ -9,7 +9,7 @@
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_post_type_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_post_type_path(id: @entity.id)) %></li>
   </ul>
 
   <%= render partial: 'posts/form', locals: { entity: Post.new(post_type: @entity) } %>

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

@@ -9,12 +9,12 @@
 
   <ul class="actions">
     <li><%= back_icon(admin_post_types_path) %></li>
-    <li><%= create_icon(new_post_admin_post_type_path(@entity.id)) %></li>
+    <li><%= create_icon(new_post_admin_post_type_path(id: @entity.id)) %></li>
   </ul>
 
   <% if current_user_has_privilege?(:chief_editor) %>
       <nav>
-        <%= link_to(t('admin.post_types.post_categories.heading'), post_categories_admin_post_type_path(@entity.id)) %>
+        <%= link_to(t('admin.post_types.post_categories.heading'), post_categories_admin_post_type_path(id: @entity.id)) %>
       </nav>
   <% end %>
 

data/app/views/admin/posts/entity/_in_list.html.erb

@@ -9,6 +9,12 @@
     <%= admin_user_link(entity.user) %>,
     <%= time_tag(entity.created_at) %>
   </div>
+  <% unless entity.language.nil? %>
+    <div class="secondary info">
+      <%= t('activerecord.attributes.post.language_id') %>:
+      <%= language_name(entity.language) %>
+    </div>
+  <% end %>
   <div class="secondaty info">
     <div><%= t(:created_at) %>: <%= time_tag(entity.created_at) %></div>
     <div><%= t(:updated_at) %>: <%= time_tag(entity.updated_at) %></div>
@@ -24,7 +30,15 @@
     <% end %>
   </div>
 
-  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_post_path(entity) } %>
+  <%=
+    render(
+        partial: 'shared/admin/toggleable',
+        locals: {
+            entity: entity,
+            url: toggle_admin_post_path(id: entity.id)
+        }
+    )
+  %>
 
   <ul class="actions">
     <%=
@@ -32,12 +46,12 @@
           partial: 'shared/actions/locks',
           locals: {
               entity: entity,
-              path: (current_user_has_privilege?(:chief_editor) ? lock_admin_post_path(entity.id) : '')
+              path: (current_user_has_privilege?(:chief_editor) ? lock_admin_post_path(id: entity.id) : '')
           }
       )
     %>
     <li class="lockable <%= entity.editable_by?(current_user) ? '' : 'hidden' %>">
-      <%= edit_icon(edit_post_path(entity.id)) %>
+      <%= edit_icon(edit_post_path(id: entity.id)) %>
     </li>
     <li class="lockable <%= entity.editable_by?(current_user) ? '' : 'hidden' %> danger">
       <%= destroy_icon(entity) %>

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

@@ -78,8 +78,10 @@
       <dd><%= @entity.image_author_link %></dd>
     <% end %>
 
-    <dt><%= t('activerecord.attributes.post.lead') %></dt>
-    <dd><%= @entity.lead %></dd>
+    <% unless @entity.lead.blank? %>
+      <dt><%= t('activerecord.attributes.post.lead') %></dt>
+      <dd><%= @entity.lead %></dd>
+    <% end %>
 
     <dt><%= t('activerecord.attributes.post.body') %></dt>
     <dd><%= simple_format(strip_tags(@entity.body)) %></dd>

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

@@ -2,7 +2,7 @@
 <% content_for :breadcrumbs do %>
     <%= link_to(t('articles.index.nav_text'), articles_path) %>
     <% @category.parents.each do |parent| %>
-        <%= link_to(parent.name, articles_category_path(parent.long_slug)) %>
+        <%= link_to(parent.name, articles_category_path(category_slug: parent.long_slug)) %>
     <% end %>
     <span><%= @category.name %></span>
 <% end %>

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

@@ -2,7 +2,7 @@
 <% content_for :breadcrumbs do %>
     <%= link_to(t('blog_posts.index.nav_text'), blog_posts_path) %>
     <% @category.parents.each do |parent| %>
-        <%= link_to(parent.name, blog_posts_category_path(parent.long_slug)) %>
+        <%= link_to(parent.name, blog_posts_category_path(category_slug: parent.long_slug)) %>
     <% end %>
     <span><%= @category.name %></span>
 <% end %>

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

@@ -0,0 +1,5 @@
+<section class="recent-posts">
+  <h2><%= t('.heading') %></h2>
+
+  <%= render partial: 'posts/list', locals: { collection: Post.visible.page_for_visitors(1) } %>
+</section>

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

@@ -2,7 +2,7 @@
 <% content_for :breadcrumbs do %>
     <%= link_to(t('news.index.nav_text'), news_index_path) %>
     <% @category.parents.each do |parent| %>
-        <%= link_to(parent.name, articles_category_path(parent.long_slug)) %>
+        <%= link_to(parent.name, articles_category_path(category_slug: parent.long_slug)) %>
     <% end %>
     <span><%= @category.name %></span>
 <% end %>

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

@@ -13,7 +13,7 @@
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
-    <li><%= return_icon(admin_post_category_path(@entity.id)) %></li>
+    <li><%= return_icon(admin_post_category_path(id: @entity.id)) %></li>
     <% if @entity.can_be_deleted? %>
         <li class="danger"><%= destroy_icon(@entity) %></li>
     <% end %>

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

@@ -1,23 +1,50 @@
-<%= form_with model: entity, html: { id: 'post-form' } do |f| %>
+<%= form_with model: entity, html: { id: "#{entity.class.to_s.underscore}-form" } do |f| %>
   <%= 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 :title %></dt>
     <dd>
-      <%= f.text_field :title, id: :post_title, size: nil, maxlength: Post::TITLE_LIMIT, required: true, data: { transliterate: :post_slug } %>
+      <%=
+        f.text_field(
+            :title,
+            id: :post_title,
+            size: nil,
+            maxlength: Post::TITLE_LIMIT,
+            required: true,
+            data: { transliterate: :post_slug }
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.title') %></div>
     </dd>
 
     <dt><%= f.label :slug %></dt>
     <dd>
-      <%= f.text_field :slug, id: :post_slug, size: nil, maxlength: Post::SLUG_LIMIT, required: true %>
+      <%=
+        f.text_field(
+            :slug,
+            id: :post_slug,
+            size: nil,
+            maxlength: Post::SLUG_LIMIT,
+            required: true,
+            pattern: Post::SLUG_PATTERN_HTML,
+            title: t('.guidelines.slug')
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.slug') %></div>
     </dd>
 
     <% if entity.post_type.post_categories.any? %>
       <dt><%= f.label :post_category_id %></dt>
       <dd>
-        <%= f.select :post_category_id, post_categories_for_select(entity.post_type_id) %>
+        <%=
+          f.select(
+              :post_category_id,
+              post_categories_for_select(entity.post_type_id)
+          )
+        %>
       </dd>
     <% end %>
 
@@ -37,43 +64,89 @@
 
     <dt><%= f.label :lead %></dt>
     <dd>
-      <%= f.text_area :lead, id: :post_lead, cols: 80, rows: 3, maxlength: Post::LEAD_LIMIT %>
+      <%=
+        f.text_area(
+            :lead,
+            id: :post_lead,
+            cols: 80,
+            rows: 3,
+            maxlength: Post::LEAD_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.lead') %></div>
     </dd>
 
     <dt><%= f.label :body %></dt>
     <dd>
-      <%= f.text_area :body, id: :post_body, cols: 20, rows: 25, required: true %>
+      <%=
+        f.text_area(
+            :body,
+            id:       :post_body,
+            cols:     20,
+            rows:     25,
+            required: true,
+            data:     { wysiwyg: 1 }
+        )
+      %>
     </dd>
 
     <dt><%= f.label :author_name %></dt>
     <dd>
-      <%= f.text_field :author_name, id: :post_author_name, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.text_field(
+            :author_name,
+            id: :post_author_name,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.author_name') %></div>
     </dd>
 
     <dt><%= f.label :author_title %></dt>
     <dd>
-      <%= f.text_field :author_title, id: :post_author_title, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.text_field(
+            :author_title,
+            id: :post_author_title,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.author_title') %></div>
     </dd>
 
     <dt><%= f.label :author_url %></dt>
     <dd>
-      <%= f.url_field :author_url, id: :post_author_url, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.url_field(
+            :author_url,
+            id: :post_author_url,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.author_url') %></div>
     </dd>
 
     <dt><%= f.label :image %></dt>
     <dd>
-      <figure class="preview" id="post-image">
+      <% figure_id = "#{entity.class.to_s.underscore}-image" %>
+      <figure role="group" class="preview" id="<%= figure_id %>">
         <% if entity.image.blank? %>
           <%= f.label :image, image_tag('biovision/base/placeholders/image.svg') %>
         <% else %>
           <%= f.label :image, image_tag(entity.image.big.url) %>
         <% end %>
         <figcaption>
-          <%= f.file_field :image, id: :post_image, accept: 'image/jpeg,image/png', data: { image: 'post-image' } %>
+          <%=
+            f.file_field(
+                :image,
+                id: :post_image,
+                accept: 'image/jpeg,image/png',
+                data: { image: figure_id }
+            )
+          %>
         </figcaption>
       </figure>
       <div class="guideline"><%= t('.guidelines.image') %></div>
@@ -81,55 +154,120 @@
 
     <dt><%= f.label :image_name %></dt>
     <dd>
-      <%= f.text_field :image_name, id: :post_image_name, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.text_field(
+            :image_name,
+            id: :post_image_name,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.image_name') %></div>
     </dd>
 
     <dt><%= f.label :image_alt_text %></dt>
     <dd>
-      <%= f.text_field :image_alt_text, id: :post_image_alt_text, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.text_field(
+            :image_alt_text,
+            id: :post_image_alt_text,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.image_alt_text') %></div>
     </dd>
 
     <dt><%= f.label :image_author_name %></dt>
     <dd>
-      <%= f.text_field :image_author_name, id: :post_image_author_name, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.text_field(
+            :image_author_name,
+            id: :post_image_author_name,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.image_author_name') %></div>
     </dd>
 
     <dt><%= f.label :image_author_link %></dt>
     <dd>
-      <%= f.url_field :image_author_link, id: :post_image_author_link, size: nil, maxlength: Post::META_LIMIT, placeholder: t('.placeholders.image_author_link') %>
+      <%=
+        f.url_field(
+            :image_author_link,
+            id: :post_image_author_link,
+            size: nil,
+            maxlength: Post::META_LIMIT,
+            placeholder: t('.placeholders.image_author_link')
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.image_author_link') %></div>
     </dd>
 
     <dt><%= f.label :source_name %></dt>
     <dd>
-      <%= f.text_field :source_name, id: :post_source_name, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.text_field(
+            :source_name,
+            id: :post_source_name,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.source') %></div>
     </dd>
 
     <dt><%= f.label :source_link %></dt>
     <dd>
-      <%= f.url_field :source_link, id: :post_source_link, size: nil, maxlength: Post::META_LIMIT, placeholder: t('.placeholders.source_link') %>
+      <%=
+        f.url_field(
+            :source_link,
+            id: :post_source_link,
+            size: nil,
+            maxlength: Post::META_LIMIT,
+            placeholder: t('.placeholders.source_link')
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.source_link') %></div>
     </dd>
 
     <dt><%= f.label :meta_title %></dt>
     <dd>
-      <%= f.text_field :meta_title, id: :post_meta_title, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.text_field(
+            :meta_title,
+            id: :post_meta_title,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.meta_title') %></div>
     </dd>
 
     <dt><%= f.label :meta_description %></dt>
     <dd>
-      <%= f.text_field :meta_description, id: :post_meta_description, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.text_field(
+            :meta_description,
+            id: :post_meta_description,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.meta_description') %></div>
     </dd>
 
     <dt><%= f.label :meta_keywords %></dt>
     <dd>
-      <%= f.text_field :meta_keywords, id: :post_meta_keywords, size: nil, maxlength: Post::META_LIMIT %>
+      <%=
+        f.text_field(
+            :meta_keywords,
+            id: :post_meta_keywords,
+            size: nil,
+            maxlength: Post::META_LIMIT
+        )
+      %>
       <div class="guideline"><%= t('.guidelines.meta_keywords') %></div>
     </dd>
 
@@ -156,8 +294,8 @@
 
   <div class="buttons">
     <%= f.hidden_field :post_type_id if entity.id.nil? %>
-    <%= f.button t(:save), type: :submit %>
+    <%= f.button t(:save), type: :submit, class: 'button-save' %>
   </div>
 <% end %>
 
-<%= render 'posts/form/wysiwyg' %>
+<%= render partial: 'shared/forms/wysiwyg' %>