Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
commit
90d70e7c88
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,3 @@
|
|||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
|
||||||
|
|
||||||
init_KindEditor_data('<%= @user_activity_id%>');
|
init_KindEditor_data('<%= @user_activity_id%>',"30px","85%");
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_issue', :locals => {:activity => @issue,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
|
||||||
|
|
||||||
init_KindEditor_data(<%= @user_activity_id%>);
|
init_KindEditor_data(<%= @user_activity_id%>,"30px","85%");
|
||||||
@ -1,6 +1,6 @@
|
|||||||
<%if @project%>
|
<%if @project%>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/project_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
|
||||||
<%elsif @course%>
|
<%elsif @course%>
|
||||||
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id}) %>");
|
$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_message', :locals => {:activity => @topic,:user_activity_id =>@user_activity_id,:first_user_activity =>@first_user_activity,:page => @page}) %>");
|
||||||
<%end%>
|
<%end%>
|
||||||
init_KindEditor_data(<%= @user_activity_id%>);
|
init_KindEditor_data(<%= @user_activity_id%>,"30px","85%");
|
||||||
@ -1,73 +1,79 @@
|
|||||||
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %>
|
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %>
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
/*回复框*/
|
/*回复框*/
|
||||||
div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
|
div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
|
||||||
span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
|
span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
|
||||||
span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
|
span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
|
||||||
div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
|
div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
|
||||||
span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
|
span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
|
||||||
span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
|
span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
|
||||||
div.ke-toolbar .ke-outline{border:none;}
|
div.ke-toolbar .ke-outline{border:none;}
|
||||||
.ke-inline-block{display: none;}
|
.ke-inline-block{display: none;}
|
||||||
</style>
|
div.ke-container{float:left;}
|
||||||
<% user_activities.each do |user_activity|
|
</style>
|
||||||
if user_activities %>
|
<% first_user_activity = user_activities.first.id %>
|
||||||
<script>
|
<% user_activities.each do |user_activity|
|
||||||
function expand_reply(container,btnid){
|
if user_activities %>
|
||||||
var target = $(container);
|
<script>
|
||||||
var btn = $(btnid);
|
function expand_reply(container,btnid){
|
||||||
if(btn.data('init')=='0'){
|
var target = $(container);
|
||||||
btn.data('init',1);
|
var btn = $(btnid);
|
||||||
btn.html('收起回复('+btn.data('count')+')');
|
if(btn.data('init')=='0'){
|
||||||
target.show();
|
btn.data('init',1);
|
||||||
}else{
|
btn.html('收起回复('+btn.data('count')+')');
|
||||||
btn.data('init',0);
|
target.show();
|
||||||
btn.html('展开更多('+btn.data('count')+')');
|
}else{
|
||||||
target.hide();
|
btn.data('init',0);
|
||||||
target.eq(0).show();
|
btn.html('展开更多('+btn.data('count')+')');
|
||||||
target.eq(1).show();
|
target.hide();
|
||||||
}
|
target.eq(0).show();
|
||||||
|
target.eq(1).show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function expand_reply_input(id) {
|
||||||
|
$(id).toggle();
|
||||||
}
|
}
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
init_KindEditor_data(<%= user_activity.id%>);
|
init_KindEditor_data(<%= user_activity.id%>,"30px","85%");
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>
|
<% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>
|
||||||
<% case user_activity.container_type.to_s %>
|
<% case user_activity.container_type.to_s %>
|
||||||
<% when 'Course' %>
|
<% when 'Course' %>
|
||||||
<% if act %>
|
<% if act %>
|
||||||
<% case user_activity.act_type.to_s %>
|
<% case user_activity.act_type.to_s %>
|
||||||
<% when 'HomeworkCommon' %>
|
<% when 'HomeworkCommon' %>
|
||||||
<%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% when 'News' %>
|
<% when 'News' %>
|
||||||
<%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% when 'Message'%>
|
<% when 'Message'%>
|
||||||
<%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<%= render :partial => 'course_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% when 'Poll' %>
|
<% when 'Poll' %>
|
||||||
<%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id} %>
|
<%= render :partial => 'course_poll', :locals => {:activity => act, :user_activity_id => user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% when 'Project' %>
|
<% when 'Project' %>
|
||||||
<% if act %>
|
<% if act %>
|
||||||
<% case user_activity.act_type.to_s %>
|
<% case user_activity.act_type.to_s %>
|
||||||
<% when 'Issue' %>
|
<% when 'Issue' %>
|
||||||
<%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<%= render :partial => 'project_issue', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% when 'Message' %>
|
<% when 'Message' %>
|
||||||
<%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
|
<%= render :partial => 'project_message', :locals => {:activity => act,:user_activity_id =>user_activity.id,:first_user_activity =>first_user_activity,:page => page} %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if user_activities.count == 10%>
|
<% if user_activities.count == 10%>
|
||||||
<div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
|
<div id="show_more_activities" class="loadMore mt10 f_grey">展开更多<%=link_to "", user_activities_path(@user.id,:type => type,:page => page),:id => "more_activities_link",:remote => "true",:class => "none" %></div>
|
||||||
<%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
|
<%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
|
||||||
<% end%>
|
<% end%>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$("#show_more_activities").mouseover(function(){
|
$("#show_more_activities").mouseover(function(){
|
||||||
$("#more_activities_link").click();
|
$("#more_activities_link").click();
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,122 +1,126 @@
|
|||||||
function init_editor(params){
|
function init_editor(params){
|
||||||
// var minHeight; //最小高度
|
// var minHeight; //最小高度
|
||||||
var paramsHeight = params.height; //设定的高度
|
var paramsHeight = params.height; //设定的高度
|
||||||
|
var paramsWidth = params.width == undefined ? "100%" : params.width;
|
||||||
var editor = params.kindutil.create(params.textarea, {
|
|
||||||
resizeType : 1,minWidth:"1px",width:"100%",
|
var editor = params.kindutil.create(params.textarea, {
|
||||||
height:"30px",// == undefined ? "30px":paramsHeight+"px",
|
resizeType : 1,minWidth:"1px",width:paramsWidth,
|
||||||
minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
|
height:"30px",// == undefined ? "30px":paramsHeight+"px",
|
||||||
items:['emoticons'],
|
minHeight:"30px",// == undefined ? "30px":paramsHeight+"px",
|
||||||
afterChange:function(){//按键事件
|
items:['emoticons'],
|
||||||
nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
|
afterChange:function(){//按键事件
|
||||||
var edit = this.edit;
|
nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
|
||||||
var body = edit.doc.body;
|
var edit = this.edit;
|
||||||
edit.iframe.height(paramsHeight);
|
var body = edit.doc.body;
|
||||||
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + (paramsHeight == undefined ? 30:paramsHeight), paramsHeight));
|
edit.iframe.height(paramsHeight);
|
||||||
},
|
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) + (paramsHeight == undefined ? 30:paramsHeight), paramsHeight));
|
||||||
afterCreate:function(){
|
},
|
||||||
var toolbar = $("div[class='ke-toolbar']",params.div_form);
|
afterCreate:function(){
|
||||||
$(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
|
var toolbar = $("div[class='ke-toolbar']",params.div_form);
|
||||||
params.toolbar_container.append(toolbar);
|
toolbar.css('width',24);
|
||||||
//init
|
$(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
|
||||||
var edit = this.edit;
|
params.toolbar_container.append(toolbar);
|
||||||
var body = edit.doc.body;
|
//init
|
||||||
edit.iframe[0].scroll = 'no';
|
var edit = this.edit;
|
||||||
body.style.overflowY = 'hidden';
|
var body = edit.doc.body;
|
||||||
//reset height
|
edit.iframe[0].scroll = 'no';
|
||||||
var edit = this.edit;
|
body.style.overflowY = 'hidden';
|
||||||
var body = edit.doc.body;
|
//reset height
|
||||||
paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
|
var edit = this.edit;
|
||||||
edit.iframe.height(paramsHeight);
|
var body = edit.doc.body;
|
||||||
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ (paramsHeight == undefined ? 30:paramsHeight) , paramsHeight));
|
paramsHeight = paramsHeight == undefined ? params.kindutil.removeUnit(this.height) : paramsHeight;
|
||||||
|
edit.iframe.height(paramsHeight);
|
||||||
}
|
this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight)+ (paramsHeight == undefined ? 30:paramsHeight) , paramsHeight));
|
||||||
}).loadPlugin('paste');
|
|
||||||
return editor;
|
}
|
||||||
}
|
}).loadPlugin('paste');
|
||||||
|
return editor;
|
||||||
function nh_check_field(params){
|
}
|
||||||
var result=true;
|
|
||||||
if(params.content!=undefined){
|
function nh_check_field(params){
|
||||||
if(params.content.isEmpty()){
|
var result=true;
|
||||||
result=false;
|
if(params.content!=undefined){
|
||||||
}
|
if(params.content.isEmpty()){
|
||||||
if(params.content.html()!=params.textarea.html() || params.issubmit==true){
|
result=false;
|
||||||
params.textarea.html(params.content.html());
|
}
|
||||||
params.content.sync();
|
if(params.content.html()!=params.textarea.html() || params.issubmit==true){
|
||||||
if(params.content.isEmpty()){
|
params.textarea.html(params.content.html());
|
||||||
params.contentmsg.html('内容不能为空');
|
params.content.sync();
|
||||||
params.contentmsg.css({color:'#ff0000'});
|
if(params.content.isEmpty()){
|
||||||
}else{
|
params.contentmsg.html('内容不能为空');
|
||||||
params.contentmsg.html('填写正确');
|
params.contentmsg.css({color:'#ff0000'});
|
||||||
params.contentmsg.css({color:'#008000'});
|
}else{
|
||||||
}
|
params.contentmsg.html('填写正确');
|
||||||
params.contentmsg.show();
|
params.contentmsg.css({color:'#008000'});
|
||||||
}
|
}
|
||||||
}
|
params.contentmsg.show();
|
||||||
return result;
|
}
|
||||||
}
|
}
|
||||||
function init_form(params){
|
return result;
|
||||||
params.form.submit(function(){
|
}
|
||||||
var flag = false;
|
function init_form(params){
|
||||||
if(params.form.attr('data-remote') != undefined ){
|
params.form.submit(function(){
|
||||||
flag = true
|
var flag = false;
|
||||||
}
|
if(params.form.attr('data-remote') != undefined ){
|
||||||
var is_checked = nh_check_field({
|
flag = true
|
||||||
issubmit:true,
|
}
|
||||||
content:params.editor,
|
var is_checked = nh_check_field({
|
||||||
contentmsg:params.contentmsg,
|
issubmit:true,
|
||||||
textarea:params.textarea
|
content:params.editor,
|
||||||
});
|
contentmsg:params.contentmsg,
|
||||||
if(is_checked){
|
textarea:params.textarea
|
||||||
if(flag){
|
});
|
||||||
return true;
|
if(is_checked){
|
||||||
}else{
|
if(flag){
|
||||||
$(this)[0].submit();
|
return true;
|
||||||
return false;
|
}else{
|
||||||
}
|
$(this)[0].submit();
|
||||||
}
|
return false;
|
||||||
return false;
|
}
|
||||||
});
|
}
|
||||||
}
|
return false;
|
||||||
function nh_reset_form(params){
|
});
|
||||||
params.form[0].reset();
|
}
|
||||||
params.textarea.empty();
|
function nh_reset_form(params){
|
||||||
if(params.editor != undefined){
|
params.form[0].reset();
|
||||||
params.editor.html(params.textarea.html());
|
params.textarea.empty();
|
||||||
}
|
if(params.editor != undefined){
|
||||||
params.contentmsg.hide();
|
params.editor.html(params.textarea.html());
|
||||||
}
|
}
|
||||||
//第二个参数是高度，可以传，可以不传
|
params.contentmsg.hide();
|
||||||
function init_KindEditor_data(id){
|
}
|
||||||
var height = arguments[1] ? arguments[1] : undefined;
|
//第二个参数是高度，可以传，可以不传
|
||||||
KindEditor.ready(function (K) {
|
function init_KindEditor_data(id){
|
||||||
$("div[nhname='new_message_" + id + "']").each(function () {
|
var height = arguments[1] ? arguments[1] : undefined;
|
||||||
var params = {};
|
var width = arguments[2] ? arguments[2] : undefined;
|
||||||
params.kindutil = K;
|
KindEditor.ready(function (K) {
|
||||||
params.div_form = $(this);
|
$("div[nhname='new_message_" + id + "']").each(function () {
|
||||||
params.form = $("form", params.div_form);
|
var params = {};
|
||||||
if (params.form == undefined || params.form.length == 0) {
|
params.kindutil = K;
|
||||||
return;
|
params.div_form = $(this);
|
||||||
}
|
params.form = $("form", params.div_form);
|
||||||
params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
|
if (params.form == undefined || params.form.length == 0) {
|
||||||
params.contentmsg = $("p[nhname='contentmsg_" + id + "']", params.div_form);
|
return;
|
||||||
params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
|
}
|
||||||
params.cancel_btn = $("#new_message_cancel_btn_" + id);
|
params.textarea = $("textarea[nhname='new_message_textarea_" + id + "']", params.div_form);
|
||||||
params.submit_btn = $("#new_message_submit_btn_" + id);
|
params.contentmsg = $("p[nhname='contentmsg_" + id + "']", params.div_form);
|
||||||
params.height = height;
|
params.toolbar_container = $("div[nhname='toolbar_container_" + id + "']", params.div_form);
|
||||||
if (params.textarea.data('init') == undefined) {
|
params.cancel_btn = $("#new_message_cancel_btn_" + id);
|
||||||
params.editor = init_editor(params);
|
params.submit_btn = $("#new_message_submit_btn_" + id);
|
||||||
init_form(params);
|
params.height = height;
|
||||||
params.cancel_btn.click(function () {
|
params.width = width;
|
||||||
nh_reset_form(params);
|
if (params.textarea.data('init') == undefined) {
|
||||||
});
|
params.editor = init_editor(params);
|
||||||
params.submit_btn.click(function () {
|
init_form(params);
|
||||||
params.form.submit();
|
params.cancel_btn.click(function () {
|
||||||
});
|
nh_reset_form(params);
|
||||||
params.textarea.data('init', 1);
|
});
|
||||||
$(this).show();
|
params.submit_btn.click(function () {
|
||||||
}
|
params.form.submit();
|
||||||
});
|
});
|
||||||
});
|
params.textarea.data('init', 1);
|
||||||
|
$(this).show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
Loading…
Reference in new issue