has_vcards 0.16.0 → 0.17.0

data/app/controllers/vcards_controller.rb

@@ -0,0 +1,9 @@
+class VcardsController < ApplicationController
+  # User inherited resources logic
+  inherit_resources
+  respond_to :html, :js
+
+  def directory_lookup
+    @vcard = Vcard.find(params[:id])
+  end
+end

data/app/views/vcards/_address.html.haml

@@ -1,6 +1,4 @@
-- vcard = vcard if defined?(vcard)
-- vcard ||= object.try(:vcard) if defined?(object)
-- vcard ||= @vcard
-- vcard ||= resource.try(:vcard) if defined?(resource)
-
-= full_address(vcard)
+%tr
+  %td= [address.first_name, address.family_name].join(" ")
+  %td= address.street
+  %td= [address.zip_code, address.city].join(" ")

data/app/views/vcards/_directory_lookup.html.haml

@@ -0,0 +1,21 @@
+#directory_lookup.modal.hide
+  = modal_header 'tel.search.ch'
+
+  .modal-body
+    %table.table
+      %tr{:style => 'border-top: none'}
+        %th{:style => 'border-top: none'}= [vcard.given_name, vcard.family_name].join(" ")
+        %th{:style => 'border-top: none'}= vcard.street_address
+        %th{:style => 'border-top: none'}= [vcard.postal_code, vcard.locality].join(" ")
+
+      - @seen_matches = []
+      %tr
+        %th{:colspan => 4}= t('directory_lookup.title')
+
+      = render 'directory_matches', :vcard => vcard, :match_type => :great
+      = render 'directory_matches', :vcard => vcard, :match_type => :family_name
+      = render 'directory_matches', :vcard => vcard, :match_type => :address
+      = render 'directory_matches', :vcard => vcard, :match_type => :locality
+
+  .modal-footer
+    = link_to 'Abbrechen', '#', :class => 'btn', 'data-dismiss' => 'modal'

data/app/views/vcards/_directory_matches.html.haml

@@ -0,0 +1,4 @@
+- matches = vcard.send("#{match_type}_matches") - @seen_matches
+- if matches.present?
+  - @seen_matches += matches
+  = render :partial => 'address', :collection => matches

data/app/views/vcards/directory_lookup.js.erb

@@ -0,0 +1,4 @@
+$('#directory_lookup').remove();
+
+$('body').append('<%=j render "directory_lookup", :vcard => @vcard %>');
+$('#directory_lookup').modal({show: true});

data/config/routes.rb

@@ -6,5 +6,10 @@ Rails.application.routes.draw do
   # Vcards
   resources :vcards do
     resources :phone_numbers
+
+    # DirectoryLookup
+    member do
+      get :directory_lookup
+    end
   end
 end

data/lib/has_vcards/version.rb

@@ -1,3 +1,3 @@
 module HasVcards
-  VERSION = '0.16.0'
+  VERSION = '0.17.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_vcards
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 91
   prerelease: false
   segments: 
   - 0
-  - 16
+  - 17
   - 0
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 +02:00
+date: 2012-07-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - app/controllers/phone_numbers_controller.rb
+- app/controllers/vcards_controller.rb
 - app/helpers/has_vcards_helper.rb
 - app/models/address.rb
 - app/models/phone_number.rb
@@ -68,8 +69,11 @@ files:
 - app/views/phone_numbers/_nested_form.html.haml
 - app/views/phone_numbers/_phone_number.html.haml
 - app/views/vcards/_address.html.haml
+- app/views/vcards/_directory_lookup.html.haml
+- app/views/vcards/_directory_matches.html.haml
 - app/views/vcards/_form.html.haml
 - app/views/vcards/_show.html.haml
+- app/views/vcards/directory_lookup.js.erb
 - config/application.rb
 - config/boot.rb
 - config/locales/de.yml