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

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

This commit is contained in:
linhk 2014-09-17 16:36:16 +08:00
parent c31b50421e 5d65901ebd
commit d0979a7bf5
1 changed files with 39 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/views/contests/index.html.erb
View File

@ -7,19 +7,7 @@
<td rowspan="2"> <td rowspan="2">
<% if User.current.logged? %> <% if User.current.logged? %>
<% unless User.current.user_extensions.identity == 1 %> <% unless User.current.user_extensions.identity == 1 %>
<<<<<<< HEAD
<!--
modified by longjun
<%#link_to l(:label_newtype_contest), :controller => 'contests', :action => 'new_contest' %>
-->
<%= link_to(l(:label_newtype_contest),
contest_new_contests_path,
:class => 'icon icon-add',
:target => "_blank")
%>
=======
<%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %> <%= link_to(l(:label_newtype_contest), new_contest_contests_path, :class => 'icon icon-add', :target => "_blank") %>
>>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
<!-- end longjun --> <!-- end longjun -->
<% end %> <% end %>
<% end %> <% end %>
@ -28,35 +16,20 @@
<div class="project-search" style="float: right"> <div class="project-search" style="float: right">
<%= text_field_tag 'name', params[:name], :size => 30 %> <%= text_field_tag 'name', params[:name], :size => 30 %>
<%= hidden_field_tag 'project_type', params[:project_type] %> <%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), <%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
:class => "enterprise",
:name => "contests_search"
%>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="padding-left: 8px"> <td style="padding-left: 8px">
<a> <a>
<<<<<<< HEAD
<!--modified by longjun-->
=======
>>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
<%= link_to request.host()+"/contests", contests_path %> <%= link_to request.host()+"/contests", contests_path %>
<!-- end longjun --> <!-- end longjun -->
</a> </a>
</td> </td>
<td > <td >
<%=link_to l(:field_homepage), home_path %> > <%=link_to l(:field_homepage), home_path %> >
<<<<<<< HEAD
<!--
modified by longjun
<%#link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
-->
<%=link_to l(:label_contest_innovate), contests_path %>
=======
<%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %> <%=link_to l(:label_contest_innovate), :controller => 'contests', :action => 'index' %>
>>>>>>> 5a14798290ec4fe5a5aeedb507e7f0077df96efc
<!-- end longjun --> <!-- end longjun -->
</td> </td>
</tr> </tr>
@ -66,9 +39,7 @@
<% if @contests.size > 0%> <% if @contests.size > 0%>
<%= sort_contest(@s_state)%> <%= sort_contest(@s_state)%>
<div id="bid-show"> <div id="bid-show">
<%= render :partial => 'contest_list', <%= render :partial => 'contest_list', :locals => {:contests => @contests, :contest_pages => @contest_pages} %>
:locals => {:contests => @contests, :contest_pages => @contest_pages}
%>
</div> </div>
<% else %> <% else %>
<%= render :partial => "layouts/no_content"%> <%= render :partial => "layouts/no_content"%>