diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/Gemfile b/Gemfile
index 2039c7d..2c314f4 100755
--- a/Gemfile
+++ b/Gemfile
@@ -44,3 +44,4 @@ gem "calendar_view"
gem 'bluecloth'
gem 'sass'
gem 'haml'
+#gem 'twitter_bootstrap_form_for'
diff --git a/Gemfile.lock b/Gemfile.lock
old mode 100755
new mode 100644
index c3b2bc4..22f4382
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,7 +31,7 @@ GEM
arel (3.0.2)
bluecloth (2.2.0)
builder (3.0.0)
- calendar_view (0.0.6)
+ calendar_view (0.0.7)
rails (>= 3.0.0)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb
index 1dfd436..679a5ca 100755
--- a/app/controllers/contacts_controller.rb
+++ b/app/controllers/contacts_controller.rb
@@ -6,34 +6,10 @@ class ContactsController < ApplicationController
before_filter :get_contacts, :only => [:index]
- before_filter :prepare_ops_buttons, :prepare_export_import_buttons,:only => [:index]
-
- #theme :theme_resolver
-
def index
end
- def ops
- if params["create_new"]
- redirect_to(new_contact_path)
- return
- end
- if !params["cids"]
- flash[:warning] = t(:no_selected,:scope=>:contact)
- else
- if params["delete_selected"]
- params["cids"].each do |id|
- @current_user.contacts.find_by_id(id).destroy
- end
- elsif params["compose_to_selected"]
- redirect_to :controller=>'messages',:action=>'compose',:cids=>params["cids"]
- return
- end
- end
- redirect_to(contacts_path)
- end
-
#problem http://binary10ve.blogspot.com/2011/05/migrating-to-rails-3-got-stuck-with.html
#def destroy
# @current_user.contacts.find(params[:id]).destroy
@@ -50,6 +26,21 @@ class ContactsController < ApplicationController
end
def create
+ if params["compose_to_selected"]
+ if params["items_ids"]
+ redirect_to compose_path(:cids => params["items_ids"])
+ return
+ end
+ end
+ if params["delete_selected"]
+ if params["items_ids"]
+ params["items_ids"].each do |id|
+ @current_user.contacts.find_by_id(id).destroy
+ end
+ end
+ redirect_to(contacts_path)
+ return
+ end
@contact = @current_user.contacts.build(params[:contact])
if @contact.valid?
@contact.save
@@ -69,10 +60,17 @@ class ContactsController < ApplicationController
end
end
- def external
+ def import_export
if params["export"]
- redirect_to :action => 'export'
- return
+ contacts = @current_user.contacts
+ s = ""
+ contacts.each do |c|
+ s += c.export + "\r\n"
+ end
+ headers['Content-type'] = "text/csv"
+ headers['Content-Disposition'] = %(attachment; filename="contacts.csv")
+ render :text => s
+ return
elsif params["import"]
begin
raise t(:no_file_chosen,:scope=>:common) if not params[:upload]
@@ -82,8 +80,8 @@ class ContactsController < ApplicationController
tmp_file.flush
tmp_file.rewind
tmp_file.readlines.each do |line|
- next if line =~ /^#/
- Contact.import(@current_user,line)
+ next if line =~ /^#/
+ Contact.import(@current_user,line)
end
rescue ActiveRecord::RecordInvalid => e
flash[:error] = {:title => e.to_s,:info => e.record.inspect + e.record.errors.inspect}
@@ -96,34 +94,10 @@ class ContactsController < ApplicationController
redirect_to :action => 'index'
end
- def export
- contacts = @current_user.contacts
- s = ""
- contacts.each do |c|
- s += c.export + "\r\n"
- end
- headers['Content-type'] = "text/csv"
- headers['Content-Disposition'] = %(attachment; filename="contacts.csv")
- render :text => s
- end
-
####################################### protected section ################################
protected
- def prepare_ops_buttons
- @buttons = []
- @buttons << {:text => 'compose_to_selected',:scope=> 'contact', :image => 'email.png'}
- @buttons << {:text => 'create_new',:scope=> 'contact', :image => 'plus.png'}
- @buttons << {:text => 'delete_selected',:scope=>'contact',:image => 'minus.png'}
- end
-
- def prepare_export_import_buttons
- @ei_buttons = []
- @ei_buttons << {:text => 'import',:scope=>'contact',:image => 'right.png'}
- @ei_buttons << {:text => 'export',:scope=>'contact',:image => 'left.png'}
- end
-
####################################### private section ##################################
private
diff --git a/app/controllers/links_controller.rb b/app/controllers/links_controller.rb
index 36c11ca..11fe22a 100755
--- a/app/controllers/links_controller.rb
+++ b/app/controllers/links_controller.rb
@@ -6,39 +6,10 @@ class LinksController < ApplicationController
before_filter :get_links, :only => [:index]
- before_filter :prepare_ops_buttons, :only => [:index]
-
- #, :prepare_export_import_buttons,:only => [:index]
-
- #theme :theme_resolver
-
def index
end
- def ops
- if params["create_new"]
- redirect_to(new_link_path)
- return
- end
- if !params["ids"]
- flash[:warning] = t(:no_selected,:scope=>:link)
- else
- if params["delete_selected"]
- params["ids"].each do |id|
- @current_user.links.find_by_id(id).destroy
- end
- end
- end
- redirect_to(links_path)
- end
-
- #problem http://binary10ve.blogspot.com/2011/05/migrating-to-rails-3-got-stuck-with.html
- #def destroy
- # @current_user.contacts.find(params[:id]).destroy
- # redirect_to(contacts_path)
- #end
-
def new
@link = Link.new
end
@@ -49,6 +20,15 @@ class LinksController < ApplicationController
end
def create
+ if params["delete_selected"]
+ if params["items_ids"]
+ params["items_ids"].each do |id|
+ @current_user.links.find_by_id(id).destroy
+ end
+ end
+ redirect_to(links_path)
+ return
+ end
@link = @current_user.links.build(params[:link])
if @link.valid?
@link.save
@@ -68,10 +48,17 @@ class LinksController < ApplicationController
end
end
- def external
+ def import_export
if params["export"]
- redirect_to :action => 'export'
- return
+ links = @current_user.links
+ s = ""
+ links.each do |l|
+ s += l.export + "\r\n"
+ end
+ headers['Content-type'] = "text/csv"
+ headers['Content-Disposition'] = %(attachment; filename="links.csv")
+ render :text => s
+ return
elsif params["import"]
begin
raise t(:no_file_chosen,:scope=>:common) if not params[:upload]
@@ -81,47 +68,24 @@ class LinksController < ApplicationController
tmp_file.flush
tmp_file.rewind
tmp_file.readlines.each do |line|
- next if line =~ /^#/
- Contact.import(@current_user,line)
+ next if line =~ /^#/
+ Link.import(@current_user,line)
end
rescue ActiveRecord::RecordInvalid => e
flash[:error] = {:title => e.to_s,:info => e.record.inspect + e.record.errors.inspect}
rescue Exception => e
flash[:error] = e.to_s
else
- flash[:success] = t(:were_imported,:scope=>:contact)
+ flash[:success] = t(:were_imported,:scope=>:link)
end
end
redirect_to :action => 'index'
end
- def export
- contacts = @current_user.contacts
- s = ""
- contacts.each do |c|
- s += c.export + "\r\n"
- end
- headers['Content-type'] = "text/csv"
- headers['Content-Disposition'] = %(attachment; filename="contacts.csv")
- render :text => s
- end
-
####################################### protected section ################################
protected
- def prepare_ops_buttons
- @buttons = []
- @buttons << {:text => 'create_new',:scope=> 'link', :image => 'plus.png'}
- @buttons << {:text => 'delete_selected',:scope=>'link',:image => 'minus.png'}
- end
-
- def prepare_export_import_buttons
- @ei_buttons = []
- @ei_buttons << {:text => 'import',:scope=>'link',:image => 'right.png'}
- @ei_buttons << {:text => 'export',:scope=>'link',:image => 'left.png'}
- end
-
####################################### private section ##################################
private
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 9259d87..86a5b42 100755
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -103,8 +103,8 @@ class MessagesController < ApplicationController
#@to = mail.To.addrs.presence
@from = @message.from_addr
@to = @message.to_addr
- @cc = mail.Cc.presence
- @bcc = mail.Bcc.presence
+ @cc = mail.cc
+ @bcc = mail.bcc
#@subject = mail.Subject
@date = mail.date.presence
diff --git a/app/controllers/messages_ops_controller.rb b/app/controllers/messages_ops_controller.rb
index cf3a0de..656ae58 100755
--- a/app/controllers/messages_ops_controller.rb
+++ b/app/controllers/messages_ops_controller.rb
@@ -25,7 +25,7 @@ class MessagesOpsController < ApplicationController
############################################### single #####################################
def single
- if params[:reply]
+ if params[:reply] or params[:reply_all]
reply
return
elsif params[:trash]
@@ -281,11 +281,19 @@ class MessagesOpsController < ApplicationController
def reply
old_message = @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,params[:uids].first).first
@message = Message.new
- @message.to_addr = old_message.from_addr
- @message.subject = old_message.subject
+ #@message.to_addr = old_message.from_addr
+ #@message.to_addr = old_message.from.first
+ #@message.subject = old_message.subject
imap_message = @mailbox.fetch_body(old_message.uid)
mail = Mail.new(imap_message)
+ @message.to_addr = mail.from.first
+ @message.subject = mail.subject
+
+ if params[:reply_all]
+ @message.cc_addr = mail.cc.join('; ')
+ end
+
if mail.multipart?
@message.body = mail.text_part.nil? ? "" : mail.text_part.decoded_and_charseted.gsub(/<\/?[^>]*>/, "")
else
@@ -295,6 +303,7 @@ class MessagesOpsController < ApplicationController
@operation = :reply
render 'messages/compose'
end
+
###################################### protected section #######################################
protected
@@ -315,6 +324,7 @@ class MessagesOpsController < ApplicationController
@mail.from = @current_user.full_id
#TODO check if email address is valid if not get address from contacts
@mail.to = params[:message][:to_addr]
+ @mail.cc = params[:message][:cc_addr]
@mail.body = params[:message][:body]
@attachments = Dir.glob(File.join($defaults["msg_upload_dir"],@current_user.username + "*"))
@attachments.each do |a|
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index be5f2ec..5e3f5d7 100755
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -327,8 +327,8 @@ module ApplicationHelper
#s
#end
-#def boolean_answer(answer)
- #answer == true ? t(:true_answer,:scope=>:common) : t(:false_answer,:scope=>:common)
-#end
+def boolean_answer(answer)
+ answer == true ? t(:true_answer,:scope=>:common) : t(:false_answer,:scope=>:common)
+end
end
diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
index 7a24395..801125c 100755
--- a/app/helpers/messages_helper.rb
+++ b/app/helpers/messages_helper.rb
@@ -16,11 +16,12 @@ module MessagesHelper
def address_formatter(addr,op)
s = ""
- return s if addr.nil?
+ return t(:no_address,:scope=>:message) if addr.empty?
length = $defaults["msg_address_length"].to_i
case op
when :index
+ logger.custom('addr',addr)
fs = addr.gsub(/\"/,"").split(/= length ? s = s[0,length]+"..." : s
@@ -42,13 +43,20 @@ module MessagesHelper
case op
when :reply
s = "\n\n\n"
- body.gsub(/^\s+/,"").split(/\n/).each do |line|
- s += ">" + line + "\n"
+ body.split(/\n/).each do |line|
+ s += '>' + line.strip + "\n"
end
s
when :edit
return body
- end
+ when :plain
+ safe_body = h(body)
+ s = ""
+ safe_body.split(/\n/).each do |line|
+ s += line.gsub(/^\s+/,"") + "
"
+ end
+ s.html_safe
+ end
end
def subject_formatter(message,op)
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 4af64b7..a7a0279 100755
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -1,12 +1,11 @@
class Contact < ActiveRecord::Base
- validates_length_of :nick, :within => 5..15
- validates_length_of :first_name,:last_name, :within => 3..20
+ validates_length_of :name, :within => 3..20
validates_length_of :email, :within => 5..50
validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
validates_length_of :info, :maximum => 100
- validate :check_unique_nick, :on => :create
- default_scope :order => 'nick ASC'
+ validate :check_unique_name, :on => :create
+ default_scope :order => 'name ASC'
belongs_to :user
@@ -22,21 +21,15 @@ class Contact < ActiveRecord::Base
Contact.paginate :page => page , :per_page => $defaults["contacts_per_page"], :conditions=> ['user_id = ?', user.id],:order => order
end
- def full_name
- first_name + ' ' + last_name
- end
-
- def check_unique_nick
- if !Contact.where('upper(nick) = ? and user_id = ?',nick.upcase,user_id).size.zero?
- errors.add(:nick, :not_unique)
+ def check_unique_name
+ if !Contact.where('upper(name) = ? and user_id = ?',name.upcase,user_id).size.zero?
+ errors.add(:name, :not_unique)
end
end
def export
fields = []
- fields << nick.presence || ""
- fields << first_name || ""
- fields << last_name || ""
+ fields << name || ""
fields << email || ""
fields << info || ""
fields.join(';')
@@ -44,11 +37,9 @@ class Contact < ActiveRecord::Base
def self.import(user,line)
fields = line.split(/;/)
- contact = user.contacts.build( :nick => fields[0].strip,
- :first_name => fields[1].strip,
- :last_name => fields[2].strip,
- :email => fields[3].strip,
- :info => fields[4].strip)
+ contact = user.contacts.build( :name => fields[0].strip,
+ :email => fields[1].strip,
+ :info => fields[2].strip)
contact.save!
end
end
diff --git a/app/models/link.rb b/app/models/link.rb
index 30e75cb..290e50f 100755
--- a/app/models/link.rb
+++ b/app/models/link.rb
@@ -1,5 +1,4 @@
class Link < ActiveRecord::Base
- validates_length_of :name, :within => 5..30
validates_length_of :url, :within => 5..150
validates_length_of :info, :maximum => 50
belongs_to :user
@@ -16,4 +15,19 @@ class Link < ActiveRecord::Base
Link.paginate :page => page , :per_page => $defaults["links_per_page"], :conditions=> ['user_id = ?', user.id],:order => order
end
+
+ def export
+ fields = []
+ fields << url || ""
+ fields << info || ""
+ fields.join(';')
+ end
+
+ def self.import(user,line)
+ fields = line.split(/;/)
+ contact = user.links.build( :url => fields[0].strip,
+ :info => fields[1].strip)
+ contact.save!
+ end
+
end
diff --git a/app/views/common/_anchor.html.haml b/app/views/common/_anchor.html.haml
new file mode 100755
index 0000000..35ab6b7
--- /dev/null
+++ b/app/views/common/_anchor.html.haml
@@ -0,0 +1,8 @@
+- size ||= "btn-small"
+- type ||= "btn-primary"
+- icon ||= ""
+
+%a{:class=>"btn #{size} #{type}",:href=>"#{href}"}
+ - if !icon.empty?
+ %i{:class=>"#{icon}"}
+ = caption
diff --git a/app/views/common/_import_export.html.haml b/app/views/common/_import_export.html.haml
new file mode 100755
index 0000000..a64b0aa
--- /dev/null
+++ b/app/views/common/_import_export.html.haml
@@ -0,0 +1,12 @@
+%form{:enctype=>"multipart/form-data", :class=>"form-horizontal top-pix18",:action=>"#{im_ex_path}",:method=>"post"}
+ = render :partial => "common/file_select", :locals => { :model_label => "#{im_ex_label}",
+ :model_string => "upload",
+ :attr => "datafile"}
+ %p
+ = render :partial => "common/button", :locals => {:name=>'import',
+ :caption=>t('import',:scope=>'contact'),
+ :icon=>'icon-upload icon-white'}
+ - if !im_ex_size.zero?
+ = render :partial => "common/button", :locals => {:name=>'export',
+ :caption=>t('export',:scope=>'contact'),
+ :icon=>'icon-download icon-white'}
diff --git a/app/views/common/_main_header.html.haml b/app/views/common/_main_header.html.haml
new file mode 100755
index 0000000..3cd86bd
--- /dev/null
+++ b/app/views/common/_main_header.html.haml
@@ -0,0 +1 @@
+= calendar_window(:title=>t(:calendar,:scope=>:common))
diff --git a/app/views/common/_main_navigation.html.haml b/app/views/common/_main_navigation.html.haml
index ac338c7..9b4031f 100755
--- a/app/views/common/_main_navigation.html.haml
+++ b/app/views/common/_main_navigation.html.haml
@@ -7,16 +7,15 @@
%ul{:class=>"nav nav-pills"}
%li{:class=>"#{messages}"}
- %a{:href=>messages_path}
- = t(:messages,:scope=>:message)
+ = link_to( t(:messages,:scope=>:message), messages_path )
%li{:class=>"#{compose}"}
= link_to( t(:compose,:scope=>:compose), compose_path )
%li{:class=>"#{folders}"}
= link_to( t(:folders,:scope=>:folder), folders_path )
%li{:class=>"#{contacts}"}
= link_to( t(:contacts,:scope=>:contact), contacts_path )
- %li{:class=>"#{prefs}"}
- = link_to( t(:prefs,:scope=>:prefs), prefs_look_path )
%li{:class=>"#{links}"}
= link_to( t(:links,:scope=>:link), links_path )
+ %li{:class=>"#{prefs}"}
+ = link_to( t(:prefs,:scope=>:prefs), prefs_look_path )
diff --git a/app/views/common/_prefs_navigation.html.haml b/app/views/common/_prefs_navigation.html.haml
new file mode 100755
index 0000000..1256186
--- /dev/null
+++ b/app/views/common/_prefs_navigation.html.haml
@@ -0,0 +1,11 @@
+- look ||= ""
+- identity ||= ""
+- servers ||= ""
+
+%ul{:class=>"nav nav-pills"}
+ %li{:class=>"#{look}"}
+ = link_to( t(:look,:scope=>:prefs), prefs_look_path )
+ %li{:class=>"#{identity}"}
+ = link_to( t(:identity,:scope=>:prefs), prefs_identity_path )
+ %li{:class=>"#{servers}"}
+ = link_to( t(:servers,:scope=>:prefs), prefs_servers_path )
diff --git a/app/views/common/_select.html.haml b/app/views/common/_select.html.haml
new file mode 100755
index 0000000..8cfd814
--- /dev/null
+++ b/app/views/common/_select.html.haml
@@ -0,0 +1,22 @@
+- model = eval(object.class.model_name)
+- model_string = object.class.model_name.downcase
+- model_label = model.human_attribute_name(attr)
+- translation_scope ||= false
+
+.control-group
+ %label{:class=>"control-label",:for=>"#{attr}"}
+ = model_label
+ .controls
+ - if translation_scope
+ - t = []
+ - choices.each do |c|
+ - t << [t(c.to_sym,:scope=>translation_scope),c.to_s]
+ = select(model_string, attr, options_for_select(t,choice), {:include_blank => blank})
+ - else
+ = select(model_string, attr, options_for_select(choices,choice), {:include_blank => blank})
+
+
+
+
+-# select(model.downcase, attr, options_for_select(choices,choice), {:include_blank => blank})
+
diff --git a/app/views/contacts/_attrs.html.haml b/app/views/contacts/_attrs.html.haml
new file mode 100755
index 0000000..6a80444
--- /dev/null
+++ b/app/views/contacts/_attrs.html.haml
@@ -0,0 +1,18 @@
+= render :partial => "common/input_form_desc_field",:locals => {:object => @contact,
+ :attr => 'name',
+ :label => nil,
+ :example => 'Joe Doe',
+ :value => @contact.name,
+ :to_class=>"span6" }
+= render :partial => "common/input_form_desc_field",:locals => {:object => @contact,
+ :attr => 'email',
+ :label => nil,
+ :example => 'joe.doe@domain.com',
+ :value => @contact.email,
+ :to_class=>"span6" }
+= render :partial => "common/input_form_desc_field",:locals => {:object => @contact,
+ :attr => 'info',
+ :label => nil,
+ :example => t(:some_add_info,:scope=>:common),
+ :value => @contact.info,
+ :to_class=>"span6" }
diff --git a/app/views/contacts/_contact.html.haml b/app/views/contacts/_contact.html.haml
new file mode 100755
index 0000000..4bcd3c7
--- /dev/null
+++ b/app/views/contacts/_contact.html.haml
@@ -0,0 +1,11 @@
+%tr
+ %td
+ = check_box_tag "items_ids[]", contact.id
+ \/
+ = link_to "".html_safe,edit_contact_path(contact)
+ %td{:nowrap=>"nowrap"}
+ = link_to contact.name,compose_contact_path(contact.id)
+ %td{:nowrap=>"nowrap"}
+ = link_to contact.email, compose_contact_path(contact.id)
+ %td{:nowrap=>"nowrap"}
+ = contact.info
diff --git a/app/views/contacts/_list.html.haml b/app/views/contacts/_list.html.haml
new file mode 100755
index 0000000..73f7e57
--- /dev/null
+++ b/app/views/contacts/_list.html.haml
@@ -0,0 +1,13 @@
+= will_paginate @contacts
+
+%table{:class=>"table table-bordered records"}
+ %thead
+ %tr
+ %th
+ %input{:id=>"toggleall",:type=>"checkbox",:name=>"allbox"}
+ = raw contacts_table_header
+ %tbody
+ - @contacts.each do |c|
+ = render :partial => 'contact', :locals => {:contact => c}
+
+= will_paginate @contacts
diff --git a/app/views/contacts/edit.html.haml b/app/views/contacts/edit.html.haml
new file mode 100755
index 0000000..a556dfd
--- /dev/null
+++ b/app/views/contacts/edit.html.haml
@@ -0,0 +1,20 @@
+= content_for :sidebar do
+ = render :partial => "sidebar/sidebar"
+
+= content_for :title do
+ \-
+ = t(:contacts,:scope=>:contact)
+
+= render :partial => 'common/main_navigation', :locals => { :contacts => :active }
+
+.well{:style=>"padding: 5px 3pt;"}
+ %h3
+ = t(:modifying,:scope=>:contact)
+
+%form{:class=>"form-horizontal",:action=>url_for(@contact),:method=>"post"}
+ %input{:name=>"_method",:type=>"hidden",:value=>"put"}
+ %fieldset
+ = render :partial => "attrs"
+ .control-group
+ .controls
+ = render :partial => "common/button",:locals => { :name=>:save, :caption => t(:save,:scope=>:common), :icon =>'icon-cog icon-white'}
diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml
index ead45f5..5868a7b 100755
--- a/app/views/contacts/index.html.haml
+++ b/app/views/contacts/index.html.haml
@@ -6,3 +6,33 @@
= t(:contacts,:scope=>:contact)
= render :partial => 'common/main_navigation', :locals => { :contacts => :active }
+
+%form{:class=>"form-horizontal top-pix18",:action=>url_for(@contact),:method=>"post"}
+ - if @contacts.size.zero?
+ .alert
+ = t(:no_entries,:scope=>:contact)
+ %p{:class=>"bottom-pix18"}
+ = render :partial => "common/anchor", :locals => {:caption=>t('create_new',:scope=>'contact'),
+ :icon=>'icon-plus icon-white',
+ :href=>new_contact_path}
+ - else
+ .well{:style=>"padding: 5px 3pt;"}
+ %h5
+ = t(:total_entries,:scope=>:contact)
+ \:
+ = @contacts.total_entries
+ %p{:class=>"bottom-pix18"}
+ = render :partial => "common/anchor", :locals => {:caption=>t('create_new',:scope=>'contact'),
+ :icon=>'icon-plus icon-white',
+ :href=>new_contact_path}
+ = render :partial => "common/button", :locals => {:name=>'delete_selected',
+ :caption=>t('delete_selected',:scope=>'contact'),
+ :icon=>'icon-minus icon-white'}
+ = render :partial => "common/button", :locals => {:name=>'compose_to_selected',
+ :caption=>t('compose_to_selected',:scope=>'contact'),
+ :icon=>'icon-envelope icon-white'}
+ = 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_size => @contacts.total_entries }
diff --git a/app/views/contacts/new.html.haml b/app/views/contacts/new.html.haml
new file mode 100755
index 0000000..5af1197
--- /dev/null
+++ b/app/views/contacts/new.html.haml
@@ -0,0 +1,19 @@
+= content_for :sidebar do
+ = render :partial => "sidebar/sidebar"
+
+= content_for :title do
+ \-
+ = t(:contacts,:scope=>:contact)
+
+= render :partial => 'common/main_navigation', :locals => { :contacts => :active }
+
+.well{:style=>"padding: 5px 3pt;"}
+ %h3
+ = t(:creating_new,:scope=>:contact)
+
+%form{:class=>"form-horizontal",:action=>url_for(@contact),:method=>"post"}
+ %fieldset
+ = render :partial => "attrs"
+ .control-group
+ .controls
+ = render :partial => "common/button",:locals => { :name=>:save, :caption => t(:save,:scope=>:common), :icon =>'icon-cog icon-white'}
diff --git a/app/views/internal/about.html.haml b/app/views/internal/about.html.haml
index bf55267..932f700 100755
--- a/app/views/internal/about.html.haml
+++ b/app/views/internal/about.html.haml
@@ -2,6 +2,7 @@
= render :partial => "sidebar/sidebar"
= content_for :title do
+ \-
= t(:about,:scope=>:internal)
= render :partial => 'common/main_navigation', :locals => { :about => :active }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 628e512..c283f5e 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -22,6 +22,7 @@
- elsif flash[:success]
.alert.alert-success
= flash[:success]
+ = render :partial => "common/main_header"
= yield
%hr/
.row
diff --git a/app/views/links/_attrs.html.haml b/app/views/links/_attrs.html.haml
new file mode 100755
index 0000000..3b18ed5
--- /dev/null
+++ b/app/views/links/_attrs.html.haml
@@ -0,0 +1,12 @@
+= render :partial => "common/input_form_desc_field",:locals => {:object => @link,
+ :attr => 'url',
+ :label => nil,
+ :example => 'www.example.com',
+ :value => @link.url,
+ :to_class=>"span6" }
+= render :partial => "common/input_form_desc_field",:locals => {:object => @link,
+ :attr => 'info',
+ :label => nil,
+ :example => t(:some_add_info,:scope=>:common),
+ :value => @link.info,
+ :to_class=>"span6" }
diff --git a/app/views/links/_link.html.haml b/app/views/links/_link.html.haml
new file mode 100755
index 0000000..470c1ee
--- /dev/null
+++ b/app/views/links/_link.html.haml
@@ -0,0 +1,9 @@
+%tr
+ %td
+ = check_box_tag "items_ids[]", link.id
+ \/
+ = link_to "".html_safe,edit_link_path(link)
+ %td{:nowrap=>"nowrap"}
+ = link_to link.url,"http://"+link.url
+ %td{:nowrap=>"nowrap"}
+ = link.info
diff --git a/app/views/links/_list.html.haml b/app/views/links/_list.html.haml
new file mode 100755
index 0000000..1d53d95
--- /dev/null
+++ b/app/views/links/_list.html.haml
@@ -0,0 +1,13 @@
+= will_paginate @links , :class => "custom_pagination bottom-pix18"
+
+%table{:class=>"table table-bordered records"}
+ %thead
+ %tr
+ %th
+ %input{:id=>"toggleall",:type=>"checkbox",:name=>"allbox"}
+ = raw links_table_header
+ %tbody
+ - @links.each do |l|
+ = render :partial => 'link', :locals => {:link => l}
+
+= will_paginate @links , :class => "custom_pagination bottom-pix18"
diff --git a/app/views/links/edit.html.haml b/app/views/links/edit.html.haml
new file mode 100755
index 0000000..3a68cc3
--- /dev/null
+++ b/app/views/links/edit.html.haml
@@ -0,0 +1,20 @@
+= content_for :sidebar do
+ = render :partial => "sidebar/sidebar"
+
+= content_for :title do
+ \-
+ = t(:links,:scope=>:link)
+
+= render :partial => 'common/main_navigation', :locals => { :links => :active }
+
+.well{:style=>"padding: 5px 3pt;"}
+ %h3
+ = t(:modifying,:scope=>:link)
+
+%form{:class=>"form-horizontal",:action=>url_for(@link),:method=>"post"}
+ %input{:name=>"_method",:type=>"hidden",:value=>"put"}
+ %fieldset
+ = render :partial => "attrs"
+ .control-group
+ .controls
+ = render :partial => "common/button",:locals => { :name=>:save, :caption => t(:save,:scope=>:common), :icon =>'icon-cog icon-white'}
diff --git a/app/views/links/index.html.haml b/app/views/links/index.html.haml
index 33af4a1..00f3098 100755
--- a/app/views/links/index.html.haml
+++ b/app/views/links/index.html.haml
@@ -6,3 +6,28 @@
= t(:links,:scope=>:link)
= render :partial => 'common/main_navigation', :locals => { :links => :active }
+
+%form{:class=>"form-horizontal top-pix18",:action=>url_for(@link),:method=>"post"}
+ - if @links.size.zero?
+ .alert
+ = t(:no_entries,:scope=>:link)
+ %p{:class=>"bottom-pix18"}
+ = render :partial => "common/anchor", :locals => {:caption=>t('create_new',:scope=>'link'),
+ :icon=>'icon-plus icon-white',
+ :href=>new_link_path}
+ - else
+ .well{:style=>"padding: 5px 3pt;"}
+ %h5
+ = t(:total_entries,:scope=>:link)
+ \:
+ = @links.total_entries
+ %p{:class=>"bottom-pix18"}
+ = render :partial => "common/anchor", :locals => {:caption=>t('create_new',:scope=>'link'),
+ :icon=>'icon-plus icon-white',
+ :href=>new_link_path}
+ = render :partial => "common/button", :locals => {:name=>'delete_selected',
+ :caption=>t('delete_selected',:scope=>'link'),
+ :icon=>'icon-minus icon-white'}
+ = render :partial => 'list'
+
+
diff --git a/app/views/links/new.html.haml b/app/views/links/new.html.haml
new file mode 100755
index 0000000..3b87d8b
--- /dev/null
+++ b/app/views/links/new.html.haml
@@ -0,0 +1,19 @@
+= content_for :sidebar do
+ = render :partial => "sidebar/sidebar"
+
+= content_for :title do
+ \-
+ = t(:links,:scope=>:link)
+
+= render :partial => 'common/main_navigation', :locals => { :links => :active }
+
+.well{:style=>"padding: 5px 3pt;"}
+ %h3
+ = t(:create_new,:scope=>:link)
+
+%form{:class=>"form-horizontal",:action=>url_for(@link),:method=>"post"}
+ %fieldset
+ = render :partial => "attrs"
+ .control-group
+ .controls
+ = render :partial => "common/button",:locals => { :name=>:save, :caption => t(:save,:scope=>:common), :icon =>'icon-cog icon-white'}
diff --git a/app/views/messages/_header.html.haml b/app/views/messages/_header.html.haml
index 993919f..a557f55 100755
--- a/app/views/messages/_header.html.haml
+++ b/app/views/messages/_header.html.haml
@@ -15,13 +15,13 @@
%td{:class=>"field_name"}
= humanize_attr(@message,'cc_addr') + ':'
%td
- "CC jest"
+ = @cc.join('; ')
- if not @bcc.nil?
%tr
%td{:class=>"field_name"}
= humanize_attr(@message,'bcc_addr') + ':'
%td
- "BCC jest"
+ = @bcc.join('; ')
%tr
%td{:class=>"field_name"}
= humanize_attr(@message,'subject') + ':'
diff --git a/app/views/messages/_image.html.haml b/app/views/messages/_image.html.haml
new file mode 100755
index 0000000..ab9f5cd
--- /dev/null
+++ b/app/views/messages/_image.html.haml
@@ -0,0 +1,22 @@
+%li{:class=>"span3"}
+ .thumbnail
+ %a{:href=>"#"}
+ %img{:alt=>image.filename,:src=>attachment_download_path(image.parent_id,image.idx),:size => @current_user.prefs.msg_image_thumbnail_size,:title=>image.filename}
+ .caption
+ %h5
+ = link_to "".html_safe, attachment_download_path(image.parent_id,image.idx)
+ = image.filename
+ %small
+ = size_formatter(image.getSize)
+
+
+-#
+
+ <%= image_tag(attachment_download_path(image.parent_id,image.idx), :size => @current_user.prefs.msg_image_thumbnail_size, :alt=>image.filename, :title=>image.filename) %>
+
+ <%= link_to (image.filename,attachment_download_path(image.parent_id,image.idx)) %>
+ <%= size_formatter(image.getSize) %>
+
+
+ <%= raw select_field_table(@prefs, "msgs_per_page", $defaults["msgs_per_page_table"],@prefs.msgs_per_page,false) %>
+ <%= raw select_field_table(@prefs, "theme", $defaults["themes"],$defaults["themes"],false) %>
+ <%= raw select_field_table(@prefs, "locale", $defaults["locales"],@prefs.locale,false) %>
+ <%= raw select_field_table(@prefs, "msg_send_type", $defaults["msg_send_type"],@prefs.msg_send_type,false) %>
+
+ <%= raw single_action('save','common','save.png') %>
+
+
+
+ <%= raw select_field_table_t(@prefs, "msg_image_view_as", $defaults["msg_image_view_as"],@prefs.msg_image_view_as,false) %>
+ <%= raw select_field_table(@prefs, "msg_image_thumbnail_size", $defaults["msg_image_thumbnail_size"],@prefs.msg_image_thumbnail_size,false) %>
+
+
diff --git a/app/views/prefs/servers.html.haml b/app/views/prefs/servers.html.haml
new file mode 100755
index 0000000..4b7e462
--- /dev/null
+++ b/app/views/prefs/servers.html.haml
@@ -0,0 +1,18 @@
+= content_for :sidebar do
+ = render :partial => "sidebar/sidebar"
+
+= content_for :title do
+ \-
+ = t(:servers,:scope=>:prefs)
+
+= render :partial => 'common/main_navigation', :locals => { :prefs => :active }
+= render :partial => 'common/prefs_navigation', :locals => { :servers => :active }
+
+%table{:class=>"table table-bordered records"}
+ %thead
+ %tr
+ %th
+ = raw servers_table_header
+ %tbody
+ - @servers.each do |s|
+ = render :partial => 'prefs/server', :locals => { :server => s }
diff --git a/app/views/sidebar/_calendar_view.html.haml b/app/views/sidebar/_calendar_view.html.haml
index e69de29..991949b 100755
--- a/app/views/sidebar/_calendar_view.html.haml
+++ b/app/views/sidebar/_calendar_view.html.haml
@@ -0,0 +1,3 @@
+= calendar_square(:month_delta=>-1)
+= calendar_square()
+= calendar_square(:month_delta=>1)
diff --git a/app/views/user/login.html.haml b/app/views/user/login.html.haml
index fbf86c9..4034d69 100755
--- a/app/views/user/login.html.haml
+++ b/app/views/user/login.html.haml
@@ -2,13 +2,14 @@
\-
= t(:login,:scope=>:user)
-%form{:class=>"form-horizontal top-pix18",:action=>"#{url_for(:controller => 'user', :action => 'authenticate')}",:method=>"post"}
+%form{:class=>"form-horizontal top-pix18",:action=>user_authenticate_path,:method=>"post"}
%fieldset
= render :partial => "common/input_form_field",:locals => { :model => 'user',:attr => 'login'}
= render :partial => "common/input_password_form_field",:locals => { :model => 'user',:attr => 'password'}
.control-group
- .controls
- = render :partial => "common/button",:locals => { :name=>'login_button', :caption => t(:please_login,:scope=>:user), :icon =>'icon-lock icon-white'}
+ .controls
+ = render :partial => "common/button",:locals => { :name=>'login_button', :caption => t(:please_login,:scope=>:user), :icon =>'icon-lock icon-white'}
%hr/
-
-
+
+
+
diff --git a/config/environments/production.rb b/config/environments/production.rb
index b435507..58b0388 100755
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -9,7 +9,7 @@ Mailr::Application.configure do
config.action_controller.perform_caching = true
# Disable Rails's static asset server (Apache or nginx will already do this)
- config.serve_static_assets = false
+ config.serve_static_assets = true
# Compress JavaScripts and CSS
config.assets.compress = true
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a809c27..182cae7 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,7 +1,7 @@
en:
will_paginate:
- previous_label: "← Previous"
- next_label: "Next →"
+ previous_label: "« Previous"
+ next_label: "Next »"
page_gap: "…"
activerecord:
attributes:
@@ -44,6 +44,10 @@ en:
to_delete_empty: No folder to delete
can_not_delete: Can not delete folder
was_deleted: Folder was deleted
+ inbox_name: Inbox
+ sent_name: Sent
+ trash_name: Trash
+ drafts_name: Drafts
message:
messages: Messages
@@ -65,3 +69,31 @@ en:
show_hide: Show/Hide
mailr: Mailr
save: Save
+
+ common:
+ false_answer: No
+ true_answer: Yes
+ file_format_error: File format error
+ no_tmp_dir: No temporary directory
+ must_be_unique: must be unique
+ some_add_info: some additional info
+ example: "example:"
+ create: Create
+ delete: Delete
+ mailr: MailR
+ save: Save
+ copy: Copy
+ move: Move
+ to: to
+ previous_page: Previous
+ next_page: Next
+ bytes: B
+ kbytes: kB
+ mbytes: MB
+ no_data: No data
+ download: Download
+ view: Show
+ version: Version
+ set: Set
+ no_file_chosen: No file was chosen
+ calendar: Calendar
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6c5abf7..6925dde 100755
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -25,9 +25,9 @@ pl:
link: Sznurek
attributes:
link:
- name: Nazwa
url: Adres
info: Informacje
+ goto: Idź do
contact:
nick: Pseudonim
first_name: Imię
@@ -93,6 +93,10 @@ pl:
no_entries: Brak sznurków
total_entries: Liczba sznurków
delete_selected: Usuń wybrane
+ modifying: Modyfikacja sznurka
+ was_created: Sznurek został utworzony
+ were_imported: Sznurki zostały zaimportowane
+ goto: Idź do
prefs:
prefs: Ustawienia
@@ -157,6 +161,7 @@ pl:
copy: Skopiuj
trash: Usuń zaznaczone
no_date: Brak daty
+ no_address: Brak adresu
compose:
compose: Nowa wiadomość
@@ -175,6 +180,7 @@ pl:
show:
reply: Odpowiedz
+ reply_all: Odpowiedz wszystkim
show_header: Pokaż nagłówek
delete: Usuń
reply_string: "Odp: "
diff --git a/config/routes.rb b/config/routes.rb
index 755460a..03597e5 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,22 +9,19 @@ Mailr::Application.routes.draw do
match "prefs/identity" => "prefs#identity", :as => :prefs_identity
match "prefs/servers" => "prefs#servers", :as => :prefs_servers
- namespace :contacts do
- post "ops"
- get "export"
- end
- match "/external" => "contacts#external", :as => :contacts_external
-
resources :contacts
-
- namespace :links do
+
+ namespace :contacts do
+ post "import_export"
post "ops"
- get "export"
end
- #match "/external" => "contacts#external", :as => :contacts_external
-
resources :links
+
+ namespace :links do
+ post "import_export"
+ #post "ops"
+ end
namespace :folders do
post "create"
@@ -63,6 +60,8 @@ Mailr::Application.routes.draw do
match "/messages/html_body/:id" => 'messages#html_body' , :as => :html_body
match "/messages/attachment/:id/:idx" => 'messages#attachment', :as => :attachment_download
+ match "/user/autheniticate" => 'user#authenticate', :as => :user_authenticate
+ match "/user/setup/:login" => 'user#setup'
namespace :user do
get "logout"
post "authenticate"
@@ -71,7 +70,8 @@ Mailr::Application.routes.draw do
get "setup"
get "unknown"
end
- match "/user/setup/:login" => 'user#setup'
+
+
#themes_for_rails
diff --git a/db/migrate/20120303202800_create_all_tables.rb b/db/migrate/20120303202800_create_all_tables.rb
index bd60470..b239a82 100755
--- a/db/migrate/20120303202800_create_all_tables.rb
+++ b/db/migrate/20120303202800_create_all_tables.rb
@@ -1,10 +1,8 @@
class CreateAllTables < ActiveRecord::Migration
def up
create_table "contacts", :force => true do |t|
- t.string "nick"
+ t.string "name"
t.string "email"
- t.string "first_name"
- t.string "last_name"
t.string "info"
t.integer "user_id"
t.datetime "created_at"
@@ -44,6 +42,8 @@ class CreateAllTables < ActiveRecord::Migration
t.string "msg_id"
t.string "from_addr"
t.string "to_addr"
+ t.string "cc_addr"
+ t.string "bcc_addr"
t.string "subject"
t.string "content_type"
t.integer "uid"
@@ -91,7 +91,6 @@ class CreateAllTables < ActiveRecord::Migration
create_table :links, :force => true do |t|
t.integer :user_id
t.integer :lgroup_id
- t.string :name
t.string :url
t.string :info
end
diff --git a/db/migrate/20120325115720_add_cc_addr_to_messages.rb b/db/migrate/20120325115720_add_cc_addr_to_messages.rb
deleted file mode 100644
index e770e46..0000000
--- a/db/migrate/20120325115720_add_cc_addr_to_messages.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class AddCcAddrToMessages < ActiveRecord::Migration
- def up
- add_column :messages,:cc_addr,:string
- end
- def down
- remove_column :messages,:cc_addr
- end
-end
diff --git a/db/schema.rb b/db/schema.rb
index b6a954c..a5040ac 100755
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,13 +10,11 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120325115720) do
+ActiveRecord::Schema.define(:version => 20120303202800) do
create_table "contacts", :force => true do |t|
- t.string "nick"
+ t.string "name"
t.string "email"
- t.string "first_name"
- t.string "last_name"
t.string "info"
t.integer "user_id"
t.datetime "created_at"
@@ -53,7 +51,6 @@ ActiveRecord::Schema.define(:version => 20120325115720) do
create_table "links", :force => true do |t|
t.integer "user_id"
t.integer "lgroup_id"
- t.string "name"
t.string "url"
t.string "info"
end
@@ -64,6 +61,8 @@ ActiveRecord::Schema.define(:version => 20120325115720) do
t.string "msg_id"
t.string "from_addr"
t.string "to_addr"
+ t.string "cc_addr"
+ t.string "bcc_addr"
t.string "subject"
t.string "content_type"
t.integer "uid"
@@ -72,7 +71,6 @@ ActiveRecord::Schema.define(:version => 20120325115720) do
t.datetime "date"
t.datetime "created_at"
t.datetime "updated_at"
- t.string "cc_addr"
end
create_table "prefs", :force => true do |t|
diff --git a/lib/tasks/clear_db.rake b/lib/tasks/clear_db.rake
index b12913c..4462132 100755
--- a/lib/tasks/clear_db.rake
+++ b/lib/tasks/clear_db.rake
@@ -1,4 +1,4 @@
-namespace :db do
+namespace :mailr do
desc "Removes all users data from db"
task :remove_all_data => :environment do