e9_crm 0.1.11 → 0.1.12

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

@@ -28,9 +28,10 @@
     = submit_tag t(:go), :name => nil
 
   = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-    %select{:name => 'company'}
+    = label_tag 'contact_company_select', Company.model_name.human
+    %select{:name => 'company', :id => 'contact_company_select'}
       = company_select_options
 
   = render 'tag_table'
   .actions
-    = submit_tag t(:clear), :name => nil, :id => 'contact_search_clear'
+    = submit_tag t(:clear_all_filters), :name => nil, :id => 'contact_search_clear'

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

@@ -1,15 +1,9 @@
 - tagged_params = Array.wrap(params[:tagged])
-%table.tag-table
-  %thead
-    %th{:colspan => 2}
-      = t(:tags_name, :scope => :e9_tags)
-  %tbody
-    - contact_tags.sort.group_by {|tag| tag[0].upcase }.each do |letter, tags|
-      %tr
-        %td.tag-starts-with= letter
-        %td.tags
-          %ul.tags
-            - tags.each do |tag|; tag_id = "tagged-#{tag.downcase.dasherize}"
-              %li.tag
-                = label_tag(tag_id, tag)
-                = check_box_tag('tagged[]', tag, tagged_params.member?(tag), :id => tag_id)
+%label= t(:tags_name, :scope => :e9_tags)
+.tag-holder
+  - contact_tags.sort.group_by {|tag| tag[0].upcase }.each do |letter, tags|
+    %ul.tags
+      - tags.each do |tag|; tag_id = "tagged-#{tag.downcase.dasherize}"
+        %li.tag
+          = label_tag(tag_id, tag)
+          = check_box_tag('tagged[]', tag, tagged_params.member?(tag), :id => tag_id)

data/config/locales/en.yml

@@ -1,6 +1,7 @@
 en:
   actions: Actions
   clear: Clear
+  clear_all_filters: Clear All Filters
   edit_dated_costs: Edit Costs
   go: Go
   inline_help_link: '[?]'

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

data/lib/generators/e9_crm/templates/javascript.js

@@ -1,44 +1,27 @@
-jQuery(function($) {
-
-  $('.dated-costs > .actions a').bind('ajax:success', function(e, data, status, xhr) {
-    $(data).insertBefore($(this).closest('.actions'));
-  });
+;jQuery(function($) {
 
   /*
-   * A function might exist for this already, but basically this stores the query variables
-   * in a hash when the page loads for later re-use/modification.
+   * add offer class handler to quick_edit.
    */
-  function query_to_hash(qs) {
-    if (!qs) qs = document.location.search;
-
-    if (!qs.length) return {};
-      
-    var params = {},
-        regex  = /[?&]?([^=]+)=([^&]*)/g,
-        tokens, key, val;
-
-    qs = qs.split('+').join(' ');
-
-    while (tokens = regex.exec(qs)) {
-      key = decodeURIComponent(tokens[1]);
-      val = decodeURIComponent(tokens[2]);
-
-      if(/\[\]$/.test(key)) {
-        if (!params[key]) params[key] = [];
-        params[key].push(val);
-      } else {
-        params[key] = val;
-      }
+  $.quick_edit = $.quick_edit || {};
+  $.quick_edit.class_handlers = $.extend({
+    'offer' : function(el) {
+      var path   = el.attr('data-renderable-path'), 
+          npath  = el.attr('data-update-node-path'),
+          epath  = path + '/edit';
+
+      //return '<a class="qe-qelink" href="'+ epath +'">Edit</a>' +
+      return '<a class="qe-ulink"  href="'+ npath +'">Switch</a>' +
+             '<a class="qe-elink"  href="'+ epath +'">Admin</a>';
     }
+  }, $.quick_edit.class_handlers);
 
-    return params;
-  }
-
-  $.query = query_to_hash();
-
-  $.fn.bindSelectChange = function(callback) {
-    this.bind($.browser.msie ? 'propertychange' : 'change', callback);
-  }
+  /* 
+   *
+   */
+  $('.dated-costs > .actions a').bind('ajax:success', function(e, data, status, xhr) {
+    $(data).insertBefore($(this).closest('.actions'));
+  });
 
   $("#campaign_code_field input").keyup(function() {
     $.event.trigger('campaign_code_change', [$(this).val()]);
@@ -50,101 +33,37 @@ jQuery(function($) {
     });
   });
 
-  $('.ordered-column a').live('click', function(e) {
-    e.preventDefault();
-
-    var $this = $(this),
-         href = $this.attr('href'),
-         qs   = href.match(/\?.*$/)[0];
-
-    var qh = qs && query_to_hash(qs) || {};
-
-    $.extend($.query, {
-      order : qh.order,
-      sort  : qh.sort
+  /*
+   * change the value of the new menu option type link when the scope select
+   * changes, e.g. when viewing "Email" menu options, clicking "Add Menu Option"
+   * defaults to creating a new email menu option.
+   */
+  $('body.admin a.new-menu-option').bind('scope-select:change:key', function(e, v) {
+    $(this).attr('href', function(i, val) {
+      return val.replace(/\[key\]=([^&]*)/, '[key]='+encodeURIComponent(v));
     });
-
-    submit_with_query();
   });
 
-  $("#campaign_search_form").each(function(i, el) {
-    var 
-    $form = $(el),
-    $st   = $(el).find('select[name=type]'),
-    $sg   = $(el).find('select[name=group]'),
-    $sa   = $(el).find('select[name=active]'),
-    $sf   = $(el).find('select[name=from]'),
-    $su   = $(el).find('select[name=until]')
-    ;
-
-    $st.val($.query.type);
-    $sg.val($.query.group);
-    $sa.val($.query.active);
-    $sf.val($.query.from);
-    $su.val($.query.until);
-
-    $('select', $form).bindSelectChange(function() {
-      var opts = {}, v;
-      if (v = $st.val()) {
-        opts['type'] = v;
-      } else {
-        delete $.query['type'];
-      }
-      if (v = $sg.val()) { 
-        opts['group']  = v;
-      } else {
-        delete $.query['group'];
-      }
-      if (v = $sa.val()) {
-        opts['active'] = v;
-      } else {
-        delete $.query['active'];
-      }
-      if (v = $sf.val()) {
-        opts['from'] = v;
-      } else {
-        delete $.query['from'];
-      }
-      if (v = $su.val()) {
-        opts['until'] = v;
-      } else {
-        delete $.query['until'];
-      }
-      $.extend($.query, opts);
-      submit_with_query();
-    });
-  });
 
-  $("#new_campaign_form").each(function(i, el) {
+  $("body.admin form#new_campaign_form, body.admin form#new_offer_form").each(function(i, el) {
     var $form = $(el);
 
     $('select', $form).bindSelectChange(function() {
       var $this = $(this);
-
       $form.attr("action", function(i, val) {
         return val.replace(/\/\w*\/new$/, '/'+$this.val()+'/new');
       });
     });
+
+    $form.submit(function(e) {
+      e.preventDefault();
+      window.location = $form.attr('action');
+    });
   });
 
   var selector_prefix = 'body.controller-e9-crm-contacts', 
       $selector       = $(selector_prefix);
 
-  $.fn.exclusiveCheck = function() {
-    var selector = $(this);
-    return this.each(function(i) {
-      $(this).click(function(e) {
-        var clicked = this;
-        if (this.checked) {
-          selector.each(function() {
-            if (this != clicked) this.checked = false;
-          });
-        }
-      });
-    });
-  }
-
-
   /*
    * The status of "primary" for a User login is stored on the individual records, but must be exlcusive in
    * the scope of the Contact (only one User may be primary).
@@ -153,7 +72,11 @@ jQuery(function($) {
    */
   var exclusifyEmailRadios;
   (exclusifyEmailRadios = function() {
-    $('.nested-association input[type=radio][name$="[primary]"]', $(selector_prefix)).exclusiveCheck();
+    var $radios = $('.nested-association input[type=radio][name$="[primary]"]', $(selector_prefix));
+
+    if (!$radios.is(':checked')) $radios.first().attr('checked', true);
+    
+    $radios.exclusiveCheck();
   })();
 
   /*
@@ -205,13 +128,6 @@ jQuery(function($) {
     else { $parent.remove(); }
   });
 
-  var submit_with_query = function(data) {
-    $.ajax({
-      dataType: 'script',
-      url: window.location.pathname,
-      data: data || $.param($.query)
-    });
-  }
 
   $('#contact_email_form', $selector).live('submit', function(e) {
     var $f = $(this);
@@ -223,44 +139,62 @@ jQuery(function($) {
     }
   });
 
-  $.fn.undisable = function() {
-    $('input[type=submit]', this).removeAttr('disabled').removeClass('ui-state-hover').blur();
-  }
-
-  $('#contact_newsletter_form', $selector).live('submit', function(e) {
-    e.preventDefault();
-
-    var $f = $(this);
-
-    if (!$('select', this).children().length) {
-      $f.undisable();
-      return false;
-    }
-
-    if ($f.attr('data-count') == '0') {
-      alert($f.attr('data-empty'));
-      $f.undisable();
-      return false;
-    }
-
-    if (!confirm($f.attr('data-confirm'))) {
-      $f.undisable();
-      return false;
-    }
-
-    $f.attr('action', function(i, val) {
-      return val.replace(/__ID__/, $('#eid', $f).val());
-    });
-
-    $f.callRemote();
-  });
+  //$('#contact_newsletter_form', $selector).live('submit', function(e) {
+    //e.preventDefault();
+
+    //var $f = $(this);
+
+    /*
+     * if no options, simply return (this shouldn't happen)
+     */
+    //if (!$('select', this).children().length) {
+      //$f.undisable();
+      //return false;
+    //}
+
+    /*
+     * warn if no selected contacts
+     */
+    //if ($f.attr('data-count') == '0') {
+      //alert($f.attr('data-empty'));
+      //$f.undisable();
+      //return false;
+    //}
+
+    /*
+     * run confirm
+     */
+    //if (!confirm($f.attr('data-confirm'))) {
+      //$f.undisable();
+      //return false;
+    //}
+
+    /*
+     * mod the form action to send to the correct email
+     */
+    //$f.attr('action', function(i, val) {
+      //return val.replace(/__ID__/, $('#eid', $f).val());
+    //});
+
+    /*
+     * we're going to remove the selected email from the options on completion, or
+     * the whole form if there are no more emails to send.
+     */
+    //var $sel       = $('option:selected', $f);
+        //$to_remove = $sel.siblings().length ? $sel : $f;
+
+    //$f.bind('ajax:complete', function() { $to_remove.remove(); });
+
+
+    //$f.callRemote();
+  //});
 
-  $('.tag-table', $selector).change(function(e) {
+  $('.tag-holder', $selector).change(function(e) {
     $.extend($.query, {
       'tagged[]': $.makeArray($(this).find('input[name="tagged[]"]').map(function(i, el) { return $(el).attr('checked') ? $(el).val() : null }))
     });
 
-    submit_with_query();
+    $.submit_with_query();
   });
 
   $('form#contact_search_form', $(selector_prefix)).live('submit', function(e) {
@@ -270,7 +204,7 @@ jQuery(function($) {
       'search': $(this).find('input[name=search]').val()
     });
 
-    submit_with_query();
+    $.submit_with_query();
   });
 
   $('input#contact_search_clear', $(selector_prefix)).live('click', function(e) {
@@ -282,10 +216,7 @@ jQuery(function($) {
 
     $.query = {};
 
-    submit_with_query();
+    $.submit_with_query();
   });
 
-  //$('#menu_option_key_select_form select').bindSelectChange(function(e) {
-    //$(this).submit();
-  //});
 });

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors: 
 - Travis Cox