Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/helpers/application_helper.rb

@@ -3995,7 +3995,7 @@ module ApplicationHelper
 
   # Returns the javascript tags that are included in the html layout head
   def javascript_heads
-    tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3',  'jquery.colorbox-min', 'baiduTemplate')
+    tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application','jquery.colorbox-min', 'baiduTemplate')
     unless User.current.pref.warn_on_leaving_unsaved == '0'
       tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
     end

app/views/layouts/base_management.html.erb

@@ -113,9 +113,9 @@
         </li>
         <li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 10 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">审批</a>
           <ul class="edu-admin-nav-inner">
-            <li><%= link_to "实名认证", :controller => "managements", :action => "identity_authentication" %></li>
-            <li><%= link_to "职业认证", :controller => "managements", :action => "professional_authentication" %></li>
-            <li><%= link_to "试用授权", :controller => "managements", :action => "trial_authorization" %></li>
+            <li><%= link_to "实名认证", identity_authentication_managements_path %></li>
+            <li><%= link_to "职业认证", professional_authentication_managements_path %></li>
+            <li><%= link_to "试用授权", trial_authorization_managements_path %></li>
             <li><%= link_to "部门审批", depart_managements_path %></li>
             <li><%= link_to '单位审批', unit_managements_path %></li>
             <li><%= link_to '实训发布', shixun_authorization_managements_path %></li>