Rename *.rhtml -> *.html.erb

*.rhtml is deprecated in Rails 3

Rename .rhtml -> .html.erb
*.rhtml is deprecated in Rails 3
Antonio Terceiro
1 parent 645451ed
Showing 762 changed files with 8014 additions and 8014 deletions Show diff stats
app/views/account/_email_status.html.erb
app/views/account/_email_status.rhtml
app/views/account/_identifier_status.html.erb
app/views/account/_identifier_status.rhtml
app/views/account/_login_form.html.erb
app/views/account/_login_form.rhtml
app/views/account/_signup_form.html.erb
app/views/account/_signup_form.rhtml
app/views/account/accept_terms.html.erb
app/views/account/accept_terms.rhtml
app/views/account/activate_enterprise.html.erb
app/views/account/activate_enterprise.rhtml
app/views/account/activation_question.html.erb
app/views/account/activation_question.rhtml
app/views/account/already_activated.html.erb
app/views/account/already_activated.rhtml
app/views/account/blocked.html.erb
app/views/account/blocked.rhtml
app/views/account/change_password.html.erb
app/views/account/change_password.rhtml
@@ -0,0 +1,7 @@
+<div class='status-identifier'>
+  <p><span class='<%= @status_class %>'><%= @status %></span></p>
+  <script type="text/javascript">
+    jQuery('#user_email').removeClass('<%= validation_classes %>');
+    jQuery('#user_email').addClass('<%= @status_class %>');
+  </script>
+</div>
@@ -1,7 +0,0 @@
-<div class='status-identifier'>
-  <p><span class='<%= @status_class %>'><%= @status %></span></p>
-  <script type="text/javascript">
-    jQuery('#user_email').removeClass('<%= validation_classes %>');
-    jQuery('#user_email').addClass('<%= @status_class %>');
-  </script>
-</div>
@@ -0,0 +1,7 @@
+<div class='status-identifier'>
+  <p><span class='<%= @status_class %>'><%= @status %></span></p>
+  <script type="text/javascript">
+    jQuery('#user_login').removeClass('<%= validation_classes %>');
+    jQuery('#user_login').addClass('<%= @status_class %>');
+  </script>
+</div>
@@ -1,7 +0,0 @@
-<div class='status-identifier'>
-  <p><span class='<%= @status_class %>'><%= @status %></span></p>
-  <script type="text/javascript">
-    jQuery('#user_login').removeClass('<%= validation_classes %>');
-    jQuery('#user_login').addClass('<%= @status_class %>');
-  </script>
-</div>
@@ -0,0 +1,22 @@
+<% labelled_form_for :user, @user,
+   :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') }  do |f| %>
+
+<%= f.text_field :login,
+                 :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
+                 :onchange => 'this.value = convToValidLogin( this.value )' %>
+
+<%= f.password_field :password,
+                     :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password' %>
+
+<% if params[:enterprise_code] %>
+  <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+  <%= hidden_field_tag :answer, params[:answer] %>
+  <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
+<% end %>
+
+<% button_bar do %>
+  <%= submit_button( 'login', _('Log in') )%>
+  <%= lightbox_close_button(_('Cancel')) if lightbox? %>
+<% end %>
+
+<% end %>
@@ -1,22 +0,0 @@
-<% labelled_form_for :user, @user,
-   :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') }  do |f| %>
-
-<%= f.text_field :login,
-                 :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
-                 :onchange => 'this.value = convToValidLogin( this.value )' %>
-
-<%= f.password_field :password,
-                     :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password' %>
-
-<% if params[:enterprise_code] %>
-  <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
-  <%= hidden_field_tag :answer, params[:answer] %>
-  <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
-<% end %>
-
-<% button_bar do %>
-  <%= submit_button( 'login', _('Log in') )%>
-  <%= lightbox_close_button(_('Cancel')) if lightbox? %>
-<% end %>
-
-<% end %>
@@ -0,0 +1,163 @@
+<% @profile_data = @person %>
+
+<%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
+
+<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %>
+
+<%= hidden_field_tag :invitation_code, @invitation_code %>
+
+<div id='signup-form-header'>
+
+  <div id='signup-formfield-group'>
+    <%= label(:user, :login, _('Username'), {:class => 'formlabel'}) %>
+    <span id="signup-domain"><%= environment.default_hostname %>/</span>
+    <div id='signup-login'>
+      <div id='signup-login-field' class='formfield'>
+        <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
+        <div id='url-check'><p>&nbsp;</p></div>
+      </div>
+      <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
+      <br style="clear: both;" />
+    </div>
+  </div>
+  <%= observe_field 'user_login',
+        :url => { :action => 'check_url' },
+        :with => 'identifier',
+        :update => 'url-check',
+        :loading => "jQuery('#user_login').removeClass('#{validation_classes}').addClass('checking');
+                     jQuery('#url-check').html('<p><span class=\"checking\">#{checking_message(:url)}</span></p>');",
+        :complete => "jQuery('#user_login').removeClass('checking')"
+  %>
+
+  <div id='signup-password'>
+    <%= required f.password_field(:password, :id => 'user_pw') %>
+    <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>
+    <div id='fake-check'><p>&nbsp;</p></div>
+  </div>
+
+  <div id='signup-password-confirmation'>
+    <%= required f.password_field(:password_confirmation) %>
+    <%= content_tag(:small,_('We need to be sure that you filled in your password correctly. Confirm you password.'), :id => 'password-confirmation-balloon') %>
+    <div id='password-check'><p>&nbsp;</p></div>
+  </div>
+
+  <div id='signup-email'>
+    <%= required f.text_field(:email) %>
+    <%= content_tag(:small,_('This e-mail address will be used to contact you.'), :id => 'email-balloon') %>
+    <div id='email-check'><p>&nbsp;</p></div>
+  </div>
+  <%= observe_field "user_email",
+        :url      => { :action => "check_email" },
+        :with     => "address",
+        :update   => "email-check",
+        :loading  => "jQuery('#user_email').removeClass('#{validation_classes}').addClass('checking');
+                      jQuery('#email-check').html('<p><span class=\"checking\">#{checking_message(:email)}</span></p>');",
+        :complete => "jQuery('#user_email').removeClass('checking')",
+        :before   => "var field = jQuery('#user_email');
+                      if (field.val()=='') {
+                        field.removeClass('#{validation_classes}');
+                        jQuery('#email-check').html('<p>&nbsp;</p>');
+                        return false;
+                      }
+                      if (!( field.valid() )) {
+                        field.removeClass('#{validation_classes}').addClass('invalid');
+                        jQuery('#email-check').html('<p><span class=\"invalid\">#{_('This e-mail address is not valid')}</span></p>');
+                        return false;
+                      }"
+  %>
+
+  <div id='signup-name'>
+    <%= labelled_form_field(_('Full name'), text_field(:profile_data, :name)) %>
+    <%= content_tag(:small,_('Tell us your name, it will be used to identify yourself.'), :id => 'name-balloon') %>
+  </div>
+
+</div>
+
+<div id="signup-form-profile">
+
+  <% labelled_fields_for :profile_data, @person do |f| %>
+    <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
+  <% end %>
+
+  <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
+
+  <%= template_options(Person, 'profile_data') %>
+
+  <% unless @terms_of_use.blank? %>
+    <div id='terms-of-use-box' class='formfieldline'>
+      <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
+    </div>
+  <% end %>
+
+  <% if params[:enterprise_code] %>
+    <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+    <%= hidden_field_tag :answer, params[:answer] %>
+    <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
+    <%= hidden_field_tag :new_user, true %>
+  <% end %>
+</div>
+
+<p style="text-align: center">
+  <%= submit_button('save', _('Create my account')) %>
+</p>
+
+<% end -%>
+
+<script type="text/javascript">
+jQuery(function($) {
+
+  $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
+
+  $('#signup-form input[type=text], #signup-form textarea').each(function() {
+    $(this).bind('blur', function() {
+      if ($(this).val() == '') {
+        $(this).removeClass('filled-in');
+      }
+      else $(this).addClass('filled-in');
+    });
+  });
+
+  $('#user_pw').focus(function() {
+    $('#password-balloon').fadeIn('slow');
+  });
+  $('#user_password_confirmation').focus(function() {
+    $('#password-confirmation-balloon').fadeIn('slow');
+  });
+  $('#user_password_confirmation, #user_pw').blur(function() {
+    if ($('#user_password_confirmation').val() != '') {
+      if ($('#user_password_confirmation').val() == $('#user_pw').val()) {
+        $('#user_password_confirmation').addClass('validated').removeClass('invalid');
+        $('#user_pw').removeClass('invalid_input').addClass('valid_input');
+        $('#password-check').html("<p>&nbsp;</p>");
+      } else if ($('#user_password_confirmation').val() != $('#user_pw').val()) {
+        $('#user_password_confirmation').removeClass('validated').addClass('invalid');
+        $('#user_pw').addClass('invalid_input').removeClass('valid_input');
+        $('#password-check').html("<p><span class='invalid'><%= _('Passwords don\'t match') %></span></p>");
+      }
+    }
+    $('#password-balloon').fadeOut('slow');
+    $('#password-confirmation-balloon').fadeOut('slow');
+  });
+  $('#user_login').focus(function() {
+    $('#signup-balloon').fadeIn('slow');
+  });
+  $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
+  $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
+  $('#user_email').focus(function() {
+    $('#email-balloon').fadeIn('slow');
+  });
+  $('#user_email').blur(function() {
+    $('#email-balloon').fadeOut('slow');
+  });
+  $('#profile_data_name').focus(function() {
+    $('#name-balloon').fadeIn('slow');
+  });
+  $('#profile_data_name').blur(function() {
+    $('#name-balloon').fadeOut('slow');
+    if ($(this).val() == '') {
+      $(this).removeClass('validated');
+    }
+    else $(this).addClass('validated');
+  });
+});
+</script>
@@ -1,163 +0,0 @@
-<% @profile_data = @person %>
-
-<%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
-
-<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do |f| %>
-
-<%= hidden_field_tag :invitation_code, @invitation_code %>
-
-<div id='signup-form-header'>
-
-  <div id='signup-formfield-group'>
-    <%= label(:user, :login, _('Username'), {:class => 'formlabel'}) %>
-    <span id="signup-domain"><%= environment.default_hostname %>/</span>
-    <div id='signup-login'>
-      <div id='signup-login-field' class='formfield'>
-        <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
-        <div id='url-check'><p>&nbsp;</p></div>
-      </div>
-      <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
-      <br style="clear: both;" />
-    </div>
-  </div>
-  <%= observe_field 'user_login',
-        :url => { :action => 'check_url' },
-        :with => 'identifier',
-        :update => 'url-check',
-        :loading => "jQuery('#user_login').removeClass('#{validation_classes}').addClass('checking');
-                     jQuery('#url-check').html('<p><span class=\"checking\">#{checking_message(:url)}</span></p>');",
-        :complete => "jQuery('#user_login').removeClass('checking')"
-  %>
-
-  <div id='signup-password'>
-    <%= required f.password_field(:password, :id => 'user_pw') %>
-    <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>
-    <div id='fake-check'><p>&nbsp;</p></div>
-  </div>
-
-  <div id='signup-password-confirmation'>
-    <%= required f.password_field(:password_confirmation) %>
-    <%= content_tag(:small,_('We need to be sure that you filled in your password correctly. Confirm you password.'), :id => 'password-confirmation-balloon') %>
-    <div id='password-check'><p>&nbsp;</p></div>
-  </div>
-
-  <div id='signup-email'>
-    <%= required f.text_field(:email) %>
-    <%= content_tag(:small,_('This e-mail address will be used to contact you.'), :id => 'email-balloon') %>
-    <div id='email-check'><p>&nbsp;</p></div>
-  </div>
-  <%= observe_field "user_email",
-        :url      => { :action => "check_email" },
-        :with     => "address",
-        :update   => "email-check",
-        :loading  => "jQuery('#user_email').removeClass('#{validation_classes}').addClass('checking');
-                      jQuery('#email-check').html('<p><span class=\"checking\">#{checking_message(:email)}</span></p>');",
-        :complete => "jQuery('#user_email').removeClass('checking')",
-        :before   => "var field = jQuery('#user_email');
-                      if (field.val()=='') {
-                        field.removeClass('#{validation_classes}');
-                        jQuery('#email-check').html('<p>&nbsp;</p>');
-                        return false;
-                      }
-                      if (!( field.valid() )) {
-                        field.removeClass('#{validation_classes}').addClass('invalid');
-                        jQuery('#email-check').html('<p><span class=\"invalid\">#{_('This e-mail address is not valid')}</span></p>');
-                        return false;
-                      }"
-  %>
-
-  <div id='signup-name'>
-    <%= labelled_form_field(_('Full name'), text_field(:profile_data, :name)) %>
-    <%= content_tag(:small,_('Tell us your name, it will be used to identify yourself.'), :id => 'name-balloon') %>
-  </div>
-
-</div>
-
-<div id="signup-form-profile">
-
-  <% labelled_fields_for :profile_data, @person do |f| %>
-    <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
-  <% end %>
-
-  <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
-
-  <%= template_options(Person, 'profile_data') %>
-
-  <% unless @terms_of_use.blank? %>
-    <div id='terms-of-use-box' class='formfieldline'>
-      <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
-    </div>
-  <% end %>
-
-  <% if params[:enterprise_code] %>
-    <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
-    <%= hidden_field_tag :answer, params[:answer] %>
-    <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
-    <%= hidden_field_tag :new_user, true %>
-  <% end %>
-</div>
-
-<p style="text-align: center">
-  <%= submit_button('save', _('Create my account')) %>
-</p>
-
-<% end -%>
-
-<script type="text/javascript">
-jQuery(function($) {
-
-  $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
-
-  $('#signup-form input[type=text], #signup-form textarea').each(function() {
-    $(this).bind('blur', function() {
-      if ($(this).val() == '') {
-        $(this).removeClass('filled-in');
-      }
-      else $(this).addClass('filled-in');
-    });
-  });
-
-  $('#user_pw').focus(function() {
-    $('#password-balloon').fadeIn('slow');
-  });
-  $('#user_password_confirmation').focus(function() {
-    $('#password-confirmation-balloon').fadeIn('slow');
-  });
-  $('#user_password_confirmation, #user_pw').blur(function() {
-    if ($('#user_password_confirmation').val() != '') {
-      if ($('#user_password_confirmation').val() == $('#user_pw').val()) {
-        $('#user_password_confirmation').addClass('validated').removeClass('invalid');
-        $('#user_pw').removeClass('invalid_input').addClass('valid_input');
-        $('#password-check').html("<p>&nbsp;</p>");
-      } else if ($('#user_password_confirmation').val() != $('#user_pw').val()) {
-        $('#user_password_confirmation').removeClass('validated').addClass('invalid');
-        $('#user_pw').addClass('invalid_input').removeClass('valid_input');
-        $('#password-check').html("<p><span class='invalid'><%= _('Passwords don\'t match') %></span></p>");
-      }
-    }
-    $('#password-balloon').fadeOut('slow');
-    $('#password-confirmation-balloon').fadeOut('slow');
-  });
-  $('#user_login').focus(function() {
-    $('#signup-balloon').fadeIn('slow');
-  });
-  $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
-  $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
-  $('#user_email').focus(function() {
-    $('#email-balloon').fadeIn('slow');
-  });
-  $('#user_email').blur(function() {
-    $('#email-balloon').fadeOut('slow');
-  });
-  $('#profile_data_name').focus(function() {
-    $('#name-balloon').fadeIn('slow');
-  });
-  $('#profile_data_name').blur(function() {
-    $('#name-balloon').fadeOut('slow');
-    if ($(this).val() == '') {
-      $(this).removeClass('validated');
-    }
-    else $(this).addClass('validated');
-  });
-});
-</script>
@@ -0,0 +1,28 @@
+<script type="text/javascript">
+  function toggle_submit_button(id, enabled) {
+    button = $(id)
+    if (enabled){
+      button.className = button.className.replace(/disabled/, '')
+      button.enable()
+    } else  {
+      button.className += ' disabled'
+      button.disable()
+    }
+  }
+</script>
+<div class=activation-box>
+  <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
+
+  <div id='terms-of-enterprise-use' class='height: 200px; overflow: auto;'><%= @terms_of_enterprise_use %></div>
+
+  <% form_tag :action => 'activate_enterprise' do %>
+    <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+    <%= hidden_field_tag :answer, params[:answer] %>
+
+    <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :onclick => 'toggle_submit_button("submit-accept-terms", this.checked)') %>
+    <% button_bar do %>
+      <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
+      <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
+    <% end %>
+  <% end %>
+</div>
@@ -1,28 +0,0 @@
-<script type="text/javascript">
-  function toggle_submit_button(id, enabled) {
-    button = $(id)
-    if (enabled){
-      button.className = button.className.replace(/disabled/, '')
-      button.enable()
-    } else  {
-      button.className += ' disabled'
-      button.disable()
-    }
-  }
-</script>
-<div class=activation-box>
-  <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
-
-  <div id='terms-of-enterprise-use' class='height: 200px; overflow: auto;'><%= @terms_of_enterprise_use %></div>
-
-  <% form_tag :action => 'activate_enterprise' do %>
-    <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
-    <%= hidden_field_tag :answer, params[:answer] %>
-
-    <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :onclick => 'toggle_submit_button("submit-accept-terms", this.checked)') %>
-    <% button_bar do %>
-      <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
-      <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
-    <% end %>
-  <% end %>
-</div>
@@ -0,0 +1,28 @@
+<div class='activation-box'>
+<h2><%= __('Enterprise activation - part 3 of 3') %></h2>
+
+<%= error_messages_for :user %>
+
+<p><%= __('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
+<p><%= _('Do you have a personal user account in the system?') %></p>
+
+<div id="enterprise-activation-create-user-or-login-button">
+  <%= button_to_function 'login', _('Yes'), "$('enterprise-activation-create-user-form').hide(); $('enterprise-activation-login-form').show()" %> 
+  <%= button_to_function 'add', _('No'),  "$('enterprise-activation-login-form').hide(); $('enterprise-activation-create-user-form').show()" %>
+</div>
+
+<div id="enterprise-activation-create-user-form" style="display: none">
+  <h3><%= _('Personal signup form') %></h3>
+  <%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>
+  <p><%= message = __('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
+</div>
+
+<div id="enterprise-activation-login-form" style="display: none">
+
+  <h3><%= _('Enter you user name and password') %></h3>
+  <%= render :partial => 'login_form' %>
+  <p><%= message %></p>
+</div>
+
+
+</div>
@@ -1,28 +0,0 @@
-<div class='activation-box'>
-<h2><%= __('Enterprise activation - part 3 of 3') %></h2>
-
-<%= error_messages_for :user %>
-
-<p><%= __('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
-<p><%= _('Do you have a personal user account in the system?') %></p>
-
-<div id="enterprise-activation-create-user-or-login-button">
-  <%= button_to_function 'login', _('Yes'), "$('enterprise-activation-create-user-form').hide(); $('enterprise-activation-login-form').show()" %> 
-  <%= button_to_function 'add', _('No'),  "$('enterprise-activation-login-form').hide(); $('enterprise-activation-create-user-form').show()" %>
-</div>
-
-<div id="enterprise-activation-create-user-form" style="display: none">
-  <h3><%= _('Personal signup form') %></h3>
-  <%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>
-  <p><%= message = __('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
-</div>
-
-<div id="enterprise-activation-login-form" style="display: none">
-
-  <h3><%= _('Enter you user name and password') %></h3>
-  <%= render :partial => 'login_form' %>
-  <p><%= message %></p>
-</div>
-
-
-</div>
@@ -0,0 +1,42 @@
+<script language="JavaScript1.2">
+  function check_valid_year(form) {
+    var answer = parseInt(form.answer.value);
+    var val = form.answer.value;
+    if (!answer || (val.length != 4) || val > <%= Time.now.year %> || val < 1900) {
+      alert(<%= (_('The year must be between %d and %d') % [1900, Time.now.year]).inspect %>);
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  function check_valid_cnpj(form) {
+    var answer = parseInt(form.answer.value);
+    var val = form.answer.value;
+    if (!answer || (val.length != 14)) {
+      alert(<%= _('A CNPJ have 14 digits').inspect %>);
+      return false;
+    } else {
+      return true;
+    }
+  }
+</script>
+
+<div class='activation-box'>
+  <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
+  <% form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %> 
+
+  <p>  <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
+
+  <p><%= __("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
+
+  <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (__("What year your enterprise was founded? It must have 4 digits, eg 1990. %s") % environment.tip_message_enterprise_activation_question) : __('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>
+
+    <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
+
+    <% button_bar do %>
+      <%= button 'cancel', _('Cancel'), :action => 'index' %>
+      <%= submit_button 'forward', _('Continue') %>
+    <% end %>
+  <% end %>
+</div>
@@ -1,42 +0,0 @@
-<script language="JavaScript1.2">
-  function check_valid_year(form) {
-    var answer = parseInt(form.answer.value);
-    var val = form.answer.value;
-    if (!answer || (val.length != 4) || val > <%= Time.now.year %> || val < 1900) {
-      alert(<%= (_('The year must be between %d and %d') % [1900, Time.now.year]).inspect %>);
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  function check_valid_cnpj(form) {
-    var answer = parseInt(form.answer.value);
-    var val = form.answer.value;
-    if (!answer || (val.length != 14)) {
-      alert(<%= _('A CNPJ have 14 digits').inspect %>);
-      return false;
-    } else {
-      return true;
-    }
-  }
-</script>
-
-<div class='activation-box'>
-  <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 1 of 2') : _('part 1 of 3')) %></h2>
-  <% form_tag( {:action => 'accept_terms'}, {:method => 'get', :onsubmit => (@question == :foundation_year ? 'return check_valid_year(this)' : 'return check_valid_cnpj(this)')}) do %> 
-
-  <p>  <strong><%= _('Pay atention! You have only one chance!') %></strong> </p>
-
-  <p><%= __("This is a question to know if you really are part of this enterprise. Pay atention because you have only one chance to answer right and activate your enterprise. If you answer wrong you will not be able to activate the enterprise automaticaly and must get in touch with the admins of %s by email or phone.") % environment.name %> </p>
-
-  <%= ApplicationHelper::NoosferoFormBuilder::output_field(@question == :foundation_year ? (__("What year your enterprise was founded? It must have 4 digits, eg 1990. %s") % environment.tip_message_enterprise_activation_question) : __('What is the CNPJ of your enterprise?'), text_field_tag(:answer, nil, :id => 'enterprise-activation-answer')) %>
-
-    <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
-
-    <% button_bar do %>
-      <%= button 'cancel', _('Cancel'), :action => 'index' %>
-      <%= submit_button 'forward', _('Continue') %>
-    <% end %>
-  <% end %>
-</div>
@@ -0,0 +1 @@
+<%= __('This enterprise is already active') %>
@@ -1 +0,0 @@
-<%= __('This enterprise is already active') %>
@@ -0,0 +1,17 @@
+<div class='blocked-warning' >
+<center><h1><%= __('This enterprise can\'t be activated by the system') %></h1></center>
+<p><%= __('Unfortunately this enterprise can\'t be activated via the system.') %></p>
+<p>
+<% if @enterprise.blocked? %>
+  <%= _('There was a failed atempt of activation and the automated activation was disabled for your security.') %>
+<% else %>
+  <%= __('We don\'t have enough information about your enterprise to identify you.') %>
+<% end %>
+</p>
+
+<% if @environment.activation_blocked_text.blank? %>
+  <%= __('Your enterprise has been blocked') %>
+<% else %>
+  <%= @environment.activation_blocked_text %>
+<% end %>
+</div>
@@ -1,17 +0,0 @@
-<div class='blocked-warning' >
-<center><h1><%= __('This enterprise can\'t be activated by the system') %></h1></center>
-<p><%= __('Unfortunately this enterprise can\'t be activated via the system.') %></p>
-<p>
-<% if @enterprise.blocked? %>
-  <%= _('There was a failed atempt of activation and the automated activation was disabled for your security.') %>
-<% else %>
-  <%= __('We don\'t have enough information about your enterprise to identify you.') %>
-<% end %>
-</p>
-
-<% if @environment.activation_blocked_text.blank? %>
-  <%= __('Your enterprise has been blocked') %>
-<% else %>
-  <%= @environment.activation_blocked_text %>
-<% end %>
-</div>
@@ -0,0 +1,17 @@
+<h1><%= _('Change password') %></h1>
+
+<% form_tag do %>
+
+<p><label for="password"><%= _('Current password') %></label><br/>
+<%= password_field_tag :current_password %></p>
+
+<p><label for="password"><%= _('New password') %></label><br/>
+<%= password_field_tag :new_password %></p>
+
+<p><label for="password_confirmation"><%= _('Confirm your new Password') %></label><br/>
+<%= password_field_tag :new_password_confirmation %></p>
+
+<%= submit_button :ok, _('Change password') %>
+
+<% end %>
+
@@ -1,17 +0,0 @@
-<h1><%= _('Change password') %></h1>
-
-<% form_tag do %>
-
-<p><label for="password"><%= _('Current password') %></label><br/>
-<%= password_field_tag :current_password %></p>
-
-<p><label for="password"><%= _('New password') %></label><br/>
-<%= password_field_tag :new_password %></p>
-
-<p><label for="password_confirmation"><%= _('Confirm your new Password') %></label><br/>
-<%= password_field_tag :new_password_confirmation %></p>
-
-<%= submit_button :ok, _('Change password') %>
-
-<% end %>
-
@@ -0,0 +1,22 @@
+<h1><%= _('Forgot your password?') %></h1>
+
+<%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
+
+<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
+
+  <%= f.text_field :login,
+                   :onchange => 'this.value = convToValidLogin( this.value )' %>
+
+  <%= f.text_field :email %>
+
+  <%= f.hidden_field :environment_id, :value => environment.id %>
+
+<div>
+  <% button_bar do %>
+    <%= submit_button('send', _('Send instructions')) %>
+  <% end %>
+</div>
+<%= content_tag(:small,_('After clicking the button above, you will receive an email with a link to a page where you will be able to create a new password.')) %>
+
+<% end %>
+
@@ -1,22 +0,0 @@
-<h1><%= _('Forgot your password?') %></h1>
-
-<%= error_messages_for :change_password, :header_message => _('Instructions to password recovery could not be sent'), :message => nil %>
-
-<% labelled_form_for :change_password, @change_password, :url => { :action => 'forgot_password' } do |f| %>
-
-  <%= f.text_field :login,
-                   :onchange => 'this.value = convToValidLogin( this.value )' %>
-
-  <%= f.text_field :email %>
-
-  <%= f.hidden_field :environment_id, :value => environment.id %>
-
-<div>
-  <% button_bar do %>
-    <%= submit_button('send', _('Send instructions')) %>
-  <% end %>
-</div>
-<%= content_tag(:small,_('After clicking the button above, you will receive an email with a link to a page where you will be able to create a new password.')) %>
-
-<% end %>
-
@@ -0,0 +1,26 @@
+<h1><%= _('Account options') %></h1>
+
+<p>
+<%= link_to _('Change password.'), :action => 'change_password' %>
+<%= _('It is a good idea to change your password from times to times.') %>
+</p>
+
+<p>
+<%= link_to _('Edit Personal details.'), :controller => 'profile_editor', :profile => user.identifier, :action => 'index' %>
+<%= _('You can change your personal details.') %>
+</p>
+
+<p>
+<%= link_to_homepage(_('My home page.')) %>
+<%= _('See your homepage.') %>
+</p>
+
+<p>
+<%= link_to(_('Manage content.'), :controller => 'cms', :profile => user.identifier, :action => 'index') %>
+<%= _('Manage your content.') %>
+</p>
+
+<p>
+<%= link_to _('Logout.'), :action => 'logout' %>
+<%= _('It is always a good idea to make a logout when you finish using the environment.')%>
+</p>
@@ -1,26 +0,0 @@
-<h1><%= _('Account options') %></h1>
-
-<p>
-<%= link_to _('Change password.'), :action => 'change_password' %>
-<%= _('It is a good idea to change your password from times to times.') %>
-</p>
-
-<p>
-<%= link_to _('Edit Personal details.'), :controller => 'profile_editor', :profile => user.identifier, :action => 'index' %>
-<%= _('You can change your personal details.') %>
-</p>
-
-<p>
-<%= link_to_homepage(_('My home page.')) %>
-<%= _('See your homepage.') %>
-</p>
-
-<p>
-<%= link_to(_('Manage content.'), :controller => 'cms', :profile => user.identifier, :action => 'index') %>
-<%= _('Manage your content.') %>
-</p>
-
-<p>
-<%= link_to _('Logout.'), :action => 'logout' %>
-<%= _('It is always a good idea to make a logout when you finish using the environment.')%>
-</p>
@@ -0,0 +1,12 @@
+<h1><%= _('Identify yourself') %></h1>
+
+<p>
+<%= lightbox_link_to _('Login.'), { :controller => 'account', :action => 'login_popup' } %>
+
+<%= _('You need to login to be able to use all the features in this environment.') %>
+</p>
+
+<p>
+<%= link_to _('Sign up.'), :action => 'signup' %>
+<%= _('If you are not an user already, you can register now to become a member of this environment.') %>
+</p>
@@ -1,12 +0,0 @@
-<h1><%= _('Identify yourself') %></h1>
-
-<p>
-<%= lightbox_link_to _('Login.'), { :controller => 'account', :action => 'login_popup' } %>
-
-<%= _('You need to login to be able to use all the features in this environment.') %>
-</p>
-
-<p>
-<%= link_to _('Sign up.'), :action => 'signup' %>
-<%= _('If you are not an user already, you can register now to become a member of this environment.') %>
-</p>
@@ -0,0 +1,5 @@
+<h1><%= _("Invalid change password code") %></h1>
+
+<p>
+<%= _('The code you are using for password change is not valid. Please try to request password change using the <a href="%s">"I forgot my password"</a> functionality.') % url_for(:action => 'forgot_password') %>
+</p>
@@ -1,5 +0,0 @@
-<h1><%= _("Invalid change password code") %></h1>
-
-<p>
-<%= _('The code you are using for password change is not valid. Please try to request password change using the <a href="%s">"I forgot my password"</a> functionality.') % url_for(:action => 'forgot_password') %>
-</p>
@@ -0,0 +1,5 @@
+<h1><%= __("Invalid enterprise code") %></h1>
+
+<p>
+<%= __('The code you are using for validate your enterprise is not valid. Please check if you are typing it correctly.') %>
+</p>
@@ -1,5 +0,0 @@
-<h1><%= __("Invalid enterprise code") %></h1>
-
-<p>
-<%= __('The code you are using for validate your enterprise is not valid. Please check if you are typing it correctly.') %>
-</p>
@@ -0,0 +1,38 @@
+<div class="login-box">
+
+<h2><%= _('Login') %></h2>
+
+<% @user ||= User.new %>
+<% is_thickbox ||= false %>
+
+<%= @message %>
+
+<% labelled_form_for :user, @user, :url => login_url do |f| %>
+
+     <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
+
+     <%= f.password_field :password %>
+
+     <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
+
+     <% button_bar do %>
+       <%= submit_button( 'login', _('Log in') )%>
+       <% if is_thickbox %>
+         <%= thickbox_close_button(_('Cancel')) %>
+       <% end %>
+     <% end %>
+
+<% end %>
+
+<% button_bar do %>
+  <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+    <%= button :add, _("New user"), :controller => 'account', :action => 'signup' %>
+  <% end %>
+
+  <% unless @plugins.dispatch(:allow_password_recovery).include?(false) %>
+    <%= button :help, _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
+  <% end %>
+<% end %>
+
+</div><!-- end class="login-box" -->
+
@@ -1,38 +0,0 @@
-<div class="login-box">
-
-<h2><%= _('Login') %></h2>
-
-<% @user ||= User.new %>
-<% is_thickbox ||= false %>
-
-<%= @message %>
-
-<% labelled_form_for :user, @user, :url => login_url do |f| %>
-
-     <%= f.text_field :login, :id => 'main_user_login', :onchange => 'this.value = convToValidLogin( this.value )', :value => params[:userlogin] %>
-
-     <%= f.password_field :password %>
-
-     <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
-
-     <% button_bar do %>
-       <%= submit_button( 'login', _('Log in') )%>
-       <% if is_thickbox %>
-         <%= thickbox_close_button(_('Cancel')) %>
-       <% end %>
-     <% end %>
-
-<% end %>
-
-<% button_bar do %>
-  <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-    <%= button :add, _("New user"), :controller => 'account', :action => 'signup' %>
-  <% end %>
-
-  <% unless @plugins.dispatch(:allow_password_recovery).include?(false) %>
-    <%= button :help, _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
-  <% end %>
-<% end %>
-
-</div><!-- end class="login-box" -->
-
@@ -0,0 +1,44 @@
+<div class="login-box">
+  <% unless logged_in? %>
+
+    <h2><span><%= _('Login') %></span></h2>
+
+    <div class="login-box-content">
+
+<%
+  @user ||= User.new
+%>
+    
+    <% labelled_form_for :user, @user, :url => login_url do |f| %>
+
+      <%= f.text_field :login, :onchange => 'this.value = convToValidLogin( this.value )' %>
+
+      <%= f.password_field :password %>
+
+      <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
+
+      <% button_bar do %>
+        <%= submit_button( 'login', _('Log in') )%>
+        <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+          <%= link_to content_tag( 'span', _('New user') ),
+              { :controller => 'account', :action => 'signup' },
+              :class => 'button with-text icon-add' %>
+        <% end %>
+      <% end %>
+
+    <% end %>
+
+    <% unless @plugins.dispatch(:allow_password_recovery).include?(false) %>
+      <p class="forgot-passwd">
+        <%= link_to _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
+      </p>
+    <% end %>
+
+    </div>
+
+  <% else %>
+    <h2><%= user.identifier %></h2>
+  <% end %>
+
+</div><!-- end id="login-box" -->
+
@@ -1,44 +0,0 @@
-<div class="login-box">
-  <% unless logged_in? %>
-
-    <h2><span><%= _('Login') %></span></h2>
-
-    <div class="login-box-content">
-
-<%
-  @user ||= User.new
-%>
-    
-    <% labelled_form_for :user, @user, :url => login_url do |f| %>
-
-      <%= f.text_field :login, :onchange => 'this.value = convToValidLogin( this.value )' %>
-
-      <%= f.password_field :password %>
-
-      <%= @plugins.dispatch(:login_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
-
-      <% button_bar do %>
-        <%= submit_button( 'login', _('Log in') )%>
-        <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-          <%= link_to content_tag( 'span', _('New user') ),
-              { :controller => 'account', :action => 'signup' },
-              :class => 'button with-text icon-add' %>
-        <% end %>
-      <% end %>
-
-    <% end %>
-
-    <% unless @plugins.dispatch(:allow_password_recovery).include?(false) %>
-      <p class="forgot-passwd">
-        <%= link_to _("I forgot my password!"), :controller => 'account', :action => 'forgot_password' %>
-      </p>
-    <% end %>
-
-    </div>
-
-  <% else %>
-    <h2><%= user.identifier %></h2>
-  <% end %>
-
-</div><!-- end id="login-box" -->
-
@@ -0,0 +1,7 @@
+<h2><%= _('Are you sure you want to get out?') %></h2>
+<p>
+<% button_bar do %>
+  <%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %>
+  <%= lightbox_close_button _('No, I want to stay.') %>
+<% end %>
+</p>
@@ -1,7 +0,0 @@
-<h2><%= _('Are you sure you want to get out?') %></h2>
-<p>
-<% button_bar do %>
-  <%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %>
-  <%= lightbox_close_button _('No, I want to stay.') %>
-<% end %>
-</p>
@@ -0,0 +1,17 @@
+<h1><%= _('Enter new password') %></h1>
+
+<p>
+<%= _("Hello, %s! Please enter your new password in the form below.") % @change_password.requestor.name %>
+</p>
+
+<%= error_messages_for :change_password %>
+
+<% form_for(:change_password) do |f| %>
+
+  <%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>
+  <%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>
+  <% button_bar do %>
+    <%= submit_button(:ok, _('Change password')) %>
+  <% end %>
+
+<% end %>
@@ -1,17 +0,0 @@
-<h1><%= _('Enter new password') %></h1>
-
-<p>
-<%= _("Hello, %s! Please enter your new password in the form below.") % @change_password.requestor.name %>
-</p>
-
-<%= error_messages_for :change_password %>
-
-<% form_for(:change_password) do |f| %>
-
-  <%= labelled_form_field(_('Enter new password'), (f.password_field :password)) %>
-  <%= labelled_form_field(_('Confirm the new password'), (f.password_field :password_confirmation)) %>
-  <% button_bar do %>
-    <%= submit_button(:ok, _('Change password')) %>
-  <% end %>
-
-<% end %>
@@ -0,0 +1,9 @@
+<h1><%= _('Password changed sucessfully') %></h1>
+
+<p>
+<%= _('%s, your new password was successfully installed.') % @change_password.requestor.identifier %>
+</p>
+
+<p>
+<%= _("You can <a href='%s'>login</a> now.") % url_for(:action => 'login') %>
+</p>
@@ -1,9 +0,0 @@
-<h1><%= _('Password changed sucessfully') %></h1>
-
-<p>
-<%= _('%s, your new password was successfully installed.') % @change_password.requestor.identifier %>
-</p>
-
-<p>
-<%= _("You can <a href='%s'>login</a> now.") % url_for(:action => 'login') %>
-</p>
@@ -0,0 +1,5 @@
+<h1><%= _('Password recovery') %></h1>
+
+<p>
+<%= _('An e-mail was just sent to your e-mail address, with instructions for changing your password. You should receive it in a few minutes.') %>
+</p>
@@ -1,5 +0,0 @@
-<h1><%= _('Password recovery') %></h1>
-
-<p>
-<%= _('An e-mail was just sent to your e-mail address, with instructions for changing your password. You should receive it in a few minutes.') %>
-</p>
@@ -0,0 +1,18 @@
+<% if @register_pending %>
+<div id='thanks-for-signing'>
+  <h1><%= _("Welcome to %s!") % environment.name %></h1>
+  <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
+  <p><%= _("Firstly, some tips for getting started:") %></p>
+  <h4><%= _("Confirm your account!") %></h4>
+  <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
+  <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
+  <h4><%= _("What to do next?") %></h4>
+  <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
+  <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
+  <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
+  <p><%= _("Start exploring and have fun!") %></p>
+</div>
+<% else %>
+  <h1><%= _('Sign up for %s!') % environment.name %></h1>
+  <%= render :partial => 'signup_form' %>
+<% end %>
@@ -1,18 +0,0 @@
-<% if @register_pending %>
-<div id='thanks-for-signing'>
-  <h1><%= _("Welcome to %s!") % environment.name %></h1>
-  <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
-  <p><%= _("Firstly, some tips for getting started:") %></p>
-  <h4><%= _("Confirm your account!") %></h4>
-  <p><%= _("You should receive a welcome email from us shortly. Please take a second to follow the link within to confirm your account.") %></p>
-  <p><%= _("You won't appear as %s until your account is confirmed.") % link_to(_('user'), {:controller => :search, :action => :people, :filter => 'more_recent'}, :target => '_blank') %></p>
-  <h4><%= _("What to do next?") %></h4>
-  <p><%= _("%s. Upload an avatar and let your friends find you easily :)") % link_to(_('Customize your profile'), {:controller => 'doc', :section => 'user', :topic => 'editing-person-info'}, :target => '_blank') %></p>
-  <p><%= _("Learn the guidelines. Read the %s for more details on how to use this social network!") % link_to(_('Documentation'), {:controller => 'doc'}, :target => '_blank') %></p>
-  <p><%= _("%s your Gmail, Yahoo and Hotmail contacts!") % link_to(_('Invite and find'), {:controller => 'doc', :section => 'user', :topic => 'invite-contacts'}, :target => '_blank') %></p>
-  <p><%= _("Start exploring and have fun!") %></p>
-</div>
-<% else %>
-  <h1><%= _('Sign up for %s!') % environment.name %></h1>
-  <%= render :partial => 'signup_form' %>
-<% end %>
@@ -0,0 +1,10 @@
+<% if @enterprise && logged_in? %>
+  <h1><%= _('Welcome to %s') % environment.name %></h1>
+
+  <%= __('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>
+
+  <% button_bar do %>
+    <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_user.person.identifier %> 
+    <%= button 'forward', __('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
+  <% end %>
+<% end %>
@@ -1,10 +0,0 @@
-<% if @enterprise && logged_in? %>
-  <h1><%= _('Welcome to %s') % environment.name %></h1>
-
-  <%= __('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>
-
-  <% button_bar do %>
-    <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_user.person.identifier %> 
-    <%= button 'forward', __('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
-  <% end %>
-<% end %>
@@ -0,0 +1,7 @@
+<div class='description'>
+  <%= _('This text will be sent to new users if the feature "Send welcome e-mail to new users" is enabled on environment.') %><br/><br/>
+  <%= _('Including %s on body, it will be replaced by the real name of the e-mail recipient.') % content_tag('code', '{user_name}') %>
+</div>
+
+<%= labelled_form_field(_('Subject'), text_field(:environment, :signup_welcome_text_subject, :style => 'width:100%')) %>
+<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_text_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
@@ -1,7 +0,0 @@
-<div class='description'>
-  <%= _('This text will be sent to new users if the feature "Send welcome e-mail to new users" is enabled on environment.') %><br/><br/>
-  <%= _('Including %s on body, it will be replaced by the real name of the e-mail recipient.') % content_tag('code', '{user_name}') %>
-</div>
-
-<%= labelled_form_field(_('Subject'), text_field(:environment, :signup_welcome_text_subject, :style => 'width:100%')) %>
-<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_text_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
@@ -0,0 +1,18 @@
+<%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
+<%= labelled_form_field(_('Contact email'), text_field(:environment, :contact_email)) %>
+<% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
+<%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
+<%= required f.text_field(:reports_lower_bound, :size => 3) %>
+<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
+<%= label_tag :languages, _('Available languages') %>
+<br />
+
+<%
+  fields = Noosfero.locales.map do |value, name|
+    labelled_check_box(name, "environment[languages][#{value}]", true, environment.available_locales.include?(value))
+  end
+%>
+<%= balanced_table(fields)%>
+
+<br />
+<%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
@@ -1,18 +0,0 @@
-<%= required labelled_form_field(_('Site name'), text_field(:environment, :name)) %>
-<%= labelled_form_field(_('Contact email'), text_field(:environment, :contact_email)) %>
-<% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
-<%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
-<%= required f.text_field(:reports_lower_bound, :size => 3) %>
-<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
-<%= label_tag :languages, _('Available languages') %>
-<br />
-
-<%
-  fields = Noosfero.locales.map do |value, name|
-    labelled_check_box(name, "environment[languages][#{value}]", true, environment.available_locales.include?(value))
-  end
-%>
-<%= balanced_table(fields)%>
-
-<br />
-<%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%', :class => 'mceEditor') %>
@@ -0,0 +1 @@
+<%= f.text_area :terms_of_use, :cols => 40, :style => 'width: 90%', :class => 'mceEditor' %>
@@ -1 +0,0 @@
-<%= f.text_area :terms_of_use, :cols => 40, :style => 'width: 90%', :class => 'mceEditor' %>
@@ -0,0 +1,42 @@
+<h1><%= _('Administrator Panel') %></h1>
+
+<h2><%= _('System settings') %></h2>
+
+<table>
+  <tr><td><%= link_to _('Environment settings'), :action => 'site_info' %></td></tr>
+  <tr><td><%= link_to _('Features'), :controller => 'features' %></td></tr>
+  <tr><td><%= link_to _('Plugins'), :controller => 'plugins' %></td></tr>
+  <tr><td><%= link_to _('Sideboxes'), :controller => 'environment_design'%></td></tr>
+  <tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>
+  <tr><td><%= link_to _('Licenses'), :controller =>'licenses' %></td></tr>
+</table>
+
+<h2><%= _('Profiles') %></h2>
+
+<table>
+  <tr><td><%= link_to _('User roles'), :controller => 'role' %></td></tr>
+  <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
+  <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
+  <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
+</table>
+
+
+<%
+  plugin_links = @plugins.dispatch(:admin_panel_links)
+%>
+<% unless plugin_links.empty? %>
+  <h2><%= _('Plugins') %></h2>
+  <table>
+  <% plugin_links.each do |link| %>
+    <tr><td><%= link_to link[:title], link[:url] %></td></tr>
+  <% end %>
+  </table>
+<% end %>
+
+<h2><%= _('Enterprise-related settings') %></h2>
+
+<table>
+  <tr><td><%= link_to __('Message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
+  <tr><td><%= link_to _('Validators by region'), :controller => 'region_validators' %></td></tr>
+  <tr><td><%= link_to _('Categories'), :controller => 'categories'%></td></tr>
+</table>
@@ -1,42 +0,0 @@
-<h1><%= _('Administrator Panel') %></h1>
-
-<h2><%= _('System settings') %></h2>
-
-<table>
-  <tr><td><%= link_to _('Environment settings'), :action => 'site_info' %></td></tr>
-  <tr><td><%= link_to _('Features'), :controller => 'features' %></td></tr>
-  <tr><td><%= link_to _('Plugins'), :controller => 'plugins' %></td></tr>
-  <tr><td><%= link_to _('Sideboxes'), :controller => 'environment_design'%></td></tr>
-  <tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>
-  <tr><td><%= link_to _('Licenses'), :controller =>'licenses' %></td></tr>
-</table>
-
-<h2><%= _('Profiles') %></h2>
-
-<table>
-  <tr><td><%= link_to _('User roles'), :controller => 'role' %></td></tr>
-  <tr><td><%= link_to _('Users'), :controller => 'users' %></td></tr>
-  <tr><td><%= link_to _('Profile templates'), :controller => 'templates' %></td></tr>
-  <tr><td><%= link_to _('Fields'), :controller => 'features', :action => 'manage_fields' %></td></tr>
-</table>
-
-
-<%
-  plugin_links = @plugins.dispatch(:admin_panel_links)
-%>
-<% unless plugin_links.empty? %>
-  <h2><%= _('Plugins') %></h2>
-  <table>
-  <% plugin_links.each do |link| %>
-    <tr><td><%= link_to link[:title], link[:url] %></td></tr>
-  <% end %>
-  </table>
-<% end %>
-
-<h2><%= _('Enterprise-related settings') %></h2>
-
-<table>
-  <tr><td><%= link_to __('Message for disabled enterprises'), :action => 'message_for_disabled_enterprise' %></td></tr>
-  <tr><td><%= link_to _('Validators by region'), :controller => 'region_validators' %></td></tr>
-  <tr><td><%= link_to _('Categories'), :controller => 'categories'%></td></tr>
-</table>
@@ -0,0 +1,14 @@
+<h2><%= _('Site info') %></h2>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<% labelled_form_for :environment, @environment, :url => {:action => 'site_info'} do |f| %>
+
+  <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save')) %>
+    <%= button(:cancel, _('Cancel'), :action => 'index') %>
+  <% end %>
+
+<% end %>
@@ -1,14 +0,0 @@
-<h2><%= _('Site info') %></h2>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<% labelled_form_for :environment, @environment, :url => {:action => 'site_info'} do |f| %>
-
-  <%= f.text_area :message_for_disabled_enterprise, :cols => 40, :style => 'width: 90%' %>
-
-  <% button_bar do %>
-    <%= submit_button(:save, _('Save')) %>
-    <%= button(:cancel, _('Cancel'), :action => 'index') %>
-  <% end %>
-
-<% end %>
@@ -0,0 +1,24 @@
+<h1> <%= _('Set Environment Portal') %></h1>
+
+<% if @portal_community.new_record? %>
+  <% form_tag do %>
+    <%= labelled_form_field(_('Portal identifier'), text_field_tag('portal_community_identifier', @portal_community.identifier, :size => 40) ) %>
+
+    <% button_bar do %>
+      <%= submit_button 'save', _('Save'), :cancel => { :action => 'index' }  %>
+    <% end %>
+  <% end %>
+<% else %>
+  <%= _('Portal identifier: %s') % link_to(@portal_community.identifier, @portal_community.url) %>
+
+  <% button_bar do %>
+    <%if @portal_community.environment.enabled?('use_portal_community') %>
+      <%= button 'cancel', _('Disable'), {:action => 'manage_portal_community', :activate => 0} %>
+    <% else %>
+      <%= button 'ok', _('Enable'), {:action => 'manage_portal_community', :activate => 1} %>
+    <% end %>
+    <%= button 'folder', _('Select Portal Folders'), {:action => 'set_portal_folders'} %>
+    <%= button 'edit', _('Define Amount by Folder'), {:action => 'set_portal_news_amount'} %>
+    <%= button 'delete', _('Remove'), { :action => 'unset_portal_community'} %>
+  <% end %>
+<% end %>
@@ -1,24 +0,0 @@
-<h1> <%= _('Set Environment Portal') %></h1>
-
-<% if @portal_community.new_record? %>
-  <% form_tag do %>
-    <%= labelled_form_field(_('Portal identifier'), text_field_tag('portal_community_identifier', @portal_community.identifier, :size => 40) ) %>
-
-    <% button_bar do %>
-      <%= submit_button 'save', _('Save'), :cancel => { :action => 'index' }  %>
-    <% end %>
-  <% end %>
-<% else %>
-  <%= _('Portal identifier: %s') % link_to(@portal_community.identifier, @portal_community.url) %>
-
-  <% button_bar do %>
-    <%if @portal_community.environment.enabled?('use_portal_community') %>
-      <%= button 'cancel', _('Disable'), {:action => 'manage_portal_community', :activate => 0} %>
-    <% else %>
-      <%= button 'ok', _('Enable'), {:action => 'manage_portal_community', :activate => 1} %>
-    <% end %>
-    <%= button 'folder', _('Select Portal Folders'), {:action => 'set_portal_folders'} %>
-    <%= button 'edit', _('Define Amount by Folder'), {:action => 'set_portal_news_amount'} %>
-    <%= button 'delete', _('Remove'), { :action => 'unset_portal_community'} %>
-  <% end %>
-<% end %>
@@ -0,0 +1,43 @@
+<h1><%= _('Select folders') %></h1>
+
+<p><%= _('Select the folders that will hold the news of the initial page of the environment') %></p>
+
+<script type="text/javascript">
+  jQuery(document).ready(function() {
+    jQuery('#add').click(function() {
+      return !jQuery('#portal-folders-list option:selected').remove().appendTo('#selected-folders');
+    });
+    jQuery('#remove').click(function() {
+      return !jQuery('#selected-folders option:selected').remove().appendTo('#portal-folders-list');
+    });
+
+    jQuery('form').submit(function() {
+      jQuery('#selected-folders option').each(function(i) {
+        jQuery(this).attr('selected','selected');
+      });
+    });
+  });
+ </script>
+
+<div id='available-folders'>
+  <%= labelled_form_field(_('Available folders'), select_tag( 'folders[]', options_from_collection_for_select(@available_portal_folders, :id, :name, nil), {:id => 'portal-folders-list', :multiple => true, :size => 6 }) ) %>
+</div>
+
+<div id='selection-buttons'>
+  <%= button :down, _('Add'), '#', { :id => 'add' } %>
+  <%= button :up, _('Remove'), '#', { :id => 'remove' } %>
+</div>
+
+<% form_tag do %>
+  <div id='portal-folders'>
+    <%= labelled_form_field(_('Portal folders'), select_tag( 'folders[]', options_from_collection_for_select(@selected, :id, :name, nil), {:id => 'selected-folders', :multiple => true, :size => 6 })) %>
+  </div>
+
+  <p>
+    <%= _('The same order in which you arrange the folders here will be used for arranging the boxes in the environment initial page.') %>
+  </p>
+
+  <% button_bar do %>
+    <%= submit_button 'save', _('Save'), :cancel => {:action => 'index'} %>
+  <% end %>
+<% end %>
@@ -1,43 +0,0 @@
-<h1><%= _('Select folders') %></h1>
-
-<p><%= _('Select the folders that will hold the news of the initial page of the environment') %></p>
-
-<script type="text/javascript">
-  jQuery(document).ready(function() {
-    jQuery('#add').click(function() {
-      return !jQuery('#portal-folders-list option:selected').remove().appendTo('#selected-folders');
-    });
-    jQuery('#remove').click(function() {
-      return !jQuery('#selected-folders option:selected').remove().appendTo('#portal-folders-list');
-    });
-
-    jQuery('form').submit(function() {
-      jQuery('#selected-folders option').each(function(i) {
-        jQuery(this).attr('selected','selected');
-      });
-    });
-  });
- </script>
-
-<div id='available-folders'>
-  <%= labelled_form_field(_('Available folders'), select_tag( 'folders[]', options_from_collection_for_select(@available_portal_folders, :id, :name, nil), {:id => 'portal-folders-list', :multiple => true, :size => 6 }) ) %>
-</div>
-
-<div id='selection-buttons'>
-  <%= button :down, _('Add'), '#', { :id => 'add' } %>
-  <%= button :up, _('Remove'), '#', { :id => 'remove' } %>
-</div>
-
-<% form_tag do %>
-  <div id='portal-folders'>
-    <%= labelled_form_field(_('Portal folders'), select_tag( 'folders[]', options_from_collection_for_select(@selected, :id, :name, nil), {:id => 'selected-folders', :multiple => true, :size => 6 })) %>
-  </div>
-
-  <p>
-    <%= _('The same order in which you arrange the folders here will be used for arranging the boxes in the environment initial page.') %>
-  </p>
-
-  <% button_bar do %>
-    <%= submit_button 'save', _('Save'), :cancel => {:action => 'index'} %>
-  <% end %>
-<% end %>
@@ -0,0 +1,12 @@
+<h1><%= _('News amount by folder') %></h1>
+
+<% labelled_form_for :environment, @environment do |f| %>
+
+  <%= labelled_form_field _('Number of news'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save')) %>
+    <%= button(:cancel, _('Cancel'), :action => 'index') %>
+  <% end %>
+
+<% end %>
@@ -1,12 +0,0 @@
-<h1><%= _('News amount by folder') %></h1>
-
-<% labelled_form_for :environment, @environment do |f| %>
-
-  <%= labelled_form_field _('Number of news'), select(:environment, :news_amount_by_folder, (1..10).to_a) %>
-
-  <% button_bar do %>
-    <%= submit_button(:save, _('Save')) %>
-    <%= button(:cancel, _('Cancel'), :action => 'index') %>
-  <% end %>
-
-<% end %>
@@ -0,0 +1,19 @@
+<h2><%= _('Environment settings') %></h2>
+
+<%= error_messages_for :environment %>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
+  <% tabs = [] %>
+  <% tabs << {:title => _('Site info'), :id => 'site-info',
+    :content => (render :partial => 'site_info', :locals => {:f => f})} %>
+  <% tabs << {:title => _('Terms of use'), :id => 'terms-of-use',
+    :content => (render :partial => 'terms_of_use', :locals => {:f => f})} %>
+  <% tabs << {:title => _('Signup welcome text'), :id => 'signup-welcome-text',
+    :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
+  <%= render_tabs(tabs) %>
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
+  <% end %>
+<% end %>
@@ -1,19 +0,0 @@
-<h2><%= _('Environment settings') %></h2>
-
-<%= error_messages_for :environment %>
-
-<%= render :file => 'shared/tiny_mce' %>
-
-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
-  <% tabs = [] %>
-  <% tabs << {:title => _('Site info'), :id => 'site-info',
-    :content => (render :partial => 'site_info', :locals => {:f => f})} %>
-  <% tabs << {:title => _('Terms of use'), :id => 'terms-of-use',
-    :content => (render :partial => 'terms_of_use', :locals => {:f => f})} %>
-  <% tabs << {:title => _('Signup welcome text'), :id => 'signup-welcome-text',
-    :content => (render :partial => 'signup_welcome_text', :locals => {:f => f})} %>
-  <%= render_tabs(tabs) %>
-  <% button_bar do %>
-    <%= submit_button(:save, _('Save'), :cancel => {:action => 'index'}) %>
-  <% end %>
-<% end %>
@@ -0,0 +1,3 @@
+<%= block_title(block.title) %>
+
+<%= display_category_menu block, block.selected_categories %>
@@ -1,3 +0,0 @@
-<%= block_title(block.title) %>
-
-<%= display_category_menu block, block.selected_categories %>
@@ -0,0 +1,8 @@
+<div id='enterprise-disabled'>
+  <%= message %>
+  <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
+    <div class='unlock-button'>
+    <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
+    </div>
+  <% end %>
+</div>
@@ -1,8 +0,0 @@
-<div id='enterprise-disabled'>
-  <%= message %>
-  <% if profile.blocked? && user && user.is_admin?(profile.environment) %>
-    <div class='unlock-button'>
-    <%= button :lock, _('Unblock'), {:controller => 'profile', :action => 'unblock'} %>
-    </div>
-  <% end %>
-</div>
@@ -0,0 +1,55 @@
+<%= block_title(block.title) %>
+<% unless block.products.blank? %>
+  <%= link_to content_tag(:span, _('Previous')), '#', :class => 'featured-product-prev featured-product-arrow'  %>
+  <div class="featured-products-block-container">
+    <ul class="featured-products-list">
+      <% block.products.in_groups_of(block.groups_of).each do |group| %>
+        <li class="featured-products-group">
+          <div class="featured-product-items">
+            <ul>
+            <% group.reject{ |x| x.nil? }.each_with_index do |p, i| %>
+            <li class="featured-product-item">
+            <%= link_to content_tag(:img, nil, :src => p.image.public_filename(:thumb), :alt => p.name, :class => ('reflect' if block.reflect)), product_path(p), :class => 'featured-product-image' %>
+              <div class="featured-product-info position-<%= i + 1 %>" style="display: none">
+                <div class="featured-product-text">
+                  <h3><%= p.name %></h3>
+                  <p class="featured-product-price"><%= float_to_currency(p.price) %></p>
+                  <p class="featured-product-desc"><%= truncate(p.description, 50, '...') %></p>
+                  <p><%= link_to _('See More'), product_path(p), :class => 'featured-product-link' %></p>
+                </div>
+              </div>
+            </li>
+            <% end %>
+            </ul>
+          </div>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+  <%= link_to content_tag(:span, _('Next')), '#', :class => 'featured-product-next featured-product-arrow'  %>
+  <script type="text/javascript">
+    (function($) {
+     var options = {
+       fx : 'scrollHorz',
+       timeout: 0,
+       prev: '#block-<%= block.id %> .featured-product-prev',
+       next: '#block-<%= block.id %> .featured-product-next',
+       speed: <%= block.speed || 2000 %>
+      }
+      $('#block-<%= block.id %> .featured-products-list').cycle(options);
+
+      $(document).ready(function(){
+        $(".featured-product-item").hover(
+          function() {
+            $(".featured-product-info", this).fadeIn('slow');
+          },
+          function() {
+            $(".featured-product-info", this).fadeOut('slow');
+        });
+      });
+    })(jQuery);
+  </script>
+  <p class="featured-products-footer"></p>
+<% else %>
+  <em><%= _('Please, edit this block and choose some products') %></em>
+<% end %>
@@ -1,55 +0,0 @@
-<%= block_title(block.title) %>
-<% unless block.products.blank? %>
-  <%= link_to content_tag(:span, _('Previous')), '#', :class => 'featured-product-prev featured-product-arrow'  %>
-  <div class="featured-products-block-container">
-    <ul class="featured-products-list">
-      <% block.products.in_groups_of(block.groups_of).each do |group| %>
-        <li class="featured-products-group">
-          <div class="featured-product-items">
-            <ul>
-            <% group.reject{ |x| x.nil? }.each_with_index do |p, i| %>
-            <li class="featured-product-item">
-            <%= link_to content_tag(:img, nil, :src => p.image.public_filename(:thumb), :alt => p.name, :class => ('reflect' if block.reflect)), product_path(p), :class => 'featured-product-image' %>
-              <div class="featured-product-info position-<%= i + 1 %>" style="display: none">
-                <div class="featured-product-text">
-                  <h3><%= p.name %></h3>
-                  <p class="featured-product-price"><%= float_to_currency(p.price) %></p>
-                  <p class="featured-product-desc"><%= truncate(p.description, 50, '...') %></p>
-                  <p><%= link_to _('See More'), product_path(p), :class => 'featured-product-link' %></p>
-                </div>
-              </div>
-            </li>
-            <% end %>
-            </ul>
-          </div>
-        </li>
-      <% end %>
-    </ul>
-  </div>
-  <%= link_to content_tag(:span, _('Next')), '#', :class => 'featured-product-next featured-product-arrow'  %>
-  <script type="text/javascript">
-    (function($) {
-     var options = {
-       fx : 'scrollHorz',
-       timeout: 0,
-       prev: '#block-<%= block.id %> .featured-product-prev',
-       next: '#block-<%= block.id %> .featured-product-next',
-       speed: <%= block.speed || 2000 %>
-      }
-      $('#block-<%= block.id %> .featured-products-list').cycle(options);
-
-      $(document).ready(function(){
-        $(".featured-product-item").hover(
-          function() {
-            $(".featured-product-info", this).fadeIn('slow');
-          },
-          function() {
-            $(".featured-product-info", this).fadeOut('slow');
-        });
-      });
-    })(jQuery);
-  </script>
-  <p class="featured-products-footer"></p>
-<% else %>
-  <em><%= _('Please, edit this block and choose some products') %></em>
-<% end %>
@@ -0,0 +1,55 @@
+<%= block_title(block.title) %>
+<% if !block.featured_images.empty? %>
+  <div class='highlights-border'>
+    <div class='highlights-container'>
+      <% block.featured_images.each do |img| %>
+        <a href="<%= img[:address] %>" title="<%= img[:title] %>" class="highlights-image-link">
+          <%= content_tag :img, nil, :src => img[:image_src], :alt => img[:title] %>
+          <p class="highlights-label"><%= img[:title] %></p>
+        </a>
+      <% end %>
+    </div>
+    <% if block.navigation %>
+      <div class='highlights-block-pager'>
+      </div>
+    <% end %>
+  </div>
+  <p class="highlights-block-footer"></p>
+  <script type="text/javascript">
+    (function($) {
+     $.fn.cycle.transitions.customFade = function($cont, $slides, opts) {
+       $slides.not(":eq(" + opts.currSlide + ")").css("opacity", 0);
+       opts.before.push(function(curr, next, opts) {
+         $.fn.cycle.commonReset(curr, next, opts);
+         opts.cssBefore.opacity = 0;
+       });
+       opts.animIn = {
+         opacity: 1
+       };
+       opts.animOut = {
+         opacity: 0
+       };
+       opts.cssBefore = {
+         top: 0,
+         left: 0,
+         zIndex: 1,
+         display: 'block'
+       };
+       opts.cssAfter = {
+         zIndex: 0
+       };
+     };
+     var options = {
+       fx: 'customFade',
+       fastOnEvent: 1,
+       timeout: <%= block.interval * 1000 %>
+     };
+     <% if block.navigation %>
+       options.pager = '#block-<%= block.id %> .highlights-block-pager';
+     <% end %>
+     $('#block-<%= block.id %> .highlights-container').cycle(options);
+    })(jQuery);
+  </script>
+<% else %>
+  <em><%= _('Please, edit this block and choose some images') %></em>
+<% end %>
@@ -1,55 +0,0 @@
-<%= block_title(block.title) %>
-<% if !block.featured_images.empty? %>
-  <div class='highlights-border'>
-    <div class='highlights-container'>
-      <% block.featured_images.each do |img| %>
-        <a href="<%= img[:address] %>" title="<%= img[:title] %>" class="highlights-image-link">
-          <%= content_tag :img, nil, :src => img[:image_src], :alt => img[:title] %>
-          <p class="highlights-label"><%= img[:title] %></p>
-        </a>
-      <% end %>
-    </div>
-    <% if block.navigation %>
-      <div class='highlights-block-pager'>
-      </div>
-    <% end %>
-  </div>
-  <p class="highlights-block-footer"></p>
-  <script type="text/javascript">
-    (function($) {
-     $.fn.cycle.transitions.customFade = function($cont, $slides, opts) {
-       $slides.not(":eq(" + opts.currSlide + ")").css("opacity", 0);
-       opts.before.push(function(curr, next, opts) {
-         $.fn.cycle.commonReset(curr, next, opts);
-         opts.cssBefore.opacity = 0;
-       });
-       opts.animIn = {
-         opacity: 1
-       };
-       opts.animOut = {
-         opacity: 0
-       };
-       opts.cssBefore = {
-         top: 0,
-         left: 0,
-         zIndex: 1,
-         display: 'block'
-       };
-       opts.cssAfter = {
-         zIndex: 0
-       };
-     };
-     var options = {
-       fx: 'customFade',
-       fastOnEvent: 1,
-       timeout: <%= block.interval * 1000 %>
-     };
-     <% if block.navigation %>
-       options.pager = '#block-<%= block.id %> .highlights-block-pager';
-     <% end %>
-     $('#block-<%= block.id %> .highlights-container').cycle(options);
-    })(jQuery);
-  </script>
-<% else %>
-  <em><%= _('Please, edit this block and choose some images') %></em>
-<% end %>
@@ -0,0 +1,13 @@
+<div class="logged-user-info" style='display: none;'>
+  <h2><%= _('Logged in as %s') % '{login}' %></h2>
+  <ul>
+    <li><%= _('User since {year}/{month}') %></li>
+    <li><%= link_to _('Homepage'), '/{login}' %></li>
+  </ul>
+  <div class="user-actions">
+    <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
+  </div>
+</div>
+<div class='not-logged-user' style='display: none;'>
+  <%= render :file => 'account/login_block' %>
+</div>
@@ -1,13 +0,0 @@
-<div class="logged-user-info" style='display: none;'>
-  <h2><%= _('Logged in as %s') % '{login}' %></h2>
-  <ul>
-    <li><%= _('User since {year}/{month}') %></li>
-    <li><%= link_to _('Homepage'), '/{login}' %></li>
-  </ul>
-  <div class="user-actions">
-    <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
-  </div>
-</div>
-<div class='not-logged-user' style='display: none;'>
-  <%= render :file => 'account/login_block' %>
-</div>
@@ -0,0 +1,15 @@
+<%= block_title(title) %>
+
+<%= render :file => 'blocks/my_network/' + owner.class.name.underscore, :locals => { :owner => owner } %>
+
+<ul>
+  <li><%= link_to(__('Homepage'), owner.url, :class => 'url') %></li>
+  <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
+  <% if !user.nil? and owner.organization? and user.has_permission?('edit_profile', profile) %>
+    <li><%= link_to _('Control panel'), :controller => 'profile_editor', :profile => profile.identifier %></li>
+  <% end %>
+</ul>
+
+<div class="my-network-actions">
+  <%= render :file => 'blocks/profile_info_actions/' + owner.class.name.underscore %>
+</div>
@@ -1,15 +0,0 @@
-<%= block_title(title) %>
-
-<%= render :file => 'blocks/my_network/' + owner.class.name.underscore, :locals => { :owner => owner } %>
-
-<ul>
-  <li><%= link_to(__('Homepage'), owner.url, :class => 'url') %></li>
-  <li><%= link_to(_('View profile'), owner.public_profile_url) %></li>
-  <% if !user.nil? and owner.organization? and user.has_permission?('edit_profile', profile) %>
-    <li><%= link_to _('Control panel'), :controller => 'profile_editor', :profile => profile.identifier %></li>
-  <% end %>
-</ul>
-
-<div class="my-network-actions">
-  <%= render :file => 'blocks/profile_info_actions/' + owner.class.name.underscore %>
-</div>
@@ -0,0 +1,9 @@
+<ul>
+  <li><%= link_to(n_( 'One article published', '%s articles published', owner.articles.count) %
+  content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') ) %></li>
+  <% members = owner.members.size %>
+  <li><%= link_to(n_( 'One member', '%s members', members) %
+  content_tag('b', members), owner.public_profile_url.merge(:action => 'members') ) %></li>
+  <li><%= link_to(n_('One tag', '%s tags', owner.article_tags.size) %
+  content_tag('b', owner.article_tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
+</ul>
@@ -1,9 +0,0 @@
-<ul>
-  <li><%= link_to(n_( 'One article published', '%s articles published', owner.articles.count) %
-  content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') ) %></li>
-  <% members = owner.members.size %>
-  <li><%= link_to(n_( 'One member', '%s members', members) %
-  content_tag('b', members), owner.public_profile_url.merge(:action => 'members') ) %></li>
-  <li><%= link_to(n_('One tag', '%s tags', owner.article_tags.size) %
-  content_tag('b', owner.article_tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
-</ul>
@@ -0,0 +1,10 @@
+<ul>
+  <li><%= link_to(n_( 'One article published', '%s articles published', owner.articles.count) %
+  content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') ) %></li>
+  <li><%= link_to(n__('One friend', '%s friends', owner.friends.count) %
+  content_tag('b', owner.friends.count), owner.public_profile_url.merge(:action => 'friends')) %></li>
+  <li><%= link_to(n__('One community', '%{num} communities', owner.communities.visible.size) %
+  {:num => content_tag('b', owner.communities.visible.size)}, owner.public_profile_url.merge(:action => 'communities')) %></li>
+  <li><%= link_to(n_('One tag', '%s tags', owner.article_tags.size) %
+  content_tag('b', owner.article_tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
+</ul>
@@ -1,10 +0,0 @@
-<ul>
-  <li><%= link_to(n_( 'One article published', '%s articles published', owner.articles.count) %
-  content_tag('b', owner.articles.count), owner.public_profile_url.merge(:action => 'sitemap') ) %></li>
-  <li><%= link_to(n__('One friend', '%s friends', owner.friends.count) %
-  content_tag('b', owner.friends.count), owner.public_profile_url.merge(:action => 'friends')) %></li>
-  <li><%= link_to(n__('One community', '%{num} communities', owner.communities.visible.size) %
-  {:num => content_tag('b', owner.communities.visible.size)}, owner.public_profile_url.merge(:action => 'communities')) %></li>
-  <li><%= link_to(n_('One tag', '%s tags', owner.article_tags.size) %
-  content_tag('b', owner.article_tags.size), owner.public_profile_url.merge(:action => 'tags')) %></li>
-</ul>
@@ -0,0 +1,24 @@
+<div class="vcard">
+
+<p><%= block.title %></p>
+
+<div class="profile-big-image">
+  <div class="profile-big-image-inner1">
+    <span class="profile-big-image-inner2">
+      <%= link_to profile_image(block.owner, :big) +"\n", profile.url %>
+    </span>
+  </div>
+</div>
+
+<% if show_name %>
+  <p><%= h block.owner.short_name %></p>
+<% end %>
+
+<div style="text-align: center; font-size: 75%; clear: both" id="profile-admin-url-<%= block.id %>"></div>
+
+<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
+
+</div><!-- end class="vcard" -->
+<script type="text/javascript">
+  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
+</script>
@@ -1,24 +0,0 @@
-<div class="vcard">
-
-<p><%= block.title %></p>
-
-<div class="profile-big-image">
-  <div class="profile-big-image-inner1">
-    <span class="profile-big-image-inner2">
-      <%= link_to profile_image(block.owner, :big) +"\n", profile.url %>
-    </span>
-  </div>
-</div>
-
-<% if show_name %>
-  <p><%= h block.owner.short_name %></p>
-<% end %>
-
-<div style="text-align: center; font-size: 75%; clear: both" id="profile-admin-url-<%= block.id %>"></div>
-
-<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
-
-</div><!-- end class="vcard" -->
-<script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
-</script>
@@ -0,0 +1,45 @@
+<div class="vcard">
+
+<h2 class="<%= profile.class == Person ? 'fn' : 'org' %>"><%= h block.owner.short_name %></h2>
+
+<div class="profile-info-picture">
+  <div class="profile-info-picture-inner1">
+    <span class="profile-info-picture-inner2">
+      <%=
+        profile_image(block.owner, :thumb) +"\n"+
+        profile_sex_icon( profile ) +
+        profile_cat_icons( profile )
+      %>
+    </span>
+  </div>
+</div>
+
+<ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
+  <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
+  <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
+  <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
+    <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
+  <% end %>
+  <li id="profile-admin-url-<%= block.id %>"></li>
+  <% if profile.person? %>
+    <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
+  <% end %>
+</ul>
+
+<% if profile.respond_to? :city %>
+<div class="adr">
+<%=
+  [ [ profile.city, 'locality' ],
+    [ profile.state, 'region' ],
+    [ profile.country_name, 'country-name' ]
+  ].map{ |s,c| s =~ /^\s*$/ ? nil : content_tag( 'span', s, :class => c ) }.compact.join ' - '
+%>
+</div>
+<% end %>
+
+<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
+
+</div><!-- end class="vcard" -->
+<script type="text/javascript">
+  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
+</script>
@@ -1,45 +0,0 @@
-<div class="vcard">
-
-<h2 class="<%= profile.class == Person ? 'fn' : 'org' %>"><%= h block.owner.short_name %></h2>
-
-<div class="profile-info-picture">
-  <div class="profile-info-picture-inner1">
-    <span class="profile-info-picture-inner2">
-      <%=
-        profile_image(block.owner, :thumb) +"\n"+
-        profile_sex_icon( profile ) +
-        profile_cat_icons( profile )
-      %>
-    </span>
-  </div>
-</div>
-
-<ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
-  <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
-  <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
-  <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
-    <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
-  <% end %>
-  <li id="profile-admin-url-<%= block.id %>"></li>
-  <% if profile.person? %>
-    <li><%= _('Since %{year}/%{month}') % { :year => block.owner.created_at.year, :month => block.owner.created_at.month } %></li>
-  <% end %>
-</ul>
-
-<% if profile.respond_to? :city %>
-<div class="adr">
-<%=
-  [ [ profile.city, 'locality' ],
-    [ profile.state, 'region' ],
-    [ profile.country_name, 'country-name' ]
-  ].map{ |s,c| s =~ /^\s*$/ ? nil : content_tag( 'span', s, :class => c ) }.compact.join ' - '
-%>
-</div>
-<% end %>
-
-<div class="profile-info-options" id="profile-info-options-<%= block.id %>"></div>
-
-</div><!-- end class="vcard" -->
-<script type="text/javascript">
-  <%= remote_function :url => { :controller => 'profile', :profile => profile.identifier, :action => 'profile_info', :block_id => block.id } %>
-</script>
@@ -0,0 +1,49 @@
+<ul>
+  <% if logged_in? %>
+    <% if profile.members.include?(user) %>
+      <li>
+        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
+          :class => 'leave-community',
+          :title => _("Leave community"),
+          :style => 'position: relative;') %>
+        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
+          :class => 'join-community',
+          :title => _("Join community"),
+          :style => 'position: relative; display: none;') %>
+      </li>
+    <% else %>
+      <% unless profile.already_request_membership?(user) %>
+        <li>
+        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
+          :class => 'leave-community',
+          :title => _("Leave community"),
+          :style => 'position: relative; display: none;') %>
+        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
+          :class => 'join-community',
+          :title => _("Join community"),
+          :style => 'position: relative;') %>
+        </li>
+      <% end %>
+    <% end %>
+
+    <% if profile.enable_contact? %>
+      <li>
+      <%= link_to content_tag('span', _('Send an e-mail')),
+        { :profile => profile.identifier,
+          :controller => 'contact',
+          :action => 'new' },
+        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
+      </li>
+    <% end %>
+
+    <li><%= report_abuse(profile, :button) %></li>
+
+    <%= render_environment_features(:profile_actions) %>
+  <% else %>
+    <li>
+    <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
+      :class => 'button with-text icon-add',
+      :title => _('Join this community') %>
+    </li>
+  <% end %>
+</ul>
@@ -1,49 +0,0 @@
-<ul>
-  <% if logged_in? %>
-    <% if profile.members.include?(user) %>
-      <li>
-        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
-          :class => 'leave-community',
-          :title => _("Leave community"),
-          :style => 'position: relative;') %>
-        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
-          :class => 'join-community',
-          :title => _("Join community"),
-          :style => 'position: relative; display: none;') %>
-      </li>
-    <% else %>
-      <% unless profile.already_request_membership?(user) %>
-        <li>
-        <%= button(:delete, content_tag('span', __('Leave community')), profile.leave_url,
-          :class => 'leave-community',
-          :title => _("Leave community"),
-          :style => 'position: relative; display: none;') %>
-        <%= button(:add, content_tag('span', __('Join')), profile.join_url,
-          :class => 'join-community',
-          :title => _("Join community"),
-          :style => 'position: relative;') %>
-        </li>
-      <% end %>
-    <% end %>
-
-    <% if profile.enable_contact? %>
-      <li>
-      <%= link_to content_tag('span', _('Send an e-mail')),
-        { :profile => profile.identifier,
-          :controller => 'contact',
-          :action => 'new' },
-        {:class => 'button with-text icon-menu-mail', :title => _('Send an e-mail to the administrators')} %>
-      </li>
-    <% end %>
-
-    <li><%= report_abuse(profile, :button) %></li>
-
-    <%= render_environment_features(:profile_actions) %>
-  <% else %>
-    <li>
-    <%= link_to content_tag('span', _('Join')), profile.join_not_logged_url,
-      :class => 'button with-text icon-add',
-      :title => _('Join this community') %>
-    </li>
-  <% end %>
-</ul>
@@ -0,0 +1,12 @@
+<ul>
+  <%if logged_in? %>
+    <%if !user.favorite_enterprises.include?(profile) %>
+      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => __('Add enterprise as favorite') %></li>
+    <% end %>
+  <% end %>
+  <% if profile.enable_contact? %>
+    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
+  <% end %>
+
+  <li><%= report_abuse(profile, :button) %></li>
+</ul>
@@ -1,12 +0,0 @@
-<ul>
-  <%if logged_in? %>
-    <%if !user.favorite_enterprises.include?(profile) %>
-      <li><%= link_to content_tag('span', _('Add as favorite')), { :profile => user.identifier, :controller => 'favorite_enterprises', :action => 'add', :id => profile.id }, :class => 'button with-text icon-add', :title => __('Add enterprise as favorite') %></li>
-    <% end %>
-  <% end %>
-  <% if profile.enable_contact? %>
-    <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
-  <% end %>
-
-  <li><%= report_abuse(profile, :button) %></li>
-</ul>
@@ -0,0 +1,16 @@
+<ul>
+  <%if logged_in? && (user != profile) %>
+
+    <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
+      <li>
+      <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
+      </li>
+    <% end %>
+
+    <% if user.is_a_friend?(profile) && profile.enable_contact? %>
+      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
+    <% end %>
+
+    <li><%= report_abuse(profile, :button) %></li>
+  <% end %>
+</ul>
@@ -1,16 +0,0 @@
-<ul>
-  <%if logged_in? && (user != profile) %>
-
-    <% if !user.already_request_friendship?(profile) and !user.is_a_friend?(profile) %>
-      <li>
-      <%= button(:add, content_tag('span', __('Add friend')), profile.add_url, :class => 'add-friend', :title => _("Add friend"), :style => 'position: relative;') %>
-      </li>
-    <% end %>
-
-    <% if user.is_a_friend?(profile) && profile.enable_contact? %>
-      <li> <%= link_to content_tag('span', _('Send an e-mail')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
-    <% end %>
-
-    <li><%= report_abuse(profile, :button) %></li>
-  <% end %>
-</ul>
@@ -0,0 +1,3 @@
+<%= block_title(title) %>
+
+<%= render :partial => 'shared/profile_search_form' %>
@@ -1,3 +0,0 @@
-<%= block_title(title) %>
-
-<%= render :partial => 'shared/profile_search_form' %>
@@ -0,0 +1,49 @@
+<%= block_title(block.title) %>
+<% if images %>
+  <% description = images.any? { |img| !img.abstract.blank? } %>
+  <div class='slideshow-border<%= (description ? ' with-descriptions' : '')%>'>
+    <div class='slideshow-container'>
+      <% images.each do |img| %>
+        <a href="<%= url_for(img.external_link.blank? ? img.view_url: img.external_link) %>">
+          <%= content_tag('div', '', :style => "background-image: url(#{block.public_filename_for(img)})", :title => (img.abstract.blank? ? '' : img.abstract)) %>
+          <% if !img.abstract.blank? %>
+            <span class='image-description'><%= img.abstract %></span>
+          <% end %>
+        </a>
+      <% end %>
+    </div>
+    <% if block.navigation %>
+      <div class='slideshow-block-navigation'>
+        <%= link_to _('Previous'), '#', :class => 'icon-media-prev'  %>
+        <% if block.interval > 0 %>
+          <%= link_to '&nbsp;', '#', :class => 'icon-media-pause', :onclick => "togglePlayback('#block-#{block.id} .slideshow-container', this); return false;" %>
+        <% end %>
+        <%= link_to _('Next'), '#', :class => 'icon-media-next'  %>
+      </div>
+    <% end %>
+  </div>
+  <script type="text/javascript">
+    (function($) {
+     var options = {fx: 'fade', pause: 1, fastOnEvent: 1, timeout: <%= block.interval * 1000 %>};
+     <% if block.navigation %>
+       options.prev = '#block-<%= block.id %> .icon-media-prev';
+       options.next = '#block-<%= block.id %> .icon-media-next';
+     <% end %>
+      $('#block-<%= block.id %> .slideshow-container').cycle(options);
+    })(jQuery);
+
+    function togglePlayback(slideshow, button) {
+      var $ = jQuery;
+      if (button.className == 'icon-media-pause') {
+        button.className = 'icon-media-play';
+        $(slideshow).cycle('pause');
+      } else {
+        button.className = 'icon-media-pause';
+        $(slideshow).cycle('resume');
+      }
+    }
+  </script>
+<% else %>
+  <em><%= _('Please, edit this block and select an image gallery.') %></em>
+<% end %>
+
@@ -1,49 +0,0 @@
-<%= block_title(block.title) %>
-<% if images %>
-  <% description = images.any? { |img| !img.abstract.blank? } %>
-  <div class='slideshow-border<%= (description ? ' with-descriptions' : '')%>'>
-    <div class='slideshow-container'>
-      <% images.each do |img| %>
-        <a href="<%= url_for(img.external_link.blank? ? img.view_url: img.external_link) %>">
-          <%= content_tag('div', '', :style => "background-image: url(#{block.public_filename_for(img)})", :title => (img.abstract.blank? ? '' : img.abstract)) %>
-          <% if !img.abstract.blank? %>
-            <span class='image-description'><%= img.abstract %></span>
-          <% end %>
-        </a>
-      <% end %>
-    </div>
-    <% if block.navigation %>
-      <div class='slideshow-block-navigation'>
-        <%= link_to _('Previous'), '#', :class => 'icon-media-prev'  %>
-        <% if block.interval > 0 %>
-          <%= link_to '&nbsp;', '#', :class => 'icon-media-pause', :onclick => "togglePlayback('#block-#{block.id} .slideshow-container', this); return false;" %>
-        <% end %>
-        <%= link_to _('Next'), '#', :class => 'icon-media-next'  %>
-      </div>
-    <% end %>
-  </div>
-  <script type="text/javascript">
-    (function($) {
-     var options = {fx: 'fade', pause: 1, fastOnEvent: 1, timeout: <%= block.interval * 1000 %>};
-     <% if block.navigation %>
-       options.prev = '#block-<%= block.id %> .icon-media-prev';
-       options.next = '#block-<%= block.id %> .icon-media-next';
-     <% end %>
-      $('#block-<%= block.id %> .slideshow-container').cycle(options);
-    })(jQuery);
-
-    function togglePlayback(slideshow, button) {
-      var $ = jQuery;
-      if (button.className == 'icon-media-pause') {
-        button.className = 'icon-media-play';
-        $(slideshow).cycle('pause');
-      } else {
-        button.className = 'icon-media-pause';
-        $(slideshow).cycle('resume');
-      }
-    }
-  </script>
-<% else %>
-  <em><%= _('Please, edit this block and select an image gallery.') %></em>
-<% end %>
-
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+<div class='status-identifier'>
	2	+ <p><span class='<%= @status_class %>'><%= @status %></span></p>
	3	+ <script type="text/javascript">
	4	+ jQuery('#user_email').removeClass('<%= validation_classes %>');
	5	+ jQuery('#user_email').addClass('<%= @status_class %>');
	6	+ </script>
	7	+</div>
	@@ -1,7 +0,0 @@	@@ -1,7 +0,0 @@
1	-<div class='status-identifier'>
2	- <p><span class='<%= @status_class %>'><%= @status %></span></p>
3	- <script type="text/javascript">
4	- jQuery('#user_email').removeClass('<%= validation_classes %>');
5	- jQuery('#user_email').addClass('<%= @status_class %>');
6	- </script>
7	-</div>
@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
	1	+<% labelled_form_for :user, @user,
	2	+ :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') } do \|f\| %>
	3	+
	4	+<%= f.text_field :login,
	5	+ :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
	6	+ :onchange => 'this.value = convToValidLogin( this.value )' %>
	7	+
	8	+<%= f.password_field :password,
	9	+ :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password' %>
	10	+
	11	+<% if params[:enterprise_code] %>
	12	+ <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
	13	+ <%= hidden_field_tag :answer, params[:answer] %>
	14	+ <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
	15	+<% end %>
	16	+
	17	+<% button_bar do %>
	18	+ <%= submit_button( 'login', _('Log in') )%>
	19	+ <%= lightbox_close_button(_('Cancel')) if lightbox? %>
	20	+<% end %>
	21	+
	22	+<% end %>
	@@ -1,22 +0,0 @@	@@ -1,22 +0,0 @@
1	-<% labelled_form_for :user, @user,
2	- :url => { :controller => 'account', :action => (params[:enterprise_code] ? 'activate_enterprise' : 'login') } do \|f\| %>
3	-
4	-<%= f.text_field :login,
5	- :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_login',
6	- :onchange => 'this.value = convToValidLogin( this.value )' %>
7	-
8	-<%= f.password_field :password,
9	- :id => ( lightbox? ? 'lightbox_' : '' ) + 'user_password' %>
10	-
11	-<% if params[:enterprise_code] %>
12	- <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
13	- <%= hidden_field_tag :answer, params[:answer] %>
14	- <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
15	-<% end %>
16	-
17	-<% button_bar do %>
18	- <%= submit_button( 'login', _('Log in') )%>
19	- <%= lightbox_close_button(_('Cancel')) if lightbox? %>
20	-<% end %>
21	-
22	-<% end %>
@@ -0,0 +1,163 @@		@@ -0,0 +1,163 @@
	1	+<% @profile_data = @person %>
	2	+
	3	+<%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
	4	+
	5	+<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do \|f\| %>
	6	+
	7	+<%= hidden_field_tag :invitation_code, @invitation_code %>
	8	+
	9	+<div id='signup-form-header'>
	10	+
	11	+ <div id='signup-formfield-group'>
	12	+ <%= label(:user, :login, _('Username'), {:class => 'formlabel'}) %>
	13	+ <span id="signup-domain"><%= environment.default_hostname %>/</span>
	14	+ <div id='signup-login'>
	15	+ <div id='signup-login-field' class='formfield'>
	16	+ <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
	17	+ <div id='url-check'><p> </p></div>
	18	+ </div>
	19	+ <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
	20	+ <br style="clear: both;" />
	21	+ </div>
	22	+ </div>
	23	+ <%= observe_field 'user_login',
	24	+ :url => { :action => 'check_url' },
	25	+ :with => 'identifier',
	26	+ :update => 'url-check',
	27	+ :loading => "jQuery('#user_login').removeClass('#{validation_classes}').addClass('checking');
	28	+ jQuery('#url-check').html('<p><span class=\"checking\">#{checking_message(:url)}</span></p>');",
	29	+ :complete => "jQuery('#user_login').removeClass('checking')"
	30	+ %>
	31	+
	32	+ <div id='signup-password'>
	33	+ <%= required f.password_field(:password, :id => 'user_pw') %>
	34	+ <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>
	35	+ <div id='fake-check'><p> </p></div>
	36	+ </div>
	37	+
	38	+ <div id='signup-password-confirmation'>
	39	+ <%= required f.password_field(:password_confirmation) %>
	40	+ <%= content_tag(:small,_('We need to be sure that you filled in your password correctly. Confirm you password.'), :id => 'password-confirmation-balloon') %>
	41	+ <div id='password-check'><p> </p></div>
	42	+ </div>
	43	+
	44	+ <div id='signup-email'>
	45	+ <%= required f.text_field(:email) %>
	46	+ <%= content_tag(:small,_('This e-mail address will be used to contact you.'), :id => 'email-balloon') %>
	47	+ <div id='email-check'><p> </p></div>
	48	+ </div>
	49	+ <%= observe_field "user_email",
	50	+ :url => { :action => "check_email" },
	51	+ :with => "address",
	52	+ :update => "email-check",
	53	+ :loading => "jQuery('#user_email').removeClass('#{validation_classes}').addClass('checking');
	54	+ jQuery('#email-check').html('<p><span class=\"checking\">#{checking_message(:email)}</span></p>');",
	55	+ :complete => "jQuery('#user_email').removeClass('checking')",
	56	+ :before => "var field = jQuery('#user_email');
	57	+ if (field.val()=='') {
	58	+ field.removeClass('#{validation_classes}');
	59	+ jQuery('#email-check').html('<p> </p>');
	60	+ return false;
	61	+ }
	62	+ if (!( field.valid() )) {
	63	+ field.removeClass('#{validation_classes}').addClass('invalid');
	64	+ jQuery('#email-check').html('<p><span class=\"invalid\">#{_('This e-mail address is not valid')}</span></p>');
	65	+ return false;
	66	+ }"
	67	+ %>
	68	+
	69	+ <div id='signup-name'>
	70	+ <%= labelled_form_field(_('Full name'), text_field(:profile_data, :name)) %>
	71	+ <%= content_tag(:small,_('Tell us your name, it will be used to identify yourself.'), :id => 'name-balloon') %>
	72	+ </div>
	73	+
	74	+</div>
	75	+
	76	+<div id="signup-form-profile">
	77	+
	78	+ <% labelled_fields_for :profile_data, @person do \|f\| %>
	79	+ <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
	80	+ <% end %>
	81	+
	82	+ <%= @plugins.dispatch(:signup_extra_contents).collect { \|content\| instance_eval(&content) }.join("") %>
	83	+
	84	+ <%= template_options(Person, 'profile_data') %>
	85	+
	86	+ <% unless @terms_of_use.blank? %>
	87	+ <div id='terms-of-use-box' class='formfieldline'>
	88	+ <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
	89	+ </div>
	90	+ <% end %>
	91	+
	92	+ <% if params[:enterprise_code] %>
	93	+ <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
	94	+ <%= hidden_field_tag :answer, params[:answer] %>
	95	+ <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
	96	+ <%= hidden_field_tag :new_user, true %>
	97	+ <% end %>
	98	+</div>
	99	+
	100	+<p style="text-align: center">
	101	+ <%= submit_button('save', _('Create my account')) %>
	102	+</p>
	103	+
	104	+<% end -%>
	105	+
	106	+<script type="text/javascript">
	107	+jQuery(function($) {
	108	+
	109	+ $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
	110	+
	111	+ $('#signup-form input[type=text], #signup-form textarea').each(function() {
	112	+ $(this).bind('blur', function() {
	113	+ if ($(this).val() == '') {
	114	+ $(this).removeClass('filled-in');
	115	+ }
	116	+ else $(this).addClass('filled-in');
	117	+ });
	118	+ });
	119	+
	120	+ $('#user_pw').focus(function() {
	121	+ $('#password-balloon').fadeIn('slow');
	122	+ });
	123	+ $('#user_password_confirmation').focus(function() {
	124	+ $('#password-confirmation-balloon').fadeIn('slow');
	125	+ });
	126	+ $('#user_password_confirmation, #user_pw').blur(function() {
	127	+ if ($('#user_password_confirmation').val() != '') {
	128	+ if ($('#user_password_confirmation').val() == $('#user_pw').val()) {
	129	+ $('#user_password_confirmation').addClass('validated').removeClass('invalid');
	130	+ $('#user_pw').removeClass('invalid_input').addClass('valid_input');
	131	+ $('#password-check').html("<p> </p>");
	132	+ } else if ($('#user_password_confirmation').val() != $('#user_pw').val()) {
	133	+ $('#user_password_confirmation').removeClass('validated').addClass('invalid');
	134	+ $('#user_pw').addClass('invalid_input').removeClass('valid_input');
	135	+ $('#password-check').html("<p><span class='invalid'><%= _('Passwords don\'t match') %></span></p>");
	136	+ }
	137	+ }
	138	+ $('#password-balloon').fadeOut('slow');
	139	+ $('#password-confirmation-balloon').fadeOut('slow');
	140	+ });
	141	+ $('#user_login').focus(function() {
	142	+ $('#signup-balloon').fadeIn('slow');
	143	+ });
	144	+ $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
	145	+ $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
	146	+ $('#user_email').focus(function() {
	147	+ $('#email-balloon').fadeIn('slow');
	148	+ });
	149	+ $('#user_email').blur(function() {
	150	+ $('#email-balloon').fadeOut('slow');
	151	+ });
	152	+ $('#profile_data_name').focus(function() {
	153	+ $('#name-balloon').fadeIn('slow');
	154	+ });
	155	+ $('#profile_data_name').blur(function() {
	156	+ $('#name-balloon').fadeOut('slow');
	157	+ if ($(this).val() == '') {
	158	+ $(this).removeClass('validated');
	159	+ }
	160	+ else $(this).addClass('validated');
	161	+ });
	162	+});
	163	+</script>
	@@ -1,163 +0,0 @@	@@ -1,163 +0,0 @@
1	-<% @profile_data = @person %>
2	-
3	-<%= error_messages_for :user, :person, :header_message => _('The account could not be created') %>
4	-
5	-<% labelled_form_for :user, @user, :html => { :multipart => true, :id => 'signup-form' } do \|f\| %>
6	-
7	-<%= hidden_field_tag :invitation_code, @invitation_code %>
8	-
9	-<div id='signup-form-header'>
10	-
11	- <div id='signup-formfield-group'>
12	- <%= label(:user, :login, _('Username'), {:class => 'formlabel'}) %>
13	- <span id="signup-domain"><%= environment.default_hostname %>/</span>
14	- <div id='signup-login'>
15	- <div id='signup-login-field' class='formfield'>
16	- <%= required text_field(:user, :login, :id => 'user_login', :onchange => 'this.value = convToValidLogin(this.value);') %>
17	- <div id='url-check'><p> </p></div>
18	- </div>
19	- <%= content_tag(:small, _('Choose your login name carefully! It will be your network access and you will not be able to change it later.'), :id => 'signup-balloon') %>
20	- <br style="clear: both;" />
21	- </div>
22	- </div>
23	- <%= observe_field 'user_login',
24	- :url => { :action => 'check_url' },
25	- :with => 'identifier',
26	- :update => 'url-check',
27	- :loading => "jQuery('#user_login').removeClass('#{validation_classes}').addClass('checking');
28	- jQuery('#url-check').html('<p><span class=\"checking\">#{checking_message(:url)}</span></p>');",
29	- :complete => "jQuery('#user_login').removeClass('checking')"
30	- %>
31	-
32	- <div id='signup-password'>
33	- <%= required f.password_field(:password, :id => 'user_pw') %>
34	- <%= content_tag(:small,_('Choose a password that you can remember easily. It must have at least 4 characters.'), :id => 'password-balloon') %>
35	- <div id='fake-check'><p> </p></div>
36	- </div>
37	-
38	- <div id='signup-password-confirmation'>
39	- <%= required f.password_field(:password_confirmation) %>
40	- <%= content_tag(:small,_('We need to be sure that you filled in your password correctly. Confirm you password.'), :id => 'password-confirmation-balloon') %>
41	- <div id='password-check'><p> </p></div>
42	- </div>
43	-
44	- <div id='signup-email'>
45	- <%= required f.text_field(:email) %>
46	- <%= content_tag(:small,_('This e-mail address will be used to contact you.'), :id => 'email-balloon') %>
47	- <div id='email-check'><p> </p></div>
48	- </div>
49	- <%= observe_field "user_email",
50	- :url => { :action => "check_email" },
51	- :with => "address",
52	- :update => "email-check",
53	- :loading => "jQuery('#user_email').removeClass('#{validation_classes}').addClass('checking');
54	- jQuery('#email-check').html('<p><span class=\"checking\">#{checking_message(:email)}</span></p>');",
55	- :complete => "jQuery('#user_email').removeClass('checking')",
56	- :before => "var field = jQuery('#user_email');
57	- if (field.val()=='') {
58	- field.removeClass('#{validation_classes}');
59	- jQuery('#email-check').html('<p> </p>');
60	- return false;
61	- }
62	- if (!( field.valid() )) {
63	- field.removeClass('#{validation_classes}').addClass('invalid');
64	- jQuery('#email-check').html('<p><span class=\"invalid\">#{_('This e-mail address is not valid')}</span></p>');
65	- return false;
66	- }"
67	- %>
68	-
69	- <div id='signup-name'>
70	- <%= labelled_form_field(_('Full name'), text_field(:profile_data, :name)) %>
71	- <%= content_tag(:small,_('Tell us your name, it will be used to identify yourself.'), :id => 'name-balloon') %>
72	- </div>
73	-
74	-</div>
75	-
76	-<div id="signup-form-profile">
77	-
78	- <% labelled_fields_for :profile_data, @person do \|f\| %>
79	- <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
80	- <% end %>
81	-
82	- <%= @plugins.dispatch(:signup_extra_contents).collect { \|content\| instance_eval(&content) }.join("") %>
83	-
84	- <%= template_options(Person, 'profile_data') %>
85	-
86	- <% unless @terms_of_use.blank? %>
87	- <div id='terms-of-use-box' class='formfieldline'>
88	- <%= labelled_check_box(_('I accept the %s') % link_to(_('terms of use'), {:controller => 'home', :action => 'terms'}, :target => '_blank'), 'user[terms_accepted]') %>
89	- </div>
90	- <% end %>
91	-
92	- <% if params[:enterprise_code] %>
93	- <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
94	- <%= hidden_field_tag :answer, params[:answer] %>
95	- <%= hidden_field_tag :terms_accepted, params[:terms_accepted] %>
96	- <%= hidden_field_tag :new_user, true %>
97	- <% end %>
98	-</div>
99	-
100	-<p style="text-align: center">
101	- <%= submit_button('save', _('Create my account')) %>
102	-</p>
103	-
104	-<% end -%>
105	-
106	-<script type="text/javascript">
107	-jQuery(function($) {
108	-
109	- $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());
110	-
111	- $('#signup-form input[type=text], #signup-form textarea').each(function() {
112	- $(this).bind('blur', function() {
113	- if ($(this).val() == '') {
114	- $(this).removeClass('filled-in');
115	- }
116	- else $(this).addClass('filled-in');
117	- });
118	- });
119	-
120	- $('#user_pw').focus(function() {
121	- $('#password-balloon').fadeIn('slow');
122	- });
123	- $('#user_password_confirmation').focus(function() {
124	- $('#password-confirmation-balloon').fadeIn('slow');
125	- });
126	- $('#user_password_confirmation, #user_pw').blur(function() {
127	- if ($('#user_password_confirmation').val() != '') {
128	- if ($('#user_password_confirmation').val() == $('#user_pw').val()) {
129	- $('#user_password_confirmation').addClass('validated').removeClass('invalid');
130	- $('#user_pw').removeClass('invalid_input').addClass('valid_input');
131	- $('#password-check').html("<p> </p>");
132	- } else if ($('#user_password_confirmation').val() != $('#user_pw').val()) {
133	- $('#user_password_confirmation').removeClass('validated').addClass('invalid');
134	- $('#user_pw').addClass('invalid_input').removeClass('valid_input');
135	- $('#password-check').html("<p><span class='invalid'><%= _('Passwords don\'t match') %></span></p>");
136	- }
137	- }
138	- $('#password-balloon').fadeOut('slow');
139	- $('#password-confirmation-balloon').fadeOut('slow');
140	- });
141	- $('#user_login').focus(function() {
142	- $('#signup-balloon').fadeIn('slow');
143	- });
144	- $('#user_login').blur(function() { $('#signup-balloon').fadeOut('slow'); });
145	- $('#signup-form').validate({ rules: { 'user[email]': { email: true } }, messages: { 'user[email]' : '' } });
146	- $('#user_email').focus(function() {
147	- $('#email-balloon').fadeIn('slow');
148	- });
149	- $('#user_email').blur(function() {
150	- $('#email-balloon').fadeOut('slow');
151	- });
152	- $('#profile_data_name').focus(function() {
153	- $('#name-balloon').fadeIn('slow');
154	- });
155	- $('#profile_data_name').blur(function() {
156	- $('#name-balloon').fadeOut('slow');
157	- if ($(this).val() == '') {
158	- $(this).removeClass('validated');
159	- }
160	- else $(this).addClass('validated');
161	- });
162	-});
163	-</script>
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+<script type="text/javascript">
	2	+ function toggle_submit_button(id, enabled) {
	3	+ button = $(id)
	4	+ if (enabled){
	5	+ button.className = button.className.replace(/disabled/, '')
	6	+ button.enable()
	7	+ } else {
	8	+ button.className += ' disabled'
	9	+ button.disable()
	10	+ }
	11	+ }
	12	+</script>
	13	+<div class=activation-box>
	14	+ <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
	15	+
	16	+ <div id='terms-of-enterprise-use' class='height: 200px; overflow: auto;'><%= @terms_of_enterprise_use %></div>
	17	+
	18	+ <% form_tag :action => 'activate_enterprise' do %>
	19	+ <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
	20	+ <%= hidden_field_tag :answer, params[:answer] %>
	21	+
	22	+ <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :onclick => 'toggle_submit_button("submit-accept-terms", this.checked)') %>
	23	+ <% button_bar do %>
	24	+ <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
	25	+ <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
	26	+ <% end %>
	27	+ <% end %>
	28	+</div>
	@@ -1,28 +0,0 @@	@@ -1,28 +0,0 @@
1	-<script type="text/javascript">
2	- function toggle_submit_button(id, enabled) {
3	- button = $(id)
4	- if (enabled){
5	- button.className = button.className.replace(/disabled/, '')
6	- button.enable()
7	- } else {
8	- button.className += ' disabled'
9	- button.disable()
10	- }
11	- }
12	-</script>
13	-<div class=activation-box>
14	- <h2><%= __('Enterprise activation') + ' - ' + (logged_in? ? _('part 2 of 2') : _(' part 2 of 3')) %></h2>
15	-
16	- <div id='terms-of-enterprise-use' class='height: 200px; overflow: auto;'><%= @terms_of_enterprise_use %></div>
17	-
18	- <% form_tag :action => 'activate_enterprise' do %>
19	- <%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
20	- <%= hidden_field_tag :answer, params[:answer] %>
21	-
22	- <%= labelled_check_box(environment.terms_of_use_acceptance_text.blank? ? _('I read the terms of use and accepted them') : environment.terms_of_use_acceptance_text, :terms_accepted, '1', false, :onclick => 'toggle_submit_button("submit-accept-terms", this.checked)') %>
23	- <% button_bar do %>
24	- <%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
25	- <%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
26	- <% end %>
27	- <% end %>
28	-</div>
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+<div class='activation-box'>
	2	+<h2><%= __('Enterprise activation - part 3 of 3') %></h2>
	3	+
	4	+<%= error_messages_for :user %>
	5	+
	6	+<p><%= __('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
	7	+<p><%= _('Do you have a personal user account in the system?') %></p>
	8	+
	9	+<div id="enterprise-activation-create-user-or-login-button">
	10	+ <%= button_to_function 'login', _('Yes'), "$('enterprise-activation-create-user-form').hide(); $('enterprise-activation-login-form').show()" %>
	11	+ <%= button_to_function 'add', _('No'), "$('enterprise-activation-login-form').hide(); $('enterprise-activation-create-user-form').show()" %>
	12	+</div>
	13	+
	14	+<div id="enterprise-activation-create-user-form" style="display: none">
	15	+ <h3><%= _('Personal signup form') %></h3>
	16	+ <%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>
	17	+ <p><%= message = __('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
	18	+</div>
	19	+
	20	+<div id="enterprise-activation-login-form" style="display: none">
	21	+
	22	+ <h3><%= _('Enter you user name and password') %></h3>
	23	+ <%= render :partial => 'login_form' %>
	24	+ <p><%= message %></p>
	25	+</div>
	26	+
	27	+
	28	+</div>
	@@ -1,28 +0,0 @@	@@ -1,28 +0,0 @@
1	-<div class='activation-box'>
2	-<h2><%= __('Enterprise activation - part 3 of 3') %></h2>
3	-
4	-<%= error_messages_for :user %>
5	-
6	-<p><%= __('Now for you manage your enterprise you have to associate an individual account to the enterprise.') %></p>
7	-<p><%= _('Do you have a personal user account in the system?') %></p>
8	-
9	-<div id="enterprise-activation-create-user-or-login-button">
10	- <%= button_to_function 'login', _('Yes'), "$('enterprise-activation-create-user-form').hide(); $('enterprise-activation-login-form').show()" %>
11	- <%= button_to_function 'add', _('No'), "$('enterprise-activation-login-form').hide(); $('enterprise-activation-create-user-form').show()" %>
12	-</div>
13	-
14	-<div id="enterprise-activation-create-user-form" style="display: none">
15	- <h3><%= _('Personal signup form') %></h3>
16	- <%= render :partial => 'signup_form', :locals => { :hidden_atention => true } %>
17	- <p><%= message = __('<b>Warning</b>: this form is for your personal information, not of your enterprise. So you will have a personal account that can manage your enterprise.') %></p>
18	-</div>
19	-
20	-<div id="enterprise-activation-login-form" style="display: none">
21	-
22	- <h3><%= _('Enter you user name and password') %></h3>
23	- <%= render :partial => 'login_form' %>
24	- <p><%= message %></p>
25	-</div>
26	-
27	-
28	-</div>