Merge branch 'master' of github.com:zwagoth/e621ng

This commit is contained in:
Earlopain 2021-11-02 16:43:17 +01:00
commit 163c8cc874
No known key found for this signature in database
GPG Key ID: 6CFB948E15246897
2 changed files with 58 additions and 52 deletions

View File

@ -13,6 +13,16 @@ table.table {
tr {
td {
padding: $padding-050 $padding-025;
&.full-width-link {
padding: 0;
> a {
width: 100%;
display: inline-block;
padding: $padding-050 $padding-025;
}
}
}
@include themable {
background-color: themed("color-section");

View File

@ -1,13 +1,9 @@
<div id="c-tickets">
<div id="a-index">
<%= render partial: 'search' %>
</div>
</div>
<%= render partial: 'search' %>
<h2>Ticket Center</h2>
<table class="valign striped">
<h2>Ticket Center</h2>
<table class="valign striped">
<thead>
<tr>
<th style="width:5%">ID</th>
@ -28,9 +24,7 @@
<tr data-link="<%= ticket_path(ticket) %>">
<td><%= link_to ticket.id, ticket_path(ticket) %></td>
<% if CurrentUser.is_admin? %>
<td>
<%= link_to_user ticket.creator %>
</td>
<td><%= link_to_user ticket.creator %></td>
<td>
<% if ticket.claimant.nil? %>
<span class="redtext">Unclaimed</span>
@ -44,7 +38,7 @@
<% if !ticket.can_see_reason?(CurrentUser.user) %>
<td><span style="cursor:help;" class="redtext" title="Due to privacy concerns, this information is confidential">Confidential</span></td>
<% else %>
<td class="ticket-subject" title="<%= h(truncate(strip_dtext(ticket.reason), length: 200)) %>"><%= link_to h(strip_dtext(truncate(ticket.subject, length: 200))), action: "show", id: ticket.id %></td>
<td class="ticket-subject full-width-link" title="<%= h(truncate(strip_dtext(ticket.reason), length: 200)) %>"><%= link_to h(strip_dtext(truncate(ticket.subject, length: 200))), action: "show", id: ticket.id %></td>
<% end %>
<td class="<%= ticket.status %>-ticket"><%= pretty_ticket_status(ticket) %></td>
@ -53,10 +47,12 @@
</tr>
<% end %>
</tbody>
</table>
</table>
<div id="paginator">
<div id="paginator">
<%= numbered_paginator(@tickets) %>
</div>
</div>
</div>
<% render partial: 'secondary_links' %>