fat_free_crm 0.11.3 → 0.11.4

data/app/views/accounts/new.js.rjs

@@ -1,10 +1,8 @@
 page.call "crm.flick", :empty, :toggle
-page.call "crm.hide_form", :options if called_from_index_page?
 page.call "crm.flip_form", :create_account
 
 unless params[:cancel].true?
   page[:create_account].replace_html :partial => "new"
-  page.call "crm.init_chosen_fields"
   page.call "crm.set_title", :create_account, t(:create_account)
 else
   page.call "crm.set_title", :create_account, t(:accounts)

data/app/views/accounts/show.html.haml

@@ -1,24 +1,26 @@
-= styles_for :task, :contact, :opportunity
+- if (template = template_for_current_view)
+  = render(template, :account => @account)
+- else
+  
+  -# default view
 
-#confirm{ hidden }
-.title_tools#menu
-  = link_to_inline(:edit_account, edit_account_path(@account), :text => t(:edit)) + " | "
-  = link_to_function(t(:delete) + '?', confirm_delete(@account))
-.title#edit_account_title= h(@account.name)
+  = styles_for :task, :contact, :opportunity
 
-%div#edit_account{ hidden }
+  = render 'accounts/title_bar', :account => @account
 
-= render "comments/new", :commentable => @account
-= render :partial => "shared/timeline", :collection => @timeline
+  %div#edit_account{ hidden }
 
-= hook(:show_account_bottom, self) do
+  = render "comments/new", :commentable => @account
+  = render :partial => "shared/timeline", :collection => @timeline
 
-  = render :partial => "tasks/tasks", :locals => {:object => @account}
+  = hook(:show_account_bottom, self) do
 
-  = render :partial => "contacts/contacts", :locals => {:object => @account}
+    = render :partial => "tasks/tasks", :locals => {:object => @account}
 
-  = render :partial => "opportunities/opportunities", :locals => {:object => @account}
+    = render "contacts/contacts", :object => @account
 
-  = render :partial => "versions/versions", :locals => {:object => @account}
+    = render "opportunities/opportunities", :object => @account
 
-  = load_select_popups_for(@account, :tasks, :contacts, :opportunities)
+    = render "versions/versions", :object => @account
+
+    = load_select_popups_for(@account, :tasks, :contacts, :opportunities)

data/app/views/accounts/show.js.erb

@@ -0,0 +1,2 @@
+jQuery('#main').html('<%= j (render :template => "accounts/show.html", :account => @account) %>')
+<%= raw generate_js_for_popups(@account, :tasks, :contacts, :opportunities) %>

data/app/views/admin/custom_fields/_base_field.html.haml

@@ -0,0 +1,21 @@
+%table
+  %tr
+    %td
+      .label.top Maxlength:
+      = f.text_field :maxlength
+    %td= spacer
+    %td
+      .label.top
+        = f.check_box :required
+        = f.label :required
+        %br
+        = f.check_box :disabled
+        = f.label :disabled
+  %tr
+    %td
+      = f.label :hint, :class => "label top"
+      = f.text_field :hint
+    %td= spacer
+    %td
+      = f.label :placeholder, :class => "label top"
+      = f.text_field :placeholder

data/app/views/admin/custom_fields/_check_boxes_field.html.haml

@@ -0,0 +1,6 @@
+%div
+  .label.top.req
+    = "Select Options (pipe separated):"
+= f.text_field :collection_string, :class => 'field_collection_string', :size => 78
+
+= render :partial => 'admin/custom_fields/base_field', :locals => {:f => f}

data/app/views/admin/custom_fields/_date_field.html.haml

@@ -0,0 +1,14 @@
+%table
+  %tr
+    %td
+      .label.top Hint:
+      = f.text_field :hint
+    %td= spacer
+    %td
+      .label.top
+        %span Required:
+        = f.check_box :required
+        %br
+        %span Disabled:
+        = f.check_box :disabled
+        %div{:style => 'width: 240px;'}

data/app/views/admin/custom_fields/_date_pair_field.html.haml

@@ -0,0 +1,21 @@
+- field1 = f.object || CustomFieldPair.new
+- field2 = f.object.respond_to?(:paired_with) ? field1.paired_with : CustomFieldPair.new
+
+%table{:class => :pairs}
+  = fields_for("pair[0]", field1) do |first|
+    = fields_for("pair[1]", field2) do |second|
+      %tr
+        %td
+          .label.top Hint:
+          = first.text_field :hint
+        %td= spacer
+        %td
+          .label.top
+            %span Required:
+            = first.check_box :required
+            %br
+            %span Disabled:
+            = first.check_box :disabled
+            = first.hidden_field :id
+            = second.hidden_field :id
+            %div{:style => 'width: 240px;'}

data/app/views/admin/custom_fields/_datetime_field.html.haml

@@ -0,0 +1,14 @@
+%table
+  %tr
+    %td
+      .label.top Hint:
+      = f.text_field :hint
+    %td= spacer
+    %td
+      .label.top
+        %span Required:
+        = f.check_box :required
+        %br
+        %span Disabled:
+        = f.check_box :disabled
+        %div{:style => 'width: 240px;'}

data/app/views/admin/custom_fields/_datetime_pair_field.html.haml

@@ -0,0 +1,21 @@
+- field1 = f.object || CustomFieldPair.new
+- field2 = f.object.respond_to?(:paired_with) ? field1.paired_with : CustomFieldPair.new
+
+%table{:class => :pairs}
+  = fields_for("pair[0]", field1) do |first|
+    = fields_for("pair[1]", field2) do |second|
+      %tr
+        %td
+          .label.top Hint:
+          = first.text_field :hint
+        %td= spacer
+        %td
+          .label.top
+            %span Required:
+            = first.check_box :required
+            %br
+            %span Disabled:
+            = first.check_box :disabled
+            = first.hidden_field :id
+            = second.hidden_field :id
+            %div{:style => 'width: 240px;'}

data/app/views/admin/custom_fields/_radio_field.html.haml

@@ -0,0 +1,6 @@
+%div
+  .label.top.req
+    = "Select Options (pipe separated):"
+= f.text_field :collection_string, :class => 'field_collection_string', :size => 78
+
+= render :partial => 'admin/custom_fields/base_field', :locals => {:f => f}

data/app/views/admin/custom_fields/_select_field.html.haml

@@ -0,0 +1,25 @@
+%div
+  .label.top.req
+    = "Select Options (pipe separated):"
+= f.text_field :collection_string, :class => 'field_collection_string', :size => 78
+
+%table
+  %tr
+    %td
+      
+    %td= spacer
+    %td
+      .label.top
+        %span Required:
+        = f.check_box :required
+        %br
+        %span Disabled:
+        = f.check_box :disabled
+  %tr
+    %td
+      .label.top Hint:
+      = f.text_field :hint
+    %td= spacer
+    %td
+      .label.top Placeholder:
+      = f.text_field :placeholder

data/app/views/admin/custom_fields/_string_field.html.haml

@@ -0,0 +1,2 @@
+
+= render :partial => 'admin/custom_fields/base_field', :locals => {:f => f}

data/app/views/admin/field_groups/_field_group.html.haml

@@ -8,7 +8,7 @@
     - unless field_group.name == "custom_fields"
       = link_to_inline(edit_form_id, edit_admin_field_group_path(field_group), :text => t(:edit_field_group))
       |
-    = link_to_inline(create_form_id, new_admin_field_path(:field_group_id => field_group.id), :text => t(:create_field))
+    = link_to(arrow_for(create_form_id) + t(:create_field), '#', :class => 'create')
     - unless field_group.name == "custom_fields"
       |
       = link_to_confirm(field_group)
@@ -16,12 +16,14 @@
   .subtitle{ :id => "#{dom_id(field_group)}_title" }= field_group_subtitle(field_group)
 
   .remote{ hidden.merge(:id => edit_form_id) }
-  .remote{ hidden.merge(:id => create_form_id) }
 
   .list{ :id => dom_id(field_group, :fields) }
-    - if (fields = field_group.fields).present?
+    - if (fields = field_group.fields.without_pairs).present?
       = render :partial => "admin/fields/field", :collection => fields
     - else
-      %div{:id => "empty_#{asset}_field_group_#{field_group.id}"}
+      .empty{:id => "empty_#{asset}_field_group_#{field_group.id}"}
         = t(:field_group_empty)
-        = link_to_inline(create_form_id, new_admin_field_path(:field_group_id => field_group.id), :plain => true, :text => t(:create_field))
+        = link_to t(:create_field), '#', :class => 'create', 'data-for' => create_form_id
+
+    .remote{ hidden.merge(:id => create_form_id, :class => 'create_field') }
+      = render :partial => 'admin/fields/form', :locals => {:field_group_id => field_group.id}

data/app/views/admin/field_groups/_top_section.html.haml

@@ -1,13 +1,14 @@
 .section
   = f.hidden_field :klass_name
 
-  %table
+  %table{:style => 'width:auto;'}
     %tr
       %td
         .label.top.req= t(:label) + ":"
         = f.text_field :label
       %td= spacer
       %td
-        .label.top= t(:restrict_by_tag) + ":"
-        %small= t(:restrict_by_tag_info, :assets => f.object.klass_name.downcase.pluralize) + ":"
+        .label.top
+          =t(:restrict_by_tag)
+          %small= t(:restrict_by_tag_info, :assets => f.object.klass_name.downcase.pluralize)
         = f.select :tag_id, Tag.all.map { |tag| [tag.name, tag.id] }, :include_blank => true

data/app/views/admin/field_groups/create.js.rjs

@@ -6,7 +6,7 @@ container_id = "#{asset}_field_groups"
 if @field_group.valid?
   page["#{id}_arrow"].replace_html "►"
   page.visual_effect :toggle_blind, id, :duration => 0.3, :afterFinish => 'function(effect) {effect.element.update("")}'
-  page.insert_html :top, container_id, :partial => "field_group", :collection => [ @field_group ]
+  page.insert_html :bottom, container_id, :partial => "field_group", :collection => [ @field_group ]
   group_list_ids = klass.field_groups.map {|field_group| dom_id(field_group, :fields)}
   klass.field_groups.each do |field_group|
     page.insert_html :bottom, container_id, sortable_element(dom_id(field_group, :fields), :url => sort_admin_fields_path(:field_group_id => field_group.id), :containment => group_list_ids, :dropOnEmpty => true)
@@ -18,4 +18,3 @@ else
   page[id].replace_html :partial => "new"
   page[id].visual_effect :shake, :duration => 0.25, :distance => 6
 end
-

data/app/views/admin/fields/_field.html.haml

@@ -1,15 +1,17 @@
-%li.highlight.position[field]
+%li.highlight.position{:class => field.class.name.underscore, :id => "field_#{field.id}"}
   %span.handle
     %img( src="/assets/sortable.gif" )
 
   .tools
     %small
-      = link_to_edit(field, :url => edit_admin_field_path(field), :klass_name => 'Field') + " | "
+      = link_to t(:edit), edit_admin_field_path(field), :class => 'edit'
       = link_to_delete(field, :url => admin_field_path(field), :klass_name => 'Field')
 
   %tt
     %b= field.label
-    == (#{t('field_types.' + field.as)})
+    == (#{t("field_types.#{field.as}.title")})
 
     == added #{time_ago_in_words(field.created_at)} ago
     = hook(:field_bottom, self, :field => field)
+
+  .edit_field

data/app/views/admin/fields/_form.html.haml

@@ -0,0 +1,35 @@
+- @field ||= CustomField.new
+- field_group_id ||= @field.field_group_id
+- new_field = @field.id.nil?
+- url = new_field ? admin_fields_path : admin_field_path
+- html_id = new_field ? nil : "edit_field_#{@field.id}"
+
+%div{:class => new_field ? nil : 'remote edit_field'}
+  = form_for([:admin, @field], :url => url, :as => :field, :html => one_submit_only(:field).merge(:class => nil, :id => html_id), :remote => true) do |f|
+    = link_to( 'x', '#', :class => 'close', :title => t(:close_form) )
+    = f.error_messages
+    
+    = hidden_field_tag 'field[field_group_id]', field_group_id, :id => nil
+
+    .section
+      %table
+        %tr
+          %td
+            .label.top.req Field label:
+            = f.text_field :label, :id => nil
+
+          %td= spacer
+          %td
+            .label.top.req Field type:
+            = select :field, :as, field_edit_as_options(@field), :include_blank => true, :id => nil
+
+      .subform
+        = render(:partial => 'admin/fields/subform') unless new_field
+
+    .buttonbar
+      - if new_field
+        = f.submit t(:create_field), :id => :field_submit
+      - else
+        = f.submit t(:save_field), :id => :field_submit
+      or
+      = link_to( t(:cancel), '#', :class => 'cancel' )

data/app/views/admin/fields/_subform.html.haml

@@ -0,0 +1,6 @@
+
+= fields_for :field, @field do |f|
+  - if (as = f.object.as).present? and lookup_context.exists? "#{as}_field", 'admin/custom_fields', true
+    = render :partial => "admin/custom_fields/#{as}_field", :locals => {:f => f}
+  - else
+    = render :partial => "admin/custom_fields/base_field", :locals => {:f => f}

data/app/views/admin/fields/create.js.erb

@@ -0,0 +1,19 @@
+<% id = "create_field_field_group_#{@field.field_group_id}";
+   custom_field_id = "custom_field_#{@field.id}";
+   container_id = "fields_field_group_#{@field.field_group_id}";
+   create_field_id = "create_field_field_group_#{@field.field_group_id}";
+   empty_field_id = "empty_opportunity_field_group_#{@field.field_group_id}"
+%>
+
+<% if @field.valid? %>
+  jQuery("#<%=id%>_arrow").html(crm.COLLAPSED)
+  jQuery('#<%=create_field_id%>').before('<%= j (render :partial => "field", :collection => [@field]) %>')
+  jQuery('#<%=create_field_id%>').before('<%= j (sortable_element(container_id, :url => sort_admin_fields_path(:field_group_id => @field.field_group_id))) %>')
+  jQuery('#<%=custom_field_id%>').effect("highlight", { duration:1500 });
+  jQuery("#<%=create_field_id%>").hide();
+  jQuery("#<%=empty_field_id%>").hide();
+<% else %>
+  jQuery('#<%=id%>').html('<%= j(render :partial => "admin/fields/form", :locals => {:field_group_id => @field.field_group_id} ) %>')
+  jQuery('#<%=id%>').effect("shake", { duration:250, distance: 6 });
+  jQuery('#<%=id%>').find('input[type="text"]').first().focus()
+<% end %>

data/app/views/admin/fields/destroy.js.erb

@@ -0,0 +1,9 @@
+<% id = "field_#{@field.id}" %>
+<% if @field.destroyed? %>
+  jQuery('li#<%=id%>').slideUp(250);
+<% else %>
+  jQuery('li#<%=id%>').effect("shake", { duration:250, distance: 6});
+  jQuery('#flash').html('<%=flash[:warning]%>')
+  jQuery(crm.flash('warning'))
+  <% flash[:warning] = nil %>
+<% end %>

data/app/views/admin/fields/edit.js.erb

@@ -0,0 +1 @@
+jQuery('#<%="field_#{@field.id}"%>').find('.edit_field').replaceWith( '<%= j(render :partial => "admin/fields/form") %>' )

data/app/views/admin/fields/index.html.haml

@@ -1,3 +1,4 @@
+
 = styles_for :fields
 
 .title
@@ -7,13 +8,15 @@
 
 .inline_tabs
   %ul
-    - Field::KLASSES.each do |klass|
-      %li{ "data-tab-class" => klass.name.downcase, :class => ("selected" if klass == Contact) }
-        = link_to t(klass.name.downcase), "#"
+    - list_of_entities.each do |entity|
+      - asset = entity.downcase
+      %li{ "data-tab-class" => asset, :class => ("selected" if entity == 'Contact') }
+        = link_to t(entity), "#"
 
-- Field::KLASSES.each do |klass|
-  - asset = klass.name.downcase
-  .fields{ :id => "#{asset}_section", :style => ("display: none;" if klass != Contact) }
+- list_of_entities.each do |entity|
+  - asset = entity.downcase
+  - klass = asset.classify.constantize
+  .fields{ :id => "#{asset}_section", :style => ("display: none;" if asset != 'contact') }
 
     - create_form_id = "#{asset}_create_field_group"
 
@@ -23,8 +26,6 @@
     .title
       = t(asset)
 
-    .remote{ hidden.merge(:id => create_form_id) }
-
     - container_id = "#{asset}_field_groups"
     .list{ :id => container_id }
       = render :partial => "admin/field_groups/field_group", :collection => klass.field_groups, :locals => {:asset => asset, :klass => klass}
@@ -34,3 +35,5 @@
       = sortable_element(dom_id(field_group, :fields), :url => sort_admin_fields_path(:field_group_id => field_group.id), :containment => group_list_ids, :dropOnEmpty => true)
 
     = sortable_element(container_id, :url => sort_admin_field_groups_path(:asset => asset), :tag => :div)
+
+    .remote{ hidden.merge(:id => create_form_id) }

data/app/views/admin/fields/update.js.erb

@@ -0,0 +1,13 @@
+<% custom_field_id = "field_#{@field.id}";
+   container_id = "#{@field.klass_name.downcase}_field_groups"
+%>
+
+<% if @field.errors.empty? %>
+  jQuery('#<%=custom_field_id%>').replaceWith('<%= j (render :partial => "field", :collection => [@field]) %>')
+  jQuery('#<%=custom_field_id%>').effect("highlight", { duration:1000 });
+  jQuery('#<%=container_id%>').after('<%= j (sortable_element(container_id, :url => sort_admin_fields_path(:field_group_id => @field.field_group_id))) %>')
+<% else %>
+  jQuery('#<%=custom_field_id%>').find('.edit_field').replaceWith('<%= j(render :partial => "form") %>')
+  jQuery('#<%=custom_field_id%>').effect("shake", { duration:250, distance: 6 });
+  jQuery('#<%=custom_field_id%>').find('input[type="text"]').first().focus()
+<% end %>

data/app/views/admin/groups/_edit.html.haml

@@ -0,0 +1,12 @@
+.remote
+  = form_for([:admin, @group], :html => one_submit_only(:group).merge({:autocomplete => 'off'}), :remote => true) do |f|
+    = link_to_close edit_admin_group_path(@group)
+
+    = f.error_messages :object_name => t('group')
+
+    = render "admin/groups/form", :f => f, :edit => true
+
+    .buttonbar
+      = f.submit t(:save_group)
+      #{t :or}
+      = link_to_cancel edit_admin_group_path(@group)

data/app/views/admin/groups/_form.html.haml

@@ -0,0 +1,13 @@
+.section
+  %table
+    %tr
+      %td
+        .label.top.req #{t :name}:
+        = f.text_field :name
+    %tr
+      %td
+        .label.top.req #{t :users}:
+        %br
+        = f.select :user_ids, User.all.map {|u| [u.full_name, u.id]}, {}, :multiple => true
+        :javascript
+          new Chosen($('group_user_ids'));