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:
z9hang 2015-03-11 15:14:04 +08:00
parent 11c8c0510a 078d2fa488
commit ec455de3d4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@
</div>
<% if @grouped.empty? %>
<p class="nodata">
<p class="nodata" style="margin-top: 30px;">
<%= l(:label_no_data) %>
</p>
<% end %>

5
app/views/files/new.html.erb
View File

@ -8,11 +8,10 @@
<% if @versions.any? %>
<p><label for="version_id"><%=l(:field_version)%></label>
<%= select_tag "version_id", content_tag('option', '') +
options_from_collection_for_select(@versions, "id", "name") %></p>
<%= select_tag "version_id", content_tag('option', '') + options_from_collection_for_select(@versions, "id", "name") %></p>
<% end %>
<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
<p><label><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form' %></p>
</div>
<%= submit_tag l(:button_add) %>
<% end %>