summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPeter Kozak <spag@golwen.net>2012-12-20 10:03:24 +0100
committerPeter Kozak <spag@golwen.net>2012-12-20 10:03:24 +0100
commite405bce6ab07f385e32c0d885b1d51ca96bf1ff5 (patch)
tree510ced8b7d925f46292ee872d04aaa25a9d0a17f /app
parent6bf23a88899522a52740113a3cfdccc7ae533fca (diff)
parent5c270c981a21d9aafaecb3b59b98dfa6a3d9d97f (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app')
-rw-r--r--app/assets/images/icons/gs_envelope_16x.pngbin0 -> 371 bytes
-rw-r--r--app/assets/images/icons/gs_forward_16x.pngbin0 -> 301 bytes
-rw-r--r--app/assets/images/icons/gs_missed_16x.pngbin0 -> 354 bytes
-rw-r--r--app/assets/images/icons/gs_placed_16x.pngbin0 -> 397 bytes
-rw-r--r--app/assets/images/icons/gs_received_16x.pngbin0 -> 390 bytes
-rw-r--r--app/assets/images/icons/phone-down-green-32x.pngbin0 -> 3426 bytes
-rw-r--r--app/assets/images/icons/phone-down-grey-32x.pngbin0 -> 3283 bytes
-rw-r--r--app/assets/images/icons/phone-down-red-32x.pngbin0 -> 3312 bytes
-rw-r--r--app/controllers/gemeinschaft_setups_controller.rb7
-rw-r--r--app/models/automatic_call_distributor.rb10
-rw-r--r--app/models/tenant.rb12
-rw-r--r--app/views/automatic_call_distributors/show.html.haml3
-rw-r--r--app/views/phone_book_entries/_index_core.de.html.haml6
-rw-r--r--app/views/phone_book_entries/_index_core.html.haml6
-rw-r--r--app/views/phone_book_entries/show.html.haml26
-rw-r--r--app/views/shared/_header.de.html.haml2
-rw-r--r--app/views/sip_accounts/_index_core.html.haml4
17 files changed, 39 insertions, 37 deletions
diff --git a/app/assets/images/icons/gs_envelope_16x.png b/app/assets/images/icons/gs_envelope_16x.png
new file mode 100644
index 0000000..6a82ade
--- /dev/null
+++ b/app/assets/images/icons/gs_envelope_16x.png
Binary files differ
diff --git a/app/assets/images/icons/gs_forward_16x.png b/app/assets/images/icons/gs_forward_16x.png
new file mode 100644
index 0000000..13c57eb
--- /dev/null
+++ b/app/assets/images/icons/gs_forward_16x.png
Binary files differ
diff --git a/app/assets/images/icons/gs_missed_16x.png b/app/assets/images/icons/gs_missed_16x.png
new file mode 100644
index 0000000..0b3b706
--- /dev/null
+++ b/app/assets/images/icons/gs_missed_16x.png
Binary files differ
diff --git a/app/assets/images/icons/gs_placed_16x.png b/app/assets/images/icons/gs_placed_16x.png
new file mode 100644
index 0000000..b5065e9
--- /dev/null
+++ b/app/assets/images/icons/gs_placed_16x.png
Binary files differ
diff --git a/app/assets/images/icons/gs_received_16x.png b/app/assets/images/icons/gs_received_16x.png
new file mode 100644
index 0000000..cd40c1a
--- /dev/null
+++ b/app/assets/images/icons/gs_received_16x.png
Binary files differ
diff --git a/app/assets/images/icons/phone-down-green-32x.png b/app/assets/images/icons/phone-down-green-32x.png
new file mode 100644
index 0000000..9f21d45
--- /dev/null
+++ b/app/assets/images/icons/phone-down-green-32x.png
Binary files differ
diff --git a/app/assets/images/icons/phone-down-grey-32x.png b/app/assets/images/icons/phone-down-grey-32x.png
new file mode 100644
index 0000000..2b604ce
--- /dev/null
+++ b/app/assets/images/icons/phone-down-grey-32x.png
Binary files differ
diff --git a/app/assets/images/icons/phone-down-red-32x.png b/app/assets/images/icons/phone-down-red-32x.png
new file mode 100644
index 0000000..f4cbde7
--- /dev/null
+++ b/app/assets/images/icons/phone-down-red-32x.png
Binary files differ
diff --git a/app/controllers/gemeinschaft_setups_controller.rb b/app/controllers/gemeinschaft_setups_controller.rb
index cafb8a3..e871862 100644
--- a/app/controllers/gemeinschaft_setups_controller.rb
+++ b/app/controllers/gemeinschaft_setups_controller.rb
@@ -26,6 +26,11 @@ class GemeinschaftSetupsController < ApplicationController
:language_id => @gemeinschaft_setup.language_id,
:description => t('gemeinschaft_setups.initial_setup.super_tenant_description'),
)
+
+ # GsNode
+ GsNode.create(:name => 'Homebase', :ip_address => @gemeinschaft_setup.sip_domain.host,
+ :push_updates_to => false, :accepts_updates_from => false,
+ :site => 'Homebase', :element_name => 'Homebase')
# Admin
user = @gemeinschaft_setup.user
@@ -35,7 +40,7 @@ class GemeinschaftSetupsController < ApplicationController
# Create the Super-Tenant's group:
super_tenant_super_admin_group = super_tenant.user_groups.create(:name => t('gemeinschaft_setups.initial_setup.super_admin_group_name'))
super_tenant_super_admin_group.user_group_memberships.create(:user_id => user.id)
-
+
# Auto-Login:
session[:user_id] = user.id
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 dda94d8..d9351b7 100644
--- a/app/models/tenant.rb
+++ b/app/models/tenant.rb
@@ -226,14 +226,12 @@ 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',
+ :number => '+492622983440'
)
- # This is the new 2013 phone number.
- #
- # amooma.phone_numbers.create(
- # :name => 'Office',
- # :number => '+4926228998900'
- # )
amooma.addresses.create(
:street => 'Bachstr. 124',
:zip_code => '56566',
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/shared/_header.de.html.haml b/app/views/shared/_header.de.html.haml
index c6205ae..10ad2a0 100644
--- a/app/views/shared/_header.de.html.haml
+++ b/app/views/shared/_header.de.html.haml
@@ -37,5 +37,5 @@
- else
.user-context
= link_to "Registrieren", sign_up_path
- oder
+ or
= link_to "Anmelden", log_in_path
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