jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

冲突

This commit is contained in:
caishi 2019-10-26 09:10:55 +08:00
parent 9dd5bf66b3 dca1515830
commit 4b483e961e
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/issues/index.html.erb
View File

@ -316,9 +316,12 @@
</div><!--issues_con_list end--> </div><!--issues_con_list end-->
<div class="cl"></div> <div class="cl"></div>
<!--issues_filter end--> <!--issues_filter end-->
<div id="issues_list_content_1"></div><!--issues_list_content_1 end--> <div id="issues_list_content_1">
<div id="issues_list_content_2" class="undis"></div><!--issues_list_content_2 end--> </div><!--issues_list_content_1 end-->
<div id="issues_list_content_3" class="undis"></div><!--issues_list_content_3 end--> <div id="issues_list_content_2" class="undis">
</div><!--issues_list_content_2 end-->
<div id="issues_list_content_3" class="undis">
</div><!--issues_list_content_3 end-->
<!--issues_con_list end--> <!--issues_con_list end-->
<!--缺陷列表结束--> <!--缺陷列表结束-->

1
app/views/layouts/base_projects.html.erb
View File

@ -29,7 +29,6 @@
<%= render_flash_messages %> <%= render_flash_messages %>
<%= yield %> <%= yield %>
<%= call_hook :view_layouts_base_content %> <%= call_hook :view_layouts_base_content %>
<div style="clear:both;"></div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<%= render :partial => 'layouts/footer' %> <%= render :partial => 'layouts/footer' %>

20
app/views/users/user_issues.html.erb
View File

@ -197,7 +197,6 @@
<li>关闭<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_close_count %></a></li> <li>关闭<a href="javascript:void(0);" class="issues_greycirbg_btn "><%= @issue_close_count %></a></li>
</ul> </ul>
</div><!--issues_statistics end--> </div><!--issues_statistics end-->
</div> </div>
<%= form_tag( user_issues_user_path(@user), :remote=>'xls', :method => "post", :id=>"issue_query_form", :class => 'query_form') do %> <%= form_tag( user_issues_user_path(@user), :remote=>'xls', :method => "post", :id=>"issue_query_form", :class => 'query_form') do %>
<div class="clear mb10"> <div class="clear mb10">
@ -278,6 +277,7 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div>
<% end %> <% end %>
<% if @issues.empty? %> <% if @issues.empty? %>
<p class="nodata mt10"><%= l(:label_no_data) %></p> <p class="nodata mt10"><%= l(:label_no_data) %></p>
@ -288,13 +288,17 @@
<% end %> <% end %>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div><!--issues_filter end-->
<div id="issues_list_content_1"> <!--issues_filter end-->
</div><!--issues_list_content_1 end--> <div id="issues_list_content_1"></div>
<div id="issues_list_content_2" class="undis">
</div><!--issues_list_content_2 end--> <!--issues_list_content_1 end-->
<div id="issues_list_content_3" class="undis"> <div id="issues_list_content_2" class="undis"></div>
</div><!--issues_list_content_3 end-->
<!--issues_list_content_2 end-->
<div id="issues_list_content_3" class="undis"></div>
<!--issues_list_content_3 end-->
<!--issues_con_list end--> <!--issues_con_list end-->