Refactoring and fixing #112

1 files changed, 16 insertions, 29 deletions

diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml
index 7b47587..e708215 100644
--- a/app/views/tenants/_admin_area.html.haml
+++ b/app/views/tenants/_admin_area.html.haml
@@ -1,31 +1,3 @@
-- cache(['tenant_show_admin_area', I18n.locale, @tenant, UserGroup.count, UserGroup.order(:updated_at).last, User.count, User.order(:updated_at).last, Manufacturer.all]) do
-  %p
-    You belong to the 
-    = link_to 'admin group', tenant_user_group_path(@tenant, @tenant.user_groups.find_by_name('Admins'))
-    and therefore have super powers. But always remember Peter Parker's: "With great power comes great responsibility."
-
-  %p
-    = succeed '.' do
-      This tenant has 
-      = link_to pluralize(@tenant.user_groups.count, 'user group'), tenant_user_groups_path(@tenant)
-      - if @tenant.user_groups.count < 5
-        = "(#{@tenant.user_groups.order(:name).map{|group| group.to_s }.join(', ')})"
-      which handle a total of 
-      = link_to pluralize(@tenant.users.count, 'user'), tenant_users_path(@tenant)
-    This system can setup 
-    = PhoneModel.count
-    different phone models from the manufacturers 
-    - 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
-          =link_to manufacturer, manufacturer_path(manufacturer)
-      - else
-        = succeed '.' do
-          =link_to manufacturer, manufacturer_path(manufacturer)
-
 %h2 Admin Area
 = render :partial => 'tenants/sip_accounts_and_phones', :locals => {:tenant => @tenant}
 
@@ -49,4 +21,19 @@
 = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => @tenant}
 
 %h2 Gemeinschaft Configuration
-= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant}
\ No newline at end of file
+= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => @tenant}
+
+%p
+  This system can setup 
+  = PhoneModel.count
+  different phone models from the manufacturers 
+  - 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
+        =link_to manufacturer, manufacturer_path(manufacturer)
+    - else
+      = succeed '.' do
+        =link_to manufacturer, manufacturer_path(manufacturer)
\ No newline at end of file