From 859e3e9a62572f7604bb4f83ad011fae0955b995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 7 May 2019 10:54:31 +0800 Subject: [PATCH] =?UTF-8?q?=20=E5=90=8E=E5=8F=B0=E6=92=A4=E9=94=80?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=EF=BC=88=E5=89=8D=E7=AB=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_trial_authorization_list_model.html.erb | 69 +++++++++++++++++++ .../_trial_authorization_passed_list.html.erb | 3 +- public/stylesheets/educoder/edu-main.css | 11 +++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 app/views/managements/_trial_authorization_list_model.html.erb diff --git a/app/views/managements/_trial_authorization_list_model.html.erb b/app/views/managements/_trial_authorization_list_model.html.erb new file mode 100644 index 00000000..01c39a59 --- /dev/null +++ b/app/views/managements/_trial_authorization_list_model.html.erb @@ -0,0 +1,69 @@ +
+
+ 撤销授权 +
+
+
+ <%= form_tag({:controller => 'courses', :action => 'join_course_multi_role'}, :remote => true, :method => :post, :id => 'new-watcher-form') do %> +
    +
  • + +
  • + +
  • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  • + +
  • + + +
  • + +
  • + 取消 + 确定 +
  • +
+ <% end %> +
+
+
+ + diff --git a/app/views/managements/_trial_authorization_passed_list.html.erb b/app/views/managements/_trial_authorization_passed_list.html.erb index 450058ee..bbba930b 100644 --- a/app/views/managements/_trial_authorization_passed_list.html.erb +++ b/app/views/managements/_trial_authorization_passed_list.html.erb @@ -37,7 +37,8 @@ 申请理由:<%= authorization.apply_reason %> <% if authorization.status == 2 %> -
  • 原因:<%= authorization.reason.blank? ? "空" : authorization.reason %>
  • +
  • 撤销原因:<%= authorization.reason.blank? ? "空" : authorization.reason %>
  • +
  • 备注说明:<%= authorization.reason.blank? ? "空" : authorization.reason %>
  • <% end %>
  • diff --git a/public/stylesheets/educoder/edu-main.css b/public/stylesheets/educoder/edu-main.css index c1765c2a..d48700a3 100644 --- a/public/stylesheets/educoder/edu-main.css +++ b/public/stylesheets/educoder/edu-main.css @@ -892,4 +892,15 @@ html>body #ajax-indicator { position: fixed; } .coolor838383{ color:#838383; +} + +.color4C4C4C{ + color:#4C4C4C; +} + +.remarktextarea{ + width: 500px; + margin-left: 20px; + text-indent: 25px; + min-height: 100px; } \ No newline at end of file