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,98 +2,35 @@ <% 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 %> - - -
      <%= 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_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) %>) -
      <%= 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 %> - - - - + + + + diff --git a/app/views/bids/_homework.html.erb b/app/views/bids/_homework.html.erb index 5dae9e940..3d6ded4fc 100644 --- a/app/views/bids/_homework.html.erb +++ b/app/views/bids/_homework.html.erb @@ -9,8 +9,9 @@ <% end %> <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ?', 5, 7)).size >0) %> +
      - <%= toggle_link l(:button_bidding), 'put-bid-form' %> + <%= toggle_link l(:button_bidding_homework), 'put-bid-form' %>
      <% elsif @homework_list.empty? %>
      暂无学生提交作业！
      diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 18bd3af7e..475bcb89b 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -145,7 +145,7 @@
        -
      • <%= link_to l(:label_overview), project_path(@project), :class => link_class(:overview)%>
        • +
      • <%= link_to l(:label_course_overview), project_path(@project), :class => link_class(:overview)%>
      • <%= link_to l(:label_homework), {:controller => 'projects', :action => 'homework'}, :class => link_class('Homework')%>
      • <%= link_to l(:label_course_file), project_files_path(@project), :class => link_class(:files)%>
      • <%= link_to l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project}, :class => link_class(:news)%>
        • diff --git a/app/views/users/_my_course.html.erb b/app/views/users/_my_course.html.erb index 4f9554e42..448affdf5 100644 --- a/app/views/users/_my_course.html.erb +++ b/app/views/users/_my_course.html.erb @@ -9,9 +9,11 @@
      		- +
      <%= link_to_project(membership.project) %><%= l(:label_homework) %> (<%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %>) + <%= link_to_project(membership.project) %> + <%= l(:label_homework) %> (<%= link_to (membership.project.homeworks.count), {:controller => 'projects', :action => 'homework', :id => membership.project.identifier} %>) +     <%= l(:label_course_news)%> (<%= link_to (membership.project.news.count), {:controller => 'news', :action => 'index', :project_id => membership.project.identifier} %>) - <%= l(:label_member)%>(<%= link_to (membership.project.members.count) %>)
      @@ -43,11 +45,11 @@ <% else %> <% if @user != User.current %>

      - <%= l(:label_project_un) %> + <%= l(:label_project_course_un) %>

      <% else %>

      - <%= l(:label_project_unadd) %><%= link_to"#{l(:label_new)}",:controller=>'projects',:action=>'new'%> + <%= l(:label_project_course_unadd) %><%= link_to"#{l(:label_new)}",:controller=>'projects',:action=>'new'%>

      <% end %> diff --git a/app/views/users/_my_homework.html.erb b/app/views/users/_my_homework.html.erb index d78c5dc0c..4c4bd2138 100644 --- a/app/views/users/_my_homework.html.erb +++ b/app/views/users/_my_homework.html.erb @@ -6,35 +6,30 @@ <% for bid in bids[1]%> - +
      - +
      <%= link_to image_tag(url_to_avatar(bid.author), :class => 'avatar'),user_path(bid.author), :class => "avatar" %><%= 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') %><%= 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_biding_project) %>(<%=link_to bid.biding_projects.count, project_for_bid_path(bid) %>) - <%= l(:label_responses) %>(<%=link_to bid.commit, respond_path(bid) %>) - <%= l(:label_followers) %>(<%=link_to bid.watcher_users.count, 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 %> <%= format_time bid.created_on %>
      - +
      diff --git a/app/views/users/watch_bids.html.erb b/app/views/users/watch_bids.html.erb index 17b8dd0ab..60ff3a695 100644 --- a/app/views/users/watch_bids.html.erb +++ b/app/views/users/watch_bids.html.erb @@ -18,19 +18,24 @@
      <%= bid.description%>
      diff --git a/config/locales/zh.yml b/config/locales/zh.yml index e4dd8d83f..c7171cab3 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -591,7 +591,8 @@ zh: label_news_view_all: 查看所有新闻 label_news_added: 新闻已添加 label_settings: 配置 - label_overview: 课程动态 + label_overview: 项目动态 + label_course_overview: "课程动态" label_question_student: 学生反馈 #huang label_homework_commit: 提交作业 #huang label_homework_info: 作业情况 #huang @@ -824,8 +825,8 @@ zh: label_project_newadd: "添加了" label_project_unadd: "暂无项目，赶快去创建吧！" label_project_un: "该用户暂未参与任何项目！" - - + label_project_course_un: "该用户暂未加入任何课程！" + label_project_course_unadd: "你还未创建课程，赶快去创建吧！" #end by huang label_user_mail_option_selected: "收取选中项目的所有通知..." label_user_mail_option_none: "不收取任何通知" @@ -1267,6 +1268,7 @@ zh: label_bidding_project: 参与项目 label_homework_project: 已提交作业 #huang button_bidding: 我要参加 + button_bidding_homework: 提交作业 #huang field_homework_type: 作业类型 label_homework_respond: 作业情况 @@ -1283,9 +1285,9 @@ zh: label_requirement_list: 需求列表 label_x_biding_project: #modify by men - zero: 项目 - one: 项目 - other: 项目 + zero: 应标项目 + one: 应标项目 + other: 应标项目 #end label_x_homework_project: #modify by huang zero: 已提交的作业 @@ -1302,6 +1304,11 @@ zh: one: 学生提问 other: 学生提问 #end + label_x_bids_responses: #modify by huang + zero: 用户反馈 + one: 用户反馈 + other: 用户反馈 + #end label_x_followers: #modify by men zero: 关注 one: 关注 diff --git a/config/routes.rb b/config/routes.rb index f3c5c6701..b0c06bd77 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -435,7 +435,7 @@ RedmineApp::Application.routes.draw do get 'calls/back', :to=> 'bids#back' match 'calls/new_bid', :controller => 'bids', :action => 'new_bid' match 'calls/:id/show_project', :controller => 'bids', :action => 'show_project', :as => 'project_for_bid' - match 'calls/:id/show_project_homework', :controller => 'bids', :action => 'show_project_homework', :as => 'project_for_bid' # by huang + match 'calls/:id/show_project_homework', :controller => 'bids', :action => 'show_project_homework', :as => 'project_for_bid_homework' # by huang match 'calls/:id/add', :controller => 'bids', :action => 'add' match 'calls/:id/add_homework', :controller => 'bids', :action => 'add_homework' match 'words/add_project_respond', :controller => 'words', :action => 'add_project_respond' diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index aa92bb6bc..cd2bc48f6 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -238,7 +238,7 @@ ul.tool li{list-style-type:none; /*font-family:微软雅黑;*/ color:#919294; font-size:13px; - padding-left: 0px; + padding-left: 12px; padding-right: 8px; line-height: 1.5em; } @@ -445,6 +445,10 @@ a.htags{ padding: 0px 4px 0px 4px; margin:0 3px; } +a.logical_int{ + color: #ed8924; +} + .contextdescription2{font-family: '微软雅黑'; font-size:12px; font-weight:ligher;
      <% 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%> + <%= 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%> + <%= l(:label_bids_reward_method) %><%= bid.budget%> <% else %> - <%= l(:label_bids_reward_method) %><%= l(:label_bids_credit) %> <%= bid.budget%> <%= l(:label_bids_credit_number) %> + <%= l(:label_bids_reward_method) %><%= l(:label_bids_credit) %> <%= bid.budget%> <%= l(:label_bids_credit_number) %> <% end %>
      - <%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<%=link_to bid.biding_projects.count, project_for_bid_path(bid) %>) + <% if bid.reward_type == 3 %> + <%= 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) %>) + <% else %> + <%= 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) %>) + <% end %> <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%=link_to bid.watcher_users.count, respond_path(bid) %>)