Download as
Browse Code »

Commit 5fbaa212e1ea08421077d68495b404af253598b8

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent d6c35f54
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem1271: displaying step buttons on wizard

Showing 2 changed files with 2 additions and 5 deletions   Show diff stats
app/views/account/_profile_details.rhtml
  Diff comments   View file @5fbaa21
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 <%= hidden_field_tag(:confirmation, 1) %> 11 <%= hidden_field_tag(:confirmation, 1) %>
12 <%= hidden_field_tag(:wizard, true) %> 12 <%= hidden_field_tag(:wizard, true) %>
13 <% if @profile.members.include?(user) %> 13 <% if @profile.members.include?(user) %>
14 - <%= link_to( _('Leave'), @profile.leave_url.merge(:confirmation => 1, :wizard => true }, :method => 'post') %> 14 + <%= link_to( _('Leave'), @profile.leave_url.merge(:confirmation => 1, :wizard => true ), :method => 'post') %>
15 <% else %> 15 <% else %>
16 <%= submit_button(:ok, _("Join now")) %> 16 <%= submit_button(:ok, _("Join now")) %>
17 <% end %> 17 <% end %>
app/views/search/communities.rhtml
  Diff comments   View file @5fbaa21
1 <% if @wizard && user %> 1 <% if @wizard && user %>
2 <h2><%= _('Hello %s, now you can choose yours groups') % user.identifier %></h2> 2 <h2><%= _('Hello %s, now you can choose yours groups') % user.identifier %></h2>
3 -<% else %>  
4 -  
5 -<% if @wizard %>  
6 <%= render :partial => 'account/wizard_steps' %> 3 <%= render :partial => 'account/wizard_steps' %>
7 -<% end %> 4 +<% else %>
8 5
9 <%= search_page_title( __('Communities'), { :query => @query, 6 <%= search_page_title( __('Communities'), { :query => @query,
10 :category => @category ? @category.name : nil, 7 :category => @category ? @category.name : nil,