Merge branch 'develop'5.1-beta5

2 files changed, 8 insertions, 2 deletions

diff --git a/app/views/users/_form.html.haml b/app/views/users/_form.html.haml
index 9a75677..90d0e02 100644
--- a/app/views/users/_form.html.haml
+++ b/app/views/users/_form.html.haml
@@ -4,7 +4,7 @@
 
     = render "form_core", :f => f
 
-    .actions
+    .form-actions
       = f.button :submit, conditional_t('users.form.submit')
 - else
   = simple_form_for(@user) do |f|
@@ -12,5 +12,5 @@
 
     = render "form_core", :f => f
 
-    .actions
+    .form-actions
       = f.button :submit, conditional_t('users.form.submit')
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index c63c791..0f6cc2c 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -67,6 +67,12 @@
     - cache(['user_show_phones_overview', I18n.locale, @user, @user.phones]) do
       = render :partial => 'phones', :locals => {:user => @user}
 
+    - if GsParameter.get('SIM_CARDS') == true
+      - cache(['user_show_sim_cards_overview', I18n.locale, @user, @user.sim_cards]) do
+        %h2=t('sim_cards.index.page_title')
+        = render :partial => 'sim_cards/index_core', :locals => {:parent => SimCardProvider.first, :sim_cards => @user.sim_cards}
+        = render :partial => 'shared/create_link', :locals => {:parent => SimCardProvider.first, :child_class => SimCard}
+
     - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do
       = render :partial => 'fax_accounts', :locals => {:user => @user}