jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course

This commit is contained in:
huang 2015-12-21 13:49:19 +08:00
parent a1395d69ef e86f9f9aeb
commit 73f0d70e23
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/views/issues/update.js.erb
View File

@ -12,12 +12,25 @@ issue_desc_editor = KindEditor.create('#issue_description',
{"width":"85%",
"resizeType":0,
"no_label":true,
"at_id":<%= @issue.project_id%>,
"at_type":"Project",
"autoHeightMode":true,
"afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\")})",
"emotionsBasePath":"http://localhost:3000","height":300,
"afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);};if(typeof enableAt ==='function'){enableAt(self, \"<%=@issue.project_id %>\", 'Project');}; this.loadPlugin('autoheight')})",
"emotionsBasePath":'<%= Setting.host_name%>',
"height":300,
"allowFileManager":true,
"uploadJson":"/kindeditor/upload",
"fileManagerJson":"/kindeditor/filemanager"});
//issue_desc_editor = KindEditor.create('#issue_description',
// {"width":"85%",
// "resizeType":0,
// "no_label":true,
// "autoHeightMode":true,
// "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\")})",
// "emotionsBasePath":"http://localhost:3000","height":300,
// "allowFileManager":true,
// "uploadJson":"/kindeditor/upload",
// "fileManagerJson":"/kindeditor/filemanager"});
<%else%>
alert('<%= @issue.errors.full_messages[0].to_s%>')
<%end %>

11
plugins/redmine_ckeditor/app/views/issues/update_form.js.erb
View File

@ -13,11 +13,12 @@ issue_desc_editor = KindEditor.create('#issue_description',
{"width":"85%",
"resizeType":0,
"no_label":true,
"at_id":<%= @issue.project_id%>,
"at_type":"Project",
"autoHeightMode":true,
"afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\"),$(this.toolbar.div).hide();})",
"afterFocus":"eval(function(){$(this.toolbar.div).show();})",
"afterBlur":"eval(function(){$(this.toolbar.div).hide();})",
"emotionsBasePath":"http://localhost:3000",
"height":300,"allowFileManager":true,
"afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);};if(typeof enableAt ==='function'){enableAt(self, "<%=@issue.project_id %>", 'Project');}; this.loadPlugin('autoheight')})",
"emotionsBasePath":'<%= Setting.host_name%>',
"height":300,
"allowFileManager":true,
"uploadJson":"/kindeditor/upload",
"fileManagerJson":"/kindeditor/filemanager"});

4
public/javascripts/course.js
View File

@ -299,12 +299,12 @@ function regexDescription()
$("#description_notice_span").focus();
return false;
}
else if(name.length >=6000){
/*else if(name.length >=6000){
$("#description_notice_span").text("描述最多3000个汉字(或6000个英文字符)");
$("#description_notice_span").css('color','#ff0000');
$("#description_notice_span").focus();
return false;
}
}*/
else
{
$("#description_notice_span").text("填写正确");

4
public/javascripts/project.js
View File

@ -248,13 +248,13 @@ function regexDescription() {
$("#description_notice_span").focus();
return false;
}
else if (name.length > 10000)
/*else if (name.length > 10000)
{
$("#description_notice_span").text("描述超过10000个字符");
$("#description_notice_span").css('color', '#ff0000');
$("#description_notice_span").focus();
return false;
}
}*/
else {
$("#description_notice_span").text("填写正确");
$("#description_notice_span").css('color', '#008000');