Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

Conflicts:
	app/views/admin/sites/site_info.html.erb
This commit is contained in:
Christophe Vilayphiou committed 2012-05-07 16:08:05 +08:00
commit 9a5e7cc8fa
3 files changed
+58 -31

No files matched your search

+1 -1
View File
@@ -160,7 +160,7 @@ module ApplicationHelper
end
def active_when_current_locale_eq(locale)
locale.to_sym == I18n.locale ? 'active': ''
locale.to_sym == I18n.locale ? 'active in': ''
end
end