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

Merge remote-tracking branch 'origin/szzh' into szzh

This commit is contained in:
lizanle 2015-09-25 17:38:25 +08:00
parent 4845435aa3 591324854b
commit e092b6c36e
4 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/attachments/file.html.erb
View File

@ -1,3 +1,8 @@
<div id="wrapper">
<div id="wrapper2">
<div id="wrapper3">
<div id="main" class="nosidebar">
<div id="content_">
<h3><%=h @attachment.filename %></h3> <h3><%=h @attachment.filename %></h3>
<div class="attachments"> <div class="attachments">
@ -24,3 +29,10 @@
<% content_for :header_tags do -%> <% content_for :header_tags do -%>
<%= stylesheet_link_tag "scm" -%> <%= stylesheet_link_tag "scm" -%>
<% end -%> <% end -%>
<div style="clear:both;"></div>
</div>
</div>
</div>
</div>
</div>

2
app/views/layouts/base_courses.html.erb
View File

@ -1,5 +1,5 @@
<%# course_model %> <%# course_model %>
<% teacher_num = teacherCount(@course) %> <% teacher_num = searchTeacherAndAssistant(@course).count %>
<% student_num = studentCount(@course) %> <% student_num = studentCount(@course) %>
<% course_file_num = visable_attachemnts_incourse(@course).count%> <% course_file_num = visable_attachemnts_incourse(@course).count%>
<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %> <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>

5
app/views/tags/tag_save.js.erb
View File

@ -20,8 +20,9 @@ $('#tags_name2').val("");
$("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>"); $("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>");
<%else%> <%else%>
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty(); $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name', $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").replaceWith('<%= escape_javascript(render :partial => 'tags/tag_new', :locals => {:obj => @obj, :object_flag => "6"}) %>');
:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>'); //render :partial => 'tags/course_attachment_tag_name',
//:locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag})
<%end%> <%end%>
$("#tags_name_<%=@obj.id%>").val(""); $("#tags_name_<%=@obj.id%>").val("");

2
public/javascripts/project.js
View File

@ -362,9 +362,11 @@ $(document).ready(function () {
}); });
function showAndScrollTo(id, focus) { function showAndScrollTo(id, focus) {
$('#' + id).show(); $('#' + id).show();
if (focus !== null) { if (focus !== null) {
$('#' + focus).focus(); $('#' + focus).focus();
issue_journal_kind_reply.focus();
} }
$('html, body').animate({scrollTop: $('#' + id).offset().top}, 400); $('html, body').animate({scrollTop: $('#' + id).offset().top}, 400);
} }