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

app/views/documents/index.html.erb

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

app/views/files/new.html.erb

@@ -8,8 +8,7 @@
 
 <% 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>