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

1 files changed, 5 insertions, 14 deletions

diff --git a/app/views/tenants/_admin_area.de.html.haml b/app/views/tenants/_admin_area.de.html.haml
index 268c8e7..ba64e9a 100644
--- a/app/views/tenants/_admin_area.de.html.haml
+++ b/app/views/tenants/_admin_area.de.html.haml
@@ -1,23 +1,12 @@
-%h2 Admin Bereich
 = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant}
 
-%h2= t("users.index.page_title")
-- if @tenant.users.count <= GsParameter.get('NUMBER_OF_SHOWN_ITEMS')
-  = render "users/index_core", :users => @tenant.users
-  = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => User}
-- else
-  %p
-    = link_to "Liste aller User.", tenant_users_path(@tenant)
+= render :partial => 'users_table', :locals => {:tenant => @tenant}
 
-- if @tenant.user_groups.any?
-  %h2= t("user_groups.index.page_title")
-  = render "user_groups/index_core", :user_groups => @tenant.user_groups
-  = render :partial => 'shared/create_link', :locals => {:parent => @tenant, :child_class => UserGroup}
+= render :partial => 'user_groups_table', :locals => {:tenant => @tenant}
 
 %h2 Features
 = render :partial => 'tenants/table_of_functions', :locals => {:tenant => @tenant}
 
-%h2=t("phone_books.index.page_title")
 = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant}
 
 %h2 Gemeinschaft Konfiguration
@@ -36,4 +25,6 @@
         =link_to manufacturer, manufacturer_path(manufacturer)
     - else
       = succeed '.' do
-        =link_to manufacturer, manufacturer_path(manufacturer)
\ No newline at end of file
+        =link_to manufacturer, manufacturer_path(manufacturer)
+
+= render :partial => 'call_routes', :locals => {:tenant => @tenant}
\ No newline at end of file