From 6a23fccef5a26bd06ecbf70e908189eb6a21b98e Mon Sep 17 00:00:00 2001 From: Peter Rotich <peter@osticket.com> Date: Sat, 28 Apr 2012 11:49:17 -0400 Subject: [PATCH] Add inline notes support --- scp/css/scp.css | 60 ++++++++++++++++++------------------------------ scp/js/ticket.js | 2 +- 2 files changed, 23 insertions(+), 39 deletions(-) diff --git a/scp/css/scp.css b/scp/css/scp.css index c5eb222ba..1964dfe80 100644 --- a/scp/css/scp.css +++ b/scp/css/scp.css @@ -689,41 +689,6 @@ h2 .reload { background:url(../images/icons/note.gif) 10px 50% no-repeat; } -#latest_notes { - margin:10px 0; - padding:10px; - background:#ffe; - border:1px solid #e7e765; -} - -#latest_notes h3 { - margin:0 0 10px 0; - padding:0; - font-size:11pt; -} - -#latest_notes h3 span, #latest_notes h3 a { - color:#777; - font-weight:normal; - text-decoration:none; - font-size:10pt; -} - -#latest_notes ul { - margin:0 20px; - padding:0; -} - -#latest_notes ul li { - margin:0; - padding:0 0 10px 0; - list-style:none; -} - -#latest_notes em { - color:#777; -} - #ticket_thread table { margin-top:10px; border:1px solid #aaa; @@ -757,21 +722,40 @@ h2 .reload { color:#666; } -#ticket_thread .message th { - background:#C3D9FF; +#ticket_notes .date { + font-weight:normal; + font-size:10pt; + color:#888; + text-align:right; } -#ticket_notes .date { +#ticket_thread table th.tmeta { font-weight:normal; 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:15px; +} + +#ticket_thread .message th { + background:#C3D9FF; } #ticket_thread .response th { background:#FFE0B3; } +#ticket_thread .note th { + background:#FFE; +} + #ticket_thread table td, #ticket_notes table td { padding:5px; } diff --git a/scp/js/ticket.js b/scp/js/ticket.js index f981bae07..22a97d623 100644 --- a/scp/js/ticket.js +++ b/scp/js/ticket.js @@ -264,7 +264,7 @@ jQuery(function($) { if(location.hash != "" && $('#response_options '+location.hash).length) { $('#response_options '+location.hash+'_tab').addClass('active'); $('#response_options '+location.hash).show(); - } else if(location.hash == "#notes") { + } else if(location.hash == "#notes" && $('#ticket_notes').length) { $('#response_options #note_tab').addClass('active'); $('#response_options form').hide(); $('#response_options #note').show(); -- GitLab