From 7a8c9371734f65043601b80638f89f6462f36b6c Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 1 Dec 2016 17:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AEissue=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=A8=E8=AE=BA=E5=8C=BA=EF=BC=8C=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=EF=BC=8Cpullrequests=EF=BC=8C=E9=87=8C=E7=A8=8B?=
 =?UTF-8?q?=E7=A2=91=E5=8F=8A=E5=85=B6=E9=87=8C=E7=A8=8B=E7=A2=91=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=95=B0=E6=8D=AE=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_project_file.html.erb          |  4 ++++
 app/views/issues/index.html.erb                 |  8 ++++----
 app/views/projects/_no_data.html.erb            |  2 +-
 app/views/projects/member_forked.html.erb       |  2 ++
 app/views/projects/project_watcherlist.html.erb |  2 ++
 app/views/pull_requests/index.html.erb          |  2 ++
 app/views/users/_project_boardlist.html.erb     |  8 ++++----
 app/views/versions/index.html.erb               | 10 +++++++---
 app/views/versions/show.html.erb                |  9 ++++++++-
 public/stylesheets/css/project.css              |  2 +-
 10 files changed, 35 insertions(+), 14 deletions(-)

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}%>
       </div>
       <div class="cl"></div>
+      <% if @tip_all_attachments > 0 %>
       <div class="re_con_top">
         <p class="f_l  fontBlue f_b f_14" id="tip_attachment_count">
           <%= render :partial => "files/tip_attachment_count" %>
@@ -124,5 +125,8 @@
   <div id="course_list">
     <%= render :partial => 'project_list',:locals => {project: @project, all_attachments: @all_attachments, sort:@sort, order:@order, project_attachments:@obj_attachments}  %>
   </div>
+  <% else %>
+    <%= render :partial => "projects/no_data" %>
+  <% end %>
 </div>
 <%# 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 @@
   </div><!--issues_statistics end-->
   <a href="<%= new_project_issue_path(@project)%>" class="sy_btn_green fr " >新建</a>
 </div>
+  <% 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')%>
           </div>
         </div>
-
         <div class="issues_con_list" style="position: relative;">
           <ul id="issues_list_nav" >
             <li id="issues_list_nav_1" onclick="HoverLi(1);all_reset_form();" class="issues_nav_hover">
@@ -309,9 +311,7 @@
           </div><!--issues_filter end-->
     <% end %>
 <% end %>
-<% if @issues.empty? %>
-    <p class="nodata mt10"><%= l(:label_no_data) %></p>
-<% else %>
+
     <div id="issue_list">
       <%= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %>
     </div>
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 @@
-<div class="pro_new_info mb10">
+<div class="pro_new_info">
   <div class="icons_tishi"><img src="/images/new_project/icons_smile.png" width="110" height="110" alt=""></div>
   <p class="sy_tab_con_p ">没有数据可供显示！</p>
 </div>
\ 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 @@
   <div class="cl"></div>
 </div>
 <% else %>
+    <div class="mb10">
     <%= render :partial => "projects/no_data" %>
+    </div>
 <% 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 @@
   <div class="cl"></div>
 </div>
 <% else %>
+    <div class="mb10">
     <%= render :partial => "projects/no_data" %>
+    </div>
 <% 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 @@
 
     </script>
 <% else %>
+    <div class="mb10">
     <%= render :partial => "projects/no_data" %>
+    </div>
 <% 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 @@
 <div id="project-boardlist">
   <div class="container-big mt10" >
     <p class="list-h2">讨论区列表</p>
+    <% if topics.any? %>
     <div class="category">
       <span class="grayTxt ">排序：</span>
       <%= link_to "时间", {:controller => 'boards', :action => 'index',  :type => @type,  :sort => @b_sort, :order => 1 }, :class => "sortTxt", :remote => true %>
@@ -15,7 +16,6 @@
       <div class="cl"></div>
     </div>
     <div class="bloglistbox">
-      <% if topics.any? %>
           <% topics.each do |activity| %>
               <div class="list-file">
                 <div><span class="item_list fl"></span>
@@ -59,11 +59,11 @@
             </ul>
             <div class="cl"></div>
           </div>
-      <% else %>
-          <p class="nodata"><%= l(:label_no_data) %></p>
-      <% end %>
     </div>
   </div>
+  <% else %>
+      <%= render :partial => "projects/no_data" %>
+  <% end %>
 </div>
 <script type="text/javascript">
     //如果右边的博客列表比左边的高度低则将右边的高度设为与左边对齐
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 494fcc916..d710368a7 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -19,9 +19,13 @@
 <!--    <a href="javascript:void(0);" class="btn btn-green fr mr15 mt10"> 新建 </a>-->
     <%= link_to "新建", new_project_version_path(@project, :is_create => true), :class => 'btn btn-green fr mr15 mt10', :remote => true %>
   </div>
-  <div id="version_list">
-    <%= render :partial => "versions/list" %>
-  </div>
+  <% if @versions_count > 0 %>
+      <div id="version_list">
+        <%= render :partial => "versions/list" %>
+      </div>
+  <% else %>
+      <%= render :partial => "projects/no_data" %>
+  <% end %>
 </div><!--new_roadmap end-->
 <!--里程碑列表结束-->
 
diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb
index 1da325593..8cab89c47 100644
--- a/app/views/versions/show.html.erb
+++ b/app/views/versions/show.html.erb
@@ -39,7 +39,8 @@
     </div>
   </div>
 </div>
-<div class="new_roadmap_conbox mb10" >
+<% if @version.issues_count > 0 %>
+  <div class="new_roadmap_conbox mb10" >
   <div class=" clear">
     <ul class="new_roadmap_nav fl"  >
       <li id="new_roadmap_nav_1" class="new_roadmap_nav_hover " onclick="HoverLi(1);">
@@ -103,7 +104,13 @@
     <!--缺陷列表结束-->
 
   </div><!--new_roadmap_content_2 end-->
+
 </div><!--new_roadmap end-->
+<% else %>
+    <div class="mb10">
+    <%= render :partial => "projects/no_data" %>
+    </div>
+<% end %>
 <!--里程碑详情结束-->
 
 
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index cc0ded22a..39309d336 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -887,7 +887,7 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
 .table-td-w180{display:inline-block;with:180px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;}
 .table-td-w380{display:inline-block;with:380px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;}
 /*项目简介*/
-.pro_new_info{ border:1px solid #ddd; background-color:#fff;  width: 998px;}
+.pro_new_info{ border:1px solid #ddd; background-color:#fff;  width: 100%;}
 .pro_new_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;}
 /*.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px}*/
 .pro_new_info_weight{ font-size: 16px; font-weight: bold;}