commit
6b40b90ba4
@ -1,5 +1,5 @@
|
|||||||
<% if User.current.logged? && User.current.id == @user.id %>
|
<% if User.current.logged? && User.current.id == @user.id %>
|
||||||
<%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage]},:method=>'PUT',
|
<%= form_for @article, :url =>{:controller=>'blog_comments',:action => 'update',:user_id=>@user.id , :blog_id => @article.id, :is_homepage => params[:is_homepage],:in_act => params[:in_act]},:method=>'PUT',
|
||||||
:html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
|
:html => {:nhname=>'form',:multipart => true, :id => 'message-form'} do |f| %>
|
||||||
<%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
|
<%= render :partial => 'blog_comments/edit', :locals => {:f => f, :article => @article, :edit_mode => true, :user => @user} %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@ -0,0 +1,46 @@
|
|||||||
|
<%= content_for(:header_tags) do %>
|
||||||
|
<%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<style type="text/css">
|
||||||
|
/*回复框*/
|
||||||
|
.homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
|
||||||
|
.homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
|
||||||
|
.homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url("/images/public_icon.png")}
|
||||||
|
.homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
|
||||||
|
.homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
|
||||||
|
.homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
|
||||||
|
.homepagePostReplyInputContainer .ke-outline {border: none;}
|
||||||
|
.homepagePostReplyInputContainer .ke-inline-block {display: none;}
|
||||||
|
.homepagePostReplyInputContainer .ke-container {float: left;}
|
||||||
|
</style>
|
||||||
|
<div id="user_homework_list">
|
||||||
|
<% homework_commons.each do |homework_common|%>
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(function() {
|
||||||
|
init_activity_KindEditor_data(<%= homework_common.id%>, null, "87%", "<%=homework_common.class.to_s%>");
|
||||||
|
});
|
||||||
|
|
||||||
|
function expand_reply(container,btnid){
|
||||||
|
var target = $(container);
|
||||||
|
var btn = $(btnid);
|
||||||
|
if(btn.data('init')=='0'){
|
||||||
|
btn.data('init',1);
|
||||||
|
btn.html('收起回复');
|
||||||
|
target.show();
|
||||||
|
}else{
|
||||||
|
btn.data('init',0);
|
||||||
|
btn.html('展开更多');
|
||||||
|
target.hide();
|
||||||
|
target.eq(0).show();
|
||||||
|
target.eq(1).show();
|
||||||
|
target.eq(2).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<%= render :partial => 'users/user_homework_detail', :locals => {:homework_common => homework_common,:is_in_course => is_in_course} %>
|
||||||
|
<% end%>
|
||||||
|
<% if homework_commons.count == 10%>
|
||||||
|
<%= link_to "点击展开更多",homework_search_course_path(course_id,:page => page,:search=>search),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
|
||||||
|
<% end%>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
<% if @page == 0 %>
|
||||||
|
$("#user_homework_list").replaceWith("<%= escape_javascript( render :partial => 'courses/user_homework_search_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id,:search=>@search} )%>");
|
||||||
|
<% else %>
|
||||||
|
$("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial => 'courses/user_homework_search_list',:locals => {:homework_commons => @homeworks, :page => @page, :is_in_course => 1,:course_id => @course.id,:search=>@search} )%>");
|
||||||
|
<% end %>
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
<%= form_tag( url_for(:controller => 'courses',:action => 'homework_search',:id=>course.id),
|
||||||
|
:remote=>true ,:method => 'get',:class=>'resourcesSearchloadBox',:id=>'resource_search_form') do %>
|
||||||
|
<input type="text" name="search" placeholder="输入作业关键词进行搜索" class="searchResource" />
|
||||||
|
<%= submit_tag '',:class=>'homepageSearchIcon',:onfocus=>'this.blur();',:style=>'border-style:none' %>
|
||||||
|
<!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
|
||||||
|
<% end %>
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
<input type="text" name="search" placeholder="输入关键词进行搜索" class="subjectSearch fr" />
|
||||||
|
<script type="text/javascript">
|
||||||
|
var lastSearchCondition = '';
|
||||||
|
var count = 0;
|
||||||
|
function search_hws(e){
|
||||||
|
if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lastSearchCondition = $(e.target).val().trim();
|
||||||
|
$.ajax({
|
||||||
|
url: '<%= url_for(:controller => 'users', :action => 'user_search_homeworks') %>'+'?name='+ e.target.value+'&type=<%=type %>',
|
||||||
|
type:'get'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function throttle(method,context,e){
|
||||||
|
clearTimeout(method.tId);
|
||||||
|
method.tId=setTimeout(function(){
|
||||||
|
method.call(context,e);
|
||||||
|
},500);
|
||||||
|
}
|
||||||
|
|
||||||
|
//查询项目
|
||||||
|
$("input[name='search']").on('input', function (e) {
|
||||||
|
throttle(search_hws,window,e);
|
||||||
|
});
|
||||||
|
|
||||||
|
</script>
|
||||||
@ -1,13 +1,35 @@
|
|||||||
<% user_homeworks.each do |homework|%>
|
<% homeworks.each do |homework| %>
|
||||||
<ul class="homeworkPublish">
|
<ul class="subjectRow">
|
||||||
<li class="fl">
|
<li class="subjectName fl hidden">
|
||||||
<input name="checkMenu" type="radio" class="courseSendCheckbox" value="<%= homework.id%>"/>
|
<label onclick="show_homework_detail('<%=show_homework_detail_user_path(@user,:homework=>homework.id) %>')">
|
||||||
|
<input type="radio" name="checkMenu" class="mr5" style="vertical-align:middle;" value="<%= homework.id%>"/>
|
||||||
|
<span title="<%= homework.name%>"><%= homework.name%></span>
|
||||||
|
</label>
|
||||||
</li>
|
</li>
|
||||||
<li class="sendCourseName fl hidden w450">
|
<li class="subjectType fl">
|
||||||
<%= homework.name%>
|
<% case homework.homework_type %>
|
||||||
|
<% when 1 %>
|
||||||
|
普通
|
||||||
|
<% when 2 %>
|
||||||
|
编程
|
||||||
|
<% when 3 %>
|
||||||
|
分组
|
||||||
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="subjectCount fl"><%= homework.quotes %></li>
|
||||||
|
<li class="subjectPublisher fl"><%= homework.user.show_name %></li>
|
||||||
|
<li class="fl subjectDate"><%=format_date homework.publish_time %></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="homeworkPublishTime">
|
<% end %>
|
||||||
创建时间：<%= format_date homework.created_at%>
|
<script type="text/javascript">
|
||||||
</div>
|
function show_homework_detail(url){
|
||||||
<% end%>
|
$.get(
|
||||||
|
url,
|
||||||
|
{
|
||||||
|
|
||||||
|
},
|
||||||
|
function (data) {
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@ -1,27 +1,52 @@
|
|||||||
<div class="coursesChoosePopup" id="coursesChoosePopup">
|
<div class="w985" style="padding:11px;"> <a href="javascript:void(0);" class="popupClose" onclick="hideModal()"></a>
|
||||||
<div>
|
<div class="f16 fb fontBlue mb10">选用题库中的题目</div>
|
||||||
<div class="sendText">导入作业</div>
|
<div class="subjectList fl mr10">
|
||||||
|
<a href="<%= user_homework_type_user_path(@user) %>" id="public_homeworks_choose" class="subjectChoose chooseActive fl" data-remote="true">公共题库</a>
|
||||||
|
<a href="<%= user_homework_type_user_path(@user,:type=>'2') %>" id="user_homeworks_choose" class="subjectChoose fl" data-remote="true">我的题库</a>
|
||||||
|
<div id="homework_search_input">
|
||||||
|
<%=render :partial=>'homework_search_input', :locals=>{:type=>@type} %>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<div>
|
||||||
|
<ul class="subjectBanner mt10">
|
||||||
|
<li class="subjectName fl hidden"><span style="padding-left:15px;">作业名称</span></li>
|
||||||
|
<li class="subjectType fl">类型</li>
|
||||||
|
<li class="subjectCount fl">引用数</li>
|
||||||
|
<li class="subjectPublisher fl">贡献者</li>
|
||||||
|
<li class="fl subjectDate">发布时间</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %>
|
||||||
|
<input type="hidden" name="select_course" value="<%= @select_course%>">
|
||||||
|
<div style="height:450px; min-height:450px; max-height:450px;" id="homework_list_form_show">
|
||||||
|
<%= render :partial => 'users/show_user_homework_form', :locals => {:homeworks => @homeworks}%>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<div class="courseSendSubmit mr15">
|
||||||
|
<a href="javascript:void(0);" class="sendSourceText" onclick="$('#select_homework_form').submit();hideModal()">选用</a>
|
||||||
|
</div>
|
||||||
|
<div class="courseSendCancel">
|
||||||
|
<a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a>
|
||||||
|
</div>
|
||||||
|
<div >
|
||||||
|
<ul class="wlist" id="homewrok_ref_pages" style="margin-top: 5px;margin-right: 20px">
|
||||||
|
<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="subjectDetail fl" id="homework_detail_information">
|
||||||
<div >
|
<%=render :partial=>'homework_detail_information', :locals=>{:homework=>nil} %>
|
||||||
<%= form_tag user_search_homeworks_user_path(User.current.id), :multipart => true, :remote => true, :class => "coursesSearchBox" do%>
|
|
||||||
<input type="text" name="name" placeholder="输入作业名称进行搜索" class="searchCoursesPopup" id="search_homework_name"/>
|
|
||||||
<a href="javascript:void(0);" class="searchIconPopup" onclick="$(this).parent().submit();"></a>
|
|
||||||
<% end%>
|
|
||||||
</div>
|
</div>
|
||||||
<%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %>
|
|
||||||
<input type="hidden" name="select_course" value="<%= @select_course%>">
|
|
||||||
<div class="homeworkListForm mb10 " id="homework_list_form_show">
|
|
||||||
<%= render :partial => 'users/show_user_homework_form', :locals => {:user_homeworks => @user_homeworks}%>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<div class="courseSendSubmit">
|
|
||||||
<a href="javascript:void(0);" class="sendSourceText" onclick="$('#select_homework_form').submit();">确定</a>
|
|
||||||
</div>
|
|
||||||
<div class="courseSendCancel">
|
|
||||||
<a href="javascript:void(0);" class="sendSourceText" onclick="hideModal('#coursesChoosePopup')">取消</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<% end%>
|
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div>
|
</div>
|
||||||
|
<script type="text/javascript">
|
||||||
|
$("#public_homeworks_choose").click(function(){
|
||||||
|
$(this).toggleClass("chooseActive");
|
||||||
|
$("#user_homeworks_choose").toggleClass("chooseActive");
|
||||||
|
});
|
||||||
|
$("#user_homeworks_choose").click(function(){
|
||||||
|
$(this).toggleClass("chooseActive");
|
||||||
|
$("#public_homeworks_choose").toggleClass("chooseActive");
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|||||||
@ -0,0 +1 @@
|
|||||||
|
$("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>@homework}) %>")
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
$("#homework_list_form_show").html('<%= escape_javascript(render :partial => 'users/show_user_homework_form', :locals => {:homeworks => @homeworks})%>');
|
||||||
|
$("#homewrok_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
|
||||||
|
$("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>nil}) %>");
|
||||||
|
$("#homework_search_input").html("<%=escape_javascript(render :partial=>'homework_search_input', :locals=>{:type=>@type}) %>");
|
||||||
@ -1,7 +1,4 @@
|
|||||||
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_homeworks') %>');
|
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_homeworks') %>');
|
||||||
showModal('ajax-modal', '580px');
|
showModal('ajax-modal', '1040px');
|
||||||
$('#ajax-modal').css('height','300px').css("width","580px");
|
|
||||||
$('#ajax-modal').siblings().remove();
|
$('#ajax-modal').siblings().remove();
|
||||||
$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
|
|
||||||
"<a href='javascript:void(0)' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
|
|
||||||
$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed").css("border","3px solid #269ac9");
|
$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed").css("border","3px solid #269ac9");
|
||||||
@ -1 +1,3 @@
|
|||||||
$("#homework_list_form_show").html("<%= escape_javascript(render :partial => 'users/show_user_homework_form', :locals => {:user_homeworks => @user_homeworks})%>");
|
$("#homework_list_form_show").html('<%= escape_javascript(render :partial => 'users/show_user_homework_form', :locals => {:homeworks => @homeworks})%>');
|
||||||
|
$("#homewrok_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
|
||||||
|
$("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>nil}) %>");
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
class ExcellentCourse < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
arr = [302,192,370,394,183,361,117,218,379,178,418,203,342,403,225]
|
||||||
|
for i in 0..arr.length-1
|
||||||
|
begin
|
||||||
|
puts arr[i]
|
||||||
|
course = Course.find(arr[i])
|
||||||
|
course.update_attribute(:is_excellent, true)
|
||||||
|
rescue
|
||||||
|
logger.error("Course is not found!")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
class ExcellentOptionCourse < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
arr = [151,122,15,227,139,410,291,224,55,137,414,43,417,52,205,44,216,132,204,258,411,50,
|
||||||
|
419,390,420,133,91,112,202,95,194,34,172,403,177,252,138,352,225,46,279,382,397,286,344,27,175,
|
||||||
|
124,265,88,59,110,72,92,392,413,26,201,94,57,156,393,154,12,262]
|
||||||
|
for i in 0..arr.length-1
|
||||||
|
begin
|
||||||
|
puts arr[i]
|
||||||
|
course = Course.find(arr[i])
|
||||||
|
course.update_attribute(:excellent_option, true)
|
||||||
|
rescue
|
||||||
|
logger.error("Course is not found!")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
class ExcellentCourseSe < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
arr = [302,192,370,394,183,361,117,218,379,178,418,203,342,403,225]
|
||||||
|
for i in 0..arr.length-1
|
||||||
|
begin
|
||||||
|
puts arr[i]
|
||||||
|
course = Course.find(arr[i])
|
||||||
|
course.update_attribute(:is_excellent, true)
|
||||||
|
rescue
|
||||||
|
logger.error("Course is not found!")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
class ExcellentOptionSe < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
arr = [151,122,15,227,139,410,291,224,55,137,414,43,417,52,205,44,216,132,204,258,411,50,
|
||||||
|
419,390,420,133,91,112,202,95,194,34,172,403,177,252,138,352,225,46,279,382,397,286,344,27,175,
|
||||||
|
124,265,88,59,110,72,92,392,413,26,201,94,57,156,393,154,12,262]
|
||||||
|
for i in 0..arr.length-1
|
||||||
|
begin
|
||||||
|
puts arr[i]
|
||||||
|
course = Course.find(arr[i])
|
||||||
|
course.update_attribute(:excellent_option, true)
|
||||||
|
rescue
|
||||||
|
logger.error("Course is not found!")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
class UpdateJournalForMessage < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
journals = JournalsForMessage.where("m_parent_id is null and jour_type ='Principal' ")
|
||||||
|
count = journals.count / 30 + 2
|
||||||
|
transaction do
|
||||||
|
for i in 1 ... count do i
|
||||||
|
journals.page(i).per(30).each do |jour|
|
||||||
|
act = UserActivity.where("act_type='JournalsForMessage' and act_id = #{jour.id}").first
|
||||||
|
unless act.nil?
|
||||||
|
jour.updated_on = act.updated_at
|
||||||
|
jour.save
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
class AddIsCopyToCourse < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :courses, :is_copy, :integer, :default => 0
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
class AddQuotesToHomework < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :homework_commons, :quotes, :integer, :default => 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.4 KiB |
Loading…
Reference in new issue