diff options
| author | David Cabo <david@calibea.com> | 2011-08-23 00:52:17 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-23 00:52:17 +0200 |
| commit | 51e4b941fd15c23eb06d7f332dd3b38aae769a1c (patch) | |
| tree | 1b9de38d2b79fa158ec6e46ce5801e01f08edda4 | |
| parent | 1d41866cd8a93e28bf8cdbcc1745d2d2fd037c6f (diff) | |
Improve layout of public body page when embedded via AJAX
| -rw-r--r-- | app/views/public_body/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/select_authority.rhtml | 3 | ||||
| -rw-r--r-- | public/stylesheets/main.css | 12 |
3 files changed, 9 insertions, 8 deletions
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 5e6c52984..372a1558c 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -1,7 +1,6 @@ <% @title = h(@public_body.name) + " - view and make Freedom of Information requests" %> <div id="main_content"> <div> -<% unless params[:narrow_layout] # XXX: not ideal %> <div id="header_right"> <h2><%= _('Track this authority')%></h2> <%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %> @@ -23,7 +22,6 @@ <% end %> <%= link_to _('View FOI email address'), view_public_body_email_url(@public_body.url_name) %><br> </div> -<% end %> <div id="header_left"> <h1><%=h(@public_body.name)%></h1> diff --git a/app/views/request/select_authority.rhtml b/app/views/request/select_authority.rhtml index 68bb34a64..802fefec6 100644 --- a/app/views/request/select_authority.rhtml +++ b/app/views/request/select_authority.rhtml @@ -13,8 +13,9 @@ // We're using the existing body list: we intercept the clicks on the titles to // display a preview on the right hand side of the screen $("#typeahead_response a").click(function() { - $("#authority_preview").load(this.href+"?narrow_layout=1 #main_content", function() { + $("#authority_preview").load(this.href+" #main_content", function() { $("#authority_preview").show(); + $("#authority_preview #header_right").hide(); }); return false; }); diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css index 0eab9aafb..e9b687f04 100644 --- a/public/stylesheets/main.css +++ b/public/stylesheets/main.css @@ -933,7 +933,7 @@ a img.attachment_image { #authority_selection { float: left; - width: 30em; + width: 40%; } #authority_search_ahead_results @@ -943,18 +943,20 @@ a img.attachment_image { #authority_preview { - width: 36em; + width: 45%; float: right; background-color: #FFFFE0; padding-left: 1em; padding-right: 1em; + overflow: hidden; } + #authority_preview #header_left, + #authority_preview.request_left, #authority_preview #stepwise_make_request { - margin: 0; - } - + width: 95%; + } /*------------------------------------------------ making a request / sign up / sign in */ |