Merge branches 'rails3' and 'rails3_AI3033-serpro_integration' into rails3_AI3033-serpro_integration

Leandro Santos
2 parents 05b6b386 05430e60
Showing 18 changed files with 91 additions and 118 deletions Show diff stats
app/helpers/application_helper.rb
app/models/environment.rb
app/views/account/accept_terms.html.erb
app/views/blocks/login_block.html.erb
app/views/layouts/_user.html.erb
app/views/profile_editor/edit.html.erb
features/admin_categories.feature
features/edit_image.feature
features/edit_profile.feature
features/forum.feature
features/plugins.feature
features/profile_domain.feature
features/suggest_article.feature
features/support/selenium.rb
plugins/foo/lib/foo_plugin.rb
public/javascripts/application.js
test/functional/profile_controller_test.rb
test/integration/manage_documents_test.rb
@@ -1091,10 +1091,10 @@ module ApplicationHelper
       link_to_all = nil
       if list.count > 5
         list = list.first(5)
-        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => current_user.login)
+        link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => user.identifier)
       end
       link = list.map do |element|
-        link_to(content_tag('strong', [_('<span>Manage</span> %s') % element.short_name(25)]), @environment.top_url + "/myprofile/#{element.identifier}", :class => "icon-menu-"+element.class.identification.underscore, :title => [_('Manage %s') % element.short_name])
+        link_to(content_tag('strong', _('<span>Manage</span> %s') % element.short_name(25)), element.admin_url, :class => "icon-menu-"+element.class.identification.underscore, :title => _('Manage %s') % element.short_name)
       end
       if link_to_all
         link << link_to_all
@@ -1118,15 +1118,15 @@ module ApplicationHelper
     pending_tasks_count = ''
     count = user ? Task.to(user).pending.count : -1
     if count > 0
-      pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
+      pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
  
-    (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i style="background-image:url({avatar})"></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
-    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
+    link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.admin_url, :title => _("Configure the environment"), :class => 'admin-link') +
     manage_enterprises.to_s +
     manage_communities.to_s +
-    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
+    link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
     pending_tasks_count +
     link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
   end
@@ -637,6 +637,10 @@ class Environment &lt; ActiveRecord::Base
     domain
   end
  
+  def admin_url
+    { :controller => 'admin_panel', :action => 'index' }
+  end
+
   def top_url
     url = 'http://'
     url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
@@ -19,10 +19,18 @@
     <%= 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)') %>
+    <%= 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, :id => 'accept-terms') %>
     <% 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>
+
+<script type="text/javascript">
+  jQuery('#accept-terms').change(function(){
+    jQuery("#submit-accept-terms").toggleClass("disabled");
+    jQuery("#submit-accept-terms").prop("disabled", !jQuery("#submit-accept-terms").prop("disabled"));
+  });
+</script>
+
-<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' %>
+<% if user.present? %>
+  <div class="logged-user-info">
+    <h2><%= _('Logged in as %s') % user.identifier %></h2>
+    <ul>
+      <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
+      <li><%= link_to _('Homepage'), user.public_profile_url %></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>
-<div class='not-logged-user' style='display: none;'>
-  <%= render :file => 'account/login_block' %>
-</div>
+<% else %>
+  <div class='not-logged-user'>
+    <%= render :file => 'account/login_block' %>
+  </div>
+<% end%>
 <div id="user">
-  <span class='logged-in' style='display: none;'>
-    <%= usermenu_logged_in %>
-  </span>
-  <span class='not-logged-in' style='display: none'>
+  <% user = (session[:user] && User.find_by_id(session[:user])) || nil %>
+  <% if user.present? %>
+    <% user = user.person %>
+    <span class='logged-in'>
+      <%= usermenu_logged_in %>
+    </span>
+  <% else %>
+    <span class='not-logged-in'>
+      <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
+      <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
  
-    <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
-    <%= @plugins.dispatch(:alternative_authentication_link).collect { |content| instance_exec(&content) }.join("") %>
+      <div id='inlineLoginBox' style='display: none;'>
+        <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
+      </div>
  
-    <div id='inlineLoginBox' style='display: none;'>
-      <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
-    </div>
-
-    <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
-      <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
-    <% end %>
-
-  </span>
+      <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
+        <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
+      <% end %>
+    </span>
+  <% end %>
   <form action="/search" id="top-search" class="search_form clean" method="get">
     <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
     <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
@@ -53,7 +53,7 @@
  
   <%=
     @plugins.dispatch(:profile_editor_extras).map do |content|
-      if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end
+      content.kind_of?(Proc) ? self.instance_exec(&content) : content
     end.join("\n")
   %>
  
@@ -40,11 +40,11 @@ Feature: manage categories
   Scenario: admin user could hide the category tree
     Given I follow "Administration"
     And I follow "Categories"
-    When I follow "Show" and wait while it hides
+    When I follow "Show"
     Then I should see "Vegetarian"
     And I should see "Steak"
-    When I follow "Hide" and wait while it hides
-    Then "Vegetarian" should not be visible within "div"
+    When I follow "Hide"
+    Then I should not see "Vegetarian"
     And "Steak" should not be visible within "div"
  
   @selenium
@@ -52,7 +52,6 @@ Feature: manage categories
     Given the following category
       | parent  | name     | display_in_menu |
       | Steak   | Pig      | true            |
-    And I am on the homepage
     When I follow "Administration"
     And I follow "Categories"
     Then I should see "Food Show"
@@ -19,8 +19,8 @@ Feature: edit_image
   Scenario: dont offer to edit external link if no image
     Given the following files
       | owner   | file     | mime       |
-      | morgoth | test.txt | text/plain |
-    When I go to edit "test.txt" by morgoth
+      | morgoth | test_another.txt | text/plain |
+    When I go to edit "test_another.txt" by morgoth
     Then I should not see "External link"
  
   Scenario: display tag list field when editing file
@@ -12,9 +12,7 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November" from "profile_data_birth_date_2i"
-    And I select "15" from "profile_data_birth_date_3i"
-    And I select "1980" from "profile_data_birth_date_1i"
+    And I select "1980-11-15" from "profile_data_birth_date"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -25,9 +23,7 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November" from "profile_data_birth_date_2i"
-    And I select "15" from "profile_data_birth_date_3i"
-    And I select "1980" from "profile_data_birth_date_1i"
+    And I select "1980-11-15" from "profile_data_birth_date"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -165,7 +165,7 @@ Feature: forum
        | article  | author    | title  | body   |
        | Post one | joaosilva | Hi all | Hi all |
    When I go to /joaosilva/forum
-   Then I should see "Joao" linking to "http://localhost/joaosilva/"
+   Then I should see "Joao Silva" within ".forum-post-last-answer"
  
    @selenium
    Scenario: community member should be able to see the discussion topic button
@@ -13,46 +13,39 @@ Feature: plugins
       | login | name |
       | joaosilva | Joao Silva |
     And I am logged in as "joaosilva"
-    And the following plugin
-      | klass       |
-      | TestPlugin  |
-    And the following events of TestPlugin
-      | event                 | body                                                                                                     |
-      | control_panel_buttons | proc { {:title => 'Test plugin button', :icon => '', :url => ''} }                                     |
-      | profile_tabs          | proc { {:title => 'Test plugin tab', :id => 'test_plugin', :content => proc {'Test plugin random content'} } } |
  
   Scenario: a user must see the plugin\'s button in the control panel if the plugin is enabled
-    Given plugin Test is enabled on environment
+    Given plugin Foo is enabled on environment
     And I go to joaosilva's control panel
-    Then I should see "Test plugin button"
+    Then I should see "Foo plugin button"
  
   Scenario: a user must see the plugin\'s tab in in the profile if the plugin is enabled
-    Given plugin Test is enabled on environment
+    Given plugin Foo is enabled on environment
     And I am on joaosilva's profile
-    Then I should see "Test plugin tab"
+    Then I should see "Foo plugin tab"
  
   Scenario: a user must not see the plugin\'s button in the control panel if the plugin is disabled
-    Given plugin Test is disabled on environment
+    Given plugin Foo is disabled on environment
     And I go to joaosilva's control panel
-    Then I should not see "Test plugin button"
+    Then I should not see "Foo plugin button"
  
   Scenario: a user must not see the plugin\'s tab in in the profile if the plugin is disabled
-    Given plugin Test is disabled on environment
+    Given plugin Foo is disabled on environment
     And I am on joaosilva's profile
-    Then I should not see "Test plugin tab"
+    Then I should not see "Foo plugin tab"
  
   Scenario: an admin should be able to deactivate a plugin
-    Given plugin Test is enabled on environment
+    Given plugin Foo is enabled on environment
     And I am logged in as admin
     When I go to admin_user's control panel
-    Then I should see "Test plugin button"
+    Then I should see "Foo plugin button"
     When I go to admin_user's profile
-    Then I should see "Test plugin tab"
+    Then I should see "Foo plugin tab"
     And I go to the environment control panel
     And I follow "Plugins"
-    And I uncheck "Test plugin"
+    And I uncheck "Foo"
     And I press "Save changes"
     When I go to admin_user's control panel
-    Then I should not see "Test plugin button"
+    Then I should not see "Foo plugin button"
     When I go to admin_user's profile
-    Then I should not see "Test plugin tab"
+    Then I should not see "Foo plugin tab"
@@ -55,7 +55,7 @@ Feature: domain for profile
   Scenario: access community by domain
     Given I go to the search communities page
     When I follow "Sample Community" within ".search-profile-item"
-    Then the page title should be "Sample Community - Colivre.net"
+    Then the page title should be "Sample Community"
  
   # This test is not working because the community domain isn't at all different
   # from the environment (localhost / 127.0.0.1)
@@ -12,6 +12,7 @@ Feature: suggest article
       | sample-community | Sample Community |
     And "Joao Silva" is admin of "Sample Community"
  
+  @selenium
   Scenario: highlight an article before approval of a suggested article
     Given someone suggested the following article to be published
       | target           | article_name        | article_body                    | name | email            |
@@ -19,6 +20,7 @@ Feature: suggest article
     When I am logged in as "joaosilva"
     And I go to sample-community's control panel
     And I follow "Process requests"
+    And I choose "Accept"
     And I should see "suggested the publication of the article"
     Then I should see "Highlight this article" within ".task_box"
  
@@ -21,6 +21,7 @@ Before(&#39;@ignore-hidden-elements&#39;) do
 end
  
 Capybara.default_wait_time = 30
+Capybara.server_host = "localhost"
  
 After do
   DatabaseCleaner.clean
@@ -8,4 +8,12 @@ class FooPlugin &lt; Noosfero::Plugin
     _("A sample plugin to test autoload craziness.")
   end
  
+  def control_panel_buttons
+    {:title => 'Foo plugin button', :icon => '', :url => ''}
+  end
+
+  def profile_tabs
+    {:title => 'Foo plugin tab', :id => 'foo_plugin', :content => lambda {'Foo plugin random content'} }
+  end
+
 end
@@ -518,16 +518,11 @@ jQuery(function($) {
   $.getJSON('/account/user_data', function userDataCallBack(data) {
     if (data.login) {
       // logged in
-      loggedInDataCallBack(data);
-      addManageEnterprisesToOldStyleMenu(data);
       if (data.chat_enabled) {
         setInterval(function(){ $.getJSON('/account/user_data', chatOnlineUsersDataCallBack)}, 10000);
       }
       $('head').append('<meta content="authenticity_token" name="csrf-param" />');
       $('head').append('<meta content="'+$.cookie("_noosfero_.XSRF-TOKEN")+'" name="csrf-token" />');
-    } else {
-      // not logged in
-      $('#user .not-logged-in, .login-block .not-logged-user').fadeIn();
     }
     if (data.notice) {
       display_notice(data.notice);
@@ -536,45 +531,6 @@ jQuery(function($) {
     $(window).trigger("userDataLoaded", data);
   });
  
-  function loggedInDataCallBack(data) {
-    // logged in
-    $('body').addClass('logged-in');
-    $('#user .logged-in, .login-block .logged-user-info').each(function() {
-      $(this).find('a[href]').each(function() {
-        var new_href = $(this).attr('href').replace('{login}', data.login);
-        if (data.email_domain) {
-          new_href = new_href.replace('{email_domain}', data.email_domain);
-        }
-        $(this).attr('href', new_href);
-      });
-      var html = $(this).html()
-                        .replace(/{login}/g, data.login)
-                        .replace('{avatar}', data.avatar)
-                        .replace('{month}', data.since_month)
-                        .replace('{year}', data.since_year);
-      $(this).html(html).fadeIn();
-      if (data.is_admin) {
-        $('#user .admin-link').show();
-      }
-      if (data.email_domain) {
-        $('#user .webmail-link').show();
-      }
-    });
-  }
-
-  function addManageEnterprisesToOldStyleMenu(data) {
-    if ($('#manage-enterprises-link-template').length > 0) {
-      $.each(data.enterprises, function(index, enterprise) {
-        var item = $('<li>' + $('#manage-enterprises-link-template').html() + '</li>');
-        item.find('a[href]').each(function() {
-          $(this).attr('href', '/myprofile/' + enterprise.identifier);
-        });
-        item.html(item.html().replace('{name}', enterprise.name));
-        item.insertAfter('#manage-enterprises-link-template');
-      });
-    }
-  }
-
   function chatOnlineUsersDataCallBack(data) {
     if ($('#chat-online-users').length == 0) {
       return;
@@ -154,7 +154,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     community = Community.create!(:name => 'my test community')
     community.add_admin(@profile)
     get :index, :profile => community.identifier
-    assert_tag :tag => 'a', :attributes => { :href => /\/myprofile\/\{login\}/ }, :content => 'Control panel'
+    assert_tag :tag => 'a', :attributes => { :href => /\/myprofile\/my-test-community/ }, :content => 'Control panel'
   end
  
   should 'show create community in own profile' do
@@ -9,7 +9,7 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
     user.activate
  
     login('myuser', 'myuser')
-    assert_tag :tag => 'a', :attributes => { :href => "#{user.environment.top_url}/myprofile\/{login}"  }
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{user.login}"  }
  
     get '/myprofile/myuser'
     assert_response :success
@@ -40,7 +40,7 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
     article.save!
  
     login('myuser', 'myuser')
-    assert_tag :tag => 'a', :attributes => { :href => "#{profile.environment.top_url}\/myprofile\/{login}"  }
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}"  }
  
     get '/myprofile/myuser'
     assert_response :success
@@ -75,7 +75,7 @@ class ManageDocumentsTest &lt; ActionController::IntegrationTest
  
     login('myuser', 'myuser')
  
-    assert_tag :tag => 'a', :attributes => { :href => "#{profile.environment.top_url}\/myprofile\/{login}"  }
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}"  }
     get '/myprofile/myuser'
     assert_response :success
...	...	@@ -1091,10 +1091,10 @@ module ApplicationHelper
1091	1091	link_to_all = nil
1092	1092	if list.count > 5
1093	1093	list = list.first(5)
1094		- link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => current_user.login)
	1094	+ link_to_all = link_to(content_tag('strong', _('See all')), :controller => 'memberships', :profile => user.identifier)
1095	1095	end
1096	1096	link = list.map do \|element\|
1097		- link_to(content_tag('strong', [_('<span>Manage</span> %s') % element.short_name(25)]), @environment.top_url + "/myprofile/#{element.identifier}", :class => "icon-menu-"+element.class.identification.underscore, :title => [_('Manage %s') % element.short_name])
	1097	+ link_to(content_tag('strong', _('<span>Manage</span> %s') % element.short_name(25)), element.admin_url, :class => "icon-menu-"+element.class.identification.underscore, :title => _('Manage %s') % element.short_name)
1098	1098	end
1099	1099	if link_to_all
1100	1100	link << link_to_all
...	...	@@ -1118,15 +1118,15 @@ module ApplicationHelper
1118	1118	pending_tasks_count = ''
1119	1119	count = user ? Task.to(user).pending.count : -1
1120	1120	if count > 0
1121		- pending_tasks_count = link_to(count.to_s, @environment.top_url + '/myprofile/{login}/tasks', :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
	1121	+ pending_tasks_count = link_to(count.to_s, user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1122	1122	end
1123	1123
1124		- (_("<span class='welcome'>Welcome,</span> %s") % link_to('<i style="background-image:url({avatar})"></i><strong>{login}</strong>', @environment.top_url + '/{login}', :id => "homepage-link", :title => _('Go to your homepage'))) +
	1124	+ (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
1125	1125	render_environment_features(:usermenu) +
1126		- link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.top_url + '/admin', :title => _("Configure the environment"), :class => 'admin-link', :style => 'display: none') +
	1126	+ link_to('<i class="icon-menu-admin"></i><strong>' + _('Administration') + '</strong>', @environment.admin_url, :title => _("Configure the environment"), :class => 'admin-link') +
1127	1127	manage_enterprises.to_s +
1128	1128	manage_communities.to_s +
1129		- link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', @environment.top_url + '/myprofile/{login}', :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
	1129	+ link_to('<i class="icon-menu-ctrl-panel"></i><strong>' + _('Control panel') + '</strong>', user.admin_url, :class => 'ctrl-panel', :title => _("Configure your personal account and content")) +
1130	1130	pending_tasks_count +
1131	1131	link_to('<i class="icon-menu-logout"></i><strong>' + _('Logout') + '</strong>', { :controller => 'account', :action => 'logout'} , :id => "logout", :title => _("Leave the system"))
1132	1132	end
...	...
...	...	@@ -637,6 +637,10 @@ class Environment < ActiveRecord::Base
637	637	domain
638	638	end
639	639
	640	+ def admin_url
	641	+ { :controller => 'admin_panel', :action => 'index' }
	642	+ end
	643	+
640	644	def top_url
641	645	url = 'http://'
642	646	url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
...	...
...	...	@@ -19,10 +19,18 @@
19	19	<%= hidden_field_tag :enterprise_code, params[:enterprise_code] %>
20	20	<%= hidden_field_tag :answer, params[:answer] %>
21	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)') %>
	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, :id => 'accept-terms') %>
23	23	<% button_bar do %>
24	24	<%= button 'cancel', _('Cancel'), :controller => 'home', :action => 'index' %>
25	25	<%= submit_button 'forward', _('Continue'), {:disabled => true, :class => 'disabled', :id => 'submit-accept-terms'} %>
26	26	<% end %>
27	27	<% end %>
28	28	</div>
	29	+
	30	+<script type="text/javascript">
	31	+ jQuery('#accept-terms').change(function(){
	32	+ jQuery("#submit-accept-terms").toggleClass("disabled");
	33	+ jQuery("#submit-accept-terms").prop("disabled", !jQuery("#submit-accept-terms").prop("disabled"));
	34	+ });
	35	+</script>
	36	+
...	...
1		-<div class="logged-user-info" style='display: none;'>
2		- <h2><%= _('Logged in as %s') % '{login}' %></h2>
3		- <ul>
4		- <li><%= _('User since {year}/{month}') %></li>
5		- <li><%= link_to _('Homepage'), '/{login}' %></li>
6		- </ul>
7		- <div class="user-actions">
8		- <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
	1	+<% if user.present? %>
	2	+ <div class="logged-user-info">
	3	+ <h2><%= _('Logged in as %s') % user.identifier %></h2>
	4	+ <ul>
	5	+ <li><%= _('User since %s/%s') % [user.created_at.month, user.created_at.year] %></li>
	6	+ <li><%= link_to _('Homepage'), user.public_profile_url %></li>
	7	+ </ul>
	8	+ <div class="user-actions">
	9	+ <%= link_to content_tag('span', _('Logout')), { :controller => 'account', :action => 'logout' }, :class => 'button with-text icon-menu-logout' %>
	10	+ </div>
9	11	</div>
10		-</div>
11		-<div class='not-logged-user' style='display: none;'>
12		- <%= render :file => 'account/login_block' %>
13		-</div>
	12	+<% else %>
	13	+ <div class='not-logged-user'>
	14	+ <%= render :file => 'account/login_block' %>
	15	+ </div>
	16	+<% end%>
...	...
1	1	<div id="user">
2		- <span class='logged-in' style='display: none;'>
3		- <%= usermenu_logged_in %>
4		- </span>
5		- <span class='not-logged-in' style='display: none'>
	2	+ <% user = (session[:user] && User.find_by_id(session[:user])) \|\| nil %>
	3	+ <% if user.present? %>
	4	+ <% user = user.person %>
	5	+ <span class='logged-in'>
	6	+ <%= usermenu_logged_in %>
	7	+ </span>
	8	+ <% else %>
	9	+ <span class='not-logged-in'>
	10	+ <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
	11	+ <%= @plugins.dispatch(:alternative_authentication_link).collect { \|content\| instance_exec(&content) }.join("") %>
6	12
7		- <%= _("<span class='login'>%s</span>") % thickbox_inline_popup_link('<i class="icon-menu-login"></i><strong>' + _('Login') + '</strong>', login_url, 'inlineLoginBox', :id => 'link_login') %>
8		- <%= @plugins.dispatch(:alternative_authentication_link).collect { \|content\| instance_exec(&content) }.join("") %>
	13	+ <div id='inlineLoginBox' style='display: none;'>
	14	+ <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
	15	+ </div>
9	16
10		- <div id='inlineLoginBox' style='display: none;'>
11		- <%= render :file => 'account/login', :locals => { :is_thickbox => true } %>
12		- </div>
13		-
14		- <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
15		- <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
16		- <% end %>
17		-
18		- </span>
	17	+ <% unless @plugins.dispatch(:allow_user_registration).include?(false) %>
	18	+ <%= _("<span class='or'>or</span> <span class='signup'>%s</span>") % link_to('<strong>' + _('Sign up') + '</strong>', :controller => 'account', :action => 'signup')%>
	19	+ <% end %>
	20	+ </span>
	21	+ <% end %>
19	22	<form action="/search" id="top-search" class="search_form clean" method="get">
20	23	<input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
21	24	<div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
...	...
...	...	@@ -53,7 +53,7 @@
53	53
54	54	<%=
55	55	@plugins.dispatch(:profile_editor_extras).map do \|content\|
56		- if content.respond_to?(:call) then instance_eval(&content).html_safe else content.html_safe end
	56	+ content.kind_of?(Proc) ? self.instance_exec(&content) : content
57	57	end.join("\n")
58	58	%>
59	59
...	...
...	...	@@ -40,11 +40,11 @@ Feature: manage categories
40	40	Scenario: admin user could hide the category tree
41	41	Given I follow "Administration"
42	42	And I follow "Categories"
43		- When I follow "Show" and wait while it hides
	43	+ When I follow "Show"
44	44	Then I should see "Vegetarian"
45	45	And I should see "Steak"
46		- When I follow "Hide" and wait while it hides
47		- Then "Vegetarian" should not be visible within "div"
	46	+ When I follow "Hide"
	47	+ Then I should not see "Vegetarian"
48	48	And "Steak" should not be visible within "div"
49	49
50	50	@selenium
...	...	@@ -52,7 +52,6 @@ Feature: manage categories
52	52	Given the following category
53	53	\| parent \| name \| display_in_menu \|
54	54	\| Steak \| Pig \| true \|
55		- And I am on the homepage
56	55	When I follow "Administration"
57	56	And I follow "Categories"
58	57	Then I should see "Food Show"
...	...
...	...	@@ -19,8 +19,8 @@ Feature: edit_image
19	19	Scenario: dont offer to edit external link if no image
20	20	Given the following files
21	21	\| owner \| file \| mime \|
22		- \| morgoth \| test.txt \| text/plain \|
23		- When I go to edit "test.txt" by morgoth
	22	+ \| morgoth \| test_another.txt \| text/plain \|
	23	+ When I go to edit "test_another.txt" by morgoth
24	24	Then I should not see "External link"
25	25
26	26	Scenario: display tag list field when editing file
...	...
...	...	@@ -12,9 +12,7 @@ Feature: edit profile
12	12	\| birth_date \|
13	13	When I go to joao's control panel
14	14	And I follow "Edit Profile"
15		- And I select "November" from "profile_data_birth_date_2i"
16		- And I select "15" from "profile_data_birth_date_3i"
17		- And I select "1980" from "profile_data_birth_date_1i"
	15	+ And I select "1980-11-15" from "profile_data_birth_date"
18	16	And I press "Save"
19	17	Then I should not see "Birth date is invalid"
20	18	And I should not see "Birth date is mandatory"
...	...	@@ -25,9 +23,7 @@ Feature: edit profile
25	23	\| birth_date \|
26	24	When I go to joao's control panel
27	25	And I follow "Edit Profile"
28		- And I select "November" from "profile_data_birth_date_2i"
29		- And I select "15" from "profile_data_birth_date_3i"
30		- And I select "1980" from "profile_data_birth_date_1i"
	26	+ And I select "1980-11-15" from "profile_data_birth_date"
31	27	And I press "Save"
32	28	Then I should not see "Birth date is invalid"
33	29	And I should not see "Birth date is mandatory"
...	...
...	...	@@ -165,7 +165,7 @@ Feature: forum
165	165	\| article \| author \| title \| body \|
166	166	\| Post one \| joaosilva \| Hi all \| Hi all \|
167	167	When I go to /joaosilva/forum
168		- Then I should see "Joao" linking to "http://localhost/joaosilva/"
	168	+ Then I should see "Joao Silva" within ".forum-post-last-answer"
169	169
170	170	@selenium
171	171	Scenario: community member should be able to see the discussion topic button
...	...