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

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
Tim 2016-10-14 20:31:04 +08:00
parent 9ce87808c8 e7f930a678
commit 162838dae6
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/attachments/_upload_attachment_new_version.html.erb
View File

@ -1,6 +1,7 @@
<div class="clear mb10"> <div class="clear mb10">
<a class="sub_btn fl" name="button" onclick="_file.click()" onmouseover="" style="<%= ie8? ? 'display:none' : ''%>">文件浏览</a> <a class="sub_btn fl" name="button" onclick="_file.click()" onmouseover="" style="<%= ie8? ? 'display:none' : ''%>">文件浏览</a>
<p class="fl ml5 mt3 sy_cgrey">(未选择文件) 您可以上传小于<span class="c_red">50MB</span>的文件</p> <p class="fl ml5 mt3 sy_cgrey" ><span id="upload_file_count" class="c_red">(未选择文件)</span> 您可以上传小于<span class="c_red">50MB</span>的文件</p>
</div> </div>
<%= file_field_tag 'attachments[dummy][file]', <%= file_field_tag 'attachments[dummy][file]',

2
app/views/attachments/upload_attachment_version.js.erb
View File

@ -1,7 +1,7 @@
<% if @flag %> <% if @flag %>
hideModal(); hideModal();
alert('更新成功') alert('更新成功')
$(".re_search").submit(); // $(".re_search").submit();
<%else%> <%else%>
$("#upload_file_count").html('(更新失败)') $("#upload_file_count").html('(更新失败)')
<%end %> <%end %>

2
app/views/files/_attachment_history_popub.html.erb
View File

@ -55,4 +55,4 @@
<a href="javascript:void(0);" id="upload_files_cancle_btn" class="btn fr" onclick="hideModal();">取消</a> <a href="javascript:void(0);" id="upload_files_cancle_btn" class="btn fr" onclick="hideModal();">取消</a>
<%= submit_tag '确定', :onclick => 'upload_attachment_version(event);', :onfocus => 'this.blur()', :id => 'upload_files_submit_btn', :class => 'btn btn-blue fr mr5' %> <%= submit_tag '确定', :onclick => 'upload_attachment_version(event);', :onfocus => 'this.blur()', :id => 'upload_files_submit_btn', :class => 'btn btn-blue fr mr5' %>
</div> </div>
<% end %> <% end %>

2
app/views/files/index.html.erb
View File

@ -441,12 +441,10 @@
if($("#upload_form").find('.upload_filename').length > 1){ if($("#upload_form").find('.upload_filename').length > 1){
$("#upload_file_count").html('(只能上传一个更新文件)') $("#upload_file_count").html('(只能上传一个更新文件)')
event.preventDefault(); event.preventDefault();
return false; return false;
}else if($("#upload_form").find('.upload_filename').length == 0){ }else if($("#upload_form").find('.upload_filename').length == 0){
$("#upload_file_count").html('(请上传一个更新文件)') $("#upload_file_count").html('(请上传一个更新文件)')
event.preventDefault(); event.preventDefault();
return false; return false;
}else{ }else{
$("#upload_form").submit(); $("#upload_form").submit();