from_scratch
Wojciech Todryk 2011-09-03 16:25:19 +02:00
parent fdd3019f55
commit 910a6f3bc0
6 changed files with 2 additions and 2 deletions

View File

@ -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

BIN
arts/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
arts/favicon.xcf Normal file

Binary file not shown.

BIN
public/favicon.ico Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 0 B

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -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') %>
<link rel="icon" type="image/x-icon" href="/favicon.ico"/>
</head>
<body>
<div id="container">

View File

@ -27,7 +27,6 @@
<%= render :partial => 'html_part' %>
<% else %>
<div class="render_text">
<span><%= t(:content,:scope=>:message) %></span>
<% if @text_part.nil? %>
<p>
<%= t(:no_content,:scope => :message) %>