diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index f440f40..f65faee 100755 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -135,7 +135,7 @@ class MessagesController < ApplicationController mail.from = @current_user.full_address mail.to = params[:message][:to_addr] mail.body = params[:message][:body] - mail.add_file :filename => 'somefile.png', :content => File.read('/tmp/script_monitor_20110810143216.log') + #mail.add_file :filename => 'somefile.png', :content => File.read('/tmp/script_monitor_20110810143216.log') if params[:send] smtp_server = @current_user.servers.primary_for_smtp diff --git a/arts/favicon.png b/arts/favicon.png new file mode 100644 index 0000000..34d2b60 Binary files /dev/null and b/arts/favicon.png differ diff --git a/arts/favicon.xcf b/arts/favicon.xcf new file mode 100644 index 0000000..0d2ad6a Binary files /dev/null and b/arts/favicon.xcf differ diff --git a/public/favicon.ico b/public/favicon.ico old mode 100755 new mode 100644 index e69de29..ffc053f Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/themes/olive/views/layouts/application.html.erb b/themes/olive/views/layouts/application.html.erb index af0dbda..073d13e 100755 --- a/themes/olive/views/layouts/application.html.erb +++ b/themes/olive/views/layouts/application.html.erb @@ -19,6 +19,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" <%=javascript_include_tag current_theme_javascript_path('rails') %> <%=javascript_include_tag current_theme_javascript_path('application') %> +
diff --git a/themes/olive/views/messages/show.html.erb b/themes/olive/views/messages/show.html.erb index 03dd553..a3a299b 100755 --- a/themes/olive/views/messages/show.html.erb +++ b/themes/olive/views/messages/show.html.erb @@ -27,7 +27,6 @@ <%= render :partial => 'html_part' %> <% else %>
- <%= t(:content,:scope=>:message) %> <% if @text_part.nil? %>

<%= t(:no_content,:scope => :message) %>