Merge branch 'i18n' into develop

3 files changed, 43 insertions, 3 deletions

diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index 9350de0..335dd3d 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -14,10 +14,10 @@
           - if current_user && GemeinschaftSetup.any? && current_user.admin?
             - if current_page?(page_help_path)
               %li.active
-                =link_to 'Admin-Doku', page_help_path
+                =link_to t('navigation.admin_docu'), page_help_path
             - else
               %li
-                =link_to 'Admin-Doku', page_help_path
+                =link_to t('navigation.admin_docu'), page_help_path
           - if current_user && current_user.sip_accounts.any?
             %li
               %a{:href => sip_account_call_histories_path(current_user.sip_accounts.first)}
diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.de.html.haml
index 28a8273..98809d1 100644
--- a/app/views/tenants/_admin_area.html.haml
+++ b/app/views/tenants/_admin_area.de.html.haml
@@ -23,7 +23,7 @@
       %p
         Das System kann  
         = PhoneModel.count
-        verschiedene Telefonmodelle von den folgenden Herstellern verwalten:  
+        verschiedene Telefonmodelle von den folgenden Herstellern automatisch provisionieren:  
         - Manufacturer.all.each do |manufacturer|
           - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last
             = succeed ', ' do
diff --git a/app/views/tenants/_admin_area.en.html.haml b/app/views/tenants/_admin_area.en.html.haml
new file mode 100644
index 0000000..4f0032c
--- /dev/null
+++ b/app/views/tenants/_admin_area.en.html.haml
@@ -0,0 +1,40 @@
+
+.row
+  .span12
+    = render :partial => 'tenants/table_of_sip_accounts', :locals => {:tenant => tenant}
+    - if SipAccount.any?
+      = render :partial => 'tenants/table_of_phones', :locals => {:tenant => tenant}
+
+    - if SipAccount.any? || Gateway.any?
+      = render :partial => 'tenants/table_of_conferences', :locals => {:tenant => tenant}
+      = render :partial => 'tenants/table_of_callthroughs', :locals => {:tenant => tenant}
+      = render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant}
+      = render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant}
+
+    = render :partial => 'tenants/users_table', :locals => {:tenant => tenant}
+    = render :partial => 'tenants/user_groups_table', :locals => {:tenant => tenant}
+
+    = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant}
+
+    .well
+      %h2 Gemeinschaft Configuration
+      = render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => tenant}
+
+      %p
+        This system can provision a total of   
+        = PhoneModel.count
+        different phone models of the following manufacturers:  
+        - Manufacturer.all.each do |manufacturer|
+          - if manufacturer != Manufacturer.last && manufacturer != Manufacturer.limit(Manufacturer.count - 1).last
+            = succeed ', ' do
+              =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer)
+          - elsif manufacturer == Manufacturer.limit(Manufacturer.count - 1).last
+            = succeed ' and ' do
+              =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer)
+          - else
+            = succeed '.' do
+              =link_to link_to Haml::Engine.new("%i.icon-list").render + ' ' + manufacturer, manufacturer_path(manufacturer)
+
+      = render :partial => 'call_routes', :locals => {:tenant => tenant}
+
+      = render :partial => 'gateways', :locals => {:tenant => tenant, :gateways => gateways}
\ No newline at end of file