From 8a3d1d033c9006cba09472bc5e79a14d98e818b4 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 25 Feb 2014 09:41:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7navbar=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=B3=A8=E5=86=8C=E5=AF=B9=E9=BD=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/users_helper.rb | 6 ++++++ app/views/account/register.html.erb | 2 +- app/views/layouts/base_users.html.erb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 647e76657..1b41fada2 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -234,4 +234,10 @@ module UsersHelper false end + + # base user上面的navbar显示内容 + def show_item_on_navbar params + displayed_item = %w|index| + displayed_item.include?(params['action']) + end end diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 2e82dcd1c..3aabc814a 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -297,7 +297,7 @@

<%= f.text_field :mail, :required => true %>

<%="#{l(:label_mail_attention)} "%>

-

<%= f.select :language, lang_options_for_select %>

+

<%= f.select :language, lang_options_for_select , :required => true %>

diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 32e517ab0..513aba827 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -1,4 +1,4 @@ -<% @nav_dispaly_user_label = 1 %> +<% @nav_dispaly_user_label = show_item_on_navbar(params) %>