diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb
index ef7cdf2f7..afd206c92 100644
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@@ -1,9 +1,9 @@
 class AvatarController < ApplicationController
-  
-     
+
+  include ActionView::Helpers::NumberHelper
   #before_filter :set_cache_buster   
   include AvatarHelper
-      
+
   def upload
     # Make sure that API users get used to set this content type
     # as it won't trigger Rails' automatic parsing of the request body for parameters
@@ -29,43 +29,51 @@ class AvatarController < ApplicationController
     end
 
     if  @temp_file && (@temp_file.size > 0)
-      diskfile=disk_filename(@source_type,@source_id)
-      @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
+      if @temp_file.size > Setting.upload_avatar_max_size.to_i
+        @status = 1
+        @msg = l(:error_upload_avatar_to_large, :max_size => number_to_human_size(Setting.upload_avatar_max_size.to_i))
+      elsif Trustie::Utils::Image.new(@temp_file.tempfile.path).image?
+        diskfile=disk_filename(@source_type,@source_id)
+        @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
 
-      # 用户头像上传时进行特别处理
-      if  @source_type == 'User'
+        # 用户头像上传时进行特别处理
+        if  @source_type == 'User'
           diskfile += "temp"
           @urlfile += "temp"
-      end
-
-      logger.info("Saving avatar '#{diskfile}' (#{@temp_file.size} bytes)")
-      path = File.dirname(diskfile)
-      unless File.directory?(path)
-        FileUtils.mkdir_p(path)
-      end
-      md5 = Digest::MD5.new
-      File.open(diskfile, "wb") do |f|
-        if @temp_file.respond_to?(:read)
-          buffer = ""
-          while (buffer = @temp_file.read(8192))
-            f.write(buffer)
-            md5.update(buffer)
-          end
-        else
-        f.write(@temp_file)
-        md5.update(@temp_file)
         end
+
+        logger.info("Saving avatar '#{diskfile}' (#{@temp_file.size} bytes)")
+        path = File.dirname(diskfile)
+        unless File.directory?(path)
+          FileUtils.mkdir_p(path)
+        end
+        md5 = Digest::MD5.new
+        File.open(diskfile, "wb") do |f|
+          if @temp_file.respond_to?(:read)
+            buffer = ""
+            while (buffer = @temp_file.read(8192))
+              f.write(buffer)
+              md5.update(buffer)
+            end
+          else
+            f.write(@temp_file)
+            md5.update(@temp_file)
+          end
+        end
+
+        Trustie::Utils::Image.new(diskfile,true).compress(300)
+        @status = 0
+        @msg = ''
+      else
+        @status = 2
+        @msg = l(:not_valid_image_file)
       end
-#    self.digest = md5.hexdigest
     end
     @temp_file = nil
 
-    image = Trustie::Utils::Image.new(diskfile,true)
-    image.compress(300)
-
     respond_to do |format|
       format.json{
-        render :inline => "#{@urlfile.to_s}?#{Time.now.to_i}",:content_type => 'text/html'
+        render :inline => {status: @status, message:@msg, url:"#{@urlfile.to_s}?#{Time.now.to_i}"}.to_json,:content_type => 'text/html'
         return
       }
       format.js
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 508e58ba3..12925b0b1 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -65,6 +65,16 @@ module ProjectsHelper
     content_tag('div', content, :class => "tabs")   
   end
 
+  # 判断我的项目中是否有重名项目
+  def judge_same_projectname(user, project_name)
+    result = false
+    my_projects = user.projects
+    my_projects.each do |mp|
+      result = true if mp.name == project_name
+    end
+    return result
+  end
+
   # Added by young
   def course_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural, :course=>'1'},
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 1f74ccd5d..269017eb8 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -199,7 +199,7 @@
                                                     </td>
                                                   <% end %>
                                                 </tr>
-                                                  <% elsif @user.user_extensions.identity == 3 && @user.user_extensions.occupation.empty? %>
+                                                  <% elsif @user.user_extensions.identity == 3 && @user.user_extensions.occupation %>
                                                   <tr>
                                                     <td style=" float: right" width="70px">
                                                      <span style="float: right"> <%= l(:field_occupation) %>：</span>
diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index 947b95076..7877782f6 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -36,9 +36,9 @@
               <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
               <br />
               <div class="cl mb5"></div>
-              <p  id="news_description_<%= news.id %>" class="news_description mt5">
+              <div  id="news_description_<%= news.id %>" class="news_description mt5">
                 <%= news.description.html_safe %>
-              </p>
+              </div>
               <div class="news_foot c_red"  style="cursor:pointer;display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>">
                 <%= l(:button_more)%>...
                 <span class="g-arr-down"></span>
diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml
index 5eb92f07e..c0e29b797 100644
--- a/config/locales/commons/en.yml
+++ b/config/locales/commons/en.yml
@@ -113,6 +113,7 @@ en:
           one:    "1 error prohibited this %{model} from being saved"
           other:  "%{count} errors prohibited this %{model} from being saved"
       messages:
+        record_invalid: "validate error: %{errors}"
         inclusion: "is not included in the list"
         exclusion: "is reserved"
         invalid: "is invalid"
@@ -428,4 +429,4 @@ en:
         previous: "&laquo; Previous"
         next: "Next &raquo;"
         truncate: "..."  
- 
\ No newline at end of file
+ 
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 231c5280a..9ba8cba7a 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -121,6 +121,7 @@ zh:
           one:    "由于发生了一个错误 %{model} 无法保存"
           other:  "%{count} 个错误使得 %{model} 无法保存"
       messages:
+        record_invalid: "校验失败: %{errors}"
         inclusion: "不包含于列表中"
         exclusion: "是保留关键字"
         invalid: "是无效的"
@@ -435,4 +436,4 @@ zh:
         last: "末页 &raquo;"
         previous: "&laquo; 上一页"
         next: "下一页 &raquo;"
-        truncate: "..."
\ No newline at end of file
+        truncate: "..."
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8989ae36a..844818ae4 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1521,4 +1521,5 @@ en:
   label_commit_failed: commit failed
   #api end
   error_upload_avatar_to_large: "too big (%{max_size})"
+  not_valid_image_file: not a valid image file
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5c1014c7a..24702ad46 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1985,3 +1985,4 @@ zh:
   label_code: 代码
 
   error_upload_avatar_to_large: "超过大小限制 (%{max_size})"
+  not_valid_image_file: 不是有效的图片文件
diff --git a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
index c3252ed1c..1f4c867ba 100644
--- a/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
+++ b/lib/rails_kindeditor/lib/rails_kindeditor/helper.rb
@@ -4,6 +4,7 @@ module RailsKindeditor
     def kindeditor_tag(name, content = nil, options = {})
       id = sanitize_to_id(name)
       input_html = { :id => id }.merge(options.delete(:input_html) || {})
+      input_html = input_html.merge(style: 'display:none')
       output = ActiveSupport::SafeBuffer.new
       output << text_area_tag(name, content, input_html)
       output << javascript_tag(js_replace(id, options.merge(window_onload: 'true')))
@@ -12,6 +13,7 @@ module RailsKindeditor
     def kindeditor(name, method, options = {})
       # TODO: Refactory options: 1. kindeditor_option 2. html_option
       input_html = (options.delete(:input_html) || {}).stringify_keys
+      input_html = input_html.merge(style: 'display:none')
       output_buffer = ActiveSupport::SafeBuffer.new
       output_buffer << build_text_area_tag(name, method, self, options, input_html)
       output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true')))
diff --git a/lib/trustie/utils/image.rb b/lib/trustie/utils/image.rb
index 9178b291a..f4ec328b3 100644
--- a/lib/trustie/utils/image.rb
+++ b/lib/trustie/utils/image.rb
@@ -3,11 +3,37 @@
 module Trustie
   module Utils
     class Image
-      def initialize(file, bak)
+      def initialize(file, bak=false)
         @file = file
         @bak = bak
       end
 
+      def bitmap?(data)
+        data[0,2]==77.chr + 66.chr
+      end
+
+      def gif?(data)
+        data[0,4]==71.chr + 73.chr + 70.chr + 56.chr
+      end
+
+      def jpeg?(data)
+        data[0,4]== 0xff.chr + 0xd8.chr + 0xff.chr + 0xe0.chr
+      end
+      def png?(data)
+        data[0,2]==0x89.chr + 80.chr
+      end
+
+      def image?
+        begin
+          f = File.open(@file,'rb')  # rb means to read using binary
+          return false if f.size < 9
+          data = f.read(9)              # magic numbers are up to 9 bytes
+          return bitmap?(data) || gif?(data) || jpeg?(data) || png?(data)
+        ensure
+          f.close
+        end
+      end
+
       def compress(size=300)
         backup if @bak
         begin
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 227048ef6..972ee858f 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -1,182 +1,158 @@
 //配置课程信息
-function course_setting(id)
-{
+function course_setting(id) {
     //alert(id);
-    $('#tb_'+id).removeClass().addClass("hwork_hovertab");
-    $('#tbc_0'+id).removeClass().addClass("dis");
-    $('#tb_'+(3-id)).removeClass().addClass("hwork_normaltab");
-    $('#tbc_0'+(3-id)).removeClass().addClass("undis");
+    $('#tb_' + id).removeClass().addClass("hwork_hovertab");
+    $('#tbc_0' + id).removeClass().addClass("dis");
+    $('#tb_' + (3 - id)).removeClass().addClass("hwork_normaltab");
+    $('#tbc_0' + (3 - id)).removeClass().addClass("undis");
 }
 
-$(function(){
-   $("img").removeAttr("align");
+$(function() {
+    $("img").removeAttr("align");
 });
 
 ///////////////////////////////////////////////////////////////
 //添加分班
-function add_group(url,course_id) {
-    var group_name = $('#group_name').val();
-    $.get(
-        url,
-        { valid: "name",
-        value: group_name,
-        course_id: course_id },
-        function (data) {
-            if (data.valid) {
-                $("#add_group_name").submit();
+function add_group(url, course_id) {
+        var group_name = $('#group_name').val();
+        $.get(
+            url, {
+                valid: "name",
+                value: group_name,
+                course_id: course_id
+            },
+            function(data) {
+                if (data.valid) {
+                    $("#add_group_name").submit();
+                } else {
+                    alert(data.message);
+                }
             }
-            else
-            {
-                alert(data.message);
-            }
-        }
-    );
-}
-//修改分班:修改分班时得考虑什么都不改但是点击确定的情况
-function edit_group(id,url,course_id,group_id)
-{
-    var group_name = $('#'+id).val();
+        );
+    }
+    //修改分班:修改分班时得考虑什么都不改但是点击确定的情况
+
+function edit_group(id, url, course_id, group_id) {
+    var group_name = $('#' + id).val();
     $.get(
-        url,
-        {
+        url, {
             valid: "name",
             value: group_name,
             course_id: course_id,
             group_id: group_id
         },
-        function (data) {
+        function(data) {
             if (data.valid) {
-                $("#update_group_"+group_id).submit();
-            }
-            else
-            {
+                $("#update_group_" + group_id).submit();
+            } else {
                 alert(data.message);
             }
         }
     );
 }
 
-function hidden_homework_score_form()
-{
-    hideModal($("#user_score"));
-}
-///////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////新建课程相关
-//验证课程名称
-function regex_course_name()
-{
-    var name = $.trim($("#course_name").val());
-    if(name.length == 0)
-    {
-        $("#course_name_notice").show();
-        return false;
+function hidden_homework_score_form() {
+        hideModal($("#user_score"));
     }
-    else
-    {
-        $("#course_name_notice").hide();
-        return true;
-    }
-}
-//验证课程学时
-function regex_course_class_period()
-{
-    var class_period = $.trim($("#class_period").val());
-    var regex = /^\d*$/;
-    if(class_period.length == 0)
-    {
-        $("#course_class_period_notice").html("学时总数不能为空");
-        $("#course_class_period_notice").show();
-        return false;
-    }
-    else if (regex.test(class_period)) {
-        if(parseInt(class_period) > 0)
-        {
-            $("#course_class_period_notice").html("");
-            $("#course_class_period_notice").hide();
+    ///////////////////////////////////////////////////////////////
+    ///////////////////////////////////////////////////////////////新建课程相关
+    //验证课程名称
+
+function regex_course_name() {
+        var name = $.trim($("#course_name").val());
+        if (name.length == 0) {
+            $("#course_name_notice").show();
+            return false;
+        } else {
+            $("#course_name_notice").hide();
             return true;
         }
-        else
-        {
-            $("#course_class_period_notice").html("学时总数必须大于0");
+    }
+    //验证课程学时
+
+function regex_course_class_period() {
+        var class_period = $.trim($("#class_period").val());
+        var regex = /^\d*$/;
+        if (class_period.length == 0) {
+            $("#course_class_period_notice").html("学时总数不能为空");
+            $("#course_class_period_notice").show();
+            return false;
+        } else if (regex.test(class_period)) {
+            if (parseInt(class_period) > 0) {
+                $("#course_class_period_notice").html("");
+                $("#course_class_period_notice").hide();
+                return true;
+            } else {
+                $("#course_class_period_notice").html("学时总数必须大于0");
+                $("#course_class_period_notice").show();
+                return false;
+            }
+        } else {
+            $("#course_class_period_notice").html("学时总数必须为数字");
             $("#course_class_period_notice").show();
             return false;
         }
     }
-    else
-    {
-        $("#course_class_period_notice").html("学时总数必须为数字");
-        $("#course_class_period_notice").show();
-        return false;
+    //验证密码
+
+function regex_course_password() {
+        var class_period = $.trim($("#course_course_password").val());
+        var regex = /^\w+$/;
+        if (class_period.length == 0) {
+            $("#course_course_password_notice").html("课程密码不能为空");
+            $("#course_course_password_notice").show();
+            return false;
+        } else if (regex.test(class_period)) {
+            $("#course_course_password_notice").html("");
+            $("#course_course_password_notice").hide();
+            return true;
+        } else {
+            $("#course_course_password_notice").html("课程密码有非法字符");
+            $("#course_course_password_notice").show();
+            return false;
+        }
     }
-}
-//验证密码
-function regex_course_password()
-{
-    var class_period = $.trim($("#course_course_password").val());
-    var regex = /^\w+$/;
-    if(class_period.length == 0)
-    {
-        $("#course_course_password_notice").html("课程密码不能为空");
-        $("#course_course_password_notice").show();
-        return false;
-    }
-    else if (regex.test(class_period)) {
-        $("#course_course_password_notice").html("");
-        $("#course_course_password_notice").hide();
-        return true;
-    }
-    else
-    {
-        $("#course_course_password_notice").html("课程密码有非法字符");
-        $("#course_course_password_notice").show();
-        return false;
-    }
-}
-//提交新建课程
-function submit_new_course()
-{
-    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
-    {
+    //提交新建课程
+
+function submit_new_course() {
+    if (regex_course_name() && regex_course_class_period() && regex_course_password()) {
         $("#new_course").submit();
     }
 }
 
-function submit_edit_course(id)
-{
-    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
-    {
-        $("#edit_course_"+id).submit();
+function submit_edit_course(id) {
+    if (regex_course_name() && regex_course_class_period() && regex_course_password()) {
+        $("#edit_course_" + id).submit();
     }
 }
 
 ///////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////课程讨论区
 function regexSubject(id) {
-    var subjectid = "#message_subject" + id ;
+    var subjectid = "#message_subject" + id;
     var content = $.trim($(subjectid).val());
     var message = "#subject_span" + id;
     if (content.length == 0) {
         $(message).text("主题不能为空");
         $(message).css('color', '#ff0000');
-        return  false;
-    }
-    else {
+        return false;
+    } else {
         $(message).text("填写正确");
         $(message).css('color', '#008000');
         return true;
     }
     return false;
 }
+
 function regexContent(id) {
     var contentid = "#message_content" + id;
-    var message = "#message_content_span"+ id;
+    var message = "#message_content_span" + id;
     var content = $.trim($(contentid).val());
     if (content.length == 0) {
         $(message).text("描述不能为空");
         $(message).css('color', '#ff0000');
-        return  false;
-    }
-    else {
+        return false;
+    } else {
         $(message).text("填写正确");
         $(message).css('color', '#008000');
         return true;
@@ -195,297 +171,242 @@ function submitProjectsBoard(id) {
 
 ///////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////// 课程通知
-function regexTitle()
-{
+function regexTitle() {
     var name = $("#news_title").val();
-    if(name.length ==0)
-    {
+    if (name.length == 0) {
         $("#title_notice_span").text("标题不能为空");
-        $("#title_notice_span").css('color','#ff0000');
+        $("#title_notice_span").css('color', '#ff0000');
         $("#news_title").focus();
         return false;
-    }
-    else if(name.length <= 60)
-    {
+    } else if (name.length <= 60) {
         $("#title_notice_span").text("填写正确");
-        $("#title_notice_span").css('color','#008000');
+        $("#title_notice_span").css('color', '#008000');
         return true;
-    }
-    else
-    {
+    } else {
         $("#title_notice_span").text("标题超过60个字符");
-        $("#title_notice_span").css('color','#ff0000');
+        $("#title_notice_span").css('color', '#ff0000');
         $("#news_title").focus();
         return false;
     }
 }
 
-function regexDescription()
-{
+function regexDescription() {
     var name = news_description_editor.html();
-    if(name.length ==0)
-    {
+    if (name.length == 0) {
         $("#description_notice_span").text("描述不能为空");
-        $("#description_notice_span").css('color','#ff0000');
+        $("#description_notice_span").css('color', '#ff0000');
         $("#description_notice_span").focus();
         return false;
-    }
-    else if(name.length >=6000){
+    } else if (name.length >= 6000) {
         $("#description_notice_span").text("描述最多3000个汉字(或6000个英文字符)");
-        $("#description_notice_span").css('color','#ff0000');
+        $("#description_notice_span").css('color', '#ff0000');
         $("#description_notice_span").focus();
         return false;
-    }
-    else
-    {
+    } else {
         $("#description_notice_span").text("填写正确");
-        $("#description_notice_span").css('color','#008000');
+        $("#description_notice_span").css('color', '#008000');
         return true;
     }
 }
 
-function submitNews()
-{
-    if(regexTitle() && regexDescription())
-    {
+function submitNews() {
+    if (regexTitle() && regexDescription()) {
         news_description_editor.sync();
         $("#news-form").submit();
     }
 }
 
-function submitFocus(obj)
-{
+function submitFocus(obj) {
     $(obj).focus();
 }
 
-function submitComment()
-{
+function submitComment() {
     comment_editor.sync();
     $("#add_comment_form").submit();
 }
 
 /////////////////////////////////////////////////课程讨论区
-function course_board_submit_message_replay()
-{
-    if(MessageReplayVevify())
-    {
-        message_content_editor.sync();//提交内容之前要sync，不然服务器端取不到值
+function course_board_submit_message_replay() {
+    if (MessageReplayVevify()) {
+        message_content_editor.sync(); //提交内容之前要sync，不然服务器端取不到值
         $("#message_form").submit();
     }
 }
 
-function course_board_canel_message_replay()
-{
+function course_board_canel_message_replay() {
     $("#reply").hide(200);
     $("#message_quote").html("");
 }
 
 function MessageReplayVevify() {
-    var content = message_content_editor.html();//$.trim($("#message_content").val());
-    if (content.length == 0) {
-        $("#message_content_span").text("回复不能为空");
-        $("#message_content_span").css('color', '#ff0000');
-        return  false;
+        var content = message_content_editor.html(); //$.trim($("#message_content").val());
+        if (content.length == 0) {
+            $("#message_content_span").text("回复不能为空");
+            $("#message_content_span").css('color', '#ff0000');
+            return false;
+        } else {
+            $("#message_content_span").text("填写正确");
+            $("#message_content_span").css('color', '#008000');
+            return true;
+        }
     }
-    else {
-        $("#message_content_span").text("填写正确");
-        $("#message_content_span").css('color', '#008000');
-        return true;
-    }
-}
-//////////////////////////////////////////////////
+    //////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////
 //验证搜索时输入名字
-function regexName(content)
-{
-    var name = $.trim($("#name").val());
-    if(name.length == 0)
-    {
-        $("#project_name_span").text(content);
-        $("#project_name_span").css('color','#ff0000');
-        $("#project_name_span").focus();
-        return false;
+function regexName(content) {
+        var name = $.trim($("#name").val());
+        if (name.length == 0) {
+            $("#project_name_span").text(content);
+            $("#project_name_span").css('color', '#ff0000');
+            $("#project_name_span").focus();
+            return false;
+        } else {
+            $("#project_name_span").text("");
+            return true;
+        }
     }
-    else
-    {
-        $("#project_name_span").text("");
-        return true;
+    //提交搜索
+
+function submitSerch(content) {
+    if (regexName(content)) {
+        $("#course_search_form").submit();
     }
 }
-//提交搜索
-function submitSerch(content)
-{
-    if(regexName(content)){$("#course_search_form").submit();}
-}
 
 //验证搜索时输入名字
-function regexQ(content)
-{
-    var name = $.trim($("#q").val());
-    if(name.length == 0)
-    {
-        $("#course_member_name_span").text(content);
-        $("#course_member_name_span").css('color','#ff0000');
-        $("#course_member_name_span").focus();
-        return false;
+function regexQ(content) {
+        var name = $.trim($("#q").val());
+        if (name.length == 0) {
+            $("#course_member_name_span").text(content);
+            $("#course_member_name_span").css('color', '#ff0000');
+            $("#course_member_name_span").focus();
+            return false;
+        } else {
+            $("#course_member_name_span").text("");
+            return true;
+        }
     }
-    else
-    {
-        $("#course_member_name_span").text("");
-        return true;
-    }
-}
-//提交课程成员搜索
-function submitMemberSerch(content)
-{
+    //提交课程成员搜索
+
+function submitMemberSerch(content) {
     //if(regexQ(content)){$("#course_member_search_form").submit();}
     $("#course_member_search_form").submit();
 }
 
 //课程描述显示更多信息
-function show_more_msg()
-{
-    $("#course_description").toggleClass("course_description_none");
+function show_more_msg() {
+        $("#course_description").toggleClass("course_description_none");
+    }
+    //作业描述显示更多信息
+
+function news_show_more_des(id) {
+    $('#news_description_' + id).toggleClass("news_description_none");
 }
-//作业描述显示更多信息
-function news_show_more_des(id)
-{
-  $('#news_description_' + id).toggleClass("news_description_none");
-}
-function bid_show_more_des(id)
-{
+
+function bid_show_more_des(id) {
     $("#bid_description_" + id).toggleClass("news_description_none");
 }
 
 //课程作业结束时间倒计时
-function show_bid_dead_line(year,month,day,divname)
-{
-    var now = new Date();
-    var endDate = new Date(year, month-1, day);
-    var leftTime=endDate.getTime()-now.getTime();
-    var leftsecond = parseInt(leftTime/1000);
-    var day1=Math.floor(leftsecond/(60*60*24));
-    var hour=Math.floor((leftsecond-day1*24*60*60)/3600);
-    var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60);
-    var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60);
-    $("#"+divname).html("<form name='formnow' class='fr'>"
-    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+day1+"' > 天"
-    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+hour+"' > 小时"
-    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+minute+"' > 分"
-    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+second+"' > 秒"
-    + "</form>"
-    + "<p class='fr'>作品提交还剩：</p>");
-}
-//验证新建作业的名字
-function regex_bid_name()
-{
+function show_bid_dead_line(year, month, day, divname) {
+        var now = new Date();
+        var endDate = new Date(year, month - 1, day);
+        var leftTime = endDate.getTime() - now.getTime();
+        var leftsecond = parseInt(leftTime / 1000);
+        var day1 = Math.floor(leftsecond / (60 * 60 * 24));
+        var hour = Math.floor((leftsecond - day1 * 24 * 60 * 60) / 3600);
+        var minute = Math.floor((leftsecond - day1 * 24 * 60 * 60 - hour * 3600) / 60);
+        var second = Math.floor(leftsecond - day1 * 24 * 60 * 60 - hour * 3600 - minute * 60);
+        $("#" + divname).html("<form name='formnow' class='fr'>" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + day1 + "' > 天" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + hour + "' > 小时" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + minute + "' > 分" + "<input class='c_orange' type='text' style='border:0;' size='1' value='" + second + "' > 秒" + "</form>" + "<p class='fr'>作品提交还剩：</p>");
+    }
+    //验证新建作业的名字
+
+function regex_bid_name() {
     var name = $.trim($("#bid_name").val());
 
-    if(name=="")
-    {
+    if (name == "") {
         $("#bid_name_span").text("名称不能为空");
         return false;
-    }
-    else
-    {
+    } else {
         $("#bid_name_span").text("");
         return true;
     }
 }
 
 //验证匿评数量
-function regex_evaluation_num()
-{
+function regex_evaluation_num() {
     var evaluation_num = $.trim($("#bid_evaluation_num").val());
     var regex = /^\d+$/;
-    if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
-    {
-        if(evaluation_num=="")
-        {
+    if ($("#bid_open_anonymous_evaluation").attr("checked") == "checked") {
+        if (evaluation_num == "") {
             $("#bid_evaluation_num_span").text("匿评分配数量不能为空");
             return false;
-        }
-        else if(regex.test(evaluation_num))
-        {
-            if(evaluation_num > 0)
-            {
+        } else if (regex.test(evaluation_num)) {
+            if (evaluation_num > 0) {
                 $("#bid_evaluation_num_span").text("");
                 return true;
-            }
-            else
-            {
+            } else {
                 $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0");
                 return false;
             }
-        }
-        else
-        {
+        } else {
             $("#bid_evaluation_num_span").text("匿评分配数量只能为数字");
             return false;
         }
-    }
-    else
-    {
+    } else {
         return true;
     }
 }
 
 //点击是否开启匿评单选框效果
-$(function(){
-    $("#bid_open_anonymous_evaluation").click(function(){
-        if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
-        {
+$(function() {
+    $("#bid_open_anonymous_evaluation").click(function() {
+        if ($("#bid_open_anonymous_evaluation").attr("checked") == "checked") {
             $("#bid_evaluation_num_li").slideDown();
-        }
-        else
-        {
+        } else {
             $("#bid_evaluation_num_li").slideUp();
         }
     });
 });
 
 //老师提交新建作业
-function submit_new_bid(id)
-{
-    if(regex_bid_name()&&regex_evaluation_num())
-    {
+function submit_new_bid(id) {
+    if (regex_bid_name() && regex_evaluation_num()) {
         bid_description_editor.sync();
-        $("#"+id).submit();
+        $("#" + id).submit();
     }
 }
 
-function show_window (id1,id2,top,left) {
-    $('#'+ id1).css('top',top);
-    $('#'+ id1).css('left',left);
-    $('#'+ id1).css('display','block');
-    $('#' + id2).css('display','block');
+function show_window(id1, id2, top, left) {
+    $('#' + id1).css('top', top);
+    $('#' + id1).css('left', left);
+    $('#' + id1).css('display', 'block');
+    $('#' + id2).css('display', 'block');
 }
 
-function close_window(id1,id2){
-    $('#' + id1).css('display','none');
-    $('#' + id2).css('display','none');
+function close_window(id1, id2) {
+    $('#' + id1).css('display', 'none');
+    $('#' + id2).css('display', 'none');
 }
 
 //隐藏提示狂
-function hidden_atert_form(cur_page,cur_type)
-{
+function hidden_atert_form(cur_page, cur_type) {
     hideModal($("#popbox"));
 }
 
 //当课程描述长度小于112px时，不显示更多按钮
-$(function(){
-    if($("#course_description_content").height()>112)
-    {
+$(function() {
+    if ($("#course_description_content").height() > 112) {
         $("#lg-foot").show();
     }
 });
 
 //将右侧的最小高度设置成左侧高度，美化界面
 // firefox pre标签换行
-$(document).ready(function () {
-    $("#RSide").css("min-height",$("#LSide").height()-30);
+$(document).ready(function() {
+    $("#RSide").css("min-height", $("#LSide").height() - 30);
     var userAgent = navigator.userAgent.toLowerCase();
     var browser = {
         version: (userAgent.match(/.+(?:rv|it|ra|ie)[/: ]([d.]+)/) || [])[1],
@@ -494,50 +415,55 @@ $(document).ready(function () {
         msie: /msie/.test(userAgent) && !/opera/.test(userAgent),
         mozilla: /mozilla/.test(userAgent) && !/(compatible|webkit)/.test(userAgent)
     };
-    if (browser.mozilla || browser.opera){
+    if (browser.mozilla || browser.opera) {
         $("pre").addClass("break_word_firefox");
-    }
-    else{
+    } else {
         $("pre").addClass("break_word");
     }
 });
 
 // 日历选择日期后关闭
-function regexDeadLine()
-{
+function regexDeadLine() {
     ('#ui-datepicker-div').hide;
 }
 
 //新建、修改课程明码显示
-$(function(){
+$(function() {
     $("#psw_btn").click(function() {
-        alert("密码: "+$("#course_course_password").val());
+        alert("密码: " + $("#course_course_password").val());
     });
 });
 
 //课程通知更多按钮显示
-$(function(){
-    $('.news_description').each(function () {
-            if($(this).height() >= 38)
-            {
-                $('#news_foot_'+$(this).attr('id').replace('news_description_','')).css("display","block");
-            }
+$(function() {
+    $('.news_description').each(function() {
+        if ($(this).height() >= 38) {
+            $('#news_foot_' + $(this).attr('id').replace('news_description_', '')).css("display", "block");
         }
-    )
+    });
+
+    $(".news_description img").one('load', function() {
+        var node = $(this).parents('.news_description');
+        if (node && node.height() >= 38) {
+            $('#news_foot_' + node.attr('id').replace('news_description_', '')).css("display", "block");
+        }
+    }).each(function() {
+        if (this.complete) {
+            $(this).load();
+        }
+    });
 });
 
 //查找TAG资源
-function search_tag_attachment(url,tag_name,q,course_id,sort)
-{
+function search_tag_attachment(url, tag_name, q, course_id, sort) {
     //alert("111");
     $.get(
-        url,
-        {
+        url, {
             tag_name: tag_name,
             q: q,
-            course_id:course_id
+            course_id: course_id
         },
-        function (data) {
+        function(data) {
 
         }
     );
@@ -546,27 +472,22 @@ function search_tag_attachment(url,tag_name,q,course_id,sort)
 // 课程讨论区
 function showhelpAndScrollToMessage(id, id1, count) {
     $('#' + id).toggle();
-    if(cookieget("repositories_visiable") == "true")
-    {
-        cookiesave("repositories_visiable", false,'','','');
-    }
-    else
-    {
-        cookiesave("repositories_visiable", true,'','','');
+    if (cookieget("repositories_visiable") == "true") {
+        cookiesave("repositories_visiable", false, '', '', '');
+    } else {
+        cookiesave("repositories_visiable", true, '', '', '');
     }
     var information = $(id1);
     var val = information.attr("value");
-    if(val=="show_help")
-    {
-        $(id1).text("收起回复(" + count + ")" );
+    if (val == "show_help") {
+        $(id1).text("收起回复(" + count + ")");
         information.attr("value", "hide_help");
-    }
-    else
-    {
+    } else {
         $(id1).text("展开回复(" + count + ")");
         information.attr("value", "show_help");
     }
 }
+
 function show_more_reply(contentid, id2, id3) {
     $(contentid).toggleClass("course_description_none");
     var information = $(id2);
@@ -576,10 +497,9 @@ function show_more_reply(contentid, id2, id3) {
         $(id2).text("[收起]");
         information.attr("value", "hide_more");
         arrow.attr("src", "/images/jiantouup.jpg")
-    }
-    else {
+    } else {
         $(id2).text("[展开]");
         information.attr("value", "show_more");
         arrow.attr("src", "/images/jiantou.jpg")
     }
-}
\ No newline at end of file
+}
diff --git a/public/javascripts/jq-upload/upload.js b/public/javascripts/jq-upload/upload.js
index 985450648..71dbefc32 100644
--- a/public/javascripts/jq-upload/upload.js
+++ b/public/javascripts/jq-upload/upload.js
@@ -44,9 +44,18 @@ $(function() {
         },
         done: function(e, data) {
             var imgSpan = jQuery('#avatar_image');
-            imgSpan.attr({
-                "src": data.result.text ? data.result.text() : data.result
-            });
+            var result = data.result.text ? data.result.text() : data.result;
+            if(result){
+              var o = JSON.parse(result);
+              if(o.status == 0){
+                imgSpan.attr({
+                  "src": o.url
+                });
+              } else {
+                alert(o.message);
+              }
+            }
+
         }
     });
 });
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 0a04b2a7b..f9f88703d 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -425,4 +425,35 @@ $(function(){
 
     personalized_init();
 });
-//cookie记忆html区块 显示/隐藏 的代码 end
\ No newline at end of file
+//cookie记忆html区块 显示/隐藏 的代码 end
+
+// 新建项目的时候判断是否与我已有的项目重复
+function judgeprojectname(){
+    $('#new_project').validate({
+        errorPlacement: function(error, element){
+            alert('error')
+        },
+        success: function(label){
+            alert('ok')
+        },
+        onkeyup: false,
+        rules : {
+            name:{required : true,
+                remote : {
+                    url : 'projects/judge_same_projectname',
+                    type:'get',
+                    dataType:'text',
+                    data:{
+                        name : function(){ return $.trim( $("#name").val() ); }
+                    },
+                    dataFilter:function( data ){
+                        if( data=='true')return false; else return true;
+                    }
+                }
+            }
+        },
+        messages : {
+            name:{required : "请填写项目名称！",remote:'您已新建过同名项目，请修改项目名称！'}
+        }
+    });
+}
\ No newline at end of file
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 85ef3240a..5c586b757 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2794,3 +2794,4 @@ div.repos_explain{
 	padding-bottom: 20px;
 }
 .upload_img img{max-width: 100%;}
+#activity .upload_img img{width: 580px;}
diff --git a/spec/factories/attachments.rb b/spec/factories/attachments.rb
new file mode 100644
index 000000000..da8e787ed
--- /dev/null
+++ b/spec/factories/attachments.rb
@@ -0,0 +1,10 @@
+#coding=utf-8
+#
+FactoryGirl.define do
+  factory :attachment do
+    filename "11.gif"
+    filesize 296833
+    digest "8a74e086d7716f89bc4fbac0606589c7"
+    disk_directory "2015/05"
+  end
+end
diff --git a/spec/factories/homeworks.rb b/spec/factories/homeworks.rb
new file mode 100644
index 000000000..208255a8d
--- /dev/null
+++ b/spec/factories/homeworks.rb
@@ -0,0 +1,17 @@
+#coding=utf-8
+#
+#:author_id, :budget, :deadline, :name, :description, :homework_type, :password
+
+FactoryGirl.define do
+  factory :homework, class: Bid do
+    name "test homework"
+    budget 0
+    deadline {(Time.now+1.days).strftime('%Y-%m-%d')}
+    description "description"
+    homework_type 3
+    reward_type 3
+  end
+
+  factory :homework_attach, class: HomeworkAttach do
+  end 
+end
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 2c695b920..4595aacc5 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -6,4 +6,12 @@ FactoryGirl.define do
     password "foobar111"
     password_confirmation "foobar111"
   end
+
+  factory :student, class: User do
+    login "student"
+    mail "student@example.com"
+    password "foobar111"
+    password_confirmation "foobar111"
+  end
+    
 end
diff --git a/spec/models/forum_observer_spec.rb b/spec/models/forum_observer_spec.rb
deleted file mode 100644
index 76d68fafa..000000000
--- a/spec/models/forum_observer_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe ForumObserver do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/models/memo_observer_spec.rb b/spec/models/memo_observer_spec.rb
deleted file mode 100644
index 82603ba7a..000000000
--- a/spec/models/memo_observer_spec.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe MemoObserver do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
diff --git a/spec/requests/course_request_spec.rb b/spec/requests/course_request_spec.rb
index d58df398e..feca37259 100644
--- a/spec/requests/course_request_spec.rb
+++ b/spec/requests/course_request_spec.rb
@@ -35,13 +35,53 @@ RSpec.describe "课程", :type => :request do
     context "修改课程图片" do
       include Rack::Test::Methods
       let(:avatar) {Rack::Test::UploadedFile.new("#{Rails.root}/spec/fixtures/test.jpg",'image/jpg')}
+
       context "正常图片上传成功" do
         subject(:resp) {post upload_avatar_path(source_type: 'Course', source_id: course.id, format: :json),"avatar"=>{image: avatar}}
         it{ expect(subject).to be_ok }
         it{ expect(subject.body).not_to be_empty }
+        it "状态要为0" do
+          o = ActiveSupport::JSON.decode(subject.body)
+          expect(o["status"]).to eq(0)
+        end
+        it "要回传图片地址" do
+          o = ActiveSupport::JSON.decode(subject.body)
+          expect(o["url"]).not_to be_empty
+        end
+      end
+
+      context "不是图片，上传失败" do
+        let(:invalid_avatar) {Rack::Test::UploadedFile.new("#{Rails.root}/spec/fixtures/hah.txt",'text/plain')}
+        before do
+         resp = post upload_avatar_path(source_type: 'Course', source_id: course.id, format: :json),"avatar"=>{image: invalid_avatar}
+         @o = ActiveSupport::JSON.decode(resp.body)
+        end
+        it "状态不为0" do
+          expect(@o["status"]).not_to eq(0)
+        end
+        it "要回传错误信息" do
+          expect(@o["message"]).to be_include("图片")
+        end
+      end
+
+      context "文件过大，上传失败" do
+        before do
+          big_file = Rack::Test::UploadedFile.new("#{Rails.root}/spec/fixtures/test.jpg",'image/jpg')
+          allow(ActionDispatch::Http::UploadedFile).to receive(:new).and_return(double('BigFile',size: 10*1024*1024, original_filename: 'rais.jpg', tempfile: nil))
+          # trace = TracePoint.new(:call) do |tp|
+          #   p [tp.lineno, tp.defined_class, tp.method_id, tp.event] if tp.method_id == :post
+          # end
+         resp = post upload_avatar_path(source_type: 'Course', source_id: course.id, format: :json),'avatar[image]'=> big_file
+         @o = ActiveSupport::JSON.decode(resp.body)
+        end
+        it "状态不为0" do
+          expect(@o["status"]).not_to eq(0)
+        end
+        it "要回传错误信息" do
+          expect(@o["message"]).to be_include("大")
+        end
       end
 
-      it "不是图片，上传失败"
     end
   end
 
diff --git a/spec/requests/zipdown_request_spec.rb b/spec/requests/zipdown_request_spec.rb
index eb179f104..72831d26f 100644
--- a/spec/requests/zipdown_request_spec.rb
+++ b/spec/requests/zipdown_request_spec.rb
@@ -1,6 +1,40 @@
 require 'rails_helper'
+require 'shared_account_spec'
 
+# "attachments"=>{"1"=>{"filename"=>"11.gif", "description"=>"", "is_public_checkbox"=>"1", "token"=>"33731.8a74e086d7716f89bc4fbac0606589c7"}}
 RSpec.describe "作业打包下载", :type => :request do
+  let(:student){FactoryGirl.create(:student)}
   describe "单独下载某学生作业" do
+    include_context "create user"
+    before {
+      FactoryGirl.create(:user)
+      shared_login
+      @homework = FactoryGirl.create(:homework, author_id: current_user.id)
+
+      @attch = HomeworkAttach.new
+      @attch.bid_id = @homework.id
+      @attch.user_id = student.id
+      @attachment = Attachment.new(:file => File.open(File.join(Rails.root, "spec/fixtures/test.jpg")))
+      @attachment.author = User.current
+      @attachment.container_type = 'HomeworkAttach'
+      @attachment.container_id = @attch.id
+      @attachment.filename = "test.jpg"
+      @attachment.save
+      params = {"1"=>{"filename" => "test.jpg", "description" =>"", 
+                                          "is_public_checkbox"=>"1", 
+                                          "token" => "#{@attachment.id}.#{@attachment.digest}" }
+      }
+      @attch.save_attachments(params)
+      @attch.name = "test.jpg"
+      @attch.save!
+    }
+    it "正常下载" do
+      uu = current_user
+      allow(uu).to receive(:admin?).and_return(true)
+      allow(User).to receive(:current).and_return(uu)
+      get zipdown_download_user_homework_path, {homework:@attch.id}
+      expect(response).to have_http_status(:success)
+      expect(response.content_type).to eq(Mime::Type.new("applcation/zip",:zip))
+    end
   end
 end