commit
43ac6b7e1f
@ -1,8 +1,8 @@
|
|||||||
clickCanel();
|
clickCanel();
|
||||||
<% if @user_activity_id != -1 %>
|
<% if @user_activity_id != -1 %>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
|
||||||
init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
|
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
|
||||||
<% else %>
|
<% else %>
|
||||||
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
|
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
|
||||||
init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
|
sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,3 +1,3 @@
|
|||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
|
||||||
|
|
||||||
init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
|
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
|
||||||
@ -1,2 +1,2 @@
|
|||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_blog', :locals => {:activity => @article,:user_activity_id =>@user_activity_id}) %>");
|
||||||
init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
|
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
|
$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>");
|
||||||
init_activity_KindEditor_data(<%= @act.id %>,"","87%", "<%=@act.class.to_s%>");
|
sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");
|
||||||
|
|||||||
@ -1,72 +1,77 @@
|
|||||||
<div class="resources mt10">
|
<div class="resources mt10">
|
||||||
<div class="homepagePostBrief">
|
<div class="homepagePostBrief">
|
||||||
|
|
||||||
<div class="homepagePostDes" style="width:690px;">
|
<div class="homepagePostDes" style="width:690px;">
|
||||||
<div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
|
<div class="homepagePostTitle postGrey"><%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id) %></div>
|
||||||
<% unless document.content.blank? %>
|
<% unless document.content.blank? %>
|
||||||
<div class="homepagePostIntro" id="intro_content_<%= document.id%>">
|
<div class="homepagePostIntro" id="intro_content_<%= document.id%>">
|
||||||
<%= document.content.html_safe %>
|
<%= document.content.html_safe %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% if params[:show_homepage].nil? %>
|
<% if params[:show_homepage].nil? %>
|
||||||
<div class="homepagePostDate" style="float:right;">
|
<div class="homepagePostDate" style="float:right;">
|
||||||
发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
|
发布时间：<%= format_activity_day(document.created_at) %> <%= format_time(document.created_at, false) %>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<div class="homepagePostDate" style="float:right;">
|
<div class="homepagePostDate" style="float:right;">
|
||||||
最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
|
最后编辑：<%= User.find(EditorOfDocument.where("org_document_comment_id =?", document.id).order("created_at desc").first.editor_id).realname %>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<!-- <%# if defined?(home_id) %>
|
<!-- <%# if defined?(home_id) %>
|
||||||
<div style="float:right;">最后编辑：<%#= User.find() %></div>
|
<div style="float:right;">最后编辑：<%#= User.find() %></div>
|
||||||
<%# end %>-->
|
<%# end %>-->
|
||||||
<% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
|
<% if User.current.admin? || User.current.admin_of_org?(Organization.find(document.organization_id)) || User.current.id == document.creator_id %>
|
||||||
<div class="homepagePostSetting">
|
<div class="homepagePostSetting">
|
||||||
<ul>
|
<ul>
|
||||||
<li class="homepagePostSettingIcon">
|
<li class="homepagePostSettingIcon">
|
||||||
<ul class="homepagePostSettiongText">
|
<ul class="homepagePostSettiongText">
|
||||||
<li>
|
<li>
|
||||||
<%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
|
<%= form_for('new_form', :url => {:controller => 'organizations', :action => 'cancel_homepage', :id => document.organization_id, :home_id => document.id}, :method => "put", :remote => true) do |f| %>
|
||||||
<a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
|
<a href="javascript:void(0);" class="postOptionLink" onclick="$(this).parent().submit();">取消首页</a>
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<%= link_to "编辑首页", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 2), :class => "postOptionLink" %>
|
<%= link_to "编辑首页", edit_org_document_comment_path(:id => document.id, :organization_id => document.organization_id, :flag => 2), :class => "postOptionLink" %>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<%= link_to "删除首页", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
|
<%= link_to "删除首页", org_document_comment_path(:id => document.id, :organization_id => document.organization_id), :method => 'delete',
|
||||||
:data => {:confirm => l(:text_are_you_sure)},
|
:data => {:confirm => l(:text_are_you_sure)},
|
||||||
:remote => true, :class => 'postOptionLink' %>
|
:remote => true, :class => 'postOptionLink' %>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var postContent = $("#intro_content_<%= document.id%>").html();
|
$("#intro_content_<%= @document.id%> p,#intro_content_<%= @document.id%> span,#intro_content_<%= @document.id%> em").each(function(){
|
||||||
postContent = postContent.replace(/ /g," ");
|
var postContent = $(this).html();
|
||||||
$("#intro_content_<%= document.id%>").html(postContent);
|
postContent = postContent.replace(/ /g," ");
|
||||||
function expand_reply(container, btnid) {
|
postContent= postContent.replace(/ {2}/g," ");
|
||||||
var target = $(container);
|
postContent=postContent.replace(/ /g," ");
|
||||||
var btn = $(btnid);
|
postContent=postContent.replace(/ /g," ");
|
||||||
if (btn.data('init') == '0') {
|
$(this).html(postContent);
|
||||||
btn.data('init', 1);
|
});
|
||||||
btn.html('收起回复');
|
function expand_reply(container, btnid) {
|
||||||
target.show();
|
var target = $(container);
|
||||||
} else {
|
var btn = $(btnid);
|
||||||
btn.data('init', 0);
|
if (btn.data('init') == '0') {
|
||||||
btn.html('展开更多');
|
btn.data('init', 1);
|
||||||
target.hide();
|
btn.html('收起回复');
|
||||||
target.eq(0).show();
|
target.show();
|
||||||
target.eq(1).show();
|
} else {
|
||||||
target.eq(2).show();
|
btn.data('init', 0);
|
||||||
}
|
btn.html('展开更多');
|
||||||
}
|
target.hide();
|
||||||
|
target.eq(0).show();
|
||||||
|
target.eq(1).show();
|
||||||
|
target.eq(2).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
@ -1,7 +1,7 @@
|
|||||||
<% if @user_activity_id != -1 %>
|
<% if @user_activity_id != -1 %>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
|
||||||
init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
|
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%");
|
||||||
<% else%>
|
<% else%>
|
||||||
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
|
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
|
||||||
init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
|
sd_create_editor_from_data(<%= @homework.id%>,"","100%");
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,7 +1,7 @@
|
|||||||
<% if @user_activity_id == -1 %>
|
<% if @user_activity_id == -1 %>
|
||||||
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
|
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
|
||||||
init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
|
sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
|
||||||
<% else %>
|
<% else %>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
|
||||||
init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
|
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,8 +1,8 @@
|
|||||||
clickCanel();
|
clickCanel();
|
||||||
<% if @user_activity_id != -1 %>
|
<% if @user_activity_id != -1 %>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@courae_activity}) %>");
|
||||||
init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
|
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
|
||||||
<% else %>
|
<% else %>
|
||||||
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
|
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
|
||||||
init_activity_KindEditor_data(<%= @homework.id%>,"","87%", "<%=@homework.class.to_s%>");
|
sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
hideModal("#popbox02");
|
hideModal("#popbox02");
|
||||||
<% if @user_activity_id != -1 %>
|
<% if @user_activity_id != -1 %>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
|
||||||
init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
|
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%");
|
||||||
<% else%>
|
<% else%>
|
||||||
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
|
$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework,:is_in_course => @is_in_course}) %>");
|
||||||
init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
|
sd_create_editor_from_data(<%= @homework.id%>,"","100%");
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,13 +1,18 @@
|
|||||||
<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
|
<div class="homepagePostIntro break_word upload_img list_style maxh360 table_maxWidth lh18" id="activity_description_<%= user_activity_id%>">
|
||||||
<div id="intro_content_<%= user_activity_id%>">
|
<div id="intro_content_<%= user_activity_id%>">
|
||||||
<%= content.to_s.html_safe%>
|
<%= content.to_s.html_safe%>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(function(){
|
$(function(){
|
||||||
var postContent = $("#intro_content_<%= user_activity_id%>").html();
|
$("#intro_content_<%= user_activity_id%> p,#intro_content_<%= user_activity_id%> span,#intro_content_<%= user_activity_id%> em").each(function(){
|
||||||
postContent = postContent.replace(/ /g," ");
|
var postContent = $(this).html();
|
||||||
$("#intro_content_<%= user_activity_id%>").html(postContent);
|
postContent = postContent.replace(/ /g," ");
|
||||||
description_show_hide(<%=user_activity_id %>);
|
postContent= postContent.replace(/ {2}/g," ");
|
||||||
});
|
postContent=postContent.replace(/ /g," ");
|
||||||
|
postContent=postContent.replace(/ /g," ");
|
||||||
|
$(this).html(postContent);
|
||||||
|
});
|
||||||
|
description_show_hide(<%=user_activity_id %>);
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
@ -1,35 +1,35 @@
|
|||||||
<% homeworks.each do |homework| %>
|
<% homeworks.each do |homework| %>
|
||||||
<ul class="subjectRow">
|
<ul class="subjectRow">
|
||||||
<li class="subjectName fl hidden">
|
<li class="subjectName fl hidden">
|
||||||
<label onclick="show_homework_detail('<%=show_homework_detail_user_path(@user,:homework=>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%>"/>
|
<input type="radio" name="checkMenu" class="mr5" style="vertical-align:middle;" value="<%= homework.id%>"/>
|
||||||
<span title="<%= homework.name%>"><%= homework.name%></span>
|
<span title="<%= homework.name%>"><%= homework.name%></span>
|
||||||
</label>
|
</label>
|
||||||
</li>
|
</li>
|
||||||
<li class="subjectType fl">
|
<li class="subjectType fl">
|
||||||
<% case homework.homework_type %>
|
<% case homework.homework_type %>
|
||||||
<% when 1 %>
|
<% when 1 %>
|
||||||
普通
|
普通
|
||||||
<% when 2 %>
|
<% when 2 %>
|
||||||
编程
|
编程
|
||||||
<% when 3 %>
|
<% when 3 %>
|
||||||
分组
|
分组
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
<li class="subjectCount fl"><%= homework.quotes %></li>
|
<li class="subjectCount fl"><%= homework.quotes %></li>
|
||||||
<li class="subjectPublisher fl"><%= homework.user.show_name %></li>
|
<li class="subjectPublisher fl hidden"><%= homework.user.show_name %></li>
|
||||||
<li class="fl subjectDate"><%=format_date homework.publish_time %></li>
|
<li class="fl subjectDate"><%=format_date homework.publish_time %></li>
|
||||||
</ul>
|
</ul>
|
||||||
<% end %>
|
<% end %>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function show_homework_detail(url){
|
function show_homework_detail(url){
|
||||||
$.get(
|
$.get(
|
||||||
url,
|
url,
|
||||||
{
|
{
|
||||||
|
|
||||||
},
|
},
|
||||||
function (data) {
|
function (data) {
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@ -1,5 +1,6 @@
|
|||||||
$('#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', '1040px');
|
showModal('ajax-modal', '1040px');
|
||||||
$('#ajax-modal').siblings().remove();
|
$('#ajax-modal').siblings().remove();
|
||||||
$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed").css("border","3px solid #269ac9");
|
var mTop = ($(window).height()-646)/2;
|
||||||
$('#ajax-modal').css("margin","15px");
|
var mLeft = ($(window).width()-1054)/2;
|
||||||
|
$('#ajax-modal').parent().css("border","3px solid #269ac9").css("top","mTop").css("left","mLeft").css("position","fixed");
|
||||||
@ -1,7 +1,7 @@
|
|||||||
<% if @user_activity_id %>
|
<% if @user_activity_id %>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
|
||||||
init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%", "UserActivity");
|
sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
|
||||||
<% elsif @homework_common_id && @is_in_course %>
|
<% elsif @homework_common_id && @is_in_course %>
|
||||||
$("#homework_common_<%= @homework_common_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");
|
$("#homework_common_<%= @homework_common_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");
|
||||||
init_activity_KindEditor_data(<%= @homework_common_id%>,"","87%", "HomeworkCommon");
|
sd_create_editor_from_data(<%= @homework_common_id%>,"","100%", "HomeworkCommon");
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Loading…
Reference in new issue