Merge branch 'dev_hjq' into szzh

app/controllers/attachments_controller.rb

@@ -600,7 +600,7 @@ private
 
   def has_login
     unless @attachment && @attachment.container_type == "PhoneAppVersion"
-      render_403 unless User.current.logged?
+      render_403 if  !User.current.logged? && @attachment.container_type != 'OrgSubfield' && @attachment.container_type != 'OrgDocumentComment'
     end
   end
 end

app/controllers/org_subfields_controller.rb

@@ -27,7 +27,11 @@ class OrgSubfieldsController < ApplicationController
     @sort = ""
     @order = ""
     @is_remote = false
-    @organization = Organization.find(params[:id])
+    if params[:id]
+      @organization = Organization.find(params[:id])
+    else
+      @organization = Organization.where("domain=?",request.subdomain).first
+    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 "+
         " org_subfields.organization_id=#{@organization.id} and subfield_subdomain_dirs.name='#{params[:sub_dir_name]}'").first

app/controllers/organizations_controller.rb

@@ -136,6 +136,10 @@ class OrganizationsController < ApplicationController
     end
   end
 
+  def check_uniq_domain
+    @is_exist = (Organization.where("domain=?", params[:org_domain]).count > 0)
+  end
+
   def find_organization
     @organization = Organization.find(params[:id])
   end

app/helpers/application_helper.rb

@@ -1996,6 +1996,8 @@ module ApplicationHelper
         candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
       elsif attachment.container.is_a?(OrgSubfield)
         candown = true
+      elsif attachment.container.is_a?(OrgDocumentComment)
+        candown = true
       elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
           attachment.container.board.course
         course = attachment.container.board.course

app/views/blogs/_article.html.erb

@@ -78,18 +78,16 @@
         发帖时间：<%= format_time(activity.created_on) %>
       </div>
       <div class="homepagePostDate fl ml15">
-        更新时间：<%= format_time(UserActivity.where("act_type='#{activity.class}' and act_id =#{activity.id}").first.updated_at) %>
+        更新时间：<%= format_time(activity.updated_on) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content= activity.content%>
+      <% else %>
+          <% content= activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+
       <div class="cl"></div>
       <!--<div class=" fl" style="width: 600px">
         <%# if activity.attachments.any?%>

app/views/blogs/_homepage.html.erb

@@ -40,9 +40,8 @@
         <%= link_to activity.title.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id,
                    :blog_id=>activity.blog.id,:id=>activity), :class=> "postGrey", :style => 'text-align:center;' %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" >
-        <%= activity.content.to_s.html_safe %>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.content} %>
+      
       <div class="cl"></div>
     </div>
     <div class="cl"></div>

app/views/files/_subfield_files.html.erb

@@ -19,7 +19,7 @@
 </script>
 
 <div class="homepageRight mt0 ml0">
-  <div class="homepageRightBanner">
+  <div class="homepageRightBanner" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>">
     <div class="NewsBannerName"><%= org_subfield.name %></div>
     <ul class="resourcesSelect">
       <ul class="resourcesSelect">

app/views/issues/index.html.erb

@@ -71,7 +71,7 @@
                 <a href="javascript:void(0)" class="grey_btn fl ml10" onclick="nh_reset_form();" >清空</a>
               </div><!--problem_search end-->
               <%#= link_to '新建问题', new_project_issue_path(@project) , :class => "green_u_btn fr ml10" %>
-              <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.visible.all.count %></a>
+              <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.project_score.issue_num %></a>
                 <%= l(:lable_issues_undo) %>：<a href="javascript:void(0)" class="c_red"><%= @project.issues.where('status_id in (1,2,4,6)').visible.all.count  %> </a>
               </p>
 

app/views/layouts/base_courses.html.erb

@@ -98,7 +98,7 @@
         <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
-          <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
+          <%= link_to "(#{@course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
           <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_message_new)}") if User.current.member_of_course?(@course) && @course.boards.first %>
         </div>
         <% end %>

app/views/layouts/base_org.html.erb

@@ -120,21 +120,19 @@
         <!--</div>-->
 
         <div class="cl"></div>
-        <% if User.current.logged? %>
-            <div class="f12 fontGrey3">
-              <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
-              <% if User.current.logged? %>
-                  (
-                  <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
-                  )
-              <% end %>
-              &nbsp;|&nbsp;
-              <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
-              <% if User.current.logged? %>
-                  （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
-              <% end %>
-            </div>
-        <% end %>
+        <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
+          <%# if User.current.logged? %>
+              (
+              <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+              )
+          <%# end %>
+          <% if User.current.logged? %>
+            &nbsp;|&nbsp;
+            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
+           （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+          <% end %>
+        </div>
       </div>
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>

app/views/org_document_comments/show.html.erb

@@ -25,7 +25,7 @@
       <div class="homepagePostDate">
         发布时间：<%= format_activity_day(@document.created_at) %> <%= format_time(@document.created_at, false) %></div>
       <% unless @document.content.blank? %>
-          <div class="homepagePostIntro" style="width:640px;">
+          <div class="homepagePostIntro" style="width:640px;" id="intro_content_<%= @document.id%>">
             <%= @document.content.html_safe %>
           </div>
       <% end %>
@@ -132,6 +132,11 @@
 </div>
 
 <script type="text/javascript">
+    $(function(){
+        var postContent = $("#intro_content_<%= @document.id%>").html();
+        postContent = postContent.replace(/&nbsp;/g," ");
+        $("#intro_content_<%= @document.id%>").html(postContent);
+    });
     function expand_reply(container, btnid) {
         var target = $(container);
         var btn = $(btnid);

app/views/org_subfields/_show_post_type.html.erb

@@ -17,7 +17,7 @@
     .homepagePostReplyInputContainer .ke-container {float: left;}
 </style>
 
-<div class="homepageRightBanner">
+<div class="homepageRightBanner" style="margin-top:<%= User.current.logged? ? '0px':'10px' %>">
   <div class="NewsBannerName"><%= @org_subfield.name %></div>
 </div>
 

app/views/organizations/_org_course_homework.html.erb

@@ -93,11 +93,8 @@
             <div class="homepagePostDeadline">匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
         <% end %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/organizations/_org_course_message.html.erb

@@ -35,15 +35,13 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
+
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/organizations/_org_course_news.html.erb

@@ -27,11 +27,7 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/organizations/_org_course_poll.html.erb

@@ -34,11 +34,8 @@
             更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
           </div>
           <div class="cl"></div>
-          <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-            <div id="intro_content_<%= user_activity_id%>">
-              <%= activity.polls_description.html_safe %>
-            </div>
-          </div>
+          <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.polls_description} %>
+
           <div class="cl"></div>
           <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
           <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/organizations/_org_left_subfield_list.html.erb

@@ -71,7 +71,11 @@
     <div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
       <% if field.field_type == "Post" %>
           <% if !field.subfield_subdomain_dir.nil? %>
-              <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+              <% if !request.local? and !organization.domain.nil? and Organization.where("domain is not null").map(&:domain).include?(request.subdomain) %>
+                  <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+              <% else %>
+                  <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+              <% end %>
           <% else %>
               <%= link_to "#{field.name}", organization_path(organization, :org_subfield_id => field.id), :class => "homepageMenuText" %>
           <% end %>
@@ -80,7 +84,11 @@
        <% end %>
       <% else %>
         <% if !field.subfield_subdomain_dir.nil? %>
-          <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+          <% if !request.local? and !organization.domain.nil? and Organization.where("domain is not null").map(&:domain).include?(request.subdomain) %>
+            <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+          <% else %>
+            <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
+          <% end %>
         <% else %>
           <%= link_to "#{field.name}", org_subfield_files_path(field), :class => "homepageMenuText" %>
         <% end %>

app/views/organizations/_org_project_issue.html.erb

@@ -38,13 +38,7 @@
         </div>
         <div class="cl"></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.description? %>
-              <%= textAreailizable activity, :description, :attachments => activity.attachments %>
-          <% end %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/organizations/_org_subfield_message.html.erb

@@ -31,15 +31,12 @@
         更新时间：<%= format_time(OrgActivity.where("org_act_type='#{activity.class}' and org_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/organizations/_project_message.html.erb

@@ -31,15 +31,12 @@
         更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/organizations/_show_home_page.html.erb

@@ -2,15 +2,13 @@
   <div class="homepagePostBrief">
 
     <div class="homepagePostDes" style="width:690px;">
-    <% if User.current.logged? %>
       <div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
-    <% end %>
       <% unless document.content.blank? %>
-          <div class="homepagePostIntro" >
+          <div class="homepagePostIntro" id="intro_content_<%= document.id%>">
             <%= document.content.html_safe %>
           </div>
       <% end %>
-      <% if params[:show_homepage].nil? and User.current.logged? %>
+      <% if params[:show_homepage].nil? %>
           <div class="homepagePostDate" style="float:right;">
             发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
           </div>
@@ -52,6 +50,9 @@
 </div>
 
 <script type="text/javascript">
+    var postContent = $("#intro_content_<%= document.id%>").html();
+    postContent = postContent.replace(/&nbsp;/g," ");
+    $("#intro_content_<%= document.id%>").html(postContent);
     function expand_reply(container, btnid) {
         var target = $(container);
         var btn = $(btnid);

app/views/organizations/_show_org_document.html.erb

@@ -20,7 +20,7 @@
       </div>
       <div class="cl"></div>
       <% unless document.content.blank? %>
-          <div class="homepagePostIntro" style="width:640px;">
+          <div class="homepagePostIntro" style="width:640px;" id="intro_content_<%= document.id%>">
             <%= document.content.html_safe %>
           </div>
       <% end %>
@@ -117,6 +117,9 @@
 
 <script type="text/javascript">
     function expand_reply(container, btnid) {
+        var postContent = $("#intro_content_<%= document.id%>").html();
+        postContent = postContent.replace(/&nbsp;/g," ");
+        $("#intro_content_<%= document.id%>").html(postContent);
         var target = $(container);
         var btn = $(btnid);
         if (btn.data('init') == '0') {

app/views/organizations/check_uniq_domain.js.erb

@@ -0,0 +1,5 @@
+<% if @is_exist %>
+    $is_exist = true;
+<% else %>
+    $is_exist = false;
+<% end %>

app/views/organizations/setting.html.erb

@@ -149,18 +149,33 @@
       if ($("#subfield_name").val().trim() != "")
         $("#add_subfield_form").submit();
   }
+  var $is_exist = false;
   function apply_subdomain(id, domain){
       var reg = new RegExp("^[a-zA-Z0-9_]{1,}$");
       if (reg.exec(domain)){
           $.ajax({
-              url:"<%= apply_subdomain_organization_path %>",
-              type:'post',
+              url: "<%= check_uniq_domain_organizations_path %>",
+              type: 'get',
               data:{
-                  id:id,
-                  domain:domain
+                  org_domain:domain
               },
               success:function(){
-                  $("#apply_hint").text("您的申请已提交，系统会以消息的形式通知您结果");
+                  if(!$is_exist){
+                      $.ajax({
+                          url:"<%= apply_subdomain_organization_path %>",
+                          type:'post',
+                          data:{
+                              id:id,
+                              domain:domain
+                          },
+                          success:function(){
+                              $("#apply_hint").text("您的申请已提交，系统会以消息的形式通知您结果");
+                          }
+                      });
+                  }
+                  else{
+                      $("#apply_hint").text("您申请的子域名已存在，请重新输入");
+                  }
               }
           });
       }

app/views/projects/_project_news.html.erb

@@ -27,11 +27,7 @@
         更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id %>">
-        <div id="intro_content_<%= user_activity_id %>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/users/_course_homework.html.erb

@@ -93,11 +93,8 @@
             <div class="homepagePostDeadline">匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
         <% end %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
+
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/users/_course_message.html.erb

@@ -35,15 +35,12 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/users/_course_news.html.erb

@@ -27,11 +27,7 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/users/_course_poll.html.erb

@@ -34,11 +34,7 @@
         更新时间：<%= format_time(CourseActivity.where("course_act_type='#{activity.class}' and course_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.polls_description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.polls_description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/users/_intro_content.html.erb

@@ -0,0 +1,12 @@
+<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
+  <div id="intro_content_<%= user_activity_id%>">
+    <%= content.to_s.html_safe%>
+  </div>
+</div>
+<script type="text/javascript">
+  $(function(){
+      var postContent = $("#intro_content_<%= user_activity_id%>").html();
+      postContent = postContent.replace(/&nbsp;/g," ");
+      $("#intro_content_<%= user_activity_id%>").html(postContent);
+  });
+</script>

app/views/users/_project_issue.html.erb

@@ -50,13 +50,7 @@
         </div>
         <div class="cl"></div>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.description? %>
-              <%= textAreailizable activity, :description, :attachments => activity.attachments %>
-          <% end %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/users/_project_message.html.erb

@@ -36,15 +36,12 @@
         更新时间：<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <% if activity.parent_id.nil? %>
-              <%= activity.content.to_s.html_safe%>
-          <% else %>
-              <%= activity.parent.content.to_s.html_safe%>
-          <% end %>
-        </div>
-      </div>
+      <% if activity.parent_id.nil? %>
+          <% content = activity.content%>
+      <% else %>
+          <% content = activity.parent.content%>
+      <% end %>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/users/_user_blog.html.erb

@@ -33,11 +33,7 @@
         更新时间：<%= format_time(UserActivity.where("act_type='#{activity.class}' and act_id =#{activity.id}").first.updated_at) %>
       </div>
       <div class="cl"></div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="activity_description_<%= user_activity_id%>">
-        <div id="intro_content_<%= user_activity_id%>">
-          <%= activity.content.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>user_activity_id, :content=>activity.content} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= user_activity_id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/users/_user_homework_detail.html.erb

@@ -95,11 +95,7 @@
             </div>
         <% end %>
       </div>
-      <div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth" id="homework_description_<%= homework_common.id%>">
-        <div id="intro_content_<%= homework_common.id%>">
-          <%= homework_common.description.html_safe %>
-        </div>
-      </div>
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>homework_common.id, :content=>homework_common.description} %>
       <div class="cl"></div>
       <div id="intro_content_show_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
       <div id="intro_content_hide_<%= homework_common.id%>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>

app/views/users/user_system_messages.html.erb

@@ -12,7 +12,7 @@
             <span style="color:#0781b4; max-width:470px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;"><%= system_message.subject.nil? ? "系统消息" : system_message.subject %></span>
           </div>
           <div class="cl"></div>
-          <div class="homepagePostIntro break_word upload_img">
+          <div class="homepagePostIntro break_word upload_img" id="system">
             <p>
               <%= system_message.content.nil? ? system_message.description.html_safe : system_message.content.html_safe %>
             </p>

config/routes.rb

@@ -66,6 +66,7 @@ RedmineApp::Application.routes.draw do
     end
     collection do
       get 'check_uniq'
+      get 'check_uniq_domain'
       get 'autocomplete_search'
       post 'hide_org_subfield'
       post 'show_org_subfield'
@@ -73,6 +74,7 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+
   constraints(Subdomain.new) do
     get '/', to: 'organizations#show'
   end
@@ -1123,6 +1125,8 @@ RedmineApp::Application.routes.draw do
 
   resources :at
 
+  get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id'
+
   Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
     file = File.join(plugin_dir, "config/routes.rb")
     if File.exists?(file)

db/migrate/20160115125217_update_rep_commits.rb

@@ -0,0 +1,32 @@
+class UpdateRepCommits < ActiveRecord::Migration
+  def up
+    project_count = Project.all.count / 30 + 2
+    transaction do
+      for i in 1 ... project_count do i
+      Project.page(i).per(30).each do |project|
+        puts project.id
+        if ProjectScore.where("project_id=?", project.id).first.nil?
+          puts "create project ==>#{project.id}"
+          ProjectScore.create(:project_id => project.id, :score => false)
+        end
+        unless project.project_score.nil?
+          # update boards
+          unless project.gpid.nil?
+            g = Gitlab.client
+            begin
+              puts project.id
+              count = g.project(project.gpid).commit_count
+            rescue
+              logger.error("The project's rep is not exit!")
+            end
+            project.project_score.update_attribute(:changeset_num, count)
+          end
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  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 => 20160115023749) do
+ActiveRecord::Schema.define(:version => 20160115125217) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

public/stylesheets/courses.css

@@ -1099,7 +1099,7 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}

public/stylesheets/new_user.css

@@ -581,7 +581,7 @@ a.homepageImageNumber:hover {color:#269ac9;}
 .homepageLeftMenuCourses {font-size:13px; border-bottom:1px solid #dddddd;}
 .homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;}
 .homepageLeftMenuCoursesLine:hover {background-color:#269ac9;}
-a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;}
+a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;}
 a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .homepageLeftMenuMore:hover {background-color:#269ac9;}
@@ -836,7 +836,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;display: inline}

public/stylesheets/project.css

@@ -1109,7 +1109,7 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{overflow: hidden; text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: normal !important;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { margin-top:28px; color:#888888; float:right;}