diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index 27e9673a7..bd2c427f7 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -94,6 +94,7 @@
<%= render :partial => "files/tag_yun_project", :locals => {:tag_list => @tag_list,:project => @project, :tag_name => @tag_name}%>
+ <% if @tip_all_attachments > 0 %>
<%= render :partial => "files/tip_attachment_count" %>
@@ -124,5 +125,8 @@
<%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments} %>
+ <% else %>
+ <%= render :partial => "projects/no_data" %>
+ <% end %>
<%# html_title(l(:label_attachment_plural)) -%>
\ No newline at end of file
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index a9f70f999..aa51842aa 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -214,6 +214,9 @@
新建
+ <% if @issues.empty? %>
+ <%= render :partial => "projects/no_data" %>
+ <% else %>
<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
<%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project},:remote=>'xls', :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
<%= hidden_field_tag 'set_filter', '1' %>
@@ -236,7 +239,6 @@
<%= calendar_for('issue_create_date_start_show')%>
-
<% end %>
<% end %>
-<% if @issues.empty? %>
- <%= l(:label_no_data) %>
-<% else %>
+
<%= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %>
diff --git a/app/views/projects/_no_data.html.erb b/app/views/projects/_no_data.html.erb
index 249a67af0..bc8b97547 100644
--- a/app/views/projects/_no_data.html.erb
+++ b/app/views/projects/_no_data.html.erb
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/app/views/projects/member_forked.html.erb b/app/views/projects/member_forked.html.erb
index b3cfad1d4..d5dba7ae2 100644
--- a/app/views/projects/member_forked.html.erb
+++ b/app/views/projects/member_forked.html.erb
@@ -26,5 +26,7 @@
<% else %>
+
<%= render :partial => "projects/no_data" %>
+
<% end %>
diff --git a/app/views/projects/project_watcherlist.html.erb b/app/views/projects/project_watcherlist.html.erb
index c421f4f81..1c97e2855 100644
--- a/app/views/projects/project_watcherlist.html.erb
+++ b/app/views/projects/project_watcherlist.html.erb
@@ -26,7 +26,9 @@
<% else %>
+
<%= render :partial => "projects/no_data" %>
+
<% end %>
diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index f2591b6ea..4053e6739 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -62,6 +62,8 @@
<% else %>
+
<%= render :partial => "projects/no_data" %>
+
<% end %>
diff --git a/app/views/users/_project_boardlist.html.erb b/app/views/users/_project_boardlist.html.erb
index dbc0b3992..c18b003d2 100644
--- a/app/views/users/_project_boardlist.html.erb
+++ b/app/views/users/_project_boardlist.html.erb
@@ -2,6 +2,7 @@
讨论区列表
+ <% if topics.any? %>
排序:
<%= link_to "时间", {:controller => 'boards', :action => 'index', :type => @type, :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
@@ -15,7 +16,6 @@
- <% if topics.any? %>
<% topics.each do |activity| %>
- <% else %>
-
<%= l(:label_no_data) %>
- <% end %>
+ <% else %>
+ <%= render :partial => "projects/no_data" %>
+ <% end %>