Changes needed for the wizard

Valessio S Brito · Antonio Terceiro
1 parent 8a13f248
Showing 4 changed files with 38 additions and 21 deletions Show diff stats
app/views/friends/invite.rhtml
app/views/layouts/wizard.rhtml
app/views/memberships/new_community.rhtml
app/views/search/communities.rhtml
+<% if @wizard %>
+  <%= render :partial => 'account/wizard_steps'%>
+<% end %>
+
 <h1><%= __('Invite your friends') %></h1>
 <% unless @friends %>
@@ -101,6 +105,3 @@
 <% end %>
-<% if @wizard %>
-  <%= render :partial => 'account/wizard_steps'%>
-<% end %>
@@ -7,13 +7,14 @@
     <%= javascript_include_tag 'jquery-latest.js' %>
     <script type="text/javascript">
       jQuery.noConflict();
+
     </script>
     <%=
       # Load the principal css files:
       stylesheet_import( %w( common button search forms profiles)
                          ) + "\n" +
-      stylesheet_import( %w( common button search forms profiles),
+      stylesheet_import( %w( common button search forms profiles wizard),
       :themed_source => true ) + "\n" +
       # Load the boxes's css file if each exists:
       import_blocks_stylesheets +
@@ -21,10 +22,20 @@
       stylesheet_import( "controller_"+ @controller.controller_name(), :themed_source => true )
     %>
   </head>
-
   <body class='noosfero' id='wizard'>
         <div id="wizard-content">
+        <a href="#" id="btShowHelp" class="icon-help32on help-on icon-help-on"
+           title="<%= _('Turn help on/off') %>"
+           onclick="mouseHelpOnOff(); return false"><span><%= _('Help') %></span></a>
           <%= yield %>
         </div><!-- id="wizard-content" -->
+    <div id="helpBox" style="display:none">
+      <div id="helpBoxBody">
+        <div class="helpAvatar"></div>
+        <div id="helpBoxContent"></div>
+      </div>
+    <%= javascript_include_tag 'show-mouse-help' %>
+    <%= javascript_include_tag 'noosfero-show-help' %>
+
   </body>
 </html>
+<% if @wizard %>
+  <%= render :partial => 'account/wizard_steps' %>
+<% end %>
+
 <h1><%= __('Creating new community') %></h1>
 <%= error_messages_for :community %>
@@ -24,13 +28,13 @@
   <div style='margin-bottom: 1em; margin-top: 1em;'>
   <%= _('New members must be approved:')%>
   </div>
-  <div style='margin-bottom: 0.5em'>
+  <div style='margin-bottom: 0.5em' id='community-join-before'>
     <%= radio_button 'community', 'closed', 'true', :style => 'float: left' %>
     <div style='margin-left: 30px'>
       <%= _('<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).') %>
     </div>
   </div>
-  <div>
+  <div id='community-join-after'>
     <%= radio_button 'community', 'closed', 'false', :style => 'float: left' %>
     <div style='margin-left: 30px'>
       <%= _('<strong>After</strong> joining this group (a moderator can always desactivate access for users later).') %>
@@ -50,6 +54,6 @@
 </div>
-<% if @wizard %>
-  <%= render :partial => 'account/wizard_steps' %>
-<% end %>
+
+
+
 <% if @wizard && user %>
   <h2><%= _('Hello %s, now you can choose yours groups') % user.identifier %></h2>
 <% else %>
+
+<% if @wizard %>
+  <%= render :partial => 'account/wizard_steps' %>
+<% end %>
+
 <%= search_page_title( __('Communities'), { :query => @query, 
                                       :category => @category ? @category.name : nil, 
                                       :total_results => @total_results, 
@@ -16,13 +21,6 @@
   <div class='atention'><%= __('Choose the communities you want to join and/or create your own.') %></div>
 <% end %>
-<div id='search-results-and-pages'>
-  <%# FIXME ARMENGUE %>
-  <%= display_results(false) %>
-
-  <%= pagination_links @results.values.first %>
-</div>
-
 <% if logged_in? %>
   <% button_bar do %>
     <%# FIXME shouldn't the user create the community in the current environment instead of going to its home environment? %>
@@ -30,9 +28,12 @@
   <% end %>
 <% end %>
-<br style="clear:both" />
+<div id='search-results-and-pages'>
+  <%# FIXME ARMENGUE %>
+  <%= display_results(false) %>
-<% if @wizard %>
-  <%= render :partial => 'account/wizard_steps' %>
-<% end %>
+  <%= pagination_links @results.values.first %>
+</div>
+
+<br style="clear:both" />