From 791bf973b02b626f876b7e5819e2037dcff90f84 Mon Sep 17 00:00:00 2001 From: "Mario \"Kuroir\" Ricalde" Date: Wed, 13 Feb 2013 05:39:21 -0600 Subject: Simple Form Fixes for Form Actions --- app/views/users/_form.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/views/users') 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') -- cgit v1.2.3 From 3d11d0a3a047a12bfd40b61252e269cabac76225 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 15 Feb 2013 14:49:16 +0100 Subject: Basic structure for sim_cards and sim_card_providers. --- app/views/users/show.html.haml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/views/users') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index c63c791..ba38547 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -67,6 +67,9 @@ - cache(['user_show_phones_overview', I18n.locale, @user, @user.phones]) do = render :partial => 'phones', :locals => {:user => @user} + / - cache(['user_show_sim_cards_overview', I18n.locale, @user, @user.phones]) do + / = render :partial => 'phones', :locals => {:user => @user} + - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do = render :partial => 'fax_accounts', :locals => {:user => @user} -- cgit v1.2.3 From 14e8e9923666991703f747a4abfd6fbfb96d2dc1 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 15 Feb 2013 15:03:37 +0100 Subject: Show sim_cards of a user. Misc. --- app/views/users/show.html.haml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'app/views/users') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index ba38547..dca8cff 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -67,8 +67,10 @@ - cache(['user_show_phones_overview', I18n.locale, @user, @user.phones]) do = render :partial => 'phones', :locals => {:user => @user} - / - cache(['user_show_sim_cards_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 => @user.sim_cards.first.sim_card_provider, :sim_cards => @user.sim_cards} - cache(['user_show_fax_accounts_overview', I18n.locale, @user, @user.fax_accounts]) do = render :partial => 'fax_accounts', :locals => {:user => @user} -- cgit v1.2.3 From 8474fe8ce8fe660ae65a59ed4fcad31c2e5647a2 Mon Sep 17 00:00:00 2001 From: Stefan Wintermeyer Date: Fri, 15 Feb 2013 16:07:47 +0100 Subject: Bugfix --- app/views/users/show.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/views/users') diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index dca8cff..0f6cc2c 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -70,7 +70,8 @@ - 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 => @user.sim_cards.first.sim_card_provider, :sim_cards => @user.sim_cards} + = 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} -- cgit v1.2.3