diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb index 6a8e879ee..cad47e6c6 100644 --- a/app/views/admin/sites/preference.html.erb +++ b/app/views/admin/sites/preference.html.erb @@ -192,6 +192,32 @@ + +
+ +
+ +
+
+ <% if @site.favicon %> + <%= image_tag( @site.favicon, :size=>"120x120") rescue ''%> + <% else %> + + <% end %> +
+
+ + <% if @site.favicon.file.present?%> + <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Change + <%else%> + <%= f.file_field :favicon, :id => "input-upload", :class => 'fileupload-new', :onchange => "document.getElementById('fu').innerHTML = this.form.fu.value = this.value;" %>Select Image + <%end%> + + Cancel + +
+
+
diff --git a/app/views/layouts/_left_menu.html.erb b/app/views/layouts/_left_menu.html.erb index 0b3aa139a..772f33892 100644 --- a/app/views/layouts/_left_menu.html.erb +++ b/app/views/layouts/_left_menu.html.erb @@ -28,8 +28,7 @@ -<% @url_path = "#{request.fullpath}".scan(/admin/)%> -<% if (@site.default_image.present? && (!@url_path.include? "admin"))%> +<% if @site.default_image.present?%>