Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

Conflicts:
	app/controllers/sub_document_comments_controller.rb
	app/views/sub_document_comments/_show_newstyle.html.erb
	app/views/sub_document_comments/show.html.erb

app/views/sub_document_comments/_show_newstyle.html.erb

@@ -1,12 +1,12 @@
 <div class="sn-innner-content">
   <div class="sn-row sn-bg-white">
-    <div class="sn-content-position"> 您的位置：<%= link_to "首页", organization_path(@organization) %> &gt;
+    <div class="sn-content-position sn-hidden"> 您的位置：<%= link_to "首页", organization_path(@organization), :class => "sn-link-grey2" %> &gt;
       <%=  @org_subfield.name %> &gt;
-      <%= link_to @subdomain.name, org_subfield_sub_domain_path(@subdomain) %> &gt;
-      <%= link_to @document.title, org_subfield_sub_domain_sub_document_comment_path(@document)  %> </div>
+      <%= link_to @subdomain.name, org_subfield_sub_domain_path(@subdomain), :class => "sn-link-grey2" %> &gt;
+      <%= link_to @document.title, org_subfield_sub_domain_sub_document_comment_path(@document), :class => "sn-link-grey2"  %> </div>
   </div>
   <div class="sn-inner-newslist">
-    <h2 class="sn-inner-newsh2"><%= @document.title %></h2>
+    <h2 class="sn-inner-newsh2 sn-hidden"><%= @document.title %></h2>
     <div class="sn-inner-newscon">
       <p class=" sn-inner-psmall">来源：卫星导航仿真与测试开放实验室 发布时间:：2016-04-08  浏览：200次</p>
       <p class=" sn-inner-pcon"><%= @document.content.html_safe %></p>