diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c16ff2f57..b42f13035 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -248,6 +248,18 @@ module ApplicationHelper classes = (ancestors.empty? ? 'root' : 'child') s << "
  • " s << h(block_given? ? yield(project) : project.name) + unless User.current.member_of?(@project) + s << "" + s << watcher_link(@project, User.current) + s << "" + end + if @project.project_type == 1 + unless Course.find_by_extra(@project.identifier).tea_id == User.current.id + s << "" + s << join_in_course(@project, User.current) + s << "" + end + end s << (render :partial => 'projects/project', :locals => {:project => project}).to_s s << "
    \n" ancestors << project diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 0cceb69ac..ca392ead7 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -59,7 +59,7 @@ <% unless @user.user_extensions.nil?%> -

    <%= l(:field_occupation)%><%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%> +

    <%= l(:field_occupation)%> <%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%>

    <%else%>

    <%= l(:field_occupation)%><%= text_field_tag "occupation", nil, :class => 'occupation'%> diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index ae0a397fe..69e9776f8 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -63,7 +63,7 @@

    - + <% if(@project.project_type==1)%> <%= content_tag('span', "#{l(:field_tea_name)}: ") %> <% else %> @@ -86,16 +86,16 @@ <%= content_tag('span', "#{l(:label_create_time)}: ") %><%= content_tag('span', format_time(@project.created_on)) %>
    - <% unless User.current.member_of?(@project) %> - +