From 5966792af5f61d9dd65ff83bfd264e8a8098d307 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Sat, 29 Sep 2012 09:10:09 -0700 Subject: [PATCH] Extract home_link partial --- app/views/site/_home_link.html.erb | 5 +++++ app/views/site/edit.html.erb | 7 +------ app/views/site/index.html.erb | 7 +------ 3 files changed, 7 insertions(+), 12 deletions(-) create mode 100644 app/views/site/_home_link.html.erb diff --git a/app/views/site/_home_link.html.erb b/app/views/site/_home_link.html.erb new file mode 100644 index 000000000..615200b5e --- /dev/null +++ b/app/views/site/_home_link.html.erb @@ -0,0 +1,5 @@ +<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> + <% content_for :greeting do %> + <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> | + <% end %> +<% end %> diff --git a/app/views/site/edit.html.erb b/app/views/site/edit.html.erb index dadb9e4e5..f99f17f1e 100644 --- a/app/views/site/edit.html.erb +++ b/app/views/site/edit.html.erb @@ -9,12 +9,7 @@

<%= raw t 'site.edit.not_public_description', :user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %>

<%= raw t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edits_link_text'), t('site.edit.anon_edits_link')) %>

<% else %> -<% content_for :greeting do %> -<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> -<%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> | -<% end %> -<% end %> - +<%= render :partial => 'home_link' %> <%= render :partial => 'sidebar' %> <%= render :partial => 'search' %> diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index 3adc55f55..5c470ca89 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -2,18 +2,13 @@ <%= javascript_include_tag "index" %> <% end %> -<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %> - <% content_for :greeting do %> - <%= link_to t("layouts.home"), "#", :class => "set_position", :data => { :lat => @user.home_lat, :lon => @user.home_lon, :zoom => 15 }, :title => t("layouts.home_tooltip") %> | - <% end %> -<% end %> - <% unless STATUS == :api_offline or STATUS == :database_offline -%> <% content_for :editmenu do -%>
  • <%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %>
  • <% end -%> <% end -%> +<%= render :partial => 'home_link' %> <%= render :partial => 'sidebar' %> <%= render :partial => 'key' %> <%= render :partial => 'search' %> -- 2.43.2