decidim-blogs 0.27.7 → 0.28.0.rc4

data/app/views/decidim/blogs/admin/posts/index.html.erb

@@ -1,64 +1,72 @@
 <% add_decidim_page_title(t(".title")) %>
 <div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t(".title") %>
-      <%= link_to t("actions.new", scope: "decidim.blogs", name: t("models.post.name", scope: "decidim.blogs.admin")), new_post_path, class: "button tiny button--title" if allowed_to? :create, :blogpost %>
+      <%= link_to t("actions.new", scope: "decidim.blogs"), new_post_path, class: "button button__sm button__secondary ml-auto" if allowed_to? :create, :blogpost %>
+      <%= render partial: "decidim/admin/components/resource_action" %>
     </h2>
   </div>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= t("models.post.fields.title", scope: "decidim.blogs") %></th>
+          <th><%= t("models.post.fields.body", scope: "decidim.blogs") %></th>
+          <th><%= t("models.post.fields.author", scope: "decidim.blogs") %></th>
+          <th><%= t("models.post.fields.published_at", scope: "decidim.blogs") %></th>
+          <th class="actions"><%= t("actions.title", scope: "decidim.blogs") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% posts.created_at_desc.each do |post| %>
 
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= t("models.post.fields.title", scope: "decidim.blogs") %></th>
-            <th><%= t("models.post.fields.body", scope: "decidim.blogs") %></th>
-            <th><%= t("models.post.fields.author", scope: "decidim.blogs") %></th>
-            <th><%= t("models.post.fields.created_at", scope: "decidim.blogs") %></th>
-            <th class="actions"><%= t("actions.title", scope: "decidim.blogs") %></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% posts.created_at_desc.each do |post| %>
-
-            <tr data-id="<%= post.id %>">
-              <td>
+          <tr data-id="<%= post.id %>">
+            <td>
+              <% if allowed_to? :update, :blogpost, blog_post: post %>
+                <%= link_to translated_attribute(post.title), edit_post_path(post) %><br>
+              <% else %>
                 <%= translated_attribute(post.title) %><br>
-              </td>
-              <td>
-                <%= decidim_sanitize_editor post_description_admin(post) %>
-              </td>
-              <td>
-                <%= post.try(:author).try(:name) %>
-              </td>
-              <td>
-                <%= l post.created_at, format: "%d/%m/%Y - %H:%M" %>
-              </td>
-              <td class="table-list__actions">
-                <% if allowed_to? :update, :blogpost, blog_post: post %>
-                  <%= icon_link_to "pencil", edit_post_path(post), t("actions.edit", scope: "decidim.blogs"), class: "action-icon--edit" %>
-                <% end %>
+              <% end %>
+            </td>
+            <td>
+              <%= decidim_sanitize_editor post_description_admin(post) %>
+            </td>
+            <td>
+              <%= post.try(:author).try(:name) %>
+            </td>
+            <% publish_data = publish_data(post.published_at) %>
+            <td>
+              <%= content_tag :span, class: "padding-3", data: { tooltip: true, disable_hover: false, click_open: false }, title: publish_data[:popup] do
+                publish_data[:icon]
+              end %>
+              <%= l post.published_at, format: :decidim_short %>
+            </td>
+            <td class="table-list__actions">
+              <% if allowed_to? :update, :blogpost, blog_post: post %>
+                <%= icon_link_to "pencil-line", edit_post_path(post), t("actions.edit", scope: "decidim.blogs"), class: "action-icon--edit" %>
+              <% end %>
 
-                <% if allowed_to? :update, :blogpost, blog_post: post %>
-                    <%= icon_link_to "folder", post_attachment_collections_path(post), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
-                <% end %>
+              <% if allowed_to? :update, :blogpost, blog_post: post %>
+                <%= icon_link_to "folder-line", post_attachment_collections_path(post), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
+              <% end %>
 
-                <% if allowed_to? :update, :blogpost, blog_post: post %>
-                  <%= icon_link_to "paperclip", post_attachments_path(post), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
-                <% end %>
+              <% if allowed_to? :update, :blogpost, blog_post: post %>
+                <%= icon_link_to "attachment-line", post_attachments_path(post), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
+              <% end %>
 
-                <%= resource_permissions_link(post) %>
+              <%= icon_link_to "eye-line", resource_locator(post).path, t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: :blank, data: { "external-link": false } %>
 
-                <% if allowed_to? :destroy, :blogpost, blog_post: post %>
-                  <%= icon_link_to "circle-x", post_path(post), t("actions.destroy", scope: "decidim.blogs"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.blogs") } %>
-                <% end %>
-              </td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-      <%= paginate posts, theme: "decidim" %>
-    </div>
+              <%= resource_permissions_link(post) %>
+
+              <% if allowed_to? :destroy, :blogpost, blog_post: post %>
+                <%= icon_link_to "delete-bin-line", post_path(post), t("actions.destroy", scope: "decidim.blogs"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.blogs") } %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
-<div>
+</div>
+<%= decidim_paginate posts %>

data/app/views/decidim/blogs/admin/posts/new.html.erb

@@ -1,8 +1,19 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, html: { class: "form new_post" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
 
-  <div class="button--double form-general-submit">
-      <%= f.submit t(".create") %>
-  </div>
-<% end %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+     <%= decidim_form_for(@form, html: { class: "form-defaults form new_post" }) do |f| %>
+       <%= render partial: "form", object: f %>
+       <div class="item__edit-sticky">
+         <div class="item__edit-sticky-container">
+           <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+         </div>
+       </div>
+     <% end %>
+   </div>
+</div>

data/app/views/decidim/blogs/posts/_actions.html.erb

@@ -0,0 +1,18 @@
+<div class="blog__actions">
+  <div class="blog__actions-left">
+    <% if endorsements_enabled? %>
+      <%= endorsement_buttons_cell(post) %>
+    <% end %>
+
+    <%= cell "decidim/comments_button", nil %>
+  </div>
+
+  <div class="blog__actions-right">
+    <%= follow_button_for(post, false, button_classes: "button button__sm button__text-secondary") %>
+
+    <%= cell "decidim/share_button", nil %>
+    <%= cell "decidim/report_button", post %>
+  </div>
+</div>
+
+<%= cell "decidim/endorsers_list", post, layout: :full %>

data/app/views/decidim/blogs/posts/index.html.erb

@@ -1,14 +1,27 @@
-<%= render partial: "decidim/shared/component_announcement" %>
+<% add_decidim_page_title component_name %>
+<%= append_javascript_pack_tag "decidim_blogs" %>
+<%= append_stylesheet_pack_tag "decidim_blogs" %>
 
-<div class="row column">
-  <div id="blogs" class="columns medium-7 mediumlarge-8">
+<% content_for :aside do %>
+  <h1 class="title-decorator"><%= component_name %></h1>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
+  <%= render partial: "decidim/shared/component_announcement" %>
+
+  <section id="blogs" class="layout-main__section layout-main__heading">
     <% if posts.empty? %>
       <%= cell("decidim/announcement", t("empty", scope: "decidim.blogs.posts.index")) %>
     <% else %>
-      <%= render partial: "posts" %>
+      <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.blogs.posts.index", count: posts.length) %></h2>
     <% end %>
-  </div>
-  <div id="most-commented" class="columns medium-5 mediumlarge-4 large-4">
-    <%= render partial: "sidebar_blog", locals: { posts: posts_most_commented } %>
-  </div>
-</div>
+
+    <% paginate_posts.each do |post| %>
+      <%= card_for post, size: :l %>
+    <% end %>
+
+    <%= decidim_paginate paginate_posts %>
+  </section>
+
+<% end %>

data/app/views/decidim/blogs/posts/show.html.erb

@@ -1,10 +1,10 @@
 <% provide(:title, translated_attribute(post.title)) %>
 
 <% add_decidim_meta_tags({
-  title: translated_attribute(post.title),
-  description: translated_attribute(post.body),
-  url: post_url(post.id)
-}) %>
+                           title: translated_attribute(post.title),
+                           description: translated_attribute(post.body),
+                           url: post_url(post.id)
+                         }) %>
 
 <%
   edit_link(
@@ -15,48 +15,38 @@
   )
 %>
 
-<div class="row column view-header">
-  <div class="m-bottom">
-    <%= link_to :posts, class: "small hollow" do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t(".back") %>
-    <% end %>
-  </div>
-  <h2 class="heading2"><%= translated_attribute post.title %></h2>
-
-  <% post_presenter = Decidim::Blogs::PostPresenter.new(post) %>
-  <%= cell "decidim/author", post_presenter.author, from: post %>
-</div>
-<div class="row">
-  <% if show_endorsements_card? %>
-      <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-        <div class="card">
-          <div class="card__content">
-            <div class="row collapse buttons__row">
-              <% if endorsements_enabled? %>
-                <div class="column small-9 collapse">
-                  <%= endorsement_buttons_cell(post) %>
-                </div>
-              <% end %>
-              <div class="column collapse <%= endorsements_enabled? ? "small-3" : "" %>">
-                <%= link_to "#comments", class: "button small compact hollow button--nomargin expanded" do %>
-                    <%= icon "comment-square", class: "icon--small", aria_label: t(".comments"), role: "img" %> <%= post.comments_count %>
-                <% end %>
-              </div>
-            </div>
-            <br>
-            <%= follow_button_for(post) %>
-          </div>
-        </div>
+<%= append_javascript_pack_tag "decidim_blogs" %>
+<%= append_stylesheet_pack_tag "decidim_blogs" %>
+
+<%= render layout: "layouts/decidim/shared/layout_center", locals: { columns: 8 } do %>
+
+  <section class="layout-main__section layout-main__heading">
+    <div class="flex justify-center">
+      <h1 class="title-decorator my-12"><%= translated_attribute post.title %></h1>
+    </div>
+
+    <% if post.photo.present? %>
+      <div class="blog__image grow">
+        <%= image_tag post.photo.big_url, alt: post.photo.description || post.photo.title || t("alt", scope: "decidim.application.photo") %>
       </div>
-  <% end %>
-  <div class="columns mediumlarge-8 <%= "mediumlarge-pull-4" if show_endorsements_card? %>">
-    <div class="section">
-      <%= decidim_sanitize_editor_admin translated_attribute(post.body) %>
+    <% end %>
+
+    <div class="layout-author">
+      <%= cell "decidim/author", post_presenter.author, from: post, context_actions: [:date], layout: :compact %>
+    </div>
+  </section>
+
+  <section class="layout-main__section">
+    <div class="editor-content">
+      <%= decidim_sanitize_editor_admin translated_attribute post.body %>
     </div>
-    <%= cell "decidim/endorsers_list", post %>
-  </div>
-</div>
-<%= attachments_for post %>
-<%= comments_for post %>
-<%= cell("decidim/flag_modal", post) %>
+
+    <%= attachments_for post %>
+
+    <%= render partial: "actions" %>
+  </section>
+
+  <section class="layout-main__section">
+    <%= comments_for post %>
+  </section>
+<% end %>

data/config/locales/ar.yml

@@ -28,15 +28,7 @@ ar:
         new: منشور جديد
         title: أفعال
       admin:
-        models:
-          post:
-            name: بريد
         posts:
-          create:
-            invalid: حدثت مشكلة أثناء إنشاء هذا المنشور
-            success: تم النشر بنجاح
-          destroy:
-            success: تم حذف المشاركة بنجاح
           edit:
             save: تحديث
             title: تعديل المنشور
@@ -47,31 +39,21 @@ ar:
             title: إنشاء وظيفة
           update:
             invalid: حدثت مشكلة في حفظ المشاركة.
-            success: تم حفظ النشر بنجاح
       admin_log:
         post:
           create: "%{user_name} أنشأ منشور المدونة %{resource_name} في %{space_name}"
           delete: "%{user_name} حذف منشور المدونة%{resource_name} من %{space_name}"
           update: "%{user_name} حدث منشور المدونة %{resource_name} في %{space_name}"
       last_activity:
-        new_post_at_html: "<span>وظيفة جديدة في %{link}</span>"
+        new_post: 'منشور جديد:'
       models:
         post:
           fields:
             author: مؤلف
             body: الجسم
-            created_at: أنشئت في
             official_blog_post: المنشور الرسمي
+            published_at: موعد النشر
             title: العنوان
-      posts:
-        show:
-          back: العودة إلى القائمة
-          comments: التعليقات
-          view: رأي
-        sidebar_blog:
-          comments: تعليقات
-          most_commented_posts: الأكثر تعليقًا عليها
-      read_more: قراءة المزيد
     components:
       blogs:
         actions:

data/config/locales/bg.yml

@@ -1,12 +1,6 @@
 ---
 bg:
   activemodel:
-    attributes:
-      post:
-        body: Основен текст
-        decidim_author_id: Автор
-        published_at: Час на публикуване
-        title: Заглавие
     models:
       decidim/blogs/create_post_event: Нова блог публикация
   activerecord:
@@ -17,84 +11,4 @@ bg:
   decidim:
     blogs:
       actions:
-        author_id: Създаване на публикация като
         confirm_destroy: Сигурни ли сте, че желаете да изтриете тази публикация?
-        destroy: Изтрий
-        edit: Редактирай
-        new: Нова публикация
-        title: Активности
-      admin:
-        models:
-          post:
-            name: Публикация
-        posts:
-          create:
-            invalid: Възникна проблем при създаването на тази публикация
-            success: Публикацията беше създадена успешно
-          destroy:
-            success: Публикацията беше изтрита успешно
-          edit:
-            save: Актуализация
-            title: Редактиране на поста
-          index:
-            title: Публикации
-          new:
-            create: Създаване
-            title: Създай публикация
-          update:
-            invalid: Възникна проблем при запазването на публикацията.
-            success: Публикацията беше запазена успешно
-      admin_log:
-        post:
-          create: "%{user_name} създаде публикацията в блога %{resource_name} в %{space_name}"
-          delete: "%{user_name} изтри публикацията в блога %{resource_name} от %{space_name}"
-          update: "%{user_name} актуализира публикацията в блога %{resource_name} в %{space_name}"
-      last_activity:
-        new_post_at_html: "<span>Нова публикация на %{link}</span>"
-      models:
-        post:
-          fields:
-            author: Автор
-            body: Основен текст
-            created_at: Създадена на
-            official_blog_post: Официална публикация
-            title: Заглавие
-      posts:
-        index:
-          empty: Все още няма постове.
-        show:
-          back: Назад към списъка
-          comments: Коментари
-          view: Преглед
-        sidebar_blog:
-          comments: коментари
-          most_commented_posts: Най-коментирани публикации
-      read_more: Прочетете повече
-    components:
-      blogs:
-        actions:
-          comment: Коментар
-          create: Създаване
-          destroy: Изтрий
-          endorse: Подкрепете
-          update: Актуализация
-        name: Блог
-        settings:
-          global:
-            announcement: Обявление
-            comments_enabled: Коментарите са разрешени
-            comments_max_length: Максимална дължина на коментарите (Оставете 0 за стойност по подразбиране)
-          step:
-            announcement: Обявление
-            comments_blocked: Коментарите са блокирани
-            endorsements_blocked: Подкрепата е блокирана
-            endorsements_enabled: Подкрепата е активирана
-    events:
-      blogs:
-        post_created:
-          email_intro: Публикацията „%{resource_title}“ е публикувана в(ъв)%{participatory_space_title}“, което следвате.
-          email_outro: Получавате това известие, защото следвате "%{participatory_space_title}". Може да премахнете следването чрез предходния линк.
-          email_subject: Публикувана е нова публикация в(ъв) %{participatory_space_title}
-          notification_title: Публикацията <a href="%{resource_path}">%{resource_title}</a> е публикувана в(ъв) %{participatory_space_title}
-    statistics:
-      posts_count: Постове

data/config/locales/ca.yml

@@ -24,52 +24,50 @@ ca:
         new: Nova publicació
         title: Accions
       admin:
-        models:
-          post:
-            name: Publicar
         posts:
           create:
-            invalid: S'ha produït un error en crear aquesta publicació
-            success: Publicació creada correctament
+            invalid: S'ha produït un error en crear aquesta publicació.
+            success: Publicació creada correctament.
           destroy:
-            success: La publicació s'ha eliminat correctament
+            success: La publicació s'ha eliminat correctament.
           edit:
             save: Actualitza
             title: Editar publicació
           index:
+            not_published_yet: No publicada encara.
             title: Publicacions
           new:
             create: Crear
             title: Crea una publicació
           update:
             invalid: S'ha produït un error en guardar la publicació.
-            success: S'ha desat la publicació correctament
+            success: S'ha desat la publicació correctament.
       admin_log:
         post:
           create: "%{user_name} ha creat el post %{resource_name} al blog de %{space_name}"
           delete: "%{user_name} ha eliminat el post %{resource_name} del blog de %{space_name}"
           update: "%{user_name} ha actualitzat el post %{resource_name} en el blog de %{space_name}"
+      content_blocks:
+        highlighted_posts:
+          last_published: Darrera publicació
+          name: Publicacions
+          see_all: Veure totes les publicacions
       last_activity:
-        new_post_at_html: "<span>Nova publicació a %{link}</span>"
+        new_post: 'Nova publicació:'
       models:
         post:
           fields:
             author: Autora
             body: Cos
-            created_at: Creat el
             official_blog_post: Post oficial
+            published_at: Hora de publicació
             title: Títol
       posts:
         index:
+          count:
+            one: "%{count} publicació"
+            other: "%{count} publicacions"
           empty: Encara no hi ha cap publicació.
-        show:
-          back: Tornar al llistat
-          comments: Comentaris
-          view: Veure
-        sidebar_blog:
-          comments: comentaris
-          most_commented_posts: Publicacions més comentades
-      read_more: Llegeix més
     components:
       blogs:
         actions:
@@ -93,7 +91,7 @@ ca:
       blogs:
         post_created:
           email_intro: La publicació "%{resource_title}" s'ha publicat al "%{participatory_space_title}", el qual segueixes.
-          email_outro: Has rebut aquesta notificació perquè estàs seguint l'espai "%{participatory_space_title}". Pots deixar de seguir-lo des de l'enllaç anterior.
+          email_outro: Has rebut aquesta notificació perquè estàs seguint "%{participatory_space_title}". Pots deixar de seguir-lo des de l'enllaç anterior.
           email_subject: Nova publicació publicada a %{participatory_space_title}
           notification_title: La publicació <a href="%{resource_path}">%{resource_title}</a> ha estat publicada a %{participatory_space_title}
     statistics:

data/config/locales/cs.yml

@@ -26,52 +26,52 @@ cs:
         new: Nový příspěvek
         title: Akce
       admin:
-        models:
-          post:
-            name: Příspěvek
         posts:
           create:
-            invalid: Při vytváření tohoto příspěvku došlo k potížím
-            success: Příspěvek byl úspěšně vytvořen
+            invalid: Při vytváření tohoto příspěvku nastal problém.
+            success: Příspěvek byl úspěšně vytvořen.
           destroy:
-            success: Příspěvek byl úspěšně odstraněn
+            success: Příspěvek byl úspěšně smazán.
           edit:
             save: Aktualizovat
             title: Upravit příspěvek
           index:
+            not_published_yet: Zatím nezveřejněno.
             title: Příspěvky
           new:
             create: Vytvořit
             title: Vytvořit příspěvek
           update:
             invalid: Při ukládání příspěvku došlo k chybám.
-            success: Příspěvek byl úspěšně uložen
+            success: Příspěvek byl úspěšně uložen.
       admin_log:
         post:
           create: "%{user_name} vytvořil příspěvek %{resource_name} v %{space_name}"
           delete: "%{user_name} odstranil příspěvek %{resource_name} z %{space_name}"
           update: "%{user_name} aktualizoval příspěvek %{resource_name} v %{space_name}"
+      content_blocks:
+        highlighted_posts:
+          last_published: Naposledy publikováno
+          name: Příspěvky
+          see_all: Zobrazit všechny příspěvky
       last_activity:
-        new_post_at_html: "<span>Nový příspěvek v %{link}</span>"
+        new_post: 'Nový příspěvek:'
       models:
         post:
           fields:
             author: Autor
             body: Tělo
-            created_at: Vytvořeno v
             official_blog_post: Oficiální příspěvek
+            published_at: Čas zveřejnění
             title: Název
       posts:
         index:
+          count:
+            one: "%{count} příspěvek"
+            few: "%{count} příspěvky"
+            many: "%{count} příspěvků"
+            other: "%{count} příspěvků"
           empty: Zatím nejsou žádné příspěvky.
-        show:
-          back: Zpět na seznam
-          comments: Komentáře
-          view: Zobrazit
-        sidebar_blog:
-          comments: komentáře
-          most_commented_posts: Nejvíce komentované příspěvky
-      read_more: Přečtěte si více
     components:
       blogs:
         actions: