innetra-easy_contacts 0.0.1 → 0.2.0

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('easy_contacts', '0.0.1') do |e|
+Echoe.new('easy_contacts', '0.2.0') do |e|
   e.description    = "Easy Contacts for Ruby on Rails 2.2 (i18n)"
   e.url            = "http://github.com/innetra/easy_contacts"
   e.author         = "Ivan Torres"
@@ -11,4 +11,4 @@ Echoe.new('easy_contacts', '0.0.1') do |e|
   e.development_dependencies = []
 end
 
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each { |f| load f }
+#Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each { |f| load f }

data/easy_contacts.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_contacts}
-  s.version = "0.0.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ivan Torres"]
-  s.date = %q{2009-01-17}
+  s.date = %q{2009-01-23}
   s.description = %q{Easy Contacts for Ruby on Rails 2.2 (i18n)}
   s.email = %q{mexpolk@gmail.com}
-  s.extra_rdoc_files = ["tasks/init.rake"]
-  s.files = ["Manifest", "tasks/init.rake", "generators/easy_contacts/easy_contacts_generator.rb", "generators/easy_contacts/templates/stylesheets/people.css", "generators/easy_contacts/templates/stylesheets/companies.css", "generators/easy_contacts/templates/stylesheets/default.css", "generators/easy_contacts/templates/helpers/emails_helper.rb", "generators/easy_contacts/templates/helpers/shadowbox_helper.rb", "generators/easy_contacts/templates/helpers/phones_helper.rb", "generators/easy_contacts/templates/helpers/web_sites_helper.rb", "generators/easy_contacts/templates/helpers/instant_messengers_helper.rb", "generators/easy_contacts/templates/helpers/addresses_helper.rb", "generators/easy_contacts/templates/helpers/form_helper.rb", "generators/easy_contacts/templates/migrations/easy_contacts.rb", "generators/easy_contacts/templates/views/phones/destroy.js.rjs", "generators/easy_contacts/templates/views/phones/_phones.html.erb", "generators/easy_contacts/templates/views/phones/_phone.html.erb", "generators/easy_contacts/templates/views/companies/index.html.erb", "generators/easy_contacts/templates/views/companies/show.html.erb", "generators/easy_contacts/templates/views/companies/edit.html.erb", "generators/easy_contacts/templates/views/companies/new.html.erb", "generators/easy_contacts/templates/views/companies/index.js.erb", "generators/easy_contacts/templates/views/companies/_company.html.erb", "generators/easy_contacts/templates/views/countries/index.js.erb", "generators/easy_contacts/templates/views/emails/destroy.js.rjs", "generators/easy_contacts/templates/views/emails/_email.html.erb", "generators/easy_contacts/templates/views/emails/_emails.html.erb", "generators/easy_contacts/templates/views/instant_messengers/destroy.js.rjs", "generators/easy_contacts/templates/views/instant_messengers/_instant_messengers.html.erb", "generators/easy_contacts/templates/views/instant_messengers/_instant_messenger.html.erb", "generators/easy_contacts/templates/views/people/index.html.erb", "generators/easy_contacts/templates/views/people/show.html.erb", "generators/easy_contacts/templates/views/people/edit.html.erb", "generators/easy_contacts/templates/views/people/new.html.erb", "generators/easy_contacts/templates/views/people/_person.html.erb", "generators/easy_contacts/templates/views/web_sites/_web_site.html.erb", "generators/easy_contacts/templates/views/web_sites/destroy.js.rjs", "generators/easy_contacts/templates/views/web_sites/_web_sites.html.erb", "generators/easy_contacts/templates/views/provinces/index.js.erb", "generators/easy_contacts/templates/views/contacts/_contact_info.html.erb", "generators/easy_contacts/templates/views/contacts/index.html.erb", "generators/easy_contacts/templates/views/contacts/_contact.html.erb", "generators/easy_contacts/templates/views/cities/index.js.erb", "generators/easy_contacts/templates/views/addresses/destroy.js.rjs", "generators/easy_contacts/templates/views/addresses/_address.html.erb", "generators/easy_contacts/templates/views/addresses/_addresses.html.erb", "generators/easy_contacts/templates/models/city.rb", "generators/easy_contacts/templates/models/web_site.rb", "generators/easy_contacts/templates/models/web_site_type.rb", "generators/easy_contacts/templates/models/phone.rb", "generators/easy_contacts/templates/models/country.rb", "generators/easy_contacts/templates/models/email.rb", "generators/easy_contacts/templates/models/address.rb", "generators/easy_contacts/templates/models/company.rb", "generators/easy_contacts/templates/models/email_type.rb", "generators/easy_contacts/templates/models/instant_messenger.rb", "generators/easy_contacts/templates/models/instant_messenger_protocol.rb", "generators/easy_contacts/templates/models/province.rb", "generators/easy_contacts/templates/models/instant_messenger_type.rb", "generators/easy_contacts/templates/models/phone_type.rb", "generators/easy_contacts/templates/models/address_type.rb", "generators/easy_contacts/templates/models/person.rb", "generators/easy_contacts/templates/models/contact.rb", "generators/easy_contacts/templates/controllers/web_sites_controller.rb", "generators/easy_contacts/templates/controllers/phones_controller.rb", "generators/easy_contacts/templates/controllers/people_controller.rb", "generators/easy_contacts/templates/controllers/emails_controller.rb", "generators/easy_contacts/templates/controllers/countries_controller.rb", "generators/easy_contacts/templates/controllers/cities_controller.rb", "generators/easy_contacts/templates/controllers/contacts_controller.rb", "generators/easy_contacts/templates/controllers/addresses_controller.rb", "generators/easy_contacts/templates/controllers/provinces_controller.rb", "generators/easy_contacts/templates/controllers/instant_messengers_controller.rb", "generators/easy_contacts/templates/controllers/companies_controller.rb", "generators/easy_contacts/templates/locales/en.easy_contacts.yml", "generators/easy_contacts/templates/locales/es-MX.easy_contacts.yml", "Rakefile", "easy_contacts.gemspec"]
+  s.extra_rdoc_files = ["lib/easy_contacts.rb"]
+  s.files = ["Manifest", "generators/easy_contacts/easy_contacts_generator.rb", "generators/easy_contacts/templates/stylesheets/contacts.css", "generators/easy_contacts/templates/stylesheets/default.css", "generators/easy_contacts/templates/helpers/emails_helper.rb", "generators/easy_contacts/templates/helpers/shadowbox_helper.rb", "generators/easy_contacts/templates/helpers/phones_helper.rb", "generators/easy_contacts/templates/helpers/web_sites_helper.rb", "generators/easy_contacts/templates/helpers/instant_messengers_helper.rb", "generators/easy_contacts/templates/helpers/addresses_helper.rb", "generators/easy_contacts/templates/helpers/form_helper.rb", "generators/easy_contacts/templates/migrations/easy_contacts.rb", "generators/easy_contacts/templates/tasks/init.rake", "generators/easy_contacts/templates/views/phones/destroy.js.rjs", "generators/easy_contacts/templates/views/phones/_phones.html.erb", "generators/easy_contacts/templates/views/phones/_phone.html.erb", "generators/easy_contacts/templates/views/companies/show.html.erb", "generators/easy_contacts/templates/views/companies/edit.html.erb", "generators/easy_contacts/templates/views/companies/new.html.erb", "generators/easy_contacts/templates/views/companies/index.js.erb", "generators/easy_contacts/templates/views/companies/_form.html.erb", "generators/easy_contacts/templates/views/countries/index.js.erb", "generators/easy_contacts/templates/views/emails/destroy.js.rjs", "generators/easy_contacts/templates/views/emails/_email.html.erb", "generators/easy_contacts/templates/views/emails/_emails.html.erb", "generators/easy_contacts/templates/views/instant_messengers/destroy.js.rjs", "generators/easy_contacts/templates/views/instant_messengers/_instant_messengers.html.erb", "generators/easy_contacts/templates/views/instant_messengers/_instant_messenger.html.erb", "generators/easy_contacts/templates/views/people/show.html.erb", "generators/easy_contacts/templates/views/people/edit.html.erb", "generators/easy_contacts/templates/views/people/new.html.erb", "generators/easy_contacts/templates/views/people/index.js.erb", "generators/easy_contacts/templates/views/people/_form.html.erb", "generators/easy_contacts/templates/views/web_sites/_web_site.html.erb", "generators/easy_contacts/templates/views/web_sites/destroy.js.rjs", "generators/easy_contacts/templates/views/web_sites/_web_sites.html.erb", "generators/easy_contacts/templates/views/provinces/index.js.erb", "generators/easy_contacts/templates/views/contacts/_contact_info.html.erb", "generators/easy_contacts/templates/views/contacts/index.html.erb", "generators/easy_contacts/templates/views/contacts/_contact.html.erb", "generators/easy_contacts/templates/views/contacts/index.js.erb", "generators/easy_contacts/templates/views/cities/index.js.erb", "generators/easy_contacts/templates/views/addresses/destroy.js.rjs", "generators/easy_contacts/templates/views/addresses/_address.html.erb", "generators/easy_contacts/templates/views/addresses/_addresses.html.erb", "generators/easy_contacts/templates/models/city.rb", "generators/easy_contacts/templates/models/web_site.rb", "generators/easy_contacts/templates/models/web_site_type.rb", "generators/easy_contacts/templates/models/phone.rb", "generators/easy_contacts/templates/models/country.rb", "generators/easy_contacts/templates/models/email.rb", "generators/easy_contacts/templates/models/address.rb", "generators/easy_contacts/templates/models/company.rb", "generators/easy_contacts/templates/models/email_type.rb", "generators/easy_contacts/templates/models/instant_messenger.rb", "generators/easy_contacts/templates/models/instant_messenger_protocol.rb", "generators/easy_contacts/templates/models/province.rb", "generators/easy_contacts/templates/models/instant_messenger_type.rb", "generators/easy_contacts/templates/models/phone_type.rb", "generators/easy_contacts/templates/models/address_type.rb", "generators/easy_contacts/templates/models/person.rb", "generators/easy_contacts/templates/models/contact.rb", "generators/easy_contacts/templates/controllers/web_sites_controller.rb", "generators/easy_contacts/templates/controllers/phones_controller.rb", "generators/easy_contacts/templates/controllers/people_controller.rb", "generators/easy_contacts/templates/controllers/emails_controller.rb", "generators/easy_contacts/templates/controllers/countries_controller.rb", "generators/easy_contacts/templates/controllers/cities_controller.rb", "generators/easy_contacts/templates/controllers/contacts_controller.rb", "generators/easy_contacts/templates/controllers/addresses_controller.rb", "generators/easy_contacts/templates/controllers/provinces_controller.rb", "generators/easy_contacts/templates/controllers/instant_messengers_controller.rb", "generators/easy_contacts/templates/controllers/companies_controller.rb", "generators/easy_contacts/templates/locales/en.easy_contacts.yml", "generators/easy_contacts/templates/locales/es-MX.easy_contacts.yml", "Rakefile", "lib/easy_contacts.rb", "easy_contacts.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/innetra/easy_contacts}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Easy_contacts"]

data/generators/easy_contacts/easy_contacts_generator.rb

@@ -46,6 +46,11 @@ class EasyContactsGenerator < Rails::Generator::Base
       m.template "locales/es-MX.easy_contacts.yml",
         "config/locales/es-MX.easy_contacts.yml"
 
+      # Rake tasks
+      m.directory('lib/tasks')
+      m.template "tasks/init.rake",
+        "lib/tasks/init.rake"
+
       # Necessary Routes
       unless options[:skip_routes]
         generate_routes
@@ -76,8 +81,7 @@ class EasyContactsGenerator < Rails::Generator::Base
           addresses/_addresses.html.erb
           addresses/destroy.js.rjs
           cities/index.js.erb
-          companies/_company.html.erb
-          companies/index.html.erb
+          companies/_form.html.erb
           companies/index.js.erb
           companies/edit.html.erb
           companies/new.html.erb
@@ -85,6 +89,7 @@ class EasyContactsGenerator < Rails::Generator::Base
           contacts/_contact.html.erb
           contacts/_contact_info.html.erb
           contacts/index.html.erb
+          contacts/index.js.erb
           countries/index.js.erb
           emails/destroy.js.rjs
           emails/_email.html.erb
@@ -92,10 +97,10 @@ class EasyContactsGenerator < Rails::Generator::Base
           instant_messengers/destroy.js.rjs
           instant_messengers/_instant_messenger.html.erb
           instant_messengers/_instant_messengers.html.erb
-          people/index.html.erb
+          people/_form.html.erb
           people/edit.html.erb
+          people/index.js.erb
           people/new.html.erb
-          people/_person.html.erb
           people/show.html.erb
           phones/destroy.js.rjs
           phones/_phone.html.erb
@@ -107,7 +112,7 @@ class EasyContactsGenerator < Rails::Generator::Base
     end
 
     def stylesheets
-      %w[ default companies people ]
+      %w[ default contacts ]
     end
 
     def models
@@ -144,7 +149,7 @@ class EasyContactsGenerator < Rails::Generator::Base
   # Easy Contacts
   map.resources :addresses, :only => :destroy
   map.resources :cities, :only => :index
-  map.resources :companies
+  map.resources :companies, :has_many => :people
   map.resources :contacts, :only => :index
   map.resources :countries, :only => :index
   map.resources :emails, :only => :destroy

data/generators/easy_contacts/templates/controllers/companies_controller.rb

@@ -1,23 +1,16 @@
 class CompaniesController < ApplicationController
 
   def index
-    if params.has_key?(:search)
-      @companies = Company.all(:conditions => ["name LIKE ?", "%#{params[:search]}%"] )
-    else
-      @companies = Company.all
-    end
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.js
-      format.xml  { render :xml => @companies }
-    end
+    @companies = Company.all(:conditions => ["name LIKE ?", "%#{params[:search]}%"] )
   end
 
   def new
     @company = Company.new
-    2.times { @company.phones.build }
+    # Build Person contact fields
+    @company.phones.build
+    @company.phones.build(:phone_type_id => 2)
     @company.emails.build
+    @company.emails.build(:email_type_id => 2)
     @company.instant_messengers.build
     @company.web_sites.build
     @company.addresses.build
@@ -54,6 +47,18 @@ class CompaniesController < ApplicationController
 
   def edit
     @company = Company.find_by_id(params[:id])
+    # Build Company contact fields if blank
+    if @company.phones.blank?
+      @company.phones.build
+      @company.phones.build(:phone_type_id => 2)
+    end
+    if @company.emails.blank?
+      @company.emails.build
+      @company.emails.build(:email_type_id => 2)
+    end
+    @company.instant_messengers.build if @company.instant_messengers.blank?
+    @company.web_sites.build if @company.web_sites.blank?
+    @company.addresses.build if @company.addresses.blank?
   end
 
   def update

data/generators/easy_contacts/templates/controllers/contacts_controller.rb

@@ -1,10 +1,16 @@
 class ContactsController < ApplicationController
   def index
-    @people = Person.all(:order => "name, last_name")
+    if params.has_key?(:search)
+      @contacts = Contact.all(:conditions => ["name LIKE ? OR last_name LIKE ?", "%#{params[:search]}%", "%#{params[:search]}%"],
+        :order => "name, last_name")
+    else
+      @contacts = Contact.all(:order => "name, last_name")
+    end
 
     respond_to do |format|
       format.html # index.html.erb
-      format.xml  { render :xml => @people }
+      format.js
+      format.xml  { render :xml => @contacts }
     end
   end
 end

data/generators/easy_contacts/templates/controllers/people_controller.rb

@@ -1,12 +1,7 @@
 class PeopleController < ApplicationController
 
   def index
-    @people = Person.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @people }
-    end
+    @people = Person.all(:conditions => ["name LIKE ? OR last_name LIKE ?", "%#{params[:search]}%", "%#{params[:search]}%"] )
   end
 
   def new
@@ -53,22 +48,18 @@ class PeopleController < ApplicationController
 
   def edit
     @person = Person.find_by_id(params[:id])
-
     # Build Person contact fields if blank
     if @person.phones.blank?
       @person.phones.build
       @person.phones.build(:phone_type_id => 2)
     end
-
     if @person.emails.blank?
       @person.emails.build
       @person.emails.build(:email_type_id => 2)
     end
-
     @person.instant_messengers.build if @person.instant_messengers.blank?
     @person.web_sites.build if @person.web_sites.blank?
     @person.addresses.build if @person.addresses.blank?
-
   end
 
   def update

data/generators/easy_contacts/templates/helpers/emails_helper.rb

@@ -1,5 +1,14 @@
 module EmailsHelper
-  def place_email_form(owner)
-    render :partial => "emails/emails", :locals => { :owner => owner }
+  def place_email_form(record_or_name, *args)
+    options = {}
+    case record_or_name
+      when String, Symbol
+        options[:fields_prefix] = "#{record_or_name}[email_attributes][]"
+        owner = args.first
+      else
+        owner = record_or_name
+        options[:fields_prefix] = "#{dom_class(owner)}[email_attributes][]"
+    end
+    render :partial => "emails/emails", :locals => { :owner => owner, :options => options }
   end
 end

data/generators/easy_contacts/templates/locales/es-MX.easy_contacts.yml

@@ -1,6 +1,5 @@
 "es-MX":
   activerecord:
-
     models:
       contact: "Contacto"
       person: "Contacto"
@@ -8,7 +7,6 @@
       phone: "Teléfono"
       email: "Correo Electrónico"
       address: "Domicilio"
-
     attributes:
       address:
         address: "Domicilio"
@@ -33,10 +31,11 @@
     delete: "Eliminar"
 
   forms:
-    save: "Guardar"
     cancel: "Cancelar"
-    update: "Actualizar"
     optional_fields: "Datos Opcionales"
+    or: "ó"
+    update: "Actualizar"
+    save: "Guardar"
 
   addresses:
     title: "Domicilio"
@@ -45,24 +44,24 @@
     flash:
       create: "Compañía creada."
       update: "Compañía actualizada."
-    index:
-      title: "Compañías"
-      new_company_link: "Registrar nueva compañía"
     new:
       title: "Registrar Nueva Compañía"
       cancel: "Cancelar"
     edit:
       title: "Editar compañía \"{{name}}\""
     show:
+      back_link: "Contactos"
+      new_person_link: "Agregar nuevo contacto"
       people_in_this_company: "Contactos"
   contacts:
     info:
       title: "Contacto {{name}}"
     index:
-      title: "Contactos"
+      add_link: "Agregar"
       new_person_link: "Registrar nuevo contacto"
       new_company_link: "Registrar nueva companía"
-      add_link: "Agregar"
+      people_count: "{{people_count}} personas"
+      title: "Contactos"
   emails:
     title: "Correo Electrónico"
     add_link: "Agregar"
@@ -73,9 +72,6 @@
     flash:
       create: "Usuario creado."
       update: "Usuario actualizado."
-    index:
-      title: "Contactos"
-      new_person_link: "Registrar nuevo contacto"
     new:
       title: "Registrar Nuevo Contacto"
       cancel: "Cancelar"
@@ -83,7 +79,7 @@
       title: "Editar contacto \"{{full_name}}\""
     show:
       title_description: "{{title}} en {{company}}"
-      contact_data: "Datos {{name}}"
+      back_link: "Contactos"
   phones:
     title: "Teléfonos"
     add_link: "Agregar"

data/generators/easy_contacts/templates/stylesheets/contacts.css

@@ -0,0 +1,14 @@
+#contact_list li {
+  margin: 10px 0;
+}
+
+#contact_list .important {
+  font-size: 16px;
+}
+
+#company_name,
+#person_name,
+#person_last_name {
+  font-size: 20px;
+  font-weight: bold;
+}

data/generators/easy_contacts/templates/views/companies/_form.html.erb

@@ -0,0 +1,6 @@
+<%%= error_messages_for :company %>
+<p>
+  <%%= form.label :name %>
+  <%%= required_field %><br />
+  <%%= form.text_field :name, :size => 60 %>
+</p>

data/generators/easy_contacts/templates/views/companies/edit.html.erb

@@ -2,12 +2,19 @@
   <%%= stylesheet_link_tag "easy_contacts/default", :media => :all %>
   <%%= stylesheet_link_tag "easy_contacts/companies", :media => :all %>
 <%% end -%>
-
 <h1>
   <div class="title_actions">
     <%%= link_to t("forms.cancel"), @company %>
   </div>
   <%%= t("companies.edit.title", :name => @company.name) %>
 </h1>
-
-<%%= render :partial => "/companies/company", :object => @company %>
+<%% form_for @company do |form| %>
+  <%%= render :partial => form %>
+  <hr />
+  <%%= render :partial => "contacts/contact", :object => @company %>
+  <hr />
+  <p>
+    <%%= submit_tag t("forms.save") %>&nbsp;<%%= t("forms.or") %>
+    <%%= link_to t("forms.cancel"), @company, :class => :red %>
+  </p>
+<%% end %>

data/generators/easy_contacts/templates/views/companies/new.html.erb

@@ -5,9 +5,17 @@
 
 <h1>
   <div class="title_actions">
-    <%%= link_to t("companies.new.cancel"), companies_url %>
+    <%%= link_to t("companies.new.cancel"), contacts_url %>
   </div>
   <%%= t "companies.new.title" %>
 </h1>
-
-<%%= render :partial => "/companies/company", :object => @person %>
+<%% form_for @company do |form| %>
+  <%%= render :partial => form %>
+  <hr />
+  <%%= render :partial => "contacts/contact", :object => @company %>
+  <hr />
+  <p>
+    <%%= submit_tag t("forms.save") %>&nbsp;<%%= t("forms.or") %>
+    <%%= link_to t("forms.cancel"), companies_url, :class => :red %>
+  </p>
+<%% end %>

data/generators/easy_contacts/templates/views/companies/show.html.erb

@@ -2,18 +2,25 @@
   <%%= render :partial => "contacts/contact_info", :object => @company %>
 
   <%% shadowbox "people_in_this_company", :class => "sidebar_section" do %>
-    <h1><%%= t("companies.show.people_in_this_company") %></h1>
-    <ul>
-      <%% for person in @company.people -%>
-        <%% content_tag_for(:li, person) do -%>
-          <%%= link_to person.full_name, person %><br />
-          <span class="comment"><%%= person.title %></span>
+    <%% unless @company.people.blank? -%>
+      <h1><%%= t("companies.show.people_in_this_company") %></h1>
+      <ul>
+        <%% for person in @company.people -%>
+          <%% content_tag_for(:li, person) do -%>
+            <%%= link_to person.full_name, person %><br />
+            <span class="comment"><%%= person.title %></span>
+          <%% end -%>
         <%% end -%>
-
-      <%% end -%>
-    </ul>
+      </ul>
+    <%% else -%>
+      <%%= link_to t("companies.show.new_person_link"), new_company_person_url(@company) %>
+    <%% end -%>
   <%% end %>
+
 <%% end -%>
 <h1>
+  <div class="title_actions">
+    <%%= link_to t("companies.show.back_link"), contacts_url %>
+  </div>
   <%%= @company.name %>
 </h1>

data/generators/easy_contacts/templates/views/contacts/index.html.erb

@@ -1,4 +1,5 @@
 <%% content_for :header do -%>
+  <%%= stylesheet_link_tag "easy_contacts/default", :media => :all %>
   <%%= stylesheet_link_tag "easy_contacts/contacts", :media => :all %>
 <%% end -%>
 
@@ -10,12 +11,16 @@
 <%% end -%>
 <h1><%%= t("contacts.index.title") %></h1>
 
-<ul>
-  <%% for person in @people -%>
-    <%% content_tag_for(:li, person) do %>
-      <%%= link_to person.full_name, person,
-        :class => "full_name important" %><br />
-      <%%= person.title_description %>
+<ul id="contact_list">
+  <%% for contact in @contacts -%>
+    <%% content_tag_for(:li, contact) do %>
+      <%% if contact.is_a?Person -%>
+        <%%= link_to contact.full_name, contact, :class => "important" %><br />
+        <%%= contact.title_description %>
+      <%% else -%>
+        <%%= link_to contact.name, contact, :class => "important" %><br />
+        <%%= t("contacts.index.people_count", :people_count => contact.people.count) %>
+      <%% end -%>
     <%% end %>
   <%% end -%>
 </ul>

data/generators/easy_contacts/templates/views/contacts/index.js.erb

@@ -0,0 +1,9 @@
+<ul>
+  <%% for contact in @contacts -%>
+    <%% if contact.is_a?Person %>
+      <li><%%= contact.full_name %></li>
+    <%% else -%>
+      <li><%%= contact.name %></li>
+    <%% end -%>
+  <%% end -%>
+</ul>

data/generators/easy_contacts/templates/views/emails/_email.html.erb

@@ -1,5 +1,5 @@
 <%% content_tag_for(:li, email) do -%>
-  <%% fields_for "#{dom_class(owner)}[email_attributes][]", email do |form| -%>
+  <%% fields_for options[:fields_prefix], email do |form| -%>
     <%% unless email.new_record? -%>
       <%%= form.hidden_field :id, :index => nil %>
     <%% end -%>

data/generators/easy_contacts/templates/views/emails/_emails.html.erb

@@ -1,6 +1,6 @@
 <%% content_tag(:ul, :id => "emails") do -%>
   <%% for email in owner.emails -%>
-    <%%= render :partial => email, :locals => { :owner => owner } %>
+    <%%= render :partial => email, :locals => { :owner => owner, :options => options } %>
   <%% end -%>
 <%% end -%>
 <p>
@@ -8,6 +8,6 @@
     page.insert_html :bottom, :emails,
       :partial => "/emails/email",
       :object => Email.new,
-      :locals => { :owner => owner }
+      :locals => { :owner => owner, :options => options }
   end %>
 </p>

data/generators/easy_contacts/templates/views/people/_form.html.erb

@@ -0,0 +1,35 @@
+<%%= error_messages_for :user %>
+<table>
+  <tr>
+    <td>
+      <%%= form.label :name %>
+      <%%= required_field %><br />
+      <%%= form.text_field :name %>
+    </td>
+    <td>
+      <%%= form.label :last_name %>
+      <%%= required_field %><br />
+      <%%= form.text_field :last_name %>
+    </td>
+  </tr>
+</table>
+<p>
+  <%%= form.label :title %><br />
+  <%%= form.text_field :title, :size => "40" %>
+</p>
+<%% fields_for "person[company_attributes]", @person.company do |form| -%>
+  <p>
+    <%%= form.label :name, t("activerecord.attributes.company.name") %><br />
+    <%%= form.text_field :name, :size => "40", :autocomplete => :off %>
+  </p>
+  <div id="person_company_attributes_name_auto_complete" class="auto_complete" style="display: none;"></div>
+  <script type="text/javascript">
+  //<![CDATA[
+  var person_company_attributes_name_auto_completer = new Ajax.Autocompleter('person_company_attributes_name',
+    'person_company_attributes_name_auto_complete',
+    '<%%= formatted_companies_url(:js) -%>',
+    {callback:function(element, value) { return 'search=' + element.value }, method:'get'})
+  //]]>
+  </script>
+<%% end -%>
+<%%= render :partial => "contacts/contact", :object => @person %>

data/generators/easy_contacts/templates/views/people/edit.html.erb

@@ -1,13 +1,18 @@
 <%% content_for :header do -%>
   <%%= stylesheet_link_tag "easy_contacts/default", :media => :all %>
-  <%%= stylesheet_link_tag "easy_contacts/people", :media => :all %>
+  <%%= stylesheet_link_tag "easy_contacts/contacts", :media => :all %>
 <%% end -%>
-
 <h1>
   <div class="title_actions">
     <%%= link_to t("forms.cancel"), @person %>
   </div>
   <%%= t("people.edit.title", :full_name => @person.full_name) %>
 </h1>
-
-<%%= render :partial => "/people/person", :object => @person %>
+<%% form_for @person do |form| %>
+  <%%= render :partial => form %>
+  <hr />
+  <p>
+    <%%= submit_tag t("forms.save") %>&nbsp;<%= t("forms.or") %>
+    <%%= link_to t("forms.cancel"), @person, :class => :red %>
+  </p>
+<%% end -%>

data/generators/easy_contacts/templates/views/people/index.js.erb

@@ -0,0 +1,5 @@
+<ul>
+  <%% for person in @people -%>
+    <li ><%%= person.full_name %></li>
+  <%% end -%>
+</ul>

data/generators/easy_contacts/templates/views/people/new.html.erb

@@ -1,13 +1,18 @@
 <%% content_for :header do -%>
   <%%= stylesheet_link_tag "easy_contacts/default", :media => :all %>
-  <%%= stylesheet_link_tag "easy_contacts/people", :media => :all %>
+  <%%= stylesheet_link_tag "easy_contacts/contacts", :media => :all %>
 <%% end -%>
-
 <h1>
   <div class="title_actions">
-    <%%= link_to t("people.new.cancel"), people_url %>
+    <%%= link_to t("people.new.cancel"), contacts_url %>
   </div>
   <%%= t "people.new.title" %>
 </h1>
-
-<%%= render :partial => "/people/person", :object => @person %>
+<%% form_for @person do |form| %>
+  <%%= render :partial => form %>
+  <hr />
+  <p>
+    <%%= submit_tag t("forms.save") %>&nbsp;<%%= t("forms.or") %>
+    <%%= link_to t("forms.cancel"), contacts_url, :class => :red %>
+  </p>
+<%% end -%>

data/generators/easy_contacts/templates/views/people/show.html.erb

@@ -2,12 +2,16 @@
   <%%= stylesheet_link_tag "easy_contacts/default", :media => :all %>
   <%%= stylesheet_link_tag "easy_contacts/people", :media => :all %>
 <%% end -%>
-
 <%% content_for :sidebar do -%>
   <%%= render :partial => "contacts/contact_info", :object => @person %>
+  <%% unless @person.company.blank? -%>
+    <%%= render :partial => "contacts/contact_info", :object => @person.company %>
+  <%% end -%>
 <%% end -%>
-
 <h1>
+  <div class="title_actions">
+    <%%= link_to t("people.show.back_link"), contacts_url %>
+  </div>
   <%%= @person.full_name %><br />
   <span class="comment"><%%= @person.title_description %></span>
 </h1>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: innetra-easy_contacts
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ivan Torres
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -08:00
+date: 2009-01-23 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -20,13 +20,11 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- tasks/init.rake
+- lib/easy_contacts.rb
 files: 
 - Manifest
-- tasks/init.rake
 - generators/easy_contacts/easy_contacts_generator.rb
-- generators/easy_contacts/templates/stylesheets/people.css
-- generators/easy_contacts/templates/stylesheets/companies.css
+- generators/easy_contacts/templates/stylesheets/contacts.css
 - generators/easy_contacts/templates/stylesheets/default.css
 - generators/easy_contacts/templates/helpers/emails_helper.rb
 - generators/easy_contacts/templates/helpers/shadowbox_helper.rb
@@ -36,15 +34,15 @@ files:
 - generators/easy_contacts/templates/helpers/addresses_helper.rb
 - generators/easy_contacts/templates/helpers/form_helper.rb
 - generators/easy_contacts/templates/migrations/easy_contacts.rb
+- generators/easy_contacts/templates/tasks/init.rake
 - generators/easy_contacts/templates/views/phones/destroy.js.rjs
 - generators/easy_contacts/templates/views/phones/_phones.html.erb
 - generators/easy_contacts/templates/views/phones/_phone.html.erb
-- generators/easy_contacts/templates/views/companies/index.html.erb
 - generators/easy_contacts/templates/views/companies/show.html.erb
 - generators/easy_contacts/templates/views/companies/edit.html.erb
 - generators/easy_contacts/templates/views/companies/new.html.erb
 - generators/easy_contacts/templates/views/companies/index.js.erb
-- generators/easy_contacts/templates/views/companies/_company.html.erb
+- generators/easy_contacts/templates/views/companies/_form.html.erb
 - generators/easy_contacts/templates/views/countries/index.js.erb
 - generators/easy_contacts/templates/views/emails/destroy.js.rjs
 - generators/easy_contacts/templates/views/emails/_email.html.erb
@@ -52,11 +50,11 @@ files:
 - generators/easy_contacts/templates/views/instant_messengers/destroy.js.rjs
 - generators/easy_contacts/templates/views/instant_messengers/_instant_messengers.html.erb
 - generators/easy_contacts/templates/views/instant_messengers/_instant_messenger.html.erb
-- generators/easy_contacts/templates/views/people/index.html.erb
 - generators/easy_contacts/templates/views/people/show.html.erb
 - generators/easy_contacts/templates/views/people/edit.html.erb
 - generators/easy_contacts/templates/views/people/new.html.erb
-- generators/easy_contacts/templates/views/people/_person.html.erb
+- generators/easy_contacts/templates/views/people/index.js.erb
+- generators/easy_contacts/templates/views/people/_form.html.erb
 - generators/easy_contacts/templates/views/web_sites/_web_site.html.erb
 - generators/easy_contacts/templates/views/web_sites/destroy.js.rjs
 - generators/easy_contacts/templates/views/web_sites/_web_sites.html.erb
@@ -64,6 +62,7 @@ files:
 - generators/easy_contacts/templates/views/contacts/_contact_info.html.erb
 - generators/easy_contacts/templates/views/contacts/index.html.erb
 - generators/easy_contacts/templates/views/contacts/_contact.html.erb
+- generators/easy_contacts/templates/views/contacts/index.js.erb
 - generators/easy_contacts/templates/views/cities/index.js.erb
 - generators/easy_contacts/templates/views/addresses/destroy.js.rjs
 - generators/easy_contacts/templates/views/addresses/_address.html.erb
@@ -99,6 +98,7 @@ files:
 - generators/easy_contacts/templates/locales/en.easy_contacts.yml
 - generators/easy_contacts/templates/locales/es-MX.easy_contacts.yml
 - Rakefile
+- lib/easy_contacts.rb
 - easy_contacts.gemspec
 has_rdoc: true
 homepage: http://github.com/innetra/easy_contacts

data/generators/easy_contacts/templates/stylesheets/companies.css

@@ -1,4 +0,0 @@
-#company_name {
-  font-size: 20px;
-  font-weight: bold;
-}

data/generators/easy_contacts/templates/stylesheets/people.css

@@ -1,13 +0,0 @@
-#person_name,
-#person_last_name {
-  font-size: 20px;
-  font-weight: bold;
-}
-
-.person {
-  padding: 10px 0;
-}
-
-.full_name {
-  font-size: 18px;
-}

data/generators/easy_contacts/templates/views/companies/_company.html.erb

@@ -1,17 +0,0 @@
-<%% form_for company do |form| %>
-  <%%= error_messages_for :company %>
-  <p>
-    <%%= form.label :name %>
-    <%%= required_field %><br />
-    <%%= form.text_field :name, :size => 60 %>
-  </p>
-  <hr />
-
-  <%%= render :partial => "contacts/contact", :object => company %>
-
-  <hr />
-  <p>
-    <%%= submit_tag t("forms.save") %>&nbsp;ó
-    <%%= link_to t("forms.cancel"), companies_url, :class => :red %>
-  </p>
-<%% end %>

data/generators/easy_contacts/templates/views/companies/index.html.erb

@@ -1,21 +0,0 @@
-<%% content_for :header do -%>
-  <%%= stylesheet_link_tag "easy_contacts/default", :media => :all %>
-  <%%= stylesheet_link_tag "easy_contacts/companies", :media => :all %>
-<%% end -%>
-
-<%% content_for :sidebar do -%>
-  <%% shadowbox "options_section", :class => "sidebar_section" do %>
-    <%%= link_to t("companies.index.new_company_link"), new_company_url %><br />
-  <%% end %>
-<%% end -%>
-
-<h1><%%= t("companies.index.title") %></h1>
-
-<ul>
-  <%% for company in @companies -%>
-    <%% content_tag_for(:li, company) do %>
-      <%%= link_to company.name, company,
-        :class => "name important" %>
-    <%% end %>
-  <%% end -%>
-</ul>

data/generators/easy_contacts/templates/views/people/_person.html.erb

@@ -1,44 +0,0 @@
-<%% form_for person do |form| %>
-  <%%= error_messages_for :user %>
-  <table>
-    <tr>
-      <td>
-        <%%= form.label :name %>
-        <%%= required_field %><br />
-        <%%= form.text_field :name %>
-      </td>
-      <td>
-        <%%= form.label :last_name %>
-        <%%= required_field %><br />
-        <%%= form.text_field :last_name %>
-      </td>
-    </tr>
-  </table>
-  <p>
-    <%%= form.label :title %><br />
-    <%%= form.text_field :title, :size => "40" %>
-  </p>
-  <%% fields_for "person[company_attributes]", @person.company do |form| -%>
-    <p>
-      <%%= form.label :name, t("activerecord.attributes.company.name") %><br />
-      <%%= form.text_field :name, :size => "40", :autocomplete => :off %>
-    </p>
-    <div id="person_company_attributes_name_auto_complete" class="auto_complete" style="display: none;"></div>
-    <script type="text/javascript">
-    //<![CDATA[
-    var person_company_attributes_name_auto_completer = new Ajax.Autocompleter('person_company_attributes_name',
-      'person_company_attributes_name_auto_complete',
-      '<%%= formatted_companies_url(:js) -%>',
-      {callback:function(element, value) { return 'search=' + element.value }, method:'get'})
-    //]]>
-    </script>
-  <%% end -%>
-
-  <%%= render :partial => "contacts/contact", :object => @person %>
-
-  <hr />
-  <p>
-    <%%= submit_tag t("forms.save") %>&nbsp;ó
-    <%%= link_to t("forms.cancel"), people_url, :class => :red %>
-  </p>
-<%% end %>

data/generators/easy_contacts/templates/views/people/index.html.erb

@@ -1,21 +0,0 @@
-<%% content_for :header do -%>
-  <%%= stylesheet_link_tag "easy_contacts/default", :media => :all %>
-  <%%= stylesheet_link_tag "easy_contacts/people", :media => :all %>
-<%% end -%>
-
-<%% content_for :sidebar do -%>
-  <%% shadowbox "options_section", :class => "sidebar_section" do %>
-    <%%= link_to t("people.index.new_person_link"), new_person_url %><br />
-  <%% end %>
-<%% end -%>
-<h1><%%= t("people.index.title") %></h1>
-
-<ul>
-  <%% for person in @people -%>
-    <%% content_tag_for(:li, person) do %>
-      <%%= link_to person.full_name, person,
-        :class => "full_name important" %><br />
-      <%%= person.title_description %>
-    <%% end %>
-  <%% end -%>
-</ul>