From 278cb57ab9d37fc8b6868a187952ce734a04766c Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Mon, 23 Sep 2013 13:35:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/boards_controller.rb | 4 +- app/controllers/documents_controller.rb | 2 +- app/controllers/files_controller.rb | 4 +- app/controllers/news_controller.rb | 4 +- app/views/bids/_bid_homework_show.html.erb | 82 +++++------ app/views/bids/_bid_show.html.erb | 157 ++++++++++----------- app/views/bids/_homework.html.erb | 3 +- app/views/layouts/base_courses.html.erb | 2 +- app/views/users/_my_course.html.erb | 10 +- app/views/users/_my_homework.html.erb | 23 ++- app/views/users/watch_bids.html.erb | 13 +- config/locales/zh.yml | 19 ++- config/routes.rb | 2 +- public/stylesheets/application.css | 6 +- 14 files changed, 164 insertions(+), 167 deletions(-) diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index a1a2575ad..81192c597 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -34,8 +34,10 @@ class BoardsController < ApplicationController @board = @boards.first show end - if @project.project_type + if @project.project_type == 1 render :layout => 'base_courses' + else + render :layout => false if request.xhr? end end diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb index bb711cf88..67c057eef 100644 --- a/app/controllers/documents_controller.rb +++ b/app/controllers/documents_controller.rb @@ -40,7 +40,7 @@ class DocumentsController < ApplicationController @grouped = documents.group_by(&:category) end @document = @project.documents.build - if @project.project_type + if @project.project_type == 1 render :layout => 'base_courses' else render :layout => false if request.xhr? diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index f47d4797f..1048c12bd 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -34,8 +34,8 @@ class FilesController < ApplicationController @containers = [ Project.includes(:attachments).reorder(sort_clause).find(@project.id)] @containers += @project.versions.includes(:attachments).reorder(sort_clause).all.sort.reverse - @course_tag = @project.project_type - if @course_tag + + if @project.project_type == 1 render :layout => 'base_courses' else render :layout => !request.xhr? diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index dffa3f5f8..bf02dabce 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -52,8 +52,8 @@ class NewsController < ApplicationController format.html { @news = News.new # for adding news inline # huang - @course_tag = @project.project_type - if @course_tag + + if @project.project_type == 1 render :layout => 'base_courses' else render :layout => false if request.xhr? diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index 72a88cb32..cea2165d4 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -1,54 +1,46 @@ - - <% bids.each do |bid|%> + +<% bids.each do |bid|%> - - - - - - -
<%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %> - - - - - - +
<%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>:  <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
- - + + + - + + + + + +
- <% if bid.reward_type.nil? or bid.reward_type == 1 %> - <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= bid.budget%> - <% elsif bid.reward_type == 2 %> - <%= l(:label_bids_reward_method) %><%= bid.budget%> - <% else %> - - <% end %> - - -
<%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %> + + + + + + - - - - - -
<%= link_to(bid.author.lastname+bid.author.firstname, user_path(bid.author), :class => 'bid_user') %>:  <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
+ + + - + +
<% if bid.reward_type.nil? or bid.reward_type == 1 %> <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %> + <%= bid.budget%> <% elsif bid.reward_type == 2 %> <%= l(:label_bids_reward_method) %><%= bid.budget%> <% else %> + + <% end %>
- <%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<%=link_to bid.biding_projects.count, project_for_bid_path(bid) %>) - <%= l(:label_x_responses, :count => bid.commit) %>(<%=link_to bid.commit, respond_path(bid) %>) -
<%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %>)<%= l(:label_x_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>)
<%= format_time bid.created_on %>
-
- - - - -
<%= bid.description%>
-
<%= format_time bid.created_on %>
+
+ + + + +
<%= bid.description%>
+
<% end %> +
    + <%= pagination_links_full bid_pages %> +
      + diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb index 0473fecf4..050a17753 100644 --- a/app/views/bids/_bid_show.html.erb +++ b/app/views/bids/_bid_show.html.erb @@ -2,46 +2,87 @@ <% bids.each do |bid|%> + + + + +
      <%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %> + + + + + + + + + + + +
      <%= link_to(bid.author, user_path(bid.author), :class => 'bid_user') %>:  <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
      + + + + + + + +
      <% if bid.reward_type.nil? or bid.reward_type == 1%> <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= bid.budget%> <% elsif bid.reward_type == 2%> <%= l(:label_bids_reward_method) %><%= bid.budget%> <% else %> <% end %>
      <%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid) %>) + <%= l(:label_x_bids_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>)<%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%= link_to bid.watcher_users.count, respond_path(bid) %>)
      		 <%= format_time bid.created_on %>
      +
      + + + + +
      <%= bid.description%>
      +
      +<% end %> + + + + - <% end %> - - -
- <%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<%=link_to bid.biding_projects.count, project_for_bid_path(bid) %>) - <%= l(:label_x_responses, :count => bid.commit) %>(<%=link_to bid.commit, respond_path(bid) %>) - <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%=link_to bid.watcher_users.count, respond_path(bid) %>) -
- <%= format_time bid.created_on %> + +<% if bid.reward_type.nil? or bid.reward_type == 1%> +<%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= bid.budget%><%= l(:label_RMB_sign) %> +<% elsif bid.reward_type == 2%> +<%= l(:label_bids_reward_method) %><%= bid.budget%> +<% else %> +<%= l(:label_bids_reward_method) %>学分 <%= bid.budget%>分 +<% end %> - -
- + + + +
<%= bid.description%>
+ + - + -
<%= bid.description%> <%= l(:label_bid_project) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid),:class=> "bids_user" %>)
-
+ +<%= l(:label_responses) %>(<%= link_to bid.commit, respond_path(bid),:class=> "bids_user" %>) + + +<%= l(:label_followers) %>(<%= link_to bid.watcher_users.count, respond_path(bid),:class=> "bids_user" %>) + + +<%= l(:field_deadline) %><%= format_time bid.created_on %> @@ -51,56 +92,4 @@