cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rearrange issues table and combine some columns.

Browse source
This commit is contained in:
Andy Allan 2018-02-28 14:56:47 +08:00
parent 3006ce9713
commit 05ae0755a4
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/views/issues/index.html.erb
View file

@ -22,24 +22,22 @@
<thead> <thead>
<tr> <tr>
<td><b><%= t ".status" %></b></td> <td><b><%= t ".status" %></b></td>
<td><b><%= t ".number_of_reports" %></b></td> <td><b><%= t ".reports" %></b></td>
<td><b><%= t ".last_updated_at" %></b></td> <td><b><%= t ".reported_item" %></b></td>
<td><b><%= t ".last_updated_by" %></b></td>
<td><b><%= t ".link_to_reports" %></b></td>
<td><b><%= t ".reported_user" %></b></td> <td><b><%= t ".reported_user" %></b></td>
<td><b><%= t ".link_to_reported_instance" %></b></td> <td><b><%= t ".last_updated_by" %></b></td>
<td><b><%= t ".last_updated_at" %></b></td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% @issues.each do |issue| %> <% @issues.each do |issue| %>
<tr> <tr>
<td><%= t "issues.states.#{issue.status}" %></td> <td><%= t "issues.states.#{issue.status}" %></td>
<td style="text-align:center;"><%= issue.reports_count %></td> <td><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
<td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td> <td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
<td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
<td><%= link_to reportable_title(issue.reportable), issue %></td>
<td><%= link_to issue.reported_user.display_name, :controller => :user, :action => :view, :display_name => issue.reported_user.display_name if issue.reported_user %></td> <td><%= link_to issue.reported_user.display_name, :controller => :user, :action => :view, :display_name => issue.reported_user.display_name if issue.reported_user %></td>
<td><%= link_to t(".show_instance"), reportable_url(issue.reportable) %></td> <td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
<td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td>
</tr> </tr>
<% end %> <% end %>
</tbody> </tbody>

10
config/locales/en.yml
View file

@ -924,13 +924,15 @@ en:
user_not_found: User does not exist user_not_found: User does not exist
issues_not_found: No such issues found issues_not_found: No such issues found
status: Status status: Status
show_instance: Show Instance reports: Reports
number_of_reports: Number of Reports
last_updated_at: Last Updated At last_updated_at: Last Updated At
last_updated_by: Last Updated By last_updated_by: Last Updated By
link_to_reports: Link to Reports link_to_reports: View Reports
reported_user: Reported User reported_user: Reported User
link_to_reported_instance: Link to Reported Instance reports_count:
one: "1 Report"
other: "%{count} Reports"
reported_item: Reported Item
create: create:
successful_report: Your report has been registered sucessfully successful_report: Your report has been registered sucessfully
provide_details: Please provide the required details provide_details: Please provide the required details