Merge branch 'develop' of github.com:amooma/GS5 into develop

20 files changed, 90 insertions, 69 deletions

diff --git a/.gitignore b/.gitignore
index 873c732..65a18ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,9 +31,7 @@ tmp/
 nbproject
 Thumbs.db
 
-
 # Extra
-.sass-cache
 .livereload
 
 # Dreamweaver added files
@@ -60,20 +58,17 @@ tmp/**/*
 # Ignore fixtures. We use factory_girl.
 /test/fixtures/*.yml
 
-ERD.pdf
-ERD.png
-
 /vendor/cache
 /vendor/bundle
 .settings/*
 /.idea
 
 # ignore Sass cache:
-/.sass-cache
-tmp/sass-cache
-tmp/cache
+.sass-cache
+/tmp/sass-cache
+/tmp/cache
 
-public/assets
+/public/assets
 
 # directory created by "bundle install --path ." (not needed anyway):
 /ruby
@@ -84,7 +79,7 @@ public/assets
 /tmp
 
 # Images
-public/uploads
+/public/uploads
 # Freeswitch
-misc/freeswitch/conf/freeswitch.serial
-misc/freeswitch/scripts/ini/gateway_gateway1.ini
+/misc/freeswitch/conf/freeswitch.serial
+/misc/freeswitch/scripts/ini/gateway_gateway1.ini
diff --git a/README.md b/README.md
index a97ad3b..50fe13d 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,33 @@
 GS5
 ===
+Gemeinschaft 5 by [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX. This Github repository is our development environment.
 
-Gemeinschaft 5 by the [AMOOMA GmbH](http://amooma.de) in Germany. It is a FreeSWITCH and Ruby on Rails based PBX.
+Documentation
+=============
+Please have a look at our [Wiki](https://github.com/amooma/GS5/wiki).
+
+Bug reports
+===========
+Please open a new issue to report a bug. Please don't forget to include the URL in case you report a view related problem.
+
+Feature requests
+================
+Please open a new issue and mark it as a feature request.
+
+Roadmap
+=======
+We don't have a public roadmap. But we do track the future work with issues. So have a look at [https://github.com/amooma/GS5/issues](https://github.com/amooma/GS5/issues) for future features.
 
 License
 =======
-We use this repository to develop and we'd like to invite everybody to add new features or find bugs. There for the repository is not a private one. But the code in this repository is not GPL! Please go to [http://amooma.de/gemeinschaft/gs5](http://amooma.de/gemeinschaft/gs5) for a copy of this software with an other license.
+We use this public repository to develop. Do not use this code on a production system! Do not give away this code to your clients! This code is strictly for development purposes and GS5 is not a GPL project.
+
+DO NOT USE CODE FROM THE CONTENT OF THIS REPOSITORY FOR A PRODUCTION SYSTEM!
 
-DO NOT USE CODE FROM THIS REPO FOR A PRODUCTION SYSTEM!
+You can download a free and stable version of GS5 for your production system at [http://amooma.de/gemeinschaft/gs5](http://amooma.de/gemeinschaft/gs5).
 
 Development How-to
 ==================
-There is a master and a develop branch in this repository. If you are familiar with [http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model/) you are good to go. Please send a pull request and an e-mail to stefan.wintermeyer@amooma.de with some info about your code. Regular developer get access to the repository and a closed developer mailinglist.
+There is a master and a develop branch in this repository. If you are familiar with [http://nvie.com/posts/a-successful-git-branching-model/](http://nvie.com/posts/a-successful-git-branching-model/) you are good to go. Please send a pull request and an e-mail to stefan.wintermeyer@amooma.de with some info about your code. Regular developer get access to the repository, a closed developer mailinglist and hardware in case they need it.
 
-We only accept code which was written 100% by you and were you grant us the rights for this code.
\ No newline at end of file
+We only accept code which was written 100% by you and were you grant us the rights for the code.
\ No newline at end of file
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
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
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
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
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
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
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
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
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
diff --git a/config/database.yml b/config/database.yml
index 4ea8d4a..bd1748e 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,22 +1,29 @@
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000  
+development: 
+   adapter: mysql2 
+   encoding: utf8 
+   database: gemeinschaft 
+   pool: 5 
+   username: gemeinschaft 
+   password: gemeinschaft 
+   socket: /var/run/mysqld/mysqld.sock 
+   reconnect: true 
 
-production:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000  
+production: 
+   adapter: mysql2 
+   encoding: utf8 
+   database: gemeinschaft 
+   pool: 10 
+   username: gemeinschaft 
+   password: gemeinschaft 
+   socket: /var/run/mysqld/mysqld.sock 
+   reconnect: true
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 
 test:
-  adapter: sqlite3
-  database: db/test<%= ENV['TEST_ENV_NUMBER'] %>.sqlite3
-  pool: 5
-  timeout: 5000
-
+   adapter: sqlite3
+   database: db/test.sqlite3
+   pool: 5
+   timeout: 5000
\ No newline at end of file