Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/homework_attach_controller.rb

@@ -1,4 +1,90 @@
 class HomeworkAttachController < ApplicationController
+  ###############################
+  def index
+    @homeworks = HomeworkAttach.all
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @homeworks }
+    end
+  end
+
+  def add_users users
+    if users != nil && users.count > 0
+      users.each do |user|
+         @homework.homework_users.build(:user_id => user.id)
+         @homework.save
+      end
+    end
+  end
+
+  def create
+    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 = ? or id =?',5, 10, 7)).size >0)
+      user_id = params[:user_id]
+      bid_id = params[:bid_id]
+      sta = 0
+      name = params[:new_form][:name]
+      description = params[:new_form][:description]
+      options = {
+          :user_id => user_id,
+          :state => sta,
+          :name => name,
+          :description => description,
+          :bid_id => bid_id
+      }
+
+      @homework = HomeworkAttach.new(options)
+      @homework.save_attachments(params[:attachments])
+      render_attachment_warning_if_needed(@homework)
+
+      @homework.save
+      respond_to do |format|
+        if @homework.save
+          format.html { redirect_to @homework, notice: 'Post was successfully created.' }
+          format.json { render json: @homework, status: :created, location: @homework }
+        else
+          format.html { render action: "new" }
+          format.json { render json: @homework.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+  end
+
+  def new
+    @homework = HomeworkAttach.new
+    @bid = Bid.find(params[:id])
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @homework }
+    end
+  end
+
+  def edit
+    @homework = HomeworkAttach.find(params[:id])
+  end
+
+  def update
+    @homework = HomeworkAttach.find(params[:id])
+    respond_to do |format|
+      if @post.update_attributes(params[:homework])
+        format.html { redirect_to @homework, notice: 'Homework was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @homework.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  def destroy
+    @homework = HomeworkAttach.find(params([:id]))
+    @homework.destroy
+    respond_to do |format|
+      format.html {render @homework}
+      format.json {render json: @homework}
+    end
+  end
+
   #显示作业信息
   def show
     @homework = HomeworkAttach.find(params[:id])
@@ -24,7 +110,7 @@ class HomeworkAttachController < ApplicationController
   end
 
   #删除留言
-  def destroy
+  def destroy_jour
     @journal_destroyed = JournalsForMessage.delete_message(params[:object_id])
     #@homework = HomeworkAttach.find(params[:id])
     #@jours = @homework.journals_for_messages.order("created_on DESC")

app/helpers/application_helper.rb

@@ -28,7 +28,6 @@ module ApplicationHelper
   include AvatarHelper
   ## added by william
   include PraiseTreadHelper
-  # add by nyan
   include CoursesHelper
 
   extend Forwardable
@@ -1330,7 +1329,7 @@ module ApplicationHelper
 
   def hubspot_head
     tags = javascript_include_tag('hubspot/messenger.min', 'hubspot/messenger-theme-future')
-    tags << stylesheet_link_tag('hubspot/messenger', 'hubspot/messenger-theme-future')
+    tags << stylesheet_link_tag('hubspot/messenger', 'hubspot/messenger-theme-future', 'hubspot/messenger-theme-flat')
     unless User.current.pref.warn_on_leaving_unsaved == '0'
       tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
     end

app/helpers/courses_helper.rb

@@ -136,4 +136,15 @@ module CoursesHelper
   def find_by_extra_from_project extra
     Course.find_by_extra(try(extra))
   end
+  #判断制定用户是不是当前课程的老师
+  def is_course_teacher user,project
+    is_teacher = false
+    searchTeacherAndAssistant(project).each do |teacher|
+      if user == teacher
+        is_teacher = true
+        break
+      end
+    end
+    is_teacher
+  end
 end

app/models/homework_user.rb

@@ -2,5 +2,5 @@ class HomeworkUser < ActiveRecord::Base
   attr_accessible :homework_attach_id, :user_id
 
   belongs_to :homework_attach
-  has_one :user
+  belongs_to :user
 end

app/models/project.rb

@@ -122,7 +122,8 @@ class Project < ActiveRecord::Base
 
   after_save :update_position_under_parent, :if => Proc.new {|project| project.name_changed?}
   after_save :update_inherited_members, :if => Proc.new {|project| project.inherit_members_changed?}
-  after_save :create_board_sync #nyan
+  # 创建project之后默认创建一个board，之后的board去掉了board的概念
+  after_save :create_board_sync
   before_destroy :delete_all_members
   def remove_references_before_destroy
     return if self.id.nil?

app/models/user.rb

@@ -73,7 +73,7 @@ class User < Principal
     ['none', :label_user_mail_option_none]
   ]
 
-  has_one :homework_user
+  belongs_to :homework_user
 
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
                                    :after_remove => Proc.new {|user, group| group.user_removed(user)}

app/views/applied_project/_set_applied.js.erb

@@ -1,4 +1,13 @@
 <% selector = ".#{applied_css(@project)}" %>
 $("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript applied_link(@project, User.current) %>")});
-
-
+if (window.Messenger) {
+  Messenger.options = {
+      extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right',
+      theme: 'flat'
+  }
+  Messenger().post({
+    id: "label_apply_project_waiting",
+    message: "<%= l(:label_apply_project_waiting) %>",
+    showCloseButton: true,
+  });
+};

app/views/bids/_homework_list.html.erb

@@ -1,23 +1,27 @@
 <!-- fq -->
+<% is_teacher = is_course_teacher User.current,@bid.courses.first.project %>
 <%= form_tag(:controller => 'bids', :action => "show_project", :method => :get) do %>
 <div class="project-search-block">
 	<table width="100%" valign="center">
 		<tr>
-			<td ><span style="margin-left:0px"><%= l(:label_task_plural)%>(<%= @homework_list.count%>)</span></td>
+			<td ><span style="margin-left:0px"><%= l(:label_task_plural)%>(<%= @homework_list.count%>)</span>
+        <%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), remote: false, class: "button_submit button_submit_font_white", style: "margin: 5px 10px;line-height: 20px;height: 20px;display: inline-block;" if(
+          User.current.admin? || 
+          !(User.current.roles_for_project(@bid.courses.first).map(&:id) & ([7,9])).empty? ) || 
+          (Rails.env.development?) %>
+      </td>
             <td align="right">
 			<div class="project-search">
-				<%= text_field_tag 'student_id', params[:student_id], :size => 30 %>
-				<%= submit_tag l(:label_search_by_student_id), :class => "small", :name => nil %>	
+                <% if is_teacher %>
+                    <%= text_field_tag 'student_id', params[:student_id], :size => 30 %>
+                    <%= submit_tag l(:label_search_by_student_id), :class => "small", :name => nil %>
+                <% end %>
 			</div></td>
 		</tr>
 	</table>
 </div>
 <% end %>
 <% display_id = im_watching_student_id? @bid%>
-<%= link_to "作业打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), remote: false, class: "button_submit button_submit_font_white", style: "margin: 5px 10px;display: inline-block;" if(
-			User.current.admin? || 
-			!(User.current.roles_for_project(@bid.courses.first).map(&:id) & ([7,9])).empty? ) || 
-			(Rails.env.development?) %>
 <% @homework_list.each do |homework|%>
 	<% if homework.attachments.any?%>
 	<table width="660px" border="0" align="center">
@@ -25,16 +29,25 @@
 			<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(homework.user), :class => "avatar")%></td>		
 			<td>
 				<table width="580px" border="0">
-                    <tr>&nbsp;&nbsp;&nbsp;<strong>作业&nbsp;&nbsp; :</strong>&nbsp;
-                      <% filename = "" %>
-                      <% homework.attachments.map do |attachment| %>
-                        <% filename = attachment.filename %>
-                        <% if homework.attachments.count > 1%>
-                             <% filename +=  "等#{homework.attachments.count}个文件"  %>
+                    <tr>
+                      <td style="width: 300px">
+                        &nbsp;&nbsp;<strong>作业&nbsp;&nbsp; :</strong>&nbsp;
+                        <% attachments = homework.attachments.map %>
+                        <% for attachment in attachments %>
+                            <% if attachments.count > 1 && attachment != attachments.first %>
+                                <br/>
+                                <% for item in 1..7 %>
+                                    &nbsp;
+                                <% end %>
+                            <% end %>
+                            <%= link_to_attachment attachment , :download => true -%>
                         <% end %>
-                        <% break %>
-                      <% end %>
-                      <%= link_to filename , homework_attach_path(homework)%>
+                      </td>
+                      <td style="vertical-align: top">
+                        <% if display_id %>
+                            <%= link_to "互评>>" , homework_attach_path(homework)%>
+                        <% end %>
+                      </td>
                     </tr>
 					<tr>
 						<td colspan="1" valign="top" style="width: 300px">&nbsp;
@@ -48,7 +61,7 @@
                               <% sum = sum + star_reates.stars %>
                           <% end %>
                           <% stars_reates_count = stars_reates.count == 0 ? 1 : stars_reates.count %>
-                          <%= sum * 1.0 / stars_reates_count  %>
+                          <%= format("%.2f", sum * 1.0 / stars_reates_count)  %>
                         </td>
 						<td valign="top" align="right">
 							<% if Time.parse(@bid.deadline.to_s) < Time.parse(homework.attachments[0].created_on.to_s) %>
@@ -58,20 +71,20 @@
 					</tr>
 					<tr>
 						<td colspan="2" valign="top">&nbsp;
-						<% if display_id %>
-						<strong><%= l(:label_bidding_user_studentcode) %>&nbsp; ：&nbsp;<%= homework.user.user_extensions.student_id%></strong>
-						<% end %>
+                            <% if display_id %>
+                                <strong><%= l(:label_bidding_user_studentcode) %>&nbsp; ：&nbsp;<%= homework.user.user_extensions.student_id%></strong>
+                            <% end %>
 						</td>
 					</tr>
 					<tr>
 						<td colspan="2" width="580px" >					
-					<% if (User.current == homework.user) || (!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 = ? or id =?',3,7, 9)).size >0) %>
-							<p class="font_description">
-								<% options = {:author => true, :deletable => attach_delete(homework)} %>
-								<%= render :partial => 'attachments/links',
-								:locals => {:attachments => homework.attachments, :options => options} %>
-							</p>
-					<% end %>					
+                        <% if (User.current == homework.user) || (!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 = ? or id =?',3,7, 9)).size >0) %>
+                            <p class="font_description">
+                                <% options = {:author => true, :deletable => attach_delete(homework)} %>
+                                <%= render :partial => 'attachments/links',
+                                :locals => {:attachments => homework.attachments, :options => options} %>
+                            </p>
+                        <% end %>
 						</td>
 					</tr>
 				</table>

app/views/bids/show_project.html.erb

@@ -32,18 +32,16 @@
               <table id="bidding_table" border="0" width="100%" style="margin-left: 40px;">
                 <tr>
                   <td><%= select_tag 'bid', options_for_select(select_option_helper(@option)), :name => 'bid', :class => 'grayline' %></td>
-                  <div id="prompt_create_pro"><!-- nyan -->
+                  <div id="prompt_create_pro">
                     <td>
-                      <p>
 
                       <div class="font_lighter" style="font-size: 13px;">
                         <%= link_to '创建项目', new_project_path(course: 0, project_type: 0), :target => '_blank' %>
                       </div>
-                      </p>
                     </td>
                   </div>
                 </tr>
-                <% if @bid.reward_type == 3 %>
+                <% if @bid.reward_type == Bid::Homework %>
                     <tr>
                       <td><%= f.text_area :bid_message, :id => "bid_message", :required => true, :rows => 4, :cols => 40, :placeholder => l(:label_bid_reason_homework), :style => "resize: none;", :class => 'noline' %></td>
                     </tr>

app/views/homework_attach/_app_link.html.erb

@@ -0,0 +1,12 @@
+<!-- #wang -->
+<% for attachment in attachments %>
+    <% if attachments.count > 1 && attachment != attachments.first%>
+        <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <% end %>
+    <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+    <% if attachment.is_text? %>
+        <%= link_to image_tag('magnifier.png'),
+                :controller => 'attachments', :action => 'show',
+                :id => attachment, :filename => attachment.filename %>
+    <% end %>
+  <% end -%>

app/views/homework_attach/_journal_reply_items.html.erb

@@ -19,8 +19,8 @@
                          %>
               <% end %>
               <% if @user == User.current || User.current.admin? || reply.user.id == User.current.id %>
-                 <%= link_to(l(:label_newfeedback_delete), {:controller => 'homework_attach', :action => 'destroy', :object_id => reply, :user_id => reply.user},
-                 :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
+                 <%= link_to(l(:label_newfeedback_delete), {:controller => 'homework_attach', :action => 'destroy_jour', :object_id => reply, :user_id => reply.user},
+                 :remote => true, :confirm => l(:text_are_you_sure), :title => l(:button_delete))  %>
               <% end %>
 	    	</span>
 	    </p>

app/views/homework_attach/_showjour.html.erb

@@ -54,8 +54,8 @@
                             {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.name}: '); $('##{ids} textarea') ;return false;"}
                 %>
                 <% if journal.user==User.current|| User.current.admin? %>
-                    <%= link_to(l(:label_bid_respond_delete), {:controller => 'homework_attach', :action => 'destroy', :object_id => journal, :user_id => journal.user},
-                                :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
+                    <%= link_to(l(:label_bid_respond_delete), {:controller => 'homework_attach', :action => 'destroy_jour', :object_id => journal, :user_id => journal.user},
+                                :remote => true, :confirm => l(:text_are_you_sure),  :title => l(:button_delete))  %>
                 <% end %>
                 </span>
             </span>

app/views/homework_attach/new.html.erb

@@ -0,0 +1,33 @@
+<p style="font-weight: bold; color: rgb(237,137,36)" xmlns="http://www.w3.org/1999/html"> <%=raw l(:label_new_homework)%> </p>
+<div class="box tabular">
+  <%= form_for('new_form', :remote => true, :method => :post,
+       :url => {:controller => 'homework_attach',
+                :action => 'create',
+                :user_id => User.current.id,
+                :bid_id => @bid
+       }) do |f|%>
+      <p>
+        <strong>标题：</strong>
+        <%= f.text_field "name", :required => true, :size => 60, :style => "width:490px;" %>
+      </p>
+      <p>
+        <strong  style="vertical-align: top">描述：</strong>
+        <span style="margin-left:-10px;padding-right: 20px;">
+          <%= f.text_area "description", :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>
+        </span>
+      </p>
+      <fieldset>
+        <legend>
+          <%= l(:label_attachment_plural) %>
+        </legend>
+        <p id="put-bid-form-partial">
+          <%= render :partial => 'attachments/form' %>
+        </p>
+      </fieldset>
+        <span style="padding-left: 60px">
+          <%= submit_tag t(:label_new), :sta => 0, :class => "enterprise"%>
+          <%= submit_tag t(:label_memo_create), :sta => 1, :class => "enterprise"%>
+        </span>
+      </p>
+  <% end %>
+</div>

app/views/homework_attach/show.html.erb

@@ -18,7 +18,9 @@
           <td colspan="2" valign="top"><strong>作业基础信息<%=@count %></strong></td>
         </tr>
         <tr>
-          <td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">发布人员：<%= link_to @homework.user, user_path(@homework.user)%></td>
+          <td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">
+            发布人员：<%= link_to @homework.user, user_path(@homework.user)%>
+          </td>
           <td>发布时间：<%=format_time @homework.created_at %></td>
 
         </tr>
@@ -26,9 +28,11 @@
           <td style="padding-left: 40px">
             <span>作业下载：</span>
             <% options = {:author => true } %>
-            <%= render :partial => 'attachments/app_link', :locals => {:attachments => @homework.attachments, :options => options} %>
+            <%= render :partial => 'app_link', :locals => {:attachments => @homework.attachments, :options => options} %>
+          </td>
+          <td style="width: 240px; word-wrap: break-word; word-break: break-all">
+            所属任务：<%= link_to(@homework.bid.name, project_for_bid_path(@homework.bid))%>
           </td>
-          <td style="width: 240px; word-wrap: break-word; word-break: break-all">所属任务：<%= link_to(@homework.bid.name, project_for_bid_path(@homework.bid))%></td>
 
         </tr>
         <tr>
@@ -49,7 +53,7 @@
     <td>
       <table width="100%" border="0">
         <tr>
-          <td colspan="2" valign="top"><strong><div style="font-size: 15px;">作业描述：</div></strong></td>
+          <td colspan="2" valign="top"><div style="font-size: 15px;"><strong>作业描述：</strong></div></td>
         </tr>
         <% @homework.attachments.map do |attachment| %>
             <% if attachment.description != nil && attachment.description != "" %>
@@ -67,16 +71,20 @@
 <div class="underline-contests_one"></div>
 
 <div style="height: auto; padding-bottom: 10px">
-  <div style="font-size: 15px;"><strong>作业得分：</strong></div>
+  <div style="font-size: 15px;">
+    <strong>作业得分：</strong>
+  </div>
   <div style="overflow: hidden">
     <div style="margin-left: 15%; float: left">
       <div style="padding-left: 45px; padding-bottom: 5px">得分比例</div>
       <div>
         <% 100.step(20,-20) do |star|  %>
-            <div data-kls="Softapplication" data-id="2" data-dimension="quality" data-average="3.25" class="rateable div_inline jDisabled" style="height: 20px; width: 115px; overflow: hidden; z-index: 1; position: relative;">
+            <div data-kls="HomeworkAttach" data-id="2" data-dimension="quality" data-average="3.25" class="rateable div_inline jDisabled"
+                 style="height: 20px; width: 115px; overflow: hidden; z-index: 1; position: relative;">
               <div class="jRatingColor" style="width: <%=star%>%;"></div>
               <div class="jRatingAverage" style="width: 0px; top: -20px;"></div>
-              <div class="jStar" style="width: 115px; height: 20px; top: -40px; background: url('/images/seems_rateable/stars.png') repeat-x scroll 0% 0% transparent;">
+              <div class="jStar" style="width: 115px; height: 20px; top: -40px;
+                        background: url('/images/seems_rateable/stars.png') repeat-x scroll 0% 0% transparent;">
               </div>
             </div>
             <%= @stars_status_map["star#{(star/20).to_s}".to_sym] %>
@@ -85,7 +93,11 @@
       </div>
     </div>
     <div style="float: left; padding-left: 100px; padding-top:35px ">
-      <div style="padding-left: 25px;">最终得分</div>
+      <div style="text-align: center">最终得分</div>
+      <div style="padding-top: 1px; font-size: 15px; color: blue;text-align: center">
+        <%= @homework.average(:quality).try(:avg).try(:round, 2).to_s %>
+        分
+      </div>
       <div style="padding-top: 3px">
         <%= rating_for @homework, :static => true, dimension: :quality, class: 'rateable div_inline' %>
       </div>
@@ -102,6 +114,18 @@
 </div>
 <div class="underline-contests_one"></div>
 
+<!--
+<div style="height: auto; padding-bottom: 10px">
+  <div style="font-size: 15px">
+    <strong>作业综评：</strong>
+  </div>
+  <div style="text-align: center;">评分:
+    <%= rating_for @homework, :static => true, dimension: :quality, class: 'rateable div_inline' %>
+  </div>
+</div>
+<div class="underline-contests_one"></div>
+-->
+
 <div style="height: 50px">
   <div style="font-size: 15px"><strong>作业评论：</strong></div>
   <div style="text-align: center;">评分:
@@ -121,5 +145,4 @@
   <%= render :partial => 'showjour', :locals => {:jour => @jours} %>
 </div>
 <div>
-<%#= link_to '返回竞赛页面', show_softapplication_contest_path(@softapplication.contest) %>
 </div>

app/views/issues/_attributes.html.erb

@@ -2,7 +2,7 @@
 
 <fieldset class="collapsible collapsed" style="padding-left: 50px;">
 	<legend  onclick="toggleFieldset(this);" style="font-size:12px;"><strong><%= l(:label_change_properties) %></strong></legend>
-<div class="splitcontent" style="display: block;"> <!-- nyan -->
+<div class="splitcontent" style="display: block;">
 <div class="splitcontentleft">
 <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %>
 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), {:required => true},

app/views/layouts/base_projects.html.erb

@@ -12,6 +12,7 @@
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_heads %>
 		<%= heads_for_theme %>
+		<%= hubspot_head %>
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
 		<%= yield :header_tags -%>

app/views/members/create.js.erb

@@ -2,12 +2,12 @@ $('#tab-content-members').html('<%= escape_javascript(render :partial => 'projec
 hideOnLoad();
 
 <%if !@applied_members%>
-<% if @members.present? && @members.all? {|m| m.valid? } %>
-  <% @members.each do |member| %>
-    $("#member-<%= member.id %>").effect("highlight");
+  <% if @members.present? && @members.all? {|m| m.valid? } %>
+    <% @members.each do |member| %>
+      $("#member-<%= member.id %>").effect("highlight");
+    <% end %>
+  <% else %>
+    <% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') %>
+    alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => errors))) %>');
   <% end %>
-<% else %>
-  <% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ') %>
-  alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => errors))) %>');
 <% end %>
-<%end%>

app/views/projects/_project.html.erb

@@ -41,9 +41,10 @@
 	</p>
 </div>
 
-<div class="information"><!-- nyan -->
+<div class="information">
 	<!-- p class="stats">
-		<%= content_tag('span',  @project.watcher_users.count, :class => "info") %><%= content_tag('span',  l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
+		<%#= content_tag('span',  @project.watcher_users.count, :class => "info") %>
+		<%#= content_tag('span',  l(:label_x_follow_people,:count =>@project.watcher_users.count)) %>
 	</p -->
 	<p class="stats">
 		<%= content_tag('span',  link_to("#{@project.homeworks.count}", homework_project_path(@project)), :class => "info") %><%= content_tag('span',  l(:label_x_task, :count => @project.homeworks.count)) %>

config/locales/en.yml

@@ -1168,6 +1168,7 @@ en:
   label_tags_issue_description: issue description
   label_tags_all_objects: all objects
   label_apply_project: Apply Project
+  label_apply_project_waiting: "Application has been submitted, please wait for administrator review."
   label_unapply_project: Unsubscribe
   
   #fq

config/locales/zh.yml

@@ -483,7 +483,7 @@ zh:
   label_project_latest: 最近的项目
   label_issue: 问题
   label_issue_new: 新建问题
-  label_issue_plural: 缺陷 #问题 #nyan
+  label_issue_plural: 缺陷
   label_issue_view_all: 查看所有问题
   label_issues_by: "按 %{value} 分组显示问题"
   label_issue_added: 问题已添加
@@ -583,6 +583,10 @@ zh:
   label_course_done: 已结束的课程
   label_homework_response: 作业咨询
   label_bidding_homework: 提交作业
+  label_add_homework: 添加作业
+  label_edit_homework: 修改作业
+  label_delete_homework: 删除作业
+  label_new_homework: 创建作业
   
   #end
   label_my_page: 我的工作台
@@ -757,7 +761,7 @@ zh:
   label_sort_higher: 上移
   label_sort_lower: 下移
   label_sort_lowest: 置底
-  label_roadmap: 里程碑 #版本路线图 #nyan
+  label_roadmap: 里程碑 #版本路线图
   label_roadmap_due_in: "截止日期到  %{value}"
   label_roadmap_overdue: "%{value} 延期"
   label_roadmap_no_issues: 该版本没有问题
@@ -965,6 +969,7 @@ zh:
   button_edit_associated_wikipage: "编辑相关wiki页面: %{page_title}"
   button_add: 新增
   button_change: 修改
+  button_ok_and_submit: 确定并提交
 
   button_apply: 查询
   button_clear: 清除留言
@@ -1260,9 +1265,9 @@ zh:
   setting_default_projects_tracker_ids: Default trackers for new projects
   label_total_time: 合计
   label_create_time: 创建时间                     #Customer added！Added by nie
-  label_comment_time: 留言时间 #nyan
-  label_activity_time: 发布时间 #nyan
-  label_update_time: 更新时间 #nyan
+  label_comment_time: 留言时间
+  label_activity_time: 发布时间
+  label_update_time: 更新时间
   label_current_contributors: 位当前贡献者
   label_commit_limit: 作业提交时间已过！
   label_commit_ar: 作业提交截止时间快到了！
@@ -1330,6 +1335,7 @@ zh:
   label_tags_issue_description: 问题描述
   label_tags_all_objects: 所有
   label_apply_project: 申请加入
+  label_apply_project_waiting: 已处理申请，请等待管理员审核
   label_unapply_project: 取消申请
  
   #fq

config/routes.rb

@@ -29,6 +29,7 @@ RedmineApp::Application.routes.draw do
     collection do
       match 'addjours', via: [:get, :post]
       match 'add_jour_reply', via: [:get,:post]
+      match 'destroy_jour', via: [:get,:post]
     end
   end
   resources :open_source_projects do
@@ -568,7 +569,7 @@ RedmineApp::Application.routes.draw do
   match 'calls/new_bid', :controller => 'bids', :action => 'new_bid'
   match 'contest/new_contest', :controller => 'bids', :action => 'new_contest' #huang
   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_homework' # by huang
+  match 'calls/:id/new_homework', :controller => 'homework_attach', :action => 'new', :as => 'new_homework_attach'
   match 'calls/:id/add', :controller => 'bids', :action => 'add'
   match 'calls/:id/delete', :controller => 'bids', :action => 'delete'
   match 'calls/:id/add_homework', :controller => 'bids', :action => 'add_homework', via: :post