Download as
Browse Code »

Commit 0e859c8ff7ebe515f6b39546fba15f8b209f032f

Authored by Valessio S Brito
Committed by Antonio Terceiro
1 parent 8a13f248
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

Changes needed for the wizard

Showing 4 changed files with 38 additions and 21 deletions   Show diff stats
app/views/friends/invite.rhtml
  Diff comments   View file @0e859c8
  1 +<% if @wizard %>
  2 + <%= render :partial => 'account/wizard_steps'%>
  3 +<% end %>
  4 +
1 5 <h1><%= __('Invite your friends') %></h1>
2 6  
3 7 <% unless @friends %>
... ... @@ -101,6 +105,3 @@
101 105  
102 106 <% end %>
103 107  
104   -<% if @wizard %>
105   - <%= render :partial => 'account/wizard_steps'%>
106   -<% end %>
... ...
app/views/layouts/wizard.rhtml
  Diff comments   View file @0e859c8
... ... @@ -7,13 +7,14 @@
7 7 <%= javascript_include_tag 'jquery-latest.js' %>
8 8 <script type="text/javascript">
9 9 jQuery.noConflict();
  10 +
10 11 </script>
11 12  
12 13 <%=
13 14 # Load the principal css files:
14 15 stylesheet_import( %w( common button search forms profiles)
15 16 ) + "\n" +
16   - stylesheet_import( %w( common button search forms profiles),
  17 + stylesheet_import( %w( common button search forms profiles wizard),
17 18 :themed_source => true ) + "\n" +
18 19 # Load the boxes's css file if each exists:
19 20 import_blocks_stylesheets +
... ... @@ -21,10 +22,20 @@
21 22 stylesheet_import( "controller_"+ @controller.controller_name(), :themed_source => true )
22 23 %>
23 24 </head>
24   -
25 25 <body class='noosfero' id='wizard'>
26 26 <div id="wizard-content">
  27 + <a href="#" id="btShowHelp" class="icon-help32on help-on icon-help-on"
  28 + title="<%= _('Turn help on/off') %>"
  29 + onclick="mouseHelpOnOff(); return false"><span><%= _('Help') %></span></a>
27 30 <%= yield %>
28 31 </div><!-- id="wizard-content" -->
  32 + <div id="helpBox" style="display:none">
  33 + <div id="helpBoxBody">
  34 + <div class="helpAvatar"></div>
  35 + <div id="helpBoxContent"></div>
  36 + </div>
  37 + <%= javascript_include_tag 'show-mouse-help' %>
  38 + <%= javascript_include_tag 'noosfero-show-help' %>
  39 +
29 40 </body>
30 41 </html>
... ...
app/views/memberships/new_community.rhtml
  Diff comments   View file @0e859c8
  1 +<% if @wizard %>
  2 + <%= render :partial => 'account/wizard_steps' %>
  3 +<% end %>
  4 +
1 5 <h1><%= __('Creating new community') %></h1>
2 6  
3 7 <%= error_messages_for :community %>
... ... @@ -24,13 +28,13 @@
24 28 <div style='margin-bottom: 1em; margin-top: 1em;'>
25 29 <%= _('New members must be approved:')%>
26 30 </div>
27   - <div style='margin-bottom: 0.5em'>
  31 + <div style='margin-bottom: 0.5em' id='community-join-before'>
28 32 <%= radio_button 'community', 'closed', 'true', :style => 'float: left' %>
29 33 <div style='margin-left: 30px'>
30 34 <%= _('<strong>Before</strong> joining this group (a moderator has to accept the member in pending request before member can access the intranet and/or the website).') %>
31 35 </div>
32 36 </div>
33   - <div>
  37 + <div id='community-join-after'>
34 38 <%= radio_button 'community', 'closed', 'false', :style => 'float: left' %>
35 39 <div style='margin-left: 30px'>
36 40 <%= _('<strong>After</strong> joining this group (a moderator can always desactivate access for users later).') %>
... ... @@ -50,6 +54,6 @@
50 54  
51 55 </div>
52 56  
53   -<% if @wizard %>
54   - <%= render :partial => 'account/wizard_steps' %>
55   -<% end %>
  57 +
  58 +
  59 +
... ...
app/views/search/communities.rhtml
  Diff comments   View file @0e859c8
1 1 <% if @wizard && user %>
2 2 <h2><%= _('Hello %s, now you can choose yours groups') % user.identifier %></h2>
3 3 <% else %>
  4 +
  5 +<% if @wizard %>
  6 + <%= render :partial => 'account/wizard_steps' %>
  7 +<% end %>
  8 +
4 9 <%= search_page_title( __('Communities'), { :query => @query,
5 10 :category => @category ? @category.name : nil,
6 11 :total_results => @total_results,
... ... @@ -16,13 +21,6 @@
16 21 <div class='atention'><%= __('Choose the communities you want to join and/or create your own.') %></div>
17 22 <% end %>
18 23  
19   -<div id='search-results-and-pages'>
20   - <%# FIXME ARMENGUE %>
21   - <%= display_results(false) %>
22   -
23   - <%= pagination_links @results.values.first %>
24   -</div>
25   -
26 24 <% if logged_in? %>
27 25 <% button_bar do %>
28 26 <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
... ... @@ -30,9 +28,12 @@
30 28 <% end %>
31 29 <% end %>
32 30  
33   -<br style="clear:both" />
  31 +<div id='search-results-and-pages'>
  32 + <%# FIXME ARMENGUE %>
  33 + <%= display_results(false) %>
34 34  
35   -<% if @wizard %>
36   - <%= render :partial => 'account/wizard_steps' %>
37   -<% end %>
  35 + <%= pagination_links @results.values.first %>
  36 +</div>
  37 +
  38 +<br style="clear:both" />
38 39  
... ...