diff options
| -rw-r--r-- | app/views/request/_correspondence.rhtml | 6 | ||||
| -rw-r--r-- | app/views/request/show.rhtml | 14 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 12 |
3 files changed, 15 insertions, 17 deletions
diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml index 1943d2de8..090f5a728 100644 --- a/app/views/request/_correspondence.rhtml +++ b/app/views/request/_correspondence.rhtml @@ -35,12 +35,6 @@ elsif [ 'sent', 'followup_sent' ].include?(info_request_event.event_type) %> <div class="correspondence" id="outgoing-<%=outgoing_message.id.to_s%>"> - <% if @info_request.user.profile_photo %> - <p class="user_photo_on_correspondence"> - <img src="<%= get_profile_photo_url(:url_name => @info_request.user.url_name) %>"> - </p> - <% end %> - <h2> <%=h @info_request.user.name %><br> <br><%= simple_date(info_request_event.created_at) %> diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml index 97dc32512..b08dd04ac 100644 --- a/app/views/request/show.rhtml +++ b/app/views/request/show.rhtml @@ -25,15 +25,19 @@ <div id="request_main"> <h1><%=@title%></h1> + <% if @info_request.user.profile_photo %> + <p class="user_photo_on_request"> + <img src="<%= get_profile_photo_url(:url_name => @info_request.user.url_name) %>"> + </p> + <% end %> + <p class="subtitle"> - <%=h @info_request.law_used_with_a%> + <%= user_link(@info_request.user) %> made this <% if !@user.nil? && @user.admin_page_links? %> (<%= link_to "admin", request_admin_url(@info_request) %>) <% end %> - to - <%= public_body_link(@info_request.public_body) %> - by - <%= user_link(@info_request.user) %> + <%=h @info_request.law_used_full%> + request to <%= public_body_link(@info_request.public_body) %> </p> <p id="request_status" class="request_icon_line icon_<%= @info_request.calculate_status %>"> diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 2beeca16b..62bc217bd 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -529,6 +529,7 @@ dd { margin: 0.6em 0 2em 4em; width: 33em; } background-position: left center; min-height: 24px; padding: 8px 0 10px 42px; + clear: left; } /* Waiting */ @@ -1125,14 +1126,13 @@ div.act_link img { padding: 2px; } -.user_photo_on_correspondence img { - width: 48px; - height: 48px; - float: right; +.user_photo_on_request img { + width: 48px; + height: 48px; + float: left; vertical-align: middle; - text-align: center; border: 1px solid #dddddd; - margin-left: 5px; + margin-right: 5px; padding: 2px; } |