diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index f016eafc5..0bbdc1348 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -4,7 +4,7 @@
- + - +
<%= l(:label_task_plural)%><%= l(:label_task_plural)%>(<%= @homework_list.count%>)
<%= text_field_tag 'student_id', params[:student_id], :size => 30 %> diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 6947f8ceb..6663ab6e2 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -3,10 +3,7 @@
- - - - + <% else %> - - + <% end %>
<%= l(:label_task_plural)%><%= l(:label_task_plural)%>
<%= text_field_tag 'student_id', params[:student_id], :size => 30 %> @@ -19,9 +16,6 @@ <% end %> <% bidding_project.each do |b_project|%> <% if b_project.project %> - - - @@ -142,7 +144,7 @@
@@ -38,7 +32,15 @@ <%= link_to(b_project.project.name, project_path(b_project.project)) %> - <%= l(:label_join_bidding)%> + + <% if @bid.reward_type == 2 %> + <%= l(:label_join_contest)%> + <% end %> + <% if @bid.reward_type == 1 %> + <%= l(:label_join_bidding)%> + <% end %> + +
- <%= b_project.created_at%> + <%= format_time b_project.created_at%>
@@ -170,7 +172,13 @@
<%= l(:label_bidding_user) %> + + <% if @bid.reward_type == 2%> + <%= l(:label_contest_user) %> + <% end %> + <% if @bid.reward_type == 1 %> + <%= l(:label_bidding_user) %> + <% end %> <% unless b_project.user.nil? %> <%= b_project.user.lastname %><%= b_project.user.firstname %> <% end %> @@ -185,7 +193,15 @@
<%= l(:label_bidding_reason) %><%= b_project.description %> + + <% if @bid.reward_type == 2%> + <%= l(:label_contest_reason) %> + <% end %> + <% if @bid.reward_type == 1 %> + <%= l(:label_bidding_reason) %> + <% end %> + <%= b_project.description %>
diff --git a/app/views/bids/_project_homework.html.erb b/app/views/bids/_project_homework.html.erb index 5013e2a8d..952867b94 100644 --- a/app/views/bids/_project_homework.html.erb +++ b/app/views/bids/_project_homework.html.erb @@ -30,7 +30,7 @@
<%= b_project.project.description %>
<%= b_project.created_at%><%= b_project.created_at %>
diff --git a/app/views/projects/course.html.erb b/app/views/projects/course.html.erb index 8c1212c46..d7235aa3f 100644 --- a/app/views/projects/course.html.erb +++ b/app/views/projects/course.html.erb @@ -25,7 +25,7 @@ - <%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'course', :project_type => 1 %> + <%= link_to "forge.trustie.net/project/course", :controller => 'projects', :action => 'course', :project_type => 1 %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course', :project_type => 1 %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 99f9a5c31..5d142c4f4 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -263,6 +263,7 @@