e9_crm 0.1.25 → 0.1.26

data/app/views/e9_crm/campaigns/_header.html.haml

@@ -1,16 +1,21 @@
 .toolbar
   .toolbar-left
+  .toolbar-middle
     = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %select{:name => 'type'}
-        = campaign_type_select_options
-      %select{:name => 'group'}
-        = campaign_group_select_options
-      %select{:name => 'active'}
-        = campaign_active_select_options
+      %fieldset
+        %legend= t(:form_legend_filter_campaigns)
+        %select{:name => 'type'}
+          = campaign_type_select_options
+        %select{:name => 'group'}
+          = campaign_group_select_options
+        %select{:name => 'active'}
+          = campaign_active_select_options
 
   .toolbar-right
     = form_tag new_campaign_path, :method => :get, :id => 'new_campaign_form' do
-      = label_tag 'new_campaign_type_select', t('activerecord.links.new', :model => Campaign.model_name.human)
-      %select{:name => 'type', :id => 'new_campaign_type_select'}
-        = campaign_type_select_options(false)
+      %fieldset
+        %legend= t(:form_legend_manage)
+        = label_tag 'new_campaign_type_select', t('activerecord.links.new', :model => Campaign.model_name.human)
+        %select{:name => 'type', :id => 'new_campaign_type_select'}
+          = campaign_type_select_options(false)
         = submit_tag t(:go), :name => nil

data/app/views/e9_crm/companies/_header.html.haml

@@ -1,4 +1,10 @@
 .toolbar
+  .toolbar-left
+  .toolbar-middle
   .toolbar-right
-    = link_to_new_resource(Company)
-    = link_to_collection(Contact)
+    %fieldset
+      %legend= t(:form_legend_manage)
+      .manage-company
+        = link_to_new_resource(Company)
+      .manage-contacts
+        = link_to_collection(Contact)

data/app/views/e9_crm/dated_costs/_dated_cost.html.haml

@@ -1,8 +1,8 @@
-.dated-cost{:id => "dated_cost_#{dated_cost.id}"}
-  .field
+%tr.dated-cost{:id => "dated_cost_#{dated_cost.id}"}
+%td.field
     = l(dated_cost.date)
-  .field.cost{':data-cost' => dated_cost.cost.to_f}
+%td.field.cost{':data-cost' => dated_cost.cost.to_f}
     = dated_cost.cost
-  .actions
+%td.actions
     = link_to_edit_resource(dated_cost, :remote => true)
     = link_to_destroy_resource(dated_cost, :remote => true)

data/app/views/e9_crm/dated_costs/_form.html.haml

@@ -1,3 +1,2 @@
 = form_for resource, :url => polymorphic_path([parent, resource]), :remote => request.xhr? do |f|
-  .errors= resource_error_messages!
   = render 'form_inner', :f => f

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

@@ -1,15 +1,17 @@
 - id = f.object.persisted? ? f.object.id : @temp_id
-.field.date-picker
-  - if temp_id = f.object.temp_id || @temp_id
-    = f.hidden_field :temp_id, :value => temp_id
-  - fid = "dated_cost_date_#{id}"
-  - unless request.xhr?
-    = f.label :date, nil, :class => :req, :for => id
-  = f.text_field :date, :class => 'date-picker', :value => l(f.object.date), :id => id
-.field.cost
-  - fid = "dated_cost_cost_#{id}"
-  - unless request.xhr?
-    = f.label :cost, nil, :class => :req, :for => id
-  = f.text_field :cost, :id => id, :value => f.object.cost.to_money
-.actions
-  = f.submit
+
+%tr
+  %td.field.date-picker
+    - if temp_id = f.object.temp_id || @temp_id
+      = f.hidden_field :temp_id, :value => temp_id
+    - fid = "dated_cost_date_#{id}"
+    - unless request.xhr?
+      = f.label :date, nil, :class => :req, :for => id
+    = f.text_field :date, :class => 'date-picker', :value => l(f.object.date), :id => id
+  %td.field.cost
+    - fid = "dated_cost_cost_#{id}"
+    - unless request.xhr?
+      = f.label :cost, nil, :class => :req, :for => id
+    = f.text_field :cost, :id => id, :value => f.object.cost.to_money
+  %td.actions
+    = f.submit

data/app/views/e9_crm/dated_costs/edit.html.haml

@@ -1,3 +1,3 @@
 - id = resource.persisted? ? "dated_cost_#{resource.id}" : nil
-.dated-cost{:id => id }
+%td.dated-cost{:id => id }
   = render 'form'

data/app/views/e9_crm/dated_costs/edit.js.erb

@@ -1 +1,2 @@
-$("#dated_cost_<%= resource.id %>").html("<%= escape_javascript(render('form')) %>");  
+$("#dated_cost_<%= resource.id %>").html("<%= escape_javascript(render('form')) %>");
+//  .errors= resource_error_messages!  

data/app/views/e9_crm/dated_costs/index.html.haml

@@ -1,15 +1,22 @@
 = title @index_title || e9_t(:index_title)
+.toolbar
+  .toolbar-left
+  .toolbar-middle
+  .toolbar-right
+    = link_to_new_resource(resource_class, :class => 'new-resource')
 
-%fieldset
-  .dated-costs
-    .dated-cost-labels
-      .field
+%table.records
+  %thead.dated-costs
+    %tr.dated-cost-labels
+      %th.field
         = resource_class.human_attribute_name(:date)
-      .field.cost
+      %th.field.cost
         = resource_class.human_attribute_name(:cost)
-
-    = render collection
-
-    .actions
-      = link_to_new_resource(resource_class, :class => 'new-resource')
+      %th= e9_t(:actions)
+  %tbody
+    - if collection.empty?
+      %tr
+        %td{:colspan => 7}= e9_t(:no_records_text)
+    - else
+      = render collection
 

data/app/views/e9_crm/deals/_header.html.haml

@@ -1,15 +1,22 @@
 .toolbar
   .toolbar-left
+  .toolbar-middle
     = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %select{:name => 'status'}
-        = deal_status_select_options
-      %select{:name => 'category'}
-        = deal_category_select_options 
-      %select{:name => 'owner'}
-        = deal_owner_select_options 
-      %select{:name => 'closed'}
-        = deal_date_select_options(:type => :in_month)
+      %fieldset
+        %legend= t(:form_legend_filter_campaigns)
+        %select{:name => 'status'}
+          = deal_status_select_options
+        %select{:name => 'category'}
+          = deal_category_select_options 
+        %select{:name => 'owner'}
+          = deal_owner_select_options 
+        %select{:name => 'closed'}
+          = deal_date_select_options(:type => :in_month)
 
   .toolbar-right
-    = link_to I18n.t('activerecord.links.index', :models => 'Leads'), leads_path
-    = link_to_new_resource(Deal)
+    %fieldset
+      %legend= t(:form_legend_manage)
+      .manage-leads
+      = link_to I18n.t('activerecord.links.index', :models => 'Leads'), leads_path
+      .manage-new-deals
+      = link_to_new_resource(Deal)

data/app/views/e9_crm/deals/_leads_header.html.haml

@@ -1,12 +1,18 @@
 .toolbar
   .toolbar-left
+  .toolbar-middle
     = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %select{:name => 'offer'}
-        = deal_offer_select_options 
-      %select{:name => 'from'}
-        = deal_date_select_options
-      %select{:name => 'until'}
-        = deal_date_select_options(:type => :until)
+      %fieldset
+        %legend= t(:form_legend_filter_campaigns)
+        %select{:name => 'offer'}
+          = deal_offer_select_options 
+        %select{:name => 'from'}
+          = deal_date_select_options
+        %select{:name => 'until'}
+          = deal_date_select_options(:type => :until)
 
   .toolbar-right
-    = link_to_collection(Deal)
+    %fieldset
+      %legend= t(:form_legend_manage)
+      .manage-deals
+        = link_to_collection(Deal)

data/app/views/e9_crm/email_templates/_header.html.haml

@@ -1,3 +1,7 @@
 .toolbar
+  .toolbar-left
+  .toolbar-middle
   .toolbar-right
-    = link_to_new_resource(EmailTemplate)
+    %fieldset
+      %legend= t(:form_legend_manage)
+      = link_to_new_resource(EmailTemplate)

data/config/locales/e9.en.yml

@@ -11,6 +11,8 @@ en:
         index_title_with_search: "%{models} matching \"%{search}\""
         index_title_with_tags: "%{models} tagged \"%{tagged}\""
         index_title_with_search_and_tags: "%{models} tagged \"%{tagged}\", matching \"%{search}\""
+        form_legend_email: Email Actions
+        form_legend_search: Search Filters
         form_legend_contact: Contact Information
         form_legend_standard: Personal Information
         send_email_template: Send Email

data/config/locales/en.yml

@@ -10,7 +10,11 @@ en:
   deal_owner_legend: Responsible
   no_deal_owner: No one is responsible
   deal_contact_legend: Associated Contacts
-
+  
+  #legend text for toolbar in admin
+  form_legend_manage: Manage
+  form_legend_filter_campaigns: Filters
+  
   actions: Actions
   clear: Clear
   clear_all_filters: Clear All Filters

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.25'
+  VERSION = '0.1.26'
 end

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors: 
 - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-26 00:00:00 Z
+date: 2011-09-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails