remove types from ip pools

closes #24

app/views/ip_pool_rules/_form.html.haml

@@ -24,7 +24,7 @@
       .fieldSet__field
         = f.label :ip_pool_id, "IP Pool", :class => 'fieldSet__label'
         .fieldSet__input
-          = f.collection_select :ip_pool_id, organization.ip_pools.includes(:ip_addresses).order("`default` desc, name asc"), :id, :description, {}, :class => 'input input--select'
+          = f.collection_select :ip_pool_id, organization.ip_pools.includes(:ip_addresses).order("`default` desc, name asc"), :id, :name, {}, :class => 'input input--select'
           %p.fieldSet__text
             This is the IP pool that this message should be delivered from.
 

app/views/ip_pool_rules/index.html.haml

@@ -59,7 +59,7 @@
 
             %dl.ipPoolRuleList__condition
               %dt Will be sent using:
-              %dd= ip_pool_rule.ip_pool.description
+              %dd= ip_pool_rule.ip_pool.name
     - if @server
-      %p.ipPoolRuleListDefault.u-margin All mail that doesn't match a rule above will be sent using #{@server.ip_pool.description}.
+      %p.ipPoolRuleListDefault.u-margin All mail that doesn't match a rule above will be sent using #{@server.ip_pool.name}.
     %p.u-center= link_to "Add another rule", [:new, organization, @server, :ip_pool_rule], :class => "button button--positive"

app/views/ip_pools/_form.html.haml

@@ -4,9 +4,6 @@
     .fieldSet__field
       = f.label :name, :class => 'fieldSet__label'
       .fieldSet__input= f.text_field :name, :autofocus => true, :class => 'input input--text'
-    .fieldSet__field
-      = f.label :type, :class => 'fieldSet__label'
-      .fieldSet__input= f.select :type, IPPool::TYPES, {}, :class => 'input input--select'
 
   - if @ip_pool.persisted?
     %table.dataTable.u-margin-half

app/views/organization_ip_pools/_nav.html.haml

@@ -1,4 +1,4 @@
 .navBar.navBar--secondary
   %ul
-    %li.navBar__item= link_to "Dedicated IPs", organization_ip_pools_path(organization), :class => ['navBar__link', active_nav == :ips ? 'is-active' : '']
+    %li.navBar__item= link_to "IP Pools", organization_ip_pools_path(organization), :class => ['navBar__link', active_nav == :ips ? 'is-active' : '']
     %li.navBar__item= link_to "Rules", organization_ip_pool_rules_path(organization), :class => ['navBar__link', active_nav == :rules ? 'is-active' : '']