diff options
| -rw-r--r-- | app/views/request/_correspondence.rhtml | 12 | ||||
| -rw-r--r-- | public/images/stripes-70-light.png | bin | 0 -> 260 bytes | |||
| -rw-r--r-- | public/images/stripes-70-light2.png | bin | 0 -> 263 bytes | |||
| -rw-r--r-- | public/stylesheets/theme.css | 7 |
4 files changed, 12 insertions, 7 deletions
diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml index 280e8f50e..9a198ad7d 100644 --- a/app/views/request/_correspondence.rhtml +++ b/app/views/request/_correspondence.rhtml @@ -6,11 +6,10 @@ end if not incoming_message.nil? %> - <div class="correspondence" id="incoming-<%=incoming_message.id.to_s%>"> - <% foi_cache(:controller => "request", :action => "show_response", :id => @info_request.id, :incoming_message_id => incoming_message.id, :only_path => true, :template => "_correspondence", :section => "incoming_message_bubble", :collapse => @collapse_quotes ? nil : 'no' ) do %> + <div class="incoming correspondence" id="incoming-<%=incoming_message.id.to_s%>"> <h2> <% if !incoming_message.safe_mail_from.nil? && incoming_message.safe_mail_from.strip != @info_request.public_body.name.strip %> - <%=h incoming_message.safe_mail_from %><br> + <%= _("From:") %> <%=h incoming_message.safe_mail_from %><br> <% end %> <% if incoming_message.safe_mail_from.nil? || (incoming_message.mail_from_domain == @info_request.public_body.request_email_domain) %> <%=h @info_request.public_body.name %><br> @@ -19,7 +18,6 @@ if not incoming_message.nil? </h2> <%= render :partial => 'bubble', :locals => { :incoming_message => incoming_message, :body => incoming_message.get_body_for_html_display(@collapse_quotes), :attachments => incoming_message.get_attachments_for_display } %> - <% end %> <p class="event_actions"> <% if !@user.nil? && @user.admin_page_links? %> @@ -32,10 +30,10 @@ if not incoming_message.nil? elsif [ 'sent', 'followup_sent' ].include?(info_request_event.event_type) outgoing_message = info_request_event.outgoing_message %> - <div class="correspondence" id="outgoing-<%=outgoing_message.id.to_s%>"> + <div class="outgoing correspondence" id="outgoing-<%=outgoing_message.id.to_s%>"> <h2> - <%=h @info_request.user.name %><br> + <%= _("From:") %> <%=h @info_request.user.name %><br> <br><%= simple_date(info_request_event.created_at) %> </h2> @@ -57,7 +55,7 @@ elsif [ 'sent', 'followup_sent' ].include?(info_request_event.event_type) </p> </div> <% elsif [ 'resent', 'followup_resent' ].include?(info_request_event.event_type) %> - <div class="correspondence" id="outgoing-<%=outgoing_message.id.to_s%>"> + <div class="outgoing correspondence" id="outgoing-<%=outgoing_message.id.to_s%>"> <h2> <%= simple_date(info_request_event.created_at) %> </h2> diff --git a/public/images/stripes-70-light.png b/public/images/stripes-70-light.png Binary files differnew file mode 100644 index 000000000..7a0ee575d --- /dev/null +++ b/public/images/stripes-70-light.png diff --git a/public/images/stripes-70-light2.png b/public/images/stripes-70-light2.png Binary files differnew file mode 100644 index 000000000..443442a48 --- /dev/null +++ b/public/images/stripes-70-light2.png diff --git a/public/stylesheets/theme.css b/public/stylesheets/theme.css index 83899563f..d00ccdf3d 100644 --- a/public/stylesheets/theme.css +++ b/public/stylesheets/theme.css @@ -785,6 +785,13 @@ div.comment_in_request { -moz-border-radius: 6px; padding: 4px 20px 0px 9px; } +div.outgoing.correspondence { + background: url(/images/stripes-70-light.png); +} + +div.comment_in_request { + background: url(/images/stripes-70-light2.png); +} div.comment_in_request { margin-left: 50px; |
