Merge branch 'szzh' into develop

app/controllers/activity_notifys_controller.rb

@@ -15,11 +15,10 @@ class ActivityNotifysController < ApplicationController
     end
 
     if( query != nil )
-      logger.info('xxoo')
       limit = 10;
       @obj_count = query.count();
       @obj_pages = Paginator.new @obj_count,limit,params['page']
-      list = query.order('id desc').limit(limit).offset(@obj_pages.offset).all();
+      list = query.order('is_read,id desc').limit(limit).offset(@obj_pages.offset).all();
       events=[];
       for item in list
         event = item.activity;
@@ -29,7 +28,6 @@ class ActivityNotifysController < ApplicationController
       end
       @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
       @controller_name = 'ActivityNotifys'
-      logger.info('aavv')
     end
     respond_to do |format|
       format.html  {render :template => 'courses/show', :layout => 'base_courses'}

app/controllers/attachments_controller.rb

@@ -216,13 +216,13 @@ class AttachmentsController < ApplicationController
         if @attachment.container.is_a?(News)
           format.html { redirect_to_referer_or news_path(@attachment.container) }
         elsif @attachment.container.is_a?(StudentWorksScore)
-          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          @is_destroy = true unless params[:attachment_id] #根据ID删除页面对应的数据，js刷新页面
           format.js
         elsif @attachment.container.is_a?(HomeworkCommon)
-          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          @is_destroy = true unless params[:attachment_id] #根据ID删除页面对应的数据，js刷新页面
           format.js
         elsif @attachment.container.is_a?(StudentWork)
-          @is_destroy = true #根据ID删除页面对应的数据，js刷新页面
+          @is_destroy = true unless params[:attachment_id] #根据ID删除页面对应的数据，js刷新页面
           format.js
         elsif @attachment.container.is_a?(Message)
           format.html { redirect_to_referer_or new_board_message_path(@attachment.container) }
@@ -246,7 +246,7 @@ class AttachmentsController < ApplicationController
       end
 
       format.js
-    end
+  end
   end
   
   def delete_homework

app/controllers/courses_controller.rb

@@ -6,6 +6,7 @@ class CoursesController < ApplicationController
   helper :members
   helper :words
   helper :attachments
+  helper :activity_notifys
 
   before_filter :auth_login1, :only => [:show, :feedback]
   menu_item :overview

app/controllers/messages_controller.rb

@@ -94,12 +94,12 @@ class MessagesController < ApplicationController
           update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
         end
         # 与我相关动态的记录add start
-        if(@board.course_id>0) #项目的先不管
+        if(@board && @board.course) #项目的先不管
-          teachers = searchTeacherAndAssistant(@board.course);
+          teachers = searchTeacherAndAssistant(@board.course)
           for teacher in teachers
             if(teacher.user_id != User.current.id)
               notify = ActivityNotify.new()
-              if(@board.course_id>0)
+              if(@board.course)
                 notify.activity_container_id = @board.course_id
                 notify.activity_container_type = 'Course'
               else
@@ -178,7 +178,7 @@ class MessagesController < ApplicationController
       end
 
       # 与我相关动态的记录add start
-      if(@board.course_id>0) #项目的先不管
+      if(@board && @board.course) #项目的先不管
         notifyto_arr = {}
         notifyto_arr[@topic.author_id] = @topic.author_id
         if( params[:parent_topic] != nil && params[:parent_topic] != '')
@@ -188,7 +188,7 @@ class MessagesController < ApplicationController
         notifyto_arr.each do |k,user_id|
           if(user_id != User.current.id)
             notify = ActivityNotify.new()
-            if(@board.course_id>0)
+            if(@board.course)
               notify.activity_container_id = @board.course_id
               notify.activity_container_type = 'Course'
             else

app/controllers/projects_controller.rb

@@ -365,6 +365,18 @@ class ProjectsController < ApplicationController
   def invite_members_by_mail
     if User.current.member_of?(@project) || User.current.admin?
       @inviter_lists = InviteList.where(project_id:@project.id).all
+      unless @inviter_lists.blank?
+        @inviter_lists.each do|inviter_list|
+          @inviters = []
+          @waiters = []
+          @inviters << inviter_list.user
+          @inviters_count = @inviters.size
+          unless inviter_list.user.member_of?(@project)
+            @waiters << inviter_list.user
+            @waiters_count = @waiters.size
+          end
+        end
+      end
       @is_zhuce = false
       respond_to do |format|
         format.html

app/controllers/users_controller.rb

@@ -25,7 +25,7 @@ class UsersController < ApplicationController
   menu_item :user_course, :only => :user_courses
   menu_item :user_homework, :only => :user_homeworks
   menu_item :user_project, :only => [:user_projects, :watch_projects]
-  menu_item :requirement_focus, :only => :watch_bids
+  # menu_item :requirement_focus, :only => :watch_bids
   menu_item :requirement_focus, :only => :watch_contests   
   menu_item :user_newfeedback, :only => :user_newfeedback
   
@@ -36,14 +36,14 @@ class UsersController < ApplicationController
 
   #
   before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
-  before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :tag_saveEx,:user_projects, :user_newfeedback, :user_comments, :watch_bids, :watch_contests, :info,
+  before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :tag_saveEx,:user_projects, :user_newfeedback, :user_comments, :watch_contests, :info,
     :user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score, :topic_score_index, :project_score_index,
     :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
     :activity_new_score_index, :influence_new_score_index, :score_new_index,:update_score,:user_activities,:user_projects_index]
   #edit has been deleted by huang, 2013-9-23
   before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :user_courses, 
                                   :user_homeworks, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, 
-                                  :watch_bids, :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index, 
+                                  :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index,
                                   :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                   :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index]
   before_filter :auth_user_extension, only: :show
@@ -141,25 +141,25 @@ class UsersController < ApplicationController
 
   ##added by fq
   def watch_bids
-    cond = 'bids.reward_type <> 1'     
+    # cond = 'bids.reward_type <> 1'
-    @bids = Bid.watched_by(@user).where('reward_type = ?', 1) # added by huang
+    # @bids = Bid.watched_by(@user).where('reward_type = ?', 1) # added by huang
-    @offset, @limit = api_offset_and_limit({:limit => 10})
+    # @offset, @limit = api_offset_and_limit({:limit => 10})
-    @bid_count = @bids.count
+    # @bid_count = @bids.count
-    @bid_pages = Paginator.new @bid_count, @limit, params['page']
+    # @bid_pages = Paginator.new @bid_count, @limit, params['page']
-    @offset ||= @bid_pages.reverse_offset 
+    # @offset ||= @bid_pages.reverse_offset
-    unless @offset == 0
+    # unless @offset == 0
-      @bid = @bids.offset(@offset).limit(@limit).all.reverse
+    #   @bid = @bids.offset(@offset).limit(@limit).all.reverse
-    else
+    # else
-      limit = @bid_count % @limit
+    #   limit = @bid_count % @limit
-      @bid = @bids.offset(@offset).limit(limit).all.reverse
+    #   @bid = @bids.offset(@offset).limit(limit).all.reverse
-    end
+    # end
-   
+    #
-    respond_to do |format|
+    # respond_to do |format|
-      format.html {
+    #   format.html {
-        render :layout => 'base_users'
+    #     render :layout => 'base_users'
-      }
+    #   }
-      format.api
+    #   format.api
-    end
+    # end
   end
   
 #new add by linchun
@@ -215,24 +215,24 @@ class UsersController < ApplicationController
   
   # added by huang
   def user_homeworks                
-      @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))  
+      # @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
-      @memberships = []
+      # @memberships = []
-      @membership.each do |membership|
+      # @membership.each do |membership|
-        if membership.project.project_type == 1
+      #   if membership.project.project_type == 1
-          @memberships << membership 
+      #     @memberships << membership
-        end
+      #   end
-      end
+      # end
-      @bid = []
+      # @bid = []
-      @memberships.each do |membership|
+      # @memberships.each do |membership|
-      @bid += membership.project.homeworks
+      # @bid += membership.project.homeworks
-      end
+      # end
-      @bid = @bid.group_by {|bid| bid.courses.first.id}
+      # @bid = @bid.group_by {|bid| bid.courses.first.id}
-      unless User.current.admin?
+      # unless User.current.admin?
-      if !@user.active? 
+      # if !@user.active?
-        render_404
+      #   render_404
-      return
+      # return
-      end 
+      # end
-      end  
+      # end
   end 
   
   
@@ -757,7 +757,7 @@ class UsersController < ApplicationController
     when '3' then
       @obj = Issue.find_by_id(@obj_id)
     when '4' then
-      @obj = Bid.find_by_id(@obj_id)
+      # @obj = Bid.find_by_id(@obj_id)
     when '5' then
       @obj = Forum.find_by_id(@obj_id)
     when '6'
@@ -800,7 +800,7 @@ class UsersController < ApplicationController
       when '3' then
         @obj = Issue.find_by_id(@obj_id)
       when '4' then
-        @obj = Bid.find_by_id(@obj_id)
+        # @obj = Bid.find_by_id(@obj_id)
       when '5' then
         @obj = Forum.find_by_id(@obj_id)
       when '6'

app/controllers/zipdown_controller.rb

@@ -30,8 +30,7 @@ class ZipdownController < ApplicationController
       if file_count > 0
         zipfile = zip_bid bid
       else
-        render file: 'public/no_file_found.html'
+        zipfile = {:message => "no file"}
-        return
       end
     elsif params[:obj_class] == "HomeworkCommon"
       homework = HomeworkCommon.find params[:obj_id]
@@ -41,8 +40,7 @@ class ZipdownController < ApplicationController
       if file_count > 0
         zipfile = zip_homework_common homework
       else
-        render file: 'public/no_file_found.html'
+        zipfile = {:message => "no file"}
-        return
       end
     else
       logger.error "[ZipDown#assort] ===> #{params[:obj_class]} unKown !!"
@@ -62,7 +60,7 @@ class ZipdownController < ApplicationController
         unless homework.attachments.empty?
           zipfile = zip_homework_by_user homework
           send_file zipfile.file_path, :filename =>  ((homework.user.user_extensions.nil? || homework.user.user_extensions.student_id.nil?) ? "" : homework.user.user_extensions.student_id) +
-              "_" + (homework.user.lastname.nil? ? "" : homework.user.lastname) + (homework.user.firstname.nil? ? "" : homework.user.firstname) +
+              "_" + homework.user.show_name +
               "_" + homework.name + ".zip", :type => detect_content_type(zipfile.file_path) if(zipfile)
         else
           render file: 'public/no_file_found.html'
@@ -150,7 +148,7 @@ class ZipdownController < ApplicationController
       end
     end
     out_file = find_or_pack(homework_attach.bid_id, homework_attach.user_id, digests.sort){
-      zipping("#{homework_attach.user.lastname}#{homework_attach.user.firstname}_#{((homework_attach.user.user_extensions.nil? || homework_attach.user.user_extensions.student_id.nil?) ? "" : homework_attach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
+      zipping("#{homework_attach.user.show_name}_#{((homework_attach.user.user_extensions.nil? || homework_attach.user.user_extensions.student_id.nil?) ? "" : homework_attach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
               homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
     }
   end
@@ -170,7 +168,7 @@ class ZipdownController < ApplicationController
       end
     end
     out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
-      zipping("#{work.user.lastname}#{work.user.firstname}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
+      zipping("#{work.user.show_name}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
               homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
     }
   end

app/helpers/activity_notifys_helper.rb

@@ -0,0 +1,7 @@
+module ActivityNotifysHelper
+  def get_new_notify_count(container,type)
+    logger.info('xxoo')
+    query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=?',container.id,type,User.current.id);
+    return query.count()
+  end
+end

app/models/mailer.rb

@@ -115,14 +115,15 @@ class Mailer < ActionMailer::Base
       count = courses.count
       count = count - 1
       for i in 0..count do
-        bids =  courses[i].homeworks.where("bids.created_on between '#{date_from}' and '#{date_to}'").order("bids.created_on desc")
+        bids =  courses[i].homework_commons.where("homework_commons.created_at between '#{date_from}' and '#{date_to}'").order("homework_commons.created_at desc")
         attachments = courses[i].attachments.where("attachments.created_on between '#{date_from}' and '#{date_to}'").order('attachments.created_on DESC')
         @bids += bids if bids.count > 0
         @attachments += attachments if attachments.count > 0
+
       end
     end
     # user 提交的作业
-    @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc")
+    # @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc")
 
     # 查询user在课程。项目中发布的讨论帖子
     messages = Message.find_by_sql("select me.* from messages me, boards b, members m where
@@ -157,7 +158,7 @@ class Mailer < ActionMailer::Base
     @memos = Memo.find_by_sql("select DISTINCT m.* from memos m, forums f where (m.author_id = #{user.id} or (m.forum_id = f.id and f.creator_id = #{user.id}))
                            and (m.created_at between '#{date_from}' and '#{date_to}')  order by m.created_at desc")
 
-    has_content = [@issues,@homeworks,@course_messages,@project_messages,@course_news,@project_news,
+    has_content = [@issues,@course_messages,@project_messages,@course_news,@project_news,
                    @course_journal_messages,@user_journal_messages,@forums,@memos,@attachments,@bids].any? {|o| !o.empty?}
     mylogger.debug "Sent activity mail : #{user.mail} - #{has_content}"
     #有内容才发，没有不发

app/models/user.rb

@@ -277,15 +277,18 @@ class User < Principal
   end
   
   def show_name
+    name = ""
     unless self.user_extensions.nil?
       if self.user_extensions.identity == 2
-        firstname
+        name = firstname
       else
-        lastname+firstname
+        name = lastname+firstname
       end
     else
-      lastname+firstname
+      name = lastname+firstname
     end
+    name = name.empty? || name.nil? ? login : name
+    name
   end
   ## end
   

app/services/users_service.rb

@@ -255,7 +255,9 @@ class UsersService
           watcher.push(params[:user_id])
           scope = scope.where("id not in (?)",watcher)
         end
-        scope = scope.like(params[:name],search_by)
+        #scope = scope.like(params[:name],search_by)
+        scope = scope.where("( LOWER(login) LIKE ? or LOWER(concat(lastname, firstname)) LIKE ? or LOWER(mail) LIKE ? )",
+                            "%#{params[:name]}%","%#{params[:name]}%","%#{params[:name]}%")
       end
       #modify by yutao 2015/5/18 没有params[:user_id]参数时去掉"id not in (?)"条件 end
     else

app/views/boards/show.html.erb

@@ -1,11 +1,11 @@
 <style type="text/css">
-    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
     span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
     div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
     span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    div.ke-toolbar .ke-outline{border:none;}
+    div.ke-toolbar .ke-outline{border:none;}*/
     .break_word {width:100%;}
 </style>
 <script type="text/javascript">
@@ -33,7 +33,8 @@
     else if (window.attachEvent)
         window.attachEvent("onload", buildsubmenus)
 </script>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
 
 <% if @project %>
     <%= render :partial => 'project_show', locals: {project: @project} %>
@@ -123,21 +124,20 @@ function nh_init_board(params){
         if(params.textarea.data('init') == undefined){
             //初始化编辑器
             var editor = params.kindutil.create(params.textarea, {
-                resizeType : 1,
+//                allowPreviewEmoticons : false,
-                allowPreviewEmoticons : false,
+//                allowImageUpload : false,
-                allowImageUpload : false,
+                resizeType : 1,minWidth:"1px",width:"565px",height:"150px",
-                minWidth:"1px",
+                allowFileManager:true,uploadJson:"/kindeditor/upload",
-                width:"565px",
+                fileManagerJson:"/kindeditor/filemanager",
-                items : ['emoticons'],
                 afterChange:function(){//按键事件
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
                 },
                 afterCreate:function(){
-                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
+//                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
-                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
+//                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
-                    params.toolbar_container.append(toolbar);
+//                    params.toolbar_container.append(toolbar);
                 }
-            });
+            }).loadPlugin('paste');
 
             //主题输入框按键事件
             params.inputsubject.keyup(function(){

app/views/courses/show.html.erb

@@ -1,14 +1,20 @@
 <div class="project_r_h">
 <% if @controller_name=='ActivityNotifys' %>
-  <a class="fl about_me" href="<%=course_path(@course)%>"><%= l(:label_activity)%></a>
+  <a class="fl about_me" style="width:80px;" href="<%=course_path(@course)%>"><%= l(:label_activity)%></a>
-  <h2 class="fl project_h2">与我相关</h2>
+  <h2 class="fl project_h2" style="width:100px;">与我相关
+    <span class="c_orange f12" style="display:none;">(<font id="new_notify_count"><%=get_new_notify_count(@course,'Course')%></font>)</span>
+  </h2>
   <div class="fr mt10 mr5 c_grey02">
-    <label class="mr5" style="cursor:pointer;" data-href="<%= course_activity_notifys_path(@course) %>/chang_read_flag" nhname='nh_act_link_all'>全部标为已读</label>
+    <a class="c_dblue">
+      <label class="mr5" style="cursor:pointer;" data-href="<%= course_activity_notifys_path(@course) %>/chang_read_flag" nhname='nh_act_link_all'>全部标为已读</label>
+    </a>
   </div>
 <% else %>
   <h2 class="fl project_h2"><%= l(:label_activity)%></h2>
   <% if User.current.logged? %>
-  <a class="fl about_me" href="<%=course_activity_notifys_path(@course)%>">与我相关</a>
+  <a class="fl about_me" href="<%=course_activity_notifys_path(@course)%>">与我相关
+    <span class="c_orange f12" style="display:none;">(<font id="new_notify_count"><%=get_new_notify_count(@course,'Course')%></font>)</span>
+  </a>
   <% end %>
 <% end %>
 </div>
@@ -35,7 +41,7 @@
                             :class => "problem_tit c_dblue fl fb",'data-type'=>e.event_type,
                             'data-notify-id'=>(e.respond_to?('get_notify_id') ? e.get_notify_id : ''),:nhname=>"nh_act_link",
                             'data-href'=>(course_activity_notifys_path(@course)+"/chang_read_flag?an_id="+(e.respond_to?('get_notify_id') ? e.get_notify_id : '').to_s)%>
-                <%if @controller_name=='ActivityNotifys' && !e.get_notify_is_read%>
+                <%if @controller_name=='ActivityNotifys' && e.get_notify_is_read!=1%>
                 <span nhname="nh_act_flag" class="ml10 fl"><img src="/images/new.png" width="35" height="15"/></span>
                 <%end%>
                 <br />
@@ -49,6 +55,8 @@
             </div><!--课程动态 end-->
         <% end%>
     <% end%>
+<% elsif @controller_name=='ActivityNotifys' %>
+    <p class="nodata"><%= l(:label_no_data) %></p>
 <% end%>
 <% if @obj_pages.next_page.nil? && @controller_name!='ActivityNotifys' %>
 <div class="problem_main">
@@ -76,6 +84,14 @@
 
 <script type="text/javascript">
   $(function(){
+      function nh_new_notify_count_show(){
+          var new_notify_count = $("#new_notify_count").html();
+          if(new_notify_count>0){
+              $("#new_notify_count").parent('span').show();
+          }else{
+              $("#new_notify_count").parent('span').hide();
+          }
+      }
       $("div[nhname='container']").each(function(){
           var container = $(this);
           var btn = $("a[nhname='nh_act_link']",container);
@@ -88,6 +104,8 @@
                       $.ajax({url:url,dataType:'text',success:function(data){
                           if(data == 'true'){
                               flag.remove();
+                              $("#new_notify_count").html($("#new_notify_count").html()-1);
+                              nh_new_notify_count_show();
                           }
                       }});
                   }
@@ -100,8 +118,11 @@
           $.ajax({url:url,dataType:'text',success:function(data){
               if(data == 'true'){
                   $("span[nhname='nh_act_flag']").remove();
+                  $("#new_notify_count").html('0');
+                  nh_new_notify_count_show();
               }
           }});
       });
+      nh_new_notify_count_show();
   });
 </script>

app/views/files/_course_file.html.erb

@@ -31,7 +31,7 @@
         }
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
         $('#ajax-modal').parent().css("top","").css("left","");
         $('#ajax-modal').parent().addClass("popbox_polls");
     }

app/views/files/_project_file_new.html.erb

@@ -5,7 +5,7 @@
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show_project',:locals => {:project => project}) %>');
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
         $('#ajax-modal').parent().css("top","40%").css("left","36%");
         $('#ajax-modal').parent().addClass("popbox_polls");
     }

app/views/files/quote_resource_show.js.erb

@@ -6,6 +6,6 @@
 
 showModal('ajax-modal', '513px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
 $('#ajax-modal').parent().css("top","").css("left","");
 $('#ajax-modal').parent().addClass("popbox_polls");

app/views/files/quote_resource_show_project.js.erb

@@ -6,6 +6,6 @@
 
 showModal('ajax-modal', '513px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'><a href='javascript:void(0)' onclick='closeModal()'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
 $('#ajax-modal').parent().css("top","30%").css("left","35%");
 $('#ajax-modal').parent().addClass("popbox_polls");

app/views/homework_common/index.html.erb

@@ -16,9 +16,9 @@
     <div class="problem_main">
       <%= link_to(image_tag(url_to_avatar(homework.user), :width => "42", :height => "42"), user_path(homework.user), :class => "problem_pic fl") %>
       <div class="problem_txt fl mt5">
-        <%= link_to(homework.user.lastname+homework.user.firstname, user_path(homework.user),:class => 'problem_name fl') %>
+        <%= link_to(homework.user.lastname+homework.user.firstname, user_path(homework.user),:class => 'problem_name fl',:target => "_blank") %>
         <span class="fl"> <%= l(:label_user_create_project_homework) %>：</span>
-        <%= link_to(homework.name, student_work_index_path(:homework => homework.id), :class => 'problem_tit fl fb c_dblue') %>
+        <%= link_to(homework.name, student_work_index_path(:homework => homework.id), :class => 'problem_tit fl fb c_dblue',:target => "_blank") %>
         <div class="cl mb5"></div>
         <p class="fl ">
           <%= l(:lebel_homework_commit)%>

app/views/layouts/base_users.html.erb

@@ -218,9 +218,8 @@
                                                     </td>
                                                   </tr>
                                                  <% end %>
-                                              <% unless @user.user_extensions.nil?&&@user.user_extensions.location.empty?%>
+                                              <% if @user.user_extensions && @user.user_extensions.location && !@user.user_extensions.location.empty?%>
                                                 <tr>
-
                                                     <td style=" float: right" width="70px">
                                                      <span style="float: right"> <%= l(:label_location) %>：</span>
                                                     </td>

app/views/mailer/message_posted.html.erb

@@ -23,7 +23,7 @@
     </li>
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-        	<%= @message.content %>
+        	<%= @message.content.html_safe %>
         </span>
     </li>
 

app/views/mailer/send_for_user_activities.html.erb

@@ -3,7 +3,7 @@
   <%= @subject %>
 </h4>
 <% if @attachments.first || @course_news.first || @bids.first ||
-        @homeworks.first || @course_journal_messages.first|| @course_messages.first %>
+        @course_journal_messages.first|| @course_messages.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h2 class="wmail_h2" style="color:#15bccf; "><%= l(:label_course_overview)%></h2>
       <% unless @course_news.first.nil? %>
@@ -39,7 +39,7 @@
       <% end %>
 
       <!--课程作业-->
-      <% if  !@bids.first.nil?  || !@homeworks.first.nil? %>
+      <% if  !@bids.first.nil? %>
           <ul class="wmail_ul" style="clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
             <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;"><%= l(:label_homework_overview) %><span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @bids.count %>)</span></h4>
             <% unless @bids.first.nil?%>
@@ -65,29 +65,6 @@
                     </li>
                 <% end %>
             <% end %>
-            <% unless @homeworks.first.nil? %>
-                <% @homeworks.each do |homework| %>
-                    <li style="clear: both; list-style: none;">
-                      <span class="wmail_dis" style="float:left; color:#000000; margin-right:5px;">▪</span>
-                      <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">[</span>
-
-                      <%= link_to truncate(homework.bid.courses.first.name,length: 30,omission: '...'), course_url(homework.bid.courses.first, :token => @token.value),
-                                  :class=> "wmail_column",
-                                  :style=> " font-weight: bold; display:block; float:left; color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %>
-                      <span class="wmail_b" style="color:#1b55a7; font-weight:bold; float:left;">]</span>
-
-                      <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value), :class => "wmail_name",
-                                  :style => "color:#fe5722; float:left;display:block; margin-right:5px; margin-left:5px;  overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"%>
-                      <span class="wmail_txt" style="float:left; margin-right:5px;color:#6e6e6e;"><%= l(:label_course_submit_homework) %></span>
-
-                      <%= link_to truncate(homework.name,length: 30,omission: '...'), course_for_bid_url(:id => homework.bid.id,:token => @token.value),
-                                  :class => 'wmail_info',
-                                  :style => "color:#5a5a5a; float:left;   margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;"
-                      %>
-                      <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(homework.created_at) %></span>
-                    </li>
-                <% end %>
-            <% end %>
 
             <div class="cl"></div>
           </ul><!--作业动态 end-->
@@ -262,7 +239,7 @@
       <% unless @project_news.first.nil? %>
           <ul class="wmail_ul" style=" list-style-type:none;clear: both;margin-left:10px; border-bottom:1px dashed #cfcfcf; padding-bottom:15px; width:720px; margin-bottom:15px;">
             <h4 class="wmail_h4" style="color:#474646; font-size:14px; margin-bottom:5px;" >
-              <%= l(:label_course_news) %>
+              <%= l(:label_project_news) %>
               <span class="wmail_num" style="color:#fe3f0c; margin-left:5px; font-weight:normal;">(<%= @project_news.count %>)</span>
             </h4>
             <% @project_news.each do |project_new|%>

app/views/mailer/send_for_user_activities.text.erb

@@ -1,6 +1,6 @@
 <%= @subject %>
 <% if @attachments.first || @course_news.first || @bids.first ||
-        @homeworks.first || @course_journal_messages.first|| @course_messages.first %>
+      @course_journal_messages.first|| @course_messages.first %>
 <%= l(:label_course_overview)%>
   <% unless @course_news.first.nil? %>
          <%= l(:label_course_news) %>
@@ -27,7 +27,7 @@
         <% end %>
 
   <% end %>
-  <% if  !@bids.first.nil?  || !@homeworks.first.nil? %>
+  <% if  !@bids.first.nil? %>
     <%= l(:label_homework_overview) %><%= @bids.count %>
         <% unless @bids.first.nil?%>
             <% @bids.each do |bid| %>
@@ -51,26 +51,6 @@
 
             <% end %>
         <% end %>
-        <% unless @homeworks.first.nil? %>
-            <% @homeworks.each do |homework| %>
-                ▪[
-
-                  <%= link_to truncate(homework.bid.courses.first.name,length: 30,omission: '...'), course_url(homework.bid.courses.first, :token => @token.value)
-                               
-                                %>
-                  ]
-
-                  <%= link_to homework.user, user_activities_url(homework.user,:token => @token.value)  
-                               %>
-               <%= l(:label_course_submit_homework) %>
-
-                  <%= link_to truncate(homework.name,length: 30,omission: '...'), course_for_bid_url(homework.bid,:token => @token.value)
-                               
-                               
-                  %>
-               <%= format_time(homework.created_at) %>  
-            <% end %>
-        <% end %>
 
 
      <!--作业动态 end-->

app/views/mailer/send_invite_in_project.html.erb

@@ -4,9 +4,9 @@
 
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-        	<p><%= @subject %> </p>
+          <p><%= @subject %> </p>
-           <p> <%= link_to @project_url, @project_url%></p>
+          <p style="color: #15BCCF ">点击下面的链接即可激活账号，系统会根据给出的密码和账号自动登录Trustie平台。</p>
-          <p>点击链接后，将自动为您注册账号</p>
+          <p> <%= link_to @project_url, @project_url%></p>
           <p>您的账号为:<%= @email %></p>
           <p>密码为： <%= @password %></p>
 

app/views/mailer/wiki_content_added.html.erb

@@ -1,3 +1,3 @@
 <p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
                                         :author => h(@wiki_content.author)).html_safe %><br />
-<em><%=h @wiki_content.comments %></em></p>
+<em><%=h @wiki_content.comments.html_safe %></em></p>

app/views/projects/invite_members_by_mail.html.erb

@@ -79,19 +79,23 @@
   <% end %>
   <%# 邀请用户的状态 %>
   <% unless @inviter_lists.blank? %>
-      <div>
+    <div>
+      <% if @inviters_count > 0 %>
         <span class="status_inviter">已邀请的用户</span><br/>
         <% @inviter_lists.each do |inviter_list| %>
-            <%= inviter_list.user.name %><br/>
+            <%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
         <% end %>
-        </br>
+      <% end %>
+      </br>
+      <% unless @waiters_count.nil? %>
         <span class="status_inviter">等待加入项目的用户</span><br/>
         <% @inviter_lists.each do |inviter_list| %>
-            <% unless inviter_list.user.member_of?(@project) %>
+          <% unless inviter_list.user.member_of?(@project) %>
-                <%= inviter_list.user.name %><br/>
+            <%= inviter_list.user.name unless inviter_list.user.nil? %><br/>
-            <% end %>
+          <% end %>
         <% end %>
-      </div>
+      <% end %>
+    </div>
   <% end %>
 </div>
 

app/views/student_work/index.html.erb

@@ -36,7 +36,7 @@
       </span>
       <% if @show_all%>
         <input  type="text" value="<%= @name%>" placeholder="昵称、学号、姓名搜索" class="min_search ml10 fl" onkeypress="SearchByName($(this),'<%= student_work_index_path(:homework => @homework.id)%>',event);">
-        <a class="student_work_search fl" onclick="SearchByName($(this).prev(),'<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
+        <a class="student_work_search fl" onclick="SearchByName_1($(this).prev(),'<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)">搜索</a>
       <% end%>
       <% if @is_teacher%>
           <div class="fr">

app/views/users/search.html.erb

@@ -30,8 +30,8 @@
 			<td rowspan="2" >	
 			<div class="project-search" style="float: right">
               <!--label for="user_browse_label"><%#= l(:label_user_search_type) %></label-->
-              <%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]],@search_by), :onchange => "searchByChange();" )  %>
+              <%= select_tag(:search_by,options_for_select([["昵称","0"],["姓名","1"],["邮箱","2"]],@search_by), :onchange => "searchByChange();",:style=>'display:none;' )  %>
-			  <%= text_field_tag 'name', params[:name], :size => 30 %>
+			  <%= text_field_tag 'name', params[:name], :size => 30, :placeholder=>'昵称/姓名/邮箱' %>
               <input type="text" name="search_by_input" hidden="hidden;" id="search_by_input" value="0">
             <input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>
 			<%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>

app/views/welcome/_search_project.html.erb

@@ -73,11 +73,13 @@ form #search_by
   {
       if($("#search_type").val() == "users")
       {
-          $("#search_by").show();
+          $("#q").attr('placeholder','昵称/姓名/邮箱');
+//          $("#search_by").show();
       }
       else
       {
           $("#search_by").hide();
+          $("#q").attr('placeholder',"<%=l('welcome.search.information')%>");
       }
   }
 
@@ -93,7 +95,7 @@ form #search_by
 		<%= text_field_tag :q, nil, :placeholder => l('welcome.search.information'), style:"float:left; width:185px;" %>
         <input type="text" name="search_by_input" style="display: none" id="search_by_input" value="0">
 		<%= select_tag(:search_type, options_for_select(select_option), :onchange => "searchTypeChange();", :style => "float:right" ) %>
-        <%= select_tag(:search_by,options_for_select([[l('welcome.search.select.userinfo.nickname'),"0"],[l('welcome.search.select.userinfo.showname'),"1"],[l('welcome.search.select.userinfo.email'),"2"]]), :onchange => "searchByChange();",:style => "float:right" )  %>
+        <%= select_tag(:search_by,options_for_select([[l('welcome.search.select.userinfo.nickname'),"0"],[l('welcome.search.select.userinfo.showname'),"1"],[l('welcome.search.select.userinfo.email'),"2"]]), :onchange => "searchByChange();",:style => "float:right;display:none;" )  %>
 	</div>
 		<%#= hidden_field_tag 'project_type', project_type %>
 </div>

config/locales/projects/zh.yml

@@ -86,7 +86,7 @@ zh:
   label_roadmap: 里程碑 #版本路线图
   project_module_dts: DTS测试工具
   label_project_tool_response: 用户反馈
-  label_course_news: 项目新闻
+  label_project_news: 项目新闻
 
   label_project_overview: "项目简介"
   label_expend_information: 展开更多信息

config/routes.rb

@@ -257,7 +257,6 @@ RedmineApp::Application.routes.draw do
   post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
   post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
   # boards end
-  # delete 'bids/homework', :to => 'bids#homework_destroy'
 
   # Misc issue routes. TODO: move into resources
   match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
@@ -764,7 +763,6 @@ RedmineApp::Application.routes.draw do
   delete 'attachment/:id', :to => 'attachments#delete_homework'
   match 'new_join', :to => 'courses#new_join', :as => 'try_join'
   match 'new_join_group', :to => 'courses#new_join_group', :as => 'try_join_group'
-  # match 'new_join_in_contest', :to => 'bids#new_join', :as => 'try_join_in_contest'
   match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post
 
   ########################

lib/redmine.rb

@@ -451,7 +451,7 @@ Redmine::MenuManager.map :user_enterprise_menu do |menu|
  
   menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.host_name}
   
-  menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.host_user}
+  # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.host_user}
   menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.host_user}
   
 end
@@ -459,7 +459,7 @@ Redmine::MenuManager.map :user_menu_self do |menu|
   menu.push :activity, {:controller => 'users', :action => 'show', :host => Setting.host_name }
   menu.push :user_information, {:controller => 'users', :action => 'info', :host => Setting.host_user}  
   menu.push :user_project, {:controller => 'users', :action => 'user_projects', :host => Setting.host_name}
-  menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.host_user}
+  # menu.push :requirement_focus, {:controller => 'users', :action => 'watch_bids', :host => Setting.host_user}
   menu.push :user_newfeedback, {:controller => 'users', :action => 'user_newfeedback', :host => Setting.host_user}
   
 end

public/javascripts/application.js

@@ -901,24 +901,30 @@ $(function(){
     $('#download_homework_attachments').bind('ajax:complete', function (event, data, status, xhr) {
         if(status == 'success'){
             var res = JSON.parse(data.responseText);
-            if(res.length<1){
+            if(res.length == null){
+                alert("该作业没有任何附件可下载");
+            }
+            else if(res.length<1){
                 return;
             }
-            if(res.length==1){
+            else
-                location.href = '/zipdown/download?file='+res[0].file;return;
+            {
-            }
+                if(res.length==1){
-            document.getElementById('light').style.display='block';
+                    location.href = '/zipdown/download?file='+res[0].file;return;
-            $container = $('#light .upload_box_ul');
-            $container.empty();
-            for(var i = 0; i <res.length; ++i){
-                var des = '';
-                if(res.count > 1){
-                    des = '第'+res[i].index+'-'+(res[i].count+res[i].index-1)+'个学生的作品下载';
-                } else {
-                    des = '第'+res[i].index+'个学生的作品下载';
                 }
-                $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="/zipdown/download?file='+res[i].file+'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
+                document.getElementById('light').style.display='block';
+                $container = $('#light .upload_box_ul');
+                $container.empty();
+                for(var i = 0; i <res.length; ++i){
+                    var des = '';
+                    if(res.count > 1){
+                        des = '第'+res[i].index+'-'+(res[i].count+res[i].index-1)+'个学生的作品下载';
+                    } else {
+                        des = '第'+res[i].index+'个学生的作品下载';
+                    }
+                    $('<li><span class="upload_box_span" >'+(i+1)+'.</span> <a href="/zipdown/download?file='+res[i].file+'">'+des+'</a><span class="c_grey">&nbsp;&nbsp;（共'+res[i].size+'M）</span> </li>').appendTo($container);
 
+                }
             }
         }
     });

public/javascripts/course.js

@@ -470,7 +470,15 @@ $(function(){
 //老师提交 新建/修改 作业
 function submit_homework(id)
 {
-    if(regex_homework_name()&&regex_evaluation_num())
+    if(!regex_homework_name())
+    {
+        $("#homework_name").focus();
+    }
+    else if(!regex_evaluation_num())
+    {
+        $("#evaluation_num").focus();
+    }
+    else
     {
         homework_description_editor.sync();
         $("#"+id).submit();
@@ -757,8 +765,8 @@ function goTopEx() {
     }
 }
 
-//匿评评分提示
 $(function(){
+    //匿评评分提示
     $(".student_score_info").bind("mouseover",function(e){
          //alert($(this).html());
         $(this).find("div").show();
@@ -769,6 +777,8 @@ $(function(){
          //alert($(this).html());
         $(this).find("div").hide();
     });
+
+    $("#about_project label").eq(1).remove();
 });
 
 //匿评弹框取消按钮
@@ -793,11 +803,7 @@ function SearchByName(obj,url,event)
         location.href = url + "&name=" + obj.val();
     }
 }
-function SearchByName(obj,url)
+function SearchByName_1(obj,url)
 {
     location.href = url + "&name=" + obj.val();
 }
-
-$(function(){
-    $("#about_project label").eq(1).remove();
-});

public/stylesheets/courses.css

@@ -380,8 +380,6 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
 .attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
 a.remove-upload:hover {text-decoration:none !important;}
-.attachments_fields input.is_public_checkbox {width:20px;}
-
 
 .attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
 a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}
@@ -679,7 +677,7 @@ input#score{ width:40px;}
 
 /* 与我相关 */
 .new_icon{background:url(../images/new_icon.png) 0px 0px no-repeat; width:35px; height:15px; display:block;}
-a.about_me{ width:80px;text-align:center;font-size:16px; color:#64bdd9; margin:10px 0 0 10px;}
+a.about_me{text-align:center;font-size:16px; color:#64bdd9; margin:10px 0 0 10px;}
 a:hover.about_me{ color:#0781b4;}
 
 

public/stylesheets/project.css

@@ -241,8 +241,6 @@ blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;}
 #attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
 #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
 a.remove-upload:hover {text-decoration:none !important;}
-#attachments_fields input.is_public_checkbox {width:20px;}
-
 
 #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
 a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;}

public/stylesheets/public.css

@@ -438,3 +438,4 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 .tl{text-align: left;}
 img{max-width: 100%;}
 .attachments {clear: both;}
+.is_public_checkbox{margin-left: 15px;margin-right: 10px;}