Merge pull request #549 from codeforjapan/update-blog-show-html

Update `Blogs#show` html file
codeforjapan · Aug 28, 2023 · 5b48835 · 5b48835
2 parents 93eba5f + 2a207eb
commit 5b48835
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 27 deletions.
diff --git a/app/views/decidim/blogs/posts/show.html.erb b/app/views/decidim/blogs/posts/show.html.erb
@@ -16,39 +16,41 @@
 %>
 
 <div class="row column view-header">
-  <%= link_to :posts, class: "small hollow" do %>
-    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= t(".back") %>
-  <% end %>
+  <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>
   <%= cell "decidim/author", present(post.author), from: post %>
 </div>
 <div class="row">
-  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-    <% if show_endorsements_card? %>
-      <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 %>
+  <% 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>
-          <br>
-          <%= follow_button_for(post) %>
         </div>
       </div>
-    <% end %>
-  </div>
-  <div class="columns mediumlarge-8 mediumlarge-pull-4">
+  <% end %>
+  <div class="columns mediumlarge-8 <%= "mediumlarge-pull-4" if show_endorsements_card? %>">
     <div class="section">
-      <%= decidim_sanitize translated_attribute post.body %>
+      <%= decidim_sanitize_editor translated_attribute post.body %>
     </div>
     <%= cell "decidim/endorsers_list", post %>
   </div>

diff --git a/docs/UPGRADE.md b/docs/UPGRADE.md
@@ -85,10 +85,6 @@ Decidim本体のバージョンを更新する際、特に注意が必要な内
 
   https://github.com/codeforjapan/decidim-cfj/pull/455 で追加したもの。ピクセル数の大きい画像に対応するため、max_image_height_or_widthの値を変更している。
 
-* `app/views/decidim/blogs/posts/show.html.erb`
-
-  https://github.com/codeforjapan/decidim-cfj/issues/107 の対応として https://github.com/codeforjapan/decidim-cfj/pull/126 で追加しています。
-
 * `lib/tasks/delete.rake`
 
   `delete:destroy_all`タスク。https://github.com/codeforjapan/decidim-cfj/pull/501 で追加されたものです。