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

9e7323539f923b5387b9ec9239b5aeb, reversing
changes made to da9c374ed9.

Conflicts:
	app/views/users/_user_homework_form.html.erb

app/controllers/comments_controller.rb

@@ -19,7 +19,7 @@ class CommentsController < ApplicationController
   default_search_scope :news
   include ApplicationHelper
   model_object News
-  before_filter :find_model_object 
+  before_filter :find_model_object
   before_filter :find_project_from_association
   before_filter :authorize
 
@@ -76,6 +76,6 @@ class CommentsController < ApplicationController
     @comment = nil
     @news
   end
-   
-  
+
+
 end

app/controllers/issues_controller.rb

@@ -66,14 +66,14 @@ class IssuesController < ApplicationController
 
     if @query.valid?
       case params[:format]
-      when 'csv', 'pdf'
-        @limit = 10#Setting.issues_export_limit.to_i
-      when 'atom'
-        @limit = 10#Setting.feeds_limit.to_i
-      when 'xml', 'json'
-        @offset, @limit = api_offset_and_limit({:limit => 10})
-      else
-        @limit = 10#per_page_option
+        when 'csv', 'pdf'
+          @limit = 10#Setting.issues_export_limit.to_i
+        when 'atom'
+          @limit = 10#Setting.feeds_limit.to_i
+        when 'xml', 'json'
+          @offset, @limit = api_offset_and_limit({:limit => 10})
+        else
+          @limit = 10#per_page_option
       end
       @assign_to_id = params[:assigned_to_id]
       @author_id = params[:author_id]
@@ -84,9 +84,9 @@ class IssuesController < ApplicationController
       @issue_pages = Paginator.new @issue_count, @limit, params['page']
       @offset ||= @issue_pages.offset
       @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
-                                :order => sort_clause,
-                                :offset => @offset,
-                                :limit => @limit)
+                              :order => sort_clause,
+                              :offset => @offset,
+                              :limit => @limit)
       @issue_count_by_group = @query.issue_count_by_group
       respond_to do |format|
         format.js
@@ -143,16 +143,16 @@ class IssuesController < ApplicationController
     @available_watchers = (@issue.project.users.sort + @issue.watcher_users).uniq
 
     respond_to do |format|``
-      format.html {
-        retrieve_previous_and_next_issue_ids
-        render :template => 'issues/show', :layout => @project_base_tag#by young
-      }
-      format.api
-      format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
-      format.pdf  {
-        pdf = issue_to_pdf(@issue, :journals => @journals)
-        send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
-      }
+    format.html {
+      retrieve_previous_and_next_issue_ids
+      render :template => 'issues/show', :layout => @project_base_tag#by young
+    }
+    format.api
+    format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
+    format.pdf  {
+      pdf = issue_to_pdf(@issue, :journals => @journals)
+      send_data(pdf, :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf")
+    }
     end
   end
 
@@ -322,8 +322,8 @@ class IssuesController < ApplicationController
       issue.reload
       if @copy
         issue = issue.copy({},
-          :attachments => params[:copy_attachments].present?,
-          :subtasks => params[:copy_subtasks].present?
+                           :attachments => params[:copy_attachments].present?,
+                           :subtasks => params[:copy_subtasks].present?
         )
       end
       journal = issue.init_journal(User.current, params[:notes])
@@ -353,21 +353,21 @@ class IssuesController < ApplicationController
     @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
     if @hours > 0
       case params[:todo]
-      when 'destroy'
-        # nothing to do
-      when 'nullify'
-        TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
-      when 'reassign'
-        reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
-        if reassign_to.nil?
-          flash.now[:error] = l(:error_issue_not_found_in_project)
-          return
+        when 'destroy'
+          # nothing to do
+        when 'nullify'
+          TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
+        when 'reassign'
+          reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
+          if reassign_to.nil?
+            flash.now[:error] = l(:error_issue_not_found_in_project)
+            return
+          else
+            TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
+          end
         else
-          TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
-        end
-      else
-        # display the destroy form if it's a user request
-        return unless api_request?
+          # display the destroy form if it's a user request
+          return unless api_request?
       end
     end
     @issues.each do |issue|
@@ -435,14 +435,14 @@ class IssuesController < ApplicationController
     issue_attributes = params[:issue]
     if issue_attributes && params[:conflict_resolution]
       case params[:conflict_resolution]
-      when 'overwrite'
-        issue_attributes = issue_attributes.dup
-        issue_attributes.delete(:lock_version)
-      when 'add_notes'
-        issue_attributes = issue_attributes.slice(:notes)
-      when 'cancel'
-        redirect_to issue_url(@issue)
-        return false
+        when 'overwrite'
+          issue_attributes = issue_attributes.dup
+          issue_attributes.delete(:lock_version)
+        when 'add_notes'
+          issue_attributes = issue_attributes.slice(:notes)
+        when 'cancel'
+          redirect_to issue_url(@issue)
+          return false
       end
     end
     @issue.safe_attributes = issue_attributes

app/helpers/users_helper.rb

@@ -71,7 +71,7 @@ module UsersHelper
   def user_settings_tabs
     tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
             {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
-            ]
+    ]
     if Group.all.any?
       tabs.insert 1, {:name => 'groups', :partial => 'users/groups', :label => :label_group_plural}
     end
@@ -83,7 +83,7 @@ module UsersHelper
   def get_users_by_tag(tag_name)
     User.tagged_with(tag_name).order('updated_on desc')
   end
-  
+
   # added by fq
   # <div class="pagination" >
   # <ul>
@@ -91,7 +91,7 @@ module UsersHelper
   # <li><%= link_to("只看自己", {:controller => 'users', :action => 'show', :type => 1}) %></li>
   # <li><%= link_to("所有反馈", {:controller => 'users', :action => 'show', :type => 2}) %></li>
   # </ul></div> 
-  
+
   # TODO: 待删
   # def show_activity(state)
   #   content = ''.html_safe
@@ -114,19 +114,19 @@ module UsersHelper
   #   end
   #   content_tag('div', content, :class => "pagination")
   # end
-  
+
   #TODO: 待删
   def watch_projects(state)
     content = ''.html_safe
     case state
-    when 0
-      s = content_tag('span', l(:label_project_take), :class => "current-page")
-      content << content_tag('li', s)
-      content << content_tag('li', link_to(l(:label_has_watched_project), {:controller => 'users', :action => 'watch_projects', :type => 1}))
-    when 1
-      s = content_tag('span', l(:label_has_watched_project), :class => "current-page")
-      content << content_tag('li', link_to(l(:label_project_take), {:controller => 'users', :action => 'user_projects'}))
-      content << content_tag('li', s, :class => "current-page")
+      when 0
+        s = content_tag('span', l(:label_project_take), :class => "current-page")
+        content << content_tag('li', s)
+        content << content_tag('li', link_to(l(:label_has_watched_project), {:controller => 'users', :action => 'watch_projects', :type => 1}))
+      when 1
+        s = content_tag('span', l(:label_has_watched_project), :class => "current-page")
+        content << content_tag('li', link_to(l(:label_project_take), {:controller => 'users', :action => 'user_projects'}))
+        content << content_tag('li', s, :class => "current-page")
     end
     content_tag('div', content, :class => "pagination")
   end
@@ -134,59 +134,59 @@ module UsersHelper
   def user_course(state)
     content = ''.html_safe
     if @user != User.current
-      if  @user.user_extensions.identity == 0 
+      if  @user.user_extensions.identity == 0
         case state
-        when 0
-          s = content_tag('span', '他执教的课程', :class => "current-page")
-          content << content_tag('li', s)
-          content << content_tag('li', link_to('他发布的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
-          content_tag('div', content, :class => "pagination")
-        when 1
-          s = content_tag('span', '他发布的作业', :class => "current-page")
-          content << content_tag('li', link_to('他执教的课程', {:controller => 'users', :action => 'user_courses'}))
-          content << content_tag('li', s, :class => "current-page")    
-          content_tag('div', content, :class => "pagination")
+          when 0
+            s = content_tag('span', '他执教的课程', :class => "current-page")
+            content << content_tag('li', s)
+            content << content_tag('li', link_to('他发布的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
+            content_tag('div', content, :class => "pagination")
+          when 1
+            s = content_tag('span', '他发布的作业', :class => "current-page")
+            content << content_tag('li', link_to('他执教的课程', {:controller => 'users', :action => 'user_courses'}))
+            content << content_tag('li', s, :class => "current-page")
+            content_tag('div', content, :class => "pagination")
         end
-      else    
+      else
         case state
-        when 0
-          s = content_tag('span', '他的课程', :class => "current-page")
-          content << content_tag('li', s)
-          content << content_tag('li', link_to('他的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
-          content_tag('div', content, :class => "pagination")      
-        when 1
-          s = content_tag('span', '他的作业', :class => "current-page")
-          content << content_tag('li', link_to('他的课程', {:controller => 'users', :action => 'user_courses', :type => 0}))
-          content << content_tag('li', s, :class => "current-page")      
-          content_tag('div', content, :class => "pagination")
+          when 0
+            s = content_tag('span', '他的课程', :class => "current-page")
+            content << content_tag('li', s)
+            content << content_tag('li', link_to('他的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
+            content_tag('div', content, :class => "pagination")
+          when 1
+            s = content_tag('span', '他的作业', :class => "current-page")
+            content << content_tag('li', link_to('他的课程', {:controller => 'users', :action => 'user_courses', :type => 0}))
+            content << content_tag('li', s, :class => "current-page")
+            content_tag('div', content, :class => "pagination")
         end
       end
     else
-      if  @user.user_extensions.identity == 0 
+      if  @user.user_extensions.identity == 0
         case state
-        when 0
-          s = content_tag('span', l(:label_teaching_course), :class => "current-page")
-          content << content_tag('li', s)
-          content << content_tag('li', link_to(l(:label_release_homework), {:controller => 'users', :action => 'user_courses', :type => 1}))
-          content_tag('div', content, :class => "pagination")
-        when 1
-          s = content_tag('span', l(:label_release_homework), :class => "current-page")
-          content << content_tag('li', link_to(l(:label_teaching_course), {:controller => 'users', :action => 'user_courses'}))
-          content << content_tag('li', s, :class => "current-page")    
-          content_tag('div', content, :class => "pagination")
+          when 0
+            s = content_tag('span', l(:label_teaching_course), :class => "current-page")
+            content << content_tag('li', s)
+            content << content_tag('li', link_to(l(:label_release_homework), {:controller => 'users', :action => 'user_courses', :type => 1}))
+            content_tag('div', content, :class => "pagination")
+          when 1
+            s = content_tag('span', l(:label_release_homework), :class => "current-page")
+            content << content_tag('li', link_to(l(:label_teaching_course), {:controller => 'users', :action => 'user_courses'}))
+            content << content_tag('li', s, :class => "current-page")
+            content_tag('div', content, :class => "pagination")
         end
-      else    
+      else
         case state
-        when 0
-          s = content_tag('span', l(:label_my_course), :class => "current-page")
-          content << content_tag('li', s)
-          content << content_tag('li', link_to('我的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
-          content_tag('div', content, :class => "pagination")      
-        when 1
-          s = content_tag('span', '我的作业', :class => "current-page")
-          content << content_tag('li', link_to(l(:label_my_course), {:controller => 'users', :action => 'user_courses', :type => 0}))
-          content << content_tag('li', s, :class => "current-page")      
-          content_tag('div', content, :class => "pagination")
+          when 0
+            s = content_tag('span', l(:label_my_course), :class => "current-page")
+            content << content_tag('li', s)
+            content << content_tag('li', link_to('我的作业', {:controller => 'users', :action => 'user_courses', :type => 1}))
+            content_tag('div', content, :class => "pagination")
+          when 1
+            s = content_tag('span', '我的作业', :class => "current-page")
+            content << content_tag('li', link_to(l(:label_my_course), {:controller => 'users', :action => 'user_courses', :type => 0}))
+            content << content_tag('li', s, :class => "current-page")
+            content_tag('div', content, :class => "pagination")
         end
       end
     end
@@ -196,42 +196,42 @@ module UsersHelper
   def sort_user(state, project_type)
     content = ''.html_safe
     case state
-    when 0
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) )))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) )))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) ), :class=>"selected") )
-    when 1
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) ), :class=>"selected") )
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) )))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) )))
-    when 2
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) )))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) ), :class=>"selected") )
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) )))
+      when 0
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) )))
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) )))
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) ), :class=>"selected") )
+      when 1
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) ), :class=>"selected") )
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) )))
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) )))
+      when 2
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(params.merge({:user_sort_type => '1', :project_type => project_type}) )))
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(params.merge({:user_sort_type => '2', :project_type => project_type}) ), :class=>"selected") )
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(params.merge({:user_sort_type => '0', :project_type => project_type}) )))
     end
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs")
-  end  
-  
+  end
+
   def sort_user_enterprise(state, project_type)
     content = ''.html_safe
     case state
-    when 0
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
-    when 1
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
-    when 2
-      content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
-      content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
-      content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
+      when 0
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type), :class=>"selected"), :class=>"selected")
+      when 1
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type), :class=>"selected"), :class=>"selected")
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type)))
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
+      when 2
+        content << content_tag('li', link_to(l(:label_sort_by_active), users_path(:user_sort_type => '1', :project_type => project_type)))
+        content << content_tag('li', link_to(l(:label_sort_by_influence), users_path(:user_sort_type => '2', :project_type => project_type), :class=>"selected"), :class=>"selected")
+        content << content_tag('li', link_to(l(:label_sort_by_time), users_path(:user_sort_type => '0', :project_type => project_type)))
     end
     content = content_tag('ul', content)
     content_tag('div', content, :class => "tabs_enterprise")
-  end 
+  end
 
   def gender_avatar_uri user
     img_uri = '/images/sidebar/female.png'
@@ -256,7 +256,7 @@ module UsersHelper
     #   people_ids += (members_to_user_ids(tmp)) unless tmp.nil?
     # end
     # people_ids.include?(login_user.id) or (login_user == user) or login_user.admin?
-    
+
     false
   end
 
@@ -290,7 +290,7 @@ module UsersHelper
     membership.collect { |e|
       memberships.push(e)
     }
-                                            ## 判断课程是否过期 [需封装]
+    ## 判断课程是否过期 [需封装]
     memberships_doing = []
     memberships_done  = []
     memberships.map { |e|
@@ -546,7 +546,7 @@ module UsersHelper
     type = []
     user.courses.select{|c| user.allowed_to?(:as_teacher,c)}.each do |course|
       option = []
-      option << course.name
+      option << course.name+"（"+course.time.to_s+course.term+"）"
       option << course.id
       type << option
     end

app/views/layouts/new_base_user.html.erb

@@ -101,9 +101,9 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
           <% if is_current_user%>
               <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
-                  <%=link_to "", new_course_path, :class => "homepageMenuSetting fr"%>
+                  <%=link_to "", new_course_path, :class => "homepageMenuSetting fr", :title => "新建课程"%>
               <% else%>
-                  <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:remote => true%>
+                  <%=link_to "", join_private_courses_courses_path, :class => "homepageMenuSetting fr",:remote => true, :title => "加入课程"%>
               <% end%>
           <% end%>
         </div>
@@ -117,7 +117,7 @@
           <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuForge').slideToggle();">项目</a>
 
           <% if is_current_user%>
-              <%=link_to "", new_project_path, :class => "homepageMenuSetting fr"%>
+              <%=link_to "", new_project_path, :class => "homepageMenuSetting fr", :title => "新建项目"%>
           <% end%>
         </div>
         <div class="homepageLeftMenuCourses" id="homepageLeftMenuForge">

app/views/users/_course_message.html.erb

@@ -1,108 +1,108 @@
-    <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
-      <div class="homepagePostBrief">
-        <div class="homepagePostPortrait">
-          <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
-        </div>
-        <div class="homepagePostDes">
-          <div class="homepagePostTo break_word">
-            <% if activity.try(:author).try(:realname) == ' ' %>
-                <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
-            <% else %>
-                <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
-            <% end %>
-            TO
-            <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course), :class => "newsBlue ml15 mr5"%>
-          </div>
-          <div class="homepagePostTitle break_word">
-            <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
-              <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" %>
-            <% else %>
-                <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey"%>
-            <% end %>
-          </div>
-          <div class="homepagePostDate">
-            发帖时间：<%= format_date(activity.created_on) %>
-          </div>
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word">
+        <% if activity.try(:author).try(:realname) == ' ' %>
+            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to activity.course.name.to_s+" | 课程讨论区", course_boards_path(activity.course), :class => "newsBlue ml15 mr5"%>
+      </div>
+      <div class="homepagePostTitle break_word">
+        <% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
+            <%= link_to activity.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.id, :topic_id => activity.id), :class=> "postGrey" %>
+        <% else %>
+            <%= link_to activity.parent.subject.to_s.html_safe, course_boards_path(activity.course,:parent_id =>activity.parent_id, :topic_id => activity.id), :class=> "postGrey"%>
+        <% end %>
+      </div>
+      <div class="homepagePostDate">
+        发帖时间：<%= format_date(activity.created_on) %>
+      </div>
 
 
-          <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">帖子描述：
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-          </div>
-          <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
-            <ul>
-              <li class="homepagePostSettingIcon">
-                <ul class="homepagePostSettiongText">
-                  <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
-                  <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
-                  <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
-                </ul>
-              </li>
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">帖子描述：
+        <% if activity.parent_id.nil? %>
+            <%= activity.content.to_s.html_safe%>
+        <% else %>
+            <%= activity.parent.content.to_s.html_safe%>
+        <% end %>
+      </div>
+      <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <ul class="homepagePostSettiongText">
+              <li><a href="javascript:void(0);" class="postOptionLink">编辑</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">复制</a></li>
+              <li><a href="javascript:void(0);" class="postOptionLink">删除</a></li>
             </ul>
-          </div>
-        </div>
-        <div class="cl"></div>
+          </li>
+        </ul>
       </div>
-      <div class="homepagePostReply">
-        <div class="homepagePostReplyBanner">
-          <% count=0 %>
-          <div class="homepagePostReplyBannerCount">回复(
-             <% if activity.parent_id.nil? %>
-                <% count=activity.replies_count%>
-                <%=count %>
-            <% else %>
-                <% count=activity.parent.replies_count%>
-                <%=count %>
-            <% end %>
-            )</div>
-          <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
-          <%if count>2 %>
-              <div class="homepagePostReplyBannerMore">
-                <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-                  点击展开更多回复(<%= count.to_s%>)
-                </a>
-              </div>
-          <% end %>
-        </div>
-
-        <div class="homepagePostReplyInputContainer">
-          <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-            <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
-                <input type="hidden" name="quote[quote]" value="">
-                <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
-                <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
-                <p nhname='contentmsg_<%= user_activity_id%>'></p>
-                <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
-                <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:3px;">取消</a>
-                <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:3px;">发送</a>
-            <% end%>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <% count=0 %>
+      <div class="homepagePostReplyBannerCount">回复(
+        <% if activity.parent_id.nil? %>
+            <% count=activity.replies_count%>
+            <%=count %>
+        <% else %>
+            <% count=activity.parent.replies_count%>
+            <%=count %>
+        <% end %>
+        )</div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
+      <%if count>2 %>
+          <div class="homepagePostReplyBannerMore">
+            <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
+              点击展开更多回复(<%= count.to_s%>)
+            </a>
           </div>
-          <div class="cl"></div>
-        </div>
+      <% end %>
+    </div>
 
-        <% activity= activity.parent_id.nil? ? activity:activity.parent%>
-        <% replies_all_i = 0 %>
-        <%  unless activity.children.empty? %>
-            <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
-                <ul>
-                    <% activity.children.reorder("created_on desc").each do |reply|%>
-                          <% replies_all_i=replies_all_i+1 %>
-                          <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
-                            <div class="homepagePostReplyPortrait">
-                              <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
-                            </div>
-                            <div class="homepagePostReplyDes">
-                              <div class="homepagePostReplyPublisher">
-                                <% if reply.try(:author).try(:realname) == ' ' %>
-                                    <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                                <% else %>
-                                    <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
-                                <% end %>
-                                <%= format_date(reply.created_on) %>
-                                <%#= link_to(
+    <div class="homepagePostReplyInputContainer">
+      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+        <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+            <input type="hidden" name="quote[quote]" value="">
+            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+            <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_<%= user_activity_id%>' name="reply[content]"></textarea>
+            <p nhname='contentmsg_<%= user_activity_id%>'></p>
+            <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px;"></div>
+            <a id="new_message_cancel_btn_<%= user_activity_id%>" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:3px;">取消</a>
+            <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:3px;">发送</a>
+        <% end%>
+      </div>
+      <div class="cl"></div>
+    </div>
+
+    <% activity= activity.parent_id.nil? ? activity:activity.parent%>
+    <% replies_all_i = 0 %>
+    <%  unless activity.children.empty? %>
+        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
+          <ul>
+            <% activity.children.reorder("created_on desc").each do |reply|%>
+                <% replies_all_i=replies_all_i+1 %>
+                <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>2 ? 'none' : '' %>">
+                  <div class="homepagePostReplyPortrait">
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "45", :height => "45"), user_path(reply.author_id), :alt => "用户头像" %>
+                  </div>
+                  <div class="homepagePostReplyDes">
+                    <div class="homepagePostReplyPublisher">
+                      <% if reply.try(:author).try(:realname) == ' ' %>
+                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                      <% else %>
+                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                      <% end %>
+                      <%= format_date(reply.created_on) %>
+                      <%#= link_to(
                                             l(:button_delete),
                                             {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
                                             :method => :post,
@@ -110,15 +110,15 @@
                                             :title => l(:button_delete),
                                             :class => 'replyGrey fr ml10'
                                     ) if reply.course_destroyable_by?(User.current) %>
-                                <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
-                              </div>
-                              <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
-                            </div>
-                            <div class="cl"></div>
-                          </li>
-                    <% end %>
-                  </ul>
-            </div>
-        <% end %>
-      </div>
-    </div>
+                      <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
+                    </div>
+                    <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+  </div>
+</div>

app/views/users/_course_news.html.erb

@@ -84,6 +84,6 @@
             <% end %>
           </ul>
         </div>
-  <% end %>
+    <% end %>
   </div>
 </div>

app/views/users/_project_issue.html.erb

@@ -11,7 +11,7 @@
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目缺陷", project_issues_path(activity.project), :class => "newsBlue ml15"%>
-        </div>
+      </div>
       <div class="homepagePostTitle break_word">
         <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %>
         <span class='<%= get_issue_priority(activity.priority_id)[0] %>'><%= get_issue_priority(activity.priority_id)[1] %></span>
@@ -19,11 +19,11 @@
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
           <% unless activity.assigned_to_id.nil? %>
-            <% if activity.try(:assigned_to).try(:realname) == ' ' %>
-              <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
-            <% else %>
-              <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
-            <% end %>
+              <% if activity.try(:assigned_to).try(:realname) == ' ' %>
+                  <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% else %>
+                  <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+              <% end %>
           <% end %>
         </div>
         <div class="homepagePostDeadline">时间：<%=format_date(activity.created_on) %></div>
@@ -37,21 +37,21 @@
       <div class="mt10" style="font-weight:normal;">
         <% if activity.attachments.any? %>
             <% activity.attachments.each do |attachment| %>
-                  <div class="break_word">
+                <div class="break_word">
                   <span title="<%= attachment.filename %>" id="attachment_">
                     <%= link_to_short_attachment attachment,:length=> 58, :class => 'homepagePostFileAtt newsBlue', :download => true -%>
                   </span>
-                   <% if attachment.is_text? %>
-                        <%= link_to image_tag('magnifier.png'),
-                                    :controller => 'attachments',
-                                    :action => 'show',
-                                    :id => attachment,
-                                    :filename => attachment.filename %>
-                    <% end %>
-                   <span class="postAttSize">(
+                  <% if attachment.is_text? %>
+                      <%= link_to image_tag('magnifier.png'),
+                                  :controller => 'attachments',
+                                  :action => 'show',
+                                  :id => attachment,
+                                  :filename => attachment.filename %>
+                  <% end %>
+                  <span class="postAttSize">(
                     <%= number_to_human_size attachment.filesize %>)
                   </span>
-                  </div>
+                </div>
             <% end %>
         <% end %>
       </div>
@@ -110,7 +110,7 @@
                     <div class="homepagePostReplyPublisher">
                       <% if reply.try(:user).try(:realname) == ' ' %>
                           <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-                          <% else %>
+                      <% else %>
                           <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_date(reply.created_on) %>

app/views/users/_resource_share_for_project_popup.html.erb

@@ -34,7 +34,7 @@
           <li class="fl">
             <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
           </li>
-          <li class="sendCourseName fl"><%= truncate( project.name,:length=>18)%></li>
+          <li class="sendCourseName fl"><%= project.name%></li>
         </ul>
         <% end %>
     </div>

app/views/users/_resource_share_popup.html.erb

@@ -34,7 +34,7 @@
               <li class="fl">
                 <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
               </li>
-              <li class="sendCourseName fl"><%= truncate(course.name,:length=>18)%></li>
+              <li class="sendCourseName fl"><%= course.name%></li>
             </ul>
             <% end %>
           </div>

app/views/users/_resources_list.html.erb

@@ -1,25 +1,25 @@
 
 <% if attachments.nil? || attachments.empty? %>
-        <!--<p class="nodata">-->
-          <!--<%#= l(:label_no_data) %>-->
-        <!--</p>-->
+    <!--<p class="nodata">-->
+    <!--<%#= l(:label_no_data) %>-->
+    <!--</p>-->
 <% else %>
     <% attachments.each do |attach| %>
-    <ul class="resourcesList">
-      <li class="resourcesListCheckbox fl">
-        <input name="checkbox1[]" type="checkbox" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
-      </li>
-    <li class="resourcesListName fl">
-      <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
-      <%= link_to truncate(attach.filename,:length=>18), download_named_attachment_path(attach.id, attach.filename),
-                  :title => attach.filename,:class=>'resourcesBlack'%>
-    </li>
-    <li class="resourcesListSize fl"><%= number_to_human_size(attach.filesize) %></li>
-    <li class="resourcesListType fl"><%= get_resource_type(attach.container_type)%></li>
-    <li class="resourcesListUploader fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
-      <li style="display: none"><%= attach.author_id %></li>
-    <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
-    <li style="display: none"><%= attach.id %></li>
-    </ul>
-   <% end %>
+        <ul class="resourcesList">
+          <li class="resourcesListCheckbox fl">
+            <input name="checkbox1[]" type="checkbox" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
+          </li>
+          <li class="resourcesListName fl">
+            <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
+            <%= link_to truncate(attach.filename,:length=>18), download_named_attachment_path(attach.id, attach.filename),
+                        :title => attach.filename,:class=>'resourcesBlack'%>
+          </li>
+          <li class="resourcesListSize fl"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="resourcesListType fl"><%= get_resource_type(attach.container_type)%></li>
+          <li class="resourcesListUploader fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li style="display: none"><%= attach.author_id %></li>
+          <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
+          <li style="display: none"><%= attach.id %></li>
+        </ul>
+    <% end %>
 <% end %>

app/views/users/_user_homework_form.html.erb

@@ -74,7 +74,11 @@
 </div>
   </div>
 <div class="cl"></div>
-
+<script type="text/javascript">
+    $(function (){
+        $("#course_id").append("<option value='-1' id='option_select' hidden selected>请选择发布作业的课程</option>");
+    });
+</script>
 
 <script id="t:test-answer-list" type="text/html">
   <div class="mt10">

app/views/users/user_homeworks.html.erb

@@ -1,10 +1,11 @@
 <script type="text/javascript">
   function reset_homework(){
       $("#homework_name").val("");
-      $("#homework_end_time").val("<%= (Time.now  + 3600 * 24).strftime('%Y-%m-%d')%>");
-      $("#course_id").val("");
+      $("#homework_end_time").val("");
+      $("#course_id").val($("#option_select").val());
       $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
       homework_description_editor.html("");
+      $("#homework_editor").toggle();
   }
 
   function checkAllBox(doc){

config/routes.rb

@@ -172,7 +172,7 @@ RedmineApp::Application.routes.draw do
   resources :contests, only: [:index] do
     resources :contestnotifications do
       # get 'preview', on: :collection
-      resources :notificationcomments 
+      resources :notificationcomments
     end
 
     collection do
@@ -233,7 +233,7 @@ RedmineApp::Application.routes.draw do
       end
     end
   end
-  
+
 
   resources :shares
 
@@ -373,7 +373,7 @@ RedmineApp::Application.routes.draw do
       get 'user_resource_type'
       get 'user_ref_resource_search'
       post 'import_resources_to_homework'
-    # end
+      # end
     end
   end
   match 'users/:id/user_newfeedback', :to => 'users#user_newfeedback',  :via => :get, :as => "feedback"
@@ -487,7 +487,7 @@ RedmineApp::Application.routes.draw do
       collection do
         match "getattachtype" , :via =>  [:get, :post]
         match "search_project",:via => [:post,:get]
-      #match 'getattachtype/:attachtype', :to => 'files#getattachtype', :via =>  [:get, :post]
+        #match 'getattachtype/:attachtype', :to => 'files#getattachtype', :via =>  [:get, :post]
       end
     end
 
@@ -517,7 +517,7 @@ RedmineApp::Application.routes.draw do
     resources :repositories, :except => [:index, :show] do
       member do
         get 'newrepo', :via => [:get, :post]
-      # get 'create', :via=>[:get, :post]
+        # get 'create', :via=>[:get, :post]
       end
     end
     match 'wiki/index',  :via => :get
@@ -607,8 +607,8 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-        :action => /(browse|show|entry|raw|annotate|diff)/,
-        :rev    => /[a-z0-9\.\-_]+/
+          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :rev    => /[a-z0-9\.\-_]+/
       }
 
   get 'projects/:id/repository/statistics', :to => 'repositories#stats'
@@ -625,8 +625,8 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-        :action => /(browse|show|entry|raw|annotate|diff)/,
-        :rev    => /[a-z0-9\.\-_]+/
+          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :rev    => /[a-z0-9\.\-_]+/
       }
   get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
       :controller => 'repositories',
@@ -729,7 +729,7 @@ RedmineApp::Application.routes.draw do
       get 'test_connection', :as => 'try_connection'
     end
     collection do
-        get 'autocomplete_for_new_user'
+      get 'autocomplete_for_new_user'
     end
   end
 
@@ -791,7 +791,7 @@ RedmineApp::Application.routes.draw do
       collection do
         match 'chang_read_flag', :via => :get
       end
-     end
+    end
 
   end   # end of resources :courses
   match 'courses/:id/feedback', :to => 'courses#feedback',  :via => :get, :as => 'course_feedback'

public/stylesheets/new_user.css

@@ -675,7 +675,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; }
+.footerAbout{ width:365px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; }
 .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
 .departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}
 .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}