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

Merge branch 'develop' into dev_shcool

This commit is contained in:
daiao 2016-09-09 14:45:46 +08:00
parent d9ad0fa1d7 89f3e0ee0d
commit 33c6514cde
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/issues/_form.html.erb
View File

@ -78,5 +78,5 @@
<div class="cl"></div> <div class="cl"></div>
<%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %> <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
<% end %> <% end %>
<a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();location.reload()" class="blue_btn fl ml80" id="issue_confirm"> 确定</a> <a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80" id="issue_confirm"> 确定</a>
<a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50 ml10" > 取消 </a> <a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50 ml10" > 取消 </a>

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

@ -1,12 +1,5 @@
<% if @saved %> <% if @saved %>
$("#issue_detail").replaceWith('<%= escape_javascript(render :partial => 'issues/detail') %>') location.reload();
$("#issue_edit").replaceWith('<%= escape_javascript(render :partial => 'issues/edit') %>')
$("#issue_detail").show();
$("#issue_edit").hide();
$("#reply_div_<%= @issue.id %>").html("<%= escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
$(".homepagePostReplyBannerCount").html('<%= escape_javascript(render :partial => 'issues/issue_reply_banner') %>');
//edit里的编辑器貌似显示不出来，所以手动js生成。 //edit里的编辑器貌似显示不出来，所以手动js生成。
issue_desc_editor = KindEditor.create('#issue_description', issue_desc_editor = KindEditor.create('#issue_description',
{"width":"85%", {"width":"85%",
@ -31,6 +24,7 @@ issue_desc_editor = KindEditor.create('#issue_description',
// "allowFileManager":true, // "allowFileManager":true,
// "uploadJson":"/kindeditor/upload", // "uploadJson":"/kindeditor/upload",
// "fileManagerJson":"/kindeditor/filemanager"}); // "fileManagerJson":"/kindeditor/filemanager"});
<%else%> <%else%>
alert('<%= @issue.errors.full_messages[0].to_s%>') alert('<%= @issue.errors.full_messages[0].to_s%>')
<%end %> <%end %>

2
app/views/users/_project_list.html.erb
View File

@ -37,7 +37,7 @@
<% else %> <% else %>
<% projects.each_with_index do |project, i| %> <% projects.each_with_index do |project, i| %>
<div class="syllabus_courses_list <%= i > 4 ? 'none' : ''%>" style="cursor: default;"> <div class="syllabus_courses_list <%= i > 4 ? 'none' : ''%>" style="cursor: default;">
<% allow_visit = User.current.member_of?(project) || User.current.admin? || project.is_public == 1 %> <% allow_visit = User.current.member_of?(project) || User.current.admin? || project.is_public? %>
<div class="sy_courses_open"> <div class="sy_courses_open">
<span id="collect_project_icon_<%= project.id %>"> <span id="collect_project_icon_<%= project.id %>">
<%=render :partial => 'collect_project', :locals => {:project => project} %> <%=render :partial => 'collect_project', :locals => {:project => project} %>