Merge branch 'szzh' into develop

app/controllers/files_controller.rb

@@ -26,7 +26,7 @@ class FilesController < ApplicationController
   before_filter :authorize, :except => [:create,:getattachtype,:quote_resource_show,:search,:searchone4reload,:search_project,:quote_resource_show_project,
                                         :search_tag_attachment,:subfield_upload_file,:search_org_subfield_tag_attachment,
                                         :search_tag_attachment,:quote_resource_show_org_subfield,:find_org_subfield_attache,
-                                        :search_files_in_subfield,:upload_files_menu]
+                                        :search_files_in_subfield,:upload_files_menu,:file_hidden,:republish_file]
 
   helper :sort
   include SortHelper
@@ -96,6 +96,33 @@ class FilesController < ApplicationController
     end
   end
 
+  def file_hidden
+    @file = Attachment.find params[:id]
+    @course = Course.find params[:course_id]
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def republish_file
+    @file = Attachment.find params[:id]
+    @course = Course.find params[:course_id]
+    if params[:publish_time]
+      unless params[:publish_time] == ""
+        @file.publish_time = params[:publish_time]
+      end
+    end
+    if @file.publish_time > Date.today
+      @file.is_publish = 0
+    else
+      @file.is_publish = 1
+    end
+    @file.save
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def search_project
     sort = ""
     @sort = ""

app/controllers/org_subfields_controller.rb

@@ -30,7 +30,8 @@ class OrgSubfieldsController < ApplicationController
     if params[:id]
       @organization = Organization.find(params[:id])
     else
-      @organization = Organization.where("domain=?",request.subdomain).first
+      domain = Secdomain.where("subname=?", request.subdomain).first
+      @organization = Organization.find(domain.pid)
     end
     @org_subfield = OrgSubfield.find_by_sql("select distinct org_subfields.* from org_subfields,"+
         "subfield_subdomain_dirs where org_subfields.id = subfield_subdomain_dirs.org_subfield_id and "+

app/controllers/organizations_controller.rb

@@ -139,7 +139,7 @@ class OrganizationsController < ApplicationController
   end
 
   def check_uniq_domain
-    @is_exist = (Organization.where("domain=?", params[:org_domain]).count > 0)
+    @is_exist = (Secdomain.where("subname=?",params[:org_domain]).count > 0)
   end
 
   def find_organization
@@ -322,7 +322,12 @@ class OrganizationsController < ApplicationController
   def agree_apply_subdomain
     @organization = Organization.find(params[:organization_id])
     OrgMessage.find(params[:act_id]).update_attribute(:viewed, 1)
-    @organization.update_attribute(:domain, params[:org_domain])
+    if Secdomain.where("pid=? and sub_type=2",@organization.id).count > 0
+      domain = Secdomain.where("pid=? and sub_type=2",params[:organization_id]).first
+      Secdomain.update(domain.id, :subname => params[:org_domain])
+    else
+      Secdomain.create(:sub_type => 2, :pid => params[:organization_id], :subname => params[:org_domain])
+    end
     if OrgMessage.where("message_type='AgreeApplySubdomain' and organization_id=#{@organization.id} and content=?",params[:org_domain]).count == 0
       OrgMessage.create(:user_id => params[:user_id], :organization_id => @organization.id, :message_type => 'AgreeApplySubdomain', :message_id => @organization.id, :sender_id => User.current.id, :viewed => 0, :content => params[:org_domain])
     end

app/controllers/repositories_controller.rb

@@ -34,7 +34,7 @@ class RepositoriesController < ApplicationController
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -521,6 +521,13 @@ update
     end
   end
 
+  # 每次提交对应的文件差异
+  def commit_diff
+    @commit_diff = $g.commit_diff(@project.gpid, params[:changeset])
+    @commit_details = $g.commit(@project.gpid, params[:changeset])
+    render :layout => 'base_projects'
+  end
+
   def diff
     if params[:format] == 'diff'
       @diff = @repository.diff(@path, @rev, @rev_to)

app/controllers/student_work_controller.rb

@@ -1055,4 +1055,4 @@ class StudentWorkController < ApplicationController
       end
     end
   end
-end
+end

app/controllers/zipdown_controller.rb

@@ -134,8 +134,11 @@ class ZipdownController < ApplicationController
     homework_common.student_works.each do |work|
       unless work.attachments.empty?
         out_file = zip_student_work_by_user(work)
-        bid_homework_path << out_file.file_path
+
-        digests << out_file.file_digest
+          bid_homework_path << out_file.file_path
+          digests << out_file.file_digest
+
+
       end
     end
     homework_id = homework_common.id
@@ -172,7 +175,11 @@ class ZipdownController < ApplicationController
     }
   end
 
-  def zip_student_work_by_user work
+  def make_zip_name(work)
+    "#{work.user.show_name}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}"
+  end
+
+  def zip_student_work_by_user(work)
     homeworks_attach_path = []
     not_exist_file = []
     # 需要将所有homework.attachments遍历加入zip
@@ -186,10 +193,23 @@ class ZipdownController < ApplicationController
         digests << 'not_exist_file'
       end
     end
-    out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+
-      zipping("#{work.user.show_name}_#{((work.user.user_extensions.nil? || work.user.user_extensions.student_id.nil?) ? "" : work.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip",
+    #单个文件的话,不需要压缩,只改名
-              homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
+    out_file = nil
-    }
+    if homeworks_attach_path.size == 1
+      out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+        des_path = "#{OUTPUT_FOLDER}/#{make_zip_name(work)}_#{File.basename(homeworks_attach_path.first)}"
+        FileUtils.cp homeworks_attach_path.first, des_path
+        des_path
+      }
+    else
+      out_file = find_or_pack(work.homework_common_id, work.user_id, digests.sort){
+        zipping("#{make_zip_name(work)}.zip",
+                homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
+      }
+    end
+    out_file
+
   end
 
 

app/helpers/courses_helper.rb

@@ -746,7 +746,7 @@ module CoursesHelper
     return[] unless course
     result = []
     course.attachments.each do |attachment|
-      if attachment.is_public? ||User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id))|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
+      if attachment.is_public? ||User.current == attachment.author ||User.current.allowed_to?(:as_teacher,Course.find(attachment.container_id))|| (User.current.member_of_course?(course) && attachment.is_publish == 1) || User.current.admin?
         result << attachment
       end
     end

app/helpers/repositories_helper.rb

@@ -41,6 +41,16 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  # 获取diff内容行号
+  def diff_line_num content
+    content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
+  end
+
+  # 处理内容
+  def diff_content content
+    content.gsub!(/.*@@ -\d+,\d+ \+\d+,\d+ @@\n/m,'')
+  end
+
   def format_revision(revision)
     if revision.respond_to? :format_identifier
       revision.format_identifier

app/helpers/users_helper.rb

@@ -85,6 +85,11 @@ module UsersHelper
     end
   end
 
+  def link_to_user_version(version, options = {})
+    return '' unless version && version.is_a?(Version)
+    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => "linkBlue"
+  end
+
   # 统计未读消息数
   def unviewed_message(user)
     course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count

app/models/attachment.rb

@@ -643,8 +643,8 @@ class Attachment < ActiveRecord::Base
 
   def decrease_attchments_count
     if self.container_type == "Project" && !self.project.project_score.nil?
-      aatach_count = self.container.project_score.attach_num - 1
+      attach_count = self.container.project_score.attach_num - 1
-      self.container.project_score.update_attribute(:attach_num, aatach_count)
+      self.container.project_score.update_attribute(:attach_num, attach_count < 0 ? 0 : attach_count)
     end
   end
 end

app/models/issue.rb

@@ -184,7 +184,7 @@ class Issue < ActiveRecord::Base
   def decrease_issues_count
     unless self.project.project_score.nil?
       issue_count = self.project.project_score.issue_num - 1
-      self.project.project_score.update_attribute(:issue_num, issue_count)
+      self.project.project_score.update_attribute(:issue_num, issue_count < 0 ? 0 : issue_count)
     end
   end
 

app/models/journal.rb

@@ -219,8 +219,9 @@ class Journal < ActiveRecord::Base
   # 减少留言数量统计
   def decrease_issues_journal_count
     unless self.issue.project.nil?
-      project = self.issue.project
+      journal_count = self.issue.project.project_score.issue_journal_num - 1
-      project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num - 1)
+      # project = self.issue.project
+       self.issue.project.project_score.update_attribute(:issue_journal_num, journal_count < 0 ? 0 : journal_count)
     end
   end
 

app/models/message.rb

@@ -146,10 +146,10 @@ class Message < ActiveRecord::Base
       # 讨论区
       if self.parent_id.nil?
         count = self.project.project_score.board_num - 1
-        self.project.project_score.update_attribute(:board_num, count)
+        self.project.project_score.update_attribute(:board_num, count < 0 ? 0 : count)
       else # 回复
         count = self.project.project_score.board_message_num - 1
-        self.project.project_score.update_attribute(:board_message_num, count)
+        self.project.project_score.update_attribute(:board_message_num, count < 0 ? 0 : count)
       end
     end
   end

app/models/news.rb

@@ -126,7 +126,7 @@ class News < ActiveRecord::Base
   def decrease_news_count
     if self.project && !self.project.project_score.nil?
       count = self.project.project_score.news_num - 1
-      self.project.project_score.update_attribute(:news_num, count)
+      self.project.project_score.update_attribute(:news_num, count < 0 ? 0 : count)
     end
   end
 

app/views/blog_comments/_simple_ke_reply_form.html.erb

@@ -1,16 +1,3 @@
-<style type="text/css">
-    /*回复框*/
-    .ReplyToMessageInputContainer .ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-    .ReplyToMessageInputContainer .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-outline{border:none;}
-    .ReplyToMessageInputContainer .ke-inline-block{display: none;}
-    .ReplyToMessageInputContainer .ke-container{float:left;}
-</style>
-
 <div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">

app/views/common/_file.html.erb

@@ -8,7 +8,7 @@
       <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
     </th>
     <td class="line-code">
-      <pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre>
+      <pre style="width:auto;white-space: nowrap;overflow: auto; "><%= line.html_safe %></pre>
     </td>
   </tr>
   <% line_num += 1 %>

app/views/courses/_user_homework_search_list.html.erb

@@ -2,18 +2,6 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
-    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url("/images/public_icon.png")}
-    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
-    .homepagePostReplyInputContainer .ke-outline {border: none;}
-    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
-    .homepagePostReplyInputContainer .ke-container {float: left;}
-</style>
 <div id="user_homework_list">
   <% homework_commons.each do |homework_common|%>
       <script type="text/javascript">

app/views/courses/syllabus.html.erb

@@ -4,18 +4,6 @@
     <%= javascript_include_tag 'blog' %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    span.ke-toolbar-icon-url{background-image:url("/images/public_icon.png")}
-    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    div.ke-toolbar .ke-outline{border:none;}
-    .ke-inline-block{display: none;}
-    div.ke-container{float:left;}
-</style>
 <script type="text/javascript">
     $(function(){
         $("#RSide").removeAttr("id");

app/views/files/_course_list.html.erb

@@ -1,82 +1,8 @@
-
-<% delete_allowed = User.current.allowed_to?(:manage_files, course) %>
   <% curse_attachments.each do |file| %>
       <% if file.is_public? || User.current.member_of_course?(course) || User.current.admin? %>
-         <div class="resources mt10"><!--资源库内容开始--->
+        <div id="resource_detail_<%=file.id %>">
-              <div class="homepagePostBrief">
+            <%=render :partial=>'files/resource_detail',:locals => {:file => file} %>
-                <div class="homepagePostPortrait">
+        </div>
-                  <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
-                </div>
-                <div class="homepagePostDes">
-                  <div class="homepagePostTitle break_word mt-4">
-                    <%= link_to truncate(file.filename,length: 35, omission: '...'),
-                                download_named_attachment_path(file.id, file.filename),
-                                :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkBlue f_14 f_b"  %>
-                    <%= file_preview_eye(file, class: 'preview') %>
-                    <span id="image_private_<%= file.id%>">
-                        <% if file.is_public? == false%>
-                            <span class="img_private ml5">私有</span>
-                        <%end %>
-                    </span>
-                    <% if file.is_publish == 0 %>
-                        <span class="grey_homework_btn_cir ml5"><%=file.publish_time %>&nbsp;&nbsp;0点发布</span>
-                    <% end %>
-                  </div>
-                  <div class="mt5">
-                    <span class="fontGrey2 mr15 fl">上传时间：<%= format_time(file.created_on)%></span>
-                    <% if file.tag_list.length > 0%>
-                        <span class="fontGrey2 fl mr15">上传类型：<%= file.tag_list[0] %></span>
-                    <% end %>
-                    <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
-                    <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
-                  </div>
-                  <div class="cl"></div>
-                  <div class="tag_h">
-                    <!-- container_type = 1 代表是课程里的资源 -->
-                    <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
-                    <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
-                  </div>
-                  <div class="homepagePostSetting">
-
-                            <ul>
-                              <li class="homepagePostSettingIcon">
-                                <% if User.current.logged? %>
-
-                                    <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
-                                        <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"  %>
-                                            <ul class="homepagePostSettiongText">
-
-                                              <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
-                                              <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
-                                              <% if @course.is_public? %>
-                                                  <li>
-                                                    <span id="is_public_<%= file.id %>">
-                                                        <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
-                                                    </span>
-                                                  </li>
-                                              <%end%>
-                                                  <li>
-                                                    <%= link_to( '删除资源', attachment_path(file),
-                                                                 :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" && file.destroyable %>
-                                                  </li>
-                                            </ul>
-
-                                        <% end %>
-                                    <%else%>
-                                        <ul class="resourceSendO">
-                                          <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
-                                        </ul>
-                                    <% end %>
-                                <% end %>
-                              </li>
-                            </ul>
-
-                  </div>
-                  <div class="cl"></div>
-                </div>
-                <div class="cl"></div>
-              </div>
-         </div>
       <% else %>
           <div class="re_con_box"><span class='fr mr10 pr_join_span '><%= file.filename %>是私有资源</span></div>
       <% end %>

app/views/files/_hidden_file.html.erb

@@ -0,0 +1,55 @@
+<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
+<span class="uploadText mb10" style="margin-top: -20px;">发布设置</span>
+  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose"></a></div>-->
+<%= form_tag(republish_file_course_file_path(@course,@file), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+<div class="mb10">
+  <label class="fl c_dark f14" style="margin-top: 4px;">延迟发布：</label>
+  <div class="calendar_div fl">
+    <input  type="text" name="publish_time" id="attachment_publish_time" placeholder="发布日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%=@file.publish_time %>">
+    <%#= calendar_for('attachment_publish_time')%>
+  </div>
+  <span class="fl c_red" style="margin-top: 4px;" id="publish_time_notice"></span>
+  <div class="cl"></div>
+</div>
+  <!--<div class="mt15"> <span class="f14 fontGrey3 mr10">延迟发布：</span>
+    <input type="text" name="" placeholder="请输入0-50数值" class="markInput" />
+  </div>-->
+  <div>
+    <div class="courseSendSubmit"><a href="javascript:void(0);" onclick="submit_republish_file()" class="sendSourceText" id="submit_file">确定</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" onclick="hideModal()" class="sendSourceText linkGrey6">取消</a></div>
+  </div>
+<% end %>
+  <div class="cl"></div>
+<script>
+    function regex_publish_time()
+    {
+        var myDate = new Date();
+        if($.trim($("#attachment_publish_time").val()) == "")
+        {
+            $("#publish_time_notice").text("发布日期不能为空");
+            return false;
+        } else{
+            var publish_time = Date.parse($("#attachment_publish_time").val());
+            if(Date.parse(formate_date(myDate)) > publish_time)
+            {
+                $("#publish_time_notice").text("发布日期不能小于当前日期");
+                return false;
+            }
+            else
+            {
+                $("#publish_time_notice").text("");
+                return true;
+            }
+        }
+    }
+    function submit_republish_file()
+    {
+        if(regex_publish_time()) {
+            $('#submit_file').parent().parent().submit();
+        }
+    }
+    $(function(){
+        var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: 0, showOn: 'button', buttonImageOnly: true, buttonImage: '/images/public_icon.png', showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
+        $('#attachment_publish_time').datepicker(datepickerOptions);
+    });
+</script>

app/views/files/_resource_detail.html.erb

@@ -0,0 +1,77 @@
+<% delete_allowed = User.current.allowed_to?(:manage_files, @course) %>
+<div class="resources mt10"><!--资源库内容开始--->
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTitle break_word mt-4">
+        <%= link_to truncate(file.filename,length: 35, omission: '...'),
+                    download_named_attachment_path(file.id, file.filename),
+                    :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkBlue f_14 f_b"  %>
+        <%= file_preview_eye(file, class: 'preview') %>
+        <span id="image_private_<%= file.id%>">
+                        <% if file.is_public? == false%>
+                            <span class="img_private ml5">私有</span>
+                        <%end %>
+                    </span>
+        <% if file.is_publish == 0 %>
+            <span class="grey_homework_btn_cir ml5"><%=file.publish_time %>&nbsp;&nbsp;0点发布</span>
+        <% end %>
+      </div>
+      <div class="mt5">
+        <span class="fontGrey2 mr15 fl">上传时间：<%= format_time(file.created_on)%></span>
+        <% if file.tag_list.length > 0%>
+            <span class="fontGrey2 fl mr15">上传类型：<%= file.tag_list[0] %></span>
+        <% end %>
+        <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
+        <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
+      </div>
+      <div class="cl"></div>
+      <div class="tag_h">
+        <!-- container_type = 1 代表是课程里的资源 -->
+        <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+        <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+      </div>
+      <div class="homepagePostSetting">
+
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <% if User.current.logged? %>
+
+                <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
+                    <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"  %>
+                        <ul class="homepagePostSettiongText">
+
+                          <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
+                          <li><%= link_to '延期发布',file_hidden_course_file_path(@course,file),:class => "postOptionLink",:remote=>true %></li>
+                          <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
+                          <% if @course.is_public? %>
+                              <li>
+                                                    <span id="is_public_<%= file.id %>">
+                                                        <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post  %>
+                                                    </span>
+                              </li>
+                          <%end%>
+                          <li>
+                            <%= link_to( '删除资源', attachment_path(file),
+                                         :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" && file.destroyable %>
+                          </li>
+                        </ul>
+
+                    <% end %>
+                <%else%>
+                    <ul class="resourceSendO">
+                      <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
+                    </ul>
+                <% end %>
+            <% end %>
+          </li>
+        </ul>
+
+      </div>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>

app/views/files/_upload_course_files.erb

@@ -1,3 +1,4 @@
+<script src="/javascripts/i18n/jquery.ui.datepicker-zh-CN.js" type="text/javascript"></script>
 <div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf;  font-size:16px;">
   <div class="upload_con">
     <h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
@@ -28,7 +29,7 @@
                     <input  type="text" name="publish_time" id="attachment_publish_time" placeholder="发布日期(可选)" class="InputBox fl W120 calendar_input" readonly="readonly">
                     <%#= calendar_for('attachment_publish_time')%>
                 </div>
-                <span class="fl c_red" style="margin-top: 4px;" id="publish_time_notice"></span>
+                <span class="fl c_red f12" style="margin-top: 4px;" id="publish_time_notice"></span>
                 <div class="cl"></div>
               </div>
           <% end %>

app/views/files/file_hidden.js.erb

@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/hidden_file',:locals => {:course => @course,:course_attachment_type => 1}) %>');
+showModal('ajax-modal', '311px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 280px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");

app/views/files/republish_file.js.erb

@@ -0,0 +1,2 @@
+hideModal();
+$("#resource_detail_<%=@file.id %>").html("<%= escape_javascript(render :partial=>'files/resource_detail',:locals => {:file => @file}) %>")

app/views/issues/index.html.erb

@@ -1,18 +1,7 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: true,init_activity: true) %>
 <% end %>
-<style type="text/css">
+
-    /*回复框*/
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}*/
-    /*span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}*/
-    /*span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}*/
-    /*div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}*/
-    /*span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}*/
-    /*span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}*/
-    /*div.ke-toolbar .ke-outline{border:none;}*/
-    /*.ke-inline-block{display: none;}*/
-    /*div.ke-container{float:left;}*/
-</style>
 <script>
     $(function(){
         $("#RSide").removeAttr("id");

app/views/layouts/base_org.html.erb

@@ -46,12 +46,12 @@
           <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
             <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), request.local? ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
             <%= link_to User.current, (request.local? || request.subdomain.blank?) ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
-            <%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
+            <%= link_to "退出",(request.local? || request.subdomain.nil?) ? signout_path():"https://www.trustie.net/logout", :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
           </li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
-          <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
+          <li class="navOrgMenu fr"><a href="<%= (request.local? || request.subdomain.nil?) ? signin_path(:login=>true):'https://www.trustie.net/login?login=true' %>" class="linkGrey8 f14">登录</a></li>
-          <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>false) %>" class="linkGrey8 f14 mr15">注册</a></li>
+          <li class="navOrgMenu fr"><a href="<%= (request.local? || request.subdomain.nil?) ? signin_path(:login=>false):'https://www.trustie.net/login?login=false' %>" class="linkGrey8 f14 mr15">注册</a></li>
       <% end %>
     </ul>
     <!--<div class="navHomepageProfile">

app/views/layouts/base_projects.html.erb

@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'header','public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','repository','share' %>
+  <%= stylesheet_link_tag 'header','scm','public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','repository','share' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
 
   <%= call_hook :view_layouts_base_html_head %>

app/views/messages/_reply_message.html.erb

@@ -1,15 +1,3 @@
-<style type="text/css">
-    /*回复框*/
-    .ReplyToMessageInputContainer .ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-    .ReplyToMessageInputContainer .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-outline{border:none;}
-    .ReplyToMessageInputContainer .ke-inline-block{display: none;}
-    .ReplyToMessageInputContainer .ke-container{float:left;}
-</style>
 
 <div class="ReplyToMessageContainer borderBottomNone" id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>

app/views/news/_course_news_detail.html.erb

@@ -3,18 +3,6 @@
     <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
 <% if newss%>
     <% newss.each do |news| %>
         <script>

app/views/news/_project_news_detail.html.erb

@@ -3,18 +3,6 @@
     <%= javascript_include_tag "create_kindeditor" %>
 <% end %>
 
-<style type="text/css">
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
 <% if all_news %>
     <% all_news.each do |news| %>
         <script>

app/views/org_document_comments/_simple_ke_reply_form.html.erb

@@ -1,16 +1,3 @@
-<style type="text/css">
-    /*回复框*/
-    .ReplyToMessageInputContainer .ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    .ReplyToMessageInputContainer .ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-    .ReplyToMessageInputContainer .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    .ReplyToMessageInputContainer .ke-outline{border:none;}
-    .ReplyToMessageInputContainer .ke-inline-block{display: none;}
-    .ReplyToMessageInputContainer .ke-container{float:left;}
-</style>
-
 <div class="ReplyToMessageContainer borderBottomNone"id="reply_to_message_<%= reply.id%>">
   <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
   <div class="ReplyToMessageInputContainer mb10">

app/views/organizations/_show_home_page.html.erb

@@ -17,6 +17,7 @@
             最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
           </div>
       <% end %>
+      <div class="cl"></div>
       <!--    <%# if defined?(home_id) %>
         <div style="float:right;">最后编辑：<%#= User.find() %></div>
     <%# end %>-->

app/views/organizations/_subfield_list.html.erb

@@ -28,7 +28,7 @@
       <li class="orgListStatus">新增</li>
       <li class="orgListStatus"><%= field.field_type == "Post" ? "帖子" : "资源" %></li>
       <li class="orgListUser hidden">
-        <% if @organization.domain %>
+        <% if Secdomain.where("sub_type=2 and pid=?", @organization.id).count > 0 %>
             <div id="sub_dir_show_<%= field.id %>" ondblclick="edit_dir('#sub_dir_show_<%= field.id %>','#sub_dir_edit_<%= field.id %>');" style="cursor:pointer;background-color:#fffce6;color: #0d90c3;" title="双击可编辑">
               <%= field.subfield_subdomain_dir.nil? ?  '未设置': field.subfield_subdomain_dir.name  %>
             </div>

app/views/organizations/setting.html.erb

@@ -27,6 +27,7 @@
         }
 
 </script>
+<% domain = Secdomain.where("sub_type=2 and pid=?", @organization.id).first %>
     <div class="homepageRightBanner">
       <div class="NewsBannerName">配置</div>
     </div>
@@ -53,12 +54,12 @@
         <div class="orgRow mb10"><span class="ml10">组织描述：</span><textarea type="text" name="organization[description]" class="orgDes" id="org_desc"  placeholder="最多3000个汉字（或6000个英文字符）"><%= @organization.description%></textarea>
           <div class="cl"></div>
         </div>
-            <div style="margin-left: 80px " id="check_desc_hint"></div>
+        <div style="margin-left: 80px " id="check_desc_hint"></div>
         <div class="orgRow mb10"><span class="ml10">组织URL：</span>
           <div class="w607 fr">http：//
-            <input type="text" name="organization[domain]" id="domain" value="<%= @organization.domain%>" class="orgUrlInput" />
+            <input type="text" name="organization[domain]" id="domain" value="<%= domain.nil? ? '' : domain.subname %>" class="orgUrlInput" />
             .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
-            <% if @organization.domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == @organization.domain %>
+            <% if domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == domain.subname %>
                 <span>(已批准)</span>
             <% elsif OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).count > 0 %>
                 <span>(您申请了子域名<%= OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content %>，还未批准)</span>
@@ -127,8 +128,8 @@
                 <input type="text" id="subfield_name" name="name" placeholder="栏目名称" class="orgAddSearch mb10" />
                 <div class="mb5">
                   <p class="fontGrey3"><span class="fb">域名目录</span>（用户自定义url，可选）</p>
-                  <% if @organization.domain %>
+                  <% if domain %>
-                    <span class="fl"><%= @organization.domain %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">
+                    <span class="fl"><%= domain.subname %>.trustie.net/</span><input class="fl personalUrl ml3" type="text" name="sub_dir">
                   <% else %>
                       <span class="fl">您还没有子域名，请先在左侧信息栏申请子域名</span>
                   <% end %>

app/views/projects/_project_activities.html.erb

@@ -35,18 +35,7 @@
         })
     })
 </script>
-<style type="text/css">
+
-    /*回复框*/
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}*/
-    /*span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}*/
-    /*span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}*/
-    /*div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}*/
-    /*span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}*/
-    /*span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}*/
-    /*div.ke-toolbar .ke-outline{border:none;}*/
-    /*.ke-inline-block{display: none;}*/
-    /*div.ke-container{float:left;}*/
-</style>
 <% unless forge_acts.empty? %>
     <% forge_acts.each do |activity| -%>
         <script>

app/views/repositories/_commit_details.html.erb

@@ -0,0 +1,15 @@
+<div class="commit-row-info">
+  <% if !user_commit_rep(changeset.author_email).nil? %>
+      <a class="commit-author-link has_tooltip"> <span class="commit-author-name">
+                        <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
+        <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>提交于
+      <div class="committed_ago">
+        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>前 </time>&nbsp;
+      </div>
+  <% else %>
+      <span class="commit-author-name"><%= changeset.author_email %></span>提交于
+      <div class="committed_ago">
+        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
+      </div>
+  <% end %>
+</div>

app/views/repositories/_dir_list_content.html.erb

@@ -24,10 +24,10 @@
 <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
   <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
 <% if @repository.report_last_commit %>
-<td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
+      <td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
-<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
+      <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-<td class="author"><%= entry.author %></td>
+      <td class="author"><%= entry.author %></td>
-<td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
+      <td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
 <% end %>
 </tr>
 <% end %>

app/views/repositories/_revisions.html.erb

@@ -20,27 +20,13 @@
           <div class="col-md-10 col-sm-12">
             <ul class="bordered-list">
               <li class="commit js-toggle-container">
-                <div class="commit-row-info">
+                <%= render :partial => 'commit_details', :locals => {:changeset => changeset} %>
-                  <% if !user_commit_rep(changeset.author_email).nil? %>
-                      <a class="commit-author-link has_tooltip"> <span class="commit-author-name">
-                        <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
-                        <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>提交于
-                      <div class="committed_ago">
-                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>前 </time>&nbsp;
-                      </div>
-                  <% else %>
-                      <span class="commit-author-name"><%= changeset.author_email %></span>提交于
-                      <div class="committed_ago">
-                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
-                      </div>
-                  <% end %>
-                </div>
                 <div style="padding-left:30px;" class="commit-row-title">
                 <strong class="str-truncated">
                   <a class="commit-row-message"><%= textilizable(truncate_at_line_break(changeset.message)) %></a>
                 </strong>
                 <div class="pull-right" title="修订号">
-                  <%= h truncate(changeset.short_id.to_s, :length => 20) %>
+                  <%= link_to truncate(changeset.short_id.to_s, :length => 20), {:controller => 'repositories', :action => 'commit_diff', :id => project.id, :changeset => changeset.id} %>
                 </div>
                 <div class="notes_count">
                 </div>

app/views/repositories/changes.html.erb

@@ -15,7 +15,7 @@
 
 <div class="mt10">
 
-  <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path ,:revisions => @commits, :entry => @entry ,:commits_pages =>@commits_pages , :commits_count => @commits_count}) unless @commits.empty? %>
+  <%= render(:partial => 'revisions', :locals => {:project => @project, :path => @path , :revisions => @commits, :entry => @entry , :commits_pages => @commits_pages , :commits_count => @commits_count}) unless @commits.empty? %>
 
 </div>
 <% content_for :header_tags do %>

app/views/repositories/commit_diff.html.erb

@@ -0,0 +1,55 @@
+<div class="project_r_h">
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
+</div>
+<!--<script>-->
+<!--//    $(document).ready(function(){-->
+<!--//        $("#changed-files").click(function(){-->
+<!--//            $("#changed-files-detail").toggle();-->
+<!--//        });-->
+<!--//    });-->
+<!--</script>-->
+<div class="showing-changes-info fontGrey2"> Commit <a href="javascript:void()" class="linkGrey3">
+  <%= @commit_details.id %></a><br />
+  <li class="commit js-toggle-container">
+    <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %>
+  </li>
+</div>
+<div class="showing-changes-project f14"><%= @commit_details.message %></div>
+<!--<div class="showing-changes-row fontGrey2">Showing <a href="javascript:void()" class="linkGrey3" id="changed-files">3 changed files</a> with <span class="c_green">3 additions</span> and <span class="c_red">3 deletions</span>-->
+  <!--<ol class="mt10" id="changed-files-detail">-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/organizations/_org_course_homework.html.erb</a> </li>-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_course_homework.html.erb</a> </li>-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_user_homework_detail.html.erb</a> </li>-->
+  <!--</ol>-->
+<!--</div>-->
+
+<% @commit_diff.each do |cd| %>
+    <div class="showing-changes-row fontGrey2">
+      <a href="javascript:void()" class="linkGrey3" id="changed-files">
+        <img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd.new_path %>
+      </a>
+    </div>
+    <div class="autoscroll">
+      <table class="filecontent syntaxhl" style="width:100%;" >
+        <tbody>
+        <% line_num = diff_line_num(cd.diff) %>
+        <% diff_content = diff_content(cd.diff) %>
+        <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %>
+            <tr>
+              <th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
+                <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
+              </th>
+              <% if line[0,1] == "-" %>
+                  <td class="line-code diff_out"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% elsif line[0,1] == "+" %>
+                  <td class="line-code diff_in"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% else%>
+                  <td class="line-code"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% end %>
+            </tr>
+            <% line_num += 1 %>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+<% end %>

app/views/tags/update_project_tag_name.js.erb

@@ -1,11 +1,11 @@
-<% if @obj %>
+<% if @obj %>
-$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
-$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
-                         :locals => {:obj => @obj,:object_flag =>  @obj_flag,:select_tag_name => @select_tag_name}) %>');
+                         :locals => {:obj => @obj,:object_flag =>  @obj_flag,:select_tag_name => @select_tag_name}) %>');
-$("#tags_name_<%=@obj.id%>").val("");
+$("#tags_name_<%=@obj.id%>").val("");
-$("#add_tag_<%=@obj.id%>").hide();
+$("#add_tag_<%=@obj.id%>").hide();
-<% else %>
+<% else %>
-$("#course_list").html("<%= escape_javascript(render :partial => 'files/project_list',
+$("#course_list").html("<%= escape_javascript(render :partial => 'files/project_list',
-        :locals => {project: @project,all_attachments: @all_attachments,sort:@sort,order:@order,project_attachments:@obj_attachments}) %>");
+        :locals => {project: @project,all_attachments: @all_attachments,sort:@sort,order:@order,project_attachments:@obj_attachments}) %>");
-<% end %>
+<% end %>
 $("#files_tag_project").html("<%= escape_javascript(render :partial => "files/tag_yun_project", :locals => {:tag_list => @tag_list,:project => @project,:tag_name => @select_tag_name}) %>");

app/views/users/_user_activities.html.erb

@@ -38,18 +38,7 @@
         })
     })
 </script>
-<style type="text/css">
+
-    /*回复框*/
-    /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}*/
-    /*span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}*/
-    /*span.ke-toolbar-icon-url{background-image:url( "/images/public_icon.png" )}*/
-    /*div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}*/
-    /*span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}*/
-    /*span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}*/
-    /*div.ke-toolbar .ke-outline{border:none;}*/
-    /*.ke-inline-block{display: none;}*/
-    /*div.ke-container{float:left;}*/
-</style>
 <% user_activities.each do |user_activity|
   if user_activities %>
         <script>

app/views/users/_user_jours_list.html.erb

@@ -2,18 +2,7 @@
     <%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
     <%#= javascript_include_tag "init_KindEditor","user" %>
 <% end %>
-<style type="text/css">
+
-    /*回复框*/
-    /*.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}*/
-    /*.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}*/
-    /*.homepagePostReplyInputContainer .ke-outline {border: none;}*/
-    /*.homepagePostReplyInputContainer .ke-inline-block {display: none;}*/
-    /*.homepagePostReplyInputContainer .ke-container {float: left;}*/
-</style>
 <%if jours %>
     <% jours.each do |jour|%>
         <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>

app/views/users/_user_message_org.html.erb

@@ -12,7 +12,7 @@
             <%= ma.content %>
           </li>
           <li class="homepageHomeworkContentWarn fl">
-            <%=link_to (ma.organization.domain.nil? || (ma.organization.domain && ma.organization.domain != ma.content)) ? "同意申请":"申请已批准",
+            <%=link_to (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准",
                        agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ),
                        :id => "agree_apply_subdomain_#{ma.id}",
                        :method => 'post',

app/views/users/user_organizations.html.erb

@@ -22,12 +22,7 @@
               </div>
               <div class="orgWrap">
                 <div class="orgTitle">
-                  <% if org.domain.nil? %>
                     <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %>
-                  <% else %>
-                    <%= link_to org.name, organization_path(org), :class => 'f16 linkBlue' %>
-                    <!--<a href="http://test.<%#= org.domain %>.trustie.net" class = 'f16 linkBlue'><%#= org.name %></a>-->
-                  <% end %>
                 </div>
                 <div class="orgIntro"><%= org.description %></div>
                 <div class="postCreater">创建者：<%= link_to User.find(org.creator_id), user_path(org.creator_id), :class => 'linkGrey2', :target => '_blank' %></div>

config/initializers/subdomain.rb

@@ -9,7 +9,7 @@ class Subdomain
     o = ::Secdomain.where(subname: request.subdomain).first
 
     if(@opt[:sub])
-      if o && o.sub_type == 2 && request.path_parameters[:sub_dir_name] == 'news'
+      if o && o.sub_type == 2
         request.path_parameters[:id] = o.pid
         request.path_parameters[:controller] = 'org_subfields'
         request.path_parameters[:action] = 'show'

config/routes.rb

@@ -695,6 +695,7 @@ RedmineApp::Application.routes.draw do
       end
       member do
         match "quote_resource_show", :via => [:get]
+        get "file_hidden"
       end
     end
 
@@ -831,7 +832,7 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :action => /(browse|show|entry|raw|annotate|diff|commit_diff)/,
           :rev    => /[a-z0-9\.\-_]+/
       }
 
@@ -850,15 +851,15 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :action => /(browse|show|entry|raw|annotate|diff|commit_diff)/,
           :rev    => /[a-z0-9\.\-_]+/
       }
   get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
       :controller => 'repositories',
-      :action => /(browse|show|entry|raw|changes|annotate|diff)/
+      :action => /(browse|show|entry|raw|changes|annotate|diff|commit_diff)/
   get 'projects/:id/repository/:action(/*path(.:ext))',
       :controller => 'repositories',
-      :action => /(browse|show|entry|raw|changes|annotate|diff)/
+      :action => /(browse|show|entry|raw|changes|annotate|diff|commit_diff)/
 
   get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
   get 'projects/:id/repository', :to => 'repositories#show', :path => nil
@@ -1015,6 +1016,8 @@ RedmineApp::Application.routes.draw do
       end
       member do
         match "quote_resource_show", :via => [:get]
+        get "file_hidden"
+        post "republish_file"
       end
     end
     resources :memberships, :shallow => true, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do

db/migrate/20160223021012_add_index_to_secdomain.rb

@@ -0,0 +1,5 @@
+class AddIndexToSecdomain < ActiveRecord::Migration
+  def change
+    add_index(:secdomains, :subname, unique: true)
+  end
+end

db/migrate/20160223021227_move_domain_to_secdomain.rb

@@ -0,0 +1,14 @@
+class MoveDomainToSecdomain < ActiveRecord::Migration
+  def up
+    Secdomain.transaction do
+      #将组织中的子域名迁移至secdomains表
+      Organization.where("domain is not null").each do |org|
+        Secdomain.create(sub_type: 2,  subname: org.domain, pid: org.id)
+      end
+      #remove_column :organizations, :domain
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20160223031843_remove_domain_from_organizations.rb

@@ -0,0 +1,8 @@
+class RemoveDomainFromOrganizations < ActiveRecord::Migration
+  def up
+    remove_column :organizations, :domain
+  end
+
+  def down
+  end
+end

db/migrate/20160223073859_add_publish_to_attachment_histories.rb

@@ -0,0 +1,6 @@
+class AddPublishToAttachmentHistories < ActiveRecord::Migration
+  def change
+    add_column :attachment_histories, :is_publish, :integer, :default => 1
+    add_column :attachment_histories, :publish_time, :date
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160220100507) do
+ActiveRecord::Schema.define(:version => 20160223073859) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -99,6 +99,8 @@ ActiveRecord::Schema.define(:version => 20160220100507) do
     t.integer  "quotes"
     t.integer  "version"
     t.integer  "attachment_id"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
   end
 
   create_table "attachments", :force => true do |t|
@@ -118,6 +120,8 @@ ActiveRecord::Schema.define(:version => 20160220100507) do
     t.integer  "is_public",                    :default => 1
     t.integer  "copy_from"
     t.integer  "quotes"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
   end
 
   add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id"
@@ -1265,7 +1269,6 @@ ActiveRecord::Schema.define(:version => 20160220100507) do
     t.text     "description"
     t.integer  "creator_id"
     t.integer  "home_id"
-    t.string   "domain"
     t.boolean  "is_public"
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
@@ -1373,7 +1376,6 @@ ActiveRecord::Schema.define(:version => 20160220100507) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
-    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end

public/stylesheets/project.css

@@ -694,7 +694,7 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 
 /*pre标签换行*/
 .break_word{word-break: break-all;word-wrap: break-word;}
-.break_word_firefox{white-space: pre-wrap;word-break: break-all;}
+.break_word_firefox{white-space: pre-wrap !important;word-break: break-all;}
 
 /*问题跟踪attachment显示*/
 div.attachments { margin-top: 12px; }
@@ -896,9 +896,9 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 /*end*/
 /***** Diff *****/
 .diff_out { background: #fcc; }
-.diff_out span { background: #faa; }
+/*.diff_out span { background: #faa; }*/
 .diff_in { background: #cfc; }
-.diff_in span { background: #afa; }
+/*.diff_in span { background: #afa; }*/
 
 .text-diff {
     padding: 1em;
@@ -1169,3 +1169,18 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .proInfoBox2{ border:1px solid #dddddd; height:45px; padding:10px 0; background-color:#f1f1f1;}
 .proInfoBox2 ul li{ height:24px; position:relative;}
 .maxwidth150{max-width: 150px;}
+
+/*版本库diff*/
+.showing-changes-info {width:650px; padding:10px; padding-top: 0px; background-color:#ffffff; line-height:2;}
+.showing-changes-project {width:650px; padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+.showing-changes-row {width:650px; padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+#changed-files-detail {display:none;}
+#changed-files-detail li {list-style-type:disc; margin-left:15px;}
+.showing-changes-detail {width:670px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+.changes-detail-chart {width:100%; overflow:auto; border-collapse:collapse; margin:0px; padding:0px; background-color:#f1f1f1;}
+.diff-line-number {width:35px; min-width:35px; max-width:50px; border-right:1px solid #c1c1c1; padding:0px 5px; text-align:right; background-color:#f1f1f1;}
+.code-line-old {background-color:#ffecec;}
+.number-line-old {background-color:#ffdddd; border-color:#f1c0c0;}
+.code-line-new {background-color:#eaffea;}
+.number-line-new {background-color:#dbffdb; border-color:#c1e9c1;}
+.branch-label {padding-right: 5px; border-radius:2px; color:#888888; display:inline-block; background-color:#f8fafc;}