Merge branch 'szzh' into dev_hjq

app/controllers/comments_controller.rb

@@ -50,11 +50,15 @@ class CommentsController < ApplicationController
       # # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
       flash[:notice] = l(:label_comment_added)
       course_activity = CourseActivity.where("course_act_type='News' and course_act_id =#{@news.id}").first
-      course_activity.updated_at = Time.now
-      course_activity.save
+      if course_activity
+        course_activity.updated_at = Time.now
+        course_activity.save
+      end
       user_activity = UserActivity.where("act_type='News' and act_id =#{@news.id}").first
-      user_activity.updated_at = Time.now
-      user_activity.save
+      if user_activity
+        user_activity.updated_at = Time.now
+        user_activity.save
+      end
     end
 
     if params[:user_activity_id]

app/controllers/files_controller.rb

@@ -176,12 +176,6 @@ class FilesController < ApplicationController
 
   def index
     @flag = params[:flag] || false
-    #sort_init 'filename', 'asc'
-    # sort_init 'created_on', 'desc'
-    # sort_update   'created_on' => "#{Attachment.table_name}.created_on",
-    #               'filename' => "#{Attachment.table_name}.filename",
-    #               'size' => "#{Attachment.table_name}.filesize",
-    #               'downloads' => "#{Attachment.table_name}.downloads"
     sort = ""
     @sort = ""
     @order = ""

app/controllers/git_usage_controller.rb

@@ -1,12 +0,0 @@
-#added by baiyu
-class GitUsageController < ApplicationController
-  layout "new_base"
-  def ch_usage
-    
-  end
-  
-  def en_usage
-    
-  end
-end
-#end

app/controllers/messages_controller.rb

@@ -163,11 +163,15 @@ class MessagesController < ApplicationController
     # @reply.reply_id = params[:id]
     @topic.children << @reply
     course_activity = CourseActivity.where("course_act_type='Message' and course_act_id =#{@topic.id}").first
-    course_activity.updated_at = Time.now
-    course_activity.save
+    if course_activity
+      course_activity.updated_at = Time.now
+      course_activity.save
+    end
     user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first
-    user_activity.updated_at = Time.now
-    user_activity.save
+    if user_activity
+      user_activity.updated_at = Time.now
+      user_activity.save
+    end
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
       if params[:asset_id]

app/controllers/news_controller.rb

@@ -175,19 +175,19 @@ class NewsController < ApplicationController
           update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
         end
         # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add start
-        teachers = searchTeacherAndAssistant(@course)
-        for teacher in teachers
-          if(teacher.user_id != User.current.id)
-            notify = ActivityNotify.new()
-            notify.activity_container_id = @course.id
-            notify.activity_container_type = 'Course'
-            notify.activity_id = @news.id
-            notify.activity_type = 'News'
-            notify.notify_to = teacher.user_id
-            notify.is_read = 0
-            notify.save()
-          end
-        end
+        # teachers = searchTeacherAndAssistant(@course)
+        # for teacher in teachers
+        #   if(teacher.user_id != User.current.id)
+        #     notify = ActivityNotify.new()
+        #     notify.activity_container_id = @course.id
+        #     notify.activity_container_type = 'Course'
+        #     notify.activity_id = @news.id
+        #     notify.activity_type = 'News'
+        #     notify.notify_to = teacher.user_id
+        #     notify.is_read = 0
+        #     notify.save()
+        #   end
+        # end
         # <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ض<EFBFBD>̬<EFBFBD>ļ<EFBFBD>¼add end
         render_attachment_warning_if_needed(@news)
         flash[:notice] = l(:notice_successful_create)

app/controllers/student_work_controller.rb

@@ -174,11 +174,15 @@ class StudentWorkController < ApplicationController
 
       if student_work.save
         course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
-        course_activity.updated_at = Time.now
-        course_activity.save
+        if course_activity
+          course_activity.updated_at = Time.now
+          course_activity.save
+        end
         user_activity = UserActivity.where("act_type='HomeworkCommon' and act_id =#{@homework.id}").first
-        user_activity.updated_at = Time.now
-        user_activity.save
+        if user_activity
+          user_activity.updated_at = Time.now
+          user_activity.save
+        end
         respond_to do |format|
           format.html {
             flash[:notice] = l(:notice_successful_create)
@@ -267,6 +271,7 @@ class StudentWorkController < ApplicationController
       end
       @is_new = false
     else
+      @is_last_a = @work.student_works_scores.empty?
       @score = StudentWorksScore.new
       @score.score = params[:score] if params[:score]
       @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""

app/controllers/tags_controller.rb

@@ -246,7 +246,7 @@ class TagsController < ApplicationController
     if  @taggable_id.blank? #如果没有传tag_id，那么直接更新tag_name就好了。但是要防止 重命名后的tag存在。
       #看重命名后的tag是否存在。如果存在的话，只需要更改taggings里边的id即可
       if @rename_tag
-        @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_type(@tag_id,@taggable_id,@taggable_type)
+        @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_type(@tag_id,@taggable_type)
         @taggings.update_attributes({:tag_id=>@rename_tag.id})
       else #如果不存在，那么就直接更新该tag名称为新的名称
         (ActsAsTaggableOn::Tag.find_by_name(@tag_name)).update_attributes(:name=>@rename_tag_name)

app/controllers/users_controller.rb

@@ -358,6 +358,7 @@ class UsersController < ApplicationController
 
   #导入作业
   def user_import_homeworks
+    @select_course = params[:select_course] ? 1 : 0
     @user_homeworks = HomeworkCommon.where(:user_id => @user.id).order("created_at desc")
     respond_to do |format|
       format.js
@@ -377,6 +378,7 @@ class UsersController < ApplicationController
     homework = HomeworkCommon.find_by_id params[:checkMenu]
     homework_detail_programing = homework.homework_detail_programing
     @homework = HomeworkCommon.new
+    @select_course = params[:select_course] || 0
     if homework
       @homework.name = homework.name
       @homework.description = homework.description

app/controllers/words_controller.rb

@@ -55,12 +55,16 @@ class WordsController < ApplicationController
     @jfm = add_reply_adapter options
     @save_succ = true if @jfm.errors.empty?
     if @save_succ
-    course_activity = CourseActivity.where("course_act_type='JournalsForMessage' and course_act_id =#{parent_id}").first
-    course_activity.updated_at = Time.now
-    course_activity.save
-    user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first
-    user_activity.updated_at = Time.now
-    user_activity.save
+      course_activity = CourseActivity.where("course_act_type='JournalsForMessage' and course_act_id =#{parent_id}").first
+      if course_activity
+        course_activity.updated_at = Time.now
+        course_activity.save
+      end
+      user_activity = UserActivity.where("act_type='JournalsForMessage' and act_id =#{parent_id}").first
+      if user_activity
+        user_activity.updated_at = Time.now
+        user_activity.save
+      end
     end
     respond_to do |format|
       # format.html {

app/models/homework_common.rb

@@ -40,9 +40,9 @@ class HomeworkCommon < ActiveRecord::Base
   def act_as_course_message
     if self.course
       self.course.members.each do |m|
-        if m.user_id != self.user_id
+        # if m.user_id != self.user_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
-        end
+        # end
       end
     end
   end

app/models/mailer.rb

@@ -53,7 +53,7 @@ class Mailer < ActionMailer::Base
     recipients ||= []
     course.members.each do |member|
       user = User.find(member.user_id)
-      # @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
       @token = Token.get_token_from_user(user, 'autologin')
       @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
       @anonymous_comment_close_name = homework_common.name
@@ -62,7 +62,7 @@ class Mailer < ActionMailer::Base
       recipients << user.mail
     end
     mail :to => recipients,
-         :subject => "[#{l(:mail_homework)}#{homework_common.name}] #{l(:mail_anonymous_comment_open)}"
+         :subject => @subject
   end
 
   # 作业匿评关闭
@@ -71,7 +71,7 @@ class Mailer < ActionMailer::Base
     recipients ||= []
     course.members.each do |member|
       user = User.find(member.user_id)
-      #@subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_open)}"
+      @subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_close)}"
       @token = Token.get_token_from_user(user, 'autologin')
       @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
       @anonymous_comment_close_name = homework_common.name
@@ -80,7 +80,7 @@ class Mailer < ActionMailer::Base
       recipients << user.mail
     end
     mail :to => recipients,
-         :subject => "[#{l(:mail_homework)}#{homework_common.name}]  #{l(:mail_anonymous_comment_open)}"
+         :subject => @subject
   end
 
   # 匿评失败给老师发送邮件通知
@@ -89,9 +89,9 @@ class Mailer < ActionMailer::Base
     recipients ||= []
     # 只给该课程的老师发送邮件提醒
     course.members.each do |member|
-      if m.user.allowed_to?(:as_teacher,course)
+      if member.user.allowed_to?(:as_teacher,course)
         user = User.find(member.user_id)
-        #@subject = "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
+        @subject = "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
         @token = Token.get_token_from_user(user, 'autologin')
         @anonymous_comment_fail_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
         @anonymous_comment_fail_name = homework_common.name
@@ -101,7 +101,7 @@ class Mailer < ActionMailer::Base
       end
     end
     mail :to => recipients,
-         :subject => "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
+         :subject => @subject
   end
 
   # author: alan

app/models/memo.rb

@@ -79,7 +79,7 @@ class Memo < ActiveRecord::Base
         receivers << self.forum.creator
       end
       # 添加发帖人
-      if  self.author_id != self.parent.author_id
+      if  self.author_id != self.parent.author_id &&  self.parent.author_id != self.forum.creator_id
         receivers << self.parent.author
       end
     end

app/views/avatar/_new_avatar_form.html.erb

@@ -2,10 +2,10 @@
   <%= image_tag(url_to_avatar(source), id: "avatar_image", :width =>"60", :height =>"60",:alt=>"上传图片")%>
 </a>
 <%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %>
-<a href="javascript:void(0)" class="upbtn fl"><%= l(:button_upload_photo) %></a>
+<a href="javascript:void(0)" class="upbtn fl" onclick="$('#upload_course_logo').click();"><%= l(:button_upload_photo) %></a>
 <%= file_field_tag 'avatar[image]',
-                   :id => nil,
-                   :class => 'upload_file',
+                   :id => 'upload_course_logo',
+                   :class => 'undis upload_file',
                    :size => "1",
                    :multiple => true,
                    :data => {

app/views/courses/_course_activity.html.erb

@@ -73,6 +73,25 @@
 
             $(function () {
                 init_activity_KindEditor_data(<%= activity.id%>, null, "87%");
+                var description_images=$("div#activity_description_<%= activity.id %>").find("img");
+                if (description_images.length>0) {
+                    for (var i=0; i<description_images.length; i++){
+                        var image=$(description_images[i]);
+                        var element=$("<a></a>").attr("href",image.attr('src'));
+                        image.wrap(element);
+                    }
+                }
+                $('#activity_description_<%= activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
+
+                var reply_images=$("div#reply_content_<%= activity.id %>").find("img");
+                if (reply_images.length>0) {
+                    for (var i=0; i<reply_images.length; i++){
+                        var image=$(reply_images[i]);
+                        var element=$("<a></a>").attr("href",image.attr('src'));
+                        image.wrap(element);
+                    }
+                }
+                $('#reply_content_<%= activity.id %> a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false});
             });
         </script>
             <% if activity %>

app/views/courses/show.html.erb

@@ -17,9 +17,9 @@
             <li><%= link_to "全部动态", {:controller => "courses", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%></li>
             <li><%= link_to "作业动态", {:controller => "courses", :action => "show", :type => "homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%></li>
             <li><%= link_to "通知动态", {:controller => "courses", :action => "show", :type => "news"}, :class => "homepagePostTypeNotice postTypeGrey"%></li>
-            <li><%= link_to "资源库动态", {:controller => "courses", :action => "show", :type => "attachment"}, :class => "resourcesTypeAtt resourcesGrey"%></li>
+            <li><%= link_to "资源库动态", {:controller => "courses", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey"%></li>
             <li><%= link_to "论坛动态", {:controller => "courses", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey"%></li>
-            <li><%= link_to "留言动态", {:controller => "courses", :action => "show", :type => "journalsForMessage"}, :class => "homepagePostTypeQuiz postTypeGrey"%></li>
+            <li><%= link_to "留言动态", {:controller => "courses", :action => "show", :type => "journalsForMessage"}, :class => "homepagePostTypeMessage postTypeGrey"%></li>
             <li><%= link_to "问卷动态", {:controller => "courses", :action => "show", :type => "poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%></li>
           </ul>
         </li>

app/views/files/_tag_yun.html.erb

@@ -1,9 +1,12 @@
 <% unless tag_list.nil?%>
     <% tag_list.each do |k,v|%>
         <% if tag_name && tag_name == k%>
-            <a href="javascript:void(0);" class="files_tag_select"><%= k%>×<%= v%></a>
+            <span  >    <a href="javascript:void(0);" class="files_tag_select" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% else%>
-        <span class="files_tag_icon">    <a  ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
+        <span class="files_tag_icon" >
+          <a  title="单击为过滤，双击可编辑"
+              onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(course)%>','<%= k%>','<%= @q%>','<%= course.id%>');"
+              ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% end%>
     <% end%>
 <% end%>

app/views/files/index.html.erb

@@ -234,6 +234,8 @@
     //第二种是改变某个tag名称。其他所有的资源如果拥有这个tag。那么对应的tag名也要改掉。
     //目前这两种依据 的来源就是 是否 传了参数 id。如果有id。就指定了资源id，就是第一种情况。如果没有id。就是第二种情况
     function rename_tag(domEle,name,id,type){
+        isdb = true; //这是双击
+        //clearTimeout(clickFunction);
         if(domEle.children().get(0) != undefined ){ //已经是编辑框的情况下不要动
             return;
         }
@@ -250,8 +252,10 @@
     }
   //监听所有的单击事件
    $(document.body).click(function(e){
+       isdb = false; //这是单击
        node = document.elementFromPoint(e.clientX, e.clientY);
        if(node.tagName == "INPUT"){ //如果是输入框的聚焦，那么就不要进行下去了
+           isdb = true; //为了防止在编辑的时候又去单击其他tag去过滤。导致tag过滤不可用
            return;
        }
            if($("#renameTagName")[0] != undefined ){//存在renameTagName,则处于编辑状态
@@ -260,15 +264,15 @@
                    ele.parent().html(tagNameHtml);
 
                }else{ //否则就要更新tag名称了
-                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){
+//                    if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){  去掉询问
                           $.post(
                                     '<%= update_tag_name_path %>',
                                     {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>}
                           )
-                   }else{
-                       ele.parent().css("border","");
-                       ele.parent().html(tagNameHtml);
-                   }
+//                   }else{
+//                       ele.parent().css("border","");
+//                       ele.parent().html(tagNameHtml);
+//                   }
                }
            }
    });

app/views/forums/_forum_list.html.erb

@@ -10,7 +10,7 @@
                 <a href="<%=  forum_path(forum) %>" class="f16 linkBlue" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%=forum.name.gsub(/(\r\n)/,'<br/>').html_safe %></a>
                 <%#= link_to forum.name.gsub(/(\r\n|\s+)/,'<br/>'), forum_path(forum),:class=>"f16 linkBlue" %>
               </div>
-              <div class="postDes" style="word-break: break-all;word-wrap : break-word ;white-space:pre-wrap;"><%= textAreailizable forum.description%></div>
+              <div class="postDes"><%= textAreailizable forum.description%></div>
               <div class="postCreater">创建者：<a href="<%= user_path( forum.creator)%>" class="linkGrey2" target="_blank"><%= forum.creator.name %></a></div>
               <div class="postDate">创建时间：<%= format_date(forum.created_at) %></div>
             </div>

app/views/forums/index.html.erb

@@ -135,7 +135,7 @@
      <div id="new_forum_div" class="mb5" style="display: none">
        <div class="red fl mb10" id="error" style="display: none">error</div>
        <%= form_tag({:controller => 'forums',:action=>'create',:format=>'js'},:method => 'post',:remote=>'true') do  |f| %>
-       <div class="mt15">
+       <div>
          <textarea type="text" name="forum[name]"  id="forum_name" maxlength="80"  class="postCreateInput" onfocus="hideError();" onblur="check_forum_name();" placeholder="输入贴吧名称"  ></textarea>
          <script>
            var textarea = document.getElementById('forum_name');

app/views/issues/show.html.erb

@@ -28,7 +28,7 @@
     <a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>
     <div class="cl"></div>
     <% if @issue.description? || @issue.attachments.any? -%>
-        <div class="talk_info mb10" style="word-break:break-all;">
+        <div class="talk_info mb10 issue_desc" style="word-break:break-all;">
           <% if @issue.description? %>
               <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
               <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>

app/views/layouts/_logined_header.html.erb

@@ -94,11 +94,13 @@
       </li>
     </ul>
   </div>
+
   <div class="navHomepageNews">
     <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon" %>
     <% if User.current.count_new_message >0 %>
-        <div ><%= link_to "" , user_message_path(User.current), :class => "newsActive" %></div>
+        <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive" %></div>
     <% end %>
+      <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
   </div>
 </div>
 

app/views/layouts/base.html.erb

@@ -19,7 +19,7 @@
 <%= yield :header_tags -%>
   <%= stylesheet_link_tag 'base','header', :media => 'all'%>
 </head>
-<body class="<%=h body_css_classes %>">
+<body class="<%=h body_css_classes %>" onload="prettyPrint();">
 
 <div class="cl"></div>
 <div class="navContainer mb10">

app/views/layouts/base_courses.html.erb

@@ -23,7 +23,7 @@
   <%= yield :header_tags -%>
 </head>
 <!--add by huang-->
-<body>
+<body onload="prettyPrint();">
 <div class="navContainer mb10">
   <% if User.current.logged? %>
       <%= render :partial => 'layouts/logined_header' %>