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

app/controllers/org_document_comments_controller.rb

@@ -1,6 +1,6 @@
 class OrgDocumentCommentsController < ApplicationController
   before_filter :find_organization, :only => [:new, :create, :show, :index]
-  before_filter :authorize_allowed, :only => [:create, :add_reply]
+  before_filter :authorize_allowed, :only => [:create]
   helper :attachments,:organizations
   layout 'base_org'
 

app/controllers/sub_document_comments_controller.rb

@@ -1,7 +1,7 @@
 class SubDocumentCommentsController < ApplicationController
   before_filter :find_subdomain_and_subfield, :only => [:new, :create, :show, :index, :destroy, :edit]
   before_filter :find_subfield_content, :only => [:show, :index]
-  before_filter :authorize_allowed, :only => [:create, :add_reply]
+  before_filter :authorize_allowed, :only => [:create]
   helper :attachments,:organizations
   layout 'base_sub_domain'
 

app/views/layouts/base_org2.html.erb

@@ -98,27 +98,27 @@
             <% else %>
                 <% if field.field_type == "Post" && field.hide == 0 %>
                     <li class="nav-element">
-                      <a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                      <%= link_to field.name, organization_path(@organization, :org_subfield_id => field.id), :class => "sn-link-white", :target => "_blank" %>
                     </li>
                     <!--二级目录-->
                     <div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
                       <ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
                         <% field.sub_domains.each do |subdomain| %>
-                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
+                            <li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey", :target => "_blank" %></li>
                             <li class="sn-subnav-slice">|</li>
                         <% end %>
                       </ul>
                     </div>
                 <% elsif field.field_type == "Resource" && field.hide == 0 %>
                     <li class="nav-element">
-                      <a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
+                      <%= link_to field.name, org_subfield_files_path(field), :class => "sn-link-white", :target => "_blank" %>
                     </li>
                 <% end %>
             <% end %>
         <% end %>
         <% if User.current.admin_of_org?(@organization) %>
             <li class="nav-element">
-              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
+              <a href="<%= setting_organization_path(@organization) %>" class="sn-link-white" target ="_blank">配置</a>
             </li>
         <% end %>
       </ul>