Merge branch 'develop'5.1-beta1

8 files changed, 89 insertions, 83 deletions

diff --git a/app/views/phone_book_entries/_form_core.html.haml b/app/views/phone_book_entries/_form_core.html.haml
index c05139e..5159668 100644
--- a/app/views/phone_book_entries/_form_core.html.haml
+++ b/app/views/phone_book_entries/_form_core.html.haml
@@ -1,6 +1,6 @@
 .inputs
   = f.input :is_male, :collection => [[true, t('phone_book_entries.form.gender.male')], [false, t('phone_book_entries.form.gender.female')]], :label_method => :last, :value_method => :first, :label => t('phone_book_entries.form.male.label'), :hint => conditional_hint('phone_book_entries.form.gender.hint'), :label => t('phone_book_entries.form.gender.label'), :as => :radio
-  = f.input :first_name, :label => t('phone_book_entries.form.first_name.label'), :hint => conditional_hint('phone_book_entries.form.first_name.hint')
+  = f.input :first_name, :label => t('phone_book_entries.form.first_name.label'), :hint => conditional_hint('phone_book_entries.form.first_name.hint'), :autofocus => true
   = f.input :middle_name, :label => t('phone_book_entries.form.middle_name.label'), :hint => conditional_hint('phone_book_entries.form.middle_name.hint')
   = f.input :last_name, :label => t('phone_book_entries.form.last_name.label'), :hint => conditional_hint('phone_book_entries.form.last_name.hint')
   = f.input :birth_name, :label => t('phone_book_entries.form.birth_name.label'), :hint => conditional_hint('phone_book_entries.form.birth_name.hint')
diff --git a/app/views/phone_book_entries/_index_core.de.html.haml b/app/views/phone_book_entries/_index_core.de.html.haml
index 0c6e74b..fe72d26 100644
--- a/app/views/phone_book_entries/_index_core.de.html.haml
+++ b/app/views/phone_book_entries/_index_core.de.html.haml
@@ -2,39 +2,41 @@
 %section.phone-book-entries 
   %header.entries-nav= render :partial => "phone_book_entries/navigation"
   .content
-    - reset_cycle
-    %table
-      - for entry in phone_book_entries
-        ~# Dear IE7,
-        ~# Because of you we have to do this with a table.
-        ~# With Love,
-        ~# Mario.
-        %tr.phone-book-entry{:class => cycle('odd', 'even'), :"itemscope itemtype" => "http://schema.org/Person"}
-          %td.thumbnail
-            = image_tag(entry.image_url(:small).to_s, :itemprop => 'image')
-          %td.user
-            - if entry.is_organization == true
-              %a.name{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => "name"}= entry
-            - else
-              %a.name{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => "name"}= entry
-              %a.company{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'memberOf'}= entry.organization
-          %td.contact
-            - if @found_phone_numbers and @found_phone_numbers.where(:phone_numberable_id => entry.id)
-              %a.phone{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'telephone'}= @found_phone_numbers.where(:phone_numberable_id => entry.id).first
-            - elsif entry.phone_numbers.first
-              %a.phone{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'telephone'}= entry.phone_numbers.first
-            - if entry.phone_numbers.count > 1
-              %a.more{:href => phone_book_phone_book_entry_path(entry.phone_book, entry)}= t('phone_book_entries.index.more_numbers', :numbers => (entry.phone_numbers.count-1))
-          %td.extra
-            - if !entry.description.blank?
-              %strong Beschreibung:
-              %div
-                = entry.description
-                - if !entry.homepage_organization.blank?
-                  %br
-                  =link_to entry.homepage_organization, entry.homepage_organization
-          - if can? :edit, entry
-            %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry )
-          - if can? :destroy, entry
-            %td= link_to t('phone_book_entries.index.actions.destroy'), [entry.phone_book, entry], :confirm => t('phone_book_entries.index.actions.confirm'), :method => :delete
+    - cache(['phone_book_entries_table', I18n.locale, current_user, phone_book_entries]) do
+      
+      %table{:class => 'table table-striped'}
+        - for entry in phone_book_entries
+          - cache(['phone_book_entries_table_tr', I18n.locale, current_user, entry]) do
+            ~# Dear IE7,
+            ~# Because of you we have to do this with a table.
+            ~# With Love,
+            ~# Mario.
+            %tr.phone-book-entry{:"itemscope itemtype" => "http://schema.org/Person"}
+              %td.thumbnail
+                = image_tag(entry.image_url(:small).to_s, :itemprop => 'image')
+              %td.user
+                - if entry.is_organization == true
+                  %a.name{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => "name"}= entry
+                - else
+                  %a.name{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => "name"}= entry
+                  %a.company{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'memberOf'}= entry.organization
+              %td.contact
+                - if @found_phone_numbers and @found_phone_numbers.where(:phone_numberable_id => entry.id)
+                  %a.phone{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'telephone'}= @found_phone_numbers.where(:phone_numberable_id => entry.id).first
+                - elsif entry.phone_numbers.first
+                  %a.phone{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'telephone'}= entry.phone_numbers.first
+                - if entry.phone_numbers.count > 1
+                  %a.more{:href => phone_book_phone_book_entry_path(entry.phone_book, entry)}= t('phone_book_entries.index.more_numbers', :numbers => (entry.phone_numbers.count-1))
+              %td.extra
+                - if !entry.description.blank?
+                  %strong Beschreibung:
+                  %div
+                    = entry.description
+                    - if !entry.homepage_organization.blank?
+                      %br
+                      =link_to entry.homepage_organization, entry.homepage_organization
+              - if can? :edit, entry
+                %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry )
+              - if can? :destroy, entry
+                %td= link_to t('phone_book_entries.index.actions.destroy'), [entry.phone_book, entry], :confirm => t('phone_book_entries.index.actions.confirm'), :method => :delete
   %footer.entries-nav= render :partial => "phone_book_entries/navigation"
diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml
index 9054833..6e35221 100644
--- a/app/views/phone_book_entries/_index_core.html.haml
+++ b/app/views/phone_book_entries/_index_core.html.haml
@@ -2,39 +2,42 @@
 %section.phone-book-entries 
   %header.entries-nav= render :partial => "phone_book_entries/navigation"
   .content
-    - reset_cycle
-    %table
-      - for entry in phone_book_entries
-        ~# Dear IE7,
-        ~# Because of you we have to do this with a table.
-        ~# With Love,
-        ~# Mario.
-        %tr.phone-book-entry{:class => cycle('odd', 'even'), :"itemscope itemtype" => "http://schema.org/Person"}
-          %td.thumbnail
-            = image_tag(entry.image_url(:small).to_s, :itemprop => 'image')
-          %td.user
-            - if entry.is_organization == true
-              %a.name{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => "name"}= entry
-            - else
-              %a.name{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => "name"}= entry
-              %a.company{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'memberOf'}= entry.organization
-          %td.contact
-            - if @found_phone_numbers and @found_phone_numbers.where(:phone_numberable_id => entry.id)
-              %a.phone{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'telephone'}= @found_phone_numbers.where(:phone_numberable_id => entry.id).first
-            - elsif entry.phone_numbers.first
-              %a.phone{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'telephone'}= entry.phone_numbers.first
-            - if entry.phone_numbers.count > 1
-              %a.more{:href => phone_book_phone_book_entry_path(entry.phone_book, entry)}= t('phone_book_entries.index.more_numbers', :numbers => (entry.phone_numbers.count-1))
-          %td.extra
-            - if !entry.description.blank?
-              %strong Description:
-              %div
-                = entry.description
-                - if !entry.homepage_organization.blank?
-                  %br
-                  =link_to entry.homepage_organization, entry.homepage_organization
-          - if can? :edit, entry
-            %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry )
-          - if can? :destroy, entry
-            %td= link_to t('phone_book_entries.index.actions.destroy'), [entry.phone_book, entry], :confirm => t('phone_book_entries.index.actions.confirm'), :method => :delete
+    - cache(['phone_book_entries_table', I18n.locale, current_user, phone_book_entries]) do
+      
+      
+      %table{:class => 'table table-striped'}
+        - for entry in phone_book_entries
+          - cache(['phone_book_entries_table_tr', I18n.locale, current_user, entry]) do
+            ~# Dear IE7,
+            ~# Because of you we have to do this with a table.
+            ~# With Love,
+            ~# Mario.
+            %tr.phone-book-entry{:"itemscope itemtype" => "http://schema.org/Person"}
+              %td.thumbnail
+                = image_tag(entry.image_url(:small).to_s, :itemprop => 'image')
+              %td.user
+                - if entry.is_organization == true
+                  %a.name{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => "name"}= entry
+                - else
+                  %a.name{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => "name"}= entry
+                  %a.company{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'memberOf'}= entry.organization
+              %td.contact
+                - if @found_phone_numbers and @found_phone_numbers.where(:phone_numberable_id => entry.id)
+                  %a.phone{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'telephone'}= @found_phone_numbers.where(:phone_numberable_id => entry.id).first
+                - elsif entry.phone_numbers.first
+                  %a.phone{:href=> phone_book_phone_book_entry_path(entry.phone_book, entry), :itemprop => 'telephone'}= entry.phone_numbers.first
+                - if entry.phone_numbers.count > 1
+                  %a.more{:href => phone_book_phone_book_entry_path(entry.phone_book, entry)}= t('phone_book_entries.index.more_numbers', :numbers => (entry.phone_numbers.count-1))
+              %td.extra
+                - if !entry.description.blank?
+                  %strong Description:
+                  %div
+                    = entry.description
+                    - if !entry.homepage_organization.blank?
+                      %br
+                      =link_to entry.homepage_organization, entry.homepage_organization
+              - if can? :edit, entry
+                %td= link_to t('phone_book_entries.index.actions.edit'), edit_phone_book_phone_book_entry_path( entry.phone_book, entry )
+              - if can? :destroy, entry
+                %td= link_to t('phone_book_entries.index.actions.destroy'), [entry.phone_book, entry], :confirm => t('phone_book_entries.index.actions.confirm'), :method => :delete
   %footer.entries-nav= render :partial => "phone_book_entries/navigation"
diff --git a/app/views/phone_book_entries/edit.html.haml b/app/views/phone_book_entries/edit.html.haml
index d4fad4d..2967366 100644
--- a/app/views/phone_book_entries/edit.html.haml
+++ b/app/views/phone_book_entries/edit.html.haml
@@ -1,4 +1,4 @@
-- title t("phone_book_entries.edit.page_title")
+- content_for :title, t("phone_book_entries.edit.page_title")
 
 = render "form"
 
diff --git a/app/views/phone_book_entries/index.html.haml b/app/views/phone_book_entries/index.html.haml
index 6a17eb9..10d1ce2 100644
--- a/app/views/phone_book_entries/index.html.haml
+++ b/app/views/phone_book_entries/index.html.haml
@@ -1,4 +1,4 @@
-- title t("phone_book_entries.index.page_title")
+- content_for :title, t("phone_book_entries.index.page_title")
 
 - if @phone_books
   %p
diff --git a/app/views/phone_book_entries/new.html.haml b/app/views/phone_book_entries/new.html.haml
index d72d1a4..2f3a8be 100644
--- a/app/views/phone_book_entries/new.html.haml
+++ b/app/views/phone_book_entries/new.html.haml
@@ -1,3 +1,3 @@
-- title t("phone_book_entries.new.page_title")
+- content_for :title, t("phone_book_entries.new.page_title")
 
 = render "form"
diff --git a/app/views/phone_book_entries/show.html.haml b/app/views/phone_book_entries/show.html.haml
index a9e1e8f..7dd9bcb 100644
--- a/app/views/phone_book_entries/show.html.haml
+++ b/app/views/phone_book_entries/show.html.haml
@@ -1,4 +1,4 @@
-- title nil
+- content_for :title, nil
 
 %section.phone-book-entry
   .content
@@ -67,27 +67,28 @@
       = @phone_book_entry.description
     .widget.phones
       - @phone_book_entry.phone_numbers.each do |phone_number|
-        - case phone_number.name
+        - case phone_number.name.to_s.downcase
         - when /fax/
           .fax
-            %a= phone_number
+            = link_to phone_number, call_phone_book_entry_phone_number_path(@phone_book_entry, phone_number), :method => :put, :title => t('phone_numbers.show.actions.call')
             %span= phone_number.name
         - when /home/
           .home
-            %a= phone_number
-            %span= phone_number.name
+            = link_to phone_number, call_phone_book_entry_phone_number_path(@phone_book_entry, phone_number), :method => :put, :title => t('phone_numbers.show.actions.call')
+            %span
         - when /mobile/
           .cellphone
-            %a= phone_number
+            = link_to phone_number, call_phone_book_entry_phone_number_path(@phone_book_entry, phone_number), :method => :put, :title => t('phone_numbers.show.actions.call')
             %span= phone_number.name  
         - when /office/
           .office
-            %a= phone_number
+            = link_to phone_number, call_phone_book_entry_phone_number_path(@phone_book_entry, phone_number), :method => :put, :title => t('phone_numbers.show.actions.call')
             %span= phone_number.name
         - else
           .phone
-            %a= phone_number
+            = link_to phone_number, call_phone_book_entry_phone_number_path(@phone_book_entry, phone_number), :method => :put, :title => t('phone_numbers.show.actions.call')
             %span= phone_number.name
+ 
       = link_to t('phone_book_entries.show.manage_phone_numbers'), phone_book_entry_phone_numbers_path(@phone_book_entry)  
 
     .widget.adresses
diff --git a/app/views/phone_book_entries/show.html.haml.examlple b/app/views/phone_book_entries/show.html.haml.examlple
index 176ad04..980f776 100644
--- a/app/views/phone_book_entries/show.html.haml.examlple
+++ b/app/views/phone_book_entries/show.html.haml.examlple
@@ -1,4 +1,4 @@
-- title nil
+- content_for :title, nil
 
 %section.phone-book-entry
   .content