diff options
| author | Martin Wright <martin@mysociety.org> | 2015-02-26 09:28:19 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-02 16:26:50 +0000 |
| commit | 1283b548c381c431ce0c7a9aa45ced286796e8a8 (patch) | |
| tree | 6cedd4d29fd602c3dec9891f8a8adcb2c3ee114f | |
| parent | 3af2835fb53fa5670e3ae0fc78e39e845b26dab3 (diff) | |
tidy up after merge added missing </div>
remove duplicate request button
| -rw-r--r-- | app/views/public_body/show.html.erb | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/app/views/public_body/show.html.erb b/app/views/public_body/show.html.erb index 5a9c7b012..572878b9f 100644 --- a/app/views/public_body/show.html.erb +++ b/app/views/public_body/show.html.erb @@ -33,10 +33,6 @@ <%= _('You can only request information about the environment from this authority.')%> </p> <% end %> - - <%= link_to _("Make a request to this authority"), - new_request_to_body_path(:url_name => @public_body.url_name), - :class => "link_button_green" %> <% else %> <p class="authority__header__notes"> <%= public_body_not_requestable_reasons(@public_body).first %> @@ -52,6 +48,7 @@ :count => @public_body.info_requests.size) %> </div> <% end %> + <div class="authority__header__action-bar"> <div class="action-bar__make-request"> <% if @public_body.is_requestable? || @public_body.not_requestable_reason == 'bad_contact' %> @@ -60,34 +57,30 @@ <%= @public_body.notes_as_html.html_safe %> <% end %> - <div class="action-bar__follow"> - <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %> - <div class="action-bar__follow-button"> - <% if @existing_track %> - <%= @track_thing.params[:verb_on_page_already] %> - <%= (link_to _("(unsubscribe)"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}) %> - <% else %> - <div class="feed_link"> - <%= link_to _("Follow"), do_track_path(@track_thing), :class => "link_button_green" %> - </div> - <% end %> - - </div> - <div class="action-bar__follower-count"> - <%= n_("{{count}} follower", - "{{count}} followers", - follower_count, - :count => content_tag(:span, follower_count, :id => "follow_count")) %> + <div class="action-bar__follow"> + <% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %> + <div class="action-bar__follow-button"> + <% if @existing_track %> + <%= @track_thing.params[:verb_on_page_already] %> + <%= (link_to _("(unsubscribe)"), {:controller => 'track', :action => 'update', :track_id => @existing_track.id, :track_medium => "delete", :r => request.fullpath}) %> + <% else %> + <div class="feed_link"> + <%= link_to _("Follow"), do_track_path(@track_thing), :class => "link_button_green" %> + </div> + <% end %> + + </div> + <div class="action-bar__follower-count"> + <%= n_("{{count}} follower", + "{{count}} followers", + follower_count, + :count => content_tag(:span, follower_count, :id => "follow_count")) %> + </div> </div> </div> </div> </div> - - - - - <div class="authority__body"> <div class="authority__body__foi-results"> <% if @public_body.info_requests.size == 0 %> |