diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/general/search.rhtml | 2 | ||||
| -rw-r--r-- | app/views/public_body/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request/new.rhtml | 4 | ||||
| -rw-r--r-- | app/views/user/_signin.rhtml | 4 | ||||
| -rw-r--r-- | app/views/user/_signup.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user/sign.rhtml | 21 |
6 files changed, 22 insertions, 13 deletions
diff --git a/app/views/general/search.rhtml b/app/views/general/search.rhtml index cc522b367..18d398c08 100644 --- a/app/views/general/search.rhtml +++ b/app/views/general/search.rhtml @@ -16,7 +16,7 @@ <% if @bodies %> <%= hidden_field_tag 'bodies', 1 %> <% end %> - <%= image_submit_tag 'button-search.png', :title=>"Search" %> + <%= submit_tag _("Search") %> <% if not @show_tips %> <%= link_to _('Advanced search tips'), search_redirect_path %> <% end %> diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml index cfdf37935..6215d7a0c 100644 --- a/app/views/public_body/show.rhtml +++ b/app/views/public_body/show.rhtml @@ -49,7 +49,7 @@ <% else %> Make a new <strong>Freedom of Information</strong> request <% end %> - <%= _('<a href="{{url}}">{{image_tag}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :image_tag=>image_tag('start-button.png'))%> + <%= _(' <a class="link_button_green" href="{{url}}">{{text}}</a>', :url=>new_request_to_body_url(:url_name => @public_body.url_name), :text=>_("Start"))%> <% elsif @public_body.has_notes? %> <%= @public_body.notes_as_html %> <% elsif @public_body.not_requestable_reason == 'not_apply' %> diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index 867f5c2f9..ddb9bd046 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -30,7 +30,7 @@ <br> <%= text_field_tag 'q', params[:q], { :size => 20 } %> <%= hidden_field_tag 'as_sitesearch', @info_request.public_body.calculated_home_page %> - <%= submit_tag _("Search") %> + <%= submit_tag _("Search"), :class=>"small" %> <% end %> <br> ... <%= _('to check that the info isn\'t already published.') %> @@ -136,7 +136,7 @@ <%= f.hidden_field(:public_body_id, { :value => @info_request.public_body_id } ) %> <%= hidden_field_tag(:submitted_new_request, 1 ) %> <%= hidden_field_tag(:preview, 1 ) %> - <%= image_submit_tag "button-preview.png", :title=>"Preview your public request" %> + <%= submit_tag _("Preview your public request") %> </div> <% if !@info_request.tag_string.empty? %> diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml index 79628b3a9..6baed3c25 100644 --- a/app/views/user/_signin.rhtml +++ b/app/views/user/_signin.rhtml @@ -3,9 +3,9 @@ <% form_tag({:action => "signin"}, {:id => "signin_form"}) do %> <%= foi_error_messages_for :user_signin %> - <% if not sign_in_as_existing_user %> + <!--<% if not sign_in_as_existing_user %> <h2><%= _('If you\'ve used {{site_name}} before', :site_name=>site_name)%></h2> - <% end %> + <% end %>--> <p> <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label> diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml index 6b0a1f8c7..9c228d684 100644 --- a/app/views/user/_signup.rhtml +++ b/app/views/user/_signup.rhtml @@ -3,7 +3,7 @@ <% form_tag({:action => "signup"}, {:id => "signup_form"}) do %> <%= foi_error_messages_for :user_signup %> - <h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2> + <!--<h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>--> <p> <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label> diff --git a/app/views/user/sign.rhtml b/app/views/user/sign.rhtml index b76edbc64..1140d961a 100644 --- a/app/views/user/sign.rhtml +++ b/app/views/user/sign.rhtml @@ -21,17 +21,26 @@ <div id="sign_together"> - <p id="sign_in_reason"> + <!--<p id="sign_in_reason"> <% if @post_redirect.reason_params[:web].empty? %> <%= _(' Please sign in or make a new account.') %> <% else %> <%= @post_redirect.reason_params[:web] %>, <%= _('please sign in or make a new account.') %> <% end %> - </p> - - <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %> - <%= render :partial => 'signup' %> - + </p>--> + + <div id="left_half"> + <h1>Sign in</h1> + <%= render :partial => 'signin', :locals => { :sign_in_as_existing_user => false } %> + </div> + <div id="middle_strip"> + - or - + </div> + <div id="right_half"> + <h1>Sign up</h2> + <%= render :partial => 'signup' %> + </div> + <div style="clear:both"></div> </div> <% end %> |