summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
2190aad)
This change uses the bootstrap grid to make the issues page responsive,
and avoids having lots of custom widths of divs specified via CSS.
It also changes the display of the reports and comments to be more
like diary entry comments, by having all metadata on one line and shown
before the comment / report text.
-.report-related-block {
- display:inline-block;
-}
-
-.report-block {
- width:475px;
- float:left;
- margin-right:100px;
-}
-
- width: 280px;
- float: right;
-
ul {
padding-left: $lineheight;
margin-bottom: 0;
ul {
padding-left: $lineheight;
margin-bottom: 0;
-.issue-comments {
- width:475px;
-}
-
.issues-list {
td:nth-child(2) {
white-space: nowrap;
.issues-list {
td:nth-child(2) {
white-space: nowrap;
<div class="issue-comments">
<% comments.each do |comment| %>
<div class="comment">
<div class="issue-comments">
<% comments.each do |comment| %>
<div class="comment">
- <div style="float:left">
+ <div class="float-left">
<%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
</div>
<%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
</div>
- <b> <%= link_to comment.user.display_name, user_path(comment.user) %> </b> <br />
- <%= comment.body %>
+ <p class="text-muted mb-0">
+ <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
+ :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
+ </p>
+ <p><%= comment.body %></p>
- <span class="deemphasize">
- <%= t(".created_at", :datetime => l(comment.created_at.to_datetime, :format => :friendly)) %>
- </span>
<% reports.each do |report| %>
<div class="report">
<% reports.each do |report| %>
<div class="report">
- <div style="float:left">
+ <div class="float-left">
<%= link_to user_thumbnail(report.user), user_path(report.user) %>
</div>
<%= link_to user_thumbnail(report.user), user_path(report.user) %>
</div>
- <%= t ".reported_by_html", :category => report.category, :user => link_to(report.user.display_name, user_path(report.user)) %>
- <br />
- <span class="deemphasize">
- <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
- </span>
- <br />
- <%= report.details %>
- <br />
+ <p class="text-muted mb-0">
+ <%= t ".reported_by_html", :category => report.category,
+ :user => link_to(report.user.display_name, user_path(report.user)),
+ :updated_at => l(report.updated_at.to_datetime, :format => :friendly) %>
+ </p>
+ <p><%= report.details %></p>
<p><%= link_to t(".reopen"), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
<% end %>
<p><%= link_to t(".reopen"), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
<% end %>
-<div class="report-related-block">
-
- <div class="report-block">
+<div class="row">
+ <div class="col-md-8">
<h3><%= t ".reports_of_this_issue" %></h3>
<% if @read_reports.present? %>
<h3><%= t ".reports_of_this_issue" %></h3>
<% if @read_reports.present? %>
<%= render "reports", :reports => @unread_reports %>
</div>
<% end %>
<%= render "reports", :reports => @unread_reports %>
</div>
<% end %>
</div>
<% if @issue.reported_user %>
</div>
<% if @issue.reported_user %>
- <div class="related-reports">
+ <div class="col-md-4 related-reports">
<h3><%= t ".other_issues_against_this_user" %></h3>
<% if @related_issues.count > 1 %>
<ul>
<h3><%= t ".other_issues_against_this_user" %></h3>
<% if @related_issues.count > 1 %>
<ul>
reopen:
reopened: Issue status has been set to 'Open'
comments:
reopen:
reopened: Issue status has been set to 'Open'
comments:
- created_at: "On %{datetime}"
+ comment_from_html: "Comment from %{user_link} on %{comment_created_at}"
reassign_param: Reassign Issue?
reports:
reassign_param: Reassign Issue?
reports:
- updated_at: "On %{datetime}"
- reported_by_html: "Reported as %{category} by %{user}"
+ reported_by_html: "Reported as %{category} by %{user} on %{updated_at}"
helper:
reportable_title:
diary_comment: "%{entry_title}, comment #%{comment_id}"
helper:
reportable_title:
diary_comment: "%{entry_title}, comment #%{comment_id}"