Download as
Browse Code »

Commit 5fbaa212e1ea08421077d68495b404af253598b8

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent d6c35f54
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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 11 <%= hidden_field_tag(:confirmation, 1) %>
12 12 <%= hidden_field_tag(:wizard, true) %>
13 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 15 <% else %>
16 16 <%= submit_button(:ok, _("Join now")) %>
17 17 <% end %>
... ...
app/views/search/communities.rhtml
  Diff comments   View file @5fbaa21
1 1 <% if @wizard && user %>
2 2 <h2><%= _('Hello %s, now you can choose yours groups') % user.identifier %></h2>
3   -<% else %>
4   -
5   -<% if @wizard %>
6 3 <%= render :partial => 'account/wizard_steps' %>
7   -<% end %>
  4 +<% else %>
8 5  
9 6 <%= search_page_title( __('Communities'), { :query => @query,
10 7 :category => @category ? @category.name : nil,
... ...