diff --git a/css/thread.css b/css/thread.css index 83f24571cc3f948225b681a1bad85d9faeb26823..14c0c694d7ce5e76346027181ef3404ee79506e6 100644 --- a/css/thread.css +++ b/css/thread.css @@ -396,7 +396,21 @@ line-height: 1.25rem; } -.thread-body div:not(.caption), +/* Adjust plain/text messages posted as <pre> in the thread body to show in + * a more normal font. Other <pre> elements in the ticket thread body should + * be shown with the ususal monospace font + */ +.thread-body > div > pre:first-child { + font-family: sans-serif; +} + +/* Avoid extra padding at the bottom of the thread body element */ +.thread-body :last-child, +.thread-body > div { + margin-bottom: 0 !important; +} + +.thread-body > div div:not(.caption), .thread-body p, .thread-body ul, .thread-body ol, @@ -451,6 +465,19 @@ table.thread-entry { table-layout: fixed; } +table.thread-entry th div span { + vertical-align: middle; +} +table.thread-entry th div :not(.title) { + font-weight: 600; +} +table.thread-entry th div .title { + font-weight: 400; +} +table.thread-entry th .textra { + margin-right: 1em; + display: inline-block; +} /* Inline image hovering with download link */ .image-hover { display: inline-block; diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php index de1fb3a0f217ac7d788e1ff92315118f3f0828d9..9bc7823ab84d425b00da5dbebfa51dd25d52dfc7 100644 --- a/include/staff/ticket-view.inc.php +++ b/include/staff/ticket-view.inc.php @@ -337,10 +337,20 @@ $tcount+= $ticket->getNumNotes(); ?> <table class="thread-entry <?php echo $threadTypes[$entry['thread_type']]; ?>" cellspacing="0" cellpadding="1" width="940" border="0"> <tr> - <th width="auto"><?php echo Format::db_datetime($entry['created']);?></th> - <th width="440"><span><?php echo $entry['title']; ?></span></th> - <th width="auto" class="textra" style="text-align:right"></th> - <th width="auto" class="tmeta"><?php echo Format::htmlchars($entry['poster']); ?></th> + <th colspan="4" width="100%"> + <div> + <span style="display:inline-block"><?php + echo Format::db_datetime($entry['created']);?></span> + <span style="display:inline-block;padding-left:1em" class="faded title"><?php + echo Format::truncate($entry['title'], 100); ?></span> + <span style="float:right;white-space:no-wrap;display:inline-block"> + <span style="vertical-align:middle;" class="textra"></span> + <span style="vertical-align:middle;" + class="tmeta faded title"><?php + echo Format::htmlchars($entry['poster']); ?></span> + </span> + </div> + </th> </tr> <tr><td colspan="4" class="thread-body" id="thread-id-<?php echo $entry['id']; ?>"><div><?php diff --git a/scp/css/scp.css b/scp/css/scp.css index 5940284adfc8eb2bc4a228c3c615c3206764fc72..d3eaceb6637dec2e8e7071a371c6c74635cee883 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -803,21 +803,6 @@ h2 .reload { text-align:right; } -#ticket_thread table th.tmeta { - font-weight:bold; - font-size:10pt; - color:#888; - text-align:right; - padding-right:15px; -} - -#ticket_thread table th span { - font-weight:normal; - font-size:10pt; - color:#888; - padding-left:5px; -} - #ticket_thread > .message th { background:#C3D9FF; }