Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
dev_haigong
caishi 6 years ago
parent 23860440ff 787acee2ea
commit e836d333ea
24 changed files with 3700 additions and 3262 deletions
Show Stats Download Patch File Download Diff File

3
app/controllers/account_controller.rb
Unescape View File

@ -141,6 +141,7 @@ class AccountController < ApplicationController
@resubmit = "#{code}" @resubmit = "#{code}"
@agreement = Help.first @agreement = Help.first
@cooperation = Cooperation.all @cooperation = Cooperation.all
@url = params[:url]
@com_coop_img = CooImg.where(:img_type => 'com_coop').order("position asc") @com_coop_img = CooImg.where(:img_type => 'com_coop').order("position asc")
@edu_coop_img = CooImg.where(:img_type => 'edu_coop').order("position asc") @edu_coop_img = CooImg.where(:img_type => 'edu_coop').order("position asc")
@ -208,7 +209,7 @@ class AccountController < ApplicationController
end end
def insert_suggest def insert_suggest
content = "<p>[#{params[:question_kind]}]</p>" + params[:description] content = "<p>[#{params[:question_kind]}]</p>" + "<p>问题页面网址：#{params[:url]}</p>" + params[:description]
PrivateMessage.create(:user_id => User.current.id, :target_id => 1, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 1) PrivateMessage.create(:user_id => User.current.id, :target_id => 1, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 1)
PrivateMessage.create(:user_id => 1, :target_id => User.current.id, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 0) PrivateMessage.create(:user_id => 1, :target_id => User.current.id, :sender_id => User.current.id, :receiver_id => 1, :content => content, :send_time => Time.now, :status => 0)
redirect_to message_detail_user_path(User.current, :user_id => 1) redirect_to message_detail_user_path(User.current, :user_id => 1)

48
app/controllers/subjects_controller.rb
Unescape View File

@ -242,14 +242,56 @@ class SubjectsController < ApplicationController
memberships = params[:membership][:user_ids] memberships = params[:membership][:user_ids]
memberships.each do |member| memberships.each do |member|
user = User.find(member) user = User.find(member)
SubjectMember.create!(:user_id => member, :subject_id => @subject.id, :role => 2) SubjectMember.create!(:user_id => member, :subject_id => @subject.id, :role => 2,
:position => @subject.subject_members.size + 1)
end end
end end
end end
def delete_member def delete_member
member = @subject.subject_members.where(:user_id => params[:mem_id]).first if User.current.admin?
member.destroy if member ActiveRecord::Base.transaction do
member = @subject.subject_members.where(:id => params[:mem_id]).first
if member.present? && member.role != 1
@subject.subject_members.where("position > #{member.position}").update_all("position = position - 1")
member.destroy
end
end
else
render_403
end
end
def up_member_position
if User.current.member_of_subject?(@subject)
ActiveRecord::Base.transaction do
member = @subject.subject_members.where(:id => params[:mem_id]).first
raise "不能再上移了" if member.position == 1
up_member = @subject.subject_members.where(:position => member.position - 1).first
up_member.update_attribute(:position, member.position)
member.update_attribute(:position, member.position - 1)
end
else
render_403
end
end
def down_member_position
if User.current.member_of_subject?(@subject)
ActiveRecord::Base.transaction do
begin
member = @subject.subject_members.where(:id => params[:mem_id]).first
raise "不能再下移了" if member.position == @subject.subject_members.count
down_member = @subject.subject_members.where(:position => member.position + 1).first
down_member.update_attribute(:position, member.position)
member.update_attribute(:position, member.position + 1)
rescue Exception => e
raise ActiveRecord::Rollback
end
end
else
render_403
end
end end
def statistics def statistics

9
app/controllers/users_controller.rb
Unescape View File

@ -2559,6 +2559,15 @@ class UsersController < ApplicationController
end end
end end
@objects_count = @objects.size @objects_count = @objects.size
# 用户访问自己主页的"我管理的"列表，且是第一页才显示新建入口
page = params[:page] ? params[:page].to_i : 1
@new_icon = @user == User.current && ['a_course', 'a_shixun', 'a_project', 'a_path'].include?(@type) && page == 1
# 用户进自己主页的全部列表时有个新建入口，加一个"new"，view层的第一页需要shift，这样翻页就没问题啦
@objects = @objects.to_a
@objects.unshift("new") if @new_icon
@objects = paginateHelper @objects, 16 @objects = paginateHelper @objects, 16
respond_to do |format| respond_to do |format|

6
app/models/school.rb
Unescape View File

@ -66,4 +66,10 @@ class School < ActiveRecord::Base
dep = departments.where("identifier is not null").first dep = departments.where("identifier is not null").first
url = dep.present? ? "/colleges/#{dep.identifier}/statistics" : "" url = dep.present? ? "/colleges/#{dep.identifier}/statistics" : ""
end end
def course_act_time
CourseActivity.find_by_sql("SELECT max(ca.updated_at) as max_update FROM course_activities ca left join courses on ca.course_id =
courses.id LEFT JOIN user_extensions ON courses.tea_id=user_extensions.user_id WHERE
user_extensions.`school_id` = #{self.id}").first.try(:max_update)
end
end end

2
app/models/subject.rb
Unescape View File

@ -2,7 +2,7 @@ class Subject < ActiveRecord::Base
#status :0 编辑中 1 审核中 2 发布 #status :0 编辑中 1 审核中 2 发布
# belongs_to :user # belongs_to :user
has_many :users, :through => :subject_members has_many :users, :through => :subject_members
has_many :subject_members, :dependent => :destroy, :order => "subject_members.id ASC" has_many :subject_members, :dependent => :destroy, :order => "subject_members.position asc"
has_many :career_stages, :through => :career_stage_subjects has_many :career_stages, :through => :career_stage_subjects
has_many :career_stage_subjects, :dependent => :destroy has_many :career_stage_subjects, :dependent => :destroy

4
app/services/games_service.rb
Unescape View File

@ -65,7 +65,7 @@ class GamesService
# power判断用户是否有权限查看隐藏测试集(TPM管理员；平台认证的老师；花费金币查看者) -1 表示不能解锁 0 表示需要付费解锁 1表示可以看 # power判断用户是否有权限查看隐藏测试集(TPM管理员；平台认证的老师；花费金币查看者) -1 表示不能解锁 0 表示需要付费解锁 1表示可以看
# myshixun_manager # myshixun_manager
myshixun_manager = shixun_manager(shixun, current_user) || (current_user.is_certification_teacher && shixun.test_set_permission) myshixun_manager = shixun_manager(shixun, current_user) || (current_user.is_certification_teacher)
power = (myshixun_manager || game.test_sets_view ) ? 1 : (shixun.test_set_permission ? 0 : -1) power = (myshixun_manager || game.test_sets_view ) ? 1 : (shixun.test_set_permission ? 0 : -1)
# 选择题和编程题公共部分 # 选择题和编程题公共部分
@ -862,7 +862,7 @@ class GamesService
Rails.logger.warn("last_output is #{latest_output}") Rails.logger.warn("last_output is #{latest_output}")
# power判断用户是否有权限查看隐藏测试集(TPM管理员；平台认证的老师；花费金币查看者) # power判断用户是否有权限查看隐藏测试集(TPM管理员；平台认证的老师；花费金币查看者)
power = (shixun_manager(shixun, current_user) || (current_user.is_certification_teacher && shixun.test_set_permission)) ? 1 : (shixun.test_set_permission ? 0 : -1) power = (shixun_manager(shixun, current_user) || (current_user.is_certification_teacher)) ? 1 : (shixun.test_set_permission ? 0 : -1)
# 测试集统计及处理 # 测试集统计及处理
unless qurey_test_sets.blank? unless qurey_test_sets.blank?
check_power = (power == 1 || game.test_sets_view) check_power = (power == 1 || game.test_sets_view)

141
app/views/account/_suggest_show.html.erb
Unescape View File

@ -1,6 +1,6 @@
<%= stylesheet_link_tag 'css/public','css/common'%> <%= stylesheet_link_tag 'css/public','css/common'%>
<%= content_for(:header_tags) do %> <%= content_for(:header_tags) do %>
<%= import_ke(enable_at: false, prettify: false, init_activity: false) %> <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
<% end %> <% end %>
<div xmlns="http://www.w3.org/1999/html"> <div xmlns="http://www.w3.org/1999/html">
<div class="edu-back-white ml15 pt20 pb20 clearfix pl30 pr30 mb30"> <div class="edu-back-white ml15 pt20 pb20 clearfix pl30 pr30 mb30">
@ -15,79 +15,94 @@
<div class="color-orange mt15 mb15"> <div class="color-orange mt15 mb15">
<span class="mr5">*</span> <span class="mr5">*</span>
<a href="https://trustie.educoder.net/help?index=5" class="color-orange">看看帮助中心是否有你想要的答案</a></div> <a href="https://trustie.educoder.net/help?index=5" class="color-orange">看看帮助中心是否有你想要的答案</a></div>
<%= form_for('new_form',:url => insert_suggest_path(), :html =>{:id => "insert_suggest"}, :method => :post) do |f| %> <%= form_for('new_form',:url => insert_suggest_path(), :html =>{:id => "insert_suggest"}, :method => :post) do |f| %>
<div class="mt10"> <div class="mt10">
<span class="mr5 color-orange font-16">*</span><span class="font-16">问题分类</span> <span class="mr5 color-orange font-16">*</span><span class="font-16">问题分类</span>
<div class="font-14 mt10 mb10 ml20 color-dark-grey"> <div class="font-14 mt10 mb10 ml20 color-dark-grey">
<label class="mr40"> <label class="mr40">
<input type="radio" value="登录注册" class="mr5 magic-radio" name="question_kind" id ="type_1" checked> <input type="radio" value="登录注册" class="mr5 magic-radio" name="question_kind" id ="type_1" checked>
<label for="type_1" style="display: inline-block">登录注册</label> <label for="type_1" style="display: inline-block">登录注册</label>
</label> </label>
<label class="mr40"> <label class="mr40">
<input type="radio" value="信息认证" class="mr5 magic-radio" name="question_kind" id ="type_2"> <input type="radio" value="信息认证" class="mr5 magic-radio" name="question_kind" id ="type_2">
<label for="type_2" style="display: inline-block">信息认证</label> <label for="type_2" style="display: inline-block">信息认证</label>
</label> </label>
<label class="mr40"> <label class="mr40">
<input type="radio" value="实训编程" class="mr5 magic-radio" name="question_kind" id ="type_3"> <input type="radio" value="实训编程" class="mr5 magic-radio" name="question_kind" id ="type_3">
<label for="type_3" style="display: inline-block">实训编程</label> <label for="type_3" style="display: inline-block">实训编程</label>
</label> </label>
<label class="mr40"> <label class="mr40">
<input type="radio" value="实训课程" class="mr5 magic-radio" name="question_kind" id ="type_4"> <input type="radio" value="实训课程" class="mr5 magic-radio" name="question_kind" id ="type_4">
<label for="type_4" style="display: inline-block">实训课程</label> <label for="type_4" style="display: inline-block">实训课程</label>
</label> </label>
<label class="mr40"> <label class="mr40">
<input type="radio" value="课堂" class="mr5 magic-radio" name="question_kind" id ="type_5"> <input type="radio" value="课堂" class="mr5 magic-radio" name="question_kind" id ="type_5">
<label for="type_5" style="display: inline-block">课堂</label> <label for="type_5" style="display: inline-block">课堂</label>
</label> </label>
<label class="mr40"> <label class="mr40">
<input type="radio" value="其他" class="mr5 magic-radio" name="question_kind" id ="type_6"> <input type="radio" value="其他" class="mr5 magic-radio" name="question_kind" id ="type_6">
<label for="type_6" style="display: inline-block">其他</label> <label for="type_6" style="display: inline-block">其他</label>
</label> </label>
</div> </div>
</div> </div>
<div class="clearfix mt10"> <div class="clearfix mt10">
<span class="mr5 color-orange font-16">*</span><span class="font-16">问题描述</span> <span class="mr5 color-orange font-16">*</span><span class="font-16">问题页面网址</span>
<div class="font-14 mt10 ml20 clearfix"> <div class="font-14 mt10 ml20 clearfix">
<!--<div id="hidden_div_block_1"> <input type="text" class="width100 radius4" id="url_content" name ="url" value="<%= @url %>" style="height: 40px;" placeholder="反馈平台问题，请同时填写对应的问题页面链接，以便平台能够及时跟踪解决，谢谢">
</div>
<p class="color-orange ml20 mt5 undis" id="new_memo_url_notice"><i class="fa fa-exclamation-circle mr5"></i>网址不能为空</p>
</div>
<div class="clearfix mt10">
<span class="mr5 color-orange font-16">*</span><span class="font-16">问题描述</span>
<div class="font-14 mt10 ml20 clearfix">
<!--<div id="hidden_div_block_1">
<textarea style="display: none" id="hidden_textarea_1" name ="description"></textarea> <textarea style="display: none" id="hidden_textarea_1" name ="description"></textarea>
</div> </div>
<%#= hidden_field_tag :asset_id, params[:asset_id],:required => false,:style => 'display:none' %>--> <%#= hidden_field_tag :asset_id, params[:asset_id],:required => false,:style => 'display:none' %>-->
<textarea class="width100 radius4" id="description" name ="description" style="height: 150px;" placeholder="反馈平台问题，请同时填写对应的问题页面链接，以便平台能够及时跟踪解决，谢谢"></textarea> <textarea class="width100 radius4" id="description" name ="description" style="height: 150px;" placeholder="反馈平台问题，请同时填写对应的问题页面链接，以便平台能够及时跟踪解决，谢谢"></textarea>
</div> </div>
<p class="color-orange ml20 mt5 undis" id="new_memo_content_notice"><i class="fa fa-exclamation-circle mr5"></i>内容不能为空</p> <p class="color-orange ml20 mt5 undis" id="new_memo_content_notice"><i class="fa fa-exclamation-circle mr5"></i>内容不能为空</p>
<!--<div class="mt10">--> <!--<div class="mt10">-->
<!--<span class="font-16 ml20">联系方式</span>--> <!--<span class="font-16 ml20">联系方式</span>-->
<!--<div class="font-14 mt10 mb10 ml20 color-dark-grey">--> <!--<div class="font-14 mt10 mb10 ml20 color-dark-grey">-->
<!--<input type="phone" class="font-14 pl10" style="width:89%;height: 40px" placeholder="请留下您的联系方式" name = 'phone'/>--> <!--<input type="phone" class="font-14 pl10" style="width:89%;height: 40px" placeholder="请留下您的联系方式" name = 'phone'/>-->
<!--</div>--> <!--</div>-->
<!--</div>--> <!--</div>-->
<a href="javascript:void(0);" class="defalutSubmitbtn fl ml20 mt10" onclick="insert_suggest()">提交</a> <a href="javascript:void(0);" class="defalutSubmitbtn fl ml20 mt10" onclick="insert_suggest()">提交</a>
<% end %>
</div> </div>
<% end %>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
/*sd_create_editor_from_data(1,null,"100%", "Issue");*/ /*sd_create_editor_from_data(1,null,"100%", "Issue");*/
//var suggest_ke; //var suggest_ke;
/*KindEditor.ready(function(K){ /*KindEditor.ready(function(K){
$("#hidden_div_block_1").each(function(){ $("#hidden_div_block_1").each(function(){
var params = {}; var params = {};
params.kindutil = K; params.kindutil = K;
params.div_form = $(this); params.div_form = $(this);
params.placeholder = "请填写具体内容，帮助我们了解您的建议与意见"; params.placeholder = "请填写具体内容，帮助我们了解您的建议与意见";
params.textarea = $("textarea[name='description']",params.div_form); params.textarea = $("textarea[name='description']",params.div_form);
params.height = 300; params.height = 300;
if(params.textarea.data('init') == undefined) { if(params.textarea.data('init') == undefined) {
memo_content_editor = init_exercise_quetison_editor(params); memo_content_editor = init_exercise_quetison_editor(params);
//suggest_ke = memo_content_editor; //suggest_ke = memo_content_editor;
//new_quetion_editor = params.editor; //new_quetion_editor = params.editor;
params.textarea.data('init', 1); params.textarea.data('init', 1);
//params.editor. //params.editor.
} }
}); });
});*/ });*/
function regexContent() { function regexContent() {
if($("#url_content").val()==""){
$("#new_memo_url_notice").show();
return false;
}
else {
$("#new_memo_url_notice").hide();
}
// KE输入框类被添加了元素，导致isEmpty方法失效 // KE输入框类被添加了元素，导致isEmpty方法失效
if($("#description").val()==""){ if($("#description").val()==""){
$("#new_memo_content_notice").show(); $("#new_memo_content_notice").show();

2
app/views/account/help.html.erb
Unescape View File

@ -27,7 +27,7 @@
<script> <script>
$.ajax({ $.ajax({
url:'<%= help_path() %>', url:'<%= help_path() %>',
data: {index: '<%= @index %>'}, data: {index: '<%= @index %>', url: '<%= @url %>'},
type: 'post', type: 'post',
dataType: 'script' dataType: 'script'
}) })

5
app/views/challenges/create_choose_question.js.erb
Unescape View File

@ -1,7 +1,8 @@
$("#task_pass_page").html("<%= j( render :partial => "single_or_multiple_question_show") %>"); $("#task_pass_page").html("<%= j( render :partial => "single_or_multiple_question_show") %>");
var html = '<a href="<%= show_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.id) %>" data-remote="true"><%= @challenge_choose.position %>.<%= @challenge_choose.category == 1 ? "单选题" : "多选题" %></a>' var html = '<a href="<%= show_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.id) %>" data-remote="true"><%= @challenge_choose.position %>.<%= @challenge_choose.category == 1 ? "单选题" : "多选题" %></a>'
$(".active").html(html); $(".click_active.active").html(html);
if($(".add_choose_type").length == 0 && $(".click_active").length < 11){ if($(".add_choose_type").length == 0 && $(".click_active").length < 11){
var html_1 ='<a href="<%= new_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" data-remote="true" data-tip-down="新增选择题" class="add_choose_type" onclick="addChooseType(this);">+</a>'; var html_1 ='<a href="<%= new_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" data-remote="true" data-tip-down="新增选择题" class="add_choose_type" onclick="addChooseType(this);">+</a>';
$(".active").after(html_1); $(".click_active.active").after(html_1);
} }
$(window).scrollTop(0);

14
app/views/cooperates/_partner_item.html.erb
Unescape View File

@ -1,23 +1,25 @@
<p class="clearfix edu-back-white"> <p class="clearfix edu-back-white">
<span class="column-No">序号</span> <span class="column-No">序号</span>
<span class="column-2">单位名称</span> <span class="column-1">单位名称</span>
<span class="column-2">教师</span> <span class="column-1">教师</span>
<span class="column-2">学生</span> <span class="column-1">学生</span>
<span class="column-2">课堂</span> <span class="column-2">课堂</span>
<span class="column-2">发布实训</span> <span class="column-2">发布实训</span>
<span class="column-2">实训报告</span> <span class="column-2">实训报告</span>
<span class="column-2">最新课堂动态时间</span>
<span class="column-2 fr">使用详情</span> <span class="column-2 fr">使用详情</span>
</p> </p>
<ul class="minH-560 edu-back-white pb20 courselist"> <ul class="minH-560 edu-back-white pb20 courselist">
<% @schools.each_with_index do |school, index| %> <% @schools.each_with_index do |school, index| %>
<li class="clearfix bor-bottom-greyE" id="major_list"> <li class="clearfix bor-bottom-greyE" id="major_list">
<span class="column-No major_index"><%= index + 1 %></span> <span class="column-No major_index"><%= index + 1 %></span>
<span class="column-2"><%= school.name %></span> <span class="column-1"><%= school.name %></span>
<span class="column-2"><%= school.teacher_count %></span> <span class="column-1"><%= school.teacher_count %></span>
<span class="column-2"><%= school.student_count %></span> <span class="column-1"><%= school.student_count %></span>
<span class="column-2"><%= school.course_count %></span> <span class="column-2"><%= school.course_count %></span>
<span class="column-2"><%= school.shixun_count %></span> <span class="column-2"><%= school.shixun_count %></span>
<span class="column-2"><%= school.shixun_report_count %></span> <span class="column-2"><%= school.shixun_report_count %></span>
<span class="column-2"><%= school.course_act_time.present? ? format_time(school.course_act_time) : "--" %></span>
<span class="column-2 fr"> <span class="column-2 fr">
<% if school.statistic_url != "" %> <% if school.statistic_url != "" %>
<a href="<%= school.statistic_url %>" target="_blank" class="color-blue">查看</a> <a href="<%= school.statistic_url %>" target="_blank" class="color-blue">查看</a>

43
app/views/subjects/_subject_members.html.erb
Unescape View File

@ -1,14 +1,45 @@
<p class="font-16 clearfix">教学团队</p> <p class="font-16 clearfix">教学团队</p>
<% @subject.subject_members.each do |member| %> <% @subject.subject_members.each do |member| %>
<% if member.user %> <% if member.user %>
<div class="teacherTeamItem clearfix df"> <div class="teacherTeamItem clearfix">
<a href="<%= user_path(member.user) %>" target="_blank" class="fl">
<%= image_tag(url_to_avatar(member.user), :width =>"80", :height => "80", :class => "radius", :alt=>"头像") %>
</a> <p class="clearfix title-line">
<div class="fl ml15 flex1">
<a href="<%= user_path(member.user) %>" target="_blank" class="fl">
<%= image_tag(url_to_avatar(member.user), :width =>"80", :height => "80", :class => "radius", :alt=>"头像") %>
</a>
<span class="font-18 font-bd"></span>
<span class="fr">
<% if User.current.admin? && member.role != 1 %>
<a class="fl mr20 mt4" data-tip-down="删除" onclick="delete_confirm_box_2('<%= delete_member_subject_path(@subject, :mem_id => member.id) %>', '确定要删除该成员吗？');">
<img src="/images/educoder/icon/del.svg" class="fl mt4 ml4">
</a>
<% end %>
<% if User.current.member_of_subject?(@subject) && member.position > 1 %>
<a data-method="POST" class="fl ring-op-green mr25 mt7" data-remote="true" href="<%= up_member_position_subject_path(@subject, :mem_id => member.id) %>">
<img src="/images/educoder/icon/moveup.svg" data-tip-down="向上移动" class="fl mt2 ml4">
</a>
<% end %>
<% if User.current.member_of_subject?(@subject) && member.position < @subject.subject_members.size %>
<a data-method="POST" class="fl ring-op-green mr25 mt7" data-remote="true" href="<%= down_member_position_subject_path(@subject, :mem_id => member.id) %>">
<img src="/images/educoder/icon/movedown.svg" data-tip-down="向下移动" class="fl mt2 ml4">
</a>
<% end %>
</span>
</p>
<div class=" ml15">
<p class="mb10 mt5"><%= member.user.try(:show_name) %></p> <p class="mb10 mt5"><%= member.user.try(:show_name) %></p>
<div class="clearfix ml3"> <div class="clearfix ml3">
<p class="color-grey-9 font-12 fl"> <p class="color-grey-9 font-12">
<!-- <span class="mr10"><%#= member.user.school_name %></span>--> <!-- <span class="mr10"><%#= member.user.school_name %></span>-->
<span><%= member.user.identity == "学生" ? "" : member.user.identity %></span> <span><%= member.user.identity == "学生" ? "" : member.user.identity %></span>
</p> </p>

1
app/views/subjects/down_member_position.js.erb
Unescape View File

@ -0,0 +1 @@
$("#subject_members").html("<%= j(render :partial => 'subject_members') %>");

1
app/views/subjects/up_member_position.js.erb
Unescape View File

@ -0,0 +1 @@
$("#subject_members").html("<%= j(render :partial => 'subject_members') %>");

63
app/views/users/_l_course.html.erb
Unescape View File

@ -15,6 +15,35 @@
<div class="educontent"> <div class="educontent">
<!--我的课堂--> <!--我的课堂-->
<div class="square-list clearfix"> <div class="square-list clearfix">
<% if @new_icon %>
<!--课堂新建入口-->
<div class="square-Item">
<div class="substance substancepad" >
<a href="/courses/new">
<div class="substancenenew">
<div class="leftten"></div>
<div class="topten"></div>
</div>
</a>
</div>
<div class="edu-txt-center course-bottom">
<div class="inline color-grey-6">
<span class="fl ml10 mr10 squareIconSpan substancefont">
新建课堂
</span>
</div>
</div>
</div>
<% @objects.shift %>
<% end %>
<%#= render :partial => "users/course_item", :locals => {:objects => @objects} %> <%#= render :partial => "users/course_item", :locals => {:objects => @objects} %>
<% @objects.each do |object| %> <% @objects.each do |object| %>
<% allow_visit = @show_all || object.is_public == 1 || User.current.member_of_course?(object) %> <% allow_visit = @show_all || object.is_public == 1 || User.current.member_of_course?(object) %>
@ -68,5 +97,37 @@
</div> </div>
</div> </div>
<% else %> <% else %>
<%= render :partial => "welcome/no_data" %>
<div class="pr padding20-30 clearfix secondNav educontent">
<% if @user == User.current && ['a_course', 'a_shixun', 'a_project', 'a_path'].include?(@type) %>
<!--课堂新建入口-->
<div class="square-Item squarebox">
<div class="substance substancepad" >
<a href="/courses/new">
<div class="substancenenew">
<div class="leftten"></div>
<div class="topten"></div>
</div>
</a>
</div>
<div class="edu-txt-center course-bottom">
<div class="inline color-grey-6">
<span class="fl ml10 mr10 squareIconSpan substancefont">
新建课堂
</span>
</div>
</div>
</div>
<% end %>
<%= render :partial => "welcome/no_data" %>
</div>
<% end %> <% end %>

64
app/views/users/_l_project.html.erb
Unescape View File

@ -15,6 +15,36 @@
<div class="educontent"> <div class="educontent">
<!--我的项目--> <!--我的项目-->
<div class="square-list clearfix"> <div class="square-list clearfix">
<% if @new_icon %>
<!--新建项目新建入口-->
<div class="square-Item">
<div class="substance substancepad" >
<a href="/projects/new">
<div class="substancenenew">
<div class="leftten"></div>
<div class="topten"></div>
</div>
</a>
</div>
<div class="edu-txt-center course-bottom">
<div class="inline color-grey-6">
<span class="fl ml10 mr10 squareIconSpan substancefont">
新建项目
</span>
</div>
</div>
</div>
<% @objects.shift %>
<% end %>
<% @objects.each do |object| %> <% @objects.each do |object| %>
<% allow_visit = object.is_public || User.current.admin? || User.current.member_of?(object) %> <% allow_visit = object.is_public || User.current.admin? || User.current.member_of?(object) %>
<div class="square-Item" onclick="open_project(<%= object.id %>, <%= allow_visit %>)" style="cursor: pointer;"> <div class="square-Item" onclick="open_project(<%= object.id %>, <%= allow_visit %>)" style="cursor: pointer;">
@ -67,5 +97,37 @@
</div> </div>
</div> </div>
<% else %> <% else %>
<%= render :partial => "welcome/no_data" %>
<div class="pr padding20-30 clearfix secondNav educontent">
<% if @user == User.current && ['a_course', 'a_shixun', 'a_project', 'a_path'].include?(@type) %>
<!--实训新建入口-->
<div class="square-Item squarebox">
<div class="substance substancepad" >
<a href="/projects/new">
<div class="substancenenew">
<div class="leftten"></div>
<div class="topten"></div>
</div>
</a>
</div>
<div class="edu-txt-center course-bottom">
<div class="inline color-grey-6">
<span class="fl ml10 mr10 squareIconSpan substancefont">
新建项目
</span>
</div>
</div>
</div>
<% end %>
<%= render :partial => "welcome/no_data" %>
</div>
<% end %> <% end %>

61
app/views/users/_l_shixun.html.erb
Unescape View File

@ -34,6 +34,36 @@
<div class="educontent"> <div class="educontent">
<!--我的实训--> <!--我的实训-->
<div class="square-list clearfix"> <div class="square-list clearfix">
<% if @new_icon %>
<!--实训新建入口-->
<div class="square-Item">
<div class="substance substancepad" >
<a href="/shixuns/new">
<div class="substancenenew">
<div class="leftten"></div>
<div class="topten"></div>
</div>
</a>
</div>
<div class="edu-txt-center course-bottom">
<div class="inline color-grey-6">
<span class="fl ml10 mr10 squareIconSpan substancefont">
新建实训
</span>
</div>
</div>
</div>
<% @objects.shift %>
<% end %>
<% @objects.each do |object| %> <% @objects.each do |object| %>
<div class="square-Item"> <div class="square-Item">
<% if object.tag_repertoires.first.present? %> <% if object.tag_repertoires.first.present? %>
@ -71,5 +101,36 @@
</div> </div>
</div> </div>
<% else %> <% else %>
<div class="pr padding20-30 clearfix secondNav educontent">
<% if @user == User.current && ['a_course', 'a_shixun', 'a_project', 'a_path'].include?(@type) %>
<!--实训新建入口-->
<div class="square-Item squarebox">
<div class="substance substancepad" >
<a href="/shixuns/new">
<div class="substancenenew">
<div class="leftten"></div>
<div class="topten"></div>
</div>
</a>
</div>
<div class="edu-txt-center course-bottom">
<div class="inline color-grey-6">
<span class="fl ml10 mr10 squareIconSpan substancefont">
新建实训
</span>
</div>
</div>
</div>
<% end %>
<%= render :partial => "welcome/no_data" %> <%= render :partial => "welcome/no_data" %>
</div>
<% end %> <% end %>

1
app/views/users/_message_dialogue.html.erb
Unescape View File

@ -49,6 +49,7 @@
<div class="cl"></div> <div class="cl"></div>
<div class="clearfix mt10"> <div class="clearfix mt10">
<div nhname='toolbar_container_<%= @target_user.id%>' class="mb10 clearfix fl"></div> <div nhname='toolbar_container_<%= @target_user.id%>' class="mb10 clearfix fl"></div>
<span class="fl ml5 color-orange none font-12" id="new_message_notice_<%= @target_user.id %>">在问题反馈时，请同时发送问题发生页的网址链接，以便我们高效的为您服务</span>
<a id="new_message_submit_btn_<%= @target_user.id%>" style="display: none" href="javascript:void(0)" class="fr task-btn task-btn-orange">回复</a> <a id="new_message_submit_btn_<%= @target_user.id%>" style="display: none" href="javascript:void(0)" class="fr task-btn task-btn-orange">回复</a>
</div> </div>

61
app/views/users/_p_path.html.erb
Unescape View File

@ -22,6 +22,37 @@
<div class="educontent"> <div class="educontent">
<!--我的实训路径--> <!--我的实训路径-->
<div class="square-list clearfix"> <div class="square-list clearfix">
<% if @new_icon %>
<!--实训路径新建入口-->
<div class="square-Item">
<div class="substance substancepad" >
<a href="/paths/new">
<div class="substancenenew">
<div class="leftten"></div>
<div class="topten"></div>
</div>
</a>
</div>
<div class="edu-txt-center course-bottom">
<div class="inline color-grey-6">
<span class="fl ml10 mr10 squareIconSpan substancefont">
新建实训课程
</span>
</div>
</div>
</div>
<% @objects.shift %>
<% end %>
<% @objects.each_with_index do |object, index| %> <% @objects.each_with_index do |object, index| %>
<div class="square-Item"> <div class="square-Item">
<% if object.status < 2 && !User.current.member_of_subject?(object) %> <% if object.status < 2 && !User.current.member_of_subject?(object) %>
@ -56,5 +87,33 @@
</div> </div>
</div> </div>
<% else %> <% else %>
<%= render :partial => "welcome/no_data" %> <div class="pr padding20-30 clearfix secondNav educontent">
<% if @user == User.current && ['a_course', 'a_shixun', 'a_project', 'a_path'].include?(@type) %>
<!--实训新建入口-->
<div class="square-Item squarebox">
<div class="substance substancepad" >
<a href="/paths/new">
<div class="substancenenew">
<div class="leftten"></div>
<div class="topten"></div>
</div>
</a>
</div>
<div class="edu-txt-center course-bottom">
<div class="inline color-grey-6">
<span class="fl ml10 mr10 squareIconSpan substancefont">
新建实训课程
</span>
</div>
</div>
</div>
<% end %>
<%= render :partial => "welcome/no_data" %>
</div>
<% end %> <% end %>

2
app/views/users/_returnTop_btn.html.erb
Unescape View File

@ -6,7 +6,7 @@
</div> </div>
<div class="feedback" tooltips="意见反馈"> <div class="feedback" tooltips="意见反馈">
<a target="_blank" class="color_white inline" href="<%= help_path(:index => 6) %>"> <a target="_blank" class="color_white inline" href="<%= help_path(:index => 6, :url => request.url) %>">
<i class="iconfont icon-yijianfankui color-white font-22 fl"></i> <i class="iconfont icon-yijianfankui color-white font-22 fl"></i>
</a> </a>
</div> </div>

2
config/routes.rb
Unescape View File

@ -339,6 +339,8 @@ RedmineApp::Application.routes.draw do ## oauth相关
match 'add_collaborators', :via => [:get, :post] match 'add_collaborators', :via => [:get, :post]
post 'add_subject_members' post 'add_subject_members'
delete 'delete_member' delete 'delete_member'
post 'up_member_position'
post 'down_member_position'
end end
collection do collection do

11
db/migrate/20190411022220_add_position_to_subject_members.rb
Unescape View File

@ -0,0 +1,11 @@
class AddPositionToSubjectMembers < ActiveRecord::Migration
def change
add_column :subject_members, :position, :integer, :default => 1
Subject.all.each do |subject|
subject.subject_members.reorder("id asc").each_with_index do |member, index|
member.update_column('position', index + 1)
end
end
end
end

3
public/javascripts/create_kindeditor.js
Unescape View File

@ -379,6 +379,7 @@ function sd_create_editor_from_message_data(id){
params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form); params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
params.cancel_btn = $("#new_message_cancel_btn_" + id); params.cancel_btn = $("#new_message_cancel_btn_" + id);
params.submit_btn = $("#new_message_submit_btn_" + id); params.submit_btn = $("#new_message_submit_btn_" + id);
params.notice_msg = $("#new_message_notice_" + id);
params.height = height; params.height = height;
params.width = width; params.width = width;
if (params.textarea.data('init') == undefined) { if (params.textarea.data('init') == undefined) {
@ -432,6 +433,7 @@ function sd_create_message_editor(params){
params.toolbar_container.hide(); params.toolbar_container.hide();
this.resize("100%", "30px"); this.resize("100%", "30px");
params.submit_btn.hide(); params.submit_btn.hide();
params.notice_msg.hide();
} }
$('#mini_comment_section').height('auto'); $('#mini_comment_section').height('auto');
@ -457,6 +459,7 @@ function sd_create_message_editor(params){
$(".private-list").css("max-height",$("#dialogPanel").height()); $(".private-list").css("max-height",$("#dialogPanel").height());
params.submit_btn.show(); params.submit_btn.show();
params.notice_msg.show();
$('#mini_comment_section').height('240px') $('#mini_comment_section').height('240px')
}, },

53
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -3171,3 +3171,56 @@ line-height: 20px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
position: relative; position: relative;
color: #05101a; color: #05101a;
} }
.substancenenew{
width: 236px;
height: 156px;
background: rgba(248,248,248,1);
border: 2px dotted rgba(225,225,225,1);
opacity: 1;
border-radius: 4px;
padding-top: 50px;
position: inherit;
}
.substancepad{
padding: 20px 20px 0px 20px;
border-bottom: 1px solid transparent;
}
.substancefont{
height:24px;
font-size:18px;
font-family:Microsoft YaHei;
font-weight:400;
line-height:21px;
color:rgba(153,153,153,1);
opacity:1;
margin-top: -8px;
}
.topten{
width: 1px;
height: 100px;
border: 2px soild rgba(225,225,225,1);
background: rgba(225,225,225,1);
border: 1px solid rgba(225,225,225,1);
margin: 0 auto;
}
.leftten{
width: 100px;
height: 1px;
background: rgba(225,225,225,1);
border: 1px solid rgba(225,225,225,1);
margin: 0px auto;
position: absolute;
top: 120px;
left: 88px;
}
.squarebox{
position: absolute;
top: 0px;
left: 0px;
}

16
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -3,6 +3,22 @@
body{font-size:14px; line-height:2.0;background:#fafafa!important;font-family: "微软雅黑","宋体"; color:#05101a;height: 100%;position: relative; body{font-size:14px; line-height:2.0;background:#fafafa!important;font-family: "微软雅黑","宋体"; color:#05101a;height: 100%;position: relative;
} }
html,body{height:100%;} html,body{height:100%;}
/*滚动条样式*/
body::-webkit-scrollbar {/*滚动条整体样式*/
width: 8px; /*高宽分别对应横竖滚动条的尺寸*/
height: 8px;
}
body::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
border-radius: 5px;
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
background: #47494d;
}
body::-webkit-scrollbar-track {/*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
border-radius: 0;
background: rgba(0,0,0,0.1);
}
body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;} body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td,span{ margin:0; padding:0;}
table,input,textarea,select,button {outline: none;border-radius: 3px; font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9;border:1px solid #eaeaea;background: #FFFFff; color:#05101A;} table,input,textarea,select,button {outline: none;border-radius: 3px; font-family: "微软雅黑","宋体"; font-size:14px;line-height:1.9;border:1px solid #eaeaea;background: #FFFFff; color:#05101A;}
textarea{resize: none;} textarea{resize: none;}

Write Preview
Loading…
Cancel
Save