Merge branch 'szzh' into develop

app/controllers/account_controller.rb

@@ -62,12 +62,12 @@ class AccountController < ApplicationController
     if params[:token]
       @token = Token.find_token("recovery", params[:token].to_s)
       if @token.nil? || @token.expired?
-        redirect_to home_url
+        redirect_to signin_path
         return
       end
       @user = @token.user
       unless @user && @user.active?
-        redirect_to home_url
+        redirect_to signin_path
         return
       end
       if request.post?
@@ -79,7 +79,7 @@ class AccountController < ApplicationController
           return
         end
       end
-      render :layout => 'static_base', :template => "account/password_recovery"
+      render  :template => "account/password_recovery"
       return
     else
       if request.post?

app/controllers/repositories_controller.rb

@@ -127,18 +127,19 @@ update
       end
     else  # 原逻辑
       ##xianbo
-      params[:repository_scm] = "Git"
       @root_path=RepositoriesHelper::ROOT_PATH
       @repository_name=User.current.login.to_s+"/"+params[:repository][:identifier]+".git"
       @project_path=@root_path+"htdocs/"+@repository_name
-      @repository_tag=params[:repository][:upassword] || params[:repository][:password] || '1234'
+      @repository_tag=params[:repository][:upassword] || params[:repository][:password]
       @repo_name=User.current.login.to_s+"_"+params[:repository][:identifier]
       logger.info "htpasswd -mb "+@root_path+"htdocs/user.passwd "+@repo_name+": "+@repository_tag
       logger.info "the value of create repository"+@root_path+": "+@repository_name+": "+@project_path+": "+@repo_name
       attrs = pickup_extra_info
-      params[:repository][:url]=@project_path
+      if((@repository_tag!="")&&params[:repository_scm]=="Git")
+          params[:repository][:url]=@project_path
+      end
       ###xianbo
-      @repository = Repository.factory(params[:repository_scm]||"Git")
+      @repository = Repository.factory(params[:repository_scm])
       @repository.safe_attributes = params[:repository]
       if attrs[:attrs_extra].keys.any?
         @repository.merge_extra_info(attrs[:attrs_extra])
@@ -277,8 +278,7 @@ update
       @course_tag = params[:course]
       project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT
       ip = RepositoriesHelper::REPO_IP_ADDRESS
-      # @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+
-      @repos_url = "http://#{Setting.host_name}/#{@repository.login.to_s}/#{@repository.identifier.to_s}.git"
+      @repos_url = "http://"+@repository.login.to_s+"_"+@repository.identifier.to_s+"@"+ip.to_s+
       @repository.url.slice(project_path_cut, @repository.url.length).to_s
       if @course_tag == 1
         render :action => 'show', :layout => 'base_courses'

app/controllers/users_controller.rb

@@ -39,20 +39,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_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,
-    :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,
-    :user_resource,:user_resource_create,:user_resource_delete,:rename_resource,:search_user_course,:add_exist_file_to_course,
-    :search_user_project,:resource_preview,:resource_search,:add_exist_file_to_project,:user_messages,:edit_brief_introduction,:user_new_homework]
   #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_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,:user_resource,
-                                  :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction]
+                                  :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
+                                  :user_import_homeworks,:user_search_homeworks,:user_import_resource]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -122,7 +116,7 @@ class UsersController < ApplicationController
       user_querys.update_all(:viewed => true)
       forum_querys.update_all(:viewed => true)
     end
-    @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
+    # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
       when nil
         @message_alls = []
@@ -176,6 +170,7 @@ class UsersController < ApplicationController
         render_404
         return
     end
+    @message_alls = paginateHelper @message_alls,25
     respond_to do |format|
       format.html{render :layout=>'new_base_user'}
     end
@@ -310,7 +305,46 @@ class UsersController < ApplicationController
     respond_to do |format|
       format.js
       format.html {render :layout => 'new_base_user'}
+    end
+  end
+
+  #导入作业
+  def user_import_homeworks
+    @user_homeworks = HomeworkCommon.where(:user_id => @user.id).order("created_at desc")
+    respond_to do |format|
+      format.js
+    end
   end
+
+  #用户主页过滤作业
+  def user_search_homeworks
+    @user_homeworks = HomeworkCommon.where("user_id = '#{@user.id}' and lower(name) like '%#{params[:name].to_s.downcase}%'").order("created_at desc")
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #导入作业，确定按钮
+  def user_select_homework
+    homework = HomeworkCommon.find_by_id params[:checkMenu]
+    @homework = HomeworkCommon.new
+    if homework
+      @homework.name = homework.name
+      @homework.description = homework.description
+      @homework.end_time = homework.end_time
+      @homework.course_id = homework.course_id
+      homework.attachments.each do |attachment|
+        att = attachment.copy
+        att.container_id = nil
+        att.container_type = nil
+        att.copy_from = attachment.id
+        att.save
+        @homework.attachments << att
+      end
+    end
+    respond_to do |format|
+      format.js
+    end
   end
 
   def user_new_homework
@@ -345,6 +379,16 @@ class UsersController < ApplicationController
     end
   end
 
+  #用户从资源库导入资源到作业
+  def user_import_resource
+    user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    respond_to do |format|
+      format.js
+    end
+  end
+
 
   include CoursesHelper
   def user_courses
@@ -962,13 +1006,13 @@ class UsersController < ApplicationController
       end
     end
     @type = params[:type] || 1
-    @limit = 15
+    @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,15
+    @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
     end
@@ -1018,13 +1062,13 @@ class UsersController < ApplicationController
       end
     end
     @type = params[:type]
-    @limit = 15
+    @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,15
+    @attachments = paginateHelper @attachments,25
      respond_to do |format|
        format.js
      end
@@ -1066,10 +1110,14 @@ class UsersController < ApplicationController
 
   # 将资源发送到对应的课程,分为发送单个，或者批量发送
   def add_exist_file_to_course
+    @flag = true
    if  params[:send_id].present?
       send_id  = params[:send_id]
       ori = Attachment.find_by_id(send_id)
       course_ids = params[:course_ids]
+      if course_ids.nil?
+        @flag = false
+      end
         unless course_ids.nil?
           course_ids.each do |id|
             next if ori.blank?
@@ -1087,9 +1135,13 @@ class UsersController < ApplicationController
         end
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(" ")
+      course_ids = params[:course_ids]
+      if course_ids.nil?
+        @flag = false
+      end
       send_ids.each do |send_id|
         ori = Attachment.find_by_id(send_id)
-        course_ids = params[:course_ids]
+
         unless course_ids.nil?
           course_ids.each do |id|
             next if ori.blank?
@@ -1106,6 +1158,8 @@ class UsersController < ApplicationController
           end
         end
       end
+    else
+     @flag = false
     end
     respond_to do |format|
       format.js
@@ -1114,9 +1168,13 @@ class UsersController < ApplicationController
 
   # 添加资源到对应的项目
   def add_exist_file_to_project
+    @flag = true
     if  params[:send_id].present?
       send_id  = params[:send_id]
       project_ids = params[:projects_ids]
+      if project_ids.nil?
+        @flag = false
+      end
       ori = Attachment.find_by_id(send_id)
       unless project_ids.nil?
         project_ids.each do |project_id|
@@ -1134,8 +1192,12 @@ class UsersController < ApplicationController
       end
     elsif params[:send_ids].present?
       send_ids = params[:send_ids].split(" ")
+      project_ids = params[:projects_ids]
+      if project_ids.nil?
+        @flag = false
+      end
       send_ids.each do |send_id|
-        project_ids = params[:projects_ids]
+
         ori = Attachment.find_by_id(send_id)
         unless project_ids.nil?
           project_ids.each do |project_id|
@@ -1153,6 +1215,7 @@ class UsersController < ApplicationController
         end
       end
     else
+      @flag=true
     end
 
     respond_to do |format|
@@ -1403,13 +1466,13 @@ class UsersController < ApplicationController
       end
     end
     @type = params[:type]
-    @limit = 15
+    @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,15
+    @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
       format.html {render :layout => 'new_base_user'}
@@ -1455,13 +1518,13 @@ class UsersController < ApplicationController
       end
     end
     @type = params[:type]
-    @limit = 15
+    @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,15
+    @attachments = paginateHelper @attachments,25
     respond_to do |format|
       format.js
     end

app/helpers/application_helper.rb

@@ -2493,4 +2493,14 @@ int main(int argc, char** argv){
   return 0;
 }".html_safe
   end
+
+  #判断用户是否已经提交了问卷
+  def has_commit_poll?(poll_id,user_id)
+    pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id)
+    if pu.nil?
+      false
+    else
+      true
+    end
+  end
 end

app/helpers/issues_helper.rb

@@ -380,6 +380,22 @@ module IssuesHelper
         value = content_tag("i", h(value)) if value
       end
     end
+    # 缺陷更新结果在消息中显示样式
+    if no_html == "message"
+      label = content_tag(:span, label, :class => "issue_update_message")
+      old_value = content_tag("span", h(old_value)) if detail.old_value
+      old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
+      if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
+        # Link to the attachment if it has not been removed
+        if options[:token].nil?
+          value = atta.filename
+        else
+          value = atta.filename
+        end
+      else
+        value = content_tag(:span, h(value), :class => "issue_update_message_value") if value
+      end
+    end
 
     if detail.property == 'attr' && detail.prop_key == 'description'
       s = l(:text_journal_changed_no_detail, :label => label)

app/helpers/poll_helper.rb

@@ -37,16 +37,6 @@ module PollHelper
       pv.vote_text
     end
   end
-
-  #判断用户是否已经提交了问卷
-  def has_commit_poll?(poll_id,user_id)
-    pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id)
-    if pu.nil?
-      false
-    else
-      true
-    end
-  end
   
   #统计答题百分比，统计结果保留两位小数
   def statistics_result_percentage(e, t)

app/helpers/users_helper.rb

@@ -425,9 +425,13 @@ module UsersHelper
     return str.html_safe
   end
 
+  # journal.details 记录每个动作的新旧值
   def get_issue_des_update(journal)
-    arr = details_to_strings(journal.details,true)
-    arr << journal.notes
+    no_html = "message"
+    arr = details_to_strings(journal.details, no_html)
+    unless journal.notes.empty?
+      arr << "留言内容：" + journal.notes
+    end
     str = ''
     arr.each { |item| str = str+item }
     return str

app/models/journal.rb

@@ -174,7 +174,7 @@ class Journal < ActiveRecord::Base
     if self.user_id != self.issue.author_id
       self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id, :project_id => self.issue.project_id, :viewed => false)
     end
-    if self.user_id != self.issue.assigned_to_id   # 指派人不是自己的话，则给指派人发送
+    if self.user_id != self.issue.assigned_to_id && self.issue.assigned_to_id != self.issue.author_id   # 指派人不是自己的话，则给指派人发送
       self.forge_messages << ForgeMessage.new(:user_id => self.issue.assigned_to_id, :project_id => self.issue.project_id, :viewed => false)
     end
   end

app/models/journals_for_message.rb

@@ -212,33 +212,11 @@ class JournalsForMessage < ActiveRecord::Base
       if self.user_id != self.reply_id # 添加我回复的那个人
         receivers << reply_to
       end
-      if self.user_id != self.parent.jour_id # 给东家发信息
+      if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发
         receivers << self.parent.jour
       end
-      # if self.user_id != self.parent.user_id
-      #   receivers << reply_to
-      #   if self.reply_id != self.parent.user_id
-      #     receivers << self.parent.user
-      #   end
-      # else
-      #   receivers << reply_to
-      # end
-
-      # 添加留言回复人
-      #reply_to = User.find(self.reply_id)
-      #if self.user_id != self.parent.user_id && self.user_id != self.parent.jour_id  # 如果回帖人不是用户自己
-      #  receivers << self.parent.user
-      #  if self.reply_id != self.parent.user_id
-      #    receivers << reply_to
-      #  end
-      #else # 用户自己回复别人的，别人收到消息通知
-      #  if self.user_id != self.reply_id # 过滤掉自己回复自己的
-      #    receivers << reply_to
-      #  end
-      #end
     end
     if self.jour_type == 'Principal'
-
         receivers.each do |r|
           self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false)
         end

app/models/user.rb

@@ -263,6 +263,7 @@ class User < Principal
     user_memo_count = MemoMessage.where("user_id =? and viewed =?", User.current.id, 0).count
     messages_count = course_count + forge_count + user_feedback_count + user_memo_count
   end
+
   # 查询指派给我的缺陷记录
   def issue_status_update
     self.status_updates

app/views/account/agreement.html.erb

@@ -1,6 +1,6 @@
 <%= stylesheet_link_tag 'new_user'%>
 <!--<div class="homepageContentContainer mb20" >-->
-  <div class="homepageContent BgBox">
+  <div class="homepageContent BgBox mt10">
   	<h2 class="BgBox_h2">Trustie服务协议</h2>
    	<div class="AgreementBox">
     	<p>尊敬的用户，您好！<br />

app/views/account/login.html.erb

@@ -47,6 +47,12 @@
             $("#loginInBox").css({display:"none"});
         }
     });
+
+//    $('#regist_btn').bind('keyup', function(event) {
+//    if (event.keyCode == "13" && $("#signUpBox").css('display') == 'block')) {
+//       register();
+//    }
+//});
     function clearInfo(id, content) {
                 var text = $('#' + id);
                 if (text.val() == content) {
@@ -161,7 +167,7 @@
   <div class="loginContent">
     <div class="loginLeft">
       <div class="loginLogo"><img src="images/trustie_big_log.png" width="100" height="88" alt="Trustie Logo" /></div>
-      <div class="loginInro">欢迎加入Trustie高校创新实践社区，老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。</div>
+      <div class="loginInro">欢迎加入Trustie高校创新实践社区！老师、学生和科研人员可以在此开展各种在线协同学习、协同作业、协同开发等活动。Trustie是在中国推行大规模开放在线研究模式（MOORE）的支撑平台。</div>
     </div>
     <div class="loginRight">
       <div id="loginInBox">
@@ -206,7 +212,7 @@
             </a></div>
         <% end %>
           <div class="loginInButton" >
-            <a href="javascript:void(0);" class="c_white db" onclick="$('#main_login_form').submit();">登录</a>
+            <a href="javascript:void(0);" id="login_btn" class="c_white db" onclick="$('#main_login_form').submit();">登录</a>
           </div>
 
         </div>
@@ -248,7 +254,7 @@
                 </div>
                 我已阅读并接受<a href="<%= agreement_path %>" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
           <div class="loginUpButton">
-            <a href="javascript:void(0);" class="c_white db" onclick="register();">注册</a>
+            <a href="javascript:void(0);" class="c_white db" id="regist_btn" onclick="register();">注册</a>
 
           </div>
           <% end %>

app/views/account/password_recovery.html.erb

@@ -1,20 +1,19 @@
-<h3><%=l(:label_password_lost)%></h3>
-
 <%= error_messages_for 'user' %>
+    <div  style="margin-top:20px;width:100%; background-color:#eaebed;">
+      <div style="width:1000px; background-color:#eaebed; margin:0 auto; width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;margin: 20px auto">
+        <h2 style="font-size:16px; color:#484848;  width:968px;border-bottom:1px solid #e3e3e3; padding-bottom:5px;">重置密码</h2>
+        <div style="width:310px; margin:80px auto;">
+          <%= form_tag(lost_password_path) do %>
+              <%= hidden_field_tag 'token', @token.value %>
+          <!--<input type="text"  class="NomalInput " value="新密码"  />-->
+          <%= password_field_tag 'new_password', nil, :size => 25,:placeholder=>'新密码',:style=>"width:308px; height:38px;  border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px; " %>
+          <p style=" color:#F00 ;margin-bottom:5px;">至少需要 6 个字符</p>
+          <!--<input type="text"  class="NomalInput mb20 " value="确定密码"  />-->
+          <%= password_field_tag 'new_password_confirmation', nil, :size => 25,:placeholder=>'确定密码',:style=>"width:308px; height:38px;  border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px;margin-bottom:20px; " %>
+          <div style="width:315px; height:40px; background-color:#269ac9; font-size:14px; text-align:center; line-height:40px; vertical-align:middle;"><a href="javascript:void(0);" style=" color:#fff;display:block !important;" onclick="$(this).parent().parent().submit();">提交</a></div>
+            <% end %>
+        </div>
 
-<%= form_tag(lost_password_path) do %>
-  <%= hidden_field_tag 'token', @token.value %>
-  <div class="box tabular">
-    <p>
-      <label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
-      <%= password_field_tag 'new_password', nil, :size => 25 %>
-      <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
-    </p>
 
-    <p>
-		<label for="new_password_confirmation"><%= l(:field_password_confirmation)%> <span class="required">*</span></label>
-		<%= password_field_tag 'new_password_confirmation', nil, :size => 25 %>
-	</p>
-  </div>
-  <p><%= submit_tag l(:button_save) %></p>
-<% end %>
+      </div>
+</div>

app/views/layouts/_footer.html.erb

@@ -1,11 +1,11 @@
 <div id="Footer">
   <div class="footerAboutContainer">
     <ul class="footerAbout">
-      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
+      <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_about_us)%></span>|</li>
       <li class="fl"><a href="http://forge.trustie.net/projects/2/member" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
-      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
+      <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
       <li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank"><%= l(:label_surpport_group)%></a>|</li>
-      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a></li>
+      <li class="fl"><span class="f_grey mw20" title="暂未开放"><%= l(:label_forums)%></span></li>
 
     </ul>
   </div>
@@ -33,8 +33,7 @@
   </ul>
   <div class="cl"></div>
   <ul class="copyright">
-    <li class="fl"><%= l(:label_rights_reserved)%></li>
-    <span class="fl mw15">|</span>
+    <li class="fl mr30"><%= l(:label_rights_reserved)%></li>
     <li class="fl"><a href="http://www.miibeian.gov.cn/" class="fl f_grey" target="_blank"><%= l(:label_license)%></a></li>
   </ul>
 </div><!--Footer end-->

app/views/layouts/_logined_header.html.erb

@@ -1,19 +1,19 @@
 <div class="navHomepage">
   <div class="navHomepageLogo fl">
-    <%=link_to image_tag("../images/logo.png",width:"51px", height: "45px",class: "mt3"), user_activities_path(User.current.id)%>
+    <%=link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), user_activities_path(User.current.id)%>
   </div>
   <div class="fl">
     <ul>
       <li class="navHomepageMenu fl">
-        <%= link_to "首页",user_activities_path(User.current.id), :class => "homepageWhite f16"%>
+        <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db"%>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>User.current.id,:type=>1)%>" class="homepageWhite f16">资源库</a></li>
+        <a href="<%=url_for(:controller => 'users', :action => 'user_resource',:id=>User.current.id,:type=>1)%>" class="c_white f16 db">资源库</a></li>
       <li class="navHomepageMenu fl">
-        <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "homepageWhite f16"%>
+        <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db"%>
       </li>
-      <li class="navHomepageMenu fl">
-        <a href="http://forge.trustie.net/forums/1/memos/1168" class="homepageWhite f16">帮助中心</a>
+      <li class="navHomepageMenu fl mr30">
+        <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16 db">帮助中心</a>
       </li>
     </ul>
   </div>
@@ -36,7 +36,7 @@
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput" />
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
         <input type="hidden" name="search_type" id="type" value=""/>
         <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
      <% end %>

app/views/layouts/_unlogin_header.html.erb

@@ -1,10 +1,10 @@
 <div class="navHomepage">
   <div class="navHomepageLogo fl">
-    <%=link_to image_tag("../images/logo.png",width:"51px", height: "45px",class: "mt3"), signin_path%>
+    <%=link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), signin_path%>
   </div>
   <div class="fl">
     <ul>
-      <li class="navHomepageMenu fl">
+      <li class="navHomepageMenu fl mr40">
         <a href="http://forge.trustie.net/forums/1/memos/1168" class="c_white f16">帮助中心</a>
       </li>
     </ul>
@@ -36,7 +36,7 @@
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput"/>
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
       <input type="hidden" name="search_type" id="type" value=""/>
       <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
     <% end %>

app/views/layouts/login.html.erb

@@ -15,7 +15,19 @@
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
 </head>
-
+<
+<script type="text/javascript" charset="utf-8">
+    $(function() {
+        $(document).keyup(function (e) {
+            var e = e || event,
+            code = e.which || e.keyCode;
+            if (code == 13 && $("#loginInBox").css('display') == 'block') {
+                e.preventDefault();
+                $('#main_login_form').submit();
+            }
+        });
+    });
+</script>
 <div class="navContainer">
     <% is_current_user = User.current.logged? && User.current == @user%>
     <% if User.current.logged? %>
@@ -26,3 +38,9 @@
 </div>
 
 <%= yield %>
+<div class="cl"></div>
+<%= render :partial => 'layouts/footer' %>
+<div class="cl"></div>
+<%= call_hook :view_layouts_base_body_bottom %>
+</body>
+</html>

app/views/layouts/new_base_user.html.erb

@@ -57,12 +57,12 @@
           <div class="cl"></div>
         </div>
         <div>
-          <div class="homepageSignature">
+          <div class="homepageSignature break_word">
             <p id="user_brief_introduction_show">
               <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
             </p>
           </div>
-          <textarea class="homepageSignatureTextarea none" placeholder="请输入回复" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id)%>');"><%= @user.user_extensions.brief_introduction %></textarea>
+          <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id)%>');"><%= @user.user_extensions.brief_introduction %></textarea>
         </div>
         <div>
           <div class="homepageImageBlock">
@@ -137,7 +137,7 @@
         </div>
       </div>
     </div>
-    <div class="homepageRight" id="RSide">
+    <div class="homepageRight">
       <%= yield %>
     </div>
   </div>

app/views/mailer/send_for_user_activities.html.erb

@@ -327,6 +327,7 @@
                 </li>
             <% end %>
             <div class="cl"></div>
+
             <!--新闻回复-->
             <% @project_news_comments.each do |project_news_comment|%>
                 <li style="clear: both; list-style: none;">

app/views/my/account.html.erb

@@ -1,5 +1,5 @@
 <div class="fl">
-  <div id="users_setting">
+  <div id="RSide">
     <div id="users_tb_" class="users_tb_">
       <ul>
         <li id="users_tb_1" class="users_hovertab" onclick="x:HoverLi(1);">基本资料</li>

app/views/projects/settings/_new_repositories.html.erb

@@ -62,6 +62,16 @@
 <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post"} do |f| %>
 <div id="pro_st_edit_ku" class="pro_st_edit_ku">
   <ul>
+    <li >
+      <label class="label02"><%=l(:label_scm)%>：</label>
+      <%= select_tag('repository_scm',
+             options_for_select(["Git"],@repository.class.name.demodulize),
+             :data => {:remote => true, :method => 'get'})%>
+             <% if @repository && ! @repository.class.scm_available %>
+             <span class="c_grey"><%= l(:text_scm_command_not_available) %></span>
+             <% end %>
+    </li>
+
     <% unless judge_main_repository(@project) %>
         <li>
             <label class="label02"><%=l(:field_repository_is_default)%>：</label>
@@ -75,6 +85,11 @@
          <span class="c_grey"><%=l(:text_length_between,:min=>1,:max=>254)<<l(:text_project_identifier_info) %></span>
       <% end %>
     </li>
+    <li >
+      <label class="label02"><span class="c_red">*</span><%=l(:label_password)%></label>
+      <%= f.password_field :upassword, :label=> "", :no_label => true %>
+      <span class="c_grey"><%= l(:label_upassword_info)%></span>
+    </li>
     <div class="cl"></div>
   </ul>
   <a href="#" onclick="$('#repository-form').submit();" class="blue_btn fl ml110"><%=l(:button_save)%></a>

app/views/users/_course_attachment.html.erb

@@ -1,5 +1,5 @@
-<div class="resources mt15">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+<div class="resources mt10">
+  <div class="homepagePostBrief mt10" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
     <div class="homepagePostPortrait">
      <!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "90", :height => "90"), user_path(activity.author_id), :alt => "用户头像" %>

app/views/users/_course_create.html.erb

@@ -1,9 +1,9 @@
-<div class="resources mt15">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
-    <div class="homepagePostPortrait">
+<div class="resources mt10">
+  <div class="homepagePostBrief mt10" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+    <div class="homepagePostPortrait mb8">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
       <div class="homepagePostTitle">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（课程创建）</a></div>

app/views/users/_course_homework.html.erb

@@ -1,5 +1,5 @@
-<div class="resources mt15">
-  <div class="homepagePostBrief">
+<div class="resources mt10">
+  <div class="homepagePostBrief mt10">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
     </div>
@@ -9,11 +9,11 @@
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
             <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
-        <% end %> TO
-        <%= link_to activity.course.name.to_s+"(课程名称)", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
+        <% end %> TO <!--+"(课程名称)" -->
+        <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
       </div>
-      <div class="homepagePostTitle" style="word-break:break-all;">
-        <%= link_to activity.name.to_s+"(作业名称)", student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
+      <div class="homepagePostTitle" style="word-break:break-all;"> <!--+"(作业名称)"-->
+        <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
       </div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit">
@@ -21,7 +21,16 @@
         </div>
         <div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
       </div>
-      <div class="homepagePostIntro" style="word-break:break-all">（作业描述）<%= activity.description.html_safe %></div>
+      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">
+        作业描述：<%= activity.description.html_safe %>
+      </div>
+      <!--<p style="display: none" id="activity_message_<%#= user_activity.id%>">
+        <a id="expend_more_information<%#= user_activity.id%>" href="javascript:void(0)" style="color: #0781b4;" onclick="show_more_reply('#activity_description_<%#=user_activity.id%>','#expend_more_information<%#= user_activity.id%>','#arrow<%#=user_activity.id%>');"  value="show_more">[展开]</a>
+                <span class="g-arr-down">
+                    <img id="arrow<%#=user_activity.id%>" src="/images/jiantou.jpg" width="12" height="6" />
+                </span>
+
+      </p>-->
       <div class="homepagePostSetting" style="visibility: hidden"  id="act-<%=user_activity.id %>">
         <ul>
           <li class="homepagePostSettingIcon">

app/views/users/_course_journalsformessage.html.erb

@@ -1,5 +1,5 @@
-<div class="resources mt15">
-  <div class="homepagePostBrief" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
+<div class="resources mt10">
+  <div class="homepagePostBrief mt10" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">