Merge pull request #4170 from osmcz/cuzk

[rails.git] / app / views / diary_entries / _diary_entry.html.erb

diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index e41eeae662dc5d5167e6149b3d5bbc19e49f3ffc..f69c7e552c3bf80f0adff79febae210093eb2a47 100644 (file)
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -1,18 +1,28 @@
-<div class='diary_post'>
-  <div class='post_heading clearfix'>
-    <% if !@user %>
-      <%= user_thumbnail diary_entry.user %>
+<article class='diary_post border-top border-grey py-3<%= " text-muted px-3 bg-danger bg-opacity-10" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
+  <div class='mb-3'>
+    <% if @user %>
+      <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
+    <% else %>
+      <div class="row">
+        <div class="col-auto">
+          <%= user_thumbnail diary_entry.user %>
+        </div>
+        <div class="col">
+          <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
+        </div>
+      </div>

     <% end %>
 
     <% end %>
 

-    <h2><%= link_to h(diary_entry.title), diary_entry_path(diary_entry.user, diary_entry) %></h2>
-
-    <small class='deemphasize'>
-      <%= raw(t '.posted_by', :link_user => (link_to h(diary_entry.user.display_name), user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to h(diary_entry.language.name), :controller => 'diary_entries', :action => 'index', :display_name => nil, :language => diary_entry.language_code)) %>
+    <small class='text-muted'>
+      <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>
+      <% if (l(diary_entry.updated_at, :format => :blog) != l(diary_entry.created_at, :format => :blog)) %>
+        <%= t(".updated_at_html", :updated => l(diary_entry.updated_at, :format => :blog)) %>
+      <% end %>

     </small>
 
   </div>
 
     </small>
 
   </div>
 

-  <div class="richtext" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
+  <div class="richtext text-break" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">

     <%= diary_entry.body.to_html %>
   </div>
 
     <%= diary_entry.body.to_html %>
   </div>
 


@@ -20,27 +30,39 @@
     <%= render :partial => "location", :object => diary_entry %>
   <% end %>
 
     <%= render :partial => "location", :object => diary_entry %>
   <% end %>
 

-  <ul class='secondary-actions clearfix'>
-    <% if params[:action] == 'index' %>
-      <li><%= link_to t('.comment_link'), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'newcomment') %></li>
-      <li><%= link_to t('.reply_link'), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>
-      <li><%= link_to t('.comment_count', :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => 'comments') %></li>
-    <% end %>
+  <nav class='secondary-actions'>
+    <ul class='clearfix'>
+      <% if params[:action] == 'index' %>
+        <li><%= link_to t(".comment_link"), diary_entry_path(diary_entry.user, diary_entry, :anchor => "newcomment") %></li>
+        <li><%= link_to t(".reply_link"), new_message_path(diary_entry.user, :message => { :title => "Re: #{diary_entry.title}" }) %></li>
+        <li>
+          <% if diary_entry.visible_comments.count > 0 %>
+            <%= link_to t(".comment_count", :count => diary_entry.visible_comments.count), diary_entry_path(diary_entry.user, diary_entry, :anchor => "comments") %>
+          <% else %>
+            <%= link_to t(".no_comments"), diary_entry_path(diary_entry.user, diary_entry, :anchor => "comments") %>
+          <% end %>
+        </li>
+      <% end %>

 
 

-    <% if current_user && current_user == diary_entry.user %>
-      <li><%= link_to t('.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></li>
-    <% end %>
+      <% if current_user && current_user == diary_entry.user %>
+        <li><%= link_to t(".edit_link"), :action => "edit", :display_name => diary_entry.user.display_name, :id => diary_entry.id %></li>
+      <% end %>

 
 

-    <% if current_user and diary_entry.user != current_user %>
-      <li>
-        <%= report_link(t(".report"), diary_entry) %>
-      </li>
-    <% end %>
+      <% if current_user and diary_entry.user != current_user %>
+        <li>
+          <%= report_link(t(".report"), diary_entry) %>
+        </li>
+      <% end %>

 
 

-    <% if current_user && current_user.administrator? %>
-      <li>
-        <%= link_to t('.hide_link'), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t('.confirm') } %>
-      </li>
-    <% end %>
-  </ul>
-</div>
+      <% if can? :hide, DiaryEntry %>
+        <li>
+          <% if diary_entry.visible %>
+            <%= link_to t(".hide_link"), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t(".confirm") } %>
+          <% else %>
+            <%= link_to t(".unhide_link"), unhide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t(".confirm") } %>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </nav>
+</article>