Merge branch 'szzh' into develop

app/controllers/attachments_controller.rb

@@ -195,6 +195,8 @@ class AttachmentsController < ApplicationController
         end
       elsif !@attachment.container.nil? && @attachment.container.is_a?(Softapplication)
         format.html { redirect_to_referer_or softapplications_path(@attachment.container) }
+      elsif !@attachment.container.nil? && @attachment.container.is_a?(Bid)
+        format.html { redirect_to_referer_or respond_path(@attachment.container) }
       else
          if @project.nil?
            format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum, @attachment.container) }

app/controllers/bids_controller.rb

@@ -496,11 +496,18 @@ class BidsController < ApplicationController
         #@homework_list = @bid.homeworks
         #增加作业按评分排序，
         #@homework_list = @bid.homeworks.eager_load(:rate_averages, :user, :attachments).order('seems_rateable_cached_ratings.avg DESC').order("#{HomeworkAttach.table_name}.created_at ASC")
-         @homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
+         all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT homework_attaches.*,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{@bid.author_id}) AS t_score,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id <> #{@bid.author_id}) AS s_score
             FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY
             (CASE WHEN t_score IS NULL THEN 0 ELSE t_score * #{teacher_proportion} END + CASE WHEN s_score IS NULL THEN 0 ELSE s_score * #{1 - teacher_proportion} END) DESC,created_at ASC")
+
+        limit =  10
+        feedback_count = all_homework_list.count
+        @feedback_pages = Paginator.new feedback_count, limit, params['page']
+        offset ||= @feedback_pages.offset
+        @homework_list = all_homework_list[offset, limit]
+
         if params[:student_id].present?
           @temp = []
           @homework_list.each do |pro|
@@ -832,15 +839,25 @@ class BidsController < ApplicationController
       }
        end
     else
-      render 403
+      render_403
     end
   end
   
   def update
     @bid = Bid.find(params[:id])
     @course = @bid.courses.first#Project.find(params[:course_id])
+    @bid.name = params[:bid][:name]
+    @bid.description = params[:bid][:description]
+    @bid.is_evaluation = params[:bid][:is_evaluation]
+    @bid.proportion = params[:bid][:proportion]
+    @bid.reward_type = 3
+    @bid.deadline = params[:bid][:deadline]
+    @bid.budget = 0
+    @bid.author_id = User.current.id
+    @bid.commit = 0
+    @bid.homework_type = 1
     @bid.save_attachments(params[:attachments] || (params[:bid] && params[:bid][:uploads]))
-    if @bid.update_attributes(params[:bid]) && @bid.save
+    if @bid.save
       flash[:notice] = l(:label_update_homework_succeed)
       redirect_to course_homework_path(@course)
     else

app/controllers/contests_controller.rb

@@ -258,7 +258,7 @@ class ContestsController < ApplicationController
     
     contests.each do |contest|
         contest.projects.each do |project|
-           @uers += project.users 
+          @users += project.users
         end
     end
     # end 

app/controllers/courses_controller.rb

@@ -175,7 +175,7 @@ class CoursesController < ApplicationController
     ## 有角色参数的才是课程，没有的就是项目
     @render_file = 'member_list'
     @teachers= searchTeacherAndAssistant(@course)
-    @canShowCode = isCourseTeacher(User.current.id,@course)
+    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
     case params[:role]
       when '1'
         @subPage_title = l :label_teacher_list
@@ -216,10 +216,15 @@ class CoursesController < ApplicationController
   end
 
   def settings
+    if User.current.allowed_to?(:as_teacher,@course)
       @issue_custom_fields = IssueCustomField.sorted.all
       @issue_category ||= IssueCategory.new
       @member ||= @course.members.new
       @trackers = Tracker.sorted.all
+    else
+      render_403
+    end
+
   end
 
   def create
@@ -470,6 +475,7 @@ class CoursesController < ApplicationController
   end
 
   def homework
+    if @course.is_public != 0 || User.current.member_of_course?(@course)
       @offset, @limit = api_offset_and_limit({:limit => 10})
       @bids = @course.homeworks.order('deadline DESC')
       @bids = @bids.like(params[:name]) if params[:name].present?
@@ -487,6 +493,9 @@ class CoursesController < ApplicationController
         @bids = @bids.offset(@offset).limit(limit).all.reverse
       end
       render :layout => 'base_courses'
+    else
+      render_403
+    end
    end
 
   # 新建作业

app/controllers/memos_controller.rb

@@ -148,6 +148,7 @@ class MemosController < ApplicationController
            @memo.update_column(:sticky, params[:memo][:sticky]) &&
            @memo.update_column(:lock, params[:memo][:lock])) 
         @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
+        @memo.save
         # @memo.root.update_attribute(:updated_at, @memo.updated_at)
         format.html {redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}"}
       else

app/helpers/watchers_helper.rb

@@ -97,7 +97,7 @@ module WatchersHelper
     return '' unless user && user.logged?
     # modify by nwb
     # 主讲教师不允许退出课程
-    return '' if user.id == course.tea_id
+    return '' if user.id == course.tea_id || course.is_public == 0
     joined = user.member_of_course?(course)
     text = joined ? l(:label_exit_course) : l(:label_join_course)
     url_t = join_path(:object_id => course.id)

app/helpers/welcome_helper.rb

@@ -137,7 +137,7 @@ module WelcomeHelper
   #获取课程列表
   # add by nwb
   def find_miracle_course(sum=10, max_rate=7, school_id)
-    if User.current.user_extensions.school.nil? and school_id.nil?
+    if User.current.user_extensions.nil? && User.current.user_extensions.school.nil? and school_id.nil?
       Course.active.visible.
           joins(:memberships).
           group('members.course_id').

app/models/softapplication.rb

@@ -1,6 +1,6 @@
 class Softapplication < ActiveRecord::Base
   attr_accessible :android_min_version_available, :app_type_id, :app_type_name, :description, :name, :user_id, :contest_id, :application_developers, :deposit_project_url, :deposit_project
-  acts_as_attachable
+  acts_as_attachable :view_permission => :view_files
   seems_rateable :allow_update => true, :dimensions => :quality
 
 

app/views/attachments/_form.html.erb

@@ -3,14 +3,17 @@
   <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
-      if attachment.id.nil?
+      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
+      <span class="ispublic-label"><%= l(:field_is_public)%>:</span>
+      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+      <%= if attachment.id.nil?
+        #待补充代码
       else
         link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
       end
       %>
       <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
-      <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
+
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
     </span>
   <% end %>

app/views/bids/_homework_form.html.erb

@@ -21,24 +21,25 @@
 </script>
 
 <%= error_messages_for 'bid' %>
-<!--[form:project]-->
 <p><%= l(:label_homeworks_form_new_description) %></p>
-<p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT  %></p>
+<p>
+  <%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;", :maxlength => Bid::NAME_LENGTH_LIMIT, :onblur => "regexName();"  %>
 
-<p 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;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
-<!-- <p><%#= select_tag 'bid_reward_type', "<option value = '0'>#{l(:label_choose_reward)}</option><option value = '1'>#{l(:label_money)}</option><option value = '3'>#{l(:label_bids_credit)}</option><option value = '2'>#{l(:label_reward_1)}</option>".html_safe,
-	:onChange => "show('bid_reward_type', 'bid_budget', '"+l(:label_bids_reward_what)+"','"+l(:label_bids_new_money)+"','"+l(:label_bids_new_credit)+"','"+l(:label_bids_new_content)+"')" %>
-	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
-</p> -->
-<p><%= f.text_field :deadline, :required => true, :size => 60, :style => "width:150px;" %><%= calendar_for('bid_deadline')%>
 </p>
-<!--
-<p><%#= f.select :homework_type, homework_type_option %>
+<p><span id="bid_name_span"></span></p>
+
+<p><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %></p>
+<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;", :onchange => "regexDeadLine();") %>
+  <%= calendar_for('bid_deadline')%>
+  <span id="bid_deadline_span">
+  </span>
 </p>
--->
 <p><%= f.select :is_evaluation, is_evaluation_option %>
-<p><%= hidden_field_tag 'course_id', @project_id %>
+</p>
+<p><%= f.select :proportion, proportion_option %>
+</p>
+<p><%= hidden_field_tag 'course_id', @course.id %>
 </p>
 <fieldset><legend><%= l(:label_attachment_plural) %></legend>
-<div class="tabDiv"><%= render :partial => 'attachments/form', :locals => {:container => @bid} %></div>
+  <p><%= render :partial => 'attachments/form', :locals => {:container => @homework} %></p>
 </fieldset>

app/views/bids/_homework_list.html.erb

@@ -136,7 +136,8 @@
                     <td>
                       <strong>终评得分:&nbsp;
                         <%# totle_homework_score = score_for_homework(homework) %>
-                        <% totle_homework_score = format("%.2f",(homework.t_score.nil? ? 0.00 : homework.t_score) * (@bid.proportion * 1.0 / 100) + (homework.s_score.nil? ? 0.00 : homework.s_score) * (1 - @bid.proportion * 1.0 / 100)) %>
+                        <% totle_homework_score = format("%.2f",(homework.t_score.nil? ? 0.00 : homework.t_score) * ((@bid.proportion.nil? ? 60 : @bid.proportion) * 1.0 / 100) +
+                                (homework.s_score.nil? ? 0.00 : homework.s_score) * (1 - (@bid.proportion.nil? ? 60 : @bid.proportion) * 1.0 / 100)) %>
                         <span style="color:<%= totle_homework_score == "0.00"? "#727272" : "#EC6300"%> ;">
                           <% score = totle_homework_score == "0.00"? "N/A" : totle_homework_score  %>
                           <%= score %>
@@ -153,3 +154,10 @@
 	</table>
 	<div class="line_under"></div>
 <% end %>
+
+<!--分页-->
+<div class="pagination" style="float:left;">
+  <ul>
+    <%= pagination_links_full @feedback_pages %>
+  </ul>
+</div>

app/views/bids/edit.html.erb

@@ -1,9 +1,60 @@
-<h3>修改作业</h3>
+<script type="text/javascript">
+    function regexName()
+    {
+        var name = $("#bid_name").val();
+
+        if(name=="")
+        {
+            $("#bid_name_span").text("名称不能为空");
+            $("#bid_name_span").css('color','#ff0000');
+            return false;
+        }
+        else
+        {
+            $("#bid_name_span").text("填写正确");
+            $("#bid_name_span").css('color','#008000');
+            return true;
+        }
+    }
+    function regexDeadLine()
+    {
+        var deadline = $("#bid_deadline").val();
+        var regex = /^\d{4}-\d{2}-\d{2}$/;
+        if(deadline=="")
+        {
+            $("#bid_deadline_span").text("截止日期不能为空");
+            $("#bid_deadline_span").css('color','#ff0000');
+            return false;
+        }
+        else if(regex.test(deadline))
+        {
+            $("#bid_deadline_span").text("填写正确");
+            $("#bid_deadline_span").css('color','#008000');
+            return true;
+        }
+        else
+        {
+            $("#bid_deadline_span").text("截止日期格式错误");
+            $("#bid_deadline_span").css('color','#ff0000');
+            return false;
+        }
+    }
+
+    function submitHomework(id)
+    {
+        if(regexDeadLine()&&regexName())
+        {
+            $("#edit_bid_" + id).submit();
+        }
+    }
+</script>
+
+<h3><%= l(:label_edit_homework)  %></h3>
 
 <%= labelled_form_for @bid do |f| %>
 <div class="box tabular">
+	<%#= render :partial => 'homework_form', :locals => { :f => f } %>
     <%= render :partial => 'homework_form', :locals => { :f => f } %>
-	<%= submit_tag l(:button_create) %>
-	<%= javascript_tag "$('#bid_name').focus();" %>
+    <input type="button" onclick="submitHomework(<%= @bid.id%>);" value="<%= l(:button_create)%>" class="enterprise">
 	<% end %>
 </div>

app/views/bids/show.html.erb

@@ -1,7 +1,7 @@
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 <div style="margin-left: 20px;">
 	<span class="portrait"><%=  image_tag(url_to_avatar(@bid.author), :class => "avatar")%></span>
-	<span class="body">
+	<span class="body" style="word-break: break-all;word-wrap: break-word;">
 		<h3><%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= link_to(@bid.name,respond_path(@bid)) %></h3>
 		<% if @bid.reward_type.nil? or @bid.reward_type == 1%>
 		<p>
@@ -16,7 +16,7 @@
 		<div class="bid_description">
 			<%= textilizable(@bid, :description) %>
 			<% if @bid.attachments.any?%>
-			<% options = {:author => true} %>
+			<% options = {:author => true,:deletable => (@bid.author.id == User.current.id || User.current.admin? ? true : false)} %>
 			<%= render :partial => 'attachments/links', :locals => {:attachments => @bid.attachments, :options => options} %>
 		<% end %>
 		</div>

app/views/courses/_course_form.html.erb

@@ -40,7 +40,9 @@
                 <td>
                   <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %>
                     <span class="required"> *&nbsp;&nbsp;</span></span>
-                  <span class="info" style="width: 10px;"><%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时", :maxlength => 5 %></span>
+                  <span class="info" style="width: 10px;">
+                    <%= text_field_tag :class_period, @course.class_period, :placeholder => "#{l(:lable_input_class)}", :maxlength => 5 %>
+                  </span>
                   <span>&nbsp;<strong><%= l(:label_class_hour) %></strong></span>
                 </td>
               </tr>
@@ -53,7 +55,10 @@
             <td>
               <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %>
                 <span class="required"> *&nbsp;&nbsp;</span></span>
-              <span class="info" style="width: 10px;"><%= text_field_tag :class_period, nil, :placeholder => "在此输入课时", :maxlength => 5 %></span><strong><%= l(:label_class_hour) %></strong>
+              <span class="info" style="width: 10px;">
+                <%= text_field_tag :class_period, nil, :placeholder => "#{l(:lable_input_class)}", :maxlength => 5 %>
+              </span>
+              <strong><%= l(:label_class_hour) %></strong>
             </td>
           </tr>
         </table>

app/views/courses/_homework_form.html.erb

@@ -34,9 +34,9 @@
 	<%#= f.text_field :budget, :required => true, :size => 60, :style => "width:350px;", :placeholder => l(:label_bids_reward_what) %>
 </p> -->
 <% time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d') %>
-<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}", :onchange => "regexDeadLine();") %><%= calendar_for('bid_deadline')%>
+<p><%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;",:value => "#{time}", :onchange => "regexDeadLine();") %>
+  <%= calendar_for('bid_deadline')%>
   <span id="bid_deadline_span">
-
   </span>
 </p>
 <p><%= f.select :is_evaluation, is_evaluation_option %>

app/views/layouts/base_courses.html.erb

@@ -74,11 +74,10 @@
                 <td align="center">
                   <div id="join_in_course">
                     <% if User.current.logged? %>
-                        <% if @course.teacher.id == User.current.id %>
+                        <% if User.current.allowed_to?(:as_teacher,@course) %>
                             <%= link_to l(:label_course_modify_settings), {:controller => 'courses', :action => 'settings', :id => @course} %>
                             <%= render :partial => 'courses/set_course_time', :locals => {:course => @course} %>
                         <% else %>
-
                             <%= join_in_course(@course, User.current) %>
                         <% end %>
                         <% unless User.current.member_of_course?(@course) %>

app/views/layouts/base_newcontest.html.erb

@@ -179,9 +179,9 @@
 										<div class="user_underline"></div>
 										<div class="font_title_left">
 											<strong><%= l(:label_x_followers, :count => @contest.watcher_users.count) %></strong>
-											<!-- <% if show_more_fans?(@contest) %>
-											   <span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;"><%= link_to l(:label_more), :controller => 'contests', :action => 'show_contest_user'%></span>
-											<% end %> -->
+											 <% if show_more_fans?(@contest) %>
+											   <span style="display:inline-block; font-size: 12px; float:right; margin-bottom: -4px;"><%= link_to l(:label_more), show_contest_user_contest_path(@contest) %></span>
+											<% end %>
 										</div>
 										<div class="left_wf">
 											<table>

app/views/layouts/base_users.html.erb

@@ -62,8 +62,14 @@
                                     </td>
                                 </tr>
                                 <tr>
-									<td style="padding-left: 8px"><%=link_to request.host()+"/users" ,:controller => 'users', :action => 'index' %></td>
-	<!-- modified by bai -->		<td><%=link_to "主页", home_path %> > <%=link_to "软件创客", :controller => 'users', :action => 'index' %> > <span><%=link_to @user.name, user_path %></span></td>
+                                    <td style="padding-left: 8px">
+                                      <%=link_to request.host()+"/users" ,:controller => 'users', :action => 'index' %>
+                                    </td>
+                                    <td>
+                                        <%=link_to "主页", home_path %> >
+                                        <%=link_to "软件创客", :controller => 'users', :action => 'index' %> >
+                                        <span><%=link_to @user.name, user_path %></span>
+                                    </td>
                                 </tr>
                             </table>
 						</div>
@@ -92,7 +98,8 @@
 														<% end %></td>
 													</tr>
 
-													<tr><td class="score">
+													<tr>
+                                                      <td class="score">
                                                           <div id="score_div">
                                                             <%= render :partial => 'users/user_score', :locals => {:user => @user}%>
                                                           </div>
@@ -104,12 +111,13 @@
 											</tr>
 										</table>
 										<div>
-											<strong class="font_small_watch"><%= link_to l(:label_user_watcher)+"("+User.watched_by(@user.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist"%></strong> &nbsp;
-											
-											<strong class="font_small_watch"><%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@user.watcher_users.count.to_s+")", :controller=>"users", :action=>"user_fanslist" %></strong>&nbsp;
+											<strong class="font_small_watch">
+                                              <%= link_to l(:label_user_watcher)+"("+User.watched_by(@user.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist"%>
+                                            </strong> &nbsp;
 											
-                                          <!-- <strong class="font_small_watch"><%= link_to l(:label_requirement_focus)+"("+Bid.watched_by(@user).where('reward_type = ?', 1).count.to_s+")" ,:controller=>"users", :action=>"watch_bids"%></strong>-->  &nbsp; <!-- added by huang -->
-											<!-- added by bai 个人签名-->
+											<strong class="font_small_watch">
+                                              <%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@user.watcher_users.count.to_s+")", :controller=>"users", :action=>"user_fanslist" %>
+                                            </strong>&nbsp;&nbsp;
 											<% if @user.id == User.current.id %>
 											<p>
 												<%= toggle_link l(:label_brief_introduction), 'introduction', {:focus => 'new_form_user_introduction'} %>
@@ -125,17 +133,21 @@
 												        :url => {:controller => 'words', :action => 'add_brief_introdution'}) do |f|%>
                                                     <table border="0" width="100%" align="center" >
                                                         <tr>
-														<td><%= f.text_area 'user_introduction', :rows => 3,
+                                                            <td>
+                                                              <%= f.text_area 'user_introduction', :rows => 3,
                                                                     :cols => 65,
                                                                     :placeholder => "#{l(:label_my_brief_introduction)}",
                                                                     :style => "resize: none;",
-                            :class => 'noline'%></td>
+                                                                    :class => 'noline'%>
+                                                            </td>
                                                         </tr>
                                                     </table>
                                                     <table border="0" width="200px" align="center">
                                                         <tr>
-														<td align="right"> <%= submit_tag l(:button_submit), :name => nil ,
-														:class => "bid_btn" %></td>
+                                                            <td align="right">
+                                                              <%= submit_tag l(:button_submit), :name => nil ,
+                                                                                :class => "bid_btn" %>
+                                                            </td>
                                                         </tr>
                                                     </table>
 												<% end %>
@@ -148,20 +160,21 @@
 									<div class="inf_user_context">
 										<table style="font-family:'微软雅黑'" width="240">
 											<tr>
-												<td style="padding-left: 5px" width="70px"><%= l(:label_user_joinin) %>：</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= format_time(@user.created_on) %></td>
-											</tr>
-											<tr>
-												<td style="padding-left: 5px"><%= l(:label_user_login) %>：</td><td class="font_lighter_sidebar" style="padding-left: 0px"><%= format_time(@user.last_login_on) %></td>
+												<td style="padding-left: 5px" width="70px">
+                                                  <%= l(:label_user_joinin) %>：
+                                                </td>
+                                              <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
+                                                <%= format_time(@user.created_on) %>
+                                              </td>
 											</tr>
-
-                                             <!--
 											<tr>
-												<td valign="top" style="padding-left: 5px;"><%#= l(:label_user_mail) %>：</td><td class="font_lighter_sidebar"  style="padding-left: 0px; word-wrap: break-word; word-break: break-all"><%#= mail_to(h(@user.mail), nil, :encode => 'javascript') %></td>
+												<td style="padding-left: 5px">
+                                                  <%= l(:label_user_login) %>：
+                                                </td>
+                                              <td class="font_lighter_sidebar" style="padding-left: 0px">
+                                                <%= format_time(@user.last_login_on) %>
+                                              </td>
 											</tr>
-                                             -->
-											<!-- added by bai 在个人主页里显示“工作单位”“地区”"教师的职称"-->
-											<!-- modified by linchun 在个人主页里显示“加入时间”，“最后登录”，“邮件地址”后面添加冒号-->
-                                            <!-- modified by zjc 高校添加超链接 -->
 											<% unless @user.user_extensions.nil? %>
                                                 <% unless @user.user_extensions.identity == 2 %>
                                                 <tr>
@@ -178,12 +191,21 @@
 											<tr>
 												<% if @user.user_extensions.identity == 0 %>
                                                   <td style="padding-left: 5px" width="76px">
-												<%= l(:label_technical_title) %>:</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.technical_title %></td>
+                                                    <%= l(:label_technical_title) %>:
+                                                  </td>
+                                                  <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
+                                                    <%= @user.user_extensions.technical_title %>
+                                                  </td>
 												<% end %>
 											</tr>
 											<% if( (@user.user_extensions.identity == 1) && (is_watching?(@user) ) )%>
                                                 <tr>
-												<td style="padding-left: 8px" width="70px"><%= l(:label_bidding_user_studentcode)%>:</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.student_id %></td>
+                                                    <td style="padding-left: 8px" width="70px">
+                                                      <%= l(:label_bidding_user_studentcode)%>:
+                                                    </td>
+                                                    <td class="font_lighter_sidebar" style="padding-left: 0px" width="170px">
+                                                      <%= @user.user_extensions.student_id %>
+                                                    </td>
                                                 </tr>
 											<% end %>
 											<% else%>
@@ -196,7 +218,6 @@
 											<% end %>
 											<!-- end -->
 										</table>
-
 									</div>
 									<!--Modified by nie-->
 									<div class="user_underline"></div>

app/views/memos/edit.html.erb

@@ -26,8 +26,11 @@
     </p>
     <p><%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %></p>
     <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script>
+    <p>
+      <%= l(:label_attachment_plural) %><br />
+      <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
+    </p>
     <br/>
     <%= f.submit :value => l(:button_change) %>&nbsp;&nbsp;<%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%>
   </div>
 <% end %>
-</div>

app/views/messages/_project_show.html.erb

@@ -96,11 +96,11 @@
     </p>
   </div>
   <div class="memo-section" style="width: 100%;word-break: break-all;word-wrap: break-word;">
-    <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 83%;word-break: break-all;">
+    <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 53%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
       <% if @project %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(29, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, project_boards_path(@topic.project),title: @topic.subject.to_s %>
       <% elsif @course %>
-          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(29,omission:'...'), course_boards_path(@topic.course),title: @topic.subject.to_s %>
+          <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %>
       <% end %>
     </div>
     <div class="memo-content">

app/views/news/_course_news.html.erb

@@ -64,12 +64,12 @@
 <span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
 	<%= label_tips %>
 </span>
-<%= link_to(btn_tips,
-            new_course_news_path(@course),
+
+<% if @course && User.current.allowed_to?(:manage_news, @course) %>
+    <%= link_to(btn_tips, new_course_news_path(@course),
                 :class => 'icon icon-add',
                 :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
 
-<% if @course && User.current.allowed_to?(:manage_news, @course) %>
     <div id="add-news" class="add_frame" style="display:none;">
       <%= labelled_form_for @news, :url => course_news_index_path(@course),
                             :html => {:id => 'news-form', :multipart => true} do |f| %>

config/locales/zh.yml

@@ -2120,7 +2120,7 @@ zh:
   label_bug: 漏洞
 
   label_school_no_course: 该学校未开设任何课程，您可以查看其他学校课程
-  label_school_less_course: 该学校开设课程较少，您可以查看其他学校课程
+  label_school_less_course: 您也可以查看其他学校课程
 
   label_file_not_found: 对不起，该文件现在不能下载
   label_goto_homepage: 返回主页
@@ -2143,3 +2143,5 @@ zh:
   lable_bar_active: 贴吧动态
   lable_student_list_visable: 学生列表是否公开
   lable_sure_exit_project: 是否确认退出该项目
+  lable_input_class: 在此输入课时
+  lable_input_class_vilidate: 学时只能为整数

config/routes.rb

@@ -132,6 +132,7 @@ RedmineApp::Application.routes.draw do
       match 'add_softapplication'        , :via =>  [:get, :post]
       match 'create'                     , :via =>  :post
       match 'settings'                   , :via =>  [:get, :post]
+      match 'show_contest_user'
     end
   end
 

db/migrate/20140930072719_add_open_student_to_course.rb

@@ -0,0 +1,5 @@
+class AddOpenStudentToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses, :open_student, :integer, :default => 0
+  end
+end

db/migrate/20141009010934_update_bids_proportion.rb

@@ -0,0 +1,12 @@
+class UpdateBidsProportion < ActiveRecord::Migration
+  def up
+    Bid.where("proportion is null").each do |bid|
+      bid.proportion = 60
+      bid.save
+    end
+  end
+
+  def down
+
+  end
+end