e9_crm 0.1.28 → 0.1.29

data/app/views/e9_crm/contacts/_form_inner.html.haml

@@ -1,10 +1,11 @@
-%fieldset.nested-associations
-  %legend= f.label(:users)
-  = render_record_attribute_association(:users, f)
-  = link_to_add_record_attribute(:users)
-  .field.checkbox
-    = f.label :ok_to_email
-    = f.check_box :ok_to_email
+.email-wrapper
+  %fieldset.nested-associations
+    %legend= f.label(:users)
+    .field.checkbox
+      = f.label :ok_to_email
+      = f.check_box :ok_to_email
+    = render_record_attribute_association(:users, f)
+    = link_to_add_record_attribute(:users)
 
 %fieldset.contact-standard-fields
   %legend= e9_t(:form_legend_standard)

data/app/views/e9_crm/contacts/_sidebar.html.haml

@@ -1,38 +1,44 @@
 - if resource.users.any?
   .contact-emails
-    %label= Contact.human_attribute_name(:users)
-    - resource.users.each do |user|
-      .contact-email
-        -#= '* ' if contact_user_subscribed_to_newsletter?(user)
-        = link_to(user.email, "mailto:#{user.email}", 'data-contact-id' => resource.id, 'data-user-id' => user.id, :class => 'contact-mailto')
-        = "(#{user.options.type})" if user.options.type
-        = "(primary)"              if user.primary?
+    %fieldset
+      %legend= Contact.human_attribute_name(:users)
+      - resource.users.each do |user|
+        .contact-email
+          -#= '* ' if contact_user_subscribed_to_newsletter?(user)
+          = link_to(user.email, "mailto:#{user.email}", 'data-contact-id' => resource.id, 'data-user-id' => user.id, :class => 'contact-mailto')
+          = "(#{user.options.type})" if user.options.type
+          = "(primary)"              if user.primary?
 
 - if resource.phone_number_attributes.any?
   .contact-phone-numbers
-    %label= Contact.human_attribute_name(:phone_number_attributes)
-    - resource.phone_number_attributes.each do |phone_number_attribute|
-      .contact-phone-number= phone_number_attribute
+    %fieldset
+      %legend= Contact.human_attribute_name(:phone_number_attributes)
+      - resource.phone_number_attributes.each do |phone_number_attribute|
+        .contact-phone-number= phone_number_attribute
 
 - if resource.instant_messaging_handle_attributes.any?
   .contact-im-handles
-    %label= Contact.human_attribute_name(:instant_messaging_handle_attributes)
-    - resource.instant_messaging_handle_attributes.each do |instant_messaging_handle_attribute|
-      .contact-im-handle= instant_messaging_handle_attribute
+    %fieldset
+      %legend= Contact.human_attribute_name(:instant_messaging_handle_attributes)
+      - resource.instant_messaging_handle_attributes.each do |instant_messaging_handle_attribute|
+        .contact-im-handle= instant_messaging_handle_attribute
 
 - if resource.website_attributes.any?
   .contact-websites
-    %label= Contact.human_attribute_name(:website_attributes)
-    - resource.website_attributes.each do |website_attribute|
-      .contact-website
-        = website_attribute.to_s
+    %fieldset
+      %legend= Contact.human_attribute_name(:website_attributes)
+      - resource.website_attributes.each do |website_attribute|
+        .contact-website
+          = website_attribute.to_s
 
 - if resource.address_attributes.any?
   .contact-addresses
-    %label= Contact.human_attribute_name(:address_attributes)
-    - resource.address_attributes.each do |address_attribute|
-      .contact-address
-        .address
-          = address_attribute.to_s
-        .actions
-          = address_attribute.link
+    %fieldset
+      %legend= Contact.human_attribute_name(:address_attributes)
+      - resource.address_attributes.each do |address_attribute|
+        .contact-address
+          .actions
+            = address_attribute.link 
+          .address
+            = address_attribute.to_s
+          

data/app/views/e9_crm/contacts/show.html.haml

@@ -1,84 +1,90 @@
 .contact-body
   = title resource.name
+  .toolbar.showcontact
+    .toolbar-left
+      .contact-photo
+        %img{:src => resource.avatar_url, :alt => "Avatar for #{resource.name}"}
+      = render 'who', :record => resource, :hide_name => true
 
-  .contact-photo
-    %img{:src => resource.avatar_url, :alt => "Avatar for #{resource.name}"}
+    .toolbar-middle
+      %fieldset
+        %legend="Filters"#e9_t(:search_options_legend)
+        - if (tags = resource.tags(:show_all => true)).present?
+          .contact-tags
+            %label #{Tag.model_name.human.pluralize}:
+            = contact_tag_list(tags.sort)
 
-  = render 'who', :record => resource, :hide_name => true
+    .toolbar-right
+      %fieldset
+        %legend="Manage"#e9_t(:search_options_legend)
+        .contact-links.actions
+          = link_to_edit_resource(resource)
+          = link_to "View Activity", page_views_url(:contact => resource.id)
+          = google_search_link(resource.name)
+          = google_news_link(resource.name)
 
-  .contact-links.actions
-    = link_to_edit_resource(resource)
-    = link_to "View Activity", page_views_url(:contact => resource.id)
-    = google_search_link(resource.name)
-    = google_news_link(resource.name)
+  .admin-content-main
+    - if company = resource.company
+      .contact-company
+        %fieldset
+          %legend.contact-subheader= company.name
+          - if company.info.present?
+            = k(company.info)
 
-  - if (tags = resource.tags(:show_all => true)).present?
-    .contact-tags
-      %label #{Tag.model_name.human.pluralize}:
-      = contact_tag_list(tags.sort)
+    .contact-info
+      %fieldset
+        %legend #{Contact.human_attribute_name(:info)}:
+        = resource.info.present? && k(resource.info) || t(:none)
 
-  .contact-info
-    %label #{Contact.human_attribute_name(:info)}:
-    = resource.info.present? && k(resource.info) || t(:none)
-
-  - if company = resource.company
-    .contact-company
+    .contact-deals
       %h2
-        %span.contact-subheader= company.name
+        %span.contact-subheader Deals
         %span.contact-actions
-          = google_search_link(company.name)
-          = google_news_link(company.name)
-      - if company.info.present?
-        = k(company.info)
-
-  .contact-deals
-    %h2
-      %span.contact-subheader Deals
-      %span.contact-actions
-        = link_to_new_resource(Deal, :deal => { :contact_ids => [resource.id] })
-
-    %table
-      %thead
-        %tr
-          %th= Deal.human_attribute_name(:status)
-          %th= Deal.human_attribute_name(:name)
-          %th= Deal.human_attribute_name(:value)
+          = link_to_new_resource(Deal, :deal => { :contact_ids => [resource.id] })
 
-      %tbody
-        - if (deals = resource.associated_deals.leads(false)).blank?
+      %table
+        %thead
           %tr
-            %td{:colspan => 3}= resource_humanize(:no_deals)
-        - else
-          - deals.each do |deal|
+            %th= Deal.human_attribute_name(:status)
+            %th= Deal.human_attribute_name(:name)
+            %th= Deal.human_attribute_name(:value)
+
+        %tbody
+          - if (deals = resource.associated_deals.leads(false)).blank?
             %tr
-              %td.contact-deal-name
-                = link_to deal.name, deal
-              %td.contact-deal-status
-                = deal.status
-              %td.contact-deal-value
-                = deal.value.format
+              %td{:colspan => 3}= resource_humanize(:no_deals)
+          - else
+            - deals.each do |deal|
+              %tr
+                %td.contact-deal-name
+                  = link_to deal.name, deal
+                %td.contact-deal-status
+                  = deal.status
+                %td.contact-deal-value
+                  = deal.value.format
 
-  .contact.leads
-    %h2
-      %span.contact-subheader Leads 
+    .contact.leads
+      %h2
+        %span.contact-subheader Leads 
 
-    %table
-      %thead
-        %tr
-          %th= Deal.human_attribute_name(:created_at)
-          %th= Deal.human_attribute_name(:offer_name)
-        
-      %tbody
-        - if (leads = resource.associated_deals.leads).blank?
+      %table
+        %thead
           %tr
-            %td{:colspan => 2}= resource_humanize(:no_leads)
-        - else
-          - leads.each do |lead|
+            %th= Deal.human_attribute_name(:created_at)
+            %th= Deal.human_attribute_name(:offer_name)
+
+        %tbody
+          - if (leads = resource.associated_deals.leads).blank?
             %tr
-              %td.contact-lead-created-at
-                = l(lead.created_at)
-              %td.contact-lead-name
-                = link_to lead.offer_name, edit_deal_path(lead)
+              %td{:colspan => 2}= resource_humanize(:no_leads)
+          - else
+            - leads.each do |lead|
+              %tr
+                %td.contact-lead-created-at
+                  = l(lead.created_at)
+                %td.contact-lead-name
+                  = link_to lead.offer_name, edit_deal_path(lead)
 
-.contact-sidebar
-  = render 'sidebar'
+  .admin-sidebar-right
+    .contact-sidebar
+      = render 'sidebar'

data/app/views/record_attributes/_user.html.haml

@@ -1,24 +1,27 @@
 .record-attribute.nested-association
-  = f.hidden_field :role
+  = f.fields_for f.object.options do |ff|
+    
+    = f.hidden_field :role
+    
+    .field.controls
+      .field.radio
+        = ff.hidden_field :primary, :value => false
+        = ff.label :primary_true, ff.object.class.human_attribute_name(:primary)
+        = ff.radio_button :primary, true
 
-  - if f.object.persisted?
-    = f.hidden_field :id
-    = f.hidden_field :_destroy, :value => 0
-    .field.contact-email
-      <input type="hidden" value="#{f.object.email}"/>
-      = f.object.email
-  - else
-    .field.contact-email
-      = f.text_field :email
+      = link_to_destroy_record_attribute
+    
+    - if f.object.persisted?
+      = f.hidden_field :id
+      = f.hidden_field :_destroy, :value => 0
+      .field.contact-email
+        <input type="hidden" value="#{f.object.email}"/>
+        = f.object.email
+    - else
+      .field.contact-email
+        = f.text_field :email
 
-  = f.fields_for f.object.options do |ff|
+  
     - if (types = User.email_types).present?
       .field
         = ff.select :type, types
-    .field.radio
-      = ff.hidden_field :primary, :value => false
-      = ff.label :primary_true, ff.object.class.human_attribute_name(:primary)
-      = ff.radio_button :primary, true
-
-  -#- if f.object.prospect?
-  = link_to_destroy_record_attribute

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.28'
+  VERSION = '0.1.29'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: e9_crm
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-07 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &10401800 !ruby/object:Gem::Requirement
+  requirement: &23190800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10401800
+  version_requirements: *23190800
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &10401260 !ruby/object:Gem::Requirement
+  requirement: &23189200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.13'
   type: :runtime
   prerelease: false
-  version_requirements: *10401260
+  version_requirements: *23189200
 description: ! "*NOTE his plugin requires the private e9_base CMS gem and WILL NOT
   WORK without it.*\n\nCRM Plugin for the e9 CMS\n=========================\n\nTo
   use, add as a gem and install by running:\n\n    rails g e9_crm:install\n\nThen