diff options
40 files changed, 28 insertions, 29 deletions
diff --git a/app/assets/icons/cellphone-32x.png b/app/assets/icons/cellphone-32x.png Binary files differdeleted file mode 100644 index cfc41f5..0000000 --- a/app/assets/icons/cellphone-32x.png +++ /dev/null diff --git a/app/assets/icons/clock-32x.png b/app/assets/icons/clock-32x.png Binary files differdeleted file mode 100644 index c076042..0000000 --- a/app/assets/icons/clock-32x.png +++ /dev/null diff --git a/app/assets/icons/cross-16x.png b/app/assets/icons/cross-16x.png Binary files differdeleted file mode 100644 index e22ed6f..0000000 --- a/app/assets/icons/cross-16x.png +++ /dev/null diff --git a/app/assets/icons/facebook-32x.png b/app/assets/icons/facebook-32x.png Binary files differdeleted file mode 100644 index 08fa0f7..0000000 --- a/app/assets/icons/facebook-32x.png +++ /dev/null diff --git a/app/assets/icons/fax-32x.png b/app/assets/icons/fax-32x.png Binary files differdeleted file mode 100644 index b05ee59..0000000 --- a/app/assets/icons/fax-32x.png +++ /dev/null diff --git a/app/assets/icons/headphones-16x.png b/app/assets/icons/headphones-16x.png Binary files differdeleted file mode 100644 index dee8346..0000000 --- a/app/assets/icons/headphones-16x.png +++ /dev/null diff --git a/app/assets/icons/headphones-32x.png b/app/assets/icons/headphones-32x.png Binary files differdeleted file mode 100644 index 89a5df7..0000000 --- a/app/assets/icons/headphones-32x.png +++ /dev/null diff --git a/app/assets/icons/house-32x.png b/app/assets/icons/house-32x.png Binary files differdeleted file mode 100644 index b112915..0000000 --- a/app/assets/icons/house-32x.png +++ /dev/null diff --git a/app/assets/icons/mic-32x.png b/app/assets/icons/mic-32x.png Binary files differdeleted file mode 100644 index 30c4531..0000000 --- a/app/assets/icons/mic-32x.png +++ /dev/null diff --git a/app/assets/icons/microphone-16x.png b/app/assets/icons/microphone-16x.png Binary files differdeleted file mode 100644 index b62422d..0000000 --- a/app/assets/icons/microphone-16x.png +++ /dev/null diff --git a/app/assets/icons/microphone-32x.png b/app/assets/icons/microphone-32x.png Binary files differdeleted file mode 100644 index 30c4531..0000000 --- a/app/assets/icons/microphone-32x.png +++ /dev/null diff --git a/app/assets/icons/mute-16x.png b/app/assets/icons/mute-16x.png Binary files differdeleted file mode 100644 index 0656f3f..0000000 --- a/app/assets/icons/mute-16x.png +++ /dev/null diff --git a/app/assets/icons/phone-down-32x.png b/app/assets/icons/phone-down-32x.png Binary files differdeleted file mode 100644 index 38c3560..0000000 --- a/app/assets/icons/phone-down-32x.png +++ /dev/null diff --git a/app/assets/icons/phone-mobile-32x.png b/app/assets/icons/phone-mobile-32x.png Binary files differdeleted file mode 100644 index b373e1a..0000000 --- a/app/assets/icons/phone-mobile-32x.png +++ /dev/null diff --git a/app/assets/icons/phone-up-32x.png b/app/assets/icons/phone-up-32x.png Binary files differdeleted file mode 100644 index 9b765c7..0000000 --- a/app/assets/icons/phone-up-32x.png +++ /dev/null diff --git a/app/assets/icons/search-13x16.png b/app/assets/icons/search-13x16.png Binary files differdeleted file mode 100644 index 16aa3c6..0000000 --- a/app/assets/icons/search-13x16.png +++ /dev/null diff --git a/app/assets/icons/skype-32x.png b/app/assets/icons/skype-32x.png Binary files differdeleted file mode 100644 index c3b0978..0000000 --- a/app/assets/icons/skype-32x.png +++ /dev/null diff --git a/app/assets/icons/star-16x.png b/app/assets/icons/star-16x.png Binary files differdeleted file mode 100644 index 6b16932..0000000 --- a/app/assets/icons/star-16x.png +++ /dev/null diff --git a/app/assets/icons/suitcase-32x.png b/app/assets/icons/suitcase-32x.png Binary files differdeleted file mode 100644 index f53daa9..0000000 --- a/app/assets/icons/suitcase-32x.png +++ /dev/null diff --git a/app/assets/icons/tag-16x.png b/app/assets/icons/tag-16x.png Binary files differdeleted file mode 100644 index b4522d7..0000000 --- a/app/assets/icons/tag-16x.png +++ /dev/null diff --git a/app/assets/icons/twitter-32x.png b/app/assets/icons/twitter-32x.png Binary files differdeleted file mode 100644 index 51351a7..0000000 --- a/app/assets/icons/twitter-32x.png +++ /dev/null diff --git a/app/assets/icons/unmute-16x.png b/app/assets/icons/unmute-16x.png Binary files differdeleted file mode 100644 index e9dfde0..0000000 --- a/app/assets/icons/unmute-16x.png +++ /dev/null diff --git a/app/assets/icons/user-16x.png b/app/assets/icons/user-16x.png Binary files differdeleted file mode 100644 index 909403a..0000000 --- a/app/assets/icons/user-16x.png +++ /dev/null diff --git a/app/assets/icons/user-female-16x.png b/app/assets/icons/user-female-16x.png Binary files differdeleted file mode 100644 index 38dde34..0000000 --- a/app/assets/icons/user-female-16x.png +++ /dev/null diff --git a/app/assets/icons/user-male-16x.png b/app/assets/icons/user-male-16x.png Binary files differdeleted file mode 100644 index e03fd0f..0000000 --- a/app/assets/icons/user-male-16x.png +++ /dev/null diff --git a/app/assets/icons/gs_envelope_16x.png b/app/assets/images/icons/gs_envelope_16x.png Binary files differindex 6a82ade..6a82ade 100644 --- a/app/assets/icons/gs_envelope_16x.png +++ b/app/assets/images/icons/gs_envelope_16x.png diff --git a/app/assets/icons/gs_forward_16x.png b/app/assets/images/icons/gs_forward_16x.png Binary files differindex 13c57eb..13c57eb 100644 --- a/app/assets/icons/gs_forward_16x.png +++ b/app/assets/images/icons/gs_forward_16x.png diff --git a/app/assets/icons/gs_missed_16x.png b/app/assets/images/icons/gs_missed_16x.png Binary files differindex 0b3b706..0b3b706 100644 --- a/app/assets/icons/gs_missed_16x.png +++ b/app/assets/images/icons/gs_missed_16x.png diff --git a/app/assets/icons/gs_placed_16x.png b/app/assets/images/icons/gs_placed_16x.png Binary files differindex b5065e9..b5065e9 100644 --- a/app/assets/icons/gs_placed_16x.png +++ b/app/assets/images/icons/gs_placed_16x.png diff --git a/app/assets/icons/gs_received_16x.png b/app/assets/images/icons/gs_received_16x.png Binary files differindex cd40c1a..cd40c1a 100644 --- a/app/assets/icons/gs_received_16x.png +++ b/app/assets/images/icons/gs_received_16x.png diff --git a/app/assets/icons/phone-down-green-32x.png b/app/assets/images/icons/phone-down-green-32x.png Binary files differindex 9f21d45..9f21d45 100644 --- a/app/assets/icons/phone-down-green-32x.png +++ b/app/assets/images/icons/phone-down-green-32x.png diff --git a/app/assets/icons/phone-down-grey-32x.png b/app/assets/images/icons/phone-down-grey-32x.png Binary files differindex 2b604ce..2b604ce 100644 --- a/app/assets/icons/phone-down-grey-32x.png +++ b/app/assets/images/icons/phone-down-grey-32x.png diff --git a/app/assets/icons/phone-down-red-32x.png b/app/assets/images/icons/phone-down-red-32x.png Binary files differindex f4cbde7..f4cbde7 100644 --- a/app/assets/icons/phone-down-red-32x.png +++ b/app/assets/images/icons/phone-down-red-32x.png diff --git a/app/models/automatic_call_distributor.rb b/app/models/automatic_call_distributor.rb index 678e0eb..cd887d5 100644 --- a/app/models/automatic_call_distributor.rb +++ b/app/models/automatic_call_distributor.rb @@ -15,7 +15,17 @@ class AutomaticCallDistributor < ActiveRecord::Base JOIN_ON = ['agents_available', 'agents_active', 'always'] LEAVE_ON = ['no_agents_available_timeout', 'no_agents_active_timeout', 'no_agents_available', 'no_agents_active', 'timeout', 'never'] + after_initialize :set_defaults + def to_s self.name end + + private + def set_defaults + self.announce_call_agents ||= 'ivr/ivr-stay_on_line_call_answered_momentarily.wav' + self.greeting ||= 'ivr/ivr-thank_you_for_calling.wav' + self.goodbye ||= 'ivr/ivr-thank_you_for_calling.wav' + self.music ||= 'local_stream://mohl' + end end diff --git a/app/models/tenant.rb b/app/models/tenant.rb index 66e50d3..d9351b7 100644 --- a/app/models/tenant.rb +++ b/app/models/tenant.rb @@ -226,7 +226,7 @@ class Tenant < ActiveRecord::Base :description => "Hersteller von Gemeinschaft. Kommerziellen Support und Consulting für Gemeinschaft.", :homepage_organization => 'http://amooma.de', :twitter_account => 'amooma_de', - :facebook_account => 'https://www.facebook.com/AMOOMA.GmbH', + :facebook_account => 'AMOOMA.GmbH', ) amooma.phone_numbers.create( :name => 'Office', diff --git a/app/views/automatic_call_distributors/show.html.haml b/app/views/automatic_call_distributors/show.html.haml index e5bf785..53ce127 100644 --- a/app/views/automatic_call_distributors/show.html.haml +++ b/app/views/automatic_call_distributors/show.html.haml @@ -2,9 +2,6 @@ %table %tr - %th= t('automatic_call_distributors.show.uuid') + ":" - %td= @automatic_call_distributor.uuid - %tr %th= t('automatic_call_distributors.show.name') + ":" %td= @automatic_call_distributor.name %tr 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 01be65f..0c6e74b 100644 --- a/app/views/phone_book_entries/_index_core.de.html.haml +++ b/app/views/phone_book_entries/_index_core.de.html.haml @@ -28,7 +28,11 @@ %td.extra - if !entry.description.blank? %strong Beschreibung: - %div= entry.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 diff --git a/app/views/phone_book_entries/_index_core.html.haml b/app/views/phone_book_entries/_index_core.html.haml index d9cfe10..9054833 100644 --- a/app/views/phone_book_entries/_index_core.html.haml +++ b/app/views/phone_book_entries/_index_core.html.haml @@ -28,7 +28,11 @@ %td.extra - if !entry.description.blank? %strong Description: - %div= entry.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 diff --git a/app/views/phone_book_entries/show.html.haml b/app/views/phone_book_entries/show.html.haml index b6e8c6e..a9e1e8f 100644 --- a/app/views/phone_book_entries/show.html.haml +++ b/app/views/phone_book_entries/show.html.haml @@ -114,33 +114,17 @@ .widget.social - if !@phone_book_entry.homepage_organization.blank? .home - %a= @phone_book_entry.homepage_organization + =link_to @phone_book_entry.homepage_organization, @phone_book_entry.homepage_organization %span www - if !@phone_book_entry.homepage_personal.blank? .home - %a= @phone_book_entry.homepage_personal + =link_to @phone_book_entry.homepage_personal, @phone_book_entry.homepage_personal %span www - if !@phone_book_entry.twitter_account.blank? .twitter - %a= @phone_book_entry.twitter_account + =link_to @phone_book_entry.twitter_account, "https://twitter.com/#{@phone_book_entry.twitter_account}" %span Twitter - - if !@phone_book_entry.google_plus_account.blank? - .google_plus - %a= @phone_book_entry.google_plus_account - %span Google+ - if !@phone_book_entry.facebook_account.blank? .facebook - %a= @phone_book_entry.facebook_account - %span Facebook - - if !@phone_book_entry.xing_account.blank? - .xing - %a= @phone_book_entry.xing_account - %span Xing - - if !@phone_book_entry.linkedin_account.blank? - .linkedin - %a= @phone_book_entry.linkedin_account - %span LinkedIn - - if !@phone_book_entry.mobileme_account.blank? - .mobileme - %a= @phone_book_entry.mobileme_account - %span MobileMe + =link_to @phone_book_entry.facebook_account, "https://www.facebook.com/#{@phone_book_entry.facebook_account}" + %span Facebook
\ No newline at end of file diff --git a/app/views/sip_accounts/_index_core.html.haml b/app/views/sip_accounts/_index_core.html.haml index 7f8dcd2..69c9302 100644 --- a/app/views/sip_accounts/_index_core.html.haml +++ b/app/views/sip_accounts/_index_core.html.haml @@ -10,9 +10,9 @@ %tr{:class => cycle('odd', 'even')} %td - if sip_account.registration - %img{:src => '/assets/icons/phone-down-green-32x.png'} + =image_tag 'icons/phone-down-green-32x.png' - else - %img{:src => '/assets/icons/phone-down-grey-32x.png'} + =image_tag 'icons/phone-down-grey-32x.png' %td = sip_account.caller_name - phone_numbers = sip_account.phone_numbers |
