From 0a69bbb65346333bbee175860b4bd9abd83fbee8 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Tue, 22 Oct 2013 10:33:05 +0800 Subject: [PATCH] Updated Favicon display and wording --- app/views/admin/sites/preference.html.erb | 6 +++--- app/views/layouts/_meta.html.erb | 4 ++++ app/views/layouts/page_layout.html.erb | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb index 0b65d171..102d18f7 100644 --- a/app/views/admin/sites/preference.html.erb +++ b/app/views/admin/sites/preference.html.erb @@ -182,7 +182,7 @@ <% if @site.default_image %> <%= image_tag( @site.default_image, :size=>"120x120") rescue ''%> <% else %> - + <%= image_tag "default-img.png", :class => "pull-left upload-picture"%> <% end %>
@@ -191,7 +191,7 @@ <%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Change <%= f.check_box :remove_default_image %> - Remove Favicon + Remove OrbitBar Logo <%else%> <%= f.file_field :default_image, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Select Image @@ -211,7 +211,7 @@ <% if @site.favicon %> <%= image_tag( @site.favicon, :size=>"120x120") rescue ''%> <% else %> - + <%= image_tag "default-img.png", :class => "pull-left upload-picture"%> <% end %>
diff --git a/app/views/layouts/_meta.html.erb b/app/views/layouts/_meta.html.erb index a00bb812..912a8f76 100644 --- a/app/views/layouts/_meta.html.erb +++ b/app/views/layouts/_meta.html.erb @@ -1,4 +1,8 @@ +<% if @site.favicon%> + +<% else %> +<% end %> diff --git a/app/views/layouts/page_layout.html.erb b/app/views/layouts/page_layout.html.erb index 6c0fb799..0d45f343 100644 --- a/app/views/layouts/page_layout.html.erb +++ b/app/views/layouts/page_layout.html.erb @@ -1,6 +1,7 @@ +<%= render 'layouts/meta' %> <%= page_title(@item).html_safe %> ">