Merge branch 'call_routes' into develop

1 files changed, 13 insertions, 11 deletions

diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml
index b974c02..7e7e46b 100644
--- a/app/views/tenants/_admin_area.html.haml
+++ b/app/views/tenants/_admin_area.html.haml
@@ -1,30 +1,32 @@
-= render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant}
+= render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => tenant}
 
-= render :partial => 'users_table', :locals => {:tenant => @tenant}
+= render :partial => 'users_table', :locals => {:tenant => tenant}
 
-= render :partial => 'user_groups_table', :locals => {:tenant => @tenant}
+= render :partial => 'user_groups_table', :locals => {:tenant => tenant}
 
 %h2 Features
-= render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant}
+= render :partial => 'tenants/table_of_functions', :locals => {:tenant => tenant}
 
-= render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant}
+= render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant}
 
-%h2 Gemeinschaft Configuration
-= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant}
+%h2 Gemeinschaft Konfiguration
+= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => tenant}
 
 %p
-  This system can setup 
+  Das System kann  
   = PhoneModel.count
-  different phone models from the manufacturers 
+  verschiedene Telefonmodelle von den folgenden Herstellern verwalten:  
   - Manufacturer.all.each do |manufacturer|
     - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last
       = succeed ', ' do
         =link_to manufacturer, manufacturer_path(manufacturer)
     - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last
-      = succeed ' and ' do
+      = succeed ' und ' do
         =link_to manufacturer, manufacturer_path(manufacturer)
     - else
       = succeed '.' do
         =link_to manufacturer, manufacturer_path(manufacturer)
 
-= render :partial => 'call_routes', :locals => {:tenant => @tenant}
\ No newline at end of file
+= render :partial => 'call_routes', :locals => {:tenant => tenant}
+
+= render :partial => 'gateways', :locals => {:tenant => tenant, :gateways => gateways}
\ No newline at end of file