From da8d0e43891a8f063f75ec997df139bc364aad09 Mon Sep 17 00:00:00 2001 From: Wojciech Todryk Date: Fri, 9 Sep 2011 23:44:51 +0200 Subject: [PATCH] devel --- app/controllers/messages_controller.rb | 17 ++++++++++------- app/controllers/messages_ops_controller.rb | 2 +- app/helpers/messages_helper.rb | 2 +- app/models/message.rb | 15 +++++++++++---- config/locales/pl.yml | 3 +++ themes/olive/stylesheets/base.css | 8 ++++---- themes/olive/stylesheets/style.css | 4 ++-- themes/olive/views/folders/_list.html.erb | 2 +- 8 files changed, 33 insertions(+), 20 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index bb1ca64..56c5214 100755 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -80,12 +80,15 @@ class MessagesController < ApplicationController mail = Mail.new(imap_message) @plain_header = mail.header.to_s - @from = mail.From.addrs - @to = mail.To.addrs - @cc = mail.Cc - @bcc = mail.Bcc + + + # FIXME missing fields + @from = mail.From.addrs.presence + @to = mail.To.addrs.presence + @cc = mail.Cc.presence + @bcc = mail.Bcc.presence #@subject = mail.Subject - @date = mail.date + @date = mail.date.presence if mail.multipart? == true if not mail.text_part.nil? @@ -169,7 +172,7 @@ class MessagesController < ApplicationController def prepare_multi2_buttons @multi2_buttons = [] - @multi2_buttons << {:text => 'delete',:scope=>:message,:image => 'trash.png'} + @multi2_buttons << {:text => 'trash',:scope=>:message,:image => 'trash.png'} @multi2_buttons << {:text => 'set_unread',:scope=>:message,:image => 'unseen.png'} @multi2_buttons << {:text => 'set_read',:scope=>:message,:image => 'seen.png'} end @@ -183,7 +186,7 @@ class MessagesController < ApplicationController def prepare_multi3_buttons @multi3_buttons = [] @multi3_buttons << {:text => 'show_header',:scope=>:show,:image => 'zoom.png'} - @multi3_buttons << {:text => 'delete',:scope=>:show,:image => 'trash.png'} + @multi3_buttons << {:text => 'trash',:scope=>:show,:image => 'trash.png'} @multi3_buttons << {:text => 'reply',:scope=>:show,:image => 'reply.png'} end end diff --git a/app/controllers/messages_ops_controller.rb b/app/controllers/messages_ops_controller.rb index 181001c..9783eed 100755 --- a/app/controllers/messages_ops_controller.rb +++ b/app/controllers/messages_ops_controller.rb @@ -45,7 +45,7 @@ class MessagesOpsController < ApplicationController set_unread elsif params[:set_read] set_read - elsif params[:delete] + elsif params[:trash] trash elsif params[:copy] copy diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb index 35e7bc1..3f8852d 100755 --- a/app/helpers/messages_helper.rb +++ b/app/helpers/messages_helper.rb @@ -11,7 +11,7 @@ module MessagesHelper end def date_formatter(date) - date.nil? ? t(:no_data) : date.strftime("%Y-%m-%d %H:%M") + date.nil? ? t(:no_date,:scope=>:message) : date.strftime("%Y-%m-%d %H:%M") end def address_formatter(addr,mode) diff --git a/app/models/message.rb b/app/models/message.rb index 1751c8c..c7cb89f 100755 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -41,16 +41,23 @@ class Message < ActiveRecord::Base mail = Mail.new(message.attr['RFC822.HEADER']) + mail.date.nil? ? date = nil : date = mail.date.to_s + mail.From.nil? ? from = nil : from = mail.From.charseted + mail.To.nil? ? to = nil : to = mail.To.charseted + mail.Subject.nil? ? subject = nil : subject = mail.Subject.charseted + + #logger.custom('mail',mail.inspect) + create( :user_id => user.id, :folder_id => folder.id, :msg_id => mail.message_id, :uid => message.attr['UID'].to_i, - :from_addr => mail.From.charseted, - :to_addr => mail.To.charseted, - :subject => mail.Subject.charseted, + :from_addr => from, + :to_addr => to, + :subject => subject, :content_type => mail.content_type, - :date => mail.date.to_s(:db), + :date => date, :unseen => !(message.attr['FLAGS'].member? :Seen), :size => message.attr['RFC822.SIZE'] ) diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 74ceeee..9455537 100755 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -121,6 +121,8 @@ pl: delete: Usuń zaznaczone move: Przenieś copy: Skopiuj + trash: Usuń zaznaczone + no_date: Brak daty compose: compose: Nowa wiadomość @@ -143,6 +145,7 @@ pl: show_header: Pokaż nagłówek delete: Usuń reply_string: "Odp: " + trash: Usuń user: login_failure: Nieudane logowanie. Podano błędny e-mail lub hasło. diff --git a/themes/olive/stylesheets/base.css b/themes/olive/stylesheets/base.css index cdd2d2a..520ad9e 100755 --- a/themes/olive/stylesheets/base.css +++ b/themes/olive/stylesheets/base.css @@ -363,22 +363,22 @@ a.button:link, a.button:visited, a.button:hover, a.button:active, button.button line-height: 1.3em; font-weight:bold; cursor:pointer; - padding:5px 10px 6px 7px; + padding:2px 5px 3px 3px; text-decoration: none; } button.button { width:auto; overflow:visible; - padding:4px 10px 3px 7px; /* IE6 */ + padding:2px 5px 1px 3px; /* IE6 */ } button.button[type] { - padding:5px 10px 5px 7px; /* Firefox */ + padding:2px 5px 2px 3px; /* Firefox */ line-height:17px; /* Safari */ } *:first-child+html button.button[type] { - padding:4px 10px 3px 7px; /* IE7 */ + padding:2px 5px 1px 3px; /* IE7 */ } button.button img, a.button img { diff --git a/themes/olive/stylesheets/style.css b/themes/olive/stylesheets/style.css index 5acf7d0..1a6d24c 100755 --- a/themes/olive/stylesheets/style.css +++ b/themes/olive/stylesheets/style.css @@ -135,10 +135,10 @@ p { } #sidebar ul li { - border-bottom: 1px solid #F0F0EE;Załączniki burnet.tar.gz + border-bottom: 1px solid #F0F0EE; } -#sidebar ul li a:hover, #sidebar ul li a:active {Załączniki burnet.tar.gz +#sidebar ul li a:hover, #sidebar ul li a:active { background: #ADBFD6; color: #FFF; } diff --git a/themes/olive/views/folders/_list.html.erb b/themes/olive/views/folders/_list.html.erb index 8b7d87e..9211551 100755 --- a/themes/olive/views/folders/_list.html.erb +++ b/themes/olive/views/folders/_list.html.erb @@ -1,5 +1,5 @@
-

<%=t(:folders,:scope=>:folder) %> <%= link_to t(:refresh), folders_refresh_status_path, :class=>'minor' %>

+

<%=t(:folders,:scope=>:folder) %>

<% if @folders_shown.nil? or @folders_shown.size.zero? %>

<%= t(:no_shown,:scope=>:folder) %> <%= link_to t(:folders,:scope=>:folder), folders_path %>