From 833be4dbaabb12f9a641ea74d4688679fec080d5 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 20 Sep 2017 11:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=AD=E8=B7=AF=E5=BE=84=E7=9A=84=E7=AE=80?=
=?UTF-8?q?=E4=BB=8B=E3=80=81=E5=AD=A6=E4=B9=A0=E9=A1=BB=E7=9F=A5=EF=BC=8C?=
=?UTF-8?q?=E8=AF=B7=E6=94=B9=E4=B8=BA=20ke=20=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 2 +-
app/views/subjects/new.html.erb | 38 ++++++++++++++++++++++++---
app/views/subjects/show.html.erb | 4 +--
public/javascripts/edu/base_edu.js | 6 +++--
4 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 12cd48c94..8ea6afc5b 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -36,7 +36,7 @@ class CoursesController < ApplicationController
before_filter :require_login, :only => [:join, :unjoin]
#before_filter :allow_join, :only => [:join]
require 'bundler/setup'
- require 'simple_xlsx_reader'
+ #require 'simple_xlsx_reader'
# params[:search] 搜索课程的名称
# params[:select] "join" "create" "all" 参与的 创建的 所有的课程
diff --git a/app/views/subjects/new.html.erb b/app/views/subjects/new.html.erb
index 6e2fd1f6f..95e0779bd 100644
--- a/app/views/subjects/new.html.erb
+++ b/app/views/subjects/new.html.erb
@@ -1,3 +1,6 @@
+<%= content_for(:header_tags) do %>
+ <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
@@ -23,14 +26,41 @@
-
-
+
+ <%#= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %>
+
+ <%= f.kindeditor :description,
+ :editor_id => 'new_subject_description',
+ :owner_id => 0,
+ :owner_type => OwnerTypeHelper::MESSAGE,
+ :width => '80%',
+ :height => 300,
+ :minHeight=>300,
+ :class => 'talk_text fl',
+ :input_html => { :id => 'new_subject_description',
+ :class => 'task task-height-220 panel-box-sizing task-form-80 fl color-grey ml20',
+ :maxlength => 5000 }
+ %>
+
请输入简介
-
-
+
+
+ <%= f.kindeditor :learning_notes,
+ :editor_id => 'new_learning_notes',
+ :owner_id => 0,
+ :owner_type => OwnerTypeHelper::MESSAGE,
+ :width => '80%',
+ :height => 300,
+ :minHeight=>300,
+ :class => 'talk_text fl',
+ :input_html => { :id => 'new_learning_notes',
+ :class => 'task task-height-220 panel-box-sizing task-form-80 fl color-grey ml20',
+ :maxlength => 5000 }
+ %>
+ <
请输入学习须知
diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb
index 7db344b7a..a3593101e 100644
--- a/app/views/subjects/show.html.erb
+++ b/app/views/subjects/show.html.erb
@@ -9,7 +9,7 @@
<% end %>
-
<%= @subject.description.blank? ? "暂未填写" : (@subject.description) %>
+
<%= @subject.description.blank? ? "暂未填写" : (@subject.description.html_safe) %>
<% end %>
@@ -142,7 +142,7 @@
<% end %>
- <%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes %>
<%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes.html_safe %>
教学团队
diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js
index 88d9f4eaf..34e761a12 100644
--- a/public/javascripts/edu/base_edu.js
+++ b/public/javascripts/edu/base_edu.js
@@ -1094,19 +1094,21 @@ function submit_new_subject(){
} else{
$("#new_subject_name_notice").hide();
}
- if($("#new_subject_description").val().trim() == ""){
+ if(new_subject_description.isEmpty()){
check = false;
$("#new_subject_description_notice").show();
} else{
$("#new_subject_description_notice").hide();
}
- if($("#new_learning_notes").val().trim() == ""){
+ if(new_learning_notes.isEmpty()){
check = false;
$("#new_learning_notes_notice").show();
} else {
$("#new_learning_notes_notice").hide();
}
if(check){
+ new_subject_description.sync();
+ new_learning_notes.sync();
$("#new_subject").submit();
}
}