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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2015-03-21 17:08:45 +08:00
parent 95d80707d9 12d88d85fc
commit 21782b9153
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/bids/_bid_homework_show.html.erb
View File

@ -165,7 +165,7 @@
<tr> <tr>
<td colspan="2" width="580px" > <td colspan="2" width="580px" >
<span class="font_description"> <span class="font_description">
<%= textilizable bid, :description %> <%= bid.description %>
</span> </span>
</td> </td>
</tr> </tr>

1
app/views/files/create.js.erb
View File

@ -31,4 +31,5 @@ closeModal();
$("#resource_list").html('<%= j(render partial: "course_file" ,locals: {course: @course}) %>'); $("#resource_list").html('<%= j(render partial: "course_file" ,locals: {course: @course}) %>');
<%end%> <%end%>
<% end %> <% end %>
$(document).ready(img_thumbnails);

2
app/views/projects/invite_members_by_mail.html.erb
View File

@ -4,7 +4,7 @@
var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/; var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
if(email == "") if(email == "")
{ {
$("#valid_email").html("电子邮件不能为空"); $("#valid_email").html("邮箱地址不能为空！");
} }
else if (filter.test(email)) { else if (filter.test(email)) {
$("#valid_email").html(""); $("#valid_email").html("");