diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index a7d7711eb..4e43514e8 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -310,7 +310,7 @@
     <% end %>
 <% end %>
 <% if @issues.empty? %>
-    <p class="nodata"><%= l(:label_no_data) %></p>
+    <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} %>
@@ -331,190 +331,3 @@
 </div>
 <!--缺陷列表结束-->
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div class="homepageRight mt0 ml10" >
-  <div class="issues_con fl">
-    <div class="clear mb5">
-      <a href="<%= new_project_issue_path(@project)%>" class="sy_btn_green  fl mr10">新 增</a>
-      <div class="issues_statistics fl">
-        <ul>
-          <li>所有<a  class="issues_greycirbg_btn "><%= @issues_filter.count %></a></li>
-          <li>开启<a  class="issues_greycirbg_btn "><%#= @issues_filter_assign_count %><%= @issue_open_count  %></a></li>
-          <li>关闭<a  class="issues_greycirbg_btn "><%#= @issues_filter_author_count %><%= @issue_close_count  %></a></li>
-        </ul>
-      </div><!--issues_statistics end-->
-      <!--<input type="button"  class="hw_btn_blue  fr" value="导出EXCEL" onclick="remote_function_export('<%#= @project.id %>')">-->
-      <a href="<%=project_issues_path(:project_id => @project, :format => 'xls', :export => true, :set_filter => "1")%>" id="sendexcel" class="hw_btn_blue  fr" alt="导出EXCEL" onclick="remote_function_export('<%= @project.id %>')">导出EXCEL</a>
-    </div>
-    <% 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' %>
-            <%= hidden_field_tag 'export_issue_hidden', '0' %>
-            <!--<input id="exprot_issues_hidden"  value="0" type="hidden">-->
-            <div class="clear mb10">
-              <div class="hw_search_box fl ">
-                <input class="hw_search-input" placeholder="请输入问题名称" type="text" id="v_subject"  name="subject" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
-                <a href="javascript:void(0);" class="hw_btn_search" onclick="remote_function();" ></a>
-              </div>
-              <a href="javascript:void(0);" class="sy_btn_grey fl ml5" onclick="all_reset_form();">清除</a>
-
-              <div class="calendar_div fr">
-                <input id="issue_date_end_issue_export" name="issue_create_date_end" nhname="date_val" type="hidden"/>
-                <input type="text" nhname="date_show" id="issue_create_date_end_show" class="InputBox fl W120 calendar_input" readonly="readonly" size="13" placeholder="结束日期">
-                <%= calendar_for('issue_create_date_end_show')%>
-              </div>
-              <div class="calendar_div fr">
-                <input id="issue_date_start_issue_export"  name="issue_create_date_start" nhname="date_val" type="hidden"/>
-                <input type="text" nhname="date_show" id="issue_create_date_start_show" class="InputBox fl W120 calendar_input" readonly="readonly" size="13" placeholder="开始日期">
-                <%= calendar_for('issue_create_date_start_show')%>
-              </div>
-              <!--<input type="text"  placeholder="开始日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl" style="border-right:none;"></a>-->
-              <!--<input type="text"  placeholder="结束日期" class="issues_calendar_input fl " ><a href="" class="issues_data_img fl"></a>-->
-            </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();">
-                  <a href="javascript:void(0);" onclick="all_reset_form();" id="issues_type_1" >所有</a>
-                  <span id="issue_filter_all"><%= render :partial => "issues/issue_filter_all" %></span>
-                </li>
-                <!--li id="issues_list_nav_2" onclick="HoverLi(2);">
-                  <a href="javascript:void(0);" onclick="switch_assign_to(<%#= User.current.id %>)" id="issues_type_2" >指派给我
-                    <span id="issue_assigned_count"><%#= render :partial => "issues/issue_filter" %></span>
-                  </a>
-                </li>
-                <li id="issues_list_nav_3" onclick="HoverLi(3);">
-                  <a href="javascript:void(0);" onclick="createByMe(<%#= User.current.id %>)" id="issues_type_3" >我的发布
-                    <span id="issue_author_count"><%#= render :partial => "issues/issue_filter_author" %></span>
-                    </a>
-                </li-->
-                <div class="cl"></div>
-
-
-              </ul>
-
-
-              <div class="issues_filter ">
-                <div class="issues_form_filter mt5 mr5">
-
-                  <%= select(:issue, :tracker, [["缺陷",1],["功能",2],["支持",3],["任务",4],["周报",5]].unshift(["类型",0]),
-                             {:include_blank => false, :selected => @tracker_id ? @tracker_id : 0},
-                             {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl issues_filter_select_min"}) %>
-
-                  <%#= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
-                              { :include_blank => false,:selected=>@author_id ? @author_id : 0},
-                              {:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:class=>"fl "}
-                      )
-                  %>
-
-                  <%= select( :issue, :user_id, principals_options_for_isuue_list(@project),
-                              { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
-                              },
-                              {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl"}
-                      )
-                  %>
-                  <%= select(:issue, :fixed_version, options_for_version_isuue_list(@project),
-                             {:include_blank => false, :selected => @fixed_version_id ? @fixed_version_id : 0},
-                             {:onchange => "remote_function();", :id => "fixed_version_id", :name => "fixed_version_id", :class => "fl"}) %>
-
-                  <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
-                              { :include_blank => false,:selected=>@status_id ? @status_id : 0
-                              },
-                              {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"fl issues_filter_select_min"}
-                      )
-                  %>
-                  <%#= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
-                              { :include_blank => false,:selected=>@priority_id ?  @priority_id : 0
-                              },
-                              {:onchange=>"remote_function();",:id=>"priority_id",:name=>"priority_id",:class=>"fl"}
-                      )
-                  %>
-
-                  <%#= select(:issue, :done_ratio, [["10%",1],["20%",2],["30%",3],["40%",4],["50%",5],["60%",6],["70%",7],["80%",8],["90%",9],["100%",10]].unshift(["完成度",0]),
-                             {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0 },
-                             {:onchange => "remote_function();", :id => "done_ratio", :name => "done_ratio", :class => "f1"}) %>
-                  <%= select( :issue,:done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }).unshift(["完成度",-1]),
-                              {:include_blank => false, :selected => @done_ratio ? @done_ratio : -1},
-                              {:onchange=>"remote_function();",:id=>"done_ratio",:name=>"done_ratio",:class=>"fl"}) %>
-
-
-                  <%#= select(:issue, :test, [["最新创建",1],["最早创建",2],["最近更新",3],["最早更新", 4]].unshift(["排序",0]),
-                             {:include_blank => false, :selected => @order ? @order : 0 },
-                             {:onchange => "remote_function();", :id => "test", :name => "test", :class => "fr issues_filter_select_min"}) %>
-
-                  <%= select(:issue, :test, [["最新创建",1],["最早创建",2],["最近更新",3],["最早更新", 4]].unshift(["排序",0]),
-                             {:include_blank => false, :selected => @test ? @test : 0 },
-                             {:onchange => "remote_function();", :id => "test", :name => "test", :class => "fr issues_filter_select_min"}) %>
-
-                  <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
-                              { :include_blank => false,:selected=>@author_id ? @author_id : 0},
-                              {:onchange=>"remote_function();",:id=>"author_id",:name=>"author_id",:style=>"display:none;"}
-                      )
-                  %>
-
-
-
-
-
-
-                  <%#= select(:issue, :tracker_id, [["缺陷",1],["功能",2],["支持",3],["任务",4],["周报",5]].unshift(["类型",0]),
-                             {:include_blank => false, :selected => @tracker_id ? @tracker_id : 0},
-                             {:onchange => "remote_function();", :id => "tracker_id", :name => "tracker_id", :class => "fl issues_filter_select_min"}) %>
-                  <%#= select( :issue, :user_id, principals_options_for_isuue_list(@project),
-                              { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0},
-                              {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"assigned_to_id",:class=>"fl"})
-                  %>
-
-                  <%#= select(:issue, :fixed_version_id, options_for_version_isuue_list(@project),
-                             {:include_blank => false, :selected => @fixed_version_id ? @fixed_version_id : 0},
-                             {:onchange => "remote_function();", :id => "fixed_version_id", :name => "fixed_version_id", :class => "f1"}) %>
-
-                  <%#= select( :issue, :status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
-                              { :include_blank => false,:selected=>@status_id ? @status_id : 0
-                              },
-                              {:onchange=>"remote_function();",:id=>"status_id",:name=>"status_id",:class=>"fl issues_filter_select_min"}
-                      ) %>
-
-                  <%#= select( :issue,:done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }),
-                              {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0},
-                              {:onchange=>"remote_function();",:id=>"done_ratio",:name=>"done_ratio",:class=>"fl"}) %>
-
-                  <%#= select(:issue, :done_ratio, [["10%",1],["20%",2],["30%",3],["40%",4],["50%",5],["60%",6],["70%",7],["80%",8],["90%",9],["10%",10]].unshift(["完成度",0]),
-                             {:include_blank => false, :selected => @done_ratio ? @done_ratio : 0 },
-                             {:onchange => "remote_function();", :id => "done_ratio", :name => "done_ratio", :class => "f1"}) %>
-
-                  <%#= select(:issue, :test, [["最早创建",1],["最早更新",2]].unshift(["排序",0]),
-                             {:include_blank => false, :selected => @order ? @order : 0 },
-                             {:onchange => "remote_function();", :id => "test", :name => "test", :class => "fr issues_filter_select_min"}) %>
-                </div>
-                <div class="cl"></div>
-              </div><!--issues_filter end-->
-        <% end %>
-    <% end %>
-    <% if @issues.empty? %>
-        <p class="nodata"><%= 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>
-    <% end %>
-    <%#= render :partial => 'issues/all_list', :locals => {:issues => @issues, :query => @query,:issue_pages=>@issue_pages,:issue_count=>@issue_count,:project=>@project,:subject=>@subject} %>
-    </div><!--issues_con_list end-->
-
-  </div>
-</div>
diff --git a/app/views/projects/_no_data.html.erb b/app/views/projects/_no_data.html.erb
new file mode 100644
index 000000000..249a67af0
--- /dev/null
+++ b/app/views/projects/_no_data.html.erb
@@ -0,0 +1,4 @@
+<div class="pro_new_info mb10">
+  <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/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index 6f0061577..2e10d6598 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -41,10 +41,6 @@
         });
     </script>
 <% else %>
-    <div class="new_roadmap_conbox mb10" >
-      <div class="new_roadmap_navbox clear">
-        版本库中还没有提交代码，请先提交代码
-      </div>
-    </div>
+    <%= render :partial => "projects/no_data" %>
 <% end %>
 
diff --git a/public/images/new_project/icons_smile.png b/public/images/new_project/icons_smile.png
new file mode 100644
index 000000000..b760d82fc
Binary files /dev/null and b/public/images/new_project/icons_smile.png differ
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 342ac0730..2db68998d 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -1008,4 +1008,8 @@ textarea.muban_textarea{ width: 98.5%;border:1px solid #ddd; background:#fff; co
 .alert-blue{ background-color: #d9edf7;border-color: #bce8f1; color: #3a87ad;}
 .alert-orange{ background-color: #fff9e9;border-color: #f6d0b1; color:#ee4a20;}
 .close{padding: 0;cursor: pointer; background: transparent; border: 0; -webkit-appearance: none;  font-size: 21px; font-weight: bold;line-height: 1; color: #000000; text-shadow: 0 1px 0 #ffffff; opacity: 0.3;}
-.close:hover{opacity: 0.5;}
\ No newline at end of file
+.close:hover{opacity: 0.5;}
+
+/* 课程大纲 */
+.icons_tishi{ width: 110px; height: 110px;margin: 135px auto 20px;}
+.sy_tab_con_p{ font-size: 16px;text-align: center; margin-bottom:100px; color:#888;}
\ No newline at end of file