deac
/
mailr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes

master
Wojciech Todryk 2012-04-15 19:51:58 +02:00
parent 77c8d3e7d7
commit a5b6df393c
7 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '3.2.2'
gem 'rails', '3.2.3'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
@ -40,7 +40,7 @@ gem 'jquery-rails'
gem 'will_paginate'
gem "ezcrypto"
gem "calendar_view"
gem "calendar_view" , '~> 0.0.7'
gem 'bluecloth'
gem 'sass'
gem 'haml'

60
Gemfile.lock
View File

@ -1,31 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.2)
actionpack (= 3.2.2)
mail (~> 2.4.0)
actionpack (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
actionmailer (3.2.3)
actionpack (= 3.2.3)
mail (~> 2.4.4)
actionpack (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.1)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
activemodel (3.2.2)
activesupport (= 3.2.2)
activemodel (3.2.3)
activesupport (= 3.2.3)
builder (~> 3.0.0)
activerecord (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
activerecord (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
activesupport (3.2.2)
activeresource (3.2.3)
activemodel (= 3.2.3)
activesupport (= 3.2.3)
activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
@ -52,7 +52,7 @@ GEM
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.6.5)
mail (2.4.1)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@ -61,23 +61,23 @@ GEM
mysql2 (0.3.11)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.1)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.2.2)
actionmailer (= 3.2.2)
actionpack (= 3.2.2)
activerecord (= 3.2.2)
activeresource (= 3.2.2)
activesupport (= 3.2.2)
rails (3.2.3)
actionmailer (= 3.2.3)
actionpack (= 3.2.3)
activerecord (= 3.2.3)
activeresource (= 3.2.3)
activesupport (= 3.2.3)
bundler (~> 1.0)
railties (= 3.2.2)
railties (3.2.2)
actionpack (= 3.2.2)
activesupport (= 3.2.2)
railties (= 3.2.3)
railties (3.2.3)
actionpack (= 3.2.3)
activesupport (= 3.2.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@ -110,14 +110,14 @@ PLATFORMS
DEPENDENCIES
bluecloth
calendar_view
calendar_view (~> 0.0.7)
coffee-rails (~> 3.2.1)
ezcrypto
haml
jquery-rails
json
mysql2
rails (= 3.2.2)
rails (= 3.2.3)
sass
sass-rails (~> 3.2.3)
uglifier (>= 1.0.3)

1
app/helpers/messages_helper.rb
View File

@ -15,6 +15,7 @@ module MessagesHelper
end
def address_formatter(addr,op)
return "" if addr.nil?
s = ""
return t(:no_address,:scope=>:message) if addr.empty?
length = $defaults["msg_address_length"].to_i

2
app/views/contacts/index.html.haml
View File

@ -34,5 +34,5 @@
= render :partial => 'list'
= render :partial => 'common/import_export',:locals=>{:im_ex_path => contacts_import_export_path,
:im_ex_label => t(:select_file,:scope=>:compose),
:im_ex_label => t(:select_file,:scope=>:contact),
:im_ex_size => @contacts.total_entries }

4
app/views/links/index.html.haml
View File

@ -30,4 +30,6 @@
:icon=>'icon-minus icon-white'}
= render :partial => 'list'
= render :partial => 'common/import_export',:locals=>{:im_ex_path => links_import_export_path,
:im_ex_label => t(:select_file,:scope=>:link),
:im_ex_size => @links.total_entries }

8
app/views/messages/compose.html.haml
View File

@ -9,10 +9,10 @@
%form{:enctype=>"multipart/form-data",:class=>"form-horizontal",:action=>composed_path,:method=>"post"}
%fieldset
= render :partial => "common/input_form_desc_field",:locals => {:object => @message,:attr => 'to_addr',:label => nil,:example => 'joe@domain.com',:value => address_formatter(@message.to_addr,@operation),:to_class=>"span6" }
= render :partial => "common/input_form_desc_field",:locals => {:object => @message,:attr => 'cc_addr',:label => nil,:example => 'joe@domain.com',:value => address_formatter(@message.cc_addr,@operation),:to_class=>"span6" }
= render :partial => "common/input_form_desc_field",:locals => {:object => @message,:attr => 'subject',:label => nil,:example => t(:subject_of_the_message,:scope=>:compose),:value => subject_formatter(@message.subject,@operation),:to_class=>"span6" }
= render :partial => "common/area_form_desc_field",:locals => {:object => @message,:attr => 'body',:label => nil,:example => t(:write_your_message_here,:scope=>:compose),:value => body_formatter(@message.body,@operation),:to_class=>"span6",:rows=>20 }
= render :partial => "common/input_form_desc_field",:locals => {:object => @message,:attr => 'to_addr',:label => nil,:example => 'joe@domain.com',:value => address_formatter(@message.to_addr,@operation),:to_class=>"span7" }
= render :partial => "common/input_form_desc_field",:locals => {:object => @message,:attr => 'cc_addr',:label => nil,:example => 'joe@domain.com',:value => address_formatter(@message.cc_addr,@operation),:to_class=>"span7" }
= render :partial => "common/input_form_desc_field",:locals => {:object => @message,:attr => 'subject',:label => nil,:example => t(:subject_of_the_message,:scope=>:compose),:value => subject_formatter(@message.subject,@operation),:to_class=>"span7" }
= render :partial => "common/area_form_desc_field",:locals => {:object => @message,:attr => 'body',:label => nil,:example => t(:write_your_message_here,:scope=>:compose),:value => body_formatter(@message.body,@operation),:to_class=>"span7",:rows=>20 }
- if !@olduid.nil?
= hidden_field_tag 'olduid', @olduid
.control-group

4
config/locales/pl.yml
View File

@ -70,7 +70,7 @@ pl:
contact:
compose_to_selected: Napisz do wybranych
delete_selected: Usuń wybrane
sdelete_selected: Usuń wybrane
modifying: Modyfikacja kontaktu
creating_new: Nowy kontakt
create_new: Utwórz nowy kontakt
@ -85,6 +85,7 @@ pl:
import: Import
were_imported: Kontakty zostały zaimportowane
format_error: Nieprawidłowy format kontaktu
select_file: Wybierz plik
link:
link: Sznurek
@ -97,6 +98,7 @@ pl:
was_created: Sznurek został utworzony
were_imported: Sznurki zostały zaimportowane
goto: Idź do
select_file: Wybierz plik
prefs:
prefs: Ustawienia