-
- <%= link_to "全部", shixun_authorization_managements_path(:type => [1, 2]), :class => "edu-filter-cir-grey mr5 active", :id => "shixun_all_authentication", :remote => true %>
- <%= link_to "同意", shixun_authorization_managements_path(:type => 1), :class => "edu-filter-cir-grey mr5", :id => "shixun_agree_authentication", :remote => true %>
- <%= link_to "拒绝", shixun_authorization_managements_path(:type => 2), :class => "edu-filter-cir-grey mr5", :id => "shixun_reject_authentication", :remote => true %>
+
+ <%= link_to "全部", shixun_authorization_managements_path(:type => [1, 2]), :class => "edu-filter-cir-grey mr5 fl font-12 active", :id => "shixun_all_authentication", :remote => true %>
+ <%= link_to "同意", shixun_authorization_managements_path(:type => 1), :class => "edu-filter-cir-grey mr5 fl font-12", :id => "shixun_agree_authentication", :remote => true %>
+ <%= link_to "拒绝", shixun_authorization_managements_path(:type => 2), :class => "edu-filter-cir-grey mr5 fl font-12", :id => "shixun_reject_authentication", :remote => true %>
diff --git a/app/views/managements/shixun_authorization.js.erb b/app/views/managements/shixun_authorization.js.erb
index c7c4e14d1..4029771f7 100644
--- a/app/views/managements/shixun_authorization.js.erb
+++ b/app/views/managements/shixun_authorization.js.erb
@@ -6,14 +6,14 @@ var nAudit = $("#shixun_all_authentication").parent();
<% if @type == 0 %>
$("#authentication_list").html("<%= j( render :partial => "managements/shixun_authorization_list" ) %>");
-nTabNav_1.addClass("edu-new-tab-hover");
-nTabNav_2.removeClass("edu-new-tab-hover");
+nTabNav_1.addClass("background-orange");
+nTabNav_2.removeClass("background-orange");
nTabIcon_1.show();
nTabIcon_2.hide();
<% else %>
$("#shixun_authentication_list").html("<%= j( render :partial => "managements/shixun_authorization_passed_list" ) %>");
-nTabNav_1.removeClass("edu-new-tab-hover");
-nTabNav_2.addClass("edu-new-tab-hover");
+nTabNav_1.removeClass("background-orange");
+nTabNav_2.addClass("background-orange");
nTabIcon_1.hide();
nTabIcon_2.show();
/* -------------------------- 未审批（全部、同意、拒绝点击时动态样式） ------------------------------ */
diff --git a/app/views/managements/subject_authorization.html.erb b/app/views/managements/subject_authorization.html.erb
index b04eda5b3..d5f8718b3 100644
--- a/app/views/managements/subject_authorization.html.erb
+++ b/app/views/managements/subject_authorization.html.erb
@@ -4,11 +4,11 @@
-
- -
+
+ -
<%= link_to "待审批", {:controller => "managements", :action => "subject_authorization", :type => 0}, :class => "tab_type", :remote => true %>
- -
+
-
<%= link_to "已审批", {:controller => "managements", :action => "subject_authorization", :type => [1, 2]}, :class => "tab_type", :remote => true %>
@@ -24,10 +24,10 @@
-
- <%= link_to "全部", shixun_authorization_managements_path(:type => [1, 2]), :class => "edu-filter-cir-grey mr5 active", :id => "subject_all_authentication", :remote => true %>
- <%= link_to "同意", shixun_authorization_managements_path(:type => 1), :class => "edu-filter-cir-grey mr5", :id => "subject_agree_authentication", :remote => true %>
- <%= link_to "拒绝", shixun_authorization_managements_path(:type => 2), :class => "edu-filter-cir-grey mr5", :id => "subject_reject_authentication", :remote => true %>
+
+ <%= link_to "全部", shixun_authorization_managements_path(:type => [1, 2]), :class => "edu-filter-cir-grey mr5 font-12 fl active", :id => "subject_all_authentication", :remote => true %>
+ <%= link_to "同意", shixun_authorization_managements_path(:type => 1), :class => "edu-filter-cir-grey mr5 font-12 fl", :id => "subject_agree_authentication", :remote => true %>
+ <%= link_to "拒绝", shixun_authorization_managements_path(:type => 2), :class => "edu-filter-cir-grey mr5 font-12 fl", :id => "subject_reject_authentication", :remote => true %>
diff --git a/app/views/managements/subject_authorization.js.erb b/app/views/managements/subject_authorization.js.erb
index 92167b545..cb9bd2801 100644
--- a/app/views/managements/subject_authorization.js.erb
+++ b/app/views/managements/subject_authorization.js.erb
@@ -6,14 +6,14 @@ var nAudit = $("#subject_all_authentication").parent();
<% if @type == 0 %>
$("#subject_authentication_list").html("<%= j( render :partial => "managements/subject_authorization_list" ) %>");
-nTabNav_1.addClass("edu-new-tab-hover");
-nTabNav_2.removeClass("edu-new-tab-hover");
+nTabNav_1.addClass("background-orange");
+nTabNav_2.removeClass("background-orange");
nTabIcon_1.show();
nTabIcon_2.hide();
<% else %>
$("#subject_authorization_list").html("<%= j( render :partial => "managements/subject_authorization_passed_list" ) %>");
-nTabNav_1.removeClass("edu-new-tab-hover");
-nTabNav_2.addClass("edu-new-tab-hover");
+nTabNav_1.removeClass("background-orange");
+nTabNav_2.addClass("background-orange");
nTabIcon_1.hide();
nTabIcon_2.show();
/* -------------------------- 未审批（全部、同意、拒绝点击时动态样式） ------------------------------ */
diff --git a/app/views/managements/trial_authorization.html.erb b/app/views/managements/trial_authorization.html.erb
index cfded8cea..10dc325f3 100644
--- a/app/views/managements/trial_authorization.html.erb
+++ b/app/views/managements/trial_authorization.html.erb
@@ -4,11 +4,11 @@
-
- -
+
+ -
<%= link_to "待审批", {:controller => "managements", :action => "trial_authorization", :status => "0"}, :class => "tab_type", :remote => true %>
- -
+
-
<%= link_to "已审批", {:controller => "managements", :action => "trial_authorization", :status => [1,2]}, :class => "tab_type", :remote => true %>
@@ -28,10 +28,10 @@
-
- 全部
- 同意
- 拒绝
+
+ 全部
+ 同意
+ 拒绝
diff --git a/app/views/managements/trial_authorization.js.erb b/app/views/managements/trial_authorization.js.erb
index 5a536a53b..d198b3756 100644
--- a/app/views/managements/trial_authorization.js.erb
+++ b/app/views/managements/trial_authorization.js.erb
@@ -6,14 +6,14 @@ var nAudit = $("#audit_all_authentication").parent();
<% if @status == 0 %>
$("#authentication_list").html("<%= j( render :partial => "managements/trial_authorization_list" ) %>");
-nTabNav_1.addClass("edu-new-tab-hover");
-nTabNav_2.removeClass("edu-new-tab-hover");
+nTabNav_1.addClass("background-orange");
+nTabNav_2.removeClass("background-orange");
nTabIcon_1.show();
nTabIcon_2.hide();
<% else %>
$("#audit_authentication_list").html("<%= j( render :partial => "managements/trial_authorization_passed_list" ) %>");
-nTabNav_1.removeClass("edu-new-tab-hover");
-nTabNav_2.addClass("edu-new-tab-hover");
+nTabNav_1.removeClass("background-orange");
+nTabNav_2.addClass("background-orange");
nTabIcon_1.hide();
nTabIcon_2.show();
/* -------------------------- 未审批（全部、同意、拒绝点击时动态样式） ------------------------------ */
diff --git a/public/javascripts/edu/syllabus.js b/public/javascripts/edu/syllabus.js
index 351555569..ba998e20b 100644
--- a/public/javascripts/edu/syllabus.js
+++ b/public/javascripts/edu/syllabus.js
@@ -3,11 +3,11 @@ var syMemberLastSearchCondition = '';
function g(o){return document.getElementById(o);}
function HoverLi(n){
$('.new-tab-nav').removeClass("background-orange");
- for(var i=1;i<=3;i++){
+ for(var i=1;i<=2;i++){
//g('edu-tab-nav-'+i).className='edu-tab-nomal';
- g('edu-tab-con-'+i).className='undis';
+ $('edu-tab-con-'+i).hide();
}
- g('edu-tab-con-'+n).className='dis';
+ $('edu-tab-con-'+n).show();
$('#edu-tab-nav-'+n).addClass("background-orange");
//g('edu-tab-nav-'+n).className='edu-new-tab-hover';
}
diff --git a/public/stylesheets/css/edu-user.css b/public/stylesheets/css/edu-user.css
index 76ff49757..6efe10ccb 100644
--- a/public/stylesheets/css/edu-user.css
+++ b/public/stylesheets/css/edu-user.css
@@ -233,4 +233,4 @@ input.new_loggin_input_test{ -webkit-box-shadow: 0 0 0px 1000px white inset; ou
.example-img{margin-left: -100px;left: 50%;top:50%;margin-top: -100px;position: relative}
.panel-cer-content table tr td{padding: 0px;border: none}
.panel-cer-content table tr td:nth-child(1){text-align:right;width: 20%}
-.panel-cer-content table tr td:nth-child(2){text-align:left;}
+.panel-cer-content table tr td:nth-child(2){text-align:left;color: #333333}