diff options
| -rw-r--r-- | app/views/layouts/default.rhtml | 2 | ||||
| -rw-r--r-- | app/views/public_body/show.rhtml | 3 | ||||
| -rw-r--r-- | app/views/request/new.rhtml | 8 | ||||
| -rw-r--r-- | app/views/request/select_authority.rhtml | 4 | ||||
| -rw-r--r-- | app/views/user/_signin.rhtml | 4 | ||||
| -rw-r--r-- | app/views/user/_signup.rhtml | 4 | ||||
| -rw-r--r-- | app/views/user/signin_successful.rhtml | 4 |
7 files changed, 13 insertions, 16 deletions
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index c802e7d45..6551095c2 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -58,7 +58,7 @@ <!-- XXX: move to a separate file --> <% if force_registration_on_new_request && !@user %> <%= javascript_include_tag 'jquery.fancybox-1.3.4.pack' %> - <script> + <script type="text/javascript"> $(document).ready(function() { $("#make-request-link").fancybox({ 'modal': false, diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index 7091e2eec..ab8eb3826 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -1,6 +1,5 @@ <% @title = h(@public_body.name) + " - view and make Freedom of Information requests" %> <div id="main_content"> -<div> <div id="header_right"> <h2><%= _('Follow this authority')%></h2> @@ -120,5 +119,3 @@ <% end %> <p> <%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests that have been made to this authority.')%></p> <% end %> -</div> -</div> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index cd748b6c2..9adf5d383 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -1,5 +1,5 @@ <script type="text/javascript" src="/javascripts/ba-throttle-debounce.js"></script> -<script> +<script type="text/javascript"> $(document).ready(function(){ // Avoid triggering too often (on each keystroke) by using the debounce jQuery plugin: // http://benalman.com/projects/jquery-throttle-debounce-plugin/ @@ -28,7 +28,7 @@ <% form_for(:info_request, @info_request, :html => { :id => 'write_form' } ) do |f| %> <div id="request_header"> - <p> + <div> <label class="form_label" for="info_request_public_body_id"><%= _('To:') %></label> <span id="to_public_body"><%=h(@info_request.public_body.name)%></span> <div class="form_item_note"> @@ -38,7 +38,7 @@ <%= _("Browse <a href='{{url}}'>other requests</a> for examples of how to word your request.", :url=>request_list_url) %> <% end %> </div> - </p> + </div> <div id="request_header_text"> <% if @info_request.public_body.has_notes? %> @@ -72,7 +72,7 @@ </div> <p> - <label class="form_label" for="info_request_title"><%= _('Summary:') %></label> + <label class="form_label" for="typeahead_search"><%= _('Summary:') %></label> <%= f.text_field :title, :size => 50, :id =>"typeahead_search" %> </p> <div class="form_item_note"> diff --git a/app/views/request/select_authority.rhtml b/app/views/request/select_authority.rhtml index 802fefec6..5f9ebfd85 100644 --- a/app/views/request/select_authority.rhtml +++ b/app/views/request/select_authority.rhtml @@ -1,5 +1,5 @@ <script type="text/javascript" src="/javascripts/ba-throttle-debounce.js"></script> -<script> +<script type="text/javascript"> $(document).ready(function(){ $("#authority_preview").hide(); @@ -47,4 +47,4 @@ <div id="authority_preview"> </div> -
\ No newline at end of file + diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml index a7cfdf28a..4fe98ee41 100644 --- a/app/views/user/_signin.rhtml +++ b/app/views/user/_signin.rhtml @@ -27,8 +27,8 @@ do not use on a public computer) ')%></p> <div class="form_button"> - <%= hidden_field_tag 'token', params[:token], { :id => 'signin_token' } %> - <%= hidden_field_tag :modal, params[:modal] %> + <%= hidden_field_tag 'token', params[:token], {:id => 'signin_token' } %> + <%= hidden_field_tag :modal, params[:modal], {:id => 'signin_modal' } %> <%= submit_tag _('Sign in') %> </div> <% end %> diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml index 791226586..9c0132f26 100644 --- a/app/views/user/_signup.rhtml +++ b/app/views/user/_signup.rhtml @@ -41,8 +41,8 @@ <% end %> <div class="form_button"> - <%= hidden_field_tag 'token', params[:token], { :id => 'signup_token' } %> - <%= hidden_field_tag :modal, params[:modal] %> + <%= hidden_field_tag 'token', params[:token], {:id => 'signup_token' } %> + <%= hidden_field_tag :modal, params[:modal], {:id => 'signup_modal' } %> <%= submit_tag _('Sign up') %> </div> diff --git a/app/views/user/signin_successful.rhtml b/app/views/user/signin_successful.rhtml index 762bfa763..8c4b2b2d4 100644 --- a/app/views/user/signin_successful.rhtml +++ b/app/views/user/signin_successful.rhtml @@ -1,9 +1,9 @@ <%= _("You're in. <a href=\"#\" id=\"send-request\">Continue sending your request</a>") %> -<script> +<script type="text/javascript"> parent.modal_signin_successful = true; $("#send-request").click(function() { parent.$.fancybox.close(); return false; }); -</script>
\ No newline at end of file +</script> |