ucb_rails 0.0.12 → 0.0.13

data/app/helpers/ucb_rails/lps_typeahead_helper.rb

@@ -11,7 +11,9 @@ module UcbRails::LpsTypeaheadHelper
   # @option options [String] :result_link_text ('Select') the text of the link button in search results
   # @option options [String] :result_link_class ('lps-typeahead-item') class to be added the the results link
   # @option options [String] :uid_dom_id ('uid') the dom-id of the (hidden) uid <input>
-  # @option options [String] :search_url ('/ucb_rails/admin/users/typeahead_search') the search url for typeahead
+  # @option options [String] :typeahead_url ('/ucb_rails/admin/users/typeahead_search') the typeahead url
+  # @option options [String] :ldap_search_url ('/ucb_rails/ldap_person_search/) the ldap search rul
+  # @option options [Boolean] :ldap_search (true) include the icon/markup for ldap searches
   def lps_typeahead_search_field(options={})
     UcbRails::Renderer::LpsTypeaheadSearchField.new(self, options).html
   end

data/app/helpers/ucb_rails/renderer/lps_typeahead_search_field.rb

@@ -3,7 +3,7 @@ module UcbRails
     
     class LpsTypeaheadSearchField < Base
       
-      attr_accessor :name, :label, :required, :value, :placeholder, :hint, :result_link_text, :result_link_class, :uid_dom_id, :typeahead_url, :ldap_search_url
+      attr_accessor :name, :label, :required, :value, :placeholder, :hint, :result_link_text, :result_link_class, :uid_dom_id, :typeahead_url, :ldap_search_url, :ldap_search
       
       def initialize(template, options={})
         super
@@ -14,11 +14,8 @@ module UcbRails
         content_tag(:div, class: 'control-group lps-typeahead') do
           label_html +
           content_tag(:div, class: 'controls') do
-            content_tag(:div, class: 'input-append') do
-              text_field_html +
-              span_html
-            end +
-            content_tag(:p, hint, class: 'help-block')
+            inputs +
+            hint_html
           end
         end
       end
@@ -35,7 +32,27 @@ module UcbRails
           label
         end
       end
-            
+      
+      def inputs
+        if ldap_search
+          input_append_div
+        else
+          text_field_html
+        end
+      end
+
+      def hint_html
+        if ldap_search
+          content_tag(:p, hint, class: 'help-block')
+        end
+      end
+      
+      def input_append_div
+        content_tag(:div, class: 'input-append') do
+          text_field_html + span_html
+        end
+      end
+
       def text_field_html
         text_field_tag(name, value, {
           autocomplete: 'off',
@@ -75,6 +92,7 @@ module UcbRails
         self.uid_dom_id = options.delete(:uid_dom_id) || 'uid'
         self.typeahead_url = options.delete(:typeahead_url) || typeahead_search_ucb_rails_admin_users_path
         self.ldap_search_url = options.delete(:ldap_search_url) || ldap_search_ucb_rails_admin_users_path
+        self.ldap_search = options.delete(:ldap_search) != false
         
         validate_options
       end
@@ -83,7 +101,7 @@ module UcbRails
         return if options.blank?
         
         msg = "Unknown lps_typeahead_search_field option(s): #{options.keys.map(&:inspect).join(', ')}. "
-        msg << "Did you mean one of :name, :required, :label, :value, :placeholder, :hint, :result_link_text, :result_link_class, :uid_dom_id, :search_url"
+        msg << "Did you mean one of :name, :required, :label, :value, :placeholder, :hint, :ldap_search, :ldap_search_url, :result_link_text, :result_link_class, :uid_dom_id, :typeahead_url"
         raise ArgumentError, msg
       end
       

data/lib/ucb_rails/version.rb

@@ -1,3 +1,3 @@
 module UcbRails
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ucb_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails